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 E739D46A63 for ; Thu, 26 Jun 2025 14:11:47 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E02C8402B6; Thu, 26 Jun 2025 14:11:47 +0200 (CEST) Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam02on2065.outbound.protection.outlook.com [40.107.212.65]) by mails.dpdk.org (Postfix) with ESMTP id 9ECC4402B6 for ; Thu, 26 Jun 2025 14:11:46 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=H/Kn+JZk2kZrYTpeE6cXOLASSJwAyoyMQtcT5M1e2MSBoER4OtOnJWC4xu4RLORi9sTK9Zy/yGfRsVJmCLHpsGm0wfFb+Dw8HQwbU0XUYy7NRs384xKdIU+MRid402W5PManzIHiHfU6Tklyvn1znbY4nL6X5DrDtoQA7v9IQpj92XtxTzBZ2zhpcdazrm06Gfvtgu9IlIUp+RhzSFFwYtIIxQoMQIFjwFPardLKD37pcMtZ0RhBFuQFdh8q6WN9I411Ln5g3S2+OvsaSc/M/mmOBqNzI/UowD18RxtLI1BxjIG50LI45Ba98xL4Xw3VSJ1IIik0tnUdWi093vmGpA== 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=bf+ECYpqomrlLLmznkmoKK8SNHXcAyiwlMutSFRT5iQ=; b=EsXXUC+YC7pGmt2DYYMpMKOPJtfekOfzAPRvdRynB/dNJ+UX3HzgN3Ir3I2Na+qc3WaFJWKPd55b5lFXLx1sYZZzlorF90CxcOP/0flIUa/gRA+1fWomDO/Bq/l0E1UzesievQToIBOl3lIVO98iIpLT+qpkKD9+MS7E1ZSB5p9+MIpn835xD5RkKFnpvHVTQ39tIJvZGaT4bdXDHzgNlrXMhrc3Xgn2X8D00UQpIMNTf0RDLfTyDWMdd9mIWCsNQMzVMsXBVQGromS7Yw8QlW9dMOqvnCrocD1x+DH8zW/7+l8O5Wfj63nBFORnf8OVL0yDZ5T5gcZLgka/Ujh6DQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=microsoft.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=bf+ECYpqomrlLLmznkmoKK8SNHXcAyiwlMutSFRT5iQ=; b=ax93da3VWhXWNS0nehCReHoRpwIk908lAKWFYrIWyQfRQ2lE+2zd5KLV7F5IJ4Rot7P7RcI3Q+z69LTFBsv5nZeRVa2/x9elZkbjTnNojR7EZDed9Ilz7vrYFwHOKeWzBOt8cgqeFFO83KgG539YLrjsiLuyPJEXMLlloFwjqeevzmKZdS04Oat/Q81vBgjnnEQq6ndjyAD1GHzRk5/adxWMMDDvgS6Wy3HkirORJdmhBsMee0mxo1ggy3iedXzv753WJ4onxhruILUwuIdSwit6fsvSInKABeFl06e8eSEaKgXWo0uU+jj2SVkNVi72fz2XUs8+olhCNLarsSo/4w== Received: from DS7PR06CA0052.namprd06.prod.outlook.com (2603:10b6:8:54::30) by SJ2PR12MB8181.namprd12.prod.outlook.com (2603:10b6:a03:4f6::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8857.30; Thu, 26 Jun 2025 12:11:44 +0000 Received: from DS2PEPF00003447.namprd04.prod.outlook.com (2603:10b6:8:54:cafe::2d) by DS7PR06CA0052.outlook.office365.com (2603:10b6:8:54::30) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8880.21 via Frontend Transport; Thu, 26 Jun 2025 12:11:44 +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 DS2PEPF00003447.mail.protection.outlook.com (10.167.17.74) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8880.14 via Frontend Transport; Thu, 26 Jun 2025 12:11:44 +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; Thu, 26 Jun 2025 05:06:04 -0700 Received: from nvidia.com (10.126.230.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; Thu, 26 Jun 2025 05:06:02 -0700 From: Xueming Li To: Long Li CC: Xueming Li , dpdk stable Subject: patch 'bus/vmbus: align ring buffer data to page boundary' has been queued to stable release 23.11.5 Date: Thu, 26 Jun 2025 20:01:06 +0800 Message-ID: <20250626120145.27369-47-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250626120145.27369-1-xuemingl@nvidia.com> References: <20250626120145.27369-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.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: DS2PEPF00003447:EE_|SJ2PR12MB8181:EE_ X-MS-Office365-Filtering-Correlation-Id: a01909be-2e0b-40e9-b6e9-08ddb4aa9ddc X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|82310400026|36860700013|376014|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?n/MgLQnP+OQF4E0pB0SpjMqITuY8LX+T6vDU231O5YjN2u3xG2eyHwRj16XT?= =?us-ascii?Q?TjgOkWWHvpBA5pWSWIHCWfJKth5ieJlxt13Lz84WEZqoAgNP65wYUKPfaBTi?= =?us-ascii?Q?i7UqeWwS4sA1fS9JaGEUAyTCsRNaZIhMUEUq7DCCg7/LJY7rU9sinDKglJ8f?= =?us-ascii?Q?Ojpy1Qgs+6Co/F2cjs5/6Mz2CsQ70M4Ah4K4ROCev4sp+d8cDavPPtvXGLmx?= =?us-ascii?Q?PsVJH13GdwGMjyU/wRe8+GbB/bn/izd2DzQGZ2frLJaprPy6QLx1kTyTzOKj?= =?us-ascii?Q?xQVTAvk3bLLPt0K+Gyo624RA0ZiWNdKZE3gbBizJclYTHWSv4wVjqZpyeG5x?= =?us-ascii?Q?6jJspMGbDs0OpXTbDyQiUF27/DjXjSHlnuPbIfaQTUO7JhIyA+9p0L8zT9Fj?= =?us-ascii?Q?TF8iUdBN8tt3SWeRDw4UM8a1aycMghOaucJbIHvYopAlGbX2b3HqgZSA4XQm?= =?us-ascii?Q?JJoJy5vjFvsb8YAQcQIaKHCzbjtCjs6G6GJUMDuq5M/zuZL2FErc8/JnNR0r?= =?us-ascii?Q?3reKgsW1YQDIwHwZiBYd8UVpWJGEvm0cSvGdbRL0KzOuWWTIGp0DywLCcSnc?= =?us-ascii?Q?ObqwyMGfbjAyj+MBD9IoTJM4QJbcxltpOum4n2NfdE0FsO40kaFDWPgcIuUk?= =?us-ascii?Q?WMdyXcVEff1Cf+pu47blY0WR7tI3Jm3d0WguPRGHh/YO/VrrlWwfoRCalKPY?= =?us-ascii?Q?7m2MSJ3WeKdWTNA+h3jYxIZBgdW6t/QAiVYR3rBSqIQ1JqoJPJJeN6Wb2amc?= =?us-ascii?Q?ja5x0rou0oI3LqGSAhleCNVlM73234vRUb4vNq3505KLq0g+mNcltxTwkB9b?= =?us-ascii?Q?D7t78l5m6fhaqaoAmRr4pL49KBKcW0qA4m4sm9MOQ8k2TrUVlY7rzzi2Jd1t?= =?us-ascii?Q?nhDls3xZW4xXa+evEOFzCdglbqQZh2RtVl9VMum25fUTHw66oRzMrxQa4G0G?= =?us-ascii?Q?bNca48WvXdGXlltaoFB5U4jAjwO8Y/nWJHMDir0l3ruAWmSS01N/wxLW+mp9?= =?us-ascii?Q?mXPrYfFVTxDiE26opHoakc6gABhdBLw5TUI3MkHayKnI4z7cISxSSORqm30e?= =?us-ascii?Q?UaD06nNvaR5x/rCwMDfv++7QeFzbrJG/SX4Z3HBdDwdghTz2P1UeW/s2KGmi?= =?us-ascii?Q?ZdsDggbpaTKvn+BEzgFQ0bjij62foNVLeyjhrAJUdQJp77WkspQlvPRd73ot?= =?us-ascii?Q?OUrdcb4XVRmyRxy03SjWQ7GLhEDu+Is5eiUynfq7iwZp8MtvBzLgsFQ1lopY?= =?us-ascii?Q?vrB0PM1ZuoN2MmFzVRzHGvNOczE6X6pEDVtl8Uz3erZcvkkc1zoizcV3xz6T?= =?us-ascii?Q?6kSqhE3YZXmi8+K2D6dVAWv0iVQ8szAxWsLeyrNr23zm2V1RMvWVgu4pAO2l?= =?us-ascii?Q?dG4feqzIbTdSSM4PYOkUxu4s7rpFobJABjVHHPrRSGH1a0aVcFco8jHJOStj?= =?us-ascii?Q?FFG0jvv9txer1I8hbfrHYdZzaZySF2W3vKbzrAAEscBOF+qndkKu+5mU0R9Q?= =?us-ascii?Q?MkgkLCGKfHUruDOfQ5ltliWkhjUvHD+WgPu/jM+lsx+GhotQ/QrGqTyKFA?= =?us-ascii?Q?=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)(82310400026)(36860700013)(376014)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jun 2025 12:11:44.0906 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a01909be-2e0b-40e9-b6e9-08ddb4aa9ddc 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: DS2PEPF00003447.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR12MB8181 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.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/28/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=3b68507506481889a63c300fa7f8adac7b193ff5 Thanks. Xueming Li --- >From 3b68507506481889a63c300fa7f8adac7b193ff5 Mon Sep 17 00:00:00 2001 From: Long Li Date: Fri, 18 Apr 2025 12:32:47 -0700 Subject: [PATCH] bus/vmbus: align ring buffer data to page boundary Cc: Xueming Li [ upstream commit c54fa45817932057dd8f275fa1b8e4dcaede7813 ] The ring buffer data region always starts at the system page boundary after ring buffer head. The current code assumes the system page size is 4k. This is not always correct. Fix this by using system page size for addressing ring buffer data. Fixes: 831dba47bd36 ("bus/vmbus: add Hyper-V virtual bus support") Signed-off-by: Long Li --- drivers/bus/vmbus/rte_vmbus_reg.h | 9 +++------ drivers/bus/vmbus/vmbus_bufring.c | 9 ++++++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/bus/vmbus/rte_vmbus_reg.h b/drivers/bus/vmbus/rte_vmbus_reg.h index a17ce40763..6257774f29 100644 --- a/drivers/bus/vmbus/rte_vmbus_reg.h +++ b/drivers/bus/vmbus/rte_vmbus_reg.h @@ -100,14 +100,11 @@ struct vmbus_bufring { uint32_t value; } feature_bits; - /* Pad it to rte_mem_page_size() so that data starts on page boundary */ - uint8_t reserved2[4028]; - /* - * Ring data starts here + RingDataStartOffset - * !!! DO NOT place any fields below this !!! + * This is the end of ring buffer head. The ring buffer data is system + * page aligned and starts at rte_mem_page_size() from the beginning + * of this structure */ - uint8_t data[]; } __rte_packed; /* diff --git a/drivers/bus/vmbus/vmbus_bufring.c b/drivers/bus/vmbus/vmbus_bufring.c index c78619dc44..fcb97287dc 100644 --- a/drivers/bus/vmbus/vmbus_bufring.c +++ b/drivers/bus/vmbus/vmbus_bufring.c @@ -36,7 +36,10 @@ void vmbus_br_setup(struct vmbus_br *br, void *buf, unsigned int blen) { br->vbr = buf; br->windex = br->vbr->windex; - br->dsize = blen - sizeof(struct vmbus_bufring); + + /* The ring buffer data starts at the 2nd page of the ring buffer */ + RTE_VERIFY(blen > rte_mem_page_size()); + br->dsize = blen - rte_mem_page_size(); } /* @@ -72,7 +75,7 @@ static inline uint32_t vmbus_txbr_copyto(const struct vmbus_br *tbr, uint32_t windex, const void *src0, uint32_t cplen) { - uint8_t *br_data = tbr->vbr->data; + uint8_t *br_data = (uint8_t *)tbr->vbr + rte_mem_page_size(); uint32_t br_dsize = tbr->dsize; const uint8_t *src = src0; @@ -170,7 +173,7 @@ static inline uint32_t vmbus_rxbr_copyfrom(const struct vmbus_br *rbr, uint32_t rindex, void *dst0, size_t cplen) { - const uint8_t *br_data = rbr->vbr->data; + const uint8_t *br_data = (uint8_t *)rbr->vbr + rte_mem_page_size(); uint32_t br_dsize = rbr->dsize; uint8_t *dst = dst0; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-06-26 19:59:19.629813050 +0800 +++ 0046-bus-vmbus-align-ring-buffer-data-to-page-boundary.patch 2025-06-26 19:59:17.390418044 +0800 @@ -1 +1 @@ -From c54fa45817932057dd8f275fa1b8e4dcaede7813 Mon Sep 17 00:00:00 2001 +From 3b68507506481889a63c300fa7f8adac7b193ff5 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit c54fa45817932057dd8f275fa1b8e4dcaede7813 ] @@ -13 +15,0 @@ -Cc: stable@dpdk.org @@ -22 +24 @@ -index 54a26d12bd..fb7e3043ec 100644 +index a17ce40763..6257774f29 100644 @@ -25 +27 @@ -@@ -100,14 +100,11 @@ struct __rte_packed_begin vmbus_bufring { +@@ -100,14 +100,11 @@ struct vmbus_bufring { @@ -40 +42 @@ - } __rte_packed_end; + } __rte_packed;