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 E67FCA0C4E; Tue, 2 Nov 2021 08:22:58 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 824C540DF6; Tue, 2 Nov 2021 08:22:58 +0100 (CET) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2085.outbound.protection.outlook.com [40.107.92.85]) by mails.dpdk.org (Postfix) with ESMTP id AE2C94068F for ; Tue, 2 Nov 2021 08:22:57 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GOgLs5ElgLtfPU/KXeZpLtu4znptuZTKnq1opO+/bgchCKi9QeX19nRmEPuMfP8vl4jpaZdJsU1zH1rZNetC5b7vEvWbspx33V+vHgMt14p/tDprPFhHvx1sGmYWFo/0vN55Q147/3iDiy7KIJmrTjlafNkkEmJcQATyNu+K/hxN05o8+LaWFCSBOO/E1vHMcRS99UrrcKAxkNkeT/VhqOlUyU9LQgFgLc2NoGnCMBQn/Uxjad43x68AnQo5Hdgqui6ZuR2LtISCZ2ELyYB+difirQ0Jy0zAyoycjxRyWED5JVaSDpvD8jJUKQXT/1h6SPXDKQBwp7zo9qJqPm8p1Q== 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=UG0MheAx+E9/L4gZ+QUarFuet66aLQsrCexgnrhuw5Q=; b=S7Kx9hoNkXPG+gU1JXy6/qBGEuz7wjaCf7Xt0D9ARLO4pzdlBbCi0LMu0fjz1F8l7zL1hSSmHTshLB7Q0229H06c54pvc5EyhoV1+LBWcUA4naYdU+jhrZh4POiWVvX85/XQ+RuoH85+CnAu86VYp1hobYXIwT/z+5/8wk1iU5tKBRcVDyFhHard+dQwPXWdaZMZeaViFsoLBxwLcXasz+HVAgKE5fjqe85QhJstlCRAvNnB+xzvXuL0a0/rEuVyj/Q6tyxPOY2Qsvnx1XYSGIDCf7aaoR8QG9Br8AefOtNO616CRo6eKCVjNXNTTq5PDVuvSV9E3sUm6BwyaPaKVA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=quarantine 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=UG0MheAx+E9/L4gZ+QUarFuet66aLQsrCexgnrhuw5Q=; b=gKg+smqQUsCd1PdKs2Q5WS5wBfDfSU9DgQAGZoVXcQoFRzdP3e3gWYYdMmSblQVQfcN8NEqJpiwqkBu9Mm0MPlKus2EtCXCDWc26NWKYs0R6O4dkXQ3b552S4UtsirXp75/4ApMHuwZ6qvPaawptL16RM6K/+DGdBQ9y35NJisRoY0MVByMlpdv2+A71YmqYsGnf98TAS4RRSQjIl+IW0B036w2PKJQPvKpMad03Z6SUA3qAWrBHEJFbP7+vplUqK4Orj8jo341GIwyx8f5cM9QT173q7qPRYQqHFd+ToSJn3vBlLBBeT7atNUOsQuzN7yb0wRd5mJuf2JbpAGPCPw== Received: from BN6PR16CA0038.namprd16.prod.outlook.com (2603:10b6:405:14::24) by DM8PR12MB5496.namprd12.prod.outlook.com (2603:10b6:8:38::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4649.15; Tue, 2 Nov 2021 07:22:56 +0000 Received: from BN8NAM11FT044.eop-nam11.prod.protection.outlook.com (2603:10b6:405:14:cafe::9c) by BN6PR16CA0038.outlook.office365.com (2603:10b6:405:14::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4649.15 via Frontend Transport; Tue, 2 Nov 2021 07:22:56 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; dpdk.org; dkim=none (message not signed) header.d=none;dpdk.org; 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 BN8NAM11FT044.mail.protection.outlook.com (10.13.177.219) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4649.14 via Frontend Transport; Tue, 2 Nov 2021 07:22:55 +0000 Received: from nvidia.com (172.20.187.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Tue, 2 Nov 2021 07:22:52 +0000 From: Rongwei Liu To: , , , , Bing Zhao CC: , Date: Tue, 2 Nov 2021 09:22:40 +0200 Message-ID: <20211102072240.1073955-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: [172.20.187.5] 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: c1739267-7d5f-48d3-f3ca-08d99dd19734 X-MS-TrafficTypeDiagnostic: DM8PR12MB5496: X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6430; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Dz20tmSC5QEiC6FD2bGlDhoh4m1PDO8FGQcQxvm9d/3v03UlXNS/NoyB7QU5dZY8iKNkvPb+zUXO0Z4oZ9hQgCUPD1yA/u007HVSIDXLZJI02piZTYiSD644QFoo6g3z6cyV0Ig5to+5Y73ZH1OCaVhjNeFkkpuWCNUe/RpQ5EqXvkuDyfJPMRkK5d3LKv1/itcQGr5FuF7jCrruJPGWclgLVNPU87FeRqqm8IDRIi2hfsaAFDJhYQ7NljpRiqPvnaJkP9YM+NAR4vkaHL2I+Nw3ivKH/tw1vaTnShPjK6sCj+9udScHxLvO36LW12dmT5Zmhe40O2FefFbt4MCgBmzyzvkSGPmrdFYR/NoJfXw1chj+3OnVGQXx0gQh0nqE56oQnxe2STlgksPOObwfPGDUQ8XdcaMCP0Z3Pw+3eOY1mPjzKF3Cdj28fzSoZz5o7lwd2Kb/rXtPkioJZ+tkpBCozZxfV7Sjer2BBRz2Y6IWzCYFSSlpXHtWmGupKquX6QYTOQIDKKm1H1cGd8e1PFuZZjknyZkqWQE5CSZZyUWhqqCV2bdaldCC8JLxxcHceIv+BQeR4ix7R6yegnJbVIRNeEP17o3r4Rzk2o/X0U+T1us6Ls28JuttVjcIOSlG8GySyvKZ2F3FsNTiMHkMQLg5m9sXfKigF/n6KVvqyJIGrEkY2eSjhRn+PU+TYt48AozpXd5Gj6PHgGppD6U78g== 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)(46966006)(36840700001)(83380400001)(82310400003)(508600001)(86362001)(5660300002)(36860700001)(55016002)(4326008)(1076003)(6636002)(2906002)(47076005)(7636003)(107886003)(54906003)(2616005)(426003)(356005)(8676002)(336012)(6286002)(7696005)(16526019)(6666004)(26005)(70206006)(316002)(186003)(8936002)(36756003)(110136005)(70586007)(36906005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Nov 2021 07:22:55.8522 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c1739267-7d5f-48d3-f3ca-08d99dd19734 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: BN8NAM11FT044.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM8PR12MB5496 Subject: [dpdk-dev] [PATCH v1] net/mlx5: fix meter policy validation 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 Sender: "dev" When a user specifies meter policy like "g_actions queue / end y_actions queue / r_action drop / end", validation logic missed to set meter policy mode and it took a random value from the stack. Define ALL policy modes for the mentioned cases. Fixes: 4b7bf3ffb473 ("net/mlx5: support yellow in meter policy validation") Cc: bingz@nvidia.com Signed-off-by: Rongwei Liu Acked-by: Matan Azrad --- drivers/net/mlx5/mlx5.h | 2 ++ drivers/net/mlx5/mlx5_flow_dv.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h index 39c001aa1b..591ae2764a 100644 --- a/drivers/net/mlx5/mlx5.h +++ b/drivers/net/mlx5/mlx5.h @@ -622,6 +622,8 @@ struct mlx5_dev_shared_port { #define MLX5_MTR_TABLE_ID_DROP 2 /* Priority of the meter policy matcher. */ #define MLX5_MTR_POLICY_MATCHER_PRIO 0 +/* Green & yellow color valid for now. */ +#define MLX5_MTR_POLICY_MODE_ALL 0 /* Default policy. */ #define MLX5_MTR_POLICY_MODE_DEF 1 /* Only green color valid. */ diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 8962d26c75..e516c11d9a 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -17617,6 +17617,8 @@ flow_dv_validate_mtr_policy_acts(struct rte_eth_dev *dev, *policy_mode = MLX5_MTR_POLICY_MODE_OG; } else if (def_green && !def_yellow) { *policy_mode = MLX5_MTR_POLICY_MODE_OY; + } else { + *policy_mode = MLX5_MTR_POLICY_MODE_ALL; } /* Set to empty string in case of NULL pointer access by user. */ flow_err.message = ""; -- 2.27.0