| Message ID | 20230425134729.835686-1-bodong@nvidia.com |
|---|---|
| State | New |
| Headers | show |
| Series | [SRU,J:linux-bluefield,v1] UBUNTU: [Config] bluefield: Enable CONFIG_NF_CONNTRACK as build-in | expand |
On 4/25/23 7:47 AM, Bodong Wang wrote: > BugLink: https://bugs.launchpad.net/bugs/2017600 > > CONFIG_NF_DEFRAG_IPV4 and CONFIG_NF_DEFRAG_IPV6 are selected as > build-in along with CONFIG_NF_CONNTRACK. > > Also configure the annotations accordingly. > > Change-Id: Ic0f5f30bf63c0a01e5426b26d2cf835c6d6a5758 > Signed-off-by: Bodong Wang <bodong@nvidia.com> > --- > debian.bluefield/config/config.common.ubuntu | 6 +++--- > debian.master/config/annotations | 2 +- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/debian.bluefield/config/config.common.ubuntu b/debian.bluefield/config/config.common.ubuntu > index f5f7959cdf74..04a83149cd7b 100644 > --- a/debian.bluefield/config/config.common.ubuntu > +++ b/debian.bluefield/config/config.common.ubuntu > @@ -6138,7 +6138,7 @@ CONFIG_NFT_SYNPROXY=m > CONFIG_NFT_TPROXY=m > CONFIG_NFT_TUNNEL=m > CONFIG_NFT_XFRM=m > -CONFIG_NF_CONNTRACK=m > +CONFIG_NF_CONNTRACK=y > CONFIG_NF_CONNTRACK_AMANDA=m > CONFIG_NF_CONNTRACK_BRIDGE=m > CONFIG_NF_CONNTRACK_BROADCAST=m > @@ -6166,8 +6166,8 @@ CONFIG_NF_CT_PROTO_DCCP=y > CONFIG_NF_CT_PROTO_GRE=y > CONFIG_NF_CT_PROTO_SCTP=y > CONFIG_NF_CT_PROTO_UDPLITE=y > -CONFIG_NF_DEFRAG_IPV4=m > -CONFIG_NF_DEFRAG_IPV6=m > +CONFIG_NF_DEFRAG_IPV4=y > +CONFIG_NF_DEFRAG_IPV6=y > CONFIG_NF_DUP_IPV4=m > CONFIG_NF_DUP_IPV6=m > CONFIG_NF_DUP_NETDEV=m > diff --git a/debian.master/config/annotations b/debian.master/config/annotations > index a531e19a9288..e842429a9dec 100644 > --- a/debian.master/config/annotations > +++ b/debian.master/config/annotations > @@ -12674,7 +12674,7 @@ CONFIG_NETFILTER_XT_MATCH_TIME policy<{'amd64': 'm', 'arm64': ' > CONFIG_NETFILTER_XT_MATCH_U32 policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 's390x': 'm'}> > > # Menu: Networking support >> Networking options >> Network packet filtering framework (Netfilter) >> Core Netfilter Configuration >> Netfilter connection tracking support > -CONFIG_NF_CONNTRACK policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 's390x': 'm'}> > +CONFIG_NF_CONNTRACK policy<{'amd64': 'm', 'arm64': 'y', 'armhf': 'm', 'ppc64el': 'm', 's390x': 'm'}> > CONFIG_NF_CONNTRACK_MARK policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'y'}> > CONFIG_NF_CONNTRACK_SECMARK policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'y'}> > CONFIG_NF_CONNTRACK_ZONES policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'y'}> Acked-by: Tim Gardner <tim.gardner@canonical.com> We generally add a note to any annotation changes: CONFIG_NF_CONNTRACK note<LP: #2017600>
On 23/04/25 09:06AM, Tim Gardner wrote: > On 4/25/23 7:47 AM, Bodong Wang wrote: > > BugLink: https://bugs.launchpad.net/bugs/2017600 > > > > CONFIG_NF_DEFRAG_IPV4 and CONFIG_NF_DEFRAG_IPV6 are selected as > > build-in along with CONFIG_NF_CONNTRACK. > > > > Also configure the annotations accordingly. > > > > Change-Id: Ic0f5f30bf63c0a01e5426b26d2cf835c6d6a5758 > > Signed-off-by: Bodong Wang <bodong@nvidia.com> > > --- > > debian.bluefield/config/config.common.ubuntu | 6 +++--- > > debian.master/config/annotations | 2 +- > > 2 files changed, 4 insertions(+), 4 deletions(-) > > > > diff --git a/debian.bluefield/config/config.common.ubuntu b/debian.bluefield/config/config.common.ubuntu > > index f5f7959cdf74..04a83149cd7b 100644 > > --- a/debian.bluefield/config/config.common.ubuntu > > +++ b/debian.bluefield/config/config.common.ubuntu > > @@ -6138,7 +6138,7 @@ CONFIG_NFT_SYNPROXY=m > > CONFIG_NFT_TPROXY=m > > CONFIG_NFT_TUNNEL=m > > CONFIG_NFT_XFRM=m > > -CONFIG_NF_CONNTRACK=m > > +CONFIG_NF_CONNTRACK=y > > CONFIG_NF_CONNTRACK_AMANDA=m > > CONFIG_NF_CONNTRACK_BRIDGE=m > > CONFIG_NF_CONNTRACK_BROADCAST=m > > @@ -6166,8 +6166,8 @@ CONFIG_NF_CT_PROTO_DCCP=y > > CONFIG_NF_CT_PROTO_GRE=y > > CONFIG_NF_CT_PROTO_SCTP=y > > CONFIG_NF_CT_PROTO_UDPLITE=y > > -CONFIG_NF_DEFRAG_IPV4=m > > -CONFIG_NF_DEFRAG_IPV6=m > > +CONFIG_NF_DEFRAG_IPV4=y > > +CONFIG_NF_DEFRAG_IPV6=y > > CONFIG_NF_DUP_IPV4=m > > CONFIG_NF_DUP_IPV6=m > > CONFIG_NF_DUP_NETDEV=m > > diff --git a/debian.master/config/annotations b/debian.master/config/annotations > > index a531e19a9288..e842429a9dec 100644 > > --- a/debian.master/config/annotations > > +++ b/debian.master/config/annotations > > @@ -12674,7 +12674,7 @@ CONFIG_NETFILTER_XT_MATCH_TIME policy<{'amd64': 'm', 'arm64': ' > > CONFIG_NETFILTER_XT_MATCH_U32 policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 's390x': 'm'}> > > # Menu: Networking support >> Networking options >> Network packet filtering framework (Netfilter) >> Core Netfilter Configuration >> Netfilter connection tracking support > > -CONFIG_NF_CONNTRACK policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 's390x': 'm'}> > > +CONFIG_NF_CONNTRACK policy<{'amd64': 'm', 'arm64': 'y', 'armhf': 'm', 'ppc64el': 'm', 's390x': 'm'}> > > CONFIG_NF_CONNTRACK_MARK policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'y'}> > > CONFIG_NF_CONNTRACK_SECMARK policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'y'}> > > CONFIG_NF_CONNTRACK_ZONES policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'y'}> > Acked-by: Tim Gardner <tim.gardner@canonical.com> > > We generally add a note to any annotation changes: > > CONFIG_NF_CONNTRACK note<LP: #2017600> The above would be nice. Acked-by: Andrei Gherzan <andrei.gherzan@canonical.com>
On 23/04/25 09:06AM, Tim Gardner wrote: > On 4/25/23 7:47 AM, Bodong Wang wrote: > > BugLink: https://bugs.launchpad.net/bugs/2017600 > > > > CONFIG_NF_DEFRAG_IPV4 and CONFIG_NF_DEFRAG_IPV6 are selected as > > build-in along with CONFIG_NF_CONNTRACK. > > > > Also configure the annotations accordingly. > > > > Change-Id: Ic0f5f30bf63c0a01e5426b26d2cf835c6d6a5758 > > Signed-off-by: Bodong Wang <bodong@nvidia.com> > Acked-by: Tim Gardner <tim.gardner@canonical.com> > > We generally add a note to any annotation changes: > > CONFIG_NF_CONNTRACK note<LP: #2017600> The above would be nice. Acked-by: Andrei Gherzan <andrei.gherzan@canonical.com> -------- Could you send me an example or this is new? I can't find such message from the git log of debian.master/config/annotations
On 23/04/25 09:30PM, Bodong Wang wrote: > > On 23/04/25 09:06AM, Tim Gardner wrote: > > On 4/25/23 7:47 AM, Bodong Wang wrote: > > > BugLink: https://bugs.launchpad.net/bugs/2017600 > > > > > > CONFIG_NF_DEFRAG_IPV4 and CONFIG_NF_DEFRAG_IPV6 are selected as > > > build-in along with CONFIG_NF_CONNTRACK. > > > > > > Also configure the annotations accordingly. > > > > > > Change-Id: Ic0f5f30bf63c0a01e5426b26d2cf835c6d6a5758 > > > Signed-off-by: Bodong Wang <bodong@nvidia.com> > > Acked-by: Tim Gardner <tim.gardner@canonical.com> > > > > We generally add a note to any annotation changes: > > > > CONFIG_NF_CONNTRACK note<LP: #2017600> > > The above would be nice. > > Acked-by: Andrei Gherzan <andrei.gherzan@canonical.com> > > -------- > > Could you send me an example or this is new? I can't find such message from the git log of debian.master/config/annotations Sure. Here is an example: CONFIG_SERIAL_DEV_CTRL_TTYPORT note<LP:1739939> The format you see in the existing notes might not be consistent so I'd recommend using what Tim suggested above: CONFIG_NF_CONNTRACK note<LP: #2017600> I hope this helps,
On 25.04.23 15:47, Bodong Wang wrote: > BugLink: https://bugs.launchpad.net/bugs/2017600 > > CONFIG_NF_DEFRAG_IPV4 and CONFIG_NF_DEFRAG_IPV6 are selected as > build-in along with CONFIG_NF_CONNTRACK. > > Also configure the annotations accordingly. > > Change-Id: Ic0f5f30bf63c0a01e5426b26d2cf835c6d6a5758 > Signed-off-by: Bodong Wang <bodong@nvidia.com> > --- > debian.bluefield/config/config.common.ubuntu | 6 +++--- > debian.master/config/annotations | 2 +- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/debian.bluefield/config/config.common.ubuntu b/debian.bluefield/config/config.common.ubuntu > index f5f7959cdf74..04a83149cd7b 100644 > --- a/debian.bluefield/config/config.common.ubuntu > +++ b/debian.bluefield/config/config.common.ubuntu > @@ -6138,7 +6138,7 @@ CONFIG_NFT_SYNPROXY=m > CONFIG_NFT_TPROXY=m > CONFIG_NFT_TUNNEL=m > CONFIG_NFT_XFRM=m > -CONFIG_NF_CONNTRACK=m > +CONFIG_NF_CONNTRACK=y > CONFIG_NF_CONNTRACK_AMANDA=m > CONFIG_NF_CONNTRACK_BRIDGE=m > CONFIG_NF_CONNTRACK_BROADCAST=m > @@ -6166,8 +6166,8 @@ CONFIG_NF_CT_PROTO_DCCP=y > CONFIG_NF_CT_PROTO_GRE=y > CONFIG_NF_CT_PROTO_SCTP=y > CONFIG_NF_CT_PROTO_UDPLITE=y > -CONFIG_NF_DEFRAG_IPV4=m > -CONFIG_NF_DEFRAG_IPV6=m > +CONFIG_NF_DEFRAG_IPV4=y > +CONFIG_NF_DEFRAG_IPV6=y > CONFIG_NF_DUP_IPV4=m > CONFIG_NF_DUP_IPV6=m > CONFIG_NF_DUP_NETDEV=m > diff --git a/debian.master/config/annotations b/debian.master/config/annotations > index a531e19a9288..e842429a9dec 100644 > --- a/debian.master/config/annotations > +++ b/debian.master/config/annotations > @@ -12674,7 +12674,7 @@ CONFIG_NETFILTER_XT_MATCH_TIME policy<{'amd64': 'm', 'arm64': ' > CONFIG_NETFILTER_XT_MATCH_U32 policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 's390x': 'm'}> > > # Menu: Networking support >> Networking options >> Network packet filtering framework (Netfilter) >> Core Netfilter Configuration >> Netfilter connection tracking support > -CONFIG_NF_CONNTRACK policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 's390x': 'm'}> > +CONFIG_NF_CONNTRACK policy<{'amd64': 'm', 'arm64': 'y', 'armhf': 'm', 'ppc64el': 'm', 's390x': 'm'}> > CONFIG_NF_CONNTRACK_MARK policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'y'}> > CONFIG_NF_CONNTRACK_SECMARK policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'y'}> > CONFIG_NF_CONNTRACK_ZONES policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'y'}> Rejected for the following reasons: - v2 submission on mailing list -Stefan
diff --git a/debian.bluefield/config/config.common.ubuntu b/debian.bluefield/config/config.common.ubuntu index f5f7959cdf74..04a83149cd7b 100644 --- a/debian.bluefield/config/config.common.ubuntu +++ b/debian.bluefield/config/config.common.ubuntu @@ -6138,7 +6138,7 @@ CONFIG_NFT_SYNPROXY=m CONFIG_NFT_TPROXY=m CONFIG_NFT_TUNNEL=m CONFIG_NFT_XFRM=m -CONFIG_NF_CONNTRACK=m +CONFIG_NF_CONNTRACK=y CONFIG_NF_CONNTRACK_AMANDA=m CONFIG_NF_CONNTRACK_BRIDGE=m CONFIG_NF_CONNTRACK_BROADCAST=m @@ -6166,8 +6166,8 @@ CONFIG_NF_CT_PROTO_DCCP=y CONFIG_NF_CT_PROTO_GRE=y CONFIG_NF_CT_PROTO_SCTP=y CONFIG_NF_CT_PROTO_UDPLITE=y -CONFIG_NF_DEFRAG_IPV4=m -CONFIG_NF_DEFRAG_IPV6=m +CONFIG_NF_DEFRAG_IPV4=y +CONFIG_NF_DEFRAG_IPV6=y CONFIG_NF_DUP_IPV4=m CONFIG_NF_DUP_IPV6=m CONFIG_NF_DUP_NETDEV=m diff --git a/debian.master/config/annotations b/debian.master/config/annotations index a531e19a9288..e842429a9dec 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -12674,7 +12674,7 @@ CONFIG_NETFILTER_XT_MATCH_TIME policy<{'amd64': 'm', 'arm64': ' CONFIG_NETFILTER_XT_MATCH_U32 policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 's390x': 'm'}> # Menu: Networking support >> Networking options >> Network packet filtering framework (Netfilter) >> Core Netfilter Configuration >> Netfilter connection tracking support -CONFIG_NF_CONNTRACK policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 's390x': 'm'}> +CONFIG_NF_CONNTRACK policy<{'amd64': 'm', 'arm64': 'y', 'armhf': 'm', 'ppc64el': 'm', 's390x': 'm'}> CONFIG_NF_CONNTRACK_MARK policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'y'}> CONFIG_NF_CONNTRACK_SECMARK policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'y'}> CONFIG_NF_CONNTRACK_ZONES policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'y'}>
BugLink: https://bugs.launchpad.net/bugs/2017600 CONFIG_NF_DEFRAG_IPV4 and CONFIG_NF_DEFRAG_IPV6 are selected as build-in along with CONFIG_NF_CONNTRACK. Also configure the annotations accordingly. Change-Id: Ic0f5f30bf63c0a01e5426b26d2cf835c6d6a5758 Signed-off-by: Bodong Wang <bodong@nvidia.com> --- debian.bluefield/config/config.common.ubuntu | 6 +++--- debian.master/config/annotations | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)