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 5B656A0C3F for ; Sat, 12 Jun 2021 01:09:22 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 54F42406A2; Sat, 12 Jun 2021 01:09:22 +0200 (CEST) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2085.outbound.protection.outlook.com [40.107.237.85]) by mails.dpdk.org (Postfix) with ESMTP id 310E54003F for ; Sat, 12 Jun 2021 01:09:21 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UDLsAzdYRWx3zPxfQVcYvFRCMw2K/piWQW+95dxZwzRgbt8cq6YFLhMR3pqY9R+fztNnCPT+15uNhLOunreYPfsL43On4O1tHMzmroP5jSxC3/4UZSQp2I7KQk/WE60IH7EVptR/mSRCIN5qcK7upS/EMjGZow1dF1rhr9aAglh1dinXtPSzH6U9pfXtwRfeKrMsgXxrJ2swxx4xfnMCyKyhXsB+BldaBMnZmyHP0ieeLlO7a81y++OUbsvbRLVJyy7NQqI30kxYtssz7eWGerDZI7iI5LV2nlb6+noerzQuFkCZen3JgD4y+huZiAEAmNORvfgdfYobcpGvnSfc+Q== 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=SdzllZoHvu8XUzWnkudZEDwubsBKNKPnaT2GBuwvGfM=; b=Urtm7MP1YTkj50qNiQVRwnRUdyNM1U6iFmOGj4cuiHpbELoSTs0HjTmu61cmnfbOJw7q3aVfXbEFtH5ta0zEYzkvkuLdwa0v7z11jY+Z/z2dEimBrP16jiehOhlSMWdJYh9KGQfnmj88I+IQx9ZR2t2lOepFyH/SW8i48C7koW+UPInaYfAa0nt2oTw0ItF37VHQ2LoFpNOKbqbKQZ4Cl1qbpHEzM/9KvYVlXhEyYPf7yiZjp+fgXXIj14N2is/r8WXTANmpJrgRU2N6pRTI/Pmv3BJq10wgcs40sGyQTT0rRgw0nnIhiJfo9t2IxO96caUovcrZxWrkp/vK1UKs3w== 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=SdzllZoHvu8XUzWnkudZEDwubsBKNKPnaT2GBuwvGfM=; b=lUSN3xnM+LXTZgToKBz6SWBJARlPkek9bIsiA3NTrINsBJQvt5fR3eNSXm1tmSSDI5oZgNqMMZQA+gVQdUbtSoeQ1f0BnlCWniDOEo7s5ZrSoWzEX8G/R1/7spFsF71F/3zydDgXX35r0/Z8i8tdtYmpWXclowlubwGZyeDqpZCgl3HxJ6ha85QLJ43x2u1ei47O8OPlDMc2NniCqi9vh0lulILRmWeEjos/GsoZ29iIcmu+xGpmkXEuVOe0JYjWb0PgydIuml60EEVuHS7IHkvK7HXQnPrQKo2N/un+RjiZIQSPTxLK98KM10Pd+iEfZ+vi3QjWgeVdsJi2Ga5xHQ== Received: from MWHPR2201CA0050.namprd22.prod.outlook.com (2603:10b6:301:16::24) by BYAPR12MB2648.namprd12.prod.outlook.com (2603:10b6:a03:69::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.24; Fri, 11 Jun 2021 23:09:19 +0000 Received: from CO1NAM11FT053.eop-nam11.prod.protection.outlook.com (2603:10b6:301:16:cafe::c8) by MWHPR2201CA0050.outlook.office365.com (2603:10b6:301:16::24) 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:09:19 +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 CO1NAM11FT053.mail.protection.outlook.com (10.13.175.63) 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:09:19 +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:09:18 +0000 From: Xueming Li To: "Min Hu (Connor)" CC: Luca Boccassi , Ferruh Yigit , dpdk stable Date: Sat, 12 Jun 2021 07:02:21 +0800 Message-ID: <20210611230433.8208-47-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: e37d0ad7-d501-495f-bae0-08d92d2df167 X-MS-TrafficTypeDiagnostic: BYAPR12MB2648: 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: aqI0k0QMJyu2lFsK3VSuK/jrKn6kFLRT3q+zs7/T2rsZkIw05BggYZFfmSovgFphZYy/4Y7/uP5JE8il3OfKfNUuEcGRKJHnCsMR+iX0YD7KQhnRekDdbjk+hCZ8T80+PwoerfBRq6g4oGKr2KteuokAEBX0+8FSRB+hMmgOiX2aarP4oET75YwkEDxB/iUXDYRrL6RAhRBI0B4Jr3aL+74djMXSvCBIsxotUNrkHDXxmbU2mfYGKXGNOAfk4EqsTZlsRysSkdUQAfTXxvRuV09vbFeT9jtddGMaCpFSYPTjwKA2jKJU+T5Zrib7XROWCgK52GqqwfmSbAwD3NAGCS3v0TdXWxeTyL1QRVBUeUkfh7wkMDZKDzJxCwUjtQ/1uzFWcWFErHpQpVUO8yhJlknxt1ECuevca3SIz2sPhCi8ilBDPN5u2HtYcKKNVvkHugBMk7e5hUuvhID6nBXmLK9xuyZ8/cMUSc0b0M1AyRtoSWjshqnvhxFie/3j28vHMZYiepRLGKs2/vSMPvuPRzbOmdQCC1yd/iE/wiojsBDDM9uBpRtA+YC3nAALwb0M1j3v1RfgNst/AG3fqxQSp+C8oQk+sWepToegLiw5+jX1/T+sZKQZyFpuWKqvepkZAgsafNUB1vyOKUZubSGHxTm8y3xi2s5FzCrVgnWW4G+/mufnNoBO1bNwGNS5F+33lxPP4p5jpz9Q5ij5C7DmF43xXgfY83abwrwnRdKEfA7XgyhQ34/ihRMjcivwrBjqcJdz4X/zEONlyqB/htNeUrNH5IzFzfOnQPE7aeCG1+NvSIjp4JsphhxHKhQmEzOy 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)(396003)(39860400002)(136003)(346002)(376002)(36840700001)(46966006)(6286002)(26005)(316002)(16526019)(4326008)(54906003)(82310400003)(6916009)(966005)(83380400001)(55016002)(336012)(186003)(36860700001)(70586007)(36906005)(2616005)(70206006)(1076003)(7696005)(7636003)(5660300002)(47076005)(426003)(478600001)(8936002)(356005)(53546011)(36756003)(6666004)(86362001)(2906002)(8676002)(82740400003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jun 2021 23:09:19.5371 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e37d0ad7-d501-495f-bae0-08d92d2df167 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: CO1NAM11FT053.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR12MB2648 Subject: [dpdk-stable] patch 'app/testpmd: fix division by zero on socket memory dump' 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/6af34d2abd298a998de974fdc4d3cdb6f2d63453 Thanks. Xueming Li --- >From 6af34d2abd298a998de974fdc4d3cdb6f2d63453 Mon Sep 17 00:00:00 2001 From: "Min Hu (Connor)" Date: Mon, 26 Apr 2021 19:57:57 +0800 Subject: [PATCH] app/testpmd: fix division by zero on socket memory dump Cc: Luca Boccassi [ upstream commit a767951e597964e6c02529097edd2b43b5aace4d ] Variable total, which may be zero and result in segmentation fault. This patch fixed it. Fixes: 9b1249d9ff69 ("app/testpmd: support dumping socket memory") Signed-off-by: Min Hu (Connor) Reviewed-by: Ferruh Yigit --- app/test-pmd/cmdline.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index 294031542a..3712daae7b 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -9557,7 +9557,7 @@ dump_socket_mem(FILE *f) fprintf(f, "Total : size(M) total: %.6lf alloc: %.6lf(%.3lf%%) free: %.6lf \tcount alloc: %-4u free: %u\n", (double)total / (1024 * 1024), (double)alloc / (1024 * 1024), - (double)alloc * 100 / (double)total, + total ? ((double)alloc * 100 / (double)total) : 0, (double)free / (1024 * 1024), n_alloc, n_free); if (last_allocs) -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-06-12 06:53:57.874394000 +0800 +++ 0047-app-testpmd-fix-division-by-zero-on-socket-memory-du.patch 2021-06-12 06:53:56.230000000 +0800 @@ -1 +1 @@ -From a767951e597964e6c02529097edd2b43b5aace4d Mon Sep 17 00:00:00 2001 +From 6af34d2abd298a998de974fdc4d3cdb6f2d63453 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit a767951e597964e6c02529097edd2b43b5aace4d ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -20 +22 @@ -index 5fdcc1ca18..29ee41da5f 100644 +index 294031542a..3712daae7b 100644 @@ -23 +25 @@ -@@ -9731,7 +9731,7 @@ dump_socket_mem(FILE *f) +@@ -9557,7 +9557,7 @@ dump_socket_mem(FILE *f)