DPDK patches and discussions
 help / color / mirror / Atom feed
From: "De Lara Guarch, Pablo" <pablo.de.lara.guarch@intel.com>
To: "Zhang, Roy Fan" <roy.fan.zhang@intel.com>,
	"Nicolau, Radu" <radu.nicolau@intel.com>,
	"Buckley, Daniel M" <daniel.m.buckley@intel.com>,
	Thomas Monjalon <thomas@monjalon.net>
Cc: "dev@dpdk.org" <dev@dpdk.org>, "stable@dpdk.org" <stable@dpdk.org>
Subject: RE: [PATCH] crypto/ipsec_mb: fix GMAC parameters setting
Date: Wed, 9 Mar 2022 19:02:51 +0000	[thread overview]
Message-ID: <DM8PR11MB55914DCF0992962E396F558F840A9@DM8PR11MB5591.namprd11.prod.outlook.com> (raw)
In-Reply-To: <MW5PR11MB58095029C11E3E02E09300D4B80A9@MW5PR11MB5809.namprd11.prod.outlook.com>

Hi Thomas,

> -----Original Message-----
> From: Zhang, Roy Fan <roy.fan.zhang@intel.com>
> Sent: Wednesday, March 9, 2022 11:01 AM
> To: De Lara Guarch, Pablo <pablo.de.lara.guarch@intel.com>; Nicolau, Radu
> <radu.nicolau@intel.com>; Buckley, Daniel M <daniel.m.buckley@intel.com>
> Cc: dev@dpdk.org; stable@dpdk.org
> Subject: RE: [PATCH] crypto/ipsec_mb: fix GMAC parameters setting
> 
> > -----Original Message-----
> > From: De Lara Guarch, Pablo <pablo.de.lara.guarch@intel.com>
> > Sent: Wednesday, March 9, 2022 10:45 AM
> > To: Nicolau, Radu <radu.nicolau@intel.com>; Buckley, Daniel M
> > <daniel.m.buckley@intel.com>; Zhang, Roy Fan <roy.fan.zhang@intel.com>
> > Cc: dev@dpdk.org; De Lara Guarch, Pablo
> > <pablo.de.lara.guarch@intel.com>; stable@dpdk.org
> > Subject: [PATCH] crypto/ipsec_mb: fix GMAC parameters setting
> >
> > AES-GMAC requires plaintext length to be 0 when using AES-GCM, so only
> > AAD data is used.
> >
> > Fixes: a501609ea646 ("crypto/ipsec_mb: fix length and offset
> > settings")
> > Cc: pablo.de.lara.guarch@intel.com
> > Cc: stable@dpdk.org
> >
> > Signed-off-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
> > ---
> >  drivers/crypto/ipsec_mb/pmd_aesni_mb.c | 16 +++++++++++++---
> >  1 file changed, 13 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/crypto/ipsec_mb/pmd_aesni_mb.c
> > b/drivers/crypto/ipsec_mb/pmd_aesni_mb.c
> > index c974886032..afa0b6e3a4 100644
> > --- a/drivers/crypto/ipsec_mb/pmd_aesni_mb.c
> > +++ b/drivers/crypto/ipsec_mb/pmd_aesni_mb.c
> > @@ -1296,9 +1296,9 @@ set_mb_job_params(IMB_JOB *job, struct
> > ipsec_mb_qp *qp,
> >  					op->sym->aead.data.offset;
> >  			job->msg_len_to_hash_in_bytes =
> >  					op->sym->aead.data.length;
> > -		} else {
> > -			job->msg_len_to_cipher_in_bytes = 0;
> > +		} else { /* AES-GMAC only, only AAD used */
> >  			job->msg_len_to_hash_in_bytes = 0;
> > +			job->hash_start_src_offset_in_bytes = 0;
> >  		}
> >
> >  		job->iv = rte_crypto_op_ctod_offset(op, uint8_t *, @@ -1378,8
> > +1378,18 @@ set_mb_job_params(IMB_JOB *job, struct ipsec_mb_qp *qp,
> >  		job->msg_len_to_cipher_in_bits =
> >  					op->sym->cipher.data.length;
> >  		break;
> > -	case IMB_CIPHER_CCM:
> >  	case IMB_CIPHER_GCM:
> > +		if (session->cipher.mode == IMB_CIPHER_NULL) {
> > +			/* AES-GMAC only (only AAD used) */
> > +			job->msg_len_to_cipher_in_bytes = 0;
> > +			job->cipher_start_src_offset_in_bytes = 0;
> > +		} else {
> > +			job->cipher_start_src_offset_in_bytes =
> > +					op->sym->aead.data.offset;
> > +			job->msg_len_to_cipher_in_bytes = op->sym-
> > >aead.data.length;
> > +		}
> > +		break;
> > +	case IMB_CIPHER_CCM:
> >  	case IMB_CIPHER_CHACHA20_POLY1305:
> >  		job->cipher_start_src_offset_in_bytes =
> >  				op->sym->aead.data.offset;
> > --
> > 2.25.1
> Acked-by: Fan Zhang <roy.fan.zhang@intel.com> Thanks Pablo!

Would it be possible to merge this fix for this release?
A previous commit merged in this release has introduced a bug,
so it would be great if this fix can make it into 22.03.

Thanks,
Pablo

  reply	other threads:[~2022-03-09 19:02 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-03-09 10:45 Pablo de Lara
2022-03-09 11:01 ` Zhang, Roy Fan
2022-03-09 19:02   ` De Lara Guarch, Pablo [this message]
2022-03-14 10:19     ` Thomas Monjalon
2022-03-09 11:44 ` Nicolau, Radu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=DM8PR11MB55914DCF0992962E396F558F840A9@DM8PR11MB5591.namprd11.prod.outlook.com \
    --to=pablo.de.lara.guarch@intel.com \
    --cc=daniel.m.buckley@intel.com \
    --cc=dev@dpdk.org \
    --cc=radu.nicolau@intel.com \
    --cc=roy.fan.zhang@intel.com \
    --cc=stable@dpdk.org \
    --cc=thomas@monjalon.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).