Joanne Koong
8845b4681b
bpf: Add alignment padding for "map_extra" + consolidate holes
This patch makes 2 changes regarding alignment padding
for the "map_extra" field.
1) In the kernel header, "map_extra" and "btf_value_type_id"
are rearranged to consolidate the hole.
Before:
struct bpf_map {
...
u32 max_entries; /* 36 4 */
u32 map_flags; /* 40 4 */
/* XXX 4 bytes hole, try to pack */
u64 map_extra; /* 48 8 */
int spin_lock_off; /* 56 4 */
int timer_off; /* 60 4 */
/* --- cacheline 1 boundary (64 bytes) --- */
u32 id; /* 64 4 */
int numa_node; /* 68 4 */
...
bool frozen; /* 117 1 */
/* XXX 10 bytes hole, try to pack */
/* --- cacheline 2 boundary (128 bytes) --- */
...
struct work_struct work; /* 144 72 */
/* --- cacheline 3 boundary (192 bytes) was 24 bytes ago --- */
struct mutex freeze_mutex; /* 216 144 */
/* --- cacheline 5 boundary (320 bytes) was 40 bytes ago --- */
u64 writecnt; /* 360 8 */
/* size: 384, cachelines: 6, members: 26 */
/* sum members: 354, holes: 2, sum holes: 14 */
/* padding: 16 */
/* forced alignments: 2, forced holes: 1, sum forced holes: 10 */
} __attribute__((__aligned__(64)));
After:
struct bpf_map {
...
u32 max_entries; /* 36 4 */
u64 map_extra; /* 40 8 */
u32 map_flags; /* 48 4 */
int spin_lock_off; /* 52 4 */
int timer_off; /* 56 4 */
u32 id; /* 60 4 */
/* --- cacheline 1 boundary (64 bytes) --- */
int numa_node; /* 64 4 */
...
bool frozen /* 113 1 */
/* XXX 14 bytes hole, try to pack */
/* --- cacheline 2 boundary (128 bytes) --- */
...
struct work_struct work; /* 144 72 */
/* --- cacheline 3 boundary (192 bytes) was 24 bytes ago --- */
struct mutex freeze_mutex; /* 216 144 */
/* --- cacheline 5 boundary (320 bytes) was 40 bytes ago --- */
u64 writecnt; /* 360 8 */
/* size: 384, cachelines: 6, members: 26 */
/* sum members: 354, holes: 1, sum holes: 14 */
/* padding: 16 */
/* forced alignments: 2, forced holes: 1, sum forced holes: 14 */
} __attribute__((__aligned__(64)));
2) Add alignment padding to the bpf_map_info struct
More details can be found in commit 36f9814a49 ("bpf: fix uapi hole
for 32 bit compat applications")
Signed-off-by: Joanne Koong <joannekoong@fb.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Acked-by: Yonghong Song <yhs@fb.com>
Link: https://lore.kernel.org/bpf/20211029224909.1721024-3-joannekoong@fb.com
2021-11-01 14:16:03 -07:00
..
2021-08-19 15:07:03 +02:00
2021-09-02 22:49:16 +02:00
2021-10-02 14:15:57 +01:00
2021-08-13 09:38:04 +02:00
2021-08-23 18:05:31 -04:00
2021-09-27 12:16:48 +01:00
2021-10-05 13:15:35 +01:00
2021-10-04 18:10:57 -07:00
2021-08-31 16:43:06 -07:00
2021-09-03 16:20:37 -07:00
2021-09-20 12:43:34 +01:00
2021-09-09 11:07:47 -07:00
2021-09-01 15:25:28 -07:00
2021-10-04 12:55:49 +01:00
2021-08-23 11:06:28 +01:00
2021-09-08 12:55:35 -07:00
2021-09-28 14:10:24 +01:00
2021-09-01 10:29:29 -07:00
2021-09-07 12:27:27 -07:00
2021-08-29 14:47:42 +03:00
2021-09-04 10:25:26 -07:00
2021-09-14 10:41:30 +02:00
2021-08-30 19:30:37 +02:00
2021-09-03 09:58:10 -07:00
2021-09-03 10:08:28 -07:00
2021-08-31 09:41:22 -07:00
2021-08-13 10:27:49 +02:00
2021-08-31 09:41:22 -07:00
2021-08-16 10:53:01 -06:00
2021-08-23 12:54:30 -06:00
2021-09-02 15:09:46 -07:00
2021-09-09 19:14:33 -04:00
2021-10-28 13:22:49 -07:00
2021-10-05 17:07:41 -07:00
2021-08-23 17:50:24 -07:00
2021-11-01 14:16:03 -07:00
2021-10-05 17:07:41 -07:00
2021-09-24 14:15:56 +01:00
2021-08-25 19:41:39 -07:00
2021-10-05 17:07:42 -07:00
2021-09-24 16:13:35 -07:00
2021-08-16 10:50:32 -06:00
2021-09-01 10:29:10 +02:00
2021-09-13 16:35:58 -07:00
2021-09-13 16:35:58 -07:00
2021-09-01 15:26:45 -07:00
2021-09-03 09:58:17 -07:00
2021-09-08 15:32:35 -07:00
2021-09-13 10:43:04 -07:00
2021-09-12 16:09:26 -07:00
2021-09-13 10:18:28 -07:00
2021-09-13 10:43:04 -07:00
2021-09-15 12:04:28 -07:00
2021-08-18 22:33:28 +02:00
2021-08-09 20:17:36 +01:00
2021-09-11 00:41:21 +02:00
2021-09-07 15:42:10 +02:00
2021-09-11 00:41:21 +02:00
2021-08-13 10:27:49 +02:00
2021-08-20 12:32:59 +02:00
2021-08-24 17:09:01 -05:00
2021-09-08 11:50:24 -07:00
2021-08-26 16:52:03 -07:00
2021-08-17 17:29:10 +02:00
2021-08-31 14:55:09 -07:00
2021-09-03 10:34:44 -07:00
2021-08-10 12:23:46 +02:00
2021-08-18 13:27:49 +02:00
2021-08-19 09:02:39 +02:00
2021-08-14 09:18:36 +02:00
2021-08-29 19:14:19 +05:30
2021-09-07 21:17:28 +02:00
2021-08-19 11:19:41 +01:00
2021-08-26 15:32:28 -04:00
2021-10-02 14:18:25 +01:00
2021-08-24 07:38:29 -07:00
2021-08-28 01:33:02 +02:00
2021-08-20 11:39:26 +01:00
2021-08-26 15:32:10 -04:00
2021-08-10 13:08:49 +02:00
2021-09-06 07:20:56 -04:00
2021-10-27 11:13:52 -07:00
2021-09-09 12:45:26 -07:00
2021-08-27 13:34:02 +01:00
2021-08-27 13:34:03 +01:00
2021-08-11 13:50:53 +02:00
2021-08-23 12:55:45 -06:00
2021-09-08 11:50:24 -07:00
2021-09-03 09:58:13 -07:00
2021-08-10 14:42:49 +02:00
2021-08-10 17:57:23 +02:00
2021-09-03 09:58:16 -07:00
2021-09-08 18:45:53 -07:00
2021-08-12 17:26:24 +02:00
2021-08-26 10:18:56 +02:00
2021-08-13 06:41:22 -07:00
2021-08-19 10:41:08 +02:00
2021-08-19 10:41:08 +02:00
2021-08-10 22:50:07 +02:00
2021-08-23 13:10:37 -06:00
2021-08-20 17:14:35 +02:00
2021-08-16 21:26:33 -07:00
2021-09-03 10:44:35 -07:00
2021-08-18 07:23:15 -06:00
2021-08-10 10:59:20 +02:00
2021-09-22 14:29:32 +01:00
2021-08-19 09:02:55 +09:00
2021-08-20 11:31:42 -07:00
2021-09-23 11:01:12 -04:00
2021-09-06 06:30:45 -04:00
2021-08-18 08:27:30 +02:00
2021-09-03 08:06:02 -06:00
2021-08-13 18:37:38 +02:00
2021-08-17 19:08:49 +02:00
2021-08-11 09:50:11 -06:00
2021-09-19 12:08:37 +01:00
2021-09-14 13:23:22 -07:00
2021-09-03 10:08:28 -07:00
2021-09-08 11:50:23 -07:00
2021-09-08 12:55:35 -07:00
2021-09-03 09:58:17 -07:00
2021-09-01 08:35:06 -07:00
2021-09-29 10:54:50 +01:00
2021-09-24 16:13:35 -07:00
2021-08-19 13:06:53 +01:00
2021-08-19 09:02:55 +09:00
2021-08-09 15:49:00 -07:00
2021-09-07 11:03:45 -07:00
2021-09-03 18:42:01 +02:00
2021-09-16 13:05:42 -07:00
2021-08-20 12:32:58 +02:00
2021-09-08 12:55:35 -07:00
2021-08-26 10:36:51 -06:00
2021-08-16 14:42:22 +02:00
2021-08-24 09:16:20 +02:00
2021-08-17 19:05:29 +02:00
2021-08-23 13:19:12 +02:00
2021-09-05 20:58:50 +01:00
2021-08-25 15:20:25 +01:00
2021-10-05 13:07:03 +01:00
2021-08-27 16:37:17 -04:00
2021-08-27 16:37:17 -04:00
2021-08-16 18:55:32 +02:00
2021-09-14 09:02:50 +02:00
2021-08-15 09:56:03 -05:00
2021-09-07 12:27:27 -07:00
2021-08-25 15:43:26 -05:00
2021-09-08 11:50:25 -07:00
2021-09-13 10:18:28 -07:00
2021-09-17 13:52:17 +01:00
2021-09-08 11:50:24 -07:00
2021-09-08 11:50:24 -07:00
2021-09-08 12:55:35 -07:00
2021-09-08 12:55:35 -07:00
2021-08-18 17:32:42 -05:00
2021-09-07 19:13:42 -07:00
2021-09-02 17:59:58 +02:00
2021-08-19 14:13:28 +01:00
2021-09-07 19:13:42 -07:00
2021-09-07 19:13:42 -07:00
2021-09-13 10:53:50 -07:00
2021-10-04 13:50:05 +01:00
2021-08-10 12:53:04 +02:00
2021-08-18 11:39:46 -07:00
2021-09-20 22:28:47 +02:00
2021-08-18 16:08:11 +02:00
2021-08-26 11:28:07 -07:00
2021-08-16 18:45:29 +02:00
2021-08-26 11:27:51 -07:00
2021-08-18 22:08:24 +02:00
2021-08-10 17:09:59 +02:00
2021-08-14 12:48:07 +02:00
2021-08-17 19:06:04 +02:00
2021-09-03 15:33:47 -07:00
2021-08-13 17:49:05 -07:00
2021-09-02 21:38:56 +02:00
2021-08-18 09:31:53 +02:00
2021-08-17 17:36:48 +02:00
2021-08-17 17:36:48 +02:00
2021-08-10 11:00:53 -07:00
2021-08-26 13:40:35 +01:00
2021-08-11 18:42:53 +02:00
2021-08-17 17:37:26 +02:00
2021-08-17 17:12:22 +02:00
2021-08-17 17:50:51 +02:00
2021-08-17 17:50:51 +02:00
2021-09-02 22:07:17 +02:00
2021-08-24 19:52:40 -03:00
2021-09-19 13:29:36 -07:00
2021-08-10 10:10:10 +02:00
2021-08-13 09:12:53 +02:00
2021-08-13 09:14:36 +02:00
2021-09-03 09:58:12 -07:00
2021-09-09 10:57:52 +01:00
2021-11-01 17:08:21 +01:00
2021-09-04 10:22:01 +02:00
2021-09-18 14:20:01 +01:00
2021-08-17 17:43:24 +02:00
2021-08-17 19:06:13 +02:00
2021-08-17 19:06:13 +02:00
2021-08-17 19:06:13 +02:00
2021-08-17 17:43:24 +02:00
2021-08-17 11:47:43 +02:00
2021-08-17 19:09:27 +02:00
2021-08-19 09:02:55 +09:00
2021-08-19 09:02:55 +09:00
2021-09-03 09:58:17 -07:00
2021-09-09 13:25:49 -07:00
2021-08-17 11:47:53 -04:00
2021-08-14 15:43:28 +02:00
2021-09-08 11:50:28 -07:00
2021-09-08 17:44:26 +02:00
2021-09-05 11:50:41 -07:00
2021-09-22 10:24:01 -04:00
2021-08-16 11:37:21 -04:00
2021-09-08 15:32:35 -07:00
2021-09-15 09:22:35 -06:00
2021-09-08 12:55:35 -07:00
2021-09-03 09:58:16 -07:00
2021-09-06 07:20:57 -04:00
2021-08-26 10:36:51 -06:00
2021-08-11 09:50:11 -06:00
2021-09-06 07:20:57 -04:00
2021-08-10 11:50:55 -04:00
2021-09-03 09:58:16 -07:00
2021-09-08 11:50:24 -07:00
2021-09-03 09:58:17 -07:00
2021-08-11 06:44:24 -04:00
2021-08-30 13:42:10 -07:00
2021-08-22 10:28:08 +02:00
2021-08-17 07:49:10 -10:00
2021-09-03 10:08:28 -07:00
2021-08-17 19:05:11 +02:00