Skip to content

Commit dab5019

Browse files
q2venNipaLocal
authored and
NipaLocal
committed
rtnetlink: Make per-netns RTNL dereference helpers to macro.
When CONFIG_DEBUG_NET_SMALL_RTNL is off, rtnl_net_dereference() is the static inline wrapper of rtnl_dereference() returning a plain (void *) pointer to make sure net is always evaluated as requested in [0]. But, it makes sparse complain [1] when the pointer has __rcu annotation: net/ipv4/devinet.c:674:47: sparse: warning: incorrect type in argument 2 (different address spaces) net/ipv4/devinet.c:674:47: sparse: expected void *p net/ipv4/devinet.c:674:47: sparse: got struct in_ifaddr [noderef] __rcu * Also, if we evaluate net as (void *) in a macro, then the compiler in turn fails to build due to -Werror=unused-value. #define rtnl_net_dereference(net, p) \ ({ \ (void *)net; \ rtnl_dereference(p); \ }) net/ipv4/devinet.c: In function ‘inet_rtm_deladdr’: ./include/linux/rtnetlink.h:154:17: error: statement with no effect [-Werror=unused-value] 154 | (void *)net; \ net/ipv4/devinet.c:674:21: note: in expansion of macro ‘rtnl_net_dereference’ 674 | (ifa = rtnl_net_dereference(net, *ifap)) != NULL; | ^~~~~~~~~~~~~~~~~~~~ Let's go back to the original simplest macro. Note that checkpatch complains about this approach, but it's one-shot and less noisy than the other two. WARNING: Argument 'net' is not used in function-like macro kernel-patches#76: FILE: include/linux/rtnetlink.h:142: +#define rtnl_net_dereference(net, p) \ + rtnl_dereference(p) Fixes: 844e5e7 ("rtnetlink: Add assertion helpers for per-netns RTNL.") Link: https://lore.kernel.org/netdev/[email protected]/ [0] Reported-by: kernel test robot <[email protected]> Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/ [1] Signed-off-by: Kuniyuki Iwashima <[email protected]> Reviewed-by: Simon Horman <[email protected]> Signed-off-by: NipaLocal <nipa@local>
1 parent 1a9ca78 commit dab5019

File tree

1 file changed

+6
-15
lines changed

1 file changed

+6
-15
lines changed

include/linux/rtnetlink.h

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -137,21 +137,12 @@ static inline void ASSERT_RTNL_NET(struct net *net)
137137
ASSERT_RTNL();
138138
}
139139

140-
static inline void *rcu_dereference_rtnl_net(struct net *net, void *p)
141-
{
142-
return rcu_dereference_rtnl(p);
143-
}
144-
145-
static inline void *rtnl_net_dereference(struct net *net, void *p)
146-
{
147-
return rtnl_dereference(p);
148-
}
149-
150-
static inline void *rcu_replace_pointer_rtnl_net(struct net *net,
151-
void *rp, void *p)
152-
{
153-
return rcu_replace_pointer_rtnl(rp, p);
154-
}
140+
#define rcu_dereference_rtnl_net(net, p) \
141+
rcu_dereference_rtnl(p)
142+
#define rtnl_net_dereference(net, p) \
143+
rtnl_dereference(p)
144+
#define rcu_replace_pointer_rtnl_net(net, rp, p) \
145+
rcu_replace_pointer_rtnl(rp, p)
155146
#endif
156147

157148
static inline struct netdev_queue *dev_ingress_queue(struct net_device *dev)

0 commit comments

Comments
 (0)