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 463ACA00BE for ; Mon, 7 Mar 2022 09:01:41 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3801241169; Mon, 7 Mar 2022 09:01:41 +0100 (CET) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2080.outbound.protection.outlook.com [40.107.93.80]) by mails.dpdk.org (Postfix) with ESMTP id 1A38140040; Mon, 7 Mar 2022 09:01:39 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MS/Xan4sVSwB33GYpUr5vFA8nxzsAfUZsqhOEos+F2fj5ryUdSwi0RiG96n6pW74r4HfLifESlRPTW3EmIKaSww3yqmmpCOu8YUhBYGbhpcfKcFTWlrMh0zm4UoIENpnhVh87D4s9Id6nV1tg8nstMnapxC1qgMASuad7gdLI/oKjrcQXsk3FjPPaQX2nOWz6OP5arONu5uRArRS8vzZEM7214ydFU9bS7EXiavK51JmTbBOOINmiNvdnfBd9L/hiYBBVnUlkP6il+4DIC4MFz6RL6481H958KXr7cFlhrhfjk4zMbhpUkz4FJeyK/a4wwyts4K6rMSV4BKgDpNv6g== 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=DNC4874/6ISq5zZXI6rFdUqDX1vENyOcyuQUPDC0n4g=; b=gn+pLR0jy8BX24VYTew1L4eQlfb1CTlGerXITcRHXNkCGMg7qoW/xnx3O0elmR2+sUC8aQGOYLhQp6zMd8jBkQZ4UZCiEXabwiwjw5nlB8j+0jJwIFMP0ENkPIDpxLZhlKHhCqYa0AE2iu0Ai/MzYvvheIZRgATLFNbnuweDZ6dvDlqPj3FMvteKjdr7pHGCcKdPMz5Qfc4N3k1ha/ob5/q6yvDX3RW0ab9IvE+7bvCcv8LZl6H0Ss97Rf/0zbL8Ave1YKjqQ5mgFE6LfrDg84spWUNL3PQERCLC3WvXe5NrT38iMcI1++80CE2xJ3fQOv8CrFetXnz0FsGsX0Zd6A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 12.22.5.238) 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=DNC4874/6ISq5zZXI6rFdUqDX1vENyOcyuQUPDC0n4g=; b=IRHzobQn2CsMV/YTFzl+F82pd+7aEoKG3ZPcO/hD9fGADf8/m6lpmsR5HqiJ4h3Z947PVLjPGSpp+Ho86230qldFThJDZmAL7KiGMZVuIbJgiyN/akpzYdB18KCT6nkNw1JpTIokNhy0/9Fo2d1tkddNRU9MYbzbMrixBs7lzew7kyJYWyS93Mh5QSSZ3cfNVRJDLJpXiFdtpw3dBlqqyACW4HulYpkalW+5IvZ8ZSONdkdqMgPVgifDzwasnGl8h6Uv9cUNNtqSqakMFnH0T0Jr0mjeRVCVU6l3ZITKCCbm9LZ1GujBydDX2w3uSk5bfgKRoC8eFn8O0xf1txPHsA== Received: from CO2PR04CA0130.namprd04.prod.outlook.com (2603:10b6:104:7::32) by SA0PR12MB4557.namprd12.prod.outlook.com (2603:10b6:806:9d::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5038.14; Mon, 7 Mar 2022 08:01:37 +0000 Received: from CO1NAM11FT068.eop-nam11.prod.protection.outlook.com (2603:10b6:104:7:cafe::16) by CO2PR04CA0130.outlook.office365.com (2603:10b6:104:7::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5038.14 via Frontend Transport; Mon, 7 Mar 2022 08:01:37 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 12.22.5.238) 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 12.22.5.238 as permitted sender) receiver=protection.outlook.com; client-ip=12.22.5.238; helo=mail.nvidia.com; Received: from mail.nvidia.com (12.22.5.238) by CO1NAM11FT068.mail.protection.outlook.com (10.13.175.142) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.5038.14 via Frontend Transport; Mon, 7 Mar 2022 08:01:36 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by DRHQMAIL105.nvidia.com (10.27.9.14) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Mon, 7 Mar 2022 08:00:50 +0000 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.9; Mon, 7 Mar 2022 00:00:47 -0800 From: Rongwei Liu To: , , , , Li Zhang CC: , , Subject: [PATCH v1] net/mlx5: fix meter creation default state Date: Mon, 7 Mar 2022 10:00:35 +0200 Message-ID: <20220307080035.1140326-1-rongweil@nvidia.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain 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-Office365-Filtering-Correlation-Id: 61cd1064-40a0-4104-6b35-08da0010b44a X-MS-TrafficTypeDiagnostic: SA0PR12MB4557:EE_ X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dl7yC1Mo+TtwLfT4GIt/Eht20H5LrK+C70/lHZBpmxvqa/ZPb0WcuctifljpR+TED5kjZUrAyciwR8J60TY6am4QVO2bg/TIhr169i9vRVSThtuHtiwGrfYXKDN1E612mDQUX0Tqq34ArRVjPUJSJfA1oVFcbMXLGy4DSn8MpAMCt0q+kwtWEP0SLEwTA+c/r1Cpu6a5+SKbjXDrTcj++RVPYd3RjEV8Xs0MlRnyVbAS9DB/8nuXM+ome5tZLbf4yy3MgsGisg+qUkxapJXWON6wC/CUfVwTBQC5/uKWeOaIxbV5ykiHVI26ciuMUaf9GfGA3IpzD/cPRa+O581sJdWr9Xqk1iPbtmXQ6PViOJhBe2qPFZMfhKKwNCWtDfmiMqee2NbP2Z3XdTmwIYYQUHVShKeOkz9tpVm3JdLIDffFINTpfOIyy/88Qm1pxoxW9eABONI1oMlBVSPBmabjfoHBcC5iEiLrH+i5EgmiddJhapSmo0I01vcAmemPdhV/0AmUDhIUHSoa331peZePtIpWojYluoL4IDo0VModdEtDxeWIcYlrLZVRGwQnduwGgDQb/dKpmtGvXxvWsVPAvzJmmB1dgBbtcI1AgqcUeDZJ/JILA6y+3bDwx2layoLuWZj+wXzYwhXrvSk0T0DA9Qs97GfvqKh1eXH5V7hQYXz87eZ4T5z9ofsqohrBxbI6U9Dn/ligKW7RW9lcIZkOChVWiDwrIVKUi1muMvpVhyJTH0QFkkMqTveqnMyZcG6R X-Forefront-Antispam-Report: CIP:12.22.5.238; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:mail.nvidia.com; PTR:InfoNoRecords; CAT:NONE; SFS:(13230001)(4636009)(46966006)(40470700004)(36840700001)(2616005)(82310400004)(81166007)(7696005)(36860700001)(2906002)(356005)(86362001)(6286002)(316002)(47076005)(70586007)(508600001)(70206006)(8676002)(6666004)(4326008)(55016003)(336012)(8936002)(26005)(16526019)(426003)(5660300002)(186003)(83380400001)(110136005)(36756003)(40460700003)(54906003)(1076003)(6636002)(36900700001)(309714004); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Mar 2022 08:01:36.9661 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 61cd1064-40a0-4104-6b35-08da0010b44a X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[12.22.5.238]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT068.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR12MB4557 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 Disable means there is no packet drop in the meter. Meter is active always but programmed with another CIR/CBS value. If the user wants to disable the meter in creation, PMD calls the disable() API manually after meter initialized. Fixes: 444320186393 ("net/mlx5: support meter creation with policy") Cc: stable@dpdk.org Signed-off-by: Rongwei Liu --- drivers/net/mlx5/mlx5_flow_meter.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_flow_meter.c b/drivers/net/mlx5/mlx5_flow_meter.c index 06ab7c4a88..7b24948ab5 100644 --- a/drivers/net/mlx5/mlx5_flow_meter.c +++ b/drivers/net/mlx5/mlx5_flow_meter.c @@ -15,6 +15,10 @@ #include "mlx5.h" #include "mlx5_flow.h" +static int +mlx5_flow_meter_disable(struct rte_eth_dev *dev, + uint32_t meter_id, + struct rte_mtr_error *error); /** * Create the meter action. * @@ -1288,7 +1292,7 @@ mlx5_flow_meter_create(struct rte_eth_dev *dev, uint32_t meter_id, } /* Add to the flow meter list. */ fm->active_state = 1; /* Config meter starts as active. */ - fm->is_enable = 1; + fm->is_enable = params->meter_enable; fm->shared = !!shared; __atomic_add_fetch(&fm->profile->ref_cnt, 1, __ATOMIC_RELAXED); if (params->meter_policy_id == priv->sh->mtrmng->def_policy_id) { @@ -1313,7 +1317,10 @@ mlx5_flow_meter_create(struct rte_eth_dev *dev, uint32_t meter_id, data.dword = mtr_idx; if (mlx5_l3t_set_entry(priv->mtr_idx_tbl, meter_id, &data)) goto error; + } else if (!params->meter_enable && mlx5_flow_meter_disable(dev, meter_id, error)) { + goto error; } + fm->active_state = params->meter_enable; if (mtr_policy) __atomic_add_fetch(&mtr_policy->ref_cnt, 1, __ATOMIC_RELAXED); return 0; -- 2.27.0