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 DFD2841D8D for ; Mon, 27 Feb 2023 08:08:42 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D5B6B40ED6; Mon, 27 Feb 2023 08:08:42 +0100 (CET) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2046.outbound.protection.outlook.com [40.107.94.46]) by mails.dpdk.org (Postfix) with ESMTP id ABF5F40ED6 for ; Mon, 27 Feb 2023 08:08:41 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CqkoSw5gj1CIoPYRWSaHv4DGbnmc7qaINB9iY+cnviAekrb260f/943oiGUe9t3rs3WcVDHCCvPePi6DfQ8jrRGkdH0qIs58Z5HNwmkR3wn90WqYaA0Cs1/a1jD2cAKgbAoyPsDVkF09DN9Be+ewpQcRiiKq+yE4Iv6u5zHS/ksPgedC1MRXcXIs3w9Buo68dsmDPn/ni+YCgQ0KY1nuf5X5nz1TweTa6lGNMPZhG6TQ+NkKAJwB7Koy9Fex3+JbhVpZbv0epFD7KqlbzSVtAtCVhONfz05hL4HO5Rl2Taao+k40Pt3yKn9uLE8lCm6WtKWQI8MxekCXteCYfEh7+Q== 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=pC2NnE7qinInbfxyo++Gl8lTCZIBsTNcEEtydVO4WWw=; b=F4Tp6KEWDz3owRMvht/Ms3BuWxAojfO0vx0myqV/115KYAhon1EDfK+fg2x8o9XjV3Vg17VoYRBq+7UjiMHUY8Bg1F+EMgn9E4YXgdpk+Ngc/0bnLP/NR4Kz2ZkCMePYvHcYx6sCCAN0hnl8wQJqark+PcvZeYKR8fZC4kozx2eElC0U5rTUGyVUPrFl/vWFTl2elBDVyRtTZiaqBAJ6QUgcD1yXELlOekuU0v0U/E6PgyJzlqy+B0g++Yq4a5h4jFMuQKPRSd7CbO40DARMkGTeUngieP6NqW7Sen/rj6WDRix8CA2uoLr8h5bx9Z+9vC/kI6CgVqnvZnHgnPHgYA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) 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=pC2NnE7qinInbfxyo++Gl8lTCZIBsTNcEEtydVO4WWw=; b=pIq/IhSuCq4klheCk4wzsZhp6cdSRbvO6F6D19tNpw0ZoHZnaULiKzAEdyvtvScpDczoB+PfgmJdKiITbp7yym72ObO2Od79vGsPnpFh0dsuZxMxOvOsj8QvqdSYmQpL2d7eNEwGoWjsYfxhkYjSe/l8OyMbtAccVz383ki8Ob7OS2T3GMkIhdY7c3+hrzI57SrBvvTbYHmW4yad21I3K4r4fGSNzN1EM/ZYXUa2gc4rvcCG4zFPnVVw9hnsQbgNb0BHHGjlI1G4Q9XdDpKnVr+wfnA9DKxAhpruvZkWxXO7z5mbYpElAjtFIdKtncHwcVvaZXdnF8fNopYV6QGRqg== Received: from MW4P223CA0011.NAMP223.PROD.OUTLOOK.COM (2603:10b6:303:80::16) by DM6PR12MB4202.namprd12.prod.outlook.com (2603:10b6:5:219::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.29; Mon, 27 Feb 2023 07:08:40 +0000 Received: from CO1NAM11FT022.eop-nam11.prod.protection.outlook.com (2603:10b6:303:80:cafe::16) by MW4P223CA0011.outlook.office365.com (2603:10b6:303:80::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.29 via Frontend Transport; Mon, 27 Feb 2023 07:08:39 +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 CO1NAM11FT022.mail.protection.outlook.com (10.13.175.199) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.16 via Frontend Transport; Mon, 27 Feb 2023 07:08:39 +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.36; Sun, 26 Feb 2023 23:08:26 -0800 Received: from nvidia.com (10.126.230.37) 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; Sun, 26 Feb 2023 23:08:24 -0800 From: Xueming Li To: Shijith Thotton CC: dpdk stable Subject: patch 'eventdev/eth_rx: fix getting adapter instance' has been queued to stable release 22.11.2 Date: Mon, 27 Feb 2023 14:59:34 +0800 Message-ID: <20230227070107.15664-66-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230227070107.15664-1-xuemingl@nvidia.com> References: <20230227062349.13764-1-xuemingl@nvidia.com> <20230227070107.15664-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.37] 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: CO1NAM11FT022:EE_|DM6PR12MB4202:EE_ X-MS-Office365-Filtering-Correlation-Id: 18bd9910-85a3-4147-4b6c-08db18917402 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dEi3YI/ReIMZMWocxq9QuvAx4GwBo6kjIJLG8VKUGymsS6ok7oB+f7HhDKmyqGr/vINupNtVEITyDGtCksO/MOoWPDpqNvgADaAxODj4Czrah+Ccjw3BE/7FYJYdwonnQ6oewNmSugJECVw0Zq90CEd8D20M5rQteyzVeSWd6IaK0+WHXlV3/Dxa02mPuR9mt4ZnTDRU9vsnLhZm6RNcGFCvdoh9uuXUIdeaNHzNMv9zVKlS64FACgNWJYACWhQsU0bSHIQfw6q0kp29+TB5RokocK1hhxAErahOdafWe1pboijKG2FbInKefTfYWPVeMdoB1x3ES988tT4bDBc1j8ZrfXeye4QAT7TICRDmtDa5jXqHLK5NyI/BwF2uA+iPS1z6WE4ivYqUR+3e2oJYqESUYSekmgQaiVa+Sw6lIHQgKGVe5Z3zfB0BVG9VBu95IDPYzZN92oX1uAPPamTrWN9de2mD3VYkICag/rrk2OZhctpYZO6I1bnMgx9XP4yKHcUFHZf51hLv05Sf0fWZC4F/dH7Fg8Aw82WQCPx+dUCCu6HOaMcVLU8tUIbzXK5mal6QcY8Vrph6tFtXCxjAQ7KluPH0mFI9iLtIej1rlIhKtdryHlKcBuGPfGQCWMooIW++O0ODD0+9B3qEhK6mB2gW+TM7AEq27FB0Y37WfILZC+MBDyOHNEYiiDBf/e8nYREfIFnOc1Qct4jIkOmdUG3jIwf1ch+O1xYhU6KLpZleJHomZgC3nMdL3bfMDt8HW3757EOU9qow7Cz5wvCfXxLgAkxrk/P4NGPmNiilxBwckem/TXsWVumixUGOs2Wh 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:(13230025)(4636009)(346002)(39860400002)(396003)(376002)(136003)(451199018)(40470700004)(36840700001)(46966006)(2616005)(966005)(316002)(36756003)(82310400005)(86362001)(16526019)(40460700003)(6286002)(186003)(2906002)(34020700004)(36860700001)(5660300002)(8676002)(4326008)(8936002)(6916009)(70586007)(70206006)(41300700001)(1076003)(426003)(47076005)(478600001)(53546011)(6666004)(26005)(336012)(55016003)(40480700001)(7696005)(7636003)(356005)(82740400003)(83380400001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Feb 2023 07:08:39.7126 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 18bd9910-85a3-4147-4b6c-08db18917402 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: CO1NAM11FT022.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4202 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.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/01/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=77f50c0971336fb8216ce87875a48561db0ccb2f Thanks. Xueming Li --- >From 77f50c0971336fb8216ce87875a48561db0ccb2f Mon Sep 17 00:00:00 2001 From: Shijith Thotton Date: Tue, 3 Jan 2023 18:39:04 +0530 Subject: [PATCH] eventdev/eth_rx: fix getting adapter instance Cc: Xueming Li [ upstream commit 0aedd85f9a2aa9f70dfdad56b6fba2d183470a99 ] The API to get rx adapter instance is returning error for event devices with internal port capability and eth_rx_adapter_instance_get op undefined. But as the Rx adapter is internally maintaining the queue information needed to find the instance id, event devices can opt out from defining the op. Modified code to match this logic. Fixes: a1793ee8aba0 ("eventdev/eth_rx: add adapter instance get API") Signed-off-by: Shijith Thotton --- lib/eventdev/rte_event_eth_rx_adapter.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/lib/eventdev/rte_event_eth_rx_adapter.c b/lib/eventdev/rte_event_eth_rx_adapter.c index cf7bbd4d69..170823a03c 100644 --- a/lib/eventdev/rte_event_eth_rx_adapter.c +++ b/lib/eventdev/rte_event_eth_rx_adapter.c @@ -3415,14 +3415,10 @@ rte_event_eth_rx_adapter_instance_get(uint16_t eth_dev_id, if (!rte_event_eth_rx_adapter_caps_get(rx_adapter->eventdev_id, eth_dev_id, &caps)) { - if (caps & RTE_EVENT_ETH_RX_ADAPTER_CAP_INTERNAL_PORT) { - ret = rxa_dev_instance_get(rx_adapter) ? - rxa_dev_instance_get(rx_adapter) - (eth_dev_id, - rx_queue_id, - rxa_inst_id) - : -EINVAL; - } + if (caps & RTE_EVENT_ETH_RX_ADAPTER_CAP_INTERNAL_PORT && + rxa_dev_instance_get(rx_adapter)) + ret = rxa_dev_instance_get(rx_adapter)(eth_dev_id, rx_queue_id, + rxa_inst_id); } /* return if entry found */ -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-02-27 14:08:43.049972800 +0800 +++ 0067-eventdev-eth_rx-fix-getting-adapter-instance.patch 2023-02-27 14:08:40.789237000 +0800 @@ -1 +1 @@ -From 0aedd85f9a2aa9f70dfdad56b6fba2d183470a99 Mon Sep 17 00:00:00 2001 +From 77f50c0971336fb8216ce87875a48561db0ccb2f Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 0aedd85f9a2aa9f70dfdad56b6fba2d183470a99 ] @@ -13 +15,0 @@ -Cc: stable@dpdk.org @@ -21 +23 @@ -index 71e81ee3e1..1bbce4ede2 100644 +index cf7bbd4d69..170823a03c 100644 @@ -24 +26 @@ -@@ -3418,14 +3418,10 @@ rte_event_eth_rx_adapter_instance_get(uint16_t eth_dev_id, +@@ -3415,14 +3415,10 @@ rte_event_eth_rx_adapter_instance_get(uint16_t eth_dev_id,