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 330F8A0547 for ; Thu, 27 May 2021 17:20:48 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2656F410EE; Thu, 27 May 2021 17:20:48 +0200 (CEST) Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1anam02on2067.outbound.protection.outlook.com [40.107.96.67]) by mails.dpdk.org (Postfix) with ESMTP id 07FB140143; Thu, 27 May 2021 17:20:45 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mjxwy+21niefQcUskEpnlMH03rR0Cbn4cqmNxSDfXtfvq18oXCiKw+182gYZ84ryZH7j/ejEAdCmMbeVju3q9DHAA4UhFUG/b6QzV5OvfO5Jk0e9jojIf5p77Xg0LXke91VxYup/fYYYP/F1aXULbixsMQ985TQewBNljRSg/qzaO8ZHI6lBuxGSGh8tn44mmyclYScdEVd/RcHyEnk4b4Qiga5ifgW9VcT+zArwF5Wmgf+kTS+n9Nb1Ur0qth2W2sjK5/6KtDs6JFvcsRu154Oo9fn9+YpnuIoQIqzRvjSKxaLhHF0mhBcVdK1S6dyR93z+J8906BFfZt1f9FXMcA== 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-SenderADCheck; bh=zDvYaMWtDJoBnX2VO0uBJ6gKa51S2U2KnQuk6X12f7c=; b=ZAdKnlnBh4/b3hROatCBbXAmmzRyuDtBYb0TtUd0ZRxUUAAA7HKkFcQP0bbJ+xisx6i1QRWsUZSY1Wbzg2UcMDpZRD5I66710JGmjwtKQpjqJUWQ+onacJfrsYpEs2HeBwcqCpr4DnzUongCv0CwCK8DB+PS6u3oi399fIQqZ5NnyySYgEbS9/2FtcVeEkKZaB5d91kRW7Yrk+mtKbcnj/C7UNGAIaHb2t4bLDDwh86QFYclziGLR+2j4DtF6mLC6Eys34Ego3hGJ0SozlNKyLrREJEI19GzgqK6JZBjzm4AE9SHe0iJxE7O8ceS3TodNHOMw5DoAxYyi1Jwn1FG0w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=none sp=none 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=zDvYaMWtDJoBnX2VO0uBJ6gKa51S2U2KnQuk6X12f7c=; b=VRpwXD/tRkyyimL5+/he87f6CewKVISvESIoLeVz0K5sJpzTdrIrgR+aks0MuUTW+QIxdLqEHYhFiSWjvqLP2IJhVg8CEqAQBov3bHKSRorQxFLKUYhTNa7Js0+VRmENXhFT9bmaByHa8TZF3dEYSWVRcg5NkF1zpgqVWs6TmyaZudNRg5XXuiDV/MGSrVBFfp6VvHFU/Xksnj8XiPtAUrnMOb/q/g+YJE/ol78cQdUDj+9E8BPmdLQex48vApMsU6Y2NADQoE63a/jYRRozqHxStxdvNnRGL1RWOnQ6o8LTvPmLbmMwqVkJMV5bjQYh8xG98qA+HE8TGkVzi3bPVw== Received: from DM5PR21CA0040.namprd21.prod.outlook.com (2603:10b6:3:ed::26) by BL1PR12MB5032.namprd12.prod.outlook.com (2603:10b6:208:30a::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4173.20; Thu, 27 May 2021 15:20:44 +0000 Received: from DM6NAM11FT015.eop-nam11.prod.protection.outlook.com (2603:10b6:3:ed:cafe::76) by DM5PR21CA0040.outlook.office365.com (2603:10b6:3:ed::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4195.2 via Frontend Transport; Thu, 27 May 2021 15:20:44 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; intel.com; dkim=none (message not signed) header.d=none;intel.com; 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 DM6NAM11FT015.mail.protection.outlook.com (10.13.172.133) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4129.25 via Frontend Transport; Thu, 27 May 2021 15:20:43 +0000 Received: from nvidia.com (172.20.145.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Thu, 27 May 2021 15:20:40 +0000 From: Gregory Etelson To: CC: , , , , , Viacheslav Ovsiienko , Shahaf Shuler , Ferruh Yigit , Dekel Peled Date: Thu, 27 May 2021 18:20:24 +0300 Message-ID: <20210527152024.12383-1-getelson@nvidia.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.145.6] X-ClientProxiedBy: HQMAIL111.nvidia.com (172.20.187.18) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7680ef6d-f312-4ef4-0fe9-08d92122fefc X-MS-TrafficTypeDiagnostic: BL1PR12MB5032: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5236; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +bn+OoY8CphYU0hwef7NXpzjaloHYDf4BEw9Z2dQkpcImMtkTCKQBiI1Hqme41jNey1LuRwMdbn5Jaf9ozWF3xWrKoJ2kKPwad3NVVlSZJxnLLAeSpYIl045m6CkPyqyv0lY4hKPDHb6nYN9LwBVgckAh8H3LGLhiEOK8+Hdk488Ovnu+mJP+WHULVM0cwGeCchHCA3JTXy+4tMZLzT9UeVkBPvNDxLjLNwnl31nNe4o0iFBFFqJOyzZ4xpghwwOaDUGvueAb1/QpMVAYhBRJkKuMw6Bt5oI2ZuhBBn5H2d3e8O6uI6/gqMpTMjoQM3e4ITl/OlXy9Z6qjzqeeEhNlzo2oXzqdCaM76P7WEP8vuwx/xQNX02LCjAs0hg9OPKRduxRk52NW3I0dxKSmEdXa5aamo2DlMnOfSfEm8H4VL4Jdyifsyjcyu7DjHuPrM0xrY1ur/shjNzQpPRs6Bb5fH93b+kq6s0CBF8EtuJOiiP+8bBYmeVN0yjMlWOSlHn2eKbjO/Jy98OPXaxEcXTd93EztMaOKqdBdg6Uliy7Apf7xYLW80OAy7ltW7HJb0NERHwlruQavSYqWLCOFgWBj5L2d1/JFwDpj+LGruiO4dPLWjOkXddHaP+35/yF+bh66UCbFk05mQ7j/dY/4RGAQ== 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)(396003)(136003)(346002)(39860400002)(376002)(46966006)(36840700001)(82740400003)(426003)(2616005)(336012)(86362001)(70586007)(356005)(16526019)(6666004)(186003)(82310400003)(70206006)(1076003)(7636003)(7696005)(54906003)(5660300002)(36860700001)(55016002)(47076005)(107886003)(6916009)(26005)(316002)(36906005)(8936002)(8676002)(4326008)(6286002)(83380400001)(36756003)(478600001)(2906002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 May 2021 15:20:43.9163 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7680ef6d-f312-4ef4-0fe9-08d92122fefc 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: DM6NAM11FT015.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR12MB5032 Subject: [dpdk-stable] [PATCH] net/mlx5: fix RSS expansion pattern 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 Sender: "stable" Flow rule pattern may be implicitly expanded by the PMD if the rule has RSS flow action. The expansion adds network headers to the original pattern. The new pattern lists all network levels that participate in the rule RSS action. The patch fixes expanded pattern for cases when original pattern included meta items like MARK, TAG, META. Fixes: c7870bfe09dc ("ethdev: move RSS expansion code to mlx5 driver") Cc: stable@dpdk.org Signed-off-by: Gregory Etelson Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_flow.c | 54 ++++++++++++++++++++++++++++++++++-- 1 file changed, 52 insertions(+), 2 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index dbeca571b6..e5e062d09a 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -114,6 +114,30 @@ struct mlx5_flow_expand_rss { } entry[]; }; +static void +mlx5_dbg__print_pattern(const struct rte_flow_item *item); + +static bool +mlx5_flow_is_rss_expandable_item(const struct rte_flow_item *item) +{ + switch (item->type) { + case RTE_FLOW_ITEM_TYPE_ETH: + case RTE_FLOW_ITEM_TYPE_VLAN: + case RTE_FLOW_ITEM_TYPE_IPV4: + case RTE_FLOW_ITEM_TYPE_IPV6: + case RTE_FLOW_ITEM_TYPE_UDP: + case RTE_FLOW_ITEM_TYPE_TCP: + case RTE_FLOW_ITEM_TYPE_VXLAN: + case RTE_FLOW_ITEM_TYPE_NVGRE: + case RTE_FLOW_ITEM_TYPE_GRE: + case RTE_FLOW_ITEM_TYPE_GENEVE: + return true; + default: + break; + } + return false; +} + static enum rte_flow_item_type mlx5_flow_expand_rss_item_complete(const struct rte_flow_item *item) { @@ -273,8 +297,11 @@ mlx5_flow_expand_rss(struct mlx5_flow_expand_rss *buf, size_t size, addr = buf->entry[0].pattern; } for (item = pattern; item->type != RTE_FLOW_ITEM_TYPE_END; item++) { - if (item->type != RTE_FLOW_ITEM_TYPE_VOID) - last_item = item; + if (!mlx5_flow_is_rss_expandable_item(item)) { + user_pattern_size += sizeof(*item); + continue; + } + last_item = item; for (i = 0; node->next && node->next[i]; ++i) { next = &graph[node->next[i]]; if (next->type == item->type) @@ -6174,6 +6201,10 @@ flow_list_create(struct rte_eth_dev *dev, uint32_t *list, mlx5_support_expansion, graph_root); MLX5_ASSERT(ret > 0 && (unsigned int)ret < sizeof(expand_buffer.buffer)); + if (rte_log_can_log(mlx5_logtype, RTE_LOG_DEBUG)) { + for (i = 0; i < buf->entries; ++i) + mlx5_dbg__print_pattern(buf->entry[i].pattern); + } } else { buf->entries = 1; buf->entry[0].pattern = (void *)(uintptr_t)items; @@ -8990,3 +9021,22 @@ mlx5_release_tunnel_hub(__rte_unused struct mlx5_dev_ctx_shared *sh, { } #endif /* HAVE_IBV_FLOW_DV_SUPPORT */ + +static void +mlx5_dbg__print_pattern(const struct rte_flow_item *item) +{ + int ret; + struct rte_flow_error error; + + for (; item->type != RTE_FLOW_ITEM_TYPE_END; item++) { + char *item_name; + ret = rte_flow_conv(RTE_FLOW_CONV_OP_ITEM_NAME_PTR, &item_name, + sizeof(item_name), + (void *)(uintptr_t)item->type, &error); + if (ret > 0) + printf("%s ", item_name); + else + printf("%d\n", (int)item->type); + } + printf("END\n"); +} -- 2.31.1