On Tue, Jan 07, 2025 at 12:22:04PM +0200, Leon Romanovsky wrote: > On Thu, Dec 19, 2024 at 02:37:29PM +0200, Leon Romanovsky wrote: > > From: Jianbo Liu <jianbol@xxxxxxxxxx> > > > > Previously xfrm_dev_state_advance_esn() was added for RX only. But > > it's possible that ESN context also need to be synced to hardware for > > TX, so call it for outbound in this patch. > > > > Signed-off-by: Jianbo Liu <jianbol@xxxxxxxxxx> > > Signed-off-by: Leon Romanovsky <leonro@xxxxxxxxxx> > > --- > > Documentation/networking/xfrm_device.rst | 3 ++- > > drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 3 +++ > > drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.c | 3 +++ > > net/xfrm/xfrm_replay.c | 1 + > > 4 files changed, 9 insertions(+), 1 deletion(-) > > Steffen, > > This is kindly reminder. Sorry for the dealy, the holidays came faster than expected :) > > diff --git a/net/xfrm/xfrm_replay.c b/net/xfrm/xfrm_replay.c > > index bc56c6305725..e500aebbad22 100644 > > --- a/net/xfrm/xfrm_replay.c > > +++ b/net/xfrm/xfrm_replay.c > > @@ -729,6 +729,7 @@ static int xfrm_replay_overflow_offload_esn(struct xfrm_state *x, struct sk_buff > > } > > > > replay_esn->oseq = oseq; > > + xfrm_dev_state_advance_esn(x); This is the only line of code that this patchset adds to the xfrm stack, so merging this through mlx5 might create less conflicts. In case you want to do that, you can add my 'Acked-by' to this patch. Otherwise I'll pull it into the ipsec-next tree tomorrow.
