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 73E52A0C3F for ; Sat, 12 Jun 2021 01:12:46 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6D1F94003F; Sat, 12 Jun 2021 01:12:46 +0200 (CEST) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2087.outbound.protection.outlook.com [40.107.243.87]) by mails.dpdk.org (Postfix) with ESMTP id 9BDA9406A2 for ; Sat, 12 Jun 2021 01:12:44 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NAm0lTPIomMqflS3W6Y+4cgTAydLZYTPavUklkqHxS9eUMZTFBAb4XdiCTT/KhYrw5Ync6X38nepjM0m+g+WK2S4q0zHjyfq2aRCT3jNtodwS0TGqCcEk4OpfQS62Gr2N81nvERqSKedySUrrXTzNuEQIAqjaEkA6N3isKbeGLgqdinnT5RcEEebRymWZXUn6FD1QAjvr1gyVsldBLZM6CN6h2/0kpHJtGjnOBz+KpEf7yyKRE3iliYsM9oossOI6dJVC4t+iRfMveq4EUcEVKyVqoPV8OFszCBg+idQqvvn1KHBKsXQJc6dszLiThVx6m5VFpQf7721v0CxPFJ0mw== 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=ob11t0z7YnDKnlvxTik7rvZMWyGxwvCUOmZeONr5ZV4=; b=MMkQIrO8y9j6bZ7+2zXW4aav7hPucop/Tt6L63wZYP6yHPoHrxWyDFAC8215hR1p+jYlh6sDkFU76gwHqN2+eYym/SKp+xQEZnJKdjnoy59euYwfcqFjHy10EqAiEh+yTmDd+othrLe6W5VO58dE37UJtCrIIbYocMxbJLfJVEJBy52btbmyKqThx6l7O+YWaOD5Qsez54b8enMqsRw/E4rLtPuw0rVjv7DQjIb22mqLBO1XrkiL8ZnmV/dMA2+eRnopo84bVqjAPr1547eEJhVO2UfMy/xyuSywkxtKx3xINs7c7qbSsLT+z2WvRXVyZSZIwzKM0lslxnxasfGj1w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=intel.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=ob11t0z7YnDKnlvxTik7rvZMWyGxwvCUOmZeONr5ZV4=; b=HKzH19NUOkMK6iAlQUcFc0yRALTOIlQKbEi6MEte2xMApj+4JYrQdZgrxSv5tZNtQFbE+GiSkVmwOPGutXg1YkQaCSPqwaD9wgHpWQFxq1XjSc3WF7PXypgYNdVkwAvQEResHApB6v/PzXyveuXt7gr6eIPf87J9GrqKSmxR674xiZP43P+DTAH7j0nxb9vDbnfSV0beogUrShLyX9ewNwiEWnWwV3/fH7cpweKUwO5O7j1MEZfKIfdvW3lwHAI5wF32mmPruUWAC+qVnQwSuQMskxVgJnin9WCn0IzYGggkN1xqjbXG479QQdGngAh56icjDpeukMP49YujLju7fg== Received: from MW4PR04CA0313.namprd04.prod.outlook.com (2603:10b6:303:82::18) by DM5PR12MB1418.namprd12.prod.outlook.com (2603:10b6:3:7a::15) 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:12:43 +0000 Received: from CO1NAM11FT035.eop-nam11.prod.protection.outlook.com (2603:10b6:303:82:cafe::9e) by MW4PR04CA0313.outlook.office365.com (2603:10b6:303:82::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.20 via Frontend Transport; Fri, 11 Jun 2021 23:12:43 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; intel.com; dkim=none (message not signed) header.d=none;intel.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 CO1NAM11FT035.mail.protection.outlook.com (10.13.175.36) 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:12:43 +0000 Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 11 Jun 2021 23:12:41 +0000 From: Xueming Li To: Chengwen Feng CC: Luca Boccassi , Min Hu , Xiaoyun Li , dpdk stable Date: Sat, 12 Jun 2021 07:02:58 +0800 Message-ID: <20210611230433.8208-84-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.6] 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: 62e38c29-469e-47b7-770b-08d92d2e6ab4 X-MS-TrafficTypeDiagnostic: DM5PR12MB1418: 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: kZ8n+ofcZuG7ztoDol9Y64W7Bd5zBTivJD6+u630bZo/V0ZxM8hzFCiWQSa4m+ZZDJSzdYhGvuOoXZ7BaggwdakKdjE6PozjfmlCVbtquT0f7eKXcwWoTSlb6FVNAKR5uWOnx2/AcbDaxbqRymMjtxhEaaanoo+wWLWJtHiP8nGCK2VLNX7sh8cZ5iOIIeKlaNniV1cmSUSNpp1o9WGZaZfNRAOspapnC/qLWIOCrORxW+xsYLQKtzARtAoWk9evLSXdXZc/PGvLIfX4oUkjC3vNy1MmEUGTyQyGQRdDgGTUuZRnQtb5xWy79qZzrLg+SyTh2ZQU9xSviMh4sWqQAe+nbRTFSmtSYrRqTEzL+G7xaESr4jAlpEyYTZXdWIMsbU5ljn0qbH5yiL2LMU5/rEizxdMJGin/HD7bGY/EpYXZGUB8ccWkWYP5oPkZiUnHux8k64pd2lqHZL7eCZcZH9lWt/IYWdJS+665Q/ZKR2KlhQCibsG1SY9WJQhHVDl37aPF+Fu5MDI40YdobZ/0tWPZ2qzn1j3qacq6Ipd47tzHeEHD///hZSrnlQV5LDhmOUN3rDRdAtObDjXPaxCuJAfI0+Z4ISERKqnz/sKMsUKm22VWkvxGEftY3bQ/u7X314sI02g5Iq1sGFmdyGKc19fZzGJF33AHnN5ApJHscjBXqUmtCoDfTv4V36n5smhS0V6wr+6l8c70u9Kcug7gnfeVaS7kSrqmYQkLrfu5TZ473A3xdqFYjjXJcD8Dq1XwO4wUAdj9lccgplZsQUnbZXR66axZ1BrHM85vna5bqKb40Fzd+5igb+oP8AMA8nbT 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)(376002)(346002)(396003)(39860400002)(136003)(46966006)(36840700001)(70586007)(70206006)(1076003)(336012)(356005)(55016002)(86362001)(6666004)(82310400003)(82740400003)(36906005)(316002)(7636003)(5660300002)(6916009)(426003)(16526019)(2906002)(36860700001)(8676002)(966005)(8936002)(7696005)(4326008)(478600001)(6286002)(26005)(186003)(54906003)(47076005)(53546011)(2616005)(36756003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jun 2021 23:12:43.0503 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 62e38c29-469e-47b7-770b-08d92d2e6ab4 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: CO1NAM11FT035.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB1418 Subject: [dpdk-stable] patch 'raw/ntb: check memory allocations' 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/89bbedc455d0d8337214d9ec5776cc9b0da49c32 Thanks. Xueming Li --- >From 89bbedc455d0d8337214d9ec5776cc9b0da49c32 Mon Sep 17 00:00:00 2001 From: Chengwen Feng Date: Wed, 21 Apr 2021 10:08:16 +0800 Subject: [PATCH] raw/ntb: check memory allocations Cc: Luca Boccassi [ upstream commit 403f21feb87fc9e0e2f61c1e4576cc1b9300ed4b ] This patch adds checking for rte_zmalloc() result when init Intel ntb device, also fix the same bug when start ntb device. Fixes: 034c328eb025 ("raw/ntb: support Intel NTB") Fixes: c39d1e082a4b ("raw/ntb: setup queues") Signed-off-by: Chengwen Feng Signed-off-by: Min Hu (Connor) Acked-by: Xiaoyun Li --- drivers/raw/ntb/ntb.c | 5 +++++ drivers/raw/ntb/ntb_hw_intel.c | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/drivers/raw/ntb/ntb.c b/drivers/raw/ntb/ntb.c index 0f0e3f27a0..6703bb5d08 100644 --- a/drivers/raw/ntb/ntb.c +++ b/drivers/raw/ntb/ntb.c @@ -923,6 +923,11 @@ ntb_dev_start(struct rte_rawdev *dev) hw->peer_mw_base = rte_zmalloc("ntb_peer_mw_base", hw->mw_cnt * sizeof(uint64_t), 0); + if (hw->peer_mw_base == NULL) { + NTB_LOG(ERR, "Cannot allocate memory for peer mw base."); + ret = -ENOMEM; + goto err_q_init; + } if (hw->ntb_ops->spad_read == NULL) { ret = -ENOTSUP; diff --git a/drivers/raw/ntb/ntb_hw_intel.c b/drivers/raw/ntb/ntb_hw_intel.c index 4427e11458..a742e8fbb9 100644 --- a/drivers/raw/ntb/ntb_hw_intel.c +++ b/drivers/raw/ntb/ntb_hw_intel.c @@ -148,6 +148,11 @@ intel_ntb_dev_init(const struct rte_rawdev *dev) hw->mw_size = rte_zmalloc("ntb_mw_size", hw->mw_cnt * sizeof(uint64_t), 0); + if (hw->mw_size == NULL) { + NTB_LOG(ERR, "Cannot allocate memory for mw size."); + return -ENOMEM; + } + for (i = 0; i < hw->mw_cnt; i++) { bar = intel_ntb_bar[i]; hw->mw_size[i] = hw->pci_dev->mem_resource[bar].len; -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-06-12 06:53:58.761055300 +0800 +++ 0084-raw-ntb-check-memory-allocations.patch 2021-06-12 06:53:56.400000000 +0800 @@ -1 +1 @@ -From 403f21feb87fc9e0e2f61c1e4576cc1b9300ed4b Mon Sep 17 00:00:00 2001 +From 89bbedc455d0d8337214d9ec5776cc9b0da49c32 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit 403f21feb87fc9e0e2f61c1e4576cc1b9300ed4b ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org