| Message ID | 1496277502-10642-1-git-send-email-liuhangbin@gmail.com |
|---|---|
| State | Superseded, archived |
| Delegated to: | David Miller |
| Headers | show |
Hi Hangbin,
[auto build test ERROR on ipsec/master]
[also build test ERROR on v4.12-rc3 next-20170531]
[cannot apply to ipsec-next/master]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/Hangbin-Liu/xfrm-fix-xfrm_dev_event-missing-when-compile-without-CONFIG_XFRM_OFFLOAD/20170601-112559
base: https://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git master
config: x86_64-randconfig-x014-201722 (attached as .config)
compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901
reproduce:
# save the attached .config to linux build tree
make ARCH=x86_64
All errors (new ones prefixed by >>):
>> net//xfrm/xfrm_device.c:207:17: error: redefinition of 'xfrm_dev_init'
void __net_init xfrm_dev_init(void)
^~~~~~~~~~~~~
In file included from net//xfrm/xfrm_device.c:22:0:
include/net/xfrm.h:1880:31: note: previous definition of 'xfrm_dev_init' was here
static inline void __net_init xfrm_dev_init(void)
^~~~~~~~~~~~~
vim +/xfrm_dev_init +207 net//xfrm/xfrm_device.c
d77e38e6 Steffen Klassert 2017-04-14 191 case NETDEV_UNREGISTER:
d77e38e6 Steffen Klassert 2017-04-14 192 return xfrm_dev_unregister(dev);
d77e38e6 Steffen Klassert 2017-04-14 193
d77e38e6 Steffen Klassert 2017-04-14 194 case NETDEV_FEAT_CHANGE:
d77e38e6 Steffen Klassert 2017-04-14 195 return xfrm_dev_feat_change(dev);
d77e38e6 Steffen Klassert 2017-04-14 196
21f42cc9 Steffen Klassert 2017-04-14 197 case NETDEV_DOWN:
d77e38e6 Steffen Klassert 2017-04-14 198 return xfrm_dev_down(dev);
21f42cc9 Steffen Klassert 2017-04-14 199 }
21f42cc9 Steffen Klassert 2017-04-14 200 return NOTIFY_DONE;
21f42cc9 Steffen Klassert 2017-04-14 201 }
21f42cc9 Steffen Klassert 2017-04-14 202
21f42cc9 Steffen Klassert 2017-04-14 203 static struct notifier_block xfrm_dev_notifier = {
21f42cc9 Steffen Klassert 2017-04-14 204 .notifier_call = xfrm_dev_event,
21f42cc9 Steffen Klassert 2017-04-14 205 };
21f42cc9 Steffen Klassert 2017-04-14 206
21f42cc9 Steffen Klassert 2017-04-14 @207 void __net_init xfrm_dev_init(void)
21f42cc9 Steffen Klassert 2017-04-14 208 {
21f42cc9 Steffen Klassert 2017-04-14 209 register_netdevice_notifier(&xfrm_dev_notifier);
21f42cc9 Steffen Klassert 2017-04-14 210 }
:::::: The code at line 207 was first introduced by commit
:::::: 21f42cc95f07c1d7827b339c04442e147411e44b xfrm: Move device notifications to a sepatate file
:::::: TO: Steffen Klassert <steffen.klassert@secunet.com>
:::::: CC: Steffen Klassert <steffen.klassert@secunet.com>
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
diff --git a/net/xfrm/Makefile b/net/xfrm/Makefile index abf81b3..55b2ac3 100644 --- a/net/xfrm/Makefile +++ b/net/xfrm/Makefile @@ -4,8 +4,7 @@ obj-$(CONFIG_XFRM) := xfrm_policy.o xfrm_state.o xfrm_hash.o \ xfrm_input.o xfrm_output.o \ - xfrm_sysctl.o xfrm_replay.o -obj-$(CONFIG_XFRM_OFFLOAD) += xfrm_device.o + xfrm_sysctl.o xfrm_replay.o xfrm_device.o obj-$(CONFIG_XFRM_STATISTICS) += xfrm_proc.o obj-$(CONFIG_XFRM_ALGO) += xfrm_algo.o obj-$(CONFIG_XFRM_USER) += xfrm_user.o diff --git a/net/xfrm/xfrm_device.c b/net/xfrm/xfrm_device.c index 574e6f3..5aba036 100644 --- a/net/xfrm/xfrm_device.c +++ b/net/xfrm/xfrm_device.c @@ -22,6 +22,7 @@ #include <net/xfrm.h> #include <linux/notifier.h> +#ifdef CONFIG_XFRM_OFFLOAD int validate_xmit_xfrm(struct sk_buff *skb, netdev_features_t features) { int err; @@ -137,6 +138,7 @@ bool xfrm_dev_offload_ok(struct sk_buff *skb, struct xfrm_state *x) return true; } EXPORT_SYMBOL_GPL(xfrm_dev_offload_ok); +#endif int xfrm_dev_register(struct net_device *dev) {
In commit d77e38e612a0 ("xfrm: Add an IPsec hardware offloading API") we make xfrm_device.o only compiled when enable option CONFIG_XFRM_OFFLOAD. But this will make xfrm_dev_event() missing if we only enable default XFRM options. So when we set down and unregister an interface with IPsec on it. there will no xfrm_garbage_collect(), which will cause dev usage count hold and get error like: unregister_netdevice: waiting for <dev> to become free. Usage count = 4 Fixes: d77e38e612a0 ("xfrm: Add an IPsec hardware offloading API") Signed-off-by: Hangbin Liu <liuhangbin@gmail.com> --- net/xfrm/Makefile | 3 +-- net/xfrm/xfrm_device.c | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-)