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 8622E433D8 for ; Mon, 11 Dec 2023 11:13:22 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7AD8140E0F; Mon, 11 Dec 2023 11:13:22 +0100 (CET) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2054.outbound.protection.outlook.com [40.107.237.54]) by mails.dpdk.org (Postfix) with ESMTP id 1151F402E9 for ; Mon, 11 Dec 2023 11:13:21 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=F5UkbIS5uZhOohNWts1Fg7fLkH/GtmLLduDCb+KVJANixHg1WGBQMIgzjx/CmmhOw7Oc271/N87ISoq6eYSFoLUtka9e3pX+YB9QT6BOaVjPHfokZ3SN/x9biJRToAWXFWbgp4VvVib1txz0Jhu/TKr5UPxzac2RJ8MlW/JwGYTP/80mmDboBpYG00agFHpzWkXsnvY7fiVGePimJPPaokFGnusMIdHz+7cXZN8eYjuer1rmnB3+c5YCNrpQ2tt7ojqXhA/MmEK0p0wMojIsqMsw7oOkPVwLcQ4vdVvnVg9AIxrRtJHI1fSiGwnfHkr0znAcqcVkMNw6o+z+ZTV+Dg== 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=nUweZkPdz8RPdDZEpy3OolFE3tl2OCZOLwbjYcpZjOU=; b=DyGGV+Zv0dtkpX4aS74oNNAwEFIINJcN+vAt6Dbl55OVcxgGWqc6ysCckRQI3qIGXpeEciJey3qw0m4ZMEjR1jgF7hymI6PXznnY1c4DFgP8+UEdUuxW7noUEIAKm9Yzlt6ZB4D0ojTOlZzPUti4jjlLB+iGoYfC3Hr6DdRXUdLFXAzGRyeVhMAVAxIToiPT6ASqbofl4rgmjOr5xklZ4mSFhy19e8UIA78eHZu62t1Du8EGq663zWuVqgmurnvho5iKDStXuZxHY+BcLATE1r825+NIRW0uJS3wy8rSnhH996GMuSjAzioIPTf+HVfNCdHRB5mD3A3UskFtBAclrg== 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 (0) 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=nUweZkPdz8RPdDZEpy3OolFE3tl2OCZOLwbjYcpZjOU=; b=lg/C/4Ag9pPO7KQVcWGGedDiZw2x6XugiajD3j232J47yno5t7psZu0C3qxni8FeQJaCz03fPdUiqlR/kbfFQnzuIQzsmMbBlQhNkGT1j+AAjInB4TZYVtXrVHky60MeZj48z0qDSFgv/uRqDXg5ZIuvRc4syKERGhVk0j/j6NYLXV7G3AG+t+3kJidE82AtqbFX/BYULmTMNmO1Gh3e/iRq6yJtz6Xi0ivEi1k1z39AyYe35CgKNiVP6fQ4xNjxBanzWBR3VB8ofIH1ppsp+Io+BEwMBGT0zuvBhXL/GwsQe7uK2Dh+XEO/Uv7EoM/OgfQUjAnPJIyIssg0Bo0RCQ== Received: from DM5PR08CA0059.namprd08.prod.outlook.com (2603:10b6:4:60::48) by LV8PR12MB9082.namprd12.prod.outlook.com (2603:10b6:408:180::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.32; Mon, 11 Dec 2023 10:13:18 +0000 Received: from DS1PEPF00017096.namprd05.prod.outlook.com (2603:10b6:4:60:cafe::43) by DM5PR08CA0059.outlook.office365.com (2603:10b6:4:60::48) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.33 via Frontend Transport; Mon, 11 Dec 2023 10:13:18 +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 DS1PEPF00017096.mail.protection.outlook.com (10.167.18.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7091.18 via Frontend Transport; Mon, 11 Dec 2023 10:13:18 +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.41; Mon, 11 Dec 2023 02:13:09 -0800 Received: from nvidia.com (10.126.231.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.41; Mon, 11 Dec 2023 02:13:07 -0800 From: Xueming Li To: Wenwu Ma CC: Wei Ling , Maxime Coquelin , dpdk stable Subject: patch 'net/virtio: fix link state interrupt vector setting' has been queued to stable release 22.11.4 Date: Mon, 11 Dec 2023 18:10:31 +0800 Message-ID: <20231211101226.2122-7-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231211101226.2122-1-xuemingl@nvidia.com> References: <20231022142250.10324-1-xuemingl@nvidia.com> <20231211101226.2122-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS1PEPF00017096:EE_|LV8PR12MB9082:EE_ X-MS-Office365-Filtering-Correlation-Id: c15f0487-1f8b-41b9-29cd-08dbfa31cc16 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dwiCTqeSYYKQdOQVhM3RdmAsKu7SvLHDS42vrh+5ouUMWEopfJ2qrPO9cymAVPglFguVVnjJzzD617xYGocyggiQ+Rh61sWHwFwjeENKrouFMkp0CmXyuqk/pH3FBWy4EnOwQo2y2GHgPA7kkOaSNVMmUDMRxAzD0ec0LLLrjot5JbkuOo56JNCAt6mJk+ypsF72ZlJQ5naL213e/RaTmmpHLHRHU9x2vXy40dO9Ti3ZeZQS/xSkpK3TjdQe32awuU/Hw68Auyl7yosQoN0uD7SWcq28vdx2faRf3558d8M00tcofJMM2ARrJLHcwm8hn5TM4lWlGU37Glg/Ayy/aTi0Ujc9vVH5Lb46m0xfYVqSejWpfmLddWsXtVIxj8xdYjohYKHpa4agHEfoeIKfaOyxDznx7OZ/+zTkXZmtuRVcNAPBQdqoH5OVf/QkvE3mW17fb7OjKv6eEPxkH3plKiNpqXsa8upC8kNTtbHAU3NN+Dk1iS7XL/UTbzWkcsOvPKeXGxg75yJawj2CHY10yv/dIfqL4n3L2Lz9ArA9h9zUExnhBqjKbdkXDUaRXZX3LLb4Rzvoswvk/JKAlKmTocONDAPeaTJR0j9mVVC0q4QSGnS+yuOqrxhH4aCKQR/ruCoyrt7eHJJaIVqVIL2ECPcLCrqEkSE8Q0a8YllFTmy77C+CBiI60MBPTjiDpL/Sl7zhEZ7MsLF7JjviHjxrtGlbMw/lwHqU/cjsD38XYxGqh4ndYG0Aguo1k/u5OZ+GpzNMLiHLW/CedCI0jRgRymGotReTMmvOP+mUzliAWfc= 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:(13230031)(4636009)(376002)(396003)(39860400002)(136003)(346002)(230922051799003)(451199024)(1800799012)(186009)(82310400011)(64100799003)(40470700004)(36840700001)(46966006)(83380400001)(2906002)(82740400003)(478600001)(356005)(41300700001)(4001150100001)(7636003)(55016003)(70206006)(70586007)(54906003)(6916009)(426003)(966005)(40480700001)(316002)(6666004)(86362001)(7696005)(4326008)(8936002)(8676002)(53546011)(40460700003)(36756003)(1076003)(47076005)(6286002)(5660300002)(36860700001)(26005)(336012)(2616005)(16526019); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2023 10:13:18.5996 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c15f0487-1f8b-41b9-29cd-08dbfa31cc16 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: DS1PEPF00017096.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV8PR12MB9082 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.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/13/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=c1001c18e68e2507e2484b55d8bd4bc16745755b Thanks. Xueming Li --- >From c1001c18e68e2507e2484b55d8bd4bc16745755b Mon Sep 17 00:00:00 2001 From: Wenwu Ma Date: Mon, 23 Oct 2023 09:46:12 +0800 Subject: [PATCH] net/virtio: fix link state interrupt vector setting Cc: Xueming Li [ upstream commit efc3f842b3dd69c4e65dbdf6cdaccde8c759b5d9 ] Setting the vector for link state interrupts should be done before the device initialization is completed. Fixes: ee85024cf5f7 ("net/virtio: complete init stage at the right place") Signed-off-by: Wenwu Ma Tested-by: Wei Ling Reviewed-by: Maxime Coquelin --- drivers/net/virtio/virtio_ethdev.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c index 11b9a4bc72..5e9ed47551 100644 --- a/drivers/net/virtio/virtio_ethdev.c +++ b/drivers/net/virtio/virtio_ethdev.c @@ -2356,6 +2356,14 @@ virtio_init_device(struct rte_eth_dev *eth_dev, uint64_t req_features) } } + if (eth_dev->data->dev_flags & RTE_ETH_DEV_INTR_LSC) + /* Enable vector (0) for Link State Interrupt */ + if (VIRTIO_OPS(hw)->set_config_irq(hw, 0) == + VIRTIO_MSI_NO_VECTOR) { + PMD_DRV_LOG(ERR, "failed to set config vector"); + return -EBUSY; + } + virtio_reinit_complete(hw); return 0; @@ -2675,14 +2683,6 @@ virtio_dev_configure(struct rte_eth_dev *dev) hw->has_tx_offload = tx_offload_enabled(hw); hw->has_rx_offload = rx_offload_enabled(hw); - if (dev->data->dev_flags & RTE_ETH_DEV_INTR_LSC) - /* Enable vector (0) for Link State Interrupt */ - if (VIRTIO_OPS(hw)->set_config_irq(hw, 0) == - VIRTIO_MSI_NO_VECTOR) { - PMD_DRV_LOG(ERR, "failed to set config vector"); - return -EBUSY; - } - if (virtio_with_packed_queue(hw)) { #if defined(RTE_ARCH_X86_64) && defined(CC_AVX512_SUPPORT) if ((hw->use_vec_rx || hw->use_vec_tx) && -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-12-11 17:56:23.451351000 +0800 +++ 0006-net-virtio-fix-link-state-interrupt-vector-setting.patch 2023-12-11 17:56:22.887652300 +0800 @@ -1 +1 @@ -From efc3f842b3dd69c4e65dbdf6cdaccde8c759b5d9 Mon Sep 17 00:00:00 2001 +From c1001c18e68e2507e2484b55d8bd4bc16745755b Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit efc3f842b3dd69c4e65dbdf6cdaccde8c759b5d9 ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +22 @@ -index 3ab56ef769..c2c0a1a111 100644 +index 11b9a4bc72..5e9ed47551 100644 @@ -23 +25 @@ -@@ -1912,6 +1912,14 @@ virtio_init_device(struct rte_eth_dev *eth_dev, uint64_t req_features) +@@ -2356,6 +2356,14 @@ virtio_init_device(struct rte_eth_dev *eth_dev, uint64_t req_features) @@ -38 +40 @@ -@@ -2237,14 +2245,6 @@ virtio_dev_configure(struct rte_eth_dev *dev) +@@ -2675,14 +2683,6 @@ virtio_dev_configure(struct rte_eth_dev *dev)