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 B3B93A0C3F for ; Sat, 12 Jun 2021 01:05:17 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AD9FD40FDF; Sat, 12 Jun 2021 01:05:17 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2041.outbound.protection.outlook.com [40.107.93.41]) by mails.dpdk.org (Postfix) with ESMTP id 29B5A40FDF for ; Sat, 12 Jun 2021 01:05:16 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jJSmoOZ/Nau8wr7yYwLBgk/x5JeeDPH28zg6ScoEhFXutsDYXVbydvwyWgiGRl+BO3QbpgDeWc0DHtO0Z+FPwdLDNsJTFmBpKfXQilCFouWaaisbOIUb4cSLZ4mBl13ZJ+7C3H6Vc8BPsQMT010ITQMiOI+5/7qvC1oLaHD6c7S4SddQeaSgtBmofm1lCJrCR2x9Lf/CTANFXEqZ2cJIcOiJuRs1Wb8jvyr8kw7b0sPqwXQJ8vlSzJEOWF6fleY28LegcOf2Scmi5gpgXG0/ch/hIungm404YKh/YyB/9Y7c+92EWfrCaV3fL2MpnSEr2bITVqxj2L4exCL1S7IJgg== 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-SenderADCheck; bh=A49w8B3Dhec4kmB164usVMXgjN1MEWl8ysnpPA9Cs7I=; b=auPXvnV6C3avg1qxYSoNfF8+jTwKmMg6+9OUiszG7yIma9JSJFURFn7lFMcR1cY3rdcfP2A2owqf5ugOhte8JyE+YY4Ik4rsLRHTTsddqJHrK0+UsxUp1254KptYUjEU6GviIDYxtdmOvZy18bCoMn81o4Rs6gs1CvYLrd5i+QYqAx2+eiu9iEFKMkMqOzBIn30V5sT7Ee0ISC12P74KC0rcglvr9gXD1vptR5seIp0edBBKvyKtt47eF2QorPAVgYA95NWX/jNJhsGxSpilEvOU3RAIr2MCkT4kDUKtvyPEe3q9UFoyzZVvlsP5OUS9/mijEaGxoGX9yJEsCOs8sA== 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=none sp=none 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=A49w8B3Dhec4kmB164usVMXgjN1MEWl8ysnpPA9Cs7I=; b=IhPRGXr09+y/CmXUbj92i9wp/bKfu2PBi9HCOt9absArZx89PW3T3J61DJs5x3xH8pyg6eeGlVddPi0IYcZkP8L4/Rqgo0odG4htUODJheNiJGUB2J9eIAoO245K9cmWqKDD8U2h81zSJNC9LBHfZmnXoA+lFMxN5tRLBJC7CSAmNnTgzdHSCmh7Ig7+WLPPm05DP+1ZD6pBXk5atBB4JP+5fmPJBKfIyHI9QTo9AarRFkmSexWtDsS8f6zoqHJg9TbYvsuai8jI3FiFVH8GRIka4SyWnuVPHzoP2s8whLu4oDdmekFTrnOSiT4L90s7GKDQn73E+/cbfGcc+kjoRA== Received: from MWHPR21CA0030.namprd21.prod.outlook.com (2603:10b6:300:129::16) by BN8PR12MB3457.namprd12.prod.outlook.com (2603:10b6:408:67::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4195.24; Fri, 11 Jun 2021 23:05:11 +0000 Received: from CO1NAM11FT006.eop-nam11.prod.protection.outlook.com (2603:10b6:300:129:cafe::19) by MWHPR21CA0030.outlook.office365.com (2603:10b6:300:129::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4242.4 via Frontend Transport; Fri, 11 Jun 2021 23:05:11 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; 6wind.com; dkim=none (message not signed) header.d=none;6wind.com; 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 CO1NAM11FT006.mail.protection.outlook.com (10.13.174.246) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4219.21 via Frontend Transport; Fri, 11 Jun 2021 23:05:10 +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.2; Fri, 11 Jun 2021 23:05:09 +0000 From: Xueming Li To: Chengwen Feng CC: Luca Boccassi , Min Hu , Olivier Matz , dpdk stable Date: Sat, 12 Jun 2021 07:01:39 +0800 Message-ID: <20210611230433.8208-5-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210611230433.8208-1-xuemingl@nvidia.com> References: <20210510160258.30982-229-xuemingl@nvidia.com> <20210611230433.8208-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: HQMAIL105.nvidia.com (172.20.187.12) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2f3136c0-68ca-4c82-f355-08d92d2d5d36 X-MS-TrafficTypeDiagnostic: BN8PR12MB3457: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:9508; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AYPTOkRspjcqSBrIUIfiyo/yedOMUZMSqMlfg6ErIa1FkDrAo2wmvn+U6PVZfQzifSLWITGZOWb4+iHP/Cc4r/US6F4ERGX1NKJVAuaHJS5wxRGXsrmDwL89hzQZD9F2t11K0Amh+i1KhbfnIczfmUQV/gjfOH50uKwUadfr1Df1nxUfElHa3+4JEX8k+pPGhlxCePTwrk8xf6GaODosIYlLdly5GJk6oI8RT1ru7Q6HILgUSUp0NbP3nwxebU+tzJqvkY3L0Vn2nLEQsAuYDjx9mHX1xG6hNt7CLrgMqqEYlNz29BUq1XVvLoEJ0yh85+k24I19KO2rEkuYgeaKz+VhWDj3E/q5nApdjanOWtYnIN3+XHY+Hig53rLDsqavoKrhNy1yXFiW5alpkqzMailu2NArQfH2pzJ60heKA12umybNjpemXqoybNsJCoIRE3yFfjw5sFCUpH39OnZOS+ENwX5TLJqx8ELS7vX6VBoko/dtS/+UhBujeha8gy755NrWjXyDWY7DsV2CRxLEDrOzdazygIXHDTgmuxD4ArY30KFYNMWYGsPM5wmqxSQeK7pP/s5C0QH05zTnQCt1s9OzRZoiXC0z7GU7XO9eIkdiJfxPVU2wM0LXOONF7JwFyc0sE/el7R6JvuVh5ujK7DWPNaiIqWS/P0vQAoRUUO4KuTSZLJ7CFjXcW/vMyxuBsax3wEn8Nt/95GNNL4k5XUWWkv1qB5wNCD7ef4xvBctdchPfBpyMFr3elZntax/JFaZSvRp4MrwECYZWQPQj/G1FF9PcW7nV3ysRxfxm6RQusfbsfKUR2mXC/UMy+ZZw 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)(346002)(396003)(136003)(39860400002)(376002)(46966006)(36840700001)(4326008)(6286002)(16526019)(70586007)(47076005)(55016002)(36906005)(82740400003)(8936002)(6666004)(316002)(1076003)(7696005)(8676002)(2616005)(36756003)(6916009)(7636003)(26005)(2906002)(356005)(70206006)(54906003)(966005)(82310400003)(53546011)(478600001)(86362001)(5660300002)(336012)(83380400001)(36860700001)(426003)(186003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jun 2021 23:05:10.9266 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2f3136c0-68ca-4c82-f355-08d92d2d5d36 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: CO1NAM11FT006.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN8PR12MB3457 Subject: [dpdk-stable] patch 'mbuf: check shared memory before dumping dynamic space' has been queued to stable release 20.11.2 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.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 06/14/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/f532cbbedb9ef66ecf31ff9c579cd7b77c0ee839 Thanks. Xueming Li --- >From f532cbbedb9ef66ecf31ff9c579cd7b77c0ee839 Mon Sep 17 00:00:00 2001 From: Chengwen Feng Date: Fri, 23 Apr 2021 16:11:04 +0800 Subject: [PATCH] mbuf: check shared memory before dumping dynamic space Cc: Luca Boccassi [ upstream commit d4902ed31c63b002268e593536b13b84d4fdac9a ] Because mbuf dyn shared memory was allocated runtime, so it's necessary to check validity when dump mbuf dyn info. Also this patch adds an error logging when init shared memory fail. Fixes: 4958ca3a443a ("mbuf: support dynamic fields and flags") Signed-off-by: Chengwen Feng Signed-off-by: Min Hu (Connor) Acked-by: Olivier Matz --- lib/librte_mbuf/rte_mbuf_dyn.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/librte_mbuf/rte_mbuf_dyn.c b/lib/librte_mbuf/rte_mbuf_dyn.c index 7d5e942bf0..ca46eb279e 100644 --- a/lib/librte_mbuf/rte_mbuf_dyn.c +++ b/lib/librte_mbuf/rte_mbuf_dyn.c @@ -115,8 +115,10 @@ init_shared_mem(void) } else { mz = rte_memzone_lookup(RTE_MBUF_DYN_MZNAME); } - if (mz == NULL) + if (mz == NULL) { + RTE_LOG(ERR, MBUF, "Failed to get mbuf dyn shared memory\n"); return -1; + } shm = mz->addr; @@ -525,7 +527,11 @@ void rte_mbuf_dyn_dump(FILE *out) size_t i; rte_mcfg_tailq_write_lock(); - init_shared_mem(); + if (init_shared_mem() < 0) { + rte_mcfg_tailq_write_unlock(); + return; + } + fprintf(out, "Reserved fields:\n"); mbuf_dynfield_list = RTE_TAILQ_CAST( mbuf_dynfield_tailq.head, mbuf_dynfield_list); -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-06-12 06:53:56.832127300 +0800 +++ 0005-mbuf-check-shared-memory-before-dumping-dynamic-spac.patch 2021-06-12 06:53:56.000000000 +0800 @@ -1 +1 @@ -From d4902ed31c63b002268e593536b13b84d4fdac9a Mon Sep 17 00:00:00 2001 +From f532cbbedb9ef66ecf31ff9c579cd7b77c0ee839 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit d4902ed31c63b002268e593536b13b84d4fdac9a ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org @@ -18 +20 @@ - lib/mbuf/rte_mbuf_dyn.c | 10 ++++++++-- + lib/librte_mbuf/rte_mbuf_dyn.c | 10 ++++++++-- @@ -21 +23 @@ -diff --git 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 @@ -23,2 +25,2 @@ ---- a/lib/mbuf/rte_mbuf_dyn.c -+++ b/lib/mbuf/rte_mbuf_dyn.c +--- a/lib/librte_mbuf/rte_mbuf_dyn.c ++++ b/lib/librte_mbuf/rte_mbuf_dyn.c