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 732284642F for ; Tue, 8 Apr 2025 09:47:34 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6583140E7C; Tue, 8 Apr 2025 09:47:34 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2086.outbound.protection.outlook.com [40.107.236.86]) by mails.dpdk.org (Postfix) with ESMTP id D425540E64 for ; Tue, 8 Apr 2025 09:47:32 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=CN9UUfw18C+CJ4FDu7AG5rOBiIM5fHPPMBu61PsKOcv5l7eoE1ZmGWLG2BVshjdbCFyM4NEGrYfvUtYmLmGTLZO/4+uBFSWKYAauZFrUayNZzW5zHoYwsrF0yC3Wuj/T0cx830NTfApUtuu+CSRpXz09kw0SucxXWNgRNXNi+EoRyfzmgoIY56/gsS/7CBQENwOfeMgfHYfIBmvSnjIYG9EQKnJ9rNtTMoJAx5sC5liiWi98ayaZHLNmBPE3sxRvUyZBd61Qc7BNtzKCVg6RQatwxRt+sXWxbZyJINXxKTYhZMZWazh4AN7TD/6LdZXKb2Tcyzbse8dzj6umit6GnQ== 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=zOrG/ZBOoAAeT/TD19ji9DRxTe78LQRorSskj7ePs/E=; b=WRCluRVj3mJlpjA58b0JyxkzG4RpnKDFeUx2Czx1i4YQN/7/diaWCp7afZ//KhphgIK2rNfw0m11mJ9/3exZXMgXsxRy84E47tCL1C86P+Uuc+57u6bYq1vJfgxQ8ae9Kpipds1kCf7ujD06Y7s4/8gc6zhyBQ2qyXAT+7LJ1T/ZGTeG8IXvQiWhHfVCQCR2CrmJMd29lzZ9kS/foXI7tAZZ1xL4kg6YNoOrcpCMiKg/AwSgsSxtKNJ1eHQePOyyYqR0ARqtb6i1Ty+z7xuM5x6nGaP9lVRGz6vYm9CQqGfUPhMaiwXVfByAjJMiSQs8LyLUZUz6ZnkqXykA0yNLuA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=huawei.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=zOrG/ZBOoAAeT/TD19ji9DRxTe78LQRorSskj7ePs/E=; b=p+1ENIfE605EMuy19yW7BosQWPRi7adGVq8fN708priOHn5IV4bZEg63OZoPlYIc5LGECclncTGBeLuxd36FtAIvt1JnEGiUt9frnTGCXLPmcUmsbMUoxNmoUAztnLhJ4Bfvlz6lVjYvs7zDfZLib/khAq8LCl/ADsQMWWYqElTLQSYd9D9+X0WbNfBELPSO8p1AWuHzNDLO3YQtgJjHYypwXBSS3QGjlg/tWi9MuEVJL2XGkizQ2yzcrlVfbMU1epPLMjAtZhMg5u70IqdhNqncTVA+D/jjOoomjbuNwbMRhzt4FhQoI/p9C8eMuB+BKegyN79holPenljdcU28DA== Received: from SJ0PR13CA0044.namprd13.prod.outlook.com (2603:10b6:a03:2c2::19) by SA3PR12MB8761.namprd12.prod.outlook.com (2603:10b6:806:312::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8606.29; Tue, 8 Apr 2025 07:47:28 +0000 Received: from SJ1PEPF000023D0.namprd02.prod.outlook.com (2603:10b6:a03:2c2:cafe::98) by SJ0PR13CA0044.outlook.office365.com (2603:10b6:a03:2c2::19) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8632.10 via Frontend Transport; Tue, 8 Apr 2025 07:47:28 +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 SJ1PEPF000023D0.mail.protection.outlook.com (10.167.244.4) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8606.22 via Frontend Transport; Tue, 8 Apr 2025 07:47:27 +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.1544.4; Tue, 8 Apr 2025 00:47:15 -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.14; Tue, 8 Apr 2025 00:47:11 -0700 From: Xueming Li To: Yunjian Wang CC: Xueming Li , Maxime Coquelin , dpdk stable Subject: patch 'vhost: check descriptor chains length' has been queued to stable release 23.11.4 Date: Tue, 8 Apr 2025 15:44:38 +0800 Message-ID: <20250408074515.361046-14-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250408074515.361046-1-xuemingl@nvidia.com> References: <20250218123523.36836-1-xuemingl@nvidia.com> <20250408074515.361046-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: SJ1PEPF000023D0:EE_|SA3PR12MB8761:EE_ X-MS-Office365-Filtering-Correlation-Id: 158eb0f7-ed22-4f50-d430-08dd76719be5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|82310400026|376014|36860700013|1800799024|13003099007|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?435ByO1/NFL5PE1fjXVbLD1k+t7SOgPGaTR6u5jr67zv8lpconIItdIeiIwU?= =?us-ascii?Q?7nScpqGsBKrxN0Fpe32KbYkKSF3kybxbq+UgC5ZDtaMP3Xy3ClRvzCqLD3t3?= =?us-ascii?Q?IALqRgxSybdSIaP+LXGCp2ZGoKNbk5V1RPsEkki9ry44SxVUbjPzkPWGJr70?= =?us-ascii?Q?aUvYtnMRcJ+4xFX7102H/VqIyv6GZ2eF77DEV59bD/8Dev3L4L1vgL5pN0C1?= =?us-ascii?Q?DIqAzB1XF/0zXAm4B+8wDfKdOmsowtxSqzwBuWbub1IZ3R+14uZj1QfrUYyk?= =?us-ascii?Q?NJsWAq0IBBp2C5egWLAMVxeGDZPQ+V/Au9BmYzA1/FZS4wZdcPtpeqA9H4pa?= =?us-ascii?Q?wwld8c6VPJsCHtdi3+7h7eE5/6htvPJBgKgOI8/nTm3TC6V5q6tTf+hnpgi7?= =?us-ascii?Q?/y87JpMP9rZBfzlr8SBWDrnH1C0EM2pT16yO5LEX11b0N47L4YXB25rrxxwj?= =?us-ascii?Q?3Oyey7NeiewpkoLIWauHSPx5Bl6Gw2dEP0Vugy0xnFG7rHg5LlCofZndFt4o?= =?us-ascii?Q?1cHtNFsMk9/XKS41jy0Vu4kZY7IkM9oLg5ONSFB82FQM2Q7K5jxnUE7FF8BM?= =?us-ascii?Q?7lROmgqoavPBQ1HzbmwzKpXQ99/bm1zgpv0sKifX86yEchRuG+7ADPHS/6wC?= =?us-ascii?Q?hZ6FbrR5QTBZPAeQOzoCR2kD5ocFBl1qZkf4ViHo1Rxc/vNOsNO1AbT5dRh5?= =?us-ascii?Q?9i95cGgwj8Po1Z7Pv5hIf2Wgjn55pKHhWUhjLIp3vCEuKkapy3hd4XrEdjYC?= =?us-ascii?Q?6Q+SbcsKtx0g5QhF9TqO5wPvoqKBgGJ1CMPySHeVa1racmV9a7eT4OZSvGKV?= =?us-ascii?Q?lwCjbUIsKvYTFdpQEi6fR99eQUEq/4hNs5bIN7iZJGhX6WDOmFozeb89eAUS?= =?us-ascii?Q?qi12XxF8eUhCylCsVuoq1VbWcraShhB+x2MhsT8M3f8mgB0adUeyRKI6AFid?= =?us-ascii?Q?ZPYMtWqdnepEDPgz5IxEymtAIl0vC6b8GJqC3FLUr/Nfdtc5AiEGKj9/O/M4?= =?us-ascii?Q?5WuSA3YD7l0MU1l02mJ646W5OERkwTlHxee/pdqi/njhjqOJh3BTitKcXfqa?= =?us-ascii?Q?3A5b4q4d6WM9u1iEsVU6GLq0+JOtxiTR7PhUfKj3IJ9cIOvj6MRffsTsfMRX?= =?us-ascii?Q?TtCerxdGZ5AO5BI0/b7ufVSXZboIxcVWOxkVwtwuqon/ELYnwO64zKp9oZG8?= =?us-ascii?Q?pHPFdqojLvmUu0h1ksf58AKuMrWCma7ZdVkYsgbCo0yZ5Ce8UKont14TnJm1?= =?us-ascii?Q?Hf3l1jbqHb/iyyjXo4C5J7Ivi+nZJdLVCzmEce02+uHed6JHUnr5VLfWfO+Y?= =?us-ascii?Q?XqTC3hKilE9gDwK8C31q/oZG9UFQceUqj+m2SYGjbREMoDt5e0C8fI5xe+0i?= =?us-ascii?Q?5IYHM4EVMzFau8NLyK9Wy3yAqZmtp6FhkJ6Gxt5/NYW2KEE1QGkVxom6n1MQ?= =?us-ascii?Q?xslkPK8yxChX6mH73eHWPfe1WUHbm7kgJd5Wi3RUau9200a7nrqubRGMQimL?= =?us-ascii?Q?d4dXteyKU1p6wqs=3D?= 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:(13230040)(82310400026)(376014)(36860700013)(1800799024)(13003099007)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Apr 2025 07:47:27.5077 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 158eb0f7-ed22-4f50-d430-08dd76719be5 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: SJ1PEPF000023D0.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA3PR12MB8761 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.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 04/10/25. 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=15b6460353de1a96760ed2a5d66e887a4d6bf07a Thanks. Xueming Li --- >From 15b6460353de1a96760ed2a5d66e887a4d6bf07a Mon Sep 17 00:00:00 2001 From: Yunjian Wang Date: Mon, 23 Dec 2024 11:29:21 +0800 Subject: [PATCH] vhost: check descriptor chains length Cc: Xueming Li [ upstream commit e31b57e732d52f3cd8c707824f79fef8c117df95 ] The descriptor chains length must be greater than the Virtio-net header size. Otherwise, such descriptor chains sizes implies no packet data. Fixes: fe8477ebbd94 ("vhost: support async packed ring dequeue") Signed-off-by: Yunjian Wang Reviewed-by: Maxime Coquelin --- lib/vhost/virtio_net.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/lib/vhost/virtio_net.c b/lib/vhost/virtio_net.c index d81b518462..da14271c6d 100644 --- a/lib/vhost/virtio_net.c +++ b/lib/vhost/virtio_net.c @@ -3932,6 +3932,16 @@ virtio_dev_tx_async_single_packed(struct virtio_net *dev, VHOST_ACCESS_RO) < 0)) return -1; + if (unlikely(buf_len <= dev->vhost_hlen)) { + if (!allocerr_warned) { + VHOST_LOG_DATA(dev->ifname, ERR, "Invalid buffer length.\n"); + allocerr_warned = true; + } + return -1; + } + + buf_len -= dev->vhost_hlen; + if (unlikely(virtio_dev_pktmbuf_prep(dev, pkts, buf_len))) { if (!allocerr_warned) { VHOST_LOG_DATA(dev->ifname, ERR, "Failed mbuf alloc of size %d from %s.\n", -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-04-08 15:39:06.405682226 +0800 +++ 0013-vhost-check-descriptor-chains-length.patch 2025-04-08 15:39:05.896436591 +0800 @@ -1 +1 @@ -From e31b57e732d52f3cd8c707824f79fef8c117df95 Mon Sep 17 00:00:00 2001 +From 15b6460353de1a96760ed2a5d66e887a4d6bf07a Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit e31b57e732d52f3cd8c707824f79fef8c117df95 ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -20 +22 @@ -index 0bf49169db..0348e8dac3 100644 +index d81b518462..da14271c6d 100644 @@ -23 +25 @@ -@@ -3960,6 +3960,16 @@ virtio_dev_tx_async_single_packed(struct virtio_net *dev, +@@ -3932,6 +3932,16 @@ virtio_dev_tx_async_single_packed(struct virtio_net *dev, @@ -29 +31 @@ -+ VHOST_DATA_LOG(dev->ifname, ERR, "Invalid buffer length."); ++ VHOST_LOG_DATA(dev->ifname, ERR, "Invalid buffer length.\n"); @@ -39 +41 @@ - VHOST_DATA_LOG(dev->ifname, ERR, "Failed mbuf alloc of size %d from %s.", + VHOST_LOG_DATA(dev->ifname, ERR, "Failed mbuf alloc of size %d from %s.\n",