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 7A8C9457A1 for ; Mon, 12 Aug 2024 14:51:56 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6DEBF402C3; Mon, 12 Aug 2024 14:51:56 +0200 (CEST) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2058.outbound.protection.outlook.com [40.107.244.58]) by mails.dpdk.org (Postfix) with ESMTP id 6182C4029C for ; Mon, 12 Aug 2024 14:51:54 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ElS+9U3tl/dnpzd6uVpylNybttJFnix2tfdcv6dGc2Jjji8tdDHMv/VhaBvrjNg52ixf92TQ8ljHUjL9gvL92HA2AabbZV8YyG70U2YDo/G0sis6+gpTknDiE9flKhGwghaIhpelb7VrtAyjQpk63wLsle1GoCk7DZWyhh71fAeH2rHYb5j07OJRnvXcX2HrAT9kFPO8kMihPe1jGixmp3tutk3LDOyIEraUqJRiBruV4w/emrr4V1+354hpOKQeLPnvDHUmGQXth7q//UNrir5F/xt0UBwgfQ8BSfMv3yhHKnK4XxvDQ35SXCWk9562Ur8Nzg1V9EtkQtUiAR8zjQ== 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=D/D3Sod9bGMi6M50y6mjGX/YbLu6JzzWvKbjA3blQi4=; b=aVKE+JSHfdzVYnYUWmWDyvKewuXoYbUGUi60ngbNtWEC+1pQFcOTq09Wgyr+UYM2WMP9RO3Bhc02EEszwBNnj7FAdXHKlLBdvrQu0mPCHEDckak4Ao1bLXVqKs94GPsRCgxCmvanGzC107TVU1YTw201Pr6QSvorvogaQ8B/FnaGpZm4YRJ/arCwhRj42nXyg08B6LyzAA8vgYdUEgqhFASx7ht7awc1jc/zlKFYnnnsGSjWX8K2eR4OZb0VHZrExkzWwNU9xYFQ2D6MHq1Hohkt6Mjc6xKlvVivXgbBZ5H+Vm35B82mgAs02Q1OIsuIjHo82WNtkCsDuM1ISUme4g== 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 (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=D/D3Sod9bGMi6M50y6mjGX/YbLu6JzzWvKbjA3blQi4=; b=I6E6B6h1AYkTI8RnumezmIsKHdno8gk688JPcii8tMF7BplSaEWF5x7+ywXamoXGU6SnF9mA+11IlML5vPtfabC8OLTd+jU4Wk2jLX5VqSWFTPrW0Xca8jLhR7xjnvjh30F+DTYC+x6mgzEch+QvgiHRildD8t0nwLRLNTOp0hR6yYmo3C/DKmDgCmXiGf6iJ4PIaQDZfS5YhTSuyngTj7evPeaNiS/or08E7fGE7VRXV4Q96ZVAuaZAGY6ic94ztY6exkLO6c3esXdRnNAGrtJSCD6rsBdgFTkMWkHlT7rTTJHrP+NboOmR3iNayCGOuFYefDZkEae0c2muGxH2fA== Received: from BL1PR13CA0442.namprd13.prod.outlook.com (2603:10b6:208:2c3::27) by PH8PR12MB6940.namprd12.prod.outlook.com (2603:10b6:510:1bf::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.20; Mon, 12 Aug 2024 12:51:50 +0000 Received: from BL02EPF0001A102.namprd05.prod.outlook.com (2603:10b6:208:2c3:cafe::ec) by BL1PR13CA0442.outlook.office365.com (2603:10b6:208:2c3::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.22 via Frontend Transport; Mon, 12 Aug 2024 12:51:50 +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 BL02EPF0001A102.mail.protection.outlook.com (10.167.241.134) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.8 via Frontend Transport; Mon, 12 Aug 2024 12:51:50 +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; Mon, 12 Aug 2024 05:51:34 -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; Mon, 12 Aug 2024 05:51:32 -0700 From: Xueming Li To: Wenwu Ma CC: , Chengwen Feng , "dpdk stable" Subject: patch 'dmadev: fix structure alignment' has been queued to stable release 23.11.2 Date: Mon, 12 Aug 2024 20:48:04 +0800 Message-ID: <20240812125035.389667-8-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240812125035.389667-1-xuemingl@nvidia.com> References: <20240712110153.309690-23-xuemingl@nvidia.com> <20240812125035.389667-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: 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: BL02EPF0001A102:EE_|PH8PR12MB6940:EE_ X-MS-Office365-Filtering-Correlation-Id: 37056062-a41c-497d-dd6f-08dcbacd889b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|376014|82310400026|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?fjmzBOAS78Vvj3l1hGS6N5h2OR7JI4XlSpNsYRsj7lY/ViMYXaf/NBnuX8lo?= =?us-ascii?Q?MhcqoU9v2XIYzpgVXGhaFA9TGPpFSi5m2NaBNzFHDxGLIdaLk5Vg9wvujNHE?= =?us-ascii?Q?smpLYX4BbR2klfGg5EKx4I26GPGsZwP/auK86Gv2fHtTa5ejwDvzL2umDg5v?= =?us-ascii?Q?yNBcRePP8ELJ3ahYP+DqUzkyae4wDBtaAOaZGdkBYTEGIGsjxpQuS3Pr22Tq?= =?us-ascii?Q?cxOVnAvkNg8fkxv7+hQBh+1oUgGuPsDpP1jxNNhVo88WKgSlDfRFBHJ4gEyF?= =?us-ascii?Q?Tdfu9YlMMtiXKTGyWi4AH9kayWtybbPuFxow85any12StPJ7i1Hvvz/iyMzE?= =?us-ascii?Q?p21s2RsEPAkvLL30xrPMBT7AmSEwb5Gj9njKAZfQuwmZhmDfZP4XjSp8VCLF?= =?us-ascii?Q?/n5a+CCUEQ2r0ERfxAoKAJwrVA29XOKS6dGT/RjpkYnvgSOwmQuncN6EizL5?= =?us-ascii?Q?2AF5HMGfHqouSebDxx2BfkDHa2CGxDzH+udhACK6rJFbK9BXkeht/uojsx03?= =?us-ascii?Q?vQwrdjuvxWAxUKfGYnNkhdzOjJepdXxKWHZkzX0I9yID4KNF+4WVQ6dWSFwN?= =?us-ascii?Q?ypE/hJZby8vBtO/4R/ctPajCkDCwE8faaoDWwyZYtu7oR9cmFb2Ytlw47p9n?= =?us-ascii?Q?j6C02leSBSJdzELhTsEA3NWwqcPrPJOjoecExKmPK8r6p7rtetQCmDJHbADh?= =?us-ascii?Q?5h2m/6m+l37mm8JaAlp8JUdz/63uYH7oJerb/hTYXRP6XI2PYUyfaz3q5oMF?= =?us-ascii?Q?lltQinN/l1NXM+o1LHn4WjR/hP9OAXFlPAacB2wzlUE47hGjSf4U+g7AXLcQ?= =?us-ascii?Q?mzDHt7O+Hh3WIx6gQ7+GQJIEBYKjL3OMuk0WvvnI/VuLpGp2AlYOtX8N26RD?= =?us-ascii?Q?QB5yC4wTF9FAswWTIGIo2oKKbRS8lnOqg/n1UJ6Whl8XZbr/7hRXdqSnLdsF?= =?us-ascii?Q?Y3kr+3+CkEijbvgJvJ5+gihpzVgIn9fdYzNLqBLre66nbnF4dphK24+YjTZS?= =?us-ascii?Q?zFTSZxaGWWrIZyklTnHWvy8hkBH6J96JxkDpl4U5cS1Frj2oxL6QLaIG0HQG?= =?us-ascii?Q?c8sopBtzSOttiCNQWVmA8KVGgdUrUzBFOYJrWKdhpEkSU9hZsulIxdb3YtEo?= =?us-ascii?Q?pzBB48QwKVtHBQSmcDPk6jsc/UahjUao70Gno8VoKi9q0gEPOAKa/qJNnbWx?= =?us-ascii?Q?ZY2IldB4r7I3fCgLBkHkP0sCQsGXgiATBKyHcJKZuvl0ZZ2f8O3mci6Frh2U?= =?us-ascii?Q?+DNhSVgnToWdYV2FfhTp/UOl7C+yTFtAuWZ4FB/HqZVXxD9isbl6SbcEz3JV?= =?us-ascii?Q?m+UFaI0Sa7QJBIZWMSrMXzGRdZmQAOd7gvYIZ1Zmt/cUyhMpzOM7DSZSv1nu?= =?us-ascii?Q?7W4yVhyX/ORfrTENOs+SHHsJ6btOlZKAKZfVvZ0ebYr1SC4JBE7A0z0Xj4TP?= =?us-ascii?Q?C1ONxkvklalM9ral6HEy6hMkQUaFbA/g?= 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)(36860700013)(376014)(82310400026)(1800799024); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2024 12:51:50.0714 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 37056062-a41c-497d-dd6f-08dcbacd889b 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: BL02EPF0001A102.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR12MB6940 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 08/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=583796e298412568ee7f2e1d9b13fc891a11b7d3 Thanks. Xueming Li --- >From 583796e298412568ee7f2e1d9b13fc891a11b7d3 Mon Sep 17 00:00:00 2001 From: Wenwu Ma Date: Wed, 20 Mar 2024 15:23:32 +0800 Subject: [PATCH] dmadev: fix structure alignment Cc: Xueming Li [ upstream commit c15902587b538ff02cfb0fbb4dd481f1503d936b ] The structure rte_dma_dev needs to be aligned to the cache line, but the return value of malloc may not be aligned to the cache line. When we use memset to clear the rte_dma_dev object, it may cause a segmentation fault in clang-x86-platform. This is because clang uses the "vmovaps" assembly instruction for memset, which requires that the operands (rte_dma_dev objects) must aligned on a 16-byte boundary or a general-protection exception (#GP) is generated. Therefore, either additional memory is applied for re-alignment, or the rte_dma_dev object does not require cache line alignment. The patch chooses the former option to fix the issue. Fixes: b36970f2e13e ("dmadev: introduce DMA device library") Signed-off-by: Wenwu Ma Reviewed-by: Chengwen Feng --- lib/dmadev/rte_dmadev.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/lib/dmadev/rte_dmadev.c b/lib/dmadev/rte_dmadev.c index 31a268cfdb..5093c6e38b 100644 --- a/lib/dmadev/rte_dmadev.c +++ b/lib/dmadev/rte_dmadev.c @@ -158,15 +158,24 @@ static int dma_dev_data_prepare(void) { size_t size; + void *ptr; if (rte_dma_devices != NULL) return 0; - size = dma_devices_max * sizeof(struct rte_dma_dev); - rte_dma_devices = malloc(size); - if (rte_dma_devices == NULL) + /* The DMA device object is expected to align cacheline, + * but the return value of malloc may not be aligned to the cache line. + * Therefore, extra memory is applied for realignment. + * Note: posix_memalign/aligned_alloc are not used + * because not always available, depending on libc. + */ + size = dma_devices_max * sizeof(struct rte_dma_dev) + RTE_CACHE_LINE_SIZE; + ptr = malloc(size); + if (ptr == NULL) return -ENOMEM; - memset(rte_dma_devices, 0, size); + memset(ptr, 0, size); + + rte_dma_devices = RTE_PTR_ALIGN(ptr, RTE_CACHE_LINE_SIZE); return 0; } -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-12 20:44:02.871464447 +0800 +++ 0007-dmadev-fix-structure-alignment.patch 2024-08-12 20:44:01.895069255 +0800 @@ -1 +1 @@ -From c15902587b538ff02cfb0fbb4dd481f1503d936b Mon Sep 17 00:00:00 2001 +From 583796e298412568ee7f2e1d9b13fc891a11b7d3 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit c15902587b538ff02cfb0fbb4dd481f1503d936b ] @@ -21 +23,0 @@ -Cc: stable@dpdk.org @@ -30 +32 @@ -index e64b279bac..845727210f 100644 +index 31a268cfdb..5093c6e38b 100644 @@ -33 +35 @@ -@@ -159,15 +159,24 @@ static int +@@ -158,15 +158,24 @@ static int