[ Sasha's backport helper bot ]
Hi,
✅ All tests passed successfully. No issues detected. No action required from the submitter.
The upstream commit SHA1 provided is correct: 169410eba271afc9f0fb476d996795aa26770c6d
WARNING: Author mismatch between patch and upstream commit: Backport author: Cliff Liudonghua.liu@windriver.com Commit author: Hou Taohoutao1@huawei.com
Status in newer kernel trees: 6.13.y | Present (exact SHA1) 6.12.y | Present (exact SHA1) 6.6.y | Present (different SHA1: 483cb92334cd) 6.1.y | Present (different SHA1: d6d6fe4bb105)
Note: The patch differs from the upstream commit: --- 1: 169410eba271a ! 1: 27f6e15ee1170 bpf: Check rcu_read_lock_trace_held() before calling bpf map helpers @@ Metadata ## Commit message ## bpf: Check rcu_read_lock_trace_held() before calling bpf map helpers
+ [ Upstream commit 169410eba271afc9f0fb476d996795aa26770c6d ] + These three bpf_map_{lookup,update,delete}_elem() helpers are also available for sleepable bpf program, so add the corresponding lock assertion for sleepable bpf program, otherwise the following warning @@ Commit message Signed-off-by: Hou Tao houtao1@huawei.com Link: https://lore.kernel.org/r/20231204140425.1480317-2-houtao@huaweicloud.com Signed-off-by: Alexei Starovoitov ast@kernel.org + Signed-off-by: Cliff Liu donghua.liu@windriver.com + Signed-off-by: He Zhe Zhe.He@windriver.com
## kernel/bpf/helpers.c ## +@@ + */ + #include <linux/bpf.h> + #include <linux/rcupdate.h> ++#include <linux/rcupdate_trace.h> + #include <linux/random.h> + #include <linux/smp.h> + #include <linux/topology.h> @@ * * Different map implementations will rely on rcu in map methods ---
Results of testing on various branches:
| Branch | Patch Apply | Build Test | |---------------------------|-------------|------------| | stable/linux-5.15.y | Success | Success |