From: Sasha Levin <sashal@kernel.org>
To: stable@vger.kernel.org, alan.maguire@oracle.com
Cc: Sasha Levin <sashal@kernel.org>
Subject: Re: [PATCH linux-6.12.y] selftests/bpf: Clean up open-coded gettid syscall invocations
Date: Sun, 9 Mar 2025 22:14:38 -0400 [thread overview]
Message-ID: <20250309170404-822d7ca7fb4d73b6@stable.kernel.org> (raw)
In-Reply-To: <20250307172439.3656157-1-alan.maguire@oracle.com>
[ Sasha's backport helper bot ]
Hi,
Summary of potential issues:
⚠️ Found matching upstream commit but patch is missing proper reference to it
Found matching upstream commit: 0e2fb011a0ba8e2258ce776fdf89fbd589c2a3a6
WARNING: Author mismatch between patch and found commit:
Backport author: Alan Maguire<alan.maguire@oracle.com>
Commit author: Kumar Kartikeya Dwivedi<memxor@gmail.com>
Status in newer kernel trees:
6.13.y | Present (exact SHA1)
6.6.y | Not found
Note: The patch differs from the upstream commit:
---
1: 0e2fb011a0ba8 ! 1: 84ebd5e6d67af selftests/bpf: Clean up open-coded gettid syscall invocations
@@ Commit message
Signed-off-by: Kumar Kartikeya Dwivedi <memxor@gmail.com>
Link: https://lore.kernel.org/r/20241104171959.2938862-3-memxor@gmail.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
+ (cherry picked from commit 0e2fb011a0ba8e2258ce776fdf89fbd589c2a3a6)
+
+ This backport is needed to build BPF selftests successfully for
+ linux-6.12.y, as when currently building BPF selftests, the following
+ error is seen:
+
+ TEST-OBJ [test_progs] raw_tp_null.test.o
+ prog_tests/raw_tp_null.c: In function ‘test_raw_tp_null’:
+ prog_tests/raw_tp_null.c:15:26: error: implicit declaration of function ‘sys_gettid’; did you mean ‘gettid’? [-Werror=implicit-function-declaration]
+ 15 | skel->bss->tid = sys_gettid();
+ | ^~~~~~~~~~
+ | gettid
+ cc1: all warnings being treated as errors
+
+ Fixes: abd30e947f70 ("selftests/bpf: Add tests for raw_tp null handling")
+
+ Reported-by: Colm Harrington <colm.harrington@oracle.com>
+ Signed-off-by: Alan Maguire <alan.maguire@oracle.com>
+
+ Conflicts:
+ tools/testing/selftests/bpf/prog_tests/task_local_storage.c
+
+ Conflicts were due to new unrelated context in the upstream version.
## tools/testing/selftests/bpf/benchs/bench_trigger.c ##
@@
@@ tools/testing/selftests/bpf/prog_tests/task_local_storage.c: static void test_re
skel->bss->test_pid = 0;
task_ls_recursion__detach(skel);
-@@ tools/testing/selftests/bpf/prog_tests/task_local_storage.c: static void test_uptr_basic(void)
- __u64 ev_dummy_data = 1;
- int err;
-
-- my_tid = syscall(SYS_gettid);
-+ my_tid = sys_gettid();
- parent_task_fd = sys_pidfd_open(my_tid, 0);
- if (!ASSERT_OK_FD(parent_task_fd, "parent_task_fd"))
- return;
## tools/testing/selftests/bpf/prog_tests/uprobe_multi_test.c ##
@@ tools/testing/selftests/bpf/prog_tests/uprobe_multi_test.c: static void *child_thread(void *ctx)
---
Results of testing on various branches:
| Branch | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-6.12.y | Success | Success |
prev parent reply other threads:[~2025-03-10 2:14 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-07 17:24 [PATCH linux-6.12.y] selftests/bpf: Clean up open-coded gettid syscall invocations Alan Maguire
2025-03-10 2:14 ` Sasha Levin [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250309170404-822d7ca7fb4d73b6@stable.kernel.org \
--to=sashal@kernel.org \
--cc=alan.maguire@oracle.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox