[dpdk-dev] [PATCH v6 2/3] ipsec: remove redundant replay_win_sz

[Akhil Goyal]

> 
> > > > The rte_security lib has introduced replay_win_sz,
> > > > so it can be removed from the rte_ipsec lib.
> > > >
> > > > The relaved tests,app are also update to reflect
> > > > the usages.
> > > >
> > > > Note that esn and anti-replay fileds were earlier used
> > > > only for ipsec library, they were enabling the libipsec
> > > > by default. With this change esn and anti-replay setting
> > > > will not automatically enabled libipsec.
> > > >
> > > > Signed-off-by: Hemant Agrawal <hemant.agrawal at nxp.com>
> > > > Acked-by: Konstantin Ananyev <konstantin.ananyev at intel.com>
> > > > ---
> > > >  app/test/test_ipsec.c                  | 2 +-
> > > >  doc/guides/rel_notes/release_19_11.rst | 7 +++++--
> > > >  examples/ipsec-secgw/ipsec-secgw.c     | 5 -----
> > > >  examples/ipsec-secgw/ipsec.c           | 4 ++++
> > > >  examples/ipsec-secgw/sa.c              | 2 +-
> > > >  lib/librte_ipsec/Makefile              | 2 +-
> > > >  lib/librte_ipsec/meson.build           | 1 +
> > > >  lib/librte_ipsec/rte_ipsec_sa.h        | 6 ------
> > > >  lib/librte_ipsec/sa.c                  | 4 ++--
> > > >  9 files changed, 15 insertions(+), 18 deletions(-)
> > > >
> > > > diff --git a/app/test/test_ipsec.c b/app/test/test_ipsec.c
> > > > index 4007eff19..7dc83fee7 100644
> > > > --- a/app/test/test_ipsec.c
> > > > +++ b/app/test/test_ipsec.c
> > > > @@ -689,11 +689,11 @@ fill_ipsec_param(uint32_t replay_win_sz,
> uint64_t
> > > flags)
> > > >
> > > >  	prm->userdata = 1;
> > > >  	prm->flags = flags;
> > > > -	prm->replay_win_sz = replay_win_sz;
> > > >
> > > >  	/* setup ipsec xform */
> > > >  	prm->ipsec_xform = ut_params->ipsec_xform;
> > > >  	prm->ipsec_xform.salt = (uint32_t)rte_rand();
> > > > +	prm->ipsec_xform.replay_win_sz = replay_win_sz;
> > > >
> > > >  	/* setup tunnel related fields */
> > > >  	prm->tun.hdr_len = sizeof(ipv4_outer);
> > > > diff --git a/doc/guides/rel_notes/release_19_11.rst
> > > b/doc/guides/rel_notes/release_19_11.rst
> > > > index dcae08002..0504a3443 100644
> > > > --- a/doc/guides/rel_notes/release_19_11.rst
> > > > +++ b/doc/guides/rel_notes/release_19_11.rst
> > > > @@ -369,10 +369,13 @@ ABI Changes
> > > >    align the Ethernet header on receive and all known encapsulations
> > > >    preserve the alignment of the header.
> > > >
> > > > -* security: A new field ''replay_win_sz'' has been added to the structure
> > > > +* security: The field ''replay_win_sz'' has been moved from ipsec library
> > > > +  based ''rte_ipsec_sa_prm'' structure to security library based structure
> > > >    ``rte_security_ipsec_xform``, which specify the Anti replay window size
> > > >    to enable sequence replay attack handling.
> > > >
> > > > +* ipsec: The field ''replay_win_sz'' has been removed from the structure
> > > > +  ''rte_ipsec_sa_prm'' as it has been added to the security library.
> > > >
> > > >  Shared Library Versions
> > > >  -----------------------
> > > > @@ -415,7 +418,7 @@ The libraries prepended with a plus sign were
> > > incremented in this version.
> > > >       librte_gso.so.1
> > > >       librte_hash.so.2
> > > >       librte_ip_frag.so.1
> > > > -     librte_ipsec.so.1
> > > > +   + librte_ipsec.so.2
> > > >       librte_jobstats.so.1
> > > >       librte_kni.so.2
> > > >       librte_kvargs.so.1
> > > > diff --git a/examples/ipsec-secgw/ipsec-secgw.c b/examples/ipsec-
> > > secgw/ipsec-secgw.c
> > > > index b12936470..3b5aaf683 100644
> > > > --- a/examples/ipsec-secgw/ipsec-secgw.c
> > > > +++ b/examples/ipsec-secgw/ipsec-secgw.c
> > > > @@ -1424,9 +1424,6 @@ print_app_sa_prm(const struct app_sa_prm
> *prm)
> > > >  	printf("librte_ipsec usage: %s\n",
> > > >  		(prm->enable == 0) ? "disabled" : "enabled");
> > > >
> > > > -	if (prm->enable == 0)
> > > > -		return;
> > > > -
> > > >  	printf("replay window size: %u\n", prm->window_size);
> > > >  	printf("ESN: %s\n", (prm->enable_esn == 0) ? "disabled" : "enabled");
> > > >  	printf("SA flags: %#" PRIx64 "\n", prm->flags);
> > > > @@ -1495,11 +1492,9 @@ parse_args(int32_t argc, char **argv)
> > > >  			app_sa_prm.enable = 1;
> > > >  			break;
> > > >  		case 'w':
> > > > -			app_sa_prm.enable = 1;
> > >
> > > That actually will break lib-mode functional tests at:
> > > examples/ipsec-secgw/test/
> > > Due to my laziness I enabled in them library mode via '-w' option,
> > > as that moment legacy mode didn't support replay window...
> > > As these patches already applied, I'll send the fix in a new one in next few.
> >
> > No issues, I will squash your changes with the original patch as it is not applied
> > On master.
> 
> Ok, thanks.
> Patch at:
> http://patches.dpdk.org/patch/62540/ 

Removed the fixes line for this patch. Rebased the tree so that script patch is just after this patch.

Applied
> 
> >
> > >
> > > >  			app_sa_prm.window_size = parse_decimal(optarg);
> > > >  			break;
> > > >  		case 'e':
> > > > -			app_sa_prm.enable = 1;
> > > >  			app_sa_prm.enable_esn = 1;
> > > >  			break;
> > > >  		case 'a':
> > > > diff --git a/examples/ipsec-secgw/ipsec.c b/examples/ipsec-secgw/ipsec.c
> > > > index d7761e966..d4b57121a 100644
> > > > --- a/examples/ipsec-secgw/ipsec.c
> > > > +++ b/examples/ipsec-secgw/ipsec.c
> > > > @@ -49,6 +49,8 @@ set_ipsec_conf(struct ipsec_sa *sa, struct
> > > rte_security_ipsec_xform *ipsec)
> > > >  		/* TODO support for Transport */
> > > >  	}
> > > >  	ipsec->esn_soft_limit = IPSEC_OFFLOAD_ESN_SOFTLIMIT;
> > > > +	ipsec->replay_win_sz = app_sa_prm.window_size;
> > > > +	ipsec->options.esn = app_sa_prm.enable_esn;
> > >
> > > Ok, but what to do for the devices that don't support esn or replay_win_sz?
> > > Should we add some check? Either to the app, or preferably into rte_security
> > > level at  rte_security_session_create()?
> >
> > Ideally app should check the capability of the device before setting it.
> 
> Yes... after another thought - as right now we do create session at run-time,
> probably we need to check these device capabilities at init stage and report an
> error.

Agreed