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 308AF45CE3 for ; Mon, 11 Nov 2024 07:34:08 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1F2DD40E1C; Mon, 11 Nov 2024 07:34:08 +0100 (CET) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2041.outbound.protection.outlook.com [40.107.237.41]) by mails.dpdk.org (Postfix) with ESMTP id E29F740685 for ; Mon, 11 Nov 2024 07:34:06 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=IoSwDgfu/aDd51ZsxqVQyOBaiaRlocWzkCW7xvB1AFCEg9brhp0ra3j3kqPGk+4A35vil6ZBfou0loSaUHG/D34hQOiY/fk+rlmxp0pmn7KoJR2KSUlBLX2VCIbWebOuabEHFjRbNo1b0HeTVH2PGZOC0TRrU074eiPxUFqMRCrmr1rOIo5GLq0LOjsfxyX3lonRkJpI+2dXGx0xQRHSk/Tc4MFA+29/fm78eAuCyTwHZEXvPHVUyO0TZJZ/DxTdBxu3aphKEUvs0ZJXtVs9GhSEm97792Sa3nShxAfcluhh1UXQvMDYaP/snZSWVSbxGYdavPUuCQmbXIcs4CmxjA== 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=dYNVQwwbG7ubFixfdZ5kDqnwVcFpIo/QeX/4iTc1uBk=; b=A/gqKIM2oBw6wFanLpN+dO1L5nL1pedywlOi0WqDuka1erw2cuxAav0aFD5iJ0dEMAGKMXZdDUmZdLtym1X1N7qPus3DQY/ECnfVDrb7sY3FHxHs6UhtqFNwrs6aqk/FzGVjMYEGIde8jDyxMbvPqtITW1ykzCrZX/krLYSw0en9eWSzfEfGvK0t5J4Fdcg32lHN9n6P+DZDOGb1mAphD09uyfWuLJ7G0hASVrrt3Cp1X6e39wyNAmBXI+RZ4rIyhcTh/AqeZQ4EOYyMcnFhpRDUSfeg9q4GwK64y/6pItc1afQniAiDimqEcFCNmRxSmbuN/ZnEFlu1lBYup7LTrQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=dayudpu.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=dYNVQwwbG7ubFixfdZ5kDqnwVcFpIo/QeX/4iTc1uBk=; b=oTcmI8eImT6YJcuco/O9y98JLP4A+Rdc6F1x2moebCqDn1P7ZmJv07QQa/jG1ZsQIUicobIzeGc3coXQQi9zmQp5zzsbH3P5/r3X9+gi+4ACdn6XEcSCusVGbm9xKNov5QpAA+1ScQOn4ySjVgfAESicHV/wazTXuSmUIAaLjd/FlJuXFeMAnsP5lNA7+sObF1idQKXV/+MTxG1nn9fHF5jq+g0EjcoLBdjp9IgZ3Ivx5aFXI0XpeWc3zUPc0R/fGeKDNKpDXxBM8X8Lb755khesIUaAM53sJlejZ0oLIbDZowpUKseCE1QN6i2w0DtXn/SdGp5zw3KrFvQarRT+YQ== Received: from BN9PR03CA0652.namprd03.prod.outlook.com (2603:10b6:408:13b::27) by SJ2PR12MB8737.namprd12.prod.outlook.com (2603:10b6:a03:545::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8137.26; Mon, 11 Nov 2024 06:34:02 +0000 Received: from BN2PEPF000055DA.namprd21.prod.outlook.com (2603:10b6:408:13b:cafe::29) by BN9PR03CA0652.outlook.office365.com (2603:10b6:408:13b::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8137.28 via Frontend Transport; Mon, 11 Nov 2024 06:34:02 +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 BN2PEPF000055DA.mail.protection.outlook.com (10.167.245.4) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8182.1 via Frontend Transport; Mon, 11 Nov 2024 06:34:02 +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; Sun, 10 Nov 2024 22:33:50 -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.1544.4; Sun, 10 Nov 2024 22:33:48 -0800 From: Xueming Li To: Bill Xiang CC: , Chenbo Xia , dpdk stable Subject: patch 'vhost: fix offset while mapping log base address' has been queued to stable release 23.11.3 Date: Mon, 11 Nov 2024 14:27:32 +0800 Message-ID: <20241111062847.216344-47-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241111062847.216344-1-xuemingl@nvidia.com> References: <20241111062847.216344-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: 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: BN2PEPF000055DA:EE_|SJ2PR12MB8737:EE_ X-MS-Office365-Filtering-Correlation-Id: dc5a9c1c-d447-4287-9c61-08dd021ad4fc X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|376014|36860700013|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?zGlUz1J4Gf/emAkdK2YI/XOnGNNgBaEPggWbUFRmVlEy/KX00WElEgcOL+ls?= =?us-ascii?Q?N0YW+hepncP+fBhlcleY3SDicuwdrIb8VD9lPKMa7Y1QXiClTY5eEBxOBzoZ?= =?us-ascii?Q?fWgW8brxqWoFbZSz/+NYV92w+OdQIp8yLopbno+SdPxyvDesLzialuBA5N4A?= =?us-ascii?Q?cgH+nu3sx3WjyH4nNPS0L0QXpfG4EW7F0UxyQyqVLlY4CchNKT0v/r0Vd0AJ?= =?us-ascii?Q?Ok05rsPHRrPNcFK4+gL7YvrmJYQy7ZiuEkp5jPPOa3rsLYVkyTm+/DT/42QY?= =?us-ascii?Q?8e4rEnZxVw+Zpz+MEjpvEvQ2y3cFnVXu/2r5tWw/O0/w3o6aJwC3J9mDyqZr?= =?us-ascii?Q?iRUSPYWZwrWEVMExkWF2C9WiTo4jaDv5ya/8FjNFN7Y14HHF5ZRBd7s7He7K?= =?us-ascii?Q?6hj7RXSaS5x+aYAsXrZlG3kzknXOjfHhZt2DuhdH+NLXO8zFK5vEbZoYQonT?= =?us-ascii?Q?CX0MNimetz7N6k4pTrxxk0mbhFiLIzgUwo7th+NGEYE1rgoJoOfbwETL1jGJ?= =?us-ascii?Q?lDsEocKRoXQhB3tjVtYxFLN76MqOW18b68PicWdKgvUpC8yaSmhHvPD6qTXW?= =?us-ascii?Q?neVUdILtldjl3pDD4pEFfTNn57xnlGwZH4vLtUHWqLE1pVkvUFir91P28XQy?= =?us-ascii?Q?/LXR8nTPda9KHisQpjGH2sXkuOyrnI7IT2QwCmp7vmKwZQLXx7ur/CwpCCEB?= =?us-ascii?Q?8YRv39xEdHBxfW8SCmbhHPeWQnmQtFXHEepq0BLTnYOklNxifCRFJKG2SXhW?= =?us-ascii?Q?INIwsgrd+6LMYxHYACdqRpyDA4CLu5lnfucAd/V2IOddkuSf/fb48YrJA3S4?= =?us-ascii?Q?RM49s1RpPwj7i2GVobx+EN8AUZY8NqnwC8hoJz0+uKMMPovNAo5mJHkNhtup?= =?us-ascii?Q?vtkYf5R39H3cJAftnK1e3eOTHOzcUoOK3RoRH7uNf3Jg6UjSSsRAEwwaGUYN?= =?us-ascii?Q?Fd1v772sY6Tg7gg8WVLOYvnFa0jle6z2kLE4Yf5CZqUVUZN581KfTtJK0XuC?= =?us-ascii?Q?IgrmIJXQTH/vhWZRmPEWplgACucs6hN45oQdVPigg4WC94lOegIsmqA+MCqe?= =?us-ascii?Q?HRZ9PdHEJU2RKzYf6hNF6DIenqo402LI6DMS8E9e1nnhDVzLms4tDsZiXlub?= =?us-ascii?Q?uDBDpyvctu9G3nR8hLr5kueAPDh8rmE7I7BMhUNPsTARBQuPk8jhJ+m5YcBM?= =?us-ascii?Q?996EWBUMB+IDAWGxA6EXhkEIO/LMJRX/N7BfR42kXbQGYeNz6g2s0+cslHX8?= =?us-ascii?Q?rMAJOzWRyFcDljWd9qVoPbSxyZ1gLE5UX3h8ZNo8Et8GtIuilPT5VvzTj+ej?= =?us-ascii?Q?mL/IAVWCCymF1/7/F5iOcBc4i0ufE//S4gQIdBoSqxKJxXtspF26iLsdrtgr?= =?us-ascii?Q?vw7FrvDRmJw7WyrOjFPDRyTxxgezYo5xGlNniXVKQSco4UGyaQ=3D=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)(1800799024)(376014)(36860700013)(82310400026); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Nov 2024 06:34:02.0223 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: dc5a9c1c-d447-4287-9c61-08dd021ad4fc 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: BN2PEPF000055DA.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR12MB8737 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.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/30/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=1f2330c670d1bedb5e54a790eda3874d402ab88d Thanks. Xueming Li --- >From 1f2330c670d1bedb5e54a790eda3874d402ab88d Mon Sep 17 00:00:00 2001 From: Bill Xiang Date: Mon, 8 Jul 2024 14:57:49 +0800 Subject: [PATCH] vhost: fix offset while mapping log base address Cc: Xueming Li [ upstream commit bdd96d8ac76ca412165b2d1bbd3701e978246d8e ] For sanity the offset should be the last parameter of mmap. Fixes: fbc4d248b198 ("vhost: fix offset while mmaping log base address") Signed-off-by: Bill Xiang Reviewed-by: Chenbo Xia --- .mailmap | 1 + lib/vhost/vhost_user.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.mailmap b/.mailmap index 4022645615..f4d2a72009 100644 --- a/.mailmap +++ b/.mailmap @@ -177,6 +177,7 @@ Bert van Leeuwen Bhagyada Modali Bharat Mota Bill Hong +Bill Xiang Billy McFall Billy O'Mahony Bing Zhao diff --git a/lib/vhost/vhost_user.c b/lib/vhost/vhost_user.c index f8e42dd619..5b6c90437c 100644 --- a/lib/vhost/vhost_user.c +++ b/lib/vhost/vhost_user.c @@ -2328,7 +2328,7 @@ vhost_user_set_log_base(struct virtio_net **pdev, * mmap from 0 to workaround a hugepage mmap bug: mmap will * fail when offset is not page size aligned. */ - addr = mmap(0, size + off, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); + addr = mmap(0, size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, off); alignment = get_blk_size(fd); close(fd); if (addr == MAP_FAILED) { -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-11-11 14:23:07.286278496 +0800 +++ 0046-vhost-fix-offset-while-mapping-log-base-address.patch 2024-11-11 14:23:05.112192840 +0800 @@ -1 +1 @@ -From bdd96d8ac76ca412165b2d1bbd3701e978246d8e Mon Sep 17 00:00:00 2001 +From 1f2330c670d1bedb5e54a790eda3874d402ab88d Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit bdd96d8ac76ca412165b2d1bbd3701e978246d8e ] @@ -9 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +21 @@ -index ed4ea17c4c..544e62df7d 100644 +index 4022645615..f4d2a72009 100644 @@ -22,3 +24,3 @@ -@@ -183,6 +183,7 @@ Bhagyada Modali - Bharat Mota - Bhuvan Mital +@@ -177,6 +177,7 @@ Bert van Leeuwen + Bhagyada Modali + Bharat Mota @@ -31 +33 @@ -index 5f470da38a..0893ae80bb 100644 +index f8e42dd619..5b6c90437c 100644 @@ -34 +36 @@ -@@ -2399,7 +2399,7 @@ vhost_user_set_log_base(struct virtio_net **pdev, +@@ -2328,7 +2328,7 @@ vhost_user_set_log_base(struct virtio_net **pdev,