Message ID | 20250509122348.649064-1-skb99@linux.ibm.com |
---|---|
State | New |
Headers | show |
Series | selftests/bpf: Fix bpf selftest build error | expand |
Hi Alexei, On Fri, 9 May 2025 10:04:18 -0700 Alexei Starovoitov <alexei.starovoitov@gmail.com> wrote: > > On Fri, May 9, 2025 at 5:24 AM Saket Kumar Bhaskar <skb99@linux.ibm.com> wrote: > > > > On linux-next, build for bpf selftest displays an error due to > > mismatch in the expected function signature of bpf_testmod_test_read > > and bpf_testmod_test_write. > > > > Commit 97d06802d10a ("sysfs: constify bin_attribute argument of bin_attribute::read/write()") > > changed the required type for struct bin_attribute to const struct bin_attribute. > > > > To resolve the error, update corresponding signature for the callback. > > > > Reported-by: Venkat Rao Bagalkote <venkat88@linux.ibm.com> > > Closes: https://lore.kernel.org/all/e915da49-2b9a-4c4c-a34f-877f378129f6@linux.ibm.com/ > > Signed-off-by: Saket Kumar Bhaskar <skb99@linux.ibm.com> > > --- > > tools/testing/selftests/bpf/test_kmods/bpf_testmod.c | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/tools/testing/selftests/bpf/test_kmods/bpf_testmod.c b/tools/testing/selftests/bpf/test_kmods/bpf_testmod.c > > index 2e54b95ad898..194c442580ee 100644 > > --- a/tools/testing/selftests/bpf/test_kmods/bpf_testmod.c > > +++ b/tools/testing/selftests/bpf/test_kmods/bpf_testmod.c > > @@ -385,7 +385,7 @@ int bpf_testmod_fentry_ok; > > > > noinline ssize_t > > bpf_testmod_test_read(struct file *file, struct kobject *kobj, > > - struct bin_attribute *bin_attr, > > + const struct bin_attribute *bin_attr, > > char *buf, loff_t off, size_t len) > > You didn't even compile it :( > > Instead of fixing the build, it breaks the build. > > pw-bot: cr This patch is only needed in linux-next. It should be applied to the driver-core tree - since that includes commit 97d06802d10a. It should also have a Fixes tag referencing commit 97d06802d10a.
Hi Saket, On Mon, 12 May 2025 10:55:59 +0530 Saket Kumar Bhaskar <skb99@linux.ibm.com> wrote: > > Apologies for missing the Fixes tag. Would you like me to resend the patch with the > Fixes tag included? Yes, please, but send it to Greg (keeping the ccs) so that he can apply it to the driver-core tree.
diff --git a/tools/testing/selftests/bpf/test_kmods/bpf_testmod.c b/tools/testing/selftests/bpf/test_kmods/bpf_testmod.c index 2e54b95ad898..194c442580ee 100644 --- a/tools/testing/selftests/bpf/test_kmods/bpf_testmod.c +++ b/tools/testing/selftests/bpf/test_kmods/bpf_testmod.c @@ -385,7 +385,7 @@ int bpf_testmod_fentry_ok; noinline ssize_t bpf_testmod_test_read(struct file *file, struct kobject *kobj, - struct bin_attribute *bin_attr, + const struct bin_attribute *bin_attr, char *buf, loff_t off, size_t len) { struct bpf_testmod_test_read_ctx ctx = { @@ -465,7 +465,7 @@ ALLOW_ERROR_INJECTION(bpf_testmod_test_read, ERRNO); noinline ssize_t bpf_testmod_test_write(struct file *file, struct kobject *kobj, - struct bin_attribute *bin_attr, + const struct bin_attribute *bin_attr, char *buf, loff_t off, size_t len) { struct bpf_testmod_test_write_ctx ctx = {
On linux-next, build for bpf selftest displays an error due to mismatch in the expected function signature of bpf_testmod_test_read and bpf_testmod_test_write. Commit 97d06802d10a ("sysfs: constify bin_attribute argument of bin_attribute::read/write()") changed the required type for struct bin_attribute to const struct bin_attribute. To resolve the error, update corresponding signature for the callback. Reported-by: Venkat Rao Bagalkote <venkat88@linux.ibm.com> Closes: https://lore.kernel.org/all/e915da49-2b9a-4c4c-a34f-877f378129f6@linux.ibm.com/ Signed-off-by: Saket Kumar Bhaskar <skb99@linux.ibm.com> --- tools/testing/selftests/bpf/test_kmods/bpf_testmod.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)