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 63413A0548 for ; Sun, 28 Nov 2021 15:56:00 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5547F4068A; Sun, 28 Nov 2021 15:56:00 +0100 (CET) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2089.outbound.protection.outlook.com [40.107.220.89]) by mails.dpdk.org (Postfix) with ESMTP id 4DBFD4068A for ; Sun, 28 Nov 2021 15:55:59 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aR0+Ip1Pswvegp+D0Sr11Z2lOjS3fum0F0EPhEKza1ixqCC9VxmRMxdkE1PnV2eKC8f8bj2a1zm9DNcH99HfemUZ36nGcg+v4+w1lhjp2irHaJTujyWSTvB/m4WI7HyhjraLPwlPb16L83NGXnh+HGQ6TlmeLhL+ei2NLCj0RPC8dwv7JnkgJMCupCws6y5LLHN0aORVuJjEnJlcI6GYYiA7xE91KwWZFoY5lao4SF4XHYJOUAnCln65/6AJ6iM1zT+W9IxJy0A7PwoceaohIrs+QKK+wWGyWEP+xeX+4Iw1bz3kbIUoBhXT1jAQfgVy4Q+pRYQOgR+kq/gGmcrn1g== 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=B75wWpwUCLScT+0HuHAO9PdjGJ/mcjSoYkNCWFiwajM=; b=T69QwckogixxTGt3qgQ4I3mcBs6NcCqZi9i1ZBMagMvv/XI90J4wQ2bGrrLR9BrMPVbNQXEBngfGOlpAqIeCoUYfEzf3fSTleMPmWutkP+ezUtqnSkf7AoT3FJrkNnNmcXAEzJ4u/c9/L5+cU854JcIBRai0kATLl8n57q6wqkwqbP8vwjAwisE6UUOogAJgkqRYkVEEbrKmdnonnE339VMmAJAtjpjP0B5nVncWgN1E4UxeiR8jKQliYM+EedhQUlMaGemiCwCnn/ieUwonDpnOWOv0JeE0UbMl1v7dl72kpI21qVcxKqlkkjRZIYRKRWsx63VMHIf5izaeOpcXdQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=quarantine 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=B75wWpwUCLScT+0HuHAO9PdjGJ/mcjSoYkNCWFiwajM=; b=q+KhuyhQNKWxwNQRqXs6SHyisDDWTGD/PMwwNUbHf+J0ebbVxjO4uzPDwyJWE8uveIJp0jeuUNCXfhgwd0NUssipZYRMi8TqMc+5mHyC9zD05Lms/tJpOXtNG//uoBubkliXDeCMV89R7s8NTS5YC/8jrJSvt/w8087mMIiZvuEcR3QsUcsiTNdhm2PKefVx/SV7Pf77PC5Ngixopn90MlD3DQR7gp4VlvdbF8Qo8kCJQ4JGkD8UsqVHJLxE9e5zLH7EwoFk7t9tiiRf5ucbSjkBO+oPApQlnucplz1R8JYIsB9GHUDe92vyNKU4EQL2qtnUsHgcrsGVOTFLChAA6Q== Received: from DM5PR17CA0062.namprd17.prod.outlook.com (2603:10b6:3:13f::24) by CH2PR12MB3720.namprd12.prod.outlook.com (2603:10b6:610:29::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.19; Sun, 28 Nov 2021 14:55:57 +0000 Received: from DM6NAM11FT053.eop-nam11.prod.protection.outlook.com (2603:10b6:3:13f:cafe::18) by DM5PR17CA0062.outlook.office365.com (2603:10b6:3:13f::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.22 via Frontend Transport; Sun, 28 Nov 2021 14:55:57 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) 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.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by DM6NAM11FT053.mail.protection.outlook.com (10.13.173.74) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4734.22 via Frontend Transport; Sun, 28 Nov 2021 14:55:56 +0000 Received: from nvidia.com (172.20.187.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Sun, 28 Nov 2021 14:55:55 +0000 From: Xueming Li To: Matan Azrad CC: Luca Boccassi , Viacheslav Ovsiienko , dpdk stable Subject: patch 'common/mlx5: fix build for zero-length headroom array' has been queued to stable release 20.11.4 Date: Sun, 28 Nov 2021 22:53:14 +0800 Message-ID: <20211128145423.3974892-11-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211128145423.3974892-1-xuemingl@nvidia.com> References: <20211110063216.2744012-1-xuemingl@nvidia.com> <20211128145423.3974892-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL101.nvidia.com (172.20.187.10) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9912336f-67e5-4402-e655-08d9b27f2f1a X-MS-TrafficTypeDiagnostic: CH2PR12MB3720: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fST4b2B6+/sHwyKqkSfFbuI6wNcJJgPJ1uLGu287egro9vRQC7RsUEK+SQ+7zMdoYpXY8rIRco6VfhRBZ4IGR+4rt/VtrJSe2u3yXaWhjTEU3hjEt2hvaV3x4SSQZlSu2Szo4gLix/qVtCCimVky7OckCttnGy1BOClfUwo7qalfsI2zBi2OegRjx4K6zAblFhdWnn69w8Kw3gYWd4MgB4UXHYkkzxRRg0p0DnUEtmJKLqc+b96NsiRP1icx7KmqfgIQ6iDpIs4oSGZAB4pd73Adyfzk7+Qbypg7/MV5QCtH+rYoiLYcL77Y7h3mN1fZVu6W2IRH/SxByHPOyLcc2T/OfOdeTZra1y+SfZKln18Z3YerHLZSG2J1NKReJndtAfRqtT++4GZaoGA8ecm++NFe7hhl4rSrZQwy+50y4MEGiJ875geoUiAgE6NNtxPip5Up1pij98onn+KkvDneZJqTBwy1I3iD90hucT5SczMZ4/942cXey07NxGsf7fXArcEkJEjPq3AlzzAWYht+C3sECHUV5TOkJqkDiIRn9AxQpMLjiQkWJHcryMhj6UdzJAj3JGyxrvWe3QMOedUAyJ0WyKgOOpMxnmLC2LPHJOwJN21i43iw4FxHOReEtBFnfmYz8Ue+pJzyJXaSsBmC6zfBUTd3vh9Kr1g9qnnXg/YE08Ejm/UvsXpGek6Xsr8tvfXKMXWSwhaCLS6d6XkmG+aTB9FfrfgfSSjtJk9qDKsGdvY7SHiETYTgWECFK35whdano96HQ3SXEOjnf6TQfGqbTG8feZiBY842JZC1CvTruPfOxifk25hvefc6QRRjgLgvOkcRIuejA3aOyNkRKQ== X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(36840700001)(46966006)(1076003)(508600001)(966005)(336012)(7696005)(4001150100001)(37006003)(55016003)(426003)(82310400004)(7636003)(6286002)(356005)(6666004)(4326008)(6636002)(83380400001)(8936002)(5660300002)(36860700001)(2906002)(186003)(53546011)(86362001)(6862004)(16526019)(8676002)(54906003)(70206006)(70586007)(26005)(36756003)(2616005)(316002)(47076005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Nov 2021 14:55:56.9489 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9912336f-67e5-4402-e655-08d9b27f2f1a X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT053.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB3720 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 20.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 11/30/21. 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://github.com/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/7ae03fc171b21609212c6ed69d79e7f5f72a5811 Thanks. Xueming Li --- >From 7ae03fc171b21609212c6ed69d79e7f5f72a5811 Mon Sep 17 00:00:00 2001 From: Matan Azrad Date: Mon, 8 Nov 2021 14:22:04 +0200 Subject: [PATCH] common/mlx5: fix build for zero-length headroom array Cc: Xueming Li [ upstream commit 8594e2a64ffe54b57f06a259d2be694096b8dccb ] The structure of the striding RQ(MPRQ) buffer includes an array size defined by the RTE_PKTMBUF_HEADROOM macro added in [1]. When RTE_PKTMBUF_HEADROOM is set to 0 in the compilation config file the compilation with debug type failed: "In file included from ../drivers/common/mlx5/mlx5_common.h:25, from ../drivers/common/mlx5/linux/mlx5_nl.h:12, from ../drivers/common/mlx5/linux/mlx5_nl.c:22: ../drivers/common/mlx5/mlx5_common_mr.h:96:10: error: ISO C forbids zero-size array 'pad' [-Werror=pedantic]" Actually, the array for the first stride headroom is not needed: Each stride in the striding RQ buffer includes the headroom of the next stride, so the headroom of the first stride should be allocated before the starting point of the buffer posted to the HW(HW buffer). The striding RQ buffer is used as an attached buffer to mbuf and have shared information per stride. The LRO support moved all the strides shared information to the top of the buffer before the first stride headroom but didn't remove the old memory of this headroom from the buffer. Remove the old headroom memory from the striding RQ buffer. [1] commit 7d6bf6b866b8 ("net/mlx5: add Multi-Packet Rx support") Fixes: 3a22f3877c9d ("net/mlx5: replace external mbuf shared memory") Signed-off-by: Matan Azrad Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_rxtx.h | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_rxtx.h b/drivers/net/mlx5/mlx5_rxtx.h index 4d043d2015..b2a891c8f6 100644 --- a/drivers/net/mlx5/mlx5_rxtx.h +++ b/drivers/net/mlx5/mlx5_rxtx.h @@ -69,7 +69,6 @@ struct rxq_zip { struct mlx5_mprq_buf { struct rte_mempool *mp; uint16_t refcnt; /* Atomically accessed refcnt. */ - uint8_t pad[RTE_PKTMBUF_HEADROOM]; /* Headroom for the first packet. */ struct rte_mbuf_ext_shared_info shinfos[]; /* * Shared information per stride. -- 2.34.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-28 22:41:04.069713835 +0800 +++ 0010-common-mlx5-fix-build-for-zero-length-headroom-array.patch 2021-11-28 22:41:03.216876184 +0800 @@ -1 +1 @@ -From 8594e2a64ffe54b57f06a259d2be694096b8dccb Mon Sep 17 00:00:00 2001 +From 7ae03fc171b21609212c6ed69d79e7f5f72a5811 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 8594e2a64ffe54b57f06a259d2be694096b8dccb ] @@ -36 +38,0 @@ -Cc: stable@dpdk.org @@ -41 +43 @@ - drivers/common/mlx5/mlx5_common_mr.h | 1 - + drivers/net/mlx5/mlx5_rxtx.h | 1 - @@ -44,5 +46,5 @@ -diff --git a/drivers/common/mlx5/mlx5_common_mr.h b/drivers/common/mlx5/mlx5_common_mr.h -index 93903d8397..dc7ddc3513 100644 ---- a/drivers/common/mlx5/mlx5_common_mr.h -+++ b/drivers/common/mlx5/mlx5_common_mr.h -@@ -96,7 +96,6 @@ struct mlx5_mr_share_cache { +diff --git a/drivers/net/mlx5/mlx5_rxtx.h b/drivers/net/mlx5/mlx5_rxtx.h +index 4d043d2015..b2a891c8f6 100644 +--- a/drivers/net/mlx5/mlx5_rxtx.h ++++ b/drivers/net/mlx5/mlx5_rxtx.h +@@ -69,7 +69,6 @@ struct rxq_zip {