From: Yuanhan Liu <yliu@fridaylinux.org>
To: Pascal Mazon <pascal.mazon@6wind.com>
Cc: dpdk stable <stable@dpdk.org>
Subject: [dpdk-stable] patch 'net/tap: fix some flow collision' has been queued to stable release 17.05.1
Date: Tue, 20 Jun 2017 19:35:27 +0800 [thread overview]
Message-ID: <1497958550-13600-15-git-send-email-yliu@fridaylinux.org> (raw)
In-Reply-To: <1497958550-13600-1-git-send-email-yliu@fridaylinux.org>
Hi,
FYI, your patch has been queued to stable release 17.05.1
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/22/17. So please
shout if anyone has objections.
Thanks.
--yliu
---
>From 0bd27f8dd39ce19ea60a07eceea584f678b13bca Mon Sep 17 00:00:00 2001
From: Pascal Mazon <pascal.mazon@6wind.com>
Date: Mon, 22 May 2017 13:19:53 +0200
Subject: [PATCH] net/tap: fix some flow collision
[ upstream commit f96fe1ab35b74b1e0914bc8a99aac633c5b15807 ]
The following two flow rules (testpmd syntax) should not collide:
flow create 0 priority 1 ingress pattern eth / ipv4 / end actions drop / end
flow create 0 priority 1 ingress pattern eth / ipv6 / end actions drop / end
But the eth_type in the associated TC rule was set to either "ip" or
"ipv6". For TC, they could thus not have the same priority.
Use ETH_P_ALL only in the TC message to make sure those rules can
coexist.
Fixes: de96fe68ae95 ("net/tap: add basic flow API patterns and actions")
Signed-off-by: Pascal Mazon <pascal.mazon@6wind.com>
---
drivers/net/tap/tap_flow.c | 7 -------
1 file changed, 7 deletions(-)
diff --git a/drivers/net/tap/tap_flow.c b/drivers/net/tap/tap_flow.c
index cf1c8a2..a0dd504 100644
--- a/drivers/net/tap/tap_flow.c
+++ b/drivers/net/tap/tap_flow.c
@@ -401,9 +401,6 @@ tap_flow_create_eth(const struct rte_flow_item *item, void *data)
if (!flow)
return 0;
msg = &flow->msg;
- if (spec->type & mask->type)
- msg->t.tcm_info = TC_H_MAKE(msg->t.tcm_info,
- (spec->type & mask->type));
if (!is_zero_ether_addr(&spec->dst)) {
nlattr_add(&msg->nh, TCA_FLOWER_KEY_ETH_DST, ETHER_ADDR_LEN,
&spec->dst.addr_bytes);
@@ -508,8 +505,6 @@ tap_flow_create_ipv4(const struct rte_flow_item *item, void *data)
msg = &flow->msg;
if (!info->eth_type)
info->eth_type = htons(ETH_P_IP);
- if (!info->vlan)
- msg->t.tcm_info = TC_H_MAKE(msg->t.tcm_info, htons(ETH_P_IP));
if (!spec)
return 0;
if (spec->hdr.dst_addr) {
@@ -566,8 +561,6 @@ tap_flow_create_ipv6(const struct rte_flow_item *item, void *data)
msg = &flow->msg;
if (!info->eth_type)
info->eth_type = htons(ETH_P_IPV6);
- if (!info->vlan)
- msg->t.tcm_info = TC_H_MAKE(msg->t.tcm_info, htons(ETH_P_IPV6));
if (!spec)
return 0;
if (memcmp(spec->hdr.dst_addr, empty_addr, 16)) {
--
2.7.4
next prev parent reply other threads:[~2017-06-20 11:37 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-20 11:35 [dpdk-stable] patch 'examples/vhost: fix uninitialized descriptor indexes' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'kni: fix build on RHEL 7.4' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'drivers/net: fix vfio kmod dependency' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'vfio: fix array bounds check' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'app/testpmd: fix creating E-Tag and NVGRE flow rules' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'net/ark: fix buffer not null terminated' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'net/ark: fix return code not checked' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'net/ark: fix null pointer dereference' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'net/ark: fix return value of null not checked' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'net/i40e/base: fix Tx error stats on VF' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'net/af_packet: handle possible null pointer' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'net/af_packet: fix packet bytes counting' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'net/mlx5: fix completion buffer size' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'net/igb: fix add/delete of flex filters' " Yuanhan Liu
2017-06-20 11:35 ` Yuanhan Liu [this message]
2017-06-20 11:35 ` [dpdk-stable] patch 'net/cxgbe: fix port statistics' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'net/cxgbe: fix rxq default params for ports under same PF' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'net/sfc/base: fix error code usage in common code' " Yuanhan Liu
2017-06-20 16:26 ` Andrew Rybchenko
2017-06-22 2:19 ` Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'net/sfc: add Tx queue flush failed flag for sanity' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'net/mlx5: fix flow application order on stop/start' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'net/ring: fix adding MAC addresses' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'net/mlx5: fix exception handling' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'net/mlx5: fix redundant free of Tx buffer' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'net/igb: fix checksum valid flags' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'net/ixgbe: fix fdir mask not be reset' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'net/i40e: exclude internal packet's byte count' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'net/i40e: fix VF statistics' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'net/qede: fix VXLAN tunnel Tx offload flag setting' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'net/liquidio: fix MTU calculation from port configuration' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'net/bnxt: fix reporting of link status' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'kni: fix build with gcc 7.1' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'net/enic: " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'net/mlx5: " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'vhost: fix malloc size too small' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'vhost: fix guest pages memory leak' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'vhost: fix crash on NUMA' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'net/virtio: zero the whole memory zone' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'lpm: fix index of tbl8' " Yuanhan Liu
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=1497958550-13600-15-git-send-email-yliu@fridaylinux.org \
--to=yliu@fridaylinux.org \
--cc=pascal.mazon@6wind.com \
--cc=stable@dpdk.org \
/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).