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 B37B7A0548 for ; Sun, 28 Nov 2021 16:01:38 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AD78C4068E; Sun, 28 Nov 2021 16:01:38 +0100 (CET) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2046.outbound.protection.outlook.com [40.107.236.46]) by mails.dpdk.org (Postfix) with ESMTP id 6D0554068A for ; Sun, 28 Nov 2021 16:01:37 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=egRaSUwERgniO8y5j0VEiSo20M4rbEQCQpWPjBZSmd0JHCuydN+RI/OKm4Zqtmtz3xOOtxVhHqUTHWK8SFoGMe+F6btFCQ+8eSpO/0yp0Gt9CfY+7TODWQ5YkWBDpjSubufa24pl/kybwaJOPIFq5GKQf+fLGQbxcrNwFIuxXwkZ7UFhdX3beV7ijTk/46bfqzImg37cLCV+BoqRqn2u2Gs+iaLskMgMiuKkeagEoSFCoMgpn1hXLYoI2sJ5KUU8DLWaBTw7ELAFkO056Eahl6O6WlR924QYhSZuuUPSmKkpYncpV9xokL6TIg8/ovYwNA5ySbYbbIeYtnXOYrgVfg== 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=ukGznv4nzFM767kpEF2183OHuQg17gaFCT9jl3An8hY=; b=CaKCkxDhqkKqNIK2dLfKhJquHHR+7vNw9zy4ceCddN1gI0j5GT9zRnrdVszxrtGZpxC2Jcu5XDI1p346rARQMxvQbhnDv2CHNCQuEjAysY6Cj37ZcD/4eNwqvCrArilXxv2qm5WE+oN5/NeB1Z1HcfsRBw5/JxAGFvj8rYjd27b7H1mQsxEn/NHuvUXg8m0+fN+dXxwcBPWP0hG10NwkzvKb1bZ2SLeht+UotdjJdyzkNFFx52c+OBJ2MJdJVstUPCpMsTiEp/fmSteXUF4gWgie4WOK3t9jx5OkJjlRVLYmbHpcpW2fxWEEVFZLZnh23UOpVAkbQP1UbPWDw93XDQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=6wind.com 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=ukGznv4nzFM767kpEF2183OHuQg17gaFCT9jl3An8hY=; b=YFTZVrzLrM9VkT4y9Mg7VnTLmEjCBaxfCjFw70WM9X8+7qWpVYb0JfZx7ld3s1Ucrylsvb7BkzQBMGHG5a2J+Ow9bB3RUG+dA48t2nUVnR2Hi+09N01AHQll5za5XtGz9cxapaHHVF/6FtDIjTtVSjA5WqA2LOKO9svhrhBQCJqh6lrO6wv15DKGBIgGyYlx9XjHDRYA9F9ctDMLbvPwwW8rc0qhO6hhWKOZfn7yLnnzCI/3ELJkRZvVAIqu+ECypmZw2T7Xlrn5ZOVwZ1k2nsmlnig6MupHHTUSVby9fX1M/umrAbXC41paJar9HHjjBKygdx5If7Fk2uGPPMajtA== Received: from BN6PR13CA0059.namprd13.prod.outlook.com (2603:10b6:404:11::21) by DM5PR12MB1545.namprd12.prod.outlook.com (2603:10b6:4:7::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.20; Sun, 28 Nov 2021 15:01:35 +0000 Received: from BN8NAM11FT064.eop-nam11.prod.protection.outlook.com (2603:10b6:404:11:cafe::a) by BN6PR13CA0059.outlook.office365.com (2603:10b6:404:11::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.7 via Frontend Transport; Sun, 28 Nov 2021 15:01:35 +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 BN8NAM11FT064.mail.protection.outlook.com (10.13.176.160) 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 15:01:34 +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 15:01:33 +0000 From: Xueming Li To: Alexander Bechikov CC: Luca Boccassi , Olivier Matz , dpdk stable Subject: patch 'mbuf: fix dump of dynamic fields and flags' has been queued to stable release 20.11.4 Date: Sun, 28 Nov 2021 22:54:04 +0800 Message-ID: <20211128145423.3974892-61-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: 9bb79475-866a-4010-b4bb-08d9b27ff89c X-MS-TrafficTypeDiagnostic: DM5PR12MB1545: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:9508; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: s4r9wd6BtNTP6KAPyhR6EKLzwzFe+03JKrklia/+D13CJMX3lDLPK5wjt5wjC+By4NDsZjBUneSblma7MIIL6Qt5UH6mIkAmAN55spIgdyNnUjZ7pfwYZv1qLGRc60orn/HTyAaTVXStUmyY3U4irSmalU1bC5h5k6uY2JIIe453N+ipfiK/UXbxLhDSF9ijn3zYcmNUIlVG5sZOFeIz2x8SFDxd7Jwwd6sMsy61OUxBuCfi980R+shP6pPfoC7SM79rSwNA/fO4jJx+sDkpTM1ZYkXmidmX+XOxF0LY4SZgBIkuSiTqHUYbxIPdi30qoeeXNQmxDbGM9DCQ1pfXV5HTTQ3rcJ/frW5EUTwvrYoW8ulg7UuL01soriaXVKbde8/UfrbCqTzrrzKTG8egBj/3ud0MgdSpOqJ/XqRfZHJIkGJR47nHlHLAcg6oopAKrtFN0XLtyYdxVWKwJIvvXh1eyd2GabNIV0axb4bStD3jYMUukNxZmh735MqV8klCaPER8eKxN3ILXzepQHKzQbu6kvZFbG3FWUJa71/pQBpQgNdfanh6Xsx/oq9ctUnUQAw6dSMSG6wPmFaCpN5cSUa99oeHANOnHHdc/GO17iOJN25Q5NcYGAlevttFL6xiwAZZ9ytYm1eftG9tSzRcPK3+TYoirNIVrLjFaDr8idVg2+aAVyJz+wLC0QgY22Szb/to0Gvq4UMw6tO6Wglr9YPkpkABv36bYSvfyQwZ7FprXRb3jxBXwPmyTF92sSUxHSjfVR0oPN0r2uZ58SWWgHocDJ4XkYPmRsM2GDIEsEH7CnjBLFT88mMYOOnNEozs9j7W9hCUErRjAnVJAx6oMw== 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)(46966006)(36840700001)(82310400004)(426003)(7696005)(6286002)(8936002)(316002)(47076005)(86362001)(4001150100001)(55016003)(54906003)(2906002)(2616005)(356005)(6666004)(4326008)(16526019)(36756003)(1076003)(7636003)(8676002)(186003)(70206006)(70586007)(336012)(6916009)(5660300002)(26005)(83380400001)(966005)(508600001)(36860700001)(53546011); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Nov 2021 15:01:34.9506 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9bb79475-866a-4010-b4bb-08d9b27ff89c 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: BN8NAM11FT064.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB1545 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/f1e3e6d421ba5c1faccfffbfb55a79aaa5c2ba85 Thanks. Xueming Li --- >From f1e3e6d421ba5c1faccfffbfb55a79aaa5c2ba85 Mon Sep 17 00:00:00 2001 From: Alexander Bechikov Date: Wed, 24 Nov 2021 13:57:04 +0100 Subject: [PATCH] mbuf: fix dump of dynamic fields and flags Cc: Xueming Li [ upstream commit c0b48da45c151987f660b897c247132dac81021f ] The dump of dynamic fields and flags fails if the shm is already allocated. Add a check to fix the issue. Fixes: d4902ed31c63 ("mbuf: check shared memory before dumping dynamic space") Signed-off-by: Alexander Bechikov Acked-by: Olivier Matz --- lib/librte_mbuf/rte_mbuf_dyn.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/librte_mbuf/rte_mbuf_dyn.c b/lib/librte_mbuf/rte_mbuf_dyn.c index d55e162a68..0c463f5818 100644 --- a/lib/librte_mbuf/rte_mbuf_dyn.c +++ b/lib/librte_mbuf/rte_mbuf_dyn.c @@ -531,7 +531,7 @@ void rte_mbuf_dyn_dump(FILE *out) size_t i; rte_mcfg_tailq_write_lock(); - if (init_shared_mem() < 0) { + if (shm == NULL && init_shared_mem() < 0) { rte_mcfg_tailq_write_unlock(); return; } -- 2.34.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-28 22:41:06.351137328 +0800 +++ 0060-mbuf-fix-dump-of-dynamic-fields-and-flags.patch 2021-11-28 22:41:03.400206198 +0800 @@ -1 +1 @@ -From c0b48da45c151987f660b897c247132dac81021f Mon Sep 17 00:00:00 2001 +From f1e3e6d421ba5c1faccfffbfb55a79aaa5c2ba85 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit c0b48da45c151987f660b897c247132dac81021f ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -15 +17 @@ - lib/mbuf/rte_mbuf_dyn.c | 2 +- + lib/librte_mbuf/rte_mbuf_dyn.c | 2 +- @@ -18,4 +20,4 @@ -diff --git a/lib/mbuf/rte_mbuf_dyn.c b/lib/mbuf/rte_mbuf_dyn.c -index db8e020665..4ae79383b5 100644 ---- a/lib/mbuf/rte_mbuf_dyn.c -+++ b/lib/mbuf/rte_mbuf_dyn.c +diff --git a/lib/librte_mbuf/rte_mbuf_dyn.c b/lib/librte_mbuf/rte_mbuf_dyn.c +index d55e162a68..0c463f5818 100644 +--- a/lib/librte_mbuf/rte_mbuf_dyn.c ++++ b/lib/librte_mbuf/rte_mbuf_dyn.c