patches for DPDK stable branches
 help / color / mirror / Atom feed
From: Kevin Traynor <ktraynor@redhat.com>
To: Steve Yang <stevex.yang@intel.com>
Cc: Qi Zhang <qi.z.zhang@intel.com>, dpdk stable <stable@dpdk.org>
Subject: patch 'net/iavf: fix pattern check for flow director parser' has been queued to stable release 21.11.3
Date: Tue, 25 Oct 2022 16:06:40 +0100	[thread overview]
Message-ID: <20221025150734.142189-45-ktraynor@redhat.com> (raw)
In-Reply-To: <20221025150734.142189-1-ktraynor@redhat.com>

Hi,

FYI, your patch has been queued to stable release 21.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 11/01/22. 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/kevintraynor/dpdk-stable

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/246026e0b89911ad715a723faef429e4c3e3f9f1

Thanks.

Kevin

---
From 246026e0b89911ad715a723faef429e4c3e3f9f1 Mon Sep 17 00:00:00 2001
From: Steve Yang <stevex.yang@intel.com>
Date: Wed, 10 Aug 2022 06:47:51 +0000
Subject: [PATCH] net/iavf: fix pattern check for flow director parser

[ upstream commit e5c7498fae094e97a8e8831979a7112fa260bf92 ]

FDIR rules with masks are not supported in current code. Thus add
pattern check for IPv4/UDP/TCP/SCTP addr/port to terminate the FDIR
programming stage.

Fixes: d5eb3e600d9e ("net/iavf: support flow director basic rule")

Signed-off-by: Steve Yang <stevex.yang@intel.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>
---
 drivers/net/iavf/iavf_fdir.c | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/drivers/net/iavf/iavf_fdir.c b/drivers/net/iavf/iavf_fdir.c
index 6b847894d8..c30853dd94 100644
--- a/drivers/net/iavf/iavf_fdir.c
+++ b/drivers/net/iavf/iavf_fdir.c
@@ -818,4 +818,12 @@ iavf_fdir_parse_pattern(__rte_unused struct iavf_adapter *ad,
 			}
 
+			/* Mask for IPv4 src/dst addrs not supported */
+			if (ipv4_mask->hdr.src_addr &&
+				ipv4_mask->hdr.src_addr != UINT32_MAX)
+				return -rte_errno;
+			if (ipv4_mask->hdr.dst_addr &&
+				ipv4_mask->hdr.dst_addr != UINT32_MAX)
+				return -rte_errno;
+
 			if (ipv4_mask->hdr.type_of_service ==
 			    UINT8_MAX) {
@@ -1008,4 +1016,12 @@ iavf_fdir_parse_pattern(__rte_unused struct iavf_adapter *ad,
 				}
 
+				/* Mask for UDP src/dst ports not supported */
+				if (udp_mask->hdr.src_port &&
+					udp_mask->hdr.src_port != UINT16_MAX)
+					return -rte_errno;
+				if (udp_mask->hdr.dst_port &&
+					udp_mask->hdr.dst_port != UINT16_MAX)
+					return -rte_errno;
+
 				if (udp_mask->hdr.src_port == UINT16_MAX) {
 					input_set |= IAVF_INSET_UDP_SRC_PORT;
@@ -1057,4 +1073,12 @@ iavf_fdir_parse_pattern(__rte_unused struct iavf_adapter *ad,
 				}
 
+				/* Mask for TCP src/dst ports not supported */
+				if (tcp_mask->hdr.src_port &&
+					tcp_mask->hdr.src_port != UINT16_MAX)
+					return -rte_errno;
+				if (tcp_mask->hdr.dst_port &&
+					tcp_mask->hdr.dst_port != UINT16_MAX)
+					return -rte_errno;
+
 				if (tcp_mask->hdr.src_port == UINT16_MAX) {
 					input_set |= IAVF_INSET_TCP_SRC_PORT;
@@ -1100,4 +1124,12 @@ iavf_fdir_parse_pattern(__rte_unused struct iavf_adapter *ad,
 				}
 
+				/* Mask for SCTP src/dst ports not supported */
+				if (sctp_mask->hdr.src_port &&
+					sctp_mask->hdr.src_port != UINT16_MAX)
+					return -rte_errno;
+				if (sctp_mask->hdr.dst_port &&
+					sctp_mask->hdr.dst_port != UINT16_MAX)
+					return -rte_errno;
+
 				if (sctp_mask->hdr.src_port == UINT16_MAX) {
 					input_set |= IAVF_INSET_SCTP_SRC_PORT;
-- 
2.37.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-10-25 14:18:59.555486280 +0100
+++ 0045-net-iavf-fix-pattern-check-for-flow-director-parser.patch	2022-10-25 14:18:58.409798084 +0100
@@ -1 +1 @@
-From e5c7498fae094e97a8e8831979a7112fa260bf92 Mon Sep 17 00:00:00 2001
+From 246026e0b89911ad715a723faef429e4c3e3f9f1 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit e5c7498fae094e97a8e8831979a7112fa260bf92 ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -20 +21 @@
-index 2e6b3a9097..a397047fdb 100644
+index 6b847894d8..c30853dd94 100644
@@ -23 +24 @@
-@@ -933,4 +933,12 @@ iavf_fdir_parse_pattern(__rte_unused struct iavf_adapter *ad,
+@@ -818,4 +818,12 @@ iavf_fdir_parse_pattern(__rte_unused struct iavf_adapter *ad,
@@ -36 +37 @@
-@@ -1123,4 +1131,12 @@ iavf_fdir_parse_pattern(__rte_unused struct iavf_adapter *ad,
+@@ -1008,4 +1016,12 @@ iavf_fdir_parse_pattern(__rte_unused struct iavf_adapter *ad,
@@ -49 +50 @@
-@@ -1172,4 +1188,12 @@ iavf_fdir_parse_pattern(__rte_unused struct iavf_adapter *ad,
+@@ -1057,4 +1073,12 @@ iavf_fdir_parse_pattern(__rte_unused struct iavf_adapter *ad,
@@ -62 +63 @@
-@@ -1215,4 +1239,12 @@ iavf_fdir_parse_pattern(__rte_unused struct iavf_adapter *ad,
+@@ -1100,4 +1124,12 @@ iavf_fdir_parse_pattern(__rte_unused struct iavf_adapter *ad,


  parent reply	other threads:[~2022-10-25 15:09 UTC|newest]

Thread overview: 101+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-10-25 15:05 patch 'build: enable developer mode for all working trees' " Kevin Traynor
2022-10-25 15:05 ` patch 'net: accept unaligned data in checksum routines' " Kevin Traynor
2022-10-25 15:05 ` patch 'eal: fix side effect in some pointer arithmetic macros' " Kevin Traynor
2022-10-25 15:05 ` patch 'app/testpmd: restore ixgbe bypass commands' " Kevin Traynor
2022-10-25 15:06 ` patch 'net/bonding: fix array overflow in Rx burst' " Kevin Traynor
2022-10-25 15:06 ` patch 'net/bonding: fix double slave link status query' " Kevin Traynor
2022-10-25 15:06 ` patch 'net/failsafe: fix interrupt handle leak' " Kevin Traynor
2022-10-25 15:06 ` patch 'net/nfp: compose firmware file name with new hwinfo' " Kevin Traynor
2022-10-25 15:06 ` patch 'net/axgbe: fix scattered Rx' " Kevin Traynor
2022-10-25 15:06 ` patch 'net/axgbe: fix mbuf lengths in " Kevin Traynor
2022-10-25 15:06 ` patch 'net/axgbe: fix length of each segment " Kevin Traynor
2022-10-25 15:06 ` patch 'net/axgbe: fix checksum and RSS " Kevin Traynor
2022-10-25 15:06 ` patch 'net/axgbe: optimise " Kevin Traynor
2022-10-25 15:06 ` patch 'net/axgbe: remove freeing buffer in " Kevin Traynor
2022-10-25 15:06 ` patch 'net/nfp: improve HW info header log readability' " Kevin Traynor
2022-10-25 15:06 ` patch 'net/txgbe: fix IPv6 flow rule' " Kevin Traynor
2022-10-25 15:06 ` patch 'net/txgbe: remove semaphore between SW/FW' " Kevin Traynor
2022-10-25 15:06 ` patch 'net/txgbe: rename some extended statistics' " Kevin Traynor
2022-10-25 15:06 ` patch 'net/ngbe: " Kevin Traynor
2022-10-25 15:06 ` patch 'net/ngbe: remove semaphore between SW/FW' " Kevin Traynor
2022-10-25 15:06 ` patch 'net/ngbe: fix maximum frame size' " Kevin Traynor
2022-10-25 15:06 ` patch 'common/cnxk: fix log level during MCAM allocation' " Kevin Traynor
2022-10-25 15:06 ` patch 'net/mvneta: fix build with GCC 12' " Kevin Traynor
2022-10-25 15:06 ` patch 'common/cnxk: fix missing flow counter reset' " Kevin Traynor
2022-10-25 15:06 ` patch 'common/cnxk: fix printing disabled MKEX registers' " Kevin Traynor
2022-10-25 15:06 ` patch 'malloc: fix storage size for some allocations' " Kevin Traynor
2022-10-25 15:06 ` patch 'event/dsw: fix flow migration' " Kevin Traynor
2022-10-25 15:06 ` patch 'event/sw: fix device name in dump' " Kevin Traynor
2022-10-25 15:06 ` patch 'eventdev/eth_tx: add spinlock for adapter start/stop' " Kevin Traynor
2022-10-25 15:06 ` patch 'eventdev/eth_tx: fix adapter stop' " Kevin Traynor
2022-10-25 15:06 ` patch 'test/ipsec: skip if no compatible device' " Kevin Traynor
2022-10-25 15:06 ` patch 'examples/ipsec-secgw: use Tx checksum offload conditionally' " Kevin Traynor
2022-10-25 15:06 ` patch 'test/crypto: fix debug messages' " Kevin Traynor
2022-10-25 15:06 ` patch 'common/qat: fix VF to PF answer' " Kevin Traynor
2022-10-25 15:06 ` patch 'test/ipsec: fix build with GCC 12' " Kevin Traynor
2022-10-25 15:06 ` patch 'ipsec: " Kevin Traynor
2022-10-25 15:06 ` patch 'crypto/qat: " Kevin Traynor
2022-10-25 15:06 ` patch 'cryptodev: fix missing SHA3 algorithm strings' " Kevin Traynor
2022-10-25 15:06 ` patch 'eventdev: fix name of Rx conf type in documentation' " Kevin Traynor
2022-10-25 15:06 ` patch 'net/i40e: fix VF representor release' " Kevin Traynor
2022-10-25 15:06 ` patch 'net/ice: fix RSS hash update' " Kevin Traynor
2022-10-25 15:06 ` patch 'net/ice/base: fix inner symmetric RSS hash in raw flow' " Kevin Traynor
2022-10-25 15:06 ` patch 'net/iavf: fix L3 checksum Tx offload flag' " Kevin Traynor
2022-10-25 15:06 ` patch 'net/iavf: fix VLAN insertion' " Kevin Traynor
2022-10-25 15:06 ` Kevin Traynor [this message]
2022-10-25 15:06 ` patch 'net/iavf: fix Tx done descriptors cleanup' " Kevin Traynor
2022-10-25 15:06 ` patch 'net/iavf: update IPsec ESN values when updating session' " Kevin Traynor
2022-10-25 15:06 ` patch 'common/iavf: avoid copy in async mode' " Kevin Traynor
2022-10-25 15:06 ` patch 'net/ice/base: fix division during E822 PTP init' " Kevin Traynor
2022-10-25 15:06 ` patch 'net/ice/base: fix 100M speed capability' " Kevin Traynor
2022-10-25 15:06 ` patch 'net/ice/base: fix DSCP PFC TLV creation' " Kevin Traynor
2022-10-25 15:06 ` patch 'net/ice/base: fix media type of PHY 10G SFI C2C' " Kevin Traynor
2022-10-25 15:06 ` patch 'net/ice/base: fix function descriptions for parser' " Kevin Traynor
2022-10-25 15:06 ` patch 'net/ice/base: fix endian format' " Kevin Traynor
2022-10-25 15:06 ` patch 'net/ice/base: fix array overflow in add switch recipe' " Kevin Traynor
2022-10-25 15:06 ` patch 'net/ice/base: fix bit finding range over ptype bitmap' " Kevin Traynor
2022-10-25 15:06 ` patch 'net/ice/base: fix add MAC rule' " Kevin Traynor
2022-10-25 15:06 ` patch 'net/ice/base: fix double VLAN in promiscuous mode' " Kevin Traynor
2022-10-25 15:06 ` patch 'net/ice/base: ignore promiscuous already exist' " Kevin Traynor
2022-10-25 15:06 ` patch 'net/ice/base: fix input set of GTPoGRE' " Kevin Traynor
2022-10-25 15:06 ` patch 'net/iavf: fix processing VLAN TCI in SSE path' " Kevin Traynor
2022-10-25 15:06 ` patch 'net/iavf: fix outer checksum flags' " Kevin Traynor
2022-10-25 15:06 ` patch 'net/virtio: fix crash when configured twice' " Kevin Traynor
2022-10-25 15:06 ` patch 'net/mlx4: fix Verbs FD leak in secondary process' " Kevin Traynor
2022-10-25 15:07 ` patch 'net/mlx5: " Kevin Traynor
2022-10-25 15:07 ` patch 'net/mlx5: fix check for orphan wait descriptor' " Kevin Traynor
2022-10-25 15:07 ` patch 'net/mlx5: fix single not inline packet storing' " Kevin Traynor
2022-10-25 15:07 ` patch 'net/mlx5: fix inline length exceeding descriptor limit' " Kevin Traynor
2022-10-25 15:07 ` patch 'net/mlx5: fix Tx check for hardware descriptor length' " Kevin Traynor
2022-10-25 15:07 ` patch 'net/mlx5: fix modify action with tunnel decapsulation' " Kevin Traynor
2022-10-25 15:07 ` patch 'net/mlx5: fix meter profile delete after disable' " Kevin Traynor
2022-10-25 15:07 ` patch 'net/iavf: check illegal packet sizes' " Kevin Traynor
2022-10-25 15:07 ` patch 'net/ice: " Kevin Traynor
2022-10-25 15:07 ` patch 'net/cnxk: fix DF bit in vector mode' " Kevin Traynor
2022-10-25 15:07 ` patch 'net/axgbe: reset end of packet in scattered Rx' " Kevin Traynor
2022-10-25 15:07 ` patch 'net/axgbe: clear buffer on scattered Rx chaining failure' " Kevin Traynor
2022-10-25 15:07 ` patch 'net/axgbe: save segment data in scattered Rx' " Kevin Traynor
2022-10-25 15:07 ` patch 'common/sfc_efx/base: fix maximum Tx data count' " Kevin Traynor
2022-10-25 15:07 ` patch 'event/cnxk: fix missing xstats operations' " Kevin Traynor
2022-10-25 15:07 ` patch 'cryptodev: fix unduly newlines in logs' " Kevin Traynor
2022-10-25 15:07 ` patch 'net/bnxt: fix null pointer dereference in LED config' " Kevin Traynor
2022-11-17  9:05   ` 答复: " Mao,Yingming
2022-11-17 10:08     ` Kevin Traynor
2022-10-25 15:07 ` patch 'net/bnxt: fix error code during MTU change' " Kevin Traynor
2022-10-25 15:07 ` patch 'net/bnxt: remove unnecessary check' " Kevin Traynor
2022-10-25 15:07 ` patch 'net/bnxt: fix representor info freeing' " Kevin Traynor
2022-10-25 15:07 ` patch 'net/bnxt: fix build with GCC 13' " Kevin Traynor
2022-10-25 15:07 ` patch 'mem: fix API doc about allocation on secondary processes' " Kevin Traynor
2022-10-25 15:07 ` patch 'examples/vm_power_manager: use safe list iterator' " Kevin Traynor
2022-10-25 15:07 ` patch 'timer: fix stopping all timers' " Kevin Traynor
2022-10-25 15:07 ` patch 'vhost: fix build with GCC 12' " Kevin Traynor
2022-10-25 15:07 ` patch 'net/i40e: fix build with MinGW " Kevin Traynor
2022-10-25 15:07 ` patch 'net/qede/base: fix 32-bit build with " Kevin Traynor
2022-10-25 15:07 ` patch 'net/tap: fix overflow of network interface index' " Kevin Traynor
2022-10-25 15:07 ` patch 'net/memif: fix crash with different number of Rx/Tx queues' " Kevin Traynor
2022-10-25 15:07 ` patch 'common/sfc_efx/base: remove VQ index check during VQ start' " Kevin Traynor
2022-10-25 15:07 ` patch 'net/hns3: fix Rx with PTP' " Kevin Traynor
2022-10-25 15:07 ` patch 'net/hns3: fix crash in SVE Tx' " Kevin Traynor
2022-10-25 15:07 ` patch 'net/hns3: fix next-to-use overflow " Kevin Traynor
2022-10-25 15:07 ` patch 'net/hns3: fix next-to-use overflow in simple " Kevin Traynor
2022-10-25 15:07 ` patch 'net/hns3: fix crash when secondary process access FW' " Kevin Traynor

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20221025150734.142189-45-ktraynor@redhat.com \
    --to=ktraynor@redhat.com \
    --cc=qi.z.zhang@intel.com \
    --cc=stable@dpdk.org \
    --cc=stevex.yang@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).