From patchwork Wed Mar 9 10:19:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiawei Wang X-Patchwork-Id: 108616 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 A3EE7A0093; Wed, 9 Mar 2022 11:20:20 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 338BC40687; Wed, 9 Mar 2022 11:20:20 +0100 (CET) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2076.outbound.protection.outlook.com [40.107.92.76]) by mails.dpdk.org (Postfix) with ESMTP id 4384B40395; Wed, 9 Mar 2022 11:20:19 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JW3lvi0ZZYgeL9SnpLWasIu0SfkhNGZD+olXy13RxidaDPxB90rFJmsag1f2VEHtO0+cYIpzlzTc+FFxDqRt3+0nE41g1sqaLDc5DPvHu5PgGV72JNF1QHI84lvgy/HAnhuCw9gZ2ifSrOYGYjT/BpfBus5LsH8Mj3lWG8wpZIsaoohjnHv6Loab1Tao2Vv0ZJk7RQHfFQs6BEZCrA8Z85rVzwMqYB9b1CMm7VH19rW9TfPe9aX2wedGqGLs26AbwHUUnFA9j/eB8spLqrCcd6ExCyU4KTvNFw0bd8l8X8tc/R4bSZHe9GaFolyzxi145qf/+kKzhwmOoa0zfQgwtw== 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=ZURPfLn9GBhXqPuFxSe0SJ6v++rOesQ1hNv608/B6ac=; b=gZxRj83sHuva50nix1Fyz5u/72ZdaQMFFmroN4pNQDEdkaIBs6lG5V9TTHOsiTP7tkTMCVakTQobFrXt4TQ3hag90EER2AwFpTsxQPyJMFTyeSP1quzI5/jOyBEmXCylsYwWRh4kEeDv/aFRzHgGjQbL5vukTeO8rXqBoiIkxME+VctszeQDBu9cRyHLOdBMO0Wmvy4g5/TjP3Inj0mvSs7ol8VpMtMTvGpLS5oyGlMUPtA0VaBrUgDlRenLlO9Oietzw7r6zMmnGDZD3+BGKhEoExS2xmQe1o/+z+TLjUuJoYiTe0dV7dVw2cr3zf7zbesLkTxZUhlou5FdpMloSw== 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=ZURPfLn9GBhXqPuFxSe0SJ6v++rOesQ1hNv608/B6ac=; b=S3k4Er7qRivox9aOjGLzWvoGMd7wm86hLgd6EKIIo3KqHuI07FIf1Sb035uRUM8MYwP0JSTWSQWLhfC0Ysx00DHDpiuNz06hbC2ydx0ndLyISliQmN6kNWURMtFABNThrhP5gv3BTOsbUrykNAVA0UoflPtXxzGoEuRlVeqTvSvRPu/gN3BXRtnWARYYItVOiMs8XN9NRPz+ppP/wSW0aUc6kk1jC//NLFX2UTm4dS1DMiQy4mc5iHA4x8HeqKYhty1j28YCgD5ycVJanCylnAJcYnwFA00+5+hVj1SF9cqhMwWPkw8PT4TIoV95lg4vAN0u/PUAcugykMz6QurGtg== Received: from MW4PR02CA0021.namprd02.prod.outlook.com (2603:10b6:303:16d::31) by MWHPR12MB1629.namprd12.prod.outlook.com (2603:10b6:301:3::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5038.14; Wed, 9 Mar 2022 10:20:17 +0000 Received: from CO1NAM11FT003.eop-nam11.prod.protection.outlook.com (2603:10b6:303:16d:cafe::3d) by MW4PR02CA0021.outlook.office365.com (2603:10b6:303:16d::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5038.14 via Frontend Transport; Wed, 9 Mar 2022 10:20:17 +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 CO1NAM11FT003.mail.protection.outlook.com (10.13.175.93) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.5038.14 via Frontend Transport; Wed, 9 Mar 2022 10:20:16 +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; Wed, 9 Mar 2022 10:20:15 +0000 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.9; Wed, 9 Mar 2022 02:20:12 -0800 From: Jiawei Wang To: , , CC: , , Subject: [PATCH] net/mlx5: fix the sample flow failure on the trusted device Date: Wed, 9 Mar 2022 12:19:46 +0200 Message-ID: <20220309101946.9086-1-jiaweiw@nvidia.com> X-Mailer: git-send-email 2.18.1 MIME-Version: 1.0 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-Office365-Filtering-Correlation-Id: b666d84e-1742-437c-de68-08da01b66838 X-MS-TrafficTypeDiagnostic: MWHPR12MB1629:EE_ 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: 5ZIp9hKBrBYuqRpkQNhu/nA2x/LA3J9ClXK7yZvjwme4bxcmt2jOif7OKKlaOqU9sCcXwEX57GcEBD/2zD+9SJ/A15NZbTq+dl4/EsnXPjST5yly1Bmf5ozGG6wCITs5igIv0zLXmXsXr20EoFtwXr3gUv9JRtd0GtKy+7L6506PT8pD5P4VlaNi8PNPJA40QMDE+/Zq/Za50B8+gjfLMzMh0rxF3CS2ytywf1ppijt0pRm/5TitD4Vo21K5gq9zOkozMeHuvT3YOKEKTholoA1hOF/4Qp+LPZsK1Bnpxp1CnwgN/22hX8d06jFCTeHU3zv7mBYumUGMqNCffN2y4O79Pi+PHiEHgaYez4jYYXaw/7aa2/d4MoF5hWsUP3VGSQKgnLgwGGcIp4zgbZRokhr/8yME5Fy8Ee8lpsJ+V9w5tH5liptVq6Rmjv6wN+Vd7x4qcjFJQHoHVVXKDMqZoz/ic/7bmdbUrSsuTXEsB7JVvhZ1Owx6C/sxtBr9/BBynxtHdZYFE4rvOyDMFy1uyGan5uyrkJ0cc3oYVEkrlV96YY1d42O/g3Xa9QIZnpUB2hW4DzWqfc8+TcwdshK/eqNNJANMIUHuS/B+8Soo0ycnouLDhLLLwZfBp7LkGuCLEdFNlqYfSZzmNqRGBHBGsJPoGZeZZZ/PUXhr8o2yPoty52fKans0M8LnsY63n12Ul6U/L/l8GeERC3KCzugAOA== 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)(36840700001)(40470700004)(46966006)(336012)(26005)(81166007)(40460700003)(36860700001)(1076003)(16526019)(426003)(186003)(83380400001)(36756003)(5660300002)(8936002)(2906002)(55016003)(6666004)(54906003)(6636002)(508600001)(110136005)(316002)(8676002)(7696005)(70206006)(70586007)(6286002)(4326008)(2616005)(47076005)(356005)(86362001)(450100002)(82310400004)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Mar 2022 10:20:16.9485 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b666d84e-1742-437c-de68-08da01b66838 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: CO1NAM11FT003.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR12MB1629 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 The flow with sample action will be split into two sub flows, and a tag action was added implicitly in the sample prefix sub flow, the reserved metadata regC index was used for this tag action. The reserved metadata regC was shared with metering action, for Connect-5 trusted device(VF/SF), the reserved metadata regC was invalid since PF only supported the legacy metering. This patch adds the checking for the tag index and back to use the application tag if a failure happened. Fixes: a9b6ea45bed6 ("net/mlx5: fix tag ID conflict with sample action") Cc: stable@dpdk.org Signed-off-by: Jiawei Wang Acked-by: Viacheslav Ovsiienko --- doc/guides/nics/mlx5.rst | 2 ++ drivers/net/mlx5/mlx5_flow.c | 6 ++++++ drivers/net/mlx5/mlx5_flow_dv.c | 10 ++++++++++ 3 files changed, 18 insertions(+) diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst index a734d10d3f..ca7ebbe9cd 100644 --- a/doc/guides/nics/mlx5.rst +++ b/doc/guides/nics/mlx5.rst @@ -400,6 +400,8 @@ Limitations sample actions list. - For E-Switch mirroring flow, supports ``RAW ENCAP``, ``Port ID``, ``VXLAN ENCAP``, ``NVGRE ENCAP`` in the sample actions list. + - For ConnectX-5 trusted device, the application metadata with SET_TAG index 0 + is not supported before ``RTE_FLOW_ACTION_TYPE_SAMPLE`` action. - Modify Field flow: diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index ffcaef0baa..e2bc6ce8ad 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -5881,6 +5881,12 @@ flow_sample_split_prep(struct rte_eth_dev *dev, append_index++; set_tag = (void *)(actions_pre + actions_n + append_index); ret = mlx5_flow_get_reg_id(dev, MLX5_SAMPLE_ID, 0, error); + /* Trust VF/SF on CX5 not supported meter so that the reserved + * metadata regC is REG_NON, back to use application tag + * index 0. + */ + if (unlikely(ret == REG_NON)) + ret = mlx5_flow_get_reg_id(dev, MLX5_APP_TAG, 0, error); if (ret < 0) return ret; mlx5_ipool_malloc(priv->sh->ipool diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 29751e7eda..ac21676416 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -6931,6 +6931,7 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, bool def_policy = false; bool shared_count = false; uint16_t udp_dport = 0; + uint32_t tag_id = 0; if (items == NULL) return -1; @@ -7407,6 +7408,8 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, ++actions_n; if (action_flags & MLX5_FLOW_ACTION_SAMPLE) modify_after_mirror = 1; + tag_id = ((const struct rte_flow_action_set_tag *) + actions->conf)->index; action_flags |= MLX5_FLOW_ACTION_SET_TAG; rw_act_num += MLX5_ACT_NUM_SET_TAG; break; @@ -7841,6 +7844,13 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, error); if (ret < 0) return ret; + if ((action_flags & MLX5_FLOW_ACTION_SET_TAG) && + tag_id == 0 && priv->mtr_color_reg == REG_NON) + return rte_flow_error_set + (error, EINVAL, + RTE_FLOW_ERROR_TYPE_ACTION, + NULL, + "Sample after Tag action cause metadata tag index 0 corruption"); action_flags |= MLX5_FLOW_ACTION_SAMPLE; ++actions_n; break;