On Tue, Dec 6, 2022 at 10:32 PM Xin Long <[email protected]> wrote: > > On Tue, Dec 6, 2022 at 6:54 PM Pablo Neira Ayuso <[email protected]> wrote: > > > > On Tue, Dec 06, 2022 at 06:31:16PM -0500, Xin Long wrote: > > [...] > > > diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile > > > index 1d4db1943936..0976d34b1e5f 100644 > > > --- a/net/netfilter/Makefile > > > +++ b/net/netfilter/Makefile > > > @@ -54,6 +54,12 @@ obj-$(CONFIG_NF_CONNTRACK_TFTP) += nf_conntrack_tftp.o > > > > > > nf_nat-y := nf_nat_core.o nf_nat_proto.o nf_nat_helper.o > > > > > > +ifdef CONFIG_OPENVSWITCH > > > +nf_nat-y += nf_nat_ovs.o > > > +else ifdef CONFIG_NET_ACT_CT > > > +nf_nat-y += nf_nat_ovs.o > > > +endif > > > > Maybe add CONFIG_NF_NAT_OVS and select it from OPENVSWITCH Kconfig > > (select is a hammer, but it should be fine in this case since > > OPENVSWITCH already depends on NF_NAT?). > not really completely depends, it's: > > depends on (!NF_NAT || NF_NAT) > > but it's fine, the select will be: > > select NF_NAT_OVS if NF_NAT > > > > > Then in Makefile: > > > > nf_nat-$(CONFIG_NF_NAT_OVS) += nf_nat_ovs.o > > > > And CONFIG_NF_NAT_OVS depends on OPENVSWITCH. > Sounds great! > Then it will be: > > --- a/net/netfilter/Kconfig > +++ b/net/netfilter/Kconfig > @@ -459,6 +459,10 @@ config NF_NAT_REDIRECT > config NF_NAT_MASQUERADE > bool > > +config NF_NAT_OVS > + bool > + depends on OPENVSWITCH || NET_ACT_CT > + Just FYI, "depends on" is not necessary in this case. Even without this "depends on OPENVSWITCH || NET_ACT_CT", it will still be disabled automatically if OPENVSWITCH and NET_ACT_CT are disabled, and you can't enable it manually either.
Thanks. > > --- a/net/netfilter/Makefile > +++ b/net/netfilter/Makefile > @@ -59,6 +59,7 @@ obj-$(CONFIG_NF_LOG_SYSLOG) += nf_log_syslog.o > obj-$(CONFIG_NF_NAT) += nf_nat.o > nf_nat-$(CONFIG_NF_NAT_REDIRECT) += nf_nat_redirect.o > nf_nat-$(CONFIG_NF_NAT_MASQUERADE) += nf_nat_masquerade.o > +nf_nat-$(CONFIG_NF_NAT_OVS) += nf_nat_ovs.o > > --- a/net/openvswitch/Kconfig > +++ b/net/openvswitch/Kconfig > @@ -15,6 +15,7 @@ config OPENVSWITCH > select NET_MPLS_GSO > select DST_CACHE > select NET_NSH > + select NF_NAT_OVS if NF_NAT > > --- a/net/sched/Kconfig > +++ b/net/sched/Kconfig > @@ -977,6 +977,7 @@ config NET_ACT_TUNNEL_KEY > config NET_ACT_CT > tristate "connection tracking tc action" > depends on NET_CLS_ACT && NF_CONNTRACK && (!NF_NAT || NF_NAT) > && NF_FLOW_TABLE > + select NF_NAT_OVS if NF_NAT > > > I will prepare v4, Thanks. _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
