| Message ID | dcadf7c144207017104657f85d512889a2d1a09e.1738778580.git.leon@kernel.org (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | Support PTMU in tunnel mode for packet offload | expand |
On Wed, Feb 05, 2025 at 08:20:21PM +0200, Leon Romanovsky wrote: > From: Leon Romanovsky <leonro@nvidia.com> > > SA replay mode is initialized differently for user-space and > kernel-space users, but the call to xfrm_init_replay() existed in > common path with boolean protection. That caused to situation where > we have two different function orders. > > So let's rewrite the SA initialization flow to have same order for > both in-kernel and user-space callers. > > Signed-off-by: Leon Romanovsky <leonro@nvidia.com> > --- > include/net/xfrm.h | 3 +-- > net/xfrm/xfrm_state.c | 22 ++++++++++------------ > net/xfrm/xfrm_user.c | 2 +- > 3 files changed, 12 insertions(+), 15 deletions(-) > > diff --git a/include/net/xfrm.h b/include/net/xfrm.h > index 28355a5be5b9..58f8f7661ec4 100644 > --- a/include/net/xfrm.h > +++ b/include/net/xfrm.h > @@ -1770,8 +1770,7 @@ void xfrm_spd_getinfo(struct net *net, struct xfrmk_spdinfo *si); > u32 xfrm_replay_seqhi(struct xfrm_state *x, __be32 net_seq); > int xfrm_init_replay(struct xfrm_state *x, struct netlink_ext_ack *extack); > u32 xfrm_state_mtu(struct xfrm_state *x, int mtu); > -int __xfrm_init_state(struct xfrm_state *x, bool init_replay, > - struct netlink_ext_ack *extack); > +int __xfrm_init_state(struct xfrm_state *x, struct netlink_ext_ack *extack); > int xfrm_init_state(struct xfrm_state *x); > int xfrm_input(struct sk_buff *skb, int nexthdr, __be32 spi, int encap_type); > int xfrm_input_resume(struct sk_buff *skb, int nexthdr); > diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c > index 568fe8df7741..42799b0946a3 100644 > --- a/net/xfrm/xfrm_state.c > +++ b/net/xfrm/xfrm_state.c > @@ -3120,8 +3120,7 @@ u32 xfrm_state_mtu(struct xfrm_state *x, int mtu) > } > EXPORT_SYMBOL_GPL(xfrm_state_mtu); > > -int __xfrm_init_state(struct xfrm_state *x, bool init_replay, > - struct netlink_ext_ack *extack) > +int __xfrm_init_state(struct xfrm_state *x, struct netlink_ext_ack *extack) The whole point of having __xfrm_init_state was to sepatate codepaths that need init_replay and those who don't need it. That was a bandaid for something, unfortunately I don't remenber for what. If we don't need that anymore, maybe we can merge __xfrm_init_state into xfrm_init_state, as it was before. The rest of the patchset looks OK to me.
On Wed, Feb 12, 2025 at 12:56:48PM +0100, Steffen Klassert wrote: > On Wed, Feb 05, 2025 at 08:20:21PM +0200, Leon Romanovsky wrote: > > From: Leon Romanovsky <leonro@nvidia.com> > > > > SA replay mode is initialized differently for user-space and > > kernel-space users, but the call to xfrm_init_replay() existed in > > common path with boolean protection. That caused to situation where > > we have two different function orders. > > > > So let's rewrite the SA initialization flow to have same order for > > both in-kernel and user-space callers. > > > > Signed-off-by: Leon Romanovsky <leonro@nvidia.com> > > --- > > include/net/xfrm.h | 3 +-- > > net/xfrm/xfrm_state.c | 22 ++++++++++------------ > > net/xfrm/xfrm_user.c | 2 +- > > 3 files changed, 12 insertions(+), 15 deletions(-) > > > > diff --git a/include/net/xfrm.h b/include/net/xfrm.h > > index 28355a5be5b9..58f8f7661ec4 100644 > > --- a/include/net/xfrm.h > > +++ b/include/net/xfrm.h > > @@ -1770,8 +1770,7 @@ void xfrm_spd_getinfo(struct net *net, struct xfrmk_spdinfo *si); > > u32 xfrm_replay_seqhi(struct xfrm_state *x, __be32 net_seq); > > int xfrm_init_replay(struct xfrm_state *x, struct netlink_ext_ack *extack); > > u32 xfrm_state_mtu(struct xfrm_state *x, int mtu); > > -int __xfrm_init_state(struct xfrm_state *x, bool init_replay, > > - struct netlink_ext_ack *extack); > > +int __xfrm_init_state(struct xfrm_state *x, struct netlink_ext_ack *extack); > > int xfrm_init_state(struct xfrm_state *x); > > int xfrm_input(struct sk_buff *skb, int nexthdr, __be32 spi, int encap_type); > > int xfrm_input_resume(struct sk_buff *skb, int nexthdr); > > diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c > > index 568fe8df7741..42799b0946a3 100644 > > --- a/net/xfrm/xfrm_state.c > > +++ b/net/xfrm/xfrm_state.c > > @@ -3120,8 +3120,7 @@ u32 xfrm_state_mtu(struct xfrm_state *x, int mtu) > > } > > EXPORT_SYMBOL_GPL(xfrm_state_mtu); > > > > -int __xfrm_init_state(struct xfrm_state *x, bool init_replay, > > - struct netlink_ext_ack *extack) > > +int __xfrm_init_state(struct xfrm_state *x, struct netlink_ext_ack *extack) > > The whole point of having __xfrm_init_state was to > sepatate codepaths that need init_replay and those > who don't need it. That was a bandaid for something, > unfortunately I don't remenber for what. > > If we don't need that anymore, maybe we can merge > __xfrm_init_state into xfrm_init_state, as it was > before. Main difference between __xfrm_init_state and xfrm_init_state is that latter is called without extack, which doesn't exist in kernel path. E.g xfrm_init_state(struct xfrm_state *x) vs. __xfrm_init_state(struct xfrm_state *x, struct netlink_ext_ack *extack). So if we merge them, we will need to change all xfrm_init_state() callers to provide extack == NULL. IMHO, such churn of changing xfrm_init_state() callers is not worth it for now. Thanks > > The rest of the patchset looks OK to me.
On Wed, Feb 12, 2025 at 08:30:20PM +0200, Leon Romanovsky wrote: > On Wed, Feb 12, 2025 at 12:56:48PM +0100, Steffen Klassert wrote: > > On Wed, Feb 05, 2025 at 08:20:21PM +0200, Leon Romanovsky wrote: > > > From: Leon Romanovsky <leonro@nvidia.com> > > > > > > SA replay mode is initialized differently for user-space and > > > kernel-space users, but the call to xfrm_init_replay() existed in > > > common path with boolean protection. That caused to situation where > > > we have two different function orders. > > > > > > So let's rewrite the SA initialization flow to have same order for > > > both in-kernel and user-space callers. > > > > > > Signed-off-by: Leon Romanovsky <leonro@nvidia.com> > > > --- > > > include/net/xfrm.h | 3 +-- > > > net/xfrm/xfrm_state.c | 22 ++++++++++------------ > > > net/xfrm/xfrm_user.c | 2 +- > > > 3 files changed, 12 insertions(+), 15 deletions(-) > > > > > > diff --git a/include/net/xfrm.h b/include/net/xfrm.h > > > index 28355a5be5b9..58f8f7661ec4 100644 > > > --- a/include/net/xfrm.h > > > +++ b/include/net/xfrm.h > > > @@ -1770,8 +1770,7 @@ void xfrm_spd_getinfo(struct net *net, struct xfrmk_spdinfo *si); > > > u32 xfrm_replay_seqhi(struct xfrm_state *x, __be32 net_seq); > > > int xfrm_init_replay(struct xfrm_state *x, struct netlink_ext_ack *extack); > > > u32 xfrm_state_mtu(struct xfrm_state *x, int mtu); > > > -int __xfrm_init_state(struct xfrm_state *x, bool init_replay, > > > - struct netlink_ext_ack *extack); > > > +int __xfrm_init_state(struct xfrm_state *x, struct netlink_ext_ack *extack); > > > int xfrm_init_state(struct xfrm_state *x); > > > int xfrm_input(struct sk_buff *skb, int nexthdr, __be32 spi, int encap_type); > > > int xfrm_input_resume(struct sk_buff *skb, int nexthdr); > > > diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c > > > index 568fe8df7741..42799b0946a3 100644 > > > --- a/net/xfrm/xfrm_state.c > > > +++ b/net/xfrm/xfrm_state.c > > > @@ -3120,8 +3120,7 @@ u32 xfrm_state_mtu(struct xfrm_state *x, int mtu) > > > } > > > EXPORT_SYMBOL_GPL(xfrm_state_mtu); > > > > > > -int __xfrm_init_state(struct xfrm_state *x, bool init_replay, > > > - struct netlink_ext_ack *extack) > > > +int __xfrm_init_state(struct xfrm_state *x, struct netlink_ext_ack *extack) > > > > The whole point of having __xfrm_init_state was to > > sepatate codepaths that need init_replay and those > > who don't need it. That was a bandaid for something, > > unfortunately I don't remenber for what. > > > > If we don't need that anymore, maybe we can merge > > __xfrm_init_state into xfrm_init_state, as it was > > before. > > Main difference between __xfrm_init_state and xfrm_init_state is that > latter is called without extack, which doesn't exist in kernel path. That split happened ~ 15 years ago, we did not have extack back than. But I'm also ok with keeping it if extack is a reason for it. Do you plan to respin, or should I take the patchset as is? Thanks!
On Fri, Feb 14, 2025, at 11:29, Steffen Klassert wrote: > On Wed, Feb 12, 2025 at 08:30:20PM +0200, Leon Romanovsky wrote: >> On Wed, Feb 12, 2025 at 12:56:48PM +0100, Steffen Klassert wrote: >> > On Wed, Feb 05, 2025 at 08:20:21PM +0200, Leon Romanovsky wrote: >> > > From: Leon Romanovsky <leonro@nvidia.com> >> > > >> > > SA replay mode is initialized differently for user-space and >> > > kernel-space users, but the call to xfrm_init_replay() existed in >> > > common path with boolean protection. That caused to situation where >> > > we have two different function orders. >> > > >> > > So let's rewrite the SA initialization flow to have same order for >> > > both in-kernel and user-space callers. >> > > >> > > Signed-off-by: Leon Romanovsky <leonro@nvidia.com> >> > > --- >> > > include/net/xfrm.h | 3 +-- >> > > net/xfrm/xfrm_state.c | 22 ++++++++++------------ >> > > net/xfrm/xfrm_user.c | 2 +- >> > > 3 files changed, 12 insertions(+), 15 deletions(-) >> > > >> > > diff --git a/include/net/xfrm.h b/include/net/xfrm.h >> > > index 28355a5be5b9..58f8f7661ec4 100644 >> > > --- a/include/net/xfrm.h >> > > +++ b/include/net/xfrm.h >> > > @@ -1770,8 +1770,7 @@ void xfrm_spd_getinfo(struct net *net, struct xfrmk_spdinfo *si); >> > > u32 xfrm_replay_seqhi(struct xfrm_state *x, __be32 net_seq); >> > > int xfrm_init_replay(struct xfrm_state *x, struct netlink_ext_ack *extack); >> > > u32 xfrm_state_mtu(struct xfrm_state *x, int mtu); >> > > -int __xfrm_init_state(struct xfrm_state *x, bool init_replay, >> > > - struct netlink_ext_ack *extack); >> > > +int __xfrm_init_state(struct xfrm_state *x, struct netlink_ext_ack *extack); >> > > int xfrm_init_state(struct xfrm_state *x); >> > > int xfrm_input(struct sk_buff *skb, int nexthdr, __be32 spi, int encap_type); >> > > int xfrm_input_resume(struct sk_buff *skb, int nexthdr); >> > > diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c >> > > index 568fe8df7741..42799b0946a3 100644 >> > > --- a/net/xfrm/xfrm_state.c >> > > +++ b/net/xfrm/xfrm_state.c >> > > @@ -3120,8 +3120,7 @@ u32 xfrm_state_mtu(struct xfrm_state *x, int mtu) >> > > } >> > > EXPORT_SYMBOL_GPL(xfrm_state_mtu); >> > > >> > > -int __xfrm_init_state(struct xfrm_state *x, bool init_replay, >> > > - struct netlink_ext_ack *extack) >> > > +int __xfrm_init_state(struct xfrm_state *x, struct netlink_ext_ack *extack) >> > >> > The whole point of having __xfrm_init_state was to >> > sepatate codepaths that need init_replay and those >> > who don't need it. That was a bandaid for something, >> > unfortunately I don't remenber for what. >> > >> > If we don't need that anymore, maybe we can merge >> > __xfrm_init_state into xfrm_init_state, as it was >> > before. >> >> Main difference between __xfrm_init_state and xfrm_init_state is that >> latter is called without extack, which doesn't exist in kernel path. > > That split happened ~ 15 years ago, we did not have extack back than. > But I'm also ok with keeping it if extack is a reason for it. > > Do you plan to respin, or should I take the patchset as is? The best way will be if you can take this series as is. > > Thanks!
diff --git a/include/net/xfrm.h b/include/net/xfrm.h index 28355a5be5b9..58f8f7661ec4 100644 --- a/include/net/xfrm.h +++ b/include/net/xfrm.h @@ -1770,8 +1770,7 @@ void xfrm_spd_getinfo(struct net *net, struct xfrmk_spdinfo *si); u32 xfrm_replay_seqhi(struct xfrm_state *x, __be32 net_seq); int xfrm_init_replay(struct xfrm_state *x, struct netlink_ext_ack *extack); u32 xfrm_state_mtu(struct xfrm_state *x, int mtu); -int __xfrm_init_state(struct xfrm_state *x, bool init_replay, - struct netlink_ext_ack *extack); +int __xfrm_init_state(struct xfrm_state *x, struct netlink_ext_ack *extack); int xfrm_init_state(struct xfrm_state *x); int xfrm_input(struct sk_buff *skb, int nexthdr, __be32 spi, int encap_type); int xfrm_input_resume(struct sk_buff *skb, int nexthdr); diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c index 568fe8df7741..42799b0946a3 100644 --- a/net/xfrm/xfrm_state.c +++ b/net/xfrm/xfrm_state.c @@ -3120,8 +3120,7 @@ u32 xfrm_state_mtu(struct xfrm_state *x, int mtu) } EXPORT_SYMBOL_GPL(xfrm_state_mtu); -int __xfrm_init_state(struct xfrm_state *x, bool init_replay, - struct netlink_ext_ack *extack) +int __xfrm_init_state(struct xfrm_state *x, struct netlink_ext_ack *extack) { const struct xfrm_mode *inner_mode; const struct xfrm_mode *outer_mode; @@ -3188,12 +3187,6 @@ int __xfrm_init_state(struct xfrm_state *x, bool init_replay, } x->outer_mode = *outer_mode; - if (init_replay) { - err = xfrm_init_replay(x, extack); - if (err) - goto error; - } - if (x->nat_keepalive_interval) { if (x->dir != XFRM_SA_DIR_OUT) { NL_SET_ERR_MSG(extack, "NAT keepalive is only supported for outbound SAs"); @@ -3225,11 +3218,16 @@ int xfrm_init_state(struct xfrm_state *x) { int err; - err = __xfrm_init_state(x, true, NULL); - if (!err) - x->km.state = XFRM_STATE_VALID; + err = __xfrm_init_state(x, NULL); + if (err) + return err; - return err; + err = xfrm_init_replay(x, NULL); + if (err) + return err; + + x->km.state = XFRM_STATE_VALID; + return 0; } EXPORT_SYMBOL(xfrm_init_state); diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c index 82a768500999..d1d422f68978 100644 --- a/net/xfrm/xfrm_user.c +++ b/net/xfrm/xfrm_user.c @@ -907,7 +907,7 @@ static struct xfrm_state *xfrm_state_construct(struct net *net, goto error; } - err = __xfrm_init_state(x, false, extack); + err = __xfrm_init_state(x, extack); if (err) goto error;