Yuntao Wang e804587ecd
bpf: Fix incorrect memory charge cost calculation in stack_map_alloc() ...
commit b45043192b3e481304062938a6561da2ceea46a6 upstream.
This is a backport of the original upstream patch for 5.4/5.10.
The original upstream patch has been applied to 5.4/5.10 branches, which
simply removed the line:
cost += n_buckets * (value_size + sizeof(struct stack_map_bucket));
This is correct for upstream branch but incorrect for 5.4/5.10 branches,
as the 5.4/5.10 branches do not have the commit 370868107bf6 ("bpf:
Eliminate rlimit-based memory accounting for stackmap maps"), so the
bpf_map_charge_init() function has not been removed.
Currently the bpf_map_charge_init() function in 5.4/5.10 branches takes a
wrong memory charge cost, the
attr->max_entries * (sizeof(struct stack_map_bucket) + (u64)value_size))
part is missing, let's fix it.
Cc: <stable@vger.kernel.org > # 5.4.y
Cc: <stable@vger.kernel.org > # 5.10.y
Signed-off-by: Yuntao Wang <ytcoode@gmail.com >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
2022-06-22 14:11:02 +02:00
2022-06-22 14:11:02 +02:00
2022-05-18 09:47:27 +02:00
2022-06-06 08:33:48 +02:00
2022-06-14 18:11:28 +02:00
2022-05-25 09:14:34 +02:00
2021-04-14 08:24:10 +02:00
2022-05-12 12:23:41 +02:00
2019-08-19 13:03:37 +02:00
2021-11-17 09:48:28 +01:00
2022-04-15 14:18:05 +02:00
2022-04-15 14:18:08 +02:00
2022-03-28 08:46:48 +02:00
2022-06-14 18:11:33 +02:00
2022-04-20 09:19:39 +02:00
2022-06-14 18:11:56 +02:00
2021-05-11 14:04:16 +02:00
2019-04-04 21:04:13 -04:00
2022-02-23 11:59:56 +01:00
2019-05-30 11:26:37 -07:00
2021-09-03 10:08:16 +02:00
2020-10-01 13:17:32 +02:00
2022-02-08 18:24:26 +01:00
2022-04-15 14:18:04 +02:00
2020-06-22 09:30:59 +02:00
2022-04-15 14:18:04 +02:00
2019-06-05 17:37:17 +02:00
2019-06-19 17:09:55 +02:00
2019-07-30 18:34:15 +02:00
2019-05-21 10:50:45 +02:00
2020-06-22 09:31:22 +02:00
2021-07-19 08:53:15 +02:00
2019-06-19 17:09:06 +02:00
2019-05-21 10:50:45 +02:00
2020-01-17 19:48:42 +01:00
2019-05-21 11:52:39 +02:00
2020-11-18 19:20:31 +01:00
2019-08-21 22:23:48 +10:00
2020-11-24 13:29:18 +01:00
2022-02-23 12:00:00 +01:00
2019-10-06 09:11:37 -06:00
2021-06-30 08:47:55 -04:00
2020-09-03 11:27:10 +02:00
2019-05-21 10:50:45 +02:00
2019-07-12 11:05:40 -07:00
2019-05-21 10:50:45 +02:00
2019-08-29 15:10:10 +01:00
2020-07-16 08:16:44 +02:00
2021-01-09 13:44:55 +01:00
2019-05-21 10:50:46 +02:00
2019-05-21 10:50:46 +02:00
2019-05-21 10:50:46 +02:00
2019-07-22 18:05:11 +02:00
2021-02-03 23:25:56 +01:00
2019-09-06 23:58:44 +02:00
2021-05-19 10:08:28 +02:00
2019-08-19 21:54:15 -07:00
2019-05-24 20:16:01 +02:00
2020-04-17 10:50:22 +02:00
2021-12-08 09:01:10 +01:00
2019-05-30 11:26:39 -07:00
2021-09-12 08:56:39 +02:00
2019-06-05 17:37:17 +02:00
2021-05-11 14:04:16 +02:00
2021-04-07 14:47:38 +02:00
2021-04-07 14:47:38 +02:00
2019-05-24 17:27:11 +02:00
2022-02-23 11:59:56 +01:00
2020-10-01 13:17:23 +02:00
2019-06-05 17:37:17 +02:00
2020-06-17 16:40:22 +02:00
2019-10-07 15:47:19 -07:00
2019-08-19 21:54:16 -07:00
2021-09-22 12:26:37 +02:00
2019-07-16 19:23:24 -07:00
2021-09-26 14:07:09 +02:00
2022-06-14 18:11:24 +02:00
2020-11-18 19:20:30 +01:00
2020-08-26 10:40:51 +02:00
2020-06-24 17:50:35 +02:00
2019-05-27 09:36:28 -05:00
2022-02-16 12:52:53 +01:00
2021-11-17 09:48:24 +01:00
2022-04-20 09:19:39 +02:00
2021-02-07 15:35:49 +01:00
2019-07-08 11:01:13 -07:00
2019-11-04 21:19:25 +01:00
2019-10-17 12:47:12 +02:00
2019-06-21 01:54:53 +02:00
2021-09-26 14:07:08 +02:00
2020-10-01 13:17:10 +02:00
2022-03-11 11:22:37 +01:00
2020-01-09 10:19:54 +01:00
2019-05-21 11:52:39 +02:00
2019-08-01 14:30:22 -07:00
2021-07-14 16:53:08 +02:00
2022-02-23 11:59:57 +01:00
2019-07-18 17:08:07 -07:00
2020-10-14 10:32:58 +02:00
2021-05-14 09:44:33 +02:00
2019-07-08 19:36:47 -07:00
2019-05-21 10:50:45 +02:00
2019-07-08 19:36:47 -07:00
2019-06-05 17:37:17 +02:00
2019-06-05 17:37:17 +02:00
2019-04-19 09:46:05 -07:00
2020-02-24 08:36:52 +01:00
2019-04-16 16:55:15 +02:00
2022-01-16 09:15:38 +01:00
e804587ecd