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 19217A0C47 for ; Tue, 10 Aug 2021 17:44:32 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 12BE540686; Tue, 10 Aug 2021 17:44:32 +0200 (CEST) Received: from smtp-relay-canonical-1.canonical.com (smtp-relay-canonical-1.canonical.com [185.125.188.121]) by mails.dpdk.org (Postfix) with ESMTP id 1F139411C7 for ; Tue, 10 Aug 2021 17:44:30 +0200 (CEST) Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-1.canonical.com (Postfix) with ESMTPS id 093523F107 for ; Tue, 10 Aug 2021 15:44:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1628610270; bh=528sadn2qnQY0aFUPAhZUQ6Zmr2whdYHcyMu58jOh7M=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=NtTRAEYfy0aYcCTjThg7GNEGPsndurx8L557kzyxwyqTlhRCV5ck6C2xpXxhk79aQ 6eX+L6pIubaHaq6Ur8hXWhRDdth1NfI6ETL1EqwaDr04eFr2al3hC/ju+CLyQAvOKw Zw/MBvgXK2nG+e5wKSbuKEdTvjTJD3oSYmt3QLzXT3OXxtLBmjfRCKcOD9U5AVfp+v DV8IO6fb+05jXkh7cKIOVBt4/DFVoDX0VpD3BQA9m/WmwMZlhUzlEbuqrrVYRkcI0Y yTHhZA4spv0KtoIS3qKnRmPmtJSbOYFSnP8nw5bOxa7BSj+QTnb7fam0SM+eDymtnu fsVhHb6gAOyew== Received: by mail-ej1-f71.google.com with SMTP id r21-20020a1709067055b02904be5f536463so5766951ejj.0 for ; Tue, 10 Aug 2021 08:44:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=528sadn2qnQY0aFUPAhZUQ6Zmr2whdYHcyMu58jOh7M=; b=fWe+xXkxckOqoVib+lG8HHlPNyYywHdCAsQiuzZ2//riB5E8+OabKPHvy17NVf4q0p xbsSPSEwe7WCklKT794y7pjvwP4BpHp+gvPYj1S/5TMwEo299+xwqJhyJBnGNUw+rMhO KYvnBf5u3xgBUcdT2mkB5n45GwkD9NcJS1SE3ZND7p2JJDWrsZobr0l9A9vb2+igj6eO r5fG11Pa/uCTIbDYHv6RJ52Ms3NAzoqevL/1cV4ld2ZEQqMByN3c5ZyFZ6YMYTaze3EF Y+c9lWztWuWJ8gXXhS04WNb3HiaiWBnKY5XDpn0t21j8U3fsAo9v8Fn93Dp5MFUOZ29J ngVA== X-Gm-Message-State: AOAM532EHoByuhyJQFc3CtIvz8FKIV4VuQdxC7I1zX4kAl1G2Ow9ugK/ dXzfu7sZQz3TwHRu620m9UXpJkKpTQXatNqIvr2a+gAjg/an9rniziVzgKRHqGV4n7nXWNatWeo GabOqvc22P39K0q2EXNO8REnX X-Received: by 2002:a05:6402:5251:: with SMTP id t17mr5478876edd.157.1628610269763; Tue, 10 Aug 2021 08:44:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxLEPmMw2YafM8rIjTSEV+SdcESHrCU0H9bHDJrTqd/uzErFIDPknJsOL3Xa0703pucyRehDw== X-Received: by 2002:a05:6402:5251:: with SMTP id t17mr5478861edd.157.1628610269531; Tue, 10 Aug 2021 08:44:29 -0700 (PDT) Received: from Keschdeichel.fritz.box ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id t9sm9371640edd.33.2021.08.10.08.44.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Aug 2021 08:44:28 -0700 (PDT) From: christian.ehrhardt@canonical.com To: Chengwen Feng Cc: Min Hu , dpdk stable Date: Tue, 10 Aug 2021 17:40:00 +0200 Message-Id: <20210810154022.749358-80-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210810154022.749358-1-christian.ehrhardt@canonical.com> References: <20210810154022.749358-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/hns3: fix filter parsing comment' has been queued to stable release 19.11.10 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" Hi, FYI, your patch has been queued to stable release 19.11.10 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/12/21. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/c5f7acac593f4b3358d3d2c449870f11d65114a5 Thanks. Christian Ehrhardt --- >From c5f7acac593f4b3358d3d2c449870f11d65114a5 Mon Sep 17 00:00:00 2001 From: Chengwen Feng Date: Sat, 17 Jul 2021 10:02:51 +0800 Subject: [PATCH] net/hns3: fix filter parsing comment [ upstream commit 529017f9e70b2b41a4febf283946183586c3ebb2 ] This patch fixed incorrect comment of hns3_parse_fdir_filter(). Fixes: fcba820d9b9e ("net/hns3: support flow director") Signed-off-by: Chengwen Feng Signed-off-by: Min Hu (Connor) --- drivers/net/hns3/hns3_flow.c | 59 ++++++++++++++---------------------- 1 file changed, 23 insertions(+), 36 deletions(-) diff --git a/drivers/net/hns3/hns3_flow.c b/drivers/net/hns3/hns3_flow.c index 2153b84ab7..ad6f18ec68 100644 --- a/drivers/net/hns3/hns3_flow.c +++ b/drivers/net/hns3/hns3_flow.c @@ -1075,42 +1075,29 @@ is_tunnel_packet(enum rte_flow_item_type type) } /* - * Parse the rule to see if it is a IP or MAC VLAN flow director rule. - * And get the flow director filter info BTW. - * UDP/TCP/SCTP PATTERN: - * The first not void item can be ETH or IPV4 or IPV6 - * The second not void item must be IPV4 or IPV6 if the first one is ETH. - * The next not void item could be UDP or TCP or SCTP (optional) - * The next not void item could be RAW (for flexbyte, optional) - * The next not void item must be END. - * A Fuzzy Match pattern can appear at any place before END. - * Fuzzy Match is optional for IPV4 but is required for IPV6 - * MAC VLAN PATTERN: - * The first not void item must be ETH. - * The second not void item must be MAC VLAN. - * The next not void item must be END. - * ACTION: - * The first not void action should be QUEUE or DROP. - * The second not void optional action should be MARK, - * mark_id is a uint32_t number. - * The next not void action should be END. - * UDP/TCP/SCTP pattern example: - * ITEM Spec Mask - * ETH NULL NULL - * IPV4 src_addr 192.168.1.20 0xFFFFFFFF - * dst_addr 192.167.3.50 0xFFFFFFFF - * UDP/TCP/SCTP src_port 80 0xFFFF - * dst_port 80 0xFFFF - * END - * MAC VLAN pattern example: - * ITEM Spec Mask - * ETH dst_addr - {0xAC, 0x7B, 0xA1, {0xFF, 0xFF, 0xFF, - 0x2C, 0x6D, 0x36} 0xFF, 0xFF, 0xFF} - * MAC VLAN tci 0x2016 0xEFFF - * END - * Other members in mask and spec should set to 0x00. - * Item->last should be NULL. + * Parse the flow director rule. + * The supported PATTERN: + * case: non-tunnel packet: + * ETH : src-mac, dst-mac, ethertype + * VLAN: tag1, tag2 + * IPv4: src-ip, dst-ip, tos, proto + * IPv6: src-ip(last 32 bit addr), dst-ip(last 32 bit addr), proto + * UDP : src-port, dst-port + * TCP : src-port, dst-port + * SCTP: src-port, dst-port, tag + * case: tunnel packet: + * OUTER-ETH: ethertype + * OUTER-L3 : proto + * OUTER-L4 : src-port, dst-port + * TUNNEL : vni, flow-id(only valid when NVGRE) + * INNER-ETH/VLAN/IPv4/IPv6/UDP/TCP/SCTP: same as non-tunnel packet + * The supported ACTION: + * QUEUE + * DROP + * COUNT + * MARK: the id range [0, 4094] + * FLAG + * RSS: only valid if firmware support FD_QUEUE_REGION. */ static int hns3_parse_fdir_filter(struct rte_eth_dev *dev, -- 2.32.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-08-10 15:11:16.101362922 +0200 +++ 0080-net-hns3-fix-filter-parsing-comment.patch 2021-08-10 15:11:13.090638619 +0200 @@ -1 +1 @@ -From 529017f9e70b2b41a4febf283946183586c3ebb2 Mon Sep 17 00:00:00 2001 +From c5f7acac593f4b3358d3d2c449870f11d65114a5 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 529017f9e70b2b41a4febf283946183586c3ebb2 ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index 82810e00e8..755a6f2c7c 100644 +index 2153b84ab7..ad6f18ec68 100644 @@ -21 +22 @@ -@@ -1134,42 +1134,29 @@ is_tunnel_packet(enum rte_flow_item_type type) +@@ -1075,42 +1075,29 @@ is_tunnel_packet(enum rte_flow_item_type type)