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 93987A00BE for ; Wed, 9 Mar 2022 13:08:52 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 81C53410E6; Wed, 9 Mar 2022 13:08:52 +0100 (CET) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2082.outbound.protection.outlook.com [40.107.93.82]) by mails.dpdk.org (Postfix) with ESMTP id 4148940395; Wed, 9 Mar 2022 13:08:50 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=H360ou6uUIG67vhzBN73m8+0epS0dGTv86K8KDSy17xQVcoVH2ke+wv+JhwQOIc4fkwlvEFni2GbR2MQrhyRhQME2k3kvF0WhjRrRkqZGDRrTBInX6eZKKL0gHStsFc9TFMRM1rFaUSXTkKiiZjAnjFwzDu7OFa4/7XeLeF1Kn1lUIvAc/pt3yWezIIFnPbfcp1MtIHUdwJ2aABbzpI5nCUSRIe4jyiDw2iAHXMhMKIagh/PW0PDdR1lV/ThcX3w97cW/3zEljb8j6jswxYMQRlCez/YuiGP8Rr9EPx42Sh5BzWlQw06Q9aekzl/lk5MLCEwk52qW3dIdA8V3dVrOg== 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=JeGdv3AT1dJlW0o0kOAM39OZFIVn+wCYbMWUpXRG6TE=; b=h82XWDbiHTyqDIIQA4bCkFksMYHLAq6dpKYzr0xsD9bgsOdWx+Tz6XQliTmo+mYBAA2LHilteSmnBqhhCPFsCg7dBAO8CmNqRZXLWmcaqKHWD2P9FdWbDHRWDIZnhj11ObQutiNV64oSmIjU5QZtzx6BSt1/DBZgHKFxkgz9gv8hg6kRSZ2ujNsOrPnw7/CHMGSFe/pnxxHZaUHCVDi+oHQUD32/aIYHcepejH9c9PCwt6JTwNQ7KRrKRXO68bempGhhTXIACpRBx92WLw5uSwstaBoNfEZ0HqBKIsTYEPACI+g891ND/zfKqU4YGqH7yDEG4EPHqbX+VQM/Zf6CRQ== 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=JeGdv3AT1dJlW0o0kOAM39OZFIVn+wCYbMWUpXRG6TE=; b=J5Y1NdxhcCVpVRRNREpU5Rabr1mO4QMIQBQ/Zc3DKuyJGJ2ENSgu3M0JfCTPWbVq5/gs/OFTr6J0u/dq9zm+zE1CpaDFls0tjOqzGaAZHhmUajHdSSA+4e3s/QBM7U3vKq4bpI0rhrJ+zTKF+l0tn3gfOZvtzkE0x4ZjbMAAcRBwXth7zN3oo16BbCaorGInUfMi1Y56Pv+xUt7p4x1AKTKfhgumet+luR8eFqaY/d0255WEncnKMspx523igaEdaCmgGVidm4Z2LhHzEcQIOXvZWLH1BUUgXrX78NloFHzMaMrfk2rN+hO9Sjv/JeCuWaWHdCTWTl1iGegDn9ESsA== Received: from BN8PR04CA0065.namprd04.prod.outlook.com (2603:10b6:408:d4::39) by MN2PR12MB3327.namprd12.prod.outlook.com (2603:10b6:208:cd::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5038.17; Wed, 9 Mar 2022 12:08:47 +0000 Received: from BN8NAM11FT008.eop-nam11.prod.protection.outlook.com (2603:10b6:408:d4:cafe::2c) by BN8PR04CA0065.outlook.office365.com (2603:10b6:408:d4::39) 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 12:08:47 +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 BN8NAM11FT008.mail.protection.outlook.com (10.13.177.95) 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 12:08:47 +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 12:08:45 +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; Wed, 9 Mar 2022 04:08:42 -0800 From: Rongwei Liu To: , , , , Michael Baum CC: , , , Xiaoyu Min Subject: [PATCH v1] net/mlx5: disallow multiple ASO actions in a single flow Date: Wed, 9 Mar 2022 14:08:29 +0200 Message-ID: <20220309120829.1485659-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: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f5c956d4-f11b-40d0-843c-08da01c590b3 X-MS-TrafficTypeDiagnostic: MN2PR12MB3327: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: +Rd+FQhe+bKKTKQ+pC3/pYQeUIQ2vOoJ0SEGl4LLCnHDedi+CbOn5Kr9ePXc7a2ZlywgSi2ASepnH6ObIuwpE/DjsTvt/4IhVUO1vuExrviat8pAPlIeIZ4KaCIlVwVUB+cZwhQUX4fkUXAwjIlfZ/lyTmSwTeecy19qnaoKAXprnq9UFaZSoJ2d0w90iVVTi5GR1Zf3SeAPVeoMMy11WhLeidzdVsBOxc3mtfInLlHVsKKp9pN88lNj6gPukTbwnwYethZSlWl1uIVYSYQpWgs5wx800hvKnLdm1Oj+w2d8atvG4LZ8RTUyJ38I/1+mI3wGE5rzVT8hPMP0u4ZKFINy4RDcY4pG71HCIMttvKhZNpJ4nYuCmBUUXV9snzm1pDogr17s/CDYy7B/hgnKVwrIJWJSolyIJvNEYcXKnYwpiLlfR2pQoT73up3JgrEt1PlAJIHqJezBdRMHEFJeRl98F7iCsMIS87HWS38NyDkyWmIzZ/iAPFPeAFW5dKxTCuDUXNxMwL+HhgDVv1Oq9DGyI/84jVk+s/jjm8oy/LB0MXrFI4pDYcgb4P+T4x6w5thbwUrAIfbNPNhRE2YgBCl/bvgjz3nB88SPEmzWpzx+HjN4Sz9SJIybE/zl5pi29eFJ6vikP4KjD14QSzRBSXUjP8L0OamjCxJlwA742gDLiq8UjTiyTvMkCG7RJtuWxrxrFP5m7NEgolrXH6/2bQ== 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)(46966006)(40470700004)(81166007)(70206006)(8676002)(5660300002)(4326008)(2906002)(356005)(82310400004)(36756003)(8936002)(54906003)(36860700001)(110136005)(316002)(6636002)(70586007)(40460700003)(508600001)(86362001)(55016003)(107886003)(47076005)(6666004)(7696005)(6286002)(336012)(2616005)(426003)(16526019)(1076003)(26005)(83380400001)(186003)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Mar 2022 12:08:47.2340 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f5c956d4-f11b-40d0-843c-08da01c590b3 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: BN8NAM11FT008.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB3327 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 For now, only one ASO action is supported in a single flow. Flow with more than one ASO action should be rejected in the validation stage. Flow with action non-shared AGE and COUNT together should be treated as non-ASO because AGE will fall back to use HW counter, not ASO hit object. Group 0 will use HW counter for AGE action even if no COUNT action. This commit will reject patterns (no matter which group if transfer) like: 1. group 1 pattern... / end actions age / meter / end 2. group 1 pattern... / end actions conntrack / meter / end 3. group 1 pattern... / end actions age / conntrack... / end If AGE comes together with COUNT in the above patterns, it's allowed. Fixes: daed4b6e ("net/mlx5: use aging by counter when counter exists") Cc: stable@dpdk.org Signed-off-by: Rongwei Liu Acked-by: Xiaoyu Min Acked-by: Matan Azrad --- drivers/net/mlx5/mlx5_flow_dv.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 29751e7eda..fccc4a9301 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -6862,7 +6862,7 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, bool external, int hairpin, struct rte_flow_error *error) { int ret; - uint64_t action_flags = 0; + uint64_t aso_mask, action_flags = 0; uint64_t item_flags = 0; uint64_t last_item = 0; uint8_t next_protocol = 0xff; @@ -6931,6 +6931,8 @@ 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; + const struct rte_flow_action_age *non_shared_age = NULL; + const struct rte_flow_action_count *count = NULL; if (items == NULL) return -1; @@ -7468,6 +7470,7 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, attr, error); if (ret < 0) return ret; + count = actions->conf; action_flags |= MLX5_FLOW_ACTION_COUNT; ++actions_n; break; @@ -7773,6 +7776,7 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, ++actions_n; break; case RTE_FLOW_ACTION_TYPE_AGE: + non_shared_age = actions->conf; ret = flow_dv_validate_action_age(action_flags, actions, dev, error); @@ -8048,6 +8052,20 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, "cannot be done before meter action"); } } + /* + * Only support one ASO action in a single flow. + * non-shared AGE + counter will fallback to use HW counter, no ASO hit object. + * Group 0 uses HW counter for AGE too even if no counter action. + */ + aso_mask = (action_flags & MLX5_FLOW_ACTION_METER && priv->sh->meter_aso_en) << 2 | + (action_flags & MLX5_FLOW_ACTION_CT && priv->sh->ct_aso_en) << 1 | + (action_flags & MLX5_FLOW_ACTION_AGE && + !(non_shared_age && count) && + (attr->group || (attr->transfer && priv->fdb_def_rule)) && + priv->sh->flow_hit_aso_en); + if (__builtin_popcountl(aso_mask) > 1) + return rte_flow_error_set(error, ENOTSUP, RTE_FLOW_ERROR_TYPE_ACTION, + NULL, "unsupported combining AGE, METER, CT ASO actions in a single flow"); /* * Hairpin flow will add one more TAG action in TX implicit mode. * In TX explicit mode, there will be no hairpin flow ID. -- 2.27.0