When CONFIG_NET_CLS_ACT is disabled:
../net/sched/cls_api.c:141:13: warning: 'tcf_exts_miss_cookie_base_destroy' defined but not used [-Wunused-function]
141 | static void tcf_exts_miss_cookie_base_destroy(struct tcf_exts *exts)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Due to the way the code is structured, it is possible for a definition
of tcf_exts_miss_cookie_base_destroy() to be present without actually
being used. Its single callsite is in an '#ifdef CONFIG_NET_CLS_ACT'
block but a definition will always be present in the file. The version
of tcf_exts_miss_cookie_base_destroy() that actually does something
depends on CONFIG_NET_TC_SKB_EXT, so the stub function is used in both
CONFIG_NET_CLS_ACT=n and CONFIG_NET_CLS_ACT=y + CONFIG_NET_TC_SKB_EXT=n
configurations.
Move the call to tcf_exts_miss_cookie_base_destroy() in
tcf_exts_destroy() out of the '#ifdef CONFIG_NET_CLS_ACT', so that it
always appears used to the compiler, while not changing any behavior
with any of the various configuration combinations.
Fixes: 80cd22c35c90 ("net/sched: cls_api: Support hardware miss to tc action")
Signed-off-by: Nathan Chancellor <[email protected]>
---
net/sched/cls_api.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c
index 3569e2c3660c..2a6b6be0811b 100644
--- a/net/sched/cls_api.c
+++ b/net/sched/cls_api.c
@@ -3241,9 +3241,9 @@ EXPORT_SYMBOL(tcf_exts_init_ex);
void tcf_exts_destroy(struct tcf_exts *exts)
{
-#ifdef CONFIG_NET_CLS_ACT
tcf_exts_miss_cookie_base_destroy(exts);
+#ifdef CONFIG_NET_CLS_ACT
if (exts->actions) {
tcf_action_destroy(exts->actions, TCA_ACT_UNBIND);
kfree(exts->actions);
---
base-commit: ac3ad19584b26fae9ac86e4faebe790becc74491
change-id: 20230224-cls_api-wunused-function-17aa94fdef90
Best regards,
--
Nathan Chancellor <[email protected]>
On Fri, Feb 24, 2023 at 11:18:49AM -0700, Nathan Chancellor wrote:
> When CONFIG_NET_CLS_ACT is disabled:
>
> ../net/sched/cls_api.c:141:13: warning: 'tcf_exts_miss_cookie_base_destroy' defined but not used [-Wunused-function]
> 141 | static void tcf_exts_miss_cookie_base_destroy(struct tcf_exts *exts)
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>
> Due to the way the code is structured, it is possible for a definition
> of tcf_exts_miss_cookie_base_destroy() to be present without actually
> being used. Its single callsite is in an '#ifdef CONFIG_NET_CLS_ACT'
> block but a definition will always be present in the file. The version
> of tcf_exts_miss_cookie_base_destroy() that actually does something
> depends on CONFIG_NET_TC_SKB_EXT, so the stub function is used in both
> CONFIG_NET_CLS_ACT=n and CONFIG_NET_CLS_ACT=y + CONFIG_NET_TC_SKB_EXT=n
> configurations.
>
> Move the call to tcf_exts_miss_cookie_base_destroy() in
> tcf_exts_destroy() out of the '#ifdef CONFIG_NET_CLS_ACT', so that it
> always appears used to the compiler, while not changing any behavior
> with any of the various configuration combinations.
>
> Fixes: 80cd22c35c90 ("net/sched: cls_api: Support hardware miss to tc action")
> Signed-off-by: Nathan Chancellor <[email protected]>
Thanks Nathan,
I think the #ifdefs in this file could do with some work.
But as a fix this looks good to me.
Reviewed-by: Simon Horman <[email protected]>
On Sat, Feb 25, 2023 at 05:08:17PM +0100, Simon Horman wrote:
> On Fri, Feb 24, 2023 at 11:18:49AM -0700, Nathan Chancellor wrote:
> > When CONFIG_NET_CLS_ACT is disabled:
> >
> > ../net/sched/cls_api.c:141:13: warning: 'tcf_exts_miss_cookie_base_destroy' defined but not used [-Wunused-function]
> > 141 | static void tcf_exts_miss_cookie_base_destroy(struct tcf_exts *exts)
> > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> >
> > Due to the way the code is structured, it is possible for a definition
> > of tcf_exts_miss_cookie_base_destroy() to be present without actually
> > being used. Its single callsite is in an '#ifdef CONFIG_NET_CLS_ACT'
> > block but a definition will always be present in the file. The version
> > of tcf_exts_miss_cookie_base_destroy() that actually does something
> > depends on CONFIG_NET_TC_SKB_EXT, so the stub function is used in both
> > CONFIG_NET_CLS_ACT=n and CONFIG_NET_CLS_ACT=y + CONFIG_NET_TC_SKB_EXT=n
> > configurations.
> >
> > Move the call to tcf_exts_miss_cookie_base_destroy() in
> > tcf_exts_destroy() out of the '#ifdef CONFIG_NET_CLS_ACT', so that it
> > always appears used to the compiler, while not changing any behavior
> > with any of the various configuration combinations.
> >
> > Fixes: 80cd22c35c90 ("net/sched: cls_api: Support hardware miss to tc action")
> > Signed-off-by: Nathan Chancellor <[email protected]>
>
> Thanks Nathan,
>
> I think the #ifdefs in this file could do with some work.
Yes, it is definitely an eye sore. I thought about cleaning it up but it
felt like net-next material to me, plus I have no other interest in this
code other than making the warning in my builds go away, if I am being
honest :)
> But as a fix this looks good to me.
>
> Reviewed-by: Simon Horman <[email protected]>
Thanks for the quick review!
Cheers,
Nathan
On Sat, Feb 25, 2023 at 02:15:27PM -0700, Nathan Chancellor wrote:
> On Sat, Feb 25, 2023 at 05:08:17PM +0100, Simon Horman wrote:
> > On Fri, Feb 24, 2023 at 11:18:49AM -0700, Nathan Chancellor wrote:
> > > When CONFIG_NET_CLS_ACT is disabled:
> > >
> > > ../net/sched/cls_api.c:141:13: warning: 'tcf_exts_miss_cookie_base_destroy' defined but not used [-Wunused-function]
> > > 141 | static void tcf_exts_miss_cookie_base_destroy(struct tcf_exts *exts)
> > > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> > >
> > > Due to the way the code is structured, it is possible for a definition
> > > of tcf_exts_miss_cookie_base_destroy() to be present without actually
> > > being used. Its single callsite is in an '#ifdef CONFIG_NET_CLS_ACT'
> > > block but a definition will always be present in the file. The version
> > > of tcf_exts_miss_cookie_base_destroy() that actually does something
> > > depends on CONFIG_NET_TC_SKB_EXT, so the stub function is used in both
> > > CONFIG_NET_CLS_ACT=n and CONFIG_NET_CLS_ACT=y + CONFIG_NET_TC_SKB_EXT=n
> > > configurations.
> > >
> > > Move the call to tcf_exts_miss_cookie_base_destroy() in
> > > tcf_exts_destroy() out of the '#ifdef CONFIG_NET_CLS_ACT', so that it
> > > always appears used to the compiler, while not changing any behavior
> > > with any of the various configuration combinations.
> > >
> > > Fixes: 80cd22c35c90 ("net/sched: cls_api: Support hardware miss to tc action")
> > > Signed-off-by: Nathan Chancellor <[email protected]>
> >
> > Thanks Nathan,
> >
> > I think the #ifdefs in this file could do with some work.
>
> Yes, it is definitely an eye sore. I thought about cleaning it up but it
> felt like net-next material to me, plus I have no other interest in this
> code other than making the warning in my builds go away, if I am being
> honest :)
Yes, of course (x2) :)
> > But as a fix this looks good to me.
> >
> > Reviewed-by: Simon Horman <[email protected]>
>
> Thanks for the quick review!
>
> Cheers,
> Nathan
>
On Fri, 24 Feb 2023 11:18:49 -0700 Nathan Chancellor wrote:
> When CONFIG_NET_CLS_ACT is disabled:
>
> ../net/sched/cls_api.c:141:13: warning: 'tcf_exts_miss_cookie_base_destroy' defined but not used [-Wunused-function]
> 141 | static void tcf_exts_miss_cookie_base_destroy(struct tcf_exts *exts)
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>
> Due to the way the code is structured, it is possible for a definition
> of tcf_exts_miss_cookie_base_destroy() to be present without actually
> being used. Its single callsite is in an '#ifdef CONFIG_NET_CLS_ACT'
> block but a definition will always be present in the file. The version
> of tcf_exts_miss_cookie_base_destroy() that actually does something
> depends on CONFIG_NET_TC_SKB_EXT, so the stub function is used in both
> CONFIG_NET_CLS_ACT=n and CONFIG_NET_CLS_ACT=y + CONFIG_NET_TC_SKB_EXT=n
> configurations.
>
> Move the call to tcf_exts_miss_cookie_base_destroy() in
> tcf_exts_destroy() out of the '#ifdef CONFIG_NET_CLS_ACT', so that it
> always appears used to the compiler, while not changing any behavior
> with any of the various configuration combinations.
>
> Fixes: 80cd22c35c90 ("net/sched: cls_api: Support hardware miss to tc action")
> Signed-off-by: Nathan Chancellor <[email protected]>
Applied, thanks!