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 8DED441D8D for ; Mon, 27 Feb 2023 08:06:13 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8A22340A84; Mon, 27 Feb 2023 08:06:13 +0100 (CET) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2079.outbound.protection.outlook.com [40.107.244.79]) by mails.dpdk.org (Postfix) with ESMTP id 02E4440A7D for ; Mon, 27 Feb 2023 08:06:12 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cuKFJYnFXPqx+EIrPjc2V4BgBxBos23ZYSTMYf+ACZutDHReZhegpzrXnjz1tYfKbup0dB+FoXQOMIEK0pbKFjdMAs58ts0OVuU3cE+zu6FkC0TKRA22YRlG7i6OeoqfYpEk2o/aGEayJ+5Q142txzAUbmOE/Lczw8UTCY5Lx3qhmRg+fDKH4o58QvYDZOH9h14/UNilZPpVgBnGuoOmh2BrMmDs/ppdeQ6eSEGTSywve1VQGwDFaRIcqg5KvQkKKNoiA6Dej4ACAWpewHtcUmCW9k9V8kaQJJsyjdRT/0FWEjtFnnNGv0r91jWo0I0JuRoGMgPkStaE0SeDKbmJ3A== 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=ObKEd6IPLZj6xrK8LnlZ/B2GZk15mbdZLLtB52CNnUY=; b=AuZKD0JquyrLyu9oihgtfyU+QrI4TgD0Cir1+BxF0JqwqGdxEQjfSKgJDA7V1OY0ONvAxPA2Me10UlDUqEmule1pyV8kfOSjY5fO6cHiXP0Q1TZI09yk9qTAc8SLGmjZRVpjCGvgwqZ/nNRV7kcsJa0mzlQFi2wb4qGnicTUji6TMOECGj6EDo44et6RryHjeDNqJg26QVulmevwigvg9v1GItS0bbbbLbWWOXcAhkCuRheuI0sjicCFi0PM8wnqsS8gqdjC+co/fvYAqQqt7+eoSnd5Y7f5aZXAzp0NmdrGvm3+WS+k1HcHPaVTXYcwOf8Vj7uz0Y9duOl6krxDxQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) 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 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=ObKEd6IPLZj6xrK8LnlZ/B2GZk15mbdZLLtB52CNnUY=; b=Xhns0+znwWszNOARmLP0iSRKR1E4CfmbI5SIBfXzrv06oKRDFSCNatY5+6kA8JJb18QeOGg3CGi4mjVTsVKvhWEbs2xZgXbDXLg5hgc4Fl0aaECoTOkeV5eT4xOaRPcjqb5n1ObBin1qGgPAzavdu/mQJRViiH943dWe5gK0Pn/5ut/ParHfpTAjLpWhkuWHJ80yTIrMdB9HrxwZWvlB286C0g13C5yVrxaUihRlZCuSCGFMHxD5RXO9wciYsqXtVjxGKRBTBZeN9BxI6YgBCqV8+k9HZFFA1DhRYdVIhZbkRqIAPgsmYc0s8CUJQ0hsm0FsodSqEaZPid+HmcPr9g== Received: from BN8PR07CA0031.namprd07.prod.outlook.com (2603:10b6:408:ac::44) by SJ2PR12MB8064.namprd12.prod.outlook.com (2603:10b6:a03:4cc::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.26; Mon, 27 Feb 2023 07:06:10 +0000 Received: from BN8NAM11FT021.eop-nam11.prod.protection.outlook.com (2603:10b6:408:ac:cafe::9a) by BN8PR07CA0031.outlook.office365.com (2603:10b6:408:ac::44) 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:06:10 +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 BN8NAM11FT021.mail.protection.outlook.com (10.13.177.114) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.14 via Frontend Transport; Mon, 27 Feb 2023 07:06:09 +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.36; Sun, 26 Feb 2023 23:05:51 -0800 Received: from nvidia.com (10.126.231.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:05:45 -0800 From: Xueming Li To: Wenwu Ma CC: Wei Ling , Cheng Jiang , Maxime Coquelin , dpdk stable Subject: patch 'vhost: fix net header settings in datapath' has been queued to stable release 22.11.2 Date: Mon, 27 Feb 2023 14:59:10 +0800 Message-ID: <20230227070107.15664-42-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.231.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: BN8NAM11FT021:EE_|SJ2PR12MB8064:EE_ X-MS-Office365-Filtering-Correlation-Id: 37c79598-3769-413f-8279-08db18911ab3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: OvP0ojtvR8mfOvY72qFibBSqbg1rPZ9JPdFERmhtrr+vTxQFoq8lh/D9P8EcP5/hVb7dgLvguxCQ598nAIwfFAK4V35q9o4+YcNF/7KcWb9QOv111g+yiewKUNi8SWg+cM2X3sooVByPyM1Wp4bH40I+udAAjb5LiLFSlK5kd+jaYDWZh6iINHVE5tC4GHWUZbuBGK+bzHgwhsCiIaAyeJwtJO1I6hjQQTVitDG0a7egrSAN9JdMcbWglSDAVjEGkRrnOQKA/Ta8DfSQFkJFkaT68TLZzwgvzaI9EzlsTHPTgY/TUYPPrthxz8rVwOXJbPhi874eoPLwF8A1/Z0siVcYkK0neS9MWjUpoCWYNeiTbBVVSO8L/jE3VAKiL6Rkztym6DQpHIVovgsFPymcGgovKSxE2VL++jPXRIkHawqitaacOavUwzxLuYu/uYVjLEXCj+9dyE+m1WoFYRvOibu2MuifEJDL9FLKmxszekCh/jPaNS0wgHC0K78bkCPfZNNX7V/kMUbVZfnLJ76NEEylO54OIz8qJOeAbxeUCg42MWVOcBT/PSbyIVwv5mSe8078BKPmEB2EKQ5EDLjrT00kKVDqJNNy5yXxPxaJAxvd0qZyytLCdQFhnhCp4ezwLqEofrQxEJ0y5XO60z5ZhPxJe/0NrjiYSFKQv7MFtAaC/fM5hx+Ub8GXYxOFqq/LFdvEQ13QMR9CsSGdvGiSXN6XDebL1FeF9uK8Iq4GwtEdMMNFwauiBCvCUQngLg/idpya+9hJ9NXPSvrCpT0xrEVLg5Kl/IHiYFoM3/a7Tooz9LtuSFFGL24OxLUeRYiT 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:(13230025)(4636009)(396003)(346002)(376002)(136003)(39860400002)(451199018)(36840700001)(46966006)(40470700004)(316002)(82740400003)(2906002)(478600001)(36756003)(5660300002)(40460700003)(8936002)(34020700004)(55016003)(4326008)(70206006)(6916009)(70586007)(40480700001)(356005)(8676002)(7636003)(54906003)(36860700001)(41300700001)(82310400005)(336012)(6666004)(86362001)(426003)(47076005)(53546011)(186003)(2616005)(16526019)(6286002)(1076003)(26005)(7696005)(966005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Feb 2023 07:06:09.8322 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 37c79598-3769-413f-8279-08db18911ab3 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: BN8NAM11FT021.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR12MB8064 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=be1187e1a647c69e887cb08e65dbd4c38c57d3fb Thanks. Xueming Li --- >From be1187e1a647c69e887cb08e65dbd4c38c57d3fb Mon Sep 17 00:00:00 2001 From: Wenwu Ma Date: Wed, 4 Jan 2023 10:39:45 +0800 Subject: [PATCH] vhost: fix net header settings in datapath Cc: Xueming Li [ upstream commit b9c1ec8577936419c8801dfad61e848b3535295f ] In vhost sync batch enqueue, the "num_buffers" of virtio net header is not be set, but it should be set to 1 if the mrg_rxbuf feature is turned on, This patch fix the issue. Fixes: ef861692c398 ("vhost: add packed ring batch enqueue") Signed-off-by: Wenwu Ma Tested-by: Wei Ling Acked-by: Cheng Jiang Reviewed-by: Maxime Coquelin --- lib/vhost/virtio_net.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/vhost/virtio_net.c b/lib/vhost/virtio_net.c index 9abf752f30..a3dbf8cb10 100644 --- a/lib/vhost/virtio_net.c +++ b/lib/vhost/virtio_net.c @@ -1453,6 +1453,12 @@ virtio_dev_rx_batch_packed_copy(struct virtio_net *dev, sizeof(struct virtio_net_hdr_mrg_rxbuf); } + if (rxvq_is_mergeable(dev)) { + vhost_for_each_try_unroll(i, 0, PACKED_BATCH_SIZE) { + ASSIGN_UNLESS_EQUAL(hdrs[i]->num_buffers, 1); + } + } + vhost_for_each_try_unroll(i, 0, PACKED_BATCH_SIZE) virtio_enqueue_offload(pkts[i], &hdrs[i]->hdr); -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-02-27 14:08:42.287661700 +0800 +++ 0043-vhost-fix-net-header-settings-in-datapath.patch 2023-02-27 14:08:40.759237000 +0800 @@ -1 +1 @@ -From b9c1ec8577936419c8801dfad61e848b3535295f Mon Sep 17 00:00:00 2001 +From be1187e1a647c69e887cb08e65dbd4c38c57d3fb Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit b9c1ec8577936419c8801dfad61e848b3535295f ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org