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 48D4E42D46 for ; Sun, 25 Jun 2023 08:42:54 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 43F0840ED8; Sun, 25 Jun 2023 08:42:54 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2072.outbound.protection.outlook.com [40.107.92.72]) by mails.dpdk.org (Postfix) with ESMTP id D730340A7F for ; Sun, 25 Jun 2023 08:42:52 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FMKg4lIFYCN0TviWfeafuDsQE7sJyHrdLS9Bu+CFjysZRaYCKpRCtD4olAJv/Qte2V7I/VLyQEUjHLWyS6c9ua+8y554WQwIufI3skuS0uAvROItkYaPqW6CiUWdGX3QswR+I7XELviN3598GLYrkQdSgoYQFREEZL3QTiR7mccptB6t7fr6HXOOAfLcTFrSSpKXRR+OcfhXW+wB3RIo5FjW5FNkb9gVPr8VLke7Igq3/pkkdNCJiqSc0aPqY5R1Q4LsL7f6IzzoFTgtcyQulY8G7nq+n0Xah6HPS8nvgp6UFoUqcNBVtpUhix0lQOZqPtKXehWRvjOtqHe6Evmtaw== 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=fc5Fq7yMSLfdUGxEegiu4NjanIKzVHeSRmGgFCy+8H8=; b=Dh/S8KbKlSRuOOLUK4XdOKBEYswJGlpj3NQnrllqY6fL0h7YaQhFmTFzxviuxD/HS89QazDrsrkXHfU+oYI+1l058BzAscl9nRlQfFYv0Sw9RGb8I3CJApDTDvXX0a5hp+Re0rtD7SMFrhPOcFuFYNGWrn8CYdnk8GFnlf7SoqcmuySKykUutzi4qQWiBJ6wwbiXDpiLn6XKLs5iZz1lq7C3ewxlg85AHLUh8nBQr+L49kNVGtxN6uDab5LkkwtDWfIBJ4kll3Sz6Jcij/JaEgCmos2RrtBXGEKkT5UCH3wsK70bUL42AWEm735+UVg4/aH3tPxEjfNhtIZAKRuO3Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=fc5Fq7yMSLfdUGxEegiu4NjanIKzVHeSRmGgFCy+8H8=; b=HBfXVwJKOOiTHbCghKuLvaBFJFsCJwm0Xnlp7C6vkWbHAjmzbTavjsF0UiBdQBA9Pz+MapYvHVgnrZOtb1YHpaRlKhUjhRY1qYwHkXzBKaUNtfNzO3Sm3oJDjbmChgB/mj1+JsgS8YA8L+56uZD9R4SgY1lFFRWxcbvwks4i5tkonEvb35HCFMuAhelLv5g48PK0MNp6DtglXpaDgDulvdu309EI2KFEtYZ/Dub1bxQ4IbvAekWYOP0LFCu74JQvkSlt02lFJ0uN7Cic3QDAGlq++4gPygsDvKiKdX4bNpXe/9gc80z0GUjZxSvbokXzHEA2HBbwQUvwtvj/TdbUTg== Received: from BN9PR03CA0913.namprd03.prod.outlook.com (2603:10b6:408:107::18) by CH0PR12MB5156.namprd12.prod.outlook.com (2603:10b6:610:bb::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.24; Sun, 25 Jun 2023 06:42:51 +0000 Received: from BN8NAM11FT068.eop-nam11.prod.protection.outlook.com (2603:10b6:408:107:cafe::b1) by BN9PR03CA0913.outlook.office365.com (2603:10b6:408:107::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.32 via Frontend Transport; Sun, 25 Jun 2023 06:42:50 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by BN8NAM11FT068.mail.protection.outlook.com (10.13.177.69) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6500.47 via Frontend Transport; Sun, 25 Jun 2023 06:42:50 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.5; Sat, 24 Jun 2023 23:42:36 -0700 Received: from nvidia.com (10.126.230.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.37; Sat, 24 Jun 2023 23:42:35 -0700 From: Xueming Li To: Saoirse O'Donovan CC: Ciara Power , dpdk stable Subject: patch 'crypto/ipsec_mb: fix enqueue counter for SNOW3G' has been queued to stable release 22.11.3 Date: Sun, 25 Jun 2023 14:34:56 +0800 Message-ID: <20230625063544.11183-79-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230625063544.11183-1-xuemingl@nvidia.com> References: <20230625063544.11183-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN8NAM11FT068:EE_|CH0PR12MB5156:EE_ X-MS-Office365-Filtering-Correlation-Id: fe9e58c9-620e-4da7-f76a-08db75476589 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Lm4Z56YzMhfEi1p/iiAazcx22IW1j45n5YQf3eVX/b/smoKEHGS6g823OzIzWsHz3Lf8qNBF0B/pj1BiyoPwtBmI2PJzDDtdwXqs9/xHUPE4JmVqPcX1JkuYZPPHYvhCTa4/oo48uAeVhvLyVdwtOe7+I7JMWWJUTqDZ6/ix0ZveRgggo65RGLPgk2LiualiUwlcSsWWyaZfSpnvzYB4bZ86OcerLgWB5E1h4V8LZZmCN6LuyRBY6ztxTAyU/TgIRbvkrm7ARJg2DULBlOQKKm0Ejmj9av90H8ddZnwqFY7u9Uzu6OgZS2OtTisjs6FR0BHh9a23ZfLyE1EH4heRnhvSBLt6kn2VDG79FOApJWJDQDk8kri4o/7Vkm53ZgKgTsJqs0xUEEltxDS079r4KomaO9chAUi25vaME810X3aEUADyIpVozXIsvjOoM/J6q5494jUo0TbR0WvXnqnq4jaS8G5H8vR29S6IUT0Xfz2Nbipf3/zhF4ZgoL+vn0U3B6si0U4RnW/C5r6tHZ1lbSCzvXuFODp13AQnA1UGF96m/wkovvvgPnEt7VqjVSMGVb5SS2iPJGFD6FtI94+BNtaqnAPR/PMCfjlCzVAhzDy6B2l6KLH2RaJLyJPKFxoimw3mDZYN6kUoTKt+Au9CRE/eJ5Gw9VMHNNW3ecjsJm5XfPyruEkByG0BjRebZIHIE9VJTz+L6spno1MVcjogBMRv6csHG+UBtZ/YH1uQ/jjbpbLx9zzAS2vx2h9b6gXD6CAfTTOmM/nSAXO6+IBxZ6ICZ+MDTxWiqY9i+bjdTiFGraHjGLEuANG4zjOIRq9/ X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230028)(4636009)(39860400002)(376002)(346002)(396003)(136003)(451199021)(40470700004)(46966006)(36840700001)(40460700003)(2906002)(7696005)(82310400005)(82740400003)(6666004)(356005)(7636003)(2616005)(83380400001)(47076005)(336012)(426003)(1076003)(26005)(186003)(6286002)(16526019)(53546011)(966005)(36860700001)(55016003)(41300700001)(40480700001)(86362001)(54906003)(478600001)(316002)(70586007)(70206006)(36756003)(6916009)(4326008)(8936002)(8676002)(5660300002)(32563001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jun 2023 06:42:50.7694 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: fe9e58c9-620e-4da7-f76a-08db75476589 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT068.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR12MB5156 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 Hi, FYI, your patch has been queued to stable release 22.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/27/23. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=c53467f356209f50297da0b63d3c80005ae61fed Thanks. Xueming Li --- >From c53467f356209f50297da0b63d3c80005ae61fed Mon Sep 17 00:00:00 2001 From: Saoirse O'Donovan Date: Thu, 20 Apr 2023 10:31:41 +0000 Subject: [PATCH] crypto/ipsec_mb: fix enqueue counter for SNOW3G Cc: Xueming Li [ upstream commit dd6b0a910ff32b2b367c18ad97b045c8dc5aa882 ] This patch removes enqueue op counter update from the process_op_bit function where the process is now done in dequeue stage. The original stats increment was incorrect as they shouldn't have been updated at all in this function. Fixes: 4f1cfda59ad3 ("crypto/ipsec_mb: move snow3g PMD") Signed-off-by: Saoirse O'Donovan Acked-by: Ciara Power --- drivers/crypto/ipsec_mb/pmd_snow3g.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/crypto/ipsec_mb/pmd_snow3g.c b/drivers/crypto/ipsec_mb/pmd_snow3g.c index 8ed069f428..e64df1a462 100644 --- a/drivers/crypto/ipsec_mb/pmd_snow3g.c +++ b/drivers/crypto/ipsec_mb/pmd_snow3g.c @@ -372,9 +372,10 @@ process_ops(struct rte_crypto_op **ops, struct snow3g_session *session, /** Process a crypto op with length/offset in bits. */ static int process_op_bit(struct rte_crypto_op *op, struct snow3g_session *session, - struct ipsec_mb_qp *qp, uint16_t *accumulated_enqueued_ops) + struct ipsec_mb_qp *qp) { - uint32_t enqueued_op, processed_op; + unsigned int processed_op; + int ret; switch (session->op) { case IPSEC_MB_OP_ENCRYPT_ONLY: @@ -421,9 +422,10 @@ process_op_bit(struct rte_crypto_op *op, struct snow3g_session *session, if (unlikely(processed_op != 1)) return 0; - enqueued_op = rte_ring_enqueue(qp->ingress_queue, op); - qp->stats.enqueued_count += enqueued_op; - *accumulated_enqueued_ops += enqueued_op; + + ret = rte_ring_enqueue(qp->ingress_queue, op); + if (ret != 0) + return ret; return 1; } @@ -439,7 +441,6 @@ snow3g_pmd_dequeue_burst(void *queue_pair, struct snow3g_session *prev_sess = NULL, *curr_sess = NULL; uint32_t i; uint8_t burst_size = 0; - uint16_t enqueued_ops = 0; uint8_t processed_ops; uint32_t nb_dequeued; @@ -479,8 +480,7 @@ snow3g_pmd_dequeue_burst(void *queue_pair, prev_sess = NULL; } - processed_ops = process_op_bit(curr_c_op, curr_sess, - qp, &enqueued_ops); + processed_ops = process_op_bit(curr_c_op, curr_sess, qp); if (processed_ops != 1) break; -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-06-25 14:32:00.604680900 +0800 +++ 0078-crypto-ipsec_mb-fix-enqueue-counter-for-SNOW3G.patch 2023-06-25 14:31:58.455773900 +0800 @@ -1 +1 @@ -From dd6b0a910ff32b2b367c18ad97b045c8dc5aa882 Mon Sep 17 00:00:00 2001 +From c53467f356209f50297da0b63d3c80005ae61fed Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit dd6b0a910ff32b2b367c18ad97b045c8dc5aa882 ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org