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 E1E3442D46 for ; Sun, 25 Jun 2023 08:38:07 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DCE3B40EDC; Sun, 25 Jun 2023 08:38:07 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2041.outbound.protection.outlook.com [40.107.92.41]) by mails.dpdk.org (Postfix) with ESMTP id 2C4AA40A7F for ; Sun, 25 Jun 2023 08:38:06 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YYmtrvswyOl2/nsegnLUofVKvYL1ZUxaVHc1uzg5IA4TjwvlWYo2GlEdRaP9zZp1OhzbB9H5xvB0KJe4ctgVahP7WPFIal3nx1GXOExkIrzhRZobu6RjP0mwdW2Q0T/LfepQaJdV2DLAHGGfYJJ/Ab+PMBP7Th3kJUpsuBE9bxJ+dmumypjPytvbSQZ41knCqfn2pOxbtrnUEZOH4TXEm/PzZ/dHRZwjtVoEEIne4IIpzCwcQgEqqxnz9zx5CnO9EkDykj70tRaGht026nVLbmf1nXM7p9Aq5tcLeQjmdB4Kqg9JFBaqpXcGSbl8oCKnReAHgHY0LR/v47f7RFLanA== 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=puP80aCLVaQbcHlo5b0Butj1OJ5T6g1xa4xBBNF1B+k=; b=Z1EPVdpnV3w1npi0kE9EeXOIyBsjsDQOXRTIJsKcPP9hkYX264Oe4ZWFVZnQekNxOwEuReH6NIdoMTIuhoxJmukJa/T9aHEjxenHS8i/4ynLq+8aqqZ0GZF/02hU7yz8vAlNxO50rRJMRJ3s8pLYLO16bV3C0Rv0sIp4ABlSy4n0OSU6jL1+F6XhXPr+rTPWWuuLVfxb99EkhN0dCEOSxocDiw+9shr7lyBU4oewv+IWEohAjjitIRREIrUprK/51Vc3hYgxWDoC10o9+62kuTe6ocx6AINIPKDxufhBi6zlyPk8XkwtGhoWYBDf4SDBqwXi51svEPZTWYvjdmCZ8Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=marvell.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=puP80aCLVaQbcHlo5b0Butj1OJ5T6g1xa4xBBNF1B+k=; b=LigcisMwg/Z2nJhJdYIRNR/POSpZJRjoeJPkODRVryCXt/5e4dkSsbjldH31dmfk1Aue7obskwF6JLWVUPVKu+DpB7RKHmeR1I6Jk1YhMcsVRHYu8bXnRwv3UdH3ehIIox2x4pPAmuuP3CrVlo6enkO1Kd0k5bOxcyTQr017V8LAcTnBra715r3OfqOFz291j6Kr6HYwbYphqhmIXF2Q1arzEXvrIdfzIcR9snKghA4+Ii2b6/HrvtdgP1obHIvL+J6Eqaknk2KX9drJ1LeXXzTunbr3mJGOBQTRiGXavSmw3wPxkYpfv2he+x3hwNmpdqpAhplp2R39xwv+yo8cJw== Received: from BN9PR03CA0871.namprd03.prod.outlook.com (2603:10b6:408:13c::6) by CY5PR12MB6227.namprd12.prod.outlook.com (2603:10b6:930:21::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.23; Sun, 25 Jun 2023 06:38:03 +0000 Received: from BN8NAM11FT024.eop-nam11.prod.protection.outlook.com (2603:10b6:408:13c:cafe::b4) by BN9PR03CA0871.outlook.office365.com (2603:10b6:408:13c::6) 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:38:03 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) 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.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by BN8NAM11FT024.mail.protection.outlook.com (10.13.177.38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6500.45 via Frontend Transport; Sun, 25 Jun 2023 06:38:03 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) 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:37:53 -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:37:51 -0700 From: Xueming Li To: Shijith Thotton CC: Pavan Nikhilesh , dpdk stable Subject: patch 'event/cnxk: fix setting attributes in empty get work' has been queued to stable release 22.11.3 Date: Sun, 25 Jun 2023 14:33:59 +0800 Message-ID: <20230625063544.11183-22-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: BN8NAM11FT024:EE_|CY5PR12MB6227:EE_ X-MS-Office365-Filtering-Correlation-Id: 9db56bba-75f2-4ab6-ed25-08db7546ba10 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0QoW0OymzWJ27uhtRr/lSwzpU/JW3llb0wq6Pxs4j1uIbBrpdylDOro7bKg4EE3z+XXCHoDlvaS59dVrd0mIKzICivFSno67sLPuDJnjppA9rnD5rUfA2JrDdlBN8jjzGrUV4r16H8l8g6BAbsgJsSHuaJ0/kUOzfvr829Dzz1rFV3G8EgcBTpkz/oXihSzVRhg0MhYqqwh1DLh1z7fZOL2W1R7Dauvi/wf4Ddl8OIDVf0GxcUeVcIKgstyQQfdARpNLJ15xk29Z5wW69Cb1J0+zRbyj+kvvGBJRB5G5WIef44lCLJygvmiV0WBy4oT1fK8s1b6fli4OkpWJOkJwga7FDdxWMsreO/RQUMEXTdPHJKTRFqIMyO8r9ByYQHKRv91Ey7K6JCAd5HoIybI2CgaSmLtm9wcMBUhfC7xBz4eBr3uVVEGavpExPahGy4zvx9IsAwOqEGLyCQtc0lMNDEEfhwFZnUr8diVSGeecWIH2dZtnLx2yn61Q3dIQixazDoGAWf+Wbmx39Vm8iuzm9i4naFj6dwoqvAtFGlpUEYCh4NnZgw4GTNM1AkWTOfrRUVvyjGmjBm8WbfcyEDo/t182wX1r1z49DVqJE5sN14tSg8Sp7s+SsOqpch2q0mEFQAEhU9CerhsWNqJzD1NJDiSwu/WCiBsX0nQKht6ubj8ZqKwkT6zLG+QIYH/qJ8nWTZcM+258uzjomO5jF4We1Yi64t3/SU3zuMHXKEzLhhJsK6dbkf5gZJjN3ePtCcPrf2v6vp2Tv8SqwzjqjGkNug== X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230028)(4636009)(136003)(346002)(396003)(39860400002)(376002)(451199021)(46966006)(36840700001)(40470700004)(36860700001)(82310400005)(47076005)(966005)(478600001)(7696005)(2616005)(54906003)(426003)(83380400001)(336012)(26005)(53546011)(1076003)(186003)(16526019)(6286002)(2906002)(5660300002)(40460700003)(36756003)(70206006)(356005)(4326008)(7636003)(70586007)(82740400003)(55016003)(40480700001)(316002)(8936002)(8676002)(41300700001)(86362001)(6916009); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jun 2023 06:38:03.0858 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9db56bba-75f2-4ab6-ed25-08db7546ba10 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.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT024.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR12MB6227 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=d3f784ad5f9c765eeb71534f939acfc2e1d29d27 Thanks. Xueming Li --- >From d3f784ad5f9c765eeb71534f939acfc2e1d29d27 Mon Sep 17 00:00:00 2001 From: Shijith Thotton Date: Thu, 27 Apr 2023 11:58:17 +0530 Subject: [PATCH] event/cnxk: fix setting attributes in empty get work Cc: Xueming Li [ upstream commit b310f02aa8cb202b3620816ac03cbc948e7b0027 ] Even when no events are dequeued, it is important to update event attributes as they provide valuable information for checking the work slot state and other attributes. Fixes: c0a9774f030d ("event/cnxk: move post-processing to separate function") Signed-off-by: Shijith Thotton Acked-by: Pavan Nikhilesh --- drivers/event/cnxk/cn10k_worker.h | 3 +++ drivers/event/cnxk/cn9k_worker.h | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/event/cnxk/cn10k_worker.h b/drivers/event/cnxk/cn10k_worker.h index 75a2ff244a..df37ab6380 100644 --- a/drivers/event/cnxk/cn10k_worker.h +++ b/drivers/event/cnxk/cn10k_worker.h @@ -316,6 +316,9 @@ cn10k_sso_hws_get_work(struct cn10k_sso_hws *ws, struct rte_event *ev, ws->gw_rdata = gw.u64[0]; if (gw.u64[1]) cn10k_sso_hws_post_process(ws, gw.u64, flags); + else + gw.u64[0] = (gw.u64[0] & (0x3ull << 32)) << 6 | + (gw.u64[0] & (0x3FFull << 36)) << 4 | (gw.u64[0] & 0xffffffff); ev->event = gw.u64[0]; ev->u64 = gw.u64[1]; diff --git a/drivers/event/cnxk/cn9k_worker.h b/drivers/event/cnxk/cn9k_worker.h index d3c5180fbc..0ccdb7baf3 100644 --- a/drivers/event/cnxk/cn9k_worker.h +++ b/drivers/event/cnxk/cn9k_worker.h @@ -353,8 +353,10 @@ cn9k_sso_hws_get_work_empty(uint64_t base, struct rte_event *ev, #endif if (gw.u64[1]) - cn9k_sso_hws_post_process(gw.u64, mbuf, flags, lookup_mem, - tstamp); + cn9k_sso_hws_post_process(gw.u64, mbuf, flags, lookup_mem, tstamp); + else + gw.u64[0] = (gw.u64[0] & (0x3ull << 32)) << 6 | + (gw.u64[0] & (0x3FFull << 36)) << 4 | (gw.u64[0] & 0xffffffff); ev->event = gw.u64[0]; ev->u64 = gw.u64[1]; -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-06-25 14:31:59.110040700 +0800 +++ 0021-event-cnxk-fix-setting-attributes-in-empty-get-work.patch 2023-06-25 14:31:58.305773900 +0800 @@ -1 +1 @@ -From b310f02aa8cb202b3620816ac03cbc948e7b0027 Mon Sep 17 00:00:00 2001 +From d3f784ad5f9c765eeb71534f939acfc2e1d29d27 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit b310f02aa8cb202b3620816ac03cbc948e7b0027 ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +23 @@ -index 06c71c6092..beae2be903 100644 +index 75a2ff244a..df37ab6380 100644 @@ -24 +26 @@ -@@ -282,6 +282,9 @@ cn10k_sso_hws_get_work_empty(struct cn10k_sso_hws *ws, struct rte_event *ev, +@@ -316,6 +316,9 @@ cn10k_sso_hws_get_work(struct cn10k_sso_hws *ws, struct rte_event *ev, @@ -35 +37 @@ -index 1ce4b044e8..47eea70b5f 100644 +index d3c5180fbc..0ccdb7baf3 100644