Commit bd5879a6 authored by Martin KaFai Lau's avatar Martin KaFai Lau Committed by Alexei Starovoitov
Browse files

selftests/bpf: Create task_local_storage map with invalid uptr's struct



This patch tests the map creation failure when the map_value
has unsupported uptr. The three cases are the struct is larger
than one page, the struct is empty, and the struct is a kernel struct.

Signed-off-by: default avatarMartin KaFai Lau <martin.lau@kernel.org>
Link: https://lore.kernel.org/r/20241023234759.860539-13-martin.lau@linux.dev


Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent 898cbca4
Loading
Loading
Loading
Loading
+46 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@
#include <sys/eventfd.h>
#include <sys/mman.h>
#include <test_progs.h>
#include <bpf/btf.h>
#include "task_local_storage_helpers.h"
#include "task_local_storage.skel.h"
#include "task_local_storage_exit_creds.skel.h"
@@ -19,6 +20,7 @@
#include "task_ls_uptr.skel.h"
#include "uptr_update_failure.skel.h"
#include "uptr_failure.skel.h"
#include "uptr_map_failure.skel.h"

static void test_sys_enter_exit(void)
{
@@ -452,6 +454,40 @@ static void test_uptr_update_failure(void)
	close(task_fd);
}

static void test_uptr_map_failure(const char *map_name, int expected_errno)
{
	LIBBPF_OPTS(bpf_map_create_opts, create_attr);
	struct uptr_map_failure *skel;
	struct bpf_map *map;
	struct btf *btf;
	int map_fd, err;

	skel = uptr_map_failure__open();
	if (!ASSERT_OK_PTR(skel, "uptr_map_failure__open"))
		return;

	map = bpf_object__find_map_by_name(skel->obj, map_name);
	btf = bpf_object__btf(skel->obj);
	err = btf__load_into_kernel(btf);
	if (!ASSERT_OK(err, "btf__load_into_kernel"))
		goto done;

	create_attr.map_flags = bpf_map__map_flags(map);
	create_attr.btf_fd = btf__fd(btf);
	create_attr.btf_key_type_id = bpf_map__btf_key_type_id(map);
	create_attr.btf_value_type_id = bpf_map__btf_value_type_id(map);
	map_fd = bpf_map_create(bpf_map__type(map), map_name,
				bpf_map__key_size(map), bpf_map__value_size(map),
				0, &create_attr);
	if (ASSERT_ERR_FD(map_fd, "map_create"))
		ASSERT_EQ(errno, expected_errno, "errno");
	else
		close(map_fd);

done:
	uptr_map_failure__destroy(skel);
}

void test_task_local_storage(void)
{
	if (test__start_subtest("sys_enter_exit"))
@@ -468,5 +504,15 @@ void test_task_local_storage(void)
		test_uptr_across_pages();
	if (test__start_subtest("uptr_update_failure"))
		test_uptr_update_failure();
	if (test__start_subtest("uptr_map_failure_e2big")) {
		if (getpagesize() == PAGE_SIZE)
			test_uptr_map_failure("large_uptr_map", E2BIG);
		else
			test__skip();
	}
	if (test__start_subtest("uptr_map_failure_size0"))
		test_uptr_map_failure("empty_uptr_map", EINVAL);
	if (test__start_subtest("uptr_map_failure_kstruct"))
		test_uptr_map_failure("kstruct_uptr_map", EINVAL);
	RUN_TESTS(uptr_failure);
}
+27 −0
Original line number Diff line number Diff line
// SPDX-License-Identifier: GPL-2.0
/* Copyright (c) 2024 Meta Platforms, Inc. and affiliates. */

#include <vmlinux.h>
#include <bpf/bpf_helpers.h>
#include "uptr_test_common.h"

struct {
	__uint(type, BPF_MAP_TYPE_TASK_STORAGE);
	__uint(map_flags, BPF_F_NO_PREALLOC);
	__type(key, int);
	__type(value, struct large_uptr);
} large_uptr_map SEC(".maps");

struct {
	__uint(type, BPF_MAP_TYPE_TASK_STORAGE);
	__uint(map_flags, BPF_F_NO_PREALLOC);
	__type(key, int);
	__type(value, struct empty_uptr);
} empty_uptr_map SEC(".maps");

struct {
	__uint(type, BPF_MAP_TYPE_TASK_STORAGE);
	__uint(map_flags, BPF_F_NO_PREALLOC);
	__type(key, int);
	__type(value, struct kstruct_uptr);
} kstruct_uptr_map SEC(".maps");
+8 −0
Original line number Diff line number Diff line
@@ -390,6 +390,14 @@ int test__join_cgroup(const char *path);
	___ok;								\
})

#define ASSERT_ERR_FD(fd, name) ({					\
	static int duration = 0;					\
	int ___fd = (fd);						\
	bool ___ok = ___fd < 0;						\
	CHECK(!___ok, (name), "unexpected fd: %d\n", ___fd);		\
	___ok;								\
})

#define SYS(goto_label, fmt, ...)					\
	({								\
		char cmd[1024];						\
+23 −0
Original line number Diff line number Diff line
@@ -5,9 +5,12 @@
#define _UPTR_TEST_COMMON_H

#define MAGIC_VALUE 0xabcd1234
#define PAGE_SIZE 4096

#ifdef __BPF__
/* Avoid fwd btf type being generated for the following struct */
struct large_data *dummy_large_data;
struct empty_data *dummy_empty_data;
struct user_data *dummy_data;
struct cgroup *dummy_cgrp;
#else
@@ -37,4 +40,24 @@ struct value_lock_type {
	struct bpf_spin_lock lock;
};

struct large_data {
	__u8 one_page[PAGE_SIZE];
	int a;
};

struct large_uptr {
	struct large_data __uptr *udata;
};

struct empty_data {
};

struct empty_uptr {
	struct empty_data __uptr *udata;
};

struct kstruct_uptr {
	struct cgroup __uptr *cgrp;
};

#endif