From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 96AD14296F for ; Mon, 17 Apr 2023 18:14:32 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9041F410E4; Mon, 17 Apr 2023 18:14:32 +0200 (CEST) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mails.dpdk.org (Postfix) with ESMTP id 9086140698 for ; Mon, 17 Apr 2023 18:14:31 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1681748071; x=1713284071; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=uaqvIGTHV431P6CzEiCtI7NABcksVmEYRvF3XLhlo7E=; b=jjkj+nvt/sE4fft9Uy0+xtBDYvJeyByqKGtTonKifXrAe5e9bwHFPgWl 6oAFldDg3h9uMIFwk445JTqJ8aZIHDli6AzjQeXH0FC8U6aGVcdnFhyAB GfovIcIEXWrwcZLZd261jYD2K4GVklkKe7o4M7Gr0XLI7vRVVpXt262Eb o65yzN8/kqFYSFLibQntxR/tKnDlqLd6latOro8BB3N9wr7boMJ7W2G6B Xhx0k3BdIgsjeKswnrvNvLIfToUolOQEeLzbBofnr31xs7ibCA1PGUeon 0WMEogoNcqDxVTmeQtb7bPoER/ZWu5BnjgG2+nPjyUYb5l2XQ9C/JZCO2 w==; X-IronPort-AV: E=McAfee;i="6600,9927,10683"; a="344931412" X-IronPort-AV: E=Sophos;i="5.99,204,1677571200"; d="scan'208";a="344931412" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Apr 2023 09:14:30 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10683"; a="721184335" X-IronPort-AV: E=Sophos;i="5.99,204,1677571200"; d="scan'208";a="721184335" Received: from orsmsx603.amr.corp.intel.com ([10.22.229.16]) by orsmga008.jf.intel.com with ESMTP; 17 Apr 2023 09:14:30 -0700 Received: from orsmsx610.amr.corp.intel.com (10.22.229.23) by ORSMSX603.amr.corp.intel.com (10.22.229.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Mon, 17 Apr 2023 09:14:29 -0700 Received: from orsmsx610.amr.corp.intel.com (10.22.229.23) by ORSMSX610.amr.corp.intel.com (10.22.229.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Mon, 17 Apr 2023 09:14:29 -0700 Received: from ORSEDG601.ED.cps.intel.com (10.7.248.6) by orsmsx610.amr.corp.intel.com (10.22.229.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23 via Frontend Transport; Mon, 17 Apr 2023 09:14:29 -0700 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (104.47.58.107) by edgegateway.intel.com (134.134.137.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.23; Mon, 17 Apr 2023 09:14:29 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=d8rCPaa10Z78Lvq3et7P/U04oP4a9gYVgDewF5ZJBgGy5bV8F6zw9ESh/1RXKutSzTc/dmXP04NGUWTDEYWSH/U8qVX8YfC3Yqbo01SWGgcnDH5DwvrQkbbTwn0HvAq2+fslFp/iipiFMXN3CvQOz37jKXCwaGa3d5t5ZTUDl6x1fFxMPwIsh6Q9a7TXqlXLWHoTP66SvKv9DYti9aywqXojo4Q5io26K1eBJEXjZNRhInzP4NmgWgQyDjox1ZrvczW5O8egTHvBpWyATuUpbELJfI77S7Xrq81XN4B+rNiMRXubIPslLZfoI5VNxECogXiUuI8w2jCkscYcAYH3xA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=+MbbSEcNImIiF5iBA0paYPsjLJXqG9cp/W9gNJAH3Qo=; b=PCCvCgoO7DU4W8yk7zC593Z+41NTUTNj3Am1ljjpTZx/lTyeZuowlbRfa/NYbB39mBWtdp9PS5UEQiNKQNC7R7IxEMB1sMDyeV+1uscYgEWHHrKrd8A5/2nwOBuhH74SY0cPaRurSAxHJTWM5vYXeToLV2eyIO1LxLG4dmmUj3gkkzTv3aAR2xT+od0FBIKqpa6MFDtDFqtu+h1vPdQOmnF9xJ0lvJqb3EGNuYbZ2mHftZPSbTdLEz9K7ef9dBfpwbP4AxYUT8uujcxJC1VRIL5LNy+mmHkAyxnUDSGVpDQSmLGYKHTBPBLkgwV33ccAFWlIm4cDG3xgabHkC8snuQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Received: from SN7PR11MB7639.namprd11.prod.outlook.com (2603:10b6:806:32a::14) by DM4PR11MB5277.namprd11.prod.outlook.com (2603:10b6:5:388::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6298.45; Mon, 17 Apr 2023 16:14:26 +0000 Received: from SN7PR11MB7639.namprd11.prod.outlook.com ([fe80::7b0e:19dd:cc02:9919]) by SN7PR11MB7639.namprd11.prod.outlook.com ([fe80::7b0e:19dd:cc02:9919%6]) with mapi id 15.20.6298.045; Mon, 17 Apr 2023 16:14:26 +0000 From: "Power, Ciara" To: "O'Donovan, Saoirse" , "De Lara Guarch, Pablo" CC: "stable@dpdk.org" , "O'Donovan, Saoirse" , "david.marchand@redhat.com" Subject: RE: [PATCH 20.11] crypto/snow3g: fix snow3g enqueue stat increment Thread-Topic: [PATCH 20.11] crypto/snow3g: fix snow3g enqueue stat increment Thread-Index: AQHZcUdVHMrHsQZKEkeJW4ty8MxAfa8vrKxQ Date: Mon, 17 Apr 2023 16:14:26 +0000 Message-ID: References: <20230417160847.19857-1-saoirse.odonovan@intel.com> In-Reply-To: <20230417160847.19857-1-saoirse.odonovan@intel.com> Accept-Language: en-IE, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: SN7PR11MB7639:EE_|DM4PR11MB5277:EE_ x-ms-office365-filtering-correlation-id: 60c0f680-d5ee-43db-9d2a-08db3f5ed08d x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: t3WlLudGLlL18h+RDs9A6kzbQVdIFTDuEh6BnXCtC1wBwZrH3cPfDmHD+RYWw0/SN13hQ8Mh3zHwNK4Zmm2OnqENFNa0BMFer1xgLH/9RzxY4rcK5kC7TryVKl8ycFpFIhYD3ue1LBJEQsSEErZr2+aUzGMcVY7RGyLkl/fq/lrKhYpIqEGgmZmoVLQVCyxRQDupIqepNE3jyOY0Qg1WEaekXx8TSGpWjU/mNj0sVdizHg2Pa9u5UINdUupdpEMiD4cAAB7y92aJWMHfbdxEPdGOxWcaJDNtDGaMP8fDkYMee+9m79ydtT9xgODpVKWcPFxCQvihI8jfE+Lv5PE98EH6XfGv8rqgGu7l3KLkqV/xThFWVS7uaK2gYf0h86DVtL+34FynfGUsH9/EkpbwXlW2jCRUQz6Q138AuWV7OVTXYNZQQEp9/fk2aZPd/Jj3yn0FQSF4j4XPYfFzrRFURurNJlbJ3PeTjs6GYbAUYjcDmQBJFdzED1w1QwCIjnzJgP8uWU2e7sodZx/tWN08x9bE1sWqEtbfzy8mbRaoUzLJMZQ/vAb2E6P4Eo2skO1sD/fIJhbHBU17KcHw6lnanA0gC6hEdBJpT1v/ZTZHJCjoRzc3t+mDK92FfQ4dWOiESXXAE61EeRd/mxA7xJnNPhMHQFtxqxoFhQl+ge6Zjis= x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SN7PR11MB7639.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(376002)(346002)(366004)(39860400002)(396003)(136003)(451199021)(66556008)(66946007)(2906002)(66476007)(4326008)(66446008)(64756008)(5660300002)(52536014)(8936002)(54906003)(316002)(55016003)(86362001)(76116006)(41300700001)(110136005)(478600001)(33656002)(7696005)(71200400001)(6636002)(186003)(122000001)(53546011)(82960400001)(26005)(9686003)(6506007)(83380400001)(38070700005)(8676002)(38100700002)(42413004)(32563001); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?OGqTa4JQywtdqC5efhxJxs+A8I6bLcJAN/qhbjIupq4aDZp4cdPTa7G4WL7j?= =?us-ascii?Q?jcn43nAcvxo7IfdfiwHlIhJje6wlHp6DS6AFvwbULtSiwifu+hNPViGa534I?= =?us-ascii?Q?EtkwOvRJcMnZXb+rDZdqMB/sPSGj4ckGowDMH/oqEcS/cj6ODya8KAYL822j?= =?us-ascii?Q?1d/HgHG2bjA9x9kln8Xpkp3kkT0FjCz859dI5imw2tJsq93wsJcwHnuh49+C?= =?us-ascii?Q?oz8ATTcZTighaATSzR4GBHiYoa6S9m5nrOgqT8Uk0YwlkXjdVLFsBLVQ5Tvu?= =?us-ascii?Q?OU0bzNXZ96DHGrvdtViauopR5AVadiIcgr0WVQuwaWmOHWp88tknpD9o04cj?= =?us-ascii?Q?dVaKnoAXtX++OfsyvsW9cEfW0H0YymhWFXL5PXKcACeT4LNxqpl21hP5qBgj?= =?us-ascii?Q?o2tkVOYnB+pNC6zRNvZB7aY/PlNknrCuL9xbVgKria+TqQeEZbAxKFAtKXEK?= =?us-ascii?Q?TDR9CkIOA3cE5u42LuUGW3Oav5Ahq7CiTZhakHoxjlMQM1k+MKJnf9tOu0+u?= =?us-ascii?Q?otC4gtgEh1BCyXFiLTmNW89xPkNC4joLOIqFeiYdq0BxHEP0urYjlWpsIdHf?= =?us-ascii?Q?AjP9YXugoBb+9rSx637oSb9GEgmEuEiGYlqxXOlDtu0kchNGT6sIXOgD7xei?= =?us-ascii?Q?v9KSuVzHg5Mg4x9ExDqZVBDwTtuwL40LRk7BFaCWAZvNNnrLTVTGy8GzoOrG?= =?us-ascii?Q?x+yeO7VaU/Q+WziJ5yJxviiQC0FiqzhQGteKAN8qOuApW1zt3b9JY/a2p6UL?= =?us-ascii?Q?zPWChM0F22z9c+0nVhr0LGPnWWM2KDkzdNbmn++31911k0Q+Ls8LMb64wONn?= =?us-ascii?Q?EwzHunpyi8HvntXaA85dx0Dy6vjj1VfPNUUlJaOxwKX6JO8qiiYdI2avRsa2?= =?us-ascii?Q?H6bZVHm9LZZ6i7+Isw38eZLrujbPNbffXqu8lM/JW1YqjITizDlD9I6XMNo+?= =?us-ascii?Q?4bXx4p1r2zUuobg6kDcVzAekTq5d1V34qBHXrjJxC5QpT0n07NbbSAin0kHw?= =?us-ascii?Q?KyasZ3ztcJLijGaCpBLdbYrFNJfQ4PZkJaWR0sOvNROmRYxJONiKfNU1Yg3d?= =?us-ascii?Q?8YBSPfQNpYrCa/ATr9f7aBzIcrZRNnxFUa2woAbrmH82klsEgtjLNOjO1RIW?= =?us-ascii?Q?QGjskgJsZFt5EbJUqhPvuUBNziHfFOwo1COvyjlboF6Mu1wehUI7xZKoPaFM?= =?us-ascii?Q?3b8KQH3gfBtH8yOVB/YizefLcrarSgPJ+ssm5Hox0nnF/qlWPlpcjxArgFhr?= =?us-ascii?Q?6q1xolf3ByoqXAoGZjn3V5EL+fCkFMNma0ENcEDKZz8fTYpRu+/IAH9sIxiW?= =?us-ascii?Q?9euk9YsVOI3Ih6E0TPZCb4yDTw2p/sQrQDqruAVJiOgEzAT+gX4s/6EKyrMv?= =?us-ascii?Q?R7L/rRDHBm2OntRgV+AcWuQIE5zolQoWNq8ierPHxv5bAuOORYWgI2ZEyj3q?= =?us-ascii?Q?dUuxH8Tz1tVFNVvaKmTVW+MvKXFpdQ2zOIyMZtp8T6iORiUfabB5j/D0Sylp?= =?us-ascii?Q?/FFa44nJzQj6DwF/LZpdQ9AUJAy6vAgjQvaBqcqzvpnVjz8eLWK6Km5A0V+H?= =?us-ascii?Q?m4Xr/AYTJXVhBP9cvODFs1eTJYScqTuP9MvCJmD2?= Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: SN7PR11MB7639.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 60c0f680-d5ee-43db-9d2a-08db3f5ed08d X-MS-Exchange-CrossTenant-originalarrivaltime: 17 Apr 2023 16:14:26.0697 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: BcYQNp3yxqzwNhU399Tg/Lao49fAaA5K1tHlTsi9NGe8KzXKn8Mi+MUqsrBfiUaBdyOw1xyJc05j2QR/qn5L6Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR11MB5277 X-OriginatorOrg: intel.com X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org > -----Original Message----- > From: Saoirse O'Donovan > Sent: Monday 17 April 2023 17:09 > To: De Lara Guarch, Pablo > Cc: stable@dpdk.org; O'Donovan, Saoirse ; > david.marchand@redhat.com > Subject: [PATCH 20.11] crypto/snow3g: fix snow3g enqueue stat increment >=20 > The two functions rte_ring_enqueue and rte_ring_enqueue_burst have differ= ent > return values which weren't accounted for when updating enqueue stats. Th= is > meant that on success, the enqueued count and accumulated_enqueued_ops > were being incremented by 0. >=20 > Fixes: 49abc602fa65 ("crypto/ipsec_mb: fix build with GCC 12") > Cc: david.marchand@redhat.com >=20 > Signed-off-by: Saoirse O'Donovan >=20 > --- > Upstream commit: > Fixes: 468f31eb71c4 ("crypto/ipsec_mb: fix build with GCC 12") > --- > drivers/crypto/snow3g/rte_snow3g_pmd.c | 13 +++++++++---- > 1 file changed, 9 insertions(+), 4 deletions(-) >=20 > diff --git a/drivers/crypto/snow3g/rte_snow3g_pmd.c > b/drivers/crypto/snow3g/rte_snow3g_pmd.c > index 2e2c8412ae..8dfc8b3945 100644 > --- a/drivers/crypto/snow3g/rte_snow3g_pmd.c > +++ b/drivers/crypto/snow3g/rte_snow3g_pmd.c > @@ -371,7 +371,8 @@ static int > process_op_bit(struct rte_crypto_op *op, struct snow3g_session *session, > struct snow3g_qp *qp, uint16_t *accumulated_enqueued_ops) > { > - unsigned enqueued_op, processed_op; > + unsigned int processed_op; > + int ret; >=20 > switch (session->op) { > case SNOW3G_OP_ONLY_CIPHER: > @@ -412,9 +413,13 @@ process_op_bit(struct rte_crypto_op *op, struct > snow3g_session *session, >=20 > if (unlikely(processed_op !=3D 1)) > return 0; > - enqueued_op =3D rte_ring_enqueue(qp->processed_ops, op); > - qp->qp_stats.enqueued_count +=3D enqueued_op; > - *accumulated_enqueued_ops +=3D enqueued_op; > + > + ret =3D rte_ring_enqueue(qp->processed_ops, op); > + if (ret !=3D 0) > + return ret; > + > + qp->qp_stats.enqueued_count +=3D 1; > + *accumulated_enqueued_ops +=3D 1; >=20 > return 1; > } > -- > 2.25.1 Acked-by: Ciara Power