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 8135142D46 for ; Sun, 25 Jun 2023 08:37:19 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7C6D942D0B; Sun, 25 Jun 2023 08:37:19 +0200 (CEST) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2075.outbound.protection.outlook.com [40.107.244.75]) by mails.dpdk.org (Postfix) with ESMTP id 01A4742BFE for ; Sun, 25 Jun 2023 08:37:18 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UCQRdbAuxHyzO8GHUqFAfrKT1kqlci4i2DlvFysYrmI/WvMJx9OVARQfVZ72l8oHKqVH058ZFyVud3CKVCcpCY5CRheGrH/407qA6ZGZ5VwcUWOgAd37NM5NRlhjYCz8nM92mckgXN7WS2sCmY2lbdQHj5lJe6wKbh2ua7jMiUJNnYBQ39DDZMViiIg9VFzNXuzTJ1NSecULnaNEJwMJzmu7Yv/i0bnP4SLyFFF4OMjYflJExxgNsB7EldUhNk+d+CSWRW1gVdw1iCCJyrbiZYlgxyMgmYKzpOTo/GmdnorI4c9fFX4SdJSnaShtd2PxueYPTt8xtRaQ1ndMoTDpDw== 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=qaazIMFVJF6brhkNAF7vPnvlhy6Erg/nNM8w5YWWiss=; b=kIzvDkYjbOeNcmcnamKPzTfDnJe4eS6uU9yCyQOWd0GqgtAg0zvjtBiSugh4sY0EFSX8nomfs2TgQxQVl3Jase0ZNrwvqB7R59tD6+A1rAd74GA2Nl14rg39DDXYHz1B8QIjVUydksf3YHdzbQ0ixDtOZ43ghb9J9ddcUuEaY61hHZT5TIEQ3wmSfxAD05NTlz41z9LbyqN8hZHvrn1eI/VTxhdmY0h5aFVDTnKcLrLKK8y58pjLWzLbSLzqMSQcLw0AO7dG5piGoYGKho2ywJ/jJhruMlIYcB+x0UjF1CJV/yjSUFMYDvdWf+5PtsBnIZTHR8AZf/+HEYUeR8wAyA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=arm.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject 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=qaazIMFVJF6brhkNAF7vPnvlhy6Erg/nNM8w5YWWiss=; b=inITdojB6BWGO0xuG8NgQgpxL1wodmYKXvnoDxvSo5Z3WjbSTboJ2saLXmzObGFEVeqJxTxsmkXcncp2Qzo+VHzXfYn2bC3pvC9yH3WsD3EJaCbajFRcHFVMUq2gSBBBmbpiFm9k2NFEAqfDym6/b+Zx7k7rzdyWFQw8YB7PRHVKgaD4hvbiCivcRFGEpYfG4aclP0MV5HWMlWslJkOwm7C3Pn1sNDm4meeQEwUaAmMYIcT6duuB79SBM1spXHQdXJTFwb20qp7CL3tq8NV5HWFlYv6bQtlUdUKyIHMcjfRA4Ix/A2znK2YJPdz7qSIgcjg383p7ORGcHSI2gauaHA== Received: from BN8PR12CA0027.namprd12.prod.outlook.com (2603:10b6:408:60::40) by DM4PR12MB5916.namprd12.prod.outlook.com (2603:10b6:8:69::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.24; Sun, 25 Jun 2023 06:37:15 +0000 Received: from BN8NAM11FT011.eop-nam11.prod.protection.outlook.com (2603:10b6:408:60:cafe::b2) by BN8PR12CA0027.outlook.office365.com (2603:10b6:408:60::40) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.33 via Frontend Transport; Sun, 25 Jun 2023 06:37:15 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) 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.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by BN8NAM11FT011.mail.protection.outlook.com (10.13.176.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6500.47 via Frontend Transport; Sun, 25 Jun 2023 06:37:14 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.5; Sat, 24 Jun 2023 23:37:03 -0700 Received: from nvidia.com (10.126.230.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.37; Sat, 24 Jun 2023 23:37:01 -0700 From: Xueming Li To: Ruifeng Wang CC: Feifei Wang , Anatoly Burakov , dpdk stable Subject: patch 'test/malloc: fix statistics checks' has been queued to stable release 22.11.3 Date: Sun, 25 Jun 2023 14:33:50 +0800 Message-ID: <20230625063544.11183-13-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230625063544.11183-1-xuemingl@nvidia.com> References: <20230625063544.11183-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN8NAM11FT011:EE_|DM4PR12MB5916:EE_ X-MS-Office365-Filtering-Correlation-Id: e298528c-a06e-4059-596b-08db75469d5b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0RleNbrpk4N5T1GfRzTuUx7T+kXnJRYWWKXn98QUDNLhKUFE/q518YfqGW89mr8/cD5xC7OVqZzCB604/xUoXE2vYsYqghPjqx4vESNwCgPQrONFsksEbz4Ij+zn35WNMzhZqPF3gZucD1Q1Y6f5IA1CFsm/bsXuhuLqAptsTrDlRUybMl4i9KsN8JZReF5BitiKeQ455WzUk48K5Cw28ziEwDFQC/BSpK/no6M5YQq+1FcaxfREn1EVG2cL+uHjTEGq05zUqc1CJFESOJn6uHVEObQUgDWcQmlb+g5sbhMRJK+xZpIIazAYXQCVGEe0A6OtqrwkeKYfTIpu3SU4L6dvqgAAV4sjc8gPXg0CvXKV+g8kM/Uq8uOUA8Nu6G1GKF638zOgRYiebY5perqe7xHfIXviTy6iIZ27MtUS54worsbCV4NAcf7gybM4DZpwqmnHAbTbKmiY57adI1ddSL5I77mGbrHDaiy/a5gUe5+YM/PDtBMoKod3Qv2vGWJ2yzWrAezSpZqTy+nuklcf9JKIzZGyPNAxZCj2TvUv3nkh9X0aQvIUxRwJx2XsuZg0rgvOqsaiGFMgi/mP5wWEUyz2t8KvjYlveuY5r3IdCOnGuJFmGgh4ZVSFDnwjh8qZmCrPSr9mOb/64iaEE9XyH3T86ceoxRJcEcDGsew89aHbt24/TvkkuE9lRMRhxh4g4rXcvntWn931bBR4cJdSb4Bnrd7F/1E2wFvwN/ya8+GOJVQn/RC4Txh6/wGZtJHLyfJLODh3huAtz8PRirbuzA== X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230028)(4636009)(346002)(136003)(396003)(39860400002)(376002)(451199021)(46966006)(40470700004)(36840700001)(316002)(4326008)(70586007)(6916009)(70206006)(478600001)(36756003)(40480700001)(8936002)(8676002)(5660300002)(2906002)(86362001)(47076005)(40460700003)(55016003)(36860700001)(966005)(54906003)(41300700001)(82310400005)(6666004)(53546011)(7696005)(336012)(426003)(186003)(16526019)(6286002)(26005)(1076003)(83380400001)(356005)(7636003)(2616005)(82740400003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jun 2023 06:37:14.9196 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e298528c-a06e-4059-596b-08db75469d5b X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT011.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB5916 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 22.11.3 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/27/23. 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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=6413085d5fa6c8404ba519bd56d531c3ff006bdc Thanks. Xueming Li --- >From 6413085d5fa6c8404ba519bd56d531c3ff006bdc Mon Sep 17 00:00:00 2001 From: Ruifeng Wang Date: Fri, 19 May 2023 12:29:23 +0800 Subject: [PATCH] test/malloc: fix statistics checks Cc: Xueming Li [ upstream commit 19606f83e6c1dffea9bda42a792e1cbbc6d5a043 ] The case expects all stats to be equal. Therefore the negative conditions in check should be logically or'ed. Fixes: a40a1f8231b4 ("app: various tests update") Signed-off-by: Ruifeng Wang Reviewed-by: Feifei Wang Acked-by: Anatoly Burakov --- app/test/test_malloc.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/app/test/test_malloc.c b/app/test/test_malloc.c index f144b89d88..ff081dd931 100644 --- a/app/test/test_malloc.c +++ b/app/test/test_malloc.c @@ -302,11 +302,11 @@ test_multi_alloc_statistics(void) rte_malloc_get_socket_stats(socket,&post_stats); /* Check statistics reported are correct */ /* All post stats should be equal to pre stats after alloc freed */ - if ((post_stats.heap_totalsz_bytes != pre_stats.heap_totalsz_bytes) && - (post_stats.heap_freesz_bytes!=pre_stats.heap_freesz_bytes) && - (post_stats.heap_allocsz_bytes!=pre_stats.heap_allocsz_bytes)&& - (post_stats.alloc_count!=pre_stats.alloc_count)&& - (post_stats.free_count!=pre_stats.free_count)) { + if ((post_stats.heap_totalsz_bytes != pre_stats.heap_totalsz_bytes) || + (post_stats.heap_freesz_bytes != pre_stats.heap_freesz_bytes) || + (post_stats.heap_allocsz_bytes != pre_stats.heap_allocsz_bytes) || + (post_stats.alloc_count != pre_stats.alloc_count) || + (post_stats.free_count != pre_stats.free_count)) { printf("Malloc statistics are incorrect - freed alloc\n"); return -1; } @@ -363,11 +363,11 @@ test_multi_alloc_statistics(void) return -1; } - if ((post_stats.heap_totalsz_bytes != pre_stats.heap_totalsz_bytes) && - (post_stats.heap_freesz_bytes!=pre_stats.heap_freesz_bytes) && - (post_stats.heap_allocsz_bytes!=pre_stats.heap_allocsz_bytes)&& - (post_stats.alloc_count!=pre_stats.alloc_count)&& - (post_stats.free_count!=pre_stats.free_count)) { + if ((post_stats.heap_totalsz_bytes != pre_stats.heap_totalsz_bytes) || + (post_stats.heap_freesz_bytes != pre_stats.heap_freesz_bytes) || + (post_stats.heap_allocsz_bytes != pre_stats.heap_allocsz_bytes) || + (post_stats.alloc_count != pre_stats.alloc_count) || + (post_stats.free_count != pre_stats.free_count)) { printf("Malloc statistics are incorrect - freed alloc\n"); return -1; } -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-06-25 14:31:58.907995900 +0800 +++ 0012-test-malloc-fix-statistics-checks.patch 2023-06-25 14:31:58.295773900 +0800 @@ -1 +1 @@ -From 19606f83e6c1dffea9bda42a792e1cbbc6d5a043 Mon Sep 17 00:00:00 2001 +From 6413085d5fa6c8404ba519bd56d531c3ff006bdc Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 19606f83e6c1dffea9bda42a792e1cbbc6d5a043 ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org