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 061E545610 for ; Fri, 12 Jul 2024 12:51:47 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F16D742F02; Fri, 12 Jul 2024 12:51:46 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2068.outbound.protection.outlook.com [40.107.236.68]) by mails.dpdk.org (Postfix) with ESMTP id B0D1A40261 for ; Fri, 12 Jul 2024 12:51:45 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=H9ErmmJvN08yoh1aV3SxWvDfXPoxfAl8seswatKmxEgmySb76BSjXEV8Od+EZ1TnJXlH0ULzOCd9hWrQxhbV8tPyMSyT5Uqf7VX7+hiCgaNta7tX01+Z2TS0wfMsDih5dR46H9XU2zmBdLfKK2Irpy2eF4HoK8X2nCc5Pkl2eXIVJAfkDs9mqM7HKota9ctwKh0bDAKFW7r0eC6KkQkpseSHkNQ15kin6PEenA5d/s6SyVkrsdDAfQdF9H9aAys+gHc4+Hu8cL/bFvPWHVnhfOFNGpuIufggGevfCh4GRh0K5sSw07ZSuobkMIEowWWia0Jet5XkttYCZWsbxqoKoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=fT8NyIhhGbBGgPwJ+8ig9G86oA6ePPTMgrNntaTAVEY=; b=yEVAiCI4D8Ja/D7yplYsFrm9KoELtgyjaH0Cc6/hnpsgMHBJTRplVVn+vf6fHlMMyTMLcrqjX21E0p56Z51Q80+994+iAKx8cEymBWMQ2/EeZcdjOFEfOvdmcJ4ILG0uWCNPAqqPZx+orwrA/QQdHnVtzz+humnHAodFMMh3MemNitsPAnlWJogxMXW1k3/TN40RxVHJuNvdJ/fZJsYPAFqKIOJq8Md0hIUnNllB+mQlE/Dz13lzfRpKqxF5yhkE9Ah3Zg/RSYkku2XT6MVPCrT8OzwhNXpDeEmQYX4CdwARKKVwkaV17kdcgZFx1SSZCjEp0iG1RyyQM+s4QDAmmw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=redhat.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=fT8NyIhhGbBGgPwJ+8ig9G86oA6ePPTMgrNntaTAVEY=; b=LI4b1GvSJTlxViGAjod2y2hRrDoWy+ybm+dHI66n+VjngSxeLQQ/jgolbFYiudWwx4NZQYfnhcJVNqKCmxbE+VIrAPyt/LAdZcQ0blkW//Da0yqnZU/rqqXziixUsXDIRXth/tOcMRQybvn4RUjnZf/G80/x5znRPZWDhotHhtdT/O9Xjk7s7REF/gTYM/+Y8DPhbpb4kQBbYId06N4RQYMVmQyMdLvRfKV9FJqsYxdjHJ8X5H1P28Ok9jCXd+pMBi7/cbWY9MkVkvzDudv7bbnKoIDgmhNodgvwJog2D7ykFJAS0qKLcgyRZZ3FX4QvVk91YuHq6dn1D45qgFzCKg== Received: from DM6PR02CA0146.namprd02.prod.outlook.com (2603:10b6:5:332::13) by BL1PR12MB5731.namprd12.prod.outlook.com (2603:10b6:208:386::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.23; Fri, 12 Jul 2024 10:51:40 +0000 Received: from DS1PEPF00017098.namprd05.prod.outlook.com (2603:10b6:5:332:cafe::9a) by DM6PR02CA0146.outlook.office365.com (2603:10b6:5:332::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.23 via Frontend Transport; Fri, 12 Jul 2024 10:51:40 +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 DS1PEPF00017098.mail.protection.outlook.com (10.167.18.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.17 via Frontend Transport; Fri, 12 Jul 2024 10:51:40 +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.1544.4; Fri, 12 Jul 2024 03:51:24 -0700 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.1544.4; Fri, 12 Jul 2024 03:51:22 -0700 From: Xueming Li To: Maxime Coquelin CC: David Marchand , dpdk stable Subject: patch 'net/virtio-user: fix control queue allocation' has been queued to stable release 23.11.2 Date: Fri, 12 Jul 2024 18:44:41 +0800 Message-ID: <20240712104528.308638-56-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240712104528.308638-1-xuemingl@nvidia.com> References: <20240712104528.308638-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: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS1PEPF00017098:EE_|BL1PR12MB5731:EE_ X-MS-Office365-Filtering-Correlation-Id: 12b91bfd-be15-4592-4c75-08dca2609c9c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|36860700013|82310400026|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?N70Nx7WO0MVyiujZYe0b4uwn2NFMnQEEZkMffVN9tcjDZ76bVGq5GYGjK379?= =?us-ascii?Q?s64PUa/oYWAm+ZWiYXoo977tv7nRc3FpK8o+aO/ijIcwdOdeskBE97+S1Z4p?= =?us-ascii?Q?oEn3Pg5KIiDCgoTeFh+q0sWZ4DeY5viOGYi30gigyQew+m4dmiGm1ft5JI2b?= =?us-ascii?Q?KcXNWUupVuMsAdhsgRiC+ed5f8ylR8E8WfMe9sTnHHWKcIkM22krOY7sR/DB?= =?us-ascii?Q?nh/WJgO+dGvcUFZxFeaopQRJd39Bvr2fOV0jtIkLOWxSIAdI6bmGnvzTw9Pd?= =?us-ascii?Q?DEVqUk9nvyw6neZlBNKN2TLxzjBvhcBOLqAhLFYd2In21Map+Oa2bFPd741I?= =?us-ascii?Q?j3aCKMD6/5gSTCWN4XU6H1VU40prjXtS+GJqmSGY7afViXgiuSnvq15n12CH?= =?us-ascii?Q?WeYXLOB/R790PdKRvrCeyz9M95YydVlzPFVxij9ZNXgqVBmFpeq23I7O7fOI?= =?us-ascii?Q?LgwkwQJDCa1J5hrgtmoQj4R4YjpMPm96p0iFnGzIMqcTiPSiyEZj2vjHvRee?= =?us-ascii?Q?7DDixH3POYA7v0yoi4TuEqTTkExMTnpk+bMRRmqhOjbc8MqrdDeMNCE0LdCV?= =?us-ascii?Q?Xak0Lzd+D1g99NQtS1UuQ/1gndPR4wqrAbdCNfldpH7RquY7N6ePL+hZhWiD?= =?us-ascii?Q?lz+4Fo/+l7Y31w+SsVR30gbJVdRgZy82VryAHVij1f6bOTvRuqU0J3fmH0kM?= =?us-ascii?Q?pPkGkpYipvzbbLTdnJfn9Ok+8HDFhtO1T25FKZo54B3kPX1juM2Ddmjk4ErP?= =?us-ascii?Q?R6tpH2jdNykZ4HMXZ9DvG/CBh+Jn9KVt05fCAs0LQXr1YNnCkZDfrdoZn6M/?= =?us-ascii?Q?CgjQtbgS+KyRfddo3/TC8Y8IB+b114neW1W9Ps1rwQLxNXYt1dhZlpf29AwI?= =?us-ascii?Q?3OnMi0zgmtKUO6tzSRpfEx8h9d+42z1qOdOcFB5tY3gTtayQDFp/gyDagm4s?= =?us-ascii?Q?xj1HpTsC7mRFn46LHYQDFGA8/v0CoFNJN9471pEBAQUmKz1Lq/68h9za5BWg?= =?us-ascii?Q?zH1iPc+WKJX20PfLoiK4oPPYMJefraY2w6fXGStRlr39fxOlb8sKNuvTmwre?= =?us-ascii?Q?mI8Qr2jGFZz3kzN1H9tH4U9OxREz0lthJsvtrQtx6WHxYa/ZBHw/bNwiXraV?= =?us-ascii?Q?QHM48DIL2O0RRcPHLC4yzlRhyUUa40TZDijKTccTbjMU+MVNrpn3RIKz3/oA?= =?us-ascii?Q?FLB1vOofW1pzS9XK6MuLUTRKLVD7+UO3N7MAZc4X6WgnZQv2S1I496qFf2bj?= =?us-ascii?Q?eqNqnST5p07AzMgfojMWLm1bl/WxNK5TbjapR5yiKNfzjCGFxPZHgkocf5o1?= =?us-ascii?Q?u2YJBINeKzw8YMkuwljuKmdOW1lK90oC7BHBUuMzrrS7mi9PDOe/vBBlpSJs?= =?us-ascii?Q?SVIlXM1ZgwRsd71BYKG1YtYjji1JQxgNinxABaa9E6brfDF2sfMIjM54gz1i?= =?us-ascii?Q?iGPaoQbhZGOAcmEZ6nqIQueh0RkagcIy?= 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:(13230040)(376014)(36860700013)(82310400026)(1800799024); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jul 2024 10:51:40.6098 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 12b91bfd-be15-4592-4c75-08dca2609c9c 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: DS1PEPF00017098.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR12MB5731 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 23.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 07/14/24. 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=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=76310fc7c1ccf9296e30baabf7eb13d4e5067623 Thanks. Xueming Li --- >From 76310fc7c1ccf9296e30baabf7eb13d4e5067623 Mon Sep 17 00:00:00 2001 From: Maxime Coquelin Date: Thu, 28 Mar 2024 14:08:13 +0100 Subject: [PATCH] net/virtio-user: fix control queue allocation Cc: Xueming Li [ upstream commit b80947743f5ebee74e2d03ece9d5a9826edde968 ] It is possible to have the control queue without the device advertising VIRTIO_NET_F_MQ. Rely on the VIRTIO_NET_F_CTRL_VQ feature being advertised instead. Fixes: 6fdf32d1e318 ("net/virtio-user: remove max queues limitation") Signed-off-by: Maxime Coquelin Acked-by: David Marchand --- drivers/net/virtio/virtio_user/virtio_user_dev.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.c b/drivers/net/virtio/virtio_user/virtio_user_dev.c index ef320d3395..209435a865 100644 --- a/drivers/net/virtio/virtio_user/virtio_user_dev.c +++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c @@ -20,6 +20,7 @@ #include #include "vhost.h" +#include "virtio.h" #include "virtio_user_dev.h" #include "../virtio_ethdev.h" @@ -608,7 +609,7 @@ virtio_user_alloc_vrings(struct virtio_user_dev *dev) bool packed_ring = !!(dev->device_features & (1ull << VIRTIO_F_RING_PACKED)); nr_vrings = dev->max_queue_pairs * 2; - if (dev->device_features & (1ull << VIRTIO_NET_F_MQ)) + if (dev->device_features & (1ull << VIRTIO_NET_F_CTRL_VQ)) nr_vrings++; dev->callfds = rte_zmalloc("virtio_user_dev", nr_vrings * sizeof(*dev->callfds), 0); -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-07-12 18:40:16.727094612 +0800 +++ 0055-net-virtio-user-fix-control-queue-allocation.patch 2024-07-12 18:40:14.106594227 +0800 @@ -1 +1 @@ -From b80947743f5ebee74e2d03ece9d5a9826edde968 Mon Sep 17 00:00:00 2001 +From 76310fc7c1ccf9296e30baabf7eb13d4e5067623 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit b80947743f5ebee74e2d03ece9d5a9826edde968 ] @@ -13 +15,0 @@ -Cc: stable@dpdk.org @@ -22 +24 @@ -index ba067d6d9c..1365c8a5c8 100644 +index ef320d3395..209435a865 100644 @@ -25,2 +27,2 @@ -@@ -21,6 +21,7 @@ - #include +@@ -20,6 +20,7 @@ + #include @@ -33 +35 @@ -@@ -615,7 +616,7 @@ virtio_user_alloc_vrings(struct virtio_user_dev *dev) +@@ -608,7 +609,7 @@ virtio_user_alloc_vrings(struct virtio_user_dev *dev)