From patchwork Tue Jun 27 08:27:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dariusz Sosnowski X-Patchwork-Id: 129018 X-Patchwork-Delegate: rasland@nvidia.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 0BC4442D70; Tue, 27 Jun 2023 10:28:35 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 56A8D42D13; Tue, 27 Jun 2023 10:28:34 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2051.outbound.protection.outlook.com [40.107.223.51]) by mails.dpdk.org (Postfix) with ESMTP id EEEDD42D12 for ; Tue, 27 Jun 2023 10:28:32 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=enh+DCeKEc10gns03k2wo1ubRLOKxhhISqpA/ocGoHN1WHSFgizR29c80SpskpGVg/9pWETfm4V0VJj+i0HzJAWaGqcaQy7A73xA6Y7Yps9VUEOTdXrSntWRpmZ6zNSPFLGNgp9MXpkRFFimnR2ppYvED2i1AGqqSsMMpMGhk/heQLmRrcgg7iK48jht6j0s94c/A39LAtETIdSEVfCMkBfh8b58rvpyfuLLvrxYMjOzoB9QTkfo7nnnVfJjbbogGEE0hWh2ezjzWjkIjSHoREOiJ5Z7arxuqh+0FZQvGsBoX24LawYxtu6LCocgbGUN6nCrz7bnoy7fGFo0OEqZkA== 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=tJj3QBiddgvWd7dvzp8kNszfl6jWlZRL0VOGud5PdFc=; b=cOs/0tXL9iYMPusW4XExxSzPnGiF7j/MsNvX3+91+AchHrpnYVM3wURWoSqSU6JELItJ09SsfQ09DXLl8ni1xWlZVUqpZYIfF39Wpsvx+ovg3WRR7N/dq1F95jUuvQrzShIsVqr8gS/B2TG6avw9l1S72Pfci80YQnKIQQbUTelrRxrHWfU1RMG6gpK4z++qRfEhNDR4ObOvpePfiOZeFz9R2EWLHvTeJHEikRQmvq91hZRDX9C7FLmH5DHncmAtHw/v7gMfSzFSp+JDxmQqmxqwyHPxFfVCYO6v8GDVO4qnsm1sLXEQeAHXxx4xrTj1vdDQ/+gbdX0DPJOksGOWMA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=dpdk.org 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=tJj3QBiddgvWd7dvzp8kNszfl6jWlZRL0VOGud5PdFc=; b=np48OnA8BQPR2Uoggjj52qx+9vatP0/cJ0zJnw/Mdywf/dnR+qVHBm1Ya03cnnAAnahYscSRkP5yYXygBdoItV4aUZFeBosfLd0sozAA8WAIRnUpV/ESu0Sgi/0Ec0uDmsxhNv0RrA7DZeq7F5KYXaPnaK+JqzBdPs4Xs1udhGg3xESfthjeL7bBWgz66DJyQdQhJaduh0KIM7KNOJkQfrUV+F5PR/nL4KE12d0v7P8SnY5Km+vhEu/DjHQ8nDABPP5O8VJg21E3KXmtH99F4lrYZUCvYBNJvthg/uxt4MBgolOb0CSs5S12AkCNBfbysNTg658k1wsbHSH4Atc57A== Received: from BN9PR03CA0244.namprd03.prod.outlook.com (2603:10b6:408:ff::9) by PH7PR12MB6936.namprd12.prod.outlook.com (2603:10b6:510:1ba::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.24; Tue, 27 Jun 2023 08:28:31 +0000 Received: from BN8NAM11FT056.eop-nam11.prod.protection.outlook.com (2603:10b6:408:ff:cafe::88) by BN9PR03CA0244.outlook.office365.com (2603:10b6:408:ff::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.34 via Frontend Transport; Tue, 27 Jun 2023 08:28:31 +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 BN8NAM11FT056.mail.protection.outlook.com (10.13.177.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6500.47 via Frontend Transport; Tue, 27 Jun 2023 08:28:31 +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; Tue, 27 Jun 2023 01:28:15 -0700 Received: from nvidia.com (10.126.231.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; Tue, 27 Jun 2023 01:28:13 -0700 From: Dariusz Sosnowski To: Matan Azrad , Viacheslav Ovsiienko , Ori Kam , Suanming Mou CC: Subject: [PATCH 2/2] net/mlx5: fix counter allocation from shared pool Date: Tue, 27 Jun 2023 11:27:46 +0300 Message-ID: <20230627082746.2466304-3-dsosnowski@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230627082746.2466304-1-dsosnowski@nvidia.com> References: <20230627082746.2466304-1-dsosnowski@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN8NAM11FT056:EE_|PH7PR12MB6936:EE_ X-MS-Office365-Filtering-Correlation-Id: c2fba19d-f170-412e-4e87-08db76e87d72 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: oBx4AVqkeG+HTXwLFk9L9J7Yiq7hlx4SSV7TKx9TTRdR5bkBSSRPGas+YnrOGLS2Iv4swP64blhgV0utKwS1g7kYcRB+1NkkQkLg9szBvMmyzwOasKVxhiuxV3lgPmfmyZqfw2sX2tD8wuaR1I2/iikH/Zj+jhSur0ndw/fn+LzG+4u8NiHKoXB694HRILvBinj4aR9g/jHCGrNFCQCybV7/UbCJP8HkJ6A1ULNjU9dYMzq5ONkseE0Gu32XYjKGOMRyk1Z8wMrClca8dVzaXiFXOTeSavdY7eBzKchHc2W64n6sJVOI0BxdPElPsS4NQNqRqiszthossGF0TLIi3FQOnPwVf6jUvSPQmpRiHQJZvPVtqu2s1mBGY7mP9ujsEa9bTvnH43VeT9X+t0eRUnk92FRZ5XhJF6rxL6DQrggL10iCBesJad1wAjY7sIc2/dtpUNvXUsHrxxjkyDJPa7e9rjZjLg3U1cMhjmgsudrtk8ft4ihV734oDmmOqpigfb93P84TCysltOu7Pslx3GBiZWX+auam97B2TPfLAbCI1eKLe/FopUpy/oOwKBXFiYJaivoop0dHWrM8zsNgNBpiBtCSIf+JImGmXrjUOGYW9pHKD+SpVKtEZrZx0pSK5h3HfbvQ4Nkgvr9cFSxLgq0aTDuEIIPutTmYip00YcNAfqhce3vUwwGBxUkn47t0feto5ZjACJ6fW5HRX+BBaE1BjyKVQjNdkZpMCo08OT9On8pGhpyBkX2HNRG4hR1e 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)(136003)(39860400002)(346002)(376002)(396003)(451199021)(36840700001)(46966006)(40470700004)(356005)(7636003)(82740400003)(47076005)(36756003)(36860700001)(86362001)(478600001)(110136005)(40460700003)(7696005)(6666004)(2616005)(6636002)(70586007)(316002)(8936002)(70206006)(41300700001)(8676002)(4326008)(55016003)(426003)(1076003)(336012)(6286002)(186003)(16526019)(26005)(82310400005)(40480700001)(5660300002)(2906002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jun 2023 08:28:31.0315 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c2fba19d-f170-412e-4e87-08db76e87d72 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: BN8NAM11FT056.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB6936 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org mlx5_hws_cnt struct represents counter objects which are used in flow rules. This struct contains a union which stores the following information: - If counter object is used: - `share` is set to 1 if and only if counter object is used in an indirect action. - `age_idx` is set to the relevant AGE object index. - Both of these fields are set at the time of allocatin a counter object from the pool. - If counter object is unused: - `query_gen_when_free` is set to the current reset cycle of the counter service at the time of freeing the counter object. When ports were configured to share the flow engine resources, counter object allocation logic in mlx5_hws_cnt_pool_get() did not reset the `share` field. This caused issues when previously released counter object had the least significant bit of `query_gen_when_free` set to 1. That counter object was treated as shared counter (indirect action), even if it was allocated by using COUNT action directly in the flow rule. This patch fixes this issue by adding the explicit reset of `share` field. Fixes: 13ea6bdcc7ee ("net/mlx5: support counters in cross port shared mode") Cc: viacheslavo@nvidia.com Signed-off-by: Dariusz Sosnowski Acked-by: Ori Kam --- drivers/net/mlx5/mlx5_hws_cnt.h | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/mlx5/mlx5_hws_cnt.h b/drivers/net/mlx5/mlx5_hws_cnt.h index f37a7d6151..f462665eac 100644 --- a/drivers/net/mlx5/mlx5_hws_cnt.h +++ b/drivers/net/mlx5/mlx5_hws_cnt.h @@ -506,6 +506,7 @@ mlx5_hws_cnt_pool_get(struct mlx5_hws_cnt_pool *cpool, uint32_t *queue, __hws_cnt_query_raw(cpool, *cnt_id, &cpool->pool[iidx].reset.hits, &cpool->pool[iidx].reset.bytes); + cpool->pool[iidx].share = 0; MLX5_ASSERT(!cpool->pool[iidx].in_used); cpool->pool[iidx].in_used = true; cpool->pool[iidx].age_idx = age_idx;