Skip to contentSkip to conversation

bpf: Lift hashtab key_size limit

PATCH Superseded Florian Lehner 2 participants 2 messages Oct 28, 2020 – Oct 29, 2020

Subsystems (5)

v4 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

PATCH v4 1/1 bpf: Lift hashtab key_size limit

Currently key_size of hashtab is limited to MAX_BPF_STACK. As the key of hashtab can also be a value from a per cpu map it can be larger than MAX_BPF_STACK.

The use-case for this patch originates to implement allow/disallow lists for files and file paths. The maximum length of file paths is defined by PATH_MAX with 4096 chars including nul.
This limit exceeds MAX_BPF_STACK.

Changelog:

v4:
- Utilize BPF skeleton in tests
- Rebase

v3:
- Rebase

v2:
- Add a test for bpf side

---
 kernel/bpf/hashtab.c                          | 16 ++-----
 .../selftests/bpf/prog_tests/hash_large_key.c | 43 +++++++++++++++++
 .../selftests/bpf/progs/test_hash_large_key.c | 46 +++++++++++++++++++
 tools/testing/selftests/bpf/test_maps.c       |  3 +-
 4 files changed, 96 insertions(+), 12 deletions(-)
 create mode 100644 tools/testing/selftests/bpf/prog_tests/hash_large_key.c
 create mode 100644 tools/testing/selftests/bpf/progs/test_hash_large_key.c
kernel/bpf/hashtab.c +5 -11
index 1815e97d4c9c..fff7cd05b9e3 100644
@@ -390,17 +390,11 @@ static int htab_map_alloc_check(union bpf_attr *attr)
 	    attr->value_size == 0)
 		return -EINVAL;
 
-	if (attr->key_size > MAX_BPF_STACK)
-		/* eBPF programs initialize keys on stack, so they cannot be
-		 * larger than max stack size
-		 */
-		return -E2BIG;
-
-	if (attr->value_size >= KMALLOC_MAX_SIZE -
-	    MAX_BPF_STACK - sizeof(struct htab_elem))
-		/* if value_size is bigger, the user space won't be able to
-		 * access the elements via bpf syscall. This check also makes
-		 * sure that the elem_size doesn't overflow and it's
+	if ((u64)(attr->key_size + attr->value_size) >= KMALLOC_MAX_SIZE -
+	   sizeof(struct htab_elem))
+		/* if key_size + value_size is bigger, the user space won't be
+		 * able to access the elements via bpf syscall. This check
+		 * also makes sure that the elem_size doesn't overflow and it's
 		 * kmalloc-able later in htab_map_update_elem()
 		 */
 		return -E2BIG;
tools/testing/selftests/bpf/prog_tests/hash_large_key.c new file +43 -0

43 lines not on this page · raw message

tools/testing/selftests/bpf/progs/test_hash_large_key.c new file +46 -0

46 lines not on this page · raw message

tools/testing/selftests/bpf/test_maps.c +2 -1
index 0d92ebcb335d..0ad3e6305ff0 100644
@@ -1223,9 +1223,10 @@ static void test_map_in_map(void)
 
 static void test_map_large(void)
 {
+
 	struct bigkey {
 		int a;
-		char b[116];
+		char b[4096];
 		long long c;
 	} key;
 	int fd, i, value;
Signature · 1 line
2.26.2
#1 lore raw
Quoted 43 lines · Florian Lehner

Currently key_size of hashtab is limited to MAX_BPF_STACK. As the key of hashtab can also be a value from a per cpu map it can be larger than MAX_BPF_STACK.

The use-case for this patch originates to implement allow/disallow lists for files and file paths. The maximum length of file paths is defined by PATH_MAX with 4096 chars including nul.
This limit exceeds MAX_BPF_STACK.

Changelog:

v4:
- Utilize BPF skeleton in tests
- Rebase

v3:
- Rebase

v2:
- Add a test for bpf side

---
 kernel/bpf/hashtab.c                          | 16 ++-----
 .../selftests/bpf/prog_tests/hash_large_key.c | 43 +++++++++++++++++
 .../selftests/bpf/progs/test_hash_large_key.c | 46 +++++++++++++++++++
 tools/testing/selftests/bpf/test_maps.c       |  3 +-
 4 files changed, 96 insertions(+), 12 deletions(-)
 create mode 100644 tools/testing/selftests/bpf/prog_tests/hash_large_key.c
 create mode 100644 tools/testing/selftests/bpf/progs/test_hash_large_key.c
kernel/bpf/hashtab.c +0 -2
index 1815e97d4c9c..fff7cd05b9e3 100644
@@ -390,17 +390,11 @@ static int htab_map_alloc_check(union bpf_attr *attr)
            attr->value_size == 0)
                return -EINVAL;
 
-       if (attr->key_size > MAX_BPF_STACK)
-               /* eBPF programs initialize keys on stack, so they cannot be

kernel/bpf/hashtab.c static int htab_map_alloc_check(union bpf_attr *attr) · line 393

Quoted 10 lines
kernel/bpf/hashtab.c +1 -9
-                * larger than max stack size
-                */
-               return -E2BIG;
-
-       if (attr->value_size >= KMALLOC_MAX_SIZE -
-           MAX_BPF_STACK - sizeof(struct htab_elem))
-               /* if value_size is bigger, the user space won't be able to
-                * access the elements via bpf syscall. This check also makes
-                * sure that the elem_size doesn't overflow and it's
+       if ((u64)(attr->key_size + attr->value_size) >= KMALLOC_MAX_SIZE -

this will add both as u32, then will cast overflown result to u64. Instead just do:

if ((u64)attr->key_size + attr->value_size >= ....)

Quoted 7 lines
kernel/bpf/hashtab.c +4 -0
+          sizeof(struct htab_elem))
+               /* if key_size + value_size is bigger, the user space won't be
+                * able to access the elements via bpf syscall. This check
+                * also makes sure that the elem_size doesn't overflow and it's
                 * kmalloc-able later in htab_map_update_elem()
                 */
                return -E2BIG;

[...]

Quoted 8 lines
kernel/bpf/hashtab.c +8 -0
+
+SEC("raw_tracepoint/sys_enter")
+int bpf_hash_large_key_test(void *ctx)
+{
+       int zero = 0, err = 1, value = 42;
+       struct bigelement *key;
+
+       key = bpf_map_lookup_elem(&key_map, &zero);

kernel/bpf/hashtab.c

Quoted 10 lines
kernel/bpf/hashtab.c +10 -0
+       if (!key)
+               goto err;
+
+       key->c = 1;
+       if (bpf_map_update_elem(&hash_map, key, &value, BPF_ANY))
+               goto err;
+
+       err = 0;
+err:
+       return err;

return value from raw_tracepoint doesn't really communicate error, you might as well just return 0 always

Quoted 21 lines
kernel/bpf/hashtab.c +2 -0
+}
+
tools/testing/selftests/bpf/test_maps.c +2 -2
index 0d92ebcb335d..0ad3e6305ff0 100644
@@ -1223,9 +1223,10 @@ static void test_map_in_map(void)
 
 static void test_map_large(void)
 {
+
        struct bigkey {
                int a;
-               char b[116];
+               char b[4096];
                long long c;
        } key;
        int fd, i, value;
--

2.26.2