patches for DPDK stable branches
 help / color / mirror / Atom feed
From: Kevin Traynor <ktraynor@redhat.com>
To: Akhil Goyal <akhil.goyal@nxp.com>, "dev@dpdk.org" <dev@dpdk.org>
Cc: Hemant Agrawal <hemant.agrawal@nxp.com>,
	"stable@dpdk.org" <stable@dpdk.org>
Subject: Re: [dpdk-stable] [dpdk-dev] [PATCH 5/6] crypto/dpaa_sec: fix session qp attach/detach
Date: Thu, 25 Apr 2019 18:42:38 +0100	[thread overview]
Message-ID: <ba8698f2-8ed3-ffeb-a794-62d3b54f3cc4@redhat.com> (raw)
In-Reply-To: <a46727bc-cfc1-ca11-cd5b-b5bc2e9f7e9b@redhat.com>

On 25/04/2019 17:24, Kevin Traynor wrote:
> On 27/03/2019 11:53, Akhil Goyal wrote:
>> session inq and qp are assigned for each core from which the
>> packets arrive. This was not correctly handled while supporting
>> multiple sessions per queue pair.
>> This patch fixes the attach and detach of queues for each core.
>>
>> Fixes: e79416d10fa3 ("crypto/dpaa_sec: support multiple sessions per queue pair")
>> Cc: stable@dpdk.org
> 
> Hi, this will not backport to 18.11 branch as:
> 4e694fe51171dcdbe94019189a0240833b45c943
> Author: Akhil Goyal <akhil.goyal@nxp.com>
> Date:   Wed Jan 9 15:14:17 2019 +0000
> 
>     crypto/dpaa_sec: support same session flows on multi-cores
> 
> was added after 18.11 and dpaa_sec_sym_session_clear() is quite
> different. Please send a backport of the bugfix for 18.11 branch, or let
> me know if it's not needed.
> 
> thanks,
> Kevin.
> 
>> Signed-off-by: Akhil Goyal <akhil.goyal@nxp.com>
>> ---
>>  drivers/crypto/dpaa_sec/dpaa_sec.c | 17 ++++++++++-------
>>  1 file changed, 10 insertions(+), 7 deletions(-)
>>
>> diff --git a/drivers/crypto/dpaa_sec/dpaa_sec.c b/drivers/crypto/dpaa_sec/dpaa_sec.c
>> index cb99be4e1..8305f19a3 100644
>> --- a/drivers/crypto/dpaa_sec/dpaa_sec.c
>> +++ b/drivers/crypto/dpaa_sec/dpaa_sec.c
>> @@ -1,7 +1,7 @@
>>  /* SPDX-License-Identifier: BSD-3-Clause
>>   *
>>   *   Copyright (c) 2016 Freescale Semiconductor, Inc. All rights reserved.
>> - *   Copyright 2017-2018 NXP
>> + *   Copyright 2017-2019 NXP
>>   *
>>   */
>>  
>> @@ -1940,13 +1940,13 @@ dpaa_sec_attach_rxq(struct dpaa_sec_dev_private *qi)
>>  {
>>  	unsigned int i;
>>  
>> -	for (i = 0; i < qi->max_nb_sessions; i++) {
>> +	for (i = 0; i < qi->max_nb_sessions * MAX_DPAA_CORES; i++) {
>>  		if (qi->inq_attach[i] == 0) {

Btw, without knowing the crypto code, the use of max_nb_sessions in for
loops with fixed size arrays being indexed looks suspect to me. In the
snippet above

unsigned char inq_attach[RTE_DPAA_MAX_RX_QUEUE];
which means inq_attach[4096]

At least in one place I can see
.max_nb_sessions = MRVL_PMD_DEFAULT_MAX_NB_SESSIONS
which makes max_nb_sessions=2048, while MAX_DPAA_CORES=4

>>  			qi->inq_attach[i] = 1;
>>  			return &qi->inq[i];
>>  		}
>>  	}
>> -	DPAA_SEC_WARN("All ses session in use %x", qi->max_nb_sessions);
>> +	DPAA_SEC_WARN("All session in use %u", qi->max_nb_sessions);
>>  
>>  	return NULL;
>>  }
>> @@ -2115,7 +2115,7 @@ dpaa_sec_sym_session_clear(struct rte_cryptodev *dev,
>>  		struct rte_cryptodev_sym_session *sess)
>>  {
>>  	struct dpaa_sec_dev_private *qi = dev->data->dev_private;
>> -	uint8_t index = dev->driver_id;
>> +	uint8_t index = dev->driver_id, i;
>>  	void *sess_priv = get_sym_session_private_data(sess, index);
>>  
>>  	PMD_INIT_FUNC_TRACE();
>> @@ -2125,9 +2125,12 @@ dpaa_sec_sym_session_clear(struct rte_cryptodev *dev,
>>  	if (sess_priv) {
>>  		struct rte_mempool *sess_mp = rte_mempool_from_obj(sess_priv);
>>  
>> -		if (s->inq[rte_lcore_id() % MAX_DPAA_CORES])
>> -			dpaa_sec_detach_rxq(qi,
>> -				s->inq[rte_lcore_id() % MAX_DPAA_CORES]);
>> +		for (i = 0; i < MAX_DPAA_CORES; i++) {
>> +			if (s->inq[i])
>> +				dpaa_sec_detach_rxq(qi, s->inq[i]);
>> +			s->inq[i] = NULL;
>> +			s->qp[i] = NULL;
>> +		}
>>  		rte_free(s->cipher_key.data);
>>  		rte_free(s->auth_key.data);
>>  		memset(s, 0, sizeof(dpaa_sec_session));
>>
> 


  reply	other threads:[~2019-04-25 17:42 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20190327114407.13697-1-akhil.goyal@nxp.com>
2019-03-27 11:53 ` [dpdk-stable] [PATCH 1/6] crypto/dpaa2_sec: fix session clear Akhil Goyal
2019-03-27 11:53 ` [dpdk-stable] [PATCH 2/6] crypto/dpaa2_sec: fix offset calculation for gcm Akhil Goyal
2019-03-27 11:53 ` [dpdk-stable] [PATCH 5/6] crypto/dpaa_sec: fix session qp attach/detach Akhil Goyal
2019-04-25 16:24   ` [dpdk-stable] [dpdk-dev] " Kevin Traynor
2019-04-25 17:42     ` Kevin Traynor [this message]
2019-04-26  7:14       ` [dpdk-stable] [EXT] " Hemant Agrawal

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=ba8698f2-8ed3-ffeb-a794-62d3b54f3cc4@redhat.com \
    --to=ktraynor@redhat.com \
    --cc=akhil.goyal@nxp.com \
    --cc=dev@dpdk.org \
    --cc=hemant.agrawal@nxp.com \
    --cc=stable@dpdk.org \
    /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).