bpf: avoid warning for unused register_bpf_struct_ops() #6463
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Author
|
Upstream branch: 835a507 |
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
bpf-next_base
branch
from
03e2ed2 to
3ea267d
Compare
The macro originally introduced in commit f6be98d ("bpf, net: switch to dynamic registration") causes a warning in the new smc code because of the way it evaluates the arguments: In file included from include/linux/bpf_verifier.h:7, from net/smc/smc_hs_bpf.c:13: net/smc/smc_hs_bpf.c: In function 'bpf_smc_hs_ctrl_init': include/linux/bpf.h:2076:50: error: statement with no effect [-Werror=unused-value] 2076 | #define register_bpf_struct_ops(st_ops, type) ({ (void *)(st_ops); 0; }) | ^~~~~~~~~~~~~~~~ net/smc/smc_hs_bpf.c:139:16: note: in expansion of macro 'register_bpf_struct_ops' 139 | return register_bpf_struct_ops(&bpf_smc_hs_ctrl_ops, smc_hs_ctrl); | ^~~~~~~~~~~~~~~~~~~~~~~ Work around this using an inline function that takes the argument, the same way as the normal implementation. Since the second argument to register_bpf_struct_ops() is a type rather than an object, this still has to be a macro, but it can call a new inline helper internally like the normal one does. Fixes: 15f295f ("net/smc: bpf: Introduce generic hook for handshake flow") Cc: Kui-Feng Lee <[email protected]> Cc: Martin KaFai Lau <[email protected]> Signed-off-by: Arnd Bergmann <[email protected]>
Author
|
Upstream branch: 835a507 |
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
series/1030401=>bpf-next
branch
from
066d885 to
7d577c9
Compare
Author
|
At least one diff in series https://patchwork.kernel.org/project/netdevbpf/list/?series=1030401 irrelevant now. Closing PR. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Pull request for series with
subject: bpf: avoid warning for unused register_bpf_struct_ops()
version: 1
url: https://patchwork.kernel.org/project/netdevbpf/list/?series=1030401