[ovs-dev] [PATCH 3/7] datapath: Use new header file net/ipv6_frag.h
From: Florian Westphal Upstream commit: commit 70b095c84326640eeacfd69a411db8fc36e8ab1a Author: Florian Westphal Date: Sat Jul 14 01:14:01 2018 +0200 ipv6: remove dependency of nf_defrag_ipv6 on ipv6 module IPV6=m DEFRAG_IPV6=m CONNTRACK=y yields: net/netfilter/nf_conntrack_proto.o: In function `nf_ct_netns_do_get': net/netfilter/nf_conntrack_proto.c:802: undefined reference to `nf_defrag_ipv6_enable' net/netfilter/nf_conntrack_proto.o:(.rodata+0x640): undefined reference to `nf_conntrack_l4proto_icmpv6' Setting DEFRAG_IPV6=y causes undefined references to ip6_rhash_params ip6_frag_init and ip6_expire_frag_queue so it would be needed to force IPV6=y too. This patch gets rid of the 'followup linker error' by removing the dependency of ipv6.ko symbols from netfilter ipv6 defrag. Shared code is placed into a header, then used from both. Signed-off-by: Florian Westphal Signed-off-by: Pablo Neira Ayuso This patch backports the above upstream patch to OVS. Cc: Florian Westphal Signed-off-by: Yifeng Sun Acked-by: Yi-Hung Wei --- acinclude.m4 | 2 ++ datapath/conntrack.c | 1 + datapath/linux/Modules.mk | 1 + datapath/linux/compat/include/net/ipv6_frag.h | 8 4 files changed, 12 insertions(+) create mode 100644 datapath/linux/compat/include/net/ipv6_frag.h diff --git a/acinclude.m4 b/acinclude.m4 index 372be5f4dccd..4f9aebc325ba 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -934,6 +934,8 @@ AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [ OVS_FIND_PARAM_IFELSE([$KSRC/include/net/netfilter/nf_conntrack_core.h], [nf_conntrack_in], [nf_hook_state], [OVS_DEFINE([HAVE_NF_CONNTRACK_IN_TAKES_NF_HOOK_STATE])]) + OVS_GREP_IFELSE([$KSRC/include/net/ipv6_frag.h], [IP6_DEFRAG_CONNTRACK_IN], + [OVS_DEFINE([HAVE_IPV6_FRAG_H])]) if cmp -s datapath/linux/kcompat.h.new \ datapath/linux/kcompat.h >/dev/null 2>&1; then diff --git a/datapath/conntrack.c b/datapath/conntrack.c index 8c1a80308d6a..52825a6b20fb 100644 --- a/datapath/conntrack.c +++ b/datapath/conntrack.c @@ -31,6 +31,7 @@ #include #include #include +#include #ifdef CONFIG_NF_NAT_NEEDED #include diff --git a/datapath/linux/Modules.mk b/datapath/linux/Modules.mk index ae63e3653b41..cbb29f1c69d0 100644 --- a/datapath/linux/Modules.mk +++ b/datapath/linux/Modules.mk @@ -86,6 +86,7 @@ openvswitch_headers += \ linux/compat/include/net/ip6_route.h \ linux/compat/include/net/ip6_tunnel.h \ linux/compat/include/net/ipv6.h \ + linux/compat/include/net/ipv6_frag.h \ linux/compat/include/net/mpls.h \ linux/compat/include/net/net_namespace.h \ linux/compat/include/net/netlink.h \ diff --git a/datapath/linux/compat/include/net/ipv6_frag.h b/datapath/linux/compat/include/net/ipv6_frag.h new file mode 100644 index ..5d1cc901bec1 --- /dev/null +++ b/datapath/linux/compat/include/net/ipv6_frag.h @@ -0,0 +1,8 @@ +#ifndef __NET_IPV6_FRAG_WRAPPER_H +#define __NET_IPV6_FRAG_WRAPPER_H + +#if IS_ENABLED(CONFIG_NF_DEFRAG_IPV6) && defined(HAVE_IPV6_FRAG_H) +#include_next +#endif + +#endif /* __NET_IPV6_FRAG_WRAPPER_H */ -- 2.7.4 ___ dev mailing list d...@openvswitch.org https://mail.openvswitch.org/mailman/listinfo/ovs-dev
Re: [ovs-dev] [PATCH 3/7] datapath: Use new header file net/ipv6_frag.h
Thank for the review, I will fix in next version. Yifeng On Wed, May 8, 2019 at 1:54 PM Yi-Hung Wei wrote: > > On Mon, May 6, 2019 at 2:58 PM Yifeng Sun wrote: > > > > From: Florian Westphal > > > > Upstream commit: > > commit 70b095c84326640eeacfd69a411db8fc36e8ab1a > > Author: Florian Westphal > > Date: Sat Jul 14 01:14:01 2018 +0200 > > > > ipv6: remove dependency of nf_defrag_ipv6 on ipv6 module > > > > IPV6=m > > DEFRAG_IPV6=m > > CONNTRACK=y yields: > > > > net/netfilter/nf_conntrack_proto.o: In function `nf_ct_netns_do_get': > > net/netfilter/nf_conntrack_proto.c:802: undefined reference to > > `nf_defrag_ipv6_enable' > > net/netfilter/nf_conntrack_proto.o:(.rodata+0x640): undefined reference > > to `nf_conntrack_l4proto_icmpv6' > > > > Setting DEFRAG_IPV6=y causes undefined references to ip6_rhash_params > > ip6_frag_init and ip6_expire_frag_queue so it would be needed to force > > IPV6=y too. > > > > This patch gets rid of the 'followup linker error' by removing > > the dependency of ipv6.ko symbols from netfilter ipv6 defrag. > > > > Shared code is placed into a header, then used from both. > > > > Signed-off-by: Florian Westphal > > Signed-off-by: Pablo Neira Ayuso > > > > This patch backports the above upstream patch to OVS. > > > > Cc: Florian Westphal > > Signed-off-by: Yifeng Sun > > --- > LGTM, given that we have the following in this patch or squash this > patch with the previous one. > > +++ b/datapath/linux/Modules.mk > + linux/compat/include/net/ipv6_frag.h \ > > Thanks, > > -Yi-Hung ___ dev mailing list d...@openvswitch.org https://mail.openvswitch.org/mailman/listinfo/ovs-dev
Re: [ovs-dev] [PATCH 3/7] datapath: Use new header file net/ipv6_frag.h
On Mon, May 6, 2019 at 2:58 PM Yifeng Sun wrote: > > From: Florian Westphal > > Upstream commit: > commit 70b095c84326640eeacfd69a411db8fc36e8ab1a > Author: Florian Westphal > Date: Sat Jul 14 01:14:01 2018 +0200 > > ipv6: remove dependency of nf_defrag_ipv6 on ipv6 module > > IPV6=m > DEFRAG_IPV6=m > CONNTRACK=y yields: > > net/netfilter/nf_conntrack_proto.o: In function `nf_ct_netns_do_get': > net/netfilter/nf_conntrack_proto.c:802: undefined reference to > `nf_defrag_ipv6_enable' > net/netfilter/nf_conntrack_proto.o:(.rodata+0x640): undefined reference > to `nf_conntrack_l4proto_icmpv6' > > Setting DEFRAG_IPV6=y causes undefined references to ip6_rhash_params > ip6_frag_init and ip6_expire_frag_queue so it would be needed to force > IPV6=y too. > > This patch gets rid of the 'followup linker error' by removing > the dependency of ipv6.ko symbols from netfilter ipv6 defrag. > > Shared code is placed into a header, then used from both. > > Signed-off-by: Florian Westphal > Signed-off-by: Pablo Neira Ayuso > > This patch backports the above upstream patch to OVS. > > Cc: Florian Westphal > Signed-off-by: Yifeng Sun > --- LGTM, given that we have the following in this patch or squash this patch with the previous one. +++ b/datapath/linux/Modules.mk + linux/compat/include/net/ipv6_frag.h \ Thanks, -Yi-Hung ___ dev mailing list d...@openvswitch.org https://mail.openvswitch.org/mailman/listinfo/ovs-dev
[ovs-dev] [PATCH 3/7] datapath: Use new header file net/ipv6_frag.h
From: Florian Westphal Upstream commit: commit 70b095c84326640eeacfd69a411db8fc36e8ab1a Author: Florian Westphal Date: Sat Jul 14 01:14:01 2018 +0200 ipv6: remove dependency of nf_defrag_ipv6 on ipv6 module IPV6=m DEFRAG_IPV6=m CONNTRACK=y yields: net/netfilter/nf_conntrack_proto.o: In function `nf_ct_netns_do_get': net/netfilter/nf_conntrack_proto.c:802: undefined reference to `nf_defrag_ipv6_enable' net/netfilter/nf_conntrack_proto.o:(.rodata+0x640): undefined reference to `nf_conntrack_l4proto_icmpv6' Setting DEFRAG_IPV6=y causes undefined references to ip6_rhash_params ip6_frag_init and ip6_expire_frag_queue so it would be needed to force IPV6=y too. This patch gets rid of the 'followup linker error' by removing the dependency of ipv6.ko symbols from netfilter ipv6 defrag. Shared code is placed into a header, then used from both. Signed-off-by: Florian Westphal Signed-off-by: Pablo Neira Ayuso This patch backports the above upstream patch to OVS. Cc: Florian Westphal Signed-off-by: Yifeng Sun --- acinclude.m4 | 2 ++ datapath/conntrack.c | 1 + datapath/linux/compat/include/net/ipv6_frag.h | 8 3 files changed, 11 insertions(+) create mode 100644 datapath/linux/compat/include/net/ipv6_frag.h diff --git a/acinclude.m4 b/acinclude.m4 index 372be5f4dccd..4f9aebc325ba 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -934,6 +934,8 @@ AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [ OVS_FIND_PARAM_IFELSE([$KSRC/include/net/netfilter/nf_conntrack_core.h], [nf_conntrack_in], [nf_hook_state], [OVS_DEFINE([HAVE_NF_CONNTRACK_IN_TAKES_NF_HOOK_STATE])]) + OVS_GREP_IFELSE([$KSRC/include/net/ipv6_frag.h], [IP6_DEFRAG_CONNTRACK_IN], + [OVS_DEFINE([HAVE_IPV6_FRAG_H])]) if cmp -s datapath/linux/kcompat.h.new \ datapath/linux/kcompat.h >/dev/null 2>&1; then diff --git a/datapath/conntrack.c b/datapath/conntrack.c index 8c1a80308d6a..52825a6b20fb 100644 --- a/datapath/conntrack.c +++ b/datapath/conntrack.c @@ -31,6 +31,7 @@ #include #include #include +#include #ifdef CONFIG_NF_NAT_NEEDED #include diff --git a/datapath/linux/compat/include/net/ipv6_frag.h b/datapath/linux/compat/include/net/ipv6_frag.h new file mode 100644 index ..5d1cc901bec1 --- /dev/null +++ b/datapath/linux/compat/include/net/ipv6_frag.h @@ -0,0 +1,8 @@ +#ifndef __NET_IPV6_FRAG_WRAPPER_H +#define __NET_IPV6_FRAG_WRAPPER_H + +#if IS_ENABLED(CONFIG_NF_DEFRAG_IPV6) && defined(HAVE_IPV6_FRAG_H) +#include_next +#endif + +#endif /* __NET_IPV6_FRAG_WRAPPER_H */ -- 2.7.4 ___ dev mailing list d...@openvswitch.org https://mail.openvswitch.org/mailman/listinfo/ovs-dev