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 A18BEA0C47 for ; Mon, 26 Jul 2021 15:55:36 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 91EDC410E1; Mon, 26 Jul 2021 15:55:36 +0200 (CEST) Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by mails.dpdk.org (Postfix) with ESMTP id 8A6C740DDA for ; Mon, 26 Jul 2021 15:55:35 +0200 (CEST) Received: by mail-wm1-f41.google.com with SMTP id n21so5392173wmq.5 for ; Mon, 26 Jul 2021 06:55:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BwYh8kpZzPplrJG/e8v85VoQbtLSOD5JVns5DAKJres=; b=AbuuGDOUjSf7yT6OlfyApyDTXm2HdEJQPb8ZPS6AAQByDsEqDC3Fjgf6uEirM4q9rD Ng0yE5uUj2SliHk5HjF4JMaRZK3JOXqgPU82eGKNJrzzd3aQHg2SJKeUGjzbEnN6XqiR Ub4mOLpmEMr3+Eln2jI4BPE1BiEuovVDIHi8BTbwBX4O7YHDBjdiNhpLPIV8wdasE8uM MatGeGix9q11QBAowzsEPW64HqEF88+am5OgcX7beIB7ejDraHB7sebGRA22Z0+ZcH3G X7kSqL63iZmQ3q+OXpThZtEpUN2A05Ej/GkrcLYYImUc1Y+SVzq9ZsSlddzvaKb9+ovA +c/Q== 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=BwYh8kpZzPplrJG/e8v85VoQbtLSOD5JVns5DAKJres=; b=BFOT1SsF8Vr9zI3JG9NYF1GZPd7fggus1eZYrZXplPjh70AJTqL6iGaJgX68YwvjGq Gn44VRvW5i3mlVPnw12N+qHRXnTduh/xkfGjwWevioi/qgXhTkIdXwj8dFmxQoFErFJC PE69MJKguQRDGZHXD2l6FrxOnw0gHJXR6bRBlchHdnJlvatUnUJXdvkrhkxwbC9WvWvA htGQArU1U6a4FjAvD5MMz1ehDYjTfiPPjW+WO2jrIRHLsEiQ3B5ZQmts9+cOYWnimHDh oBszIn5RyU37DdcFaGEkxGlqYnNSNlSGNH3WQuN5gBVvUVQXKc5fGis/ZVJr6gGp0lU0 uong== X-Gm-Message-State: AOAM533CVJh+hIoC4y8X3rurimbpk/Qi9LDyM4evfDNO08Jwo1EkUPTW Ece2o+We8QUXTjEXyo7ZEgU= X-Google-Smtp-Source: ABdhPJwYpXH0RBf6U/CAULrS60nogcy9iokke8CZALvnbjo3dh/v7jwnI15T5FvJ0ivp9HIN9lXSzA== X-Received: by 2002:a05:600c:4ecc:: with SMTP id g12mr27375176wmq.118.1627307735327; Mon, 26 Jul 2021 06:55:35 -0700 (PDT) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id n5sm41325134wri.31.2021.07.26.06.55.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jul 2021 06:55:34 -0700 (PDT) From: luca.boccassi@gmail.com To: Chengwen Feng Cc: Min Hu , dpdk stable Date: Mon, 26 Jul 2021 14:53:04 +0100 Message-Id: <20210726135322.149850-41-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210726135322.149850-1-luca.boccassi@gmail.com> References: <20210712130551.2462159-1-luca.boccassi@gmail.com> <20210726135322.149850-1-luca.boccassi@gmail.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 20.11.3 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 20.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/28/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/01dcb1618688cadf04f8e8d2677005c77cb85a9b Thanks. Luca Boccassi --- >From 01dcb1618688cadf04f8e8d2677005c77cb85a9b 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 40e40bd88b..4e81769a8b 100644 --- a/drivers/net/hns3/hns3_flow.c +++ b/drivers/net/hns3/hns3_flow.c @@ -1161,42 +1161,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.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-07-26 13:53:18.053943762 +0100 +++ 0041-net-hns3-fix-filter-parsing-comment.patch 2021-07-26 13:53:15.909293884 +0100 @@ -1 +1 @@ -From 529017f9e70b2b41a4febf283946183586c3ebb2 Mon Sep 17 00:00:00 2001 +From 01dcb1618688cadf04f8e8d2677005c77cb85a9b 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 40e40bd88b..4e81769a8b 100644 @@ -21 +22 @@ -@@ -1134,42 +1134,29 @@ is_tunnel_packet(enum rte_flow_item_type type) +@@ -1161,42 +1161,29 @@ is_tunnel_packet(enum rte_flow_item_type type)