* [dpdk-dev] [PATCH] net/i40e: add fdir nvgre parameters check
@ 2017-12-01 8:47 Wei Zhao
2017-12-22 2:10 ` Zhang, Qi Z
2017-12-22 5:11 ` [dpdk-dev] [PATCH v2] " Wei Zhao
0 siblings, 2 replies; 7+ messages in thread
From: Wei Zhao @ 2017-12-01 8:47 UTC (permalink / raw)
To: dev; +Cc: wenzhuo.lu, beilei.xing, Wei Zhao
Add mask parameters check in nvgre parser for flow API.
Fixes: 30965ca341278 ("net/i40e: add NVGRE flow parsing")
Signed-off-by: Wei Zhao <wei.zhao1@intel.com>
---
drivers/net/i40e/i40e_flow.c | 35 +++++++++++++++++++++++++++++++++++
1 file changed, 35 insertions(+)
diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c
index 7e4936e..05e54f1 100644
--- a/drivers/net/i40e/i40e_flow.c
+++ b/drivers/net/i40e/i40e_flow.c
@@ -3610,6 +3610,41 @@ i40e_flow_parse_nvgre_pattern(__rte_unused struct rte_eth_dev *dev,
"Invalid TNI mask");
return -rte_errno;
}
+ if (nvgre_mask->protocol &&
+ nvgre_mask->protocol != 0xFFFF) {
+ rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ITEM,
+ item,
+ "Invalid NVGRE item");
+ return -rte_errno;
+ }
+ if (nvgre_mask->c_k_s_rsvd0_ver &&
+ nvgre_mask->c_k_s_rsvd0_ver !=
+ rte_cpu_to_be_16(0x3000)) {
+ rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ITEM,
+ item,
+ "Invalid NVGRE item");
+ return -rte_errno;
+ }
+ if (nvgre_spec->c_k_s_rsvd0_ver !=
+ rte_cpu_to_be_16(0x2000) &&
+ nvgre_mask->c_k_s_rsvd0_ver) {
+ rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ITEM,
+ item,
+ "Invalid NVGRE item");
+ return -rte_errno;
+ }
+ if (nvgre_mask->protocol &&
+ nvgre_spec->protocol !=
+ rte_cpu_to_be_16(0x6558)) {
+ rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ITEM,
+ item,
+ "Invalid NVGRE item");
+ return -rte_errno;
+ }
rte_memcpy(((uint8_t *)&tenant_id_be + 1),
nvgre_spec->tni, 3);
filter->tenant_id =
--
2.9.3
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [dpdk-dev] [PATCH] net/i40e: add fdir nvgre parameters check 2017-12-01 8:47 [dpdk-dev] [PATCH] net/i40e: add fdir nvgre parameters check Wei Zhao @ 2017-12-22 2:10 ` Zhang, Qi Z 2017-12-22 2:26 ` Zhao1, Wei 2017-12-22 2:45 ` Zhao1, Wei 2017-12-22 5:11 ` [dpdk-dev] [PATCH v2] " Wei Zhao 1 sibling, 2 replies; 7+ messages in thread From: Zhang, Qi Z @ 2017-12-22 2:10 UTC (permalink / raw) To: Zhao1, Wei, dev; +Cc: Lu, Wenzhuo, Xing, Beilei, Zhao1, Wei > -----Original Message----- > From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Wei Zhao > Sent: Friday, December 1, 2017 4:47 PM > To: dev@dpdk.org > Cc: Lu, Wenzhuo <wenzhuo.lu@intel.com>; Xing, Beilei > <beilei.xing@intel.com>; Zhao1, Wei <wei.zhao1@intel.com> > Subject: [dpdk-dev] [PATCH] net/i40e: add fdir nvgre parameters check > > Add mask parameters check in nvgre parser for flow API. > > Fixes: 30965ca341278 ("net/i40e: add NVGRE flow parsing") > > Signed-off-by: Wei Zhao <wei.zhao1@intel.com> > --- > drivers/net/i40e/i40e_flow.c | 35 +++++++++++++++++++++++++++++++++++ > 1 file changed, 35 insertions(+) > > diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c index > 7e4936e..05e54f1 100644 > --- a/drivers/net/i40e/i40e_flow.c > +++ b/drivers/net/i40e/i40e_flow.c > @@ -3610,6 +3610,41 @@ i40e_flow_parse_nvgre_pattern(__rte_unused > struct rte_eth_dev *dev, > "Invalid TNI mask"); > return -rte_errno; > } > + if (nvgre_mask->protocol && > + nvgre_mask->protocol != 0xFFFF) { > + rte_flow_error_set(error, EINVAL, > + RTE_FLOW_ERROR_TYPE_ITEM, > + item, > + "Invalid NVGRE item"); > + return -rte_errno; > + } > + if (nvgre_mask->c_k_s_rsvd0_ver && > + nvgre_mask->c_k_s_rsvd0_ver != > + rte_cpu_to_be_16(0x3000)) { If " c_k_s_rsvd0_ver must have value 0x2000 according to RFC 7637" , I think here we should have mask 0xffff to make sure each bit of c_k_s_rsvd0_ver be set correctly. Regards Qi > + rte_flow_error_set(error, EINVAL, > + RTE_FLOW_ERROR_TYPE_ITEM, > + item, > + "Invalid NVGRE item"); > + return -rte_errno; > + } > + if (nvgre_spec->c_k_s_rsvd0_ver != > + rte_cpu_to_be_16(0x2000) && > + nvgre_mask->c_k_s_rsvd0_ver) { > + rte_flow_error_set(error, EINVAL, > + RTE_FLOW_ERROR_TYPE_ITEM, > + item, > + "Invalid NVGRE item"); > + return -rte_errno; > + } > + if (nvgre_mask->protocol && > + nvgre_spec->protocol != > + rte_cpu_to_be_16(0x6558)) { > + rte_flow_error_set(error, EINVAL, > + RTE_FLOW_ERROR_TYPE_ITEM, > + item, > + "Invalid NVGRE item"); > + return -rte_errno; > + } > rte_memcpy(((uint8_t *)&tenant_id_be + 1), > nvgre_spec->tni, 3); > filter->tenant_id = > -- > 2.9.3 ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [dpdk-dev] [PATCH] net/i40e: add fdir nvgre parameters check 2017-12-22 2:10 ` Zhang, Qi Z @ 2017-12-22 2:26 ` Zhao1, Wei 2017-12-22 2:45 ` Zhao1, Wei 1 sibling, 0 replies; 7+ messages in thread From: Zhao1, Wei @ 2017-12-22 2:26 UTC (permalink / raw) To: Zhang, Qi Z, dev; +Cc: Lu, Wenzhuo, Xing, Beilei Hi，zhangqi > -----Original Message----- > From: Zhang, Qi Z > Sent: Friday, December 22, 2017 10:11 AM > To: Zhao1, Wei <wei.zhao1@intel.com>; dev@dpdk.org > Cc: Lu, Wenzhuo <wenzhuo.lu@intel.com>; Xing, Beilei > <beilei.xing@intel.com>; Zhao1, Wei <wei.zhao1@intel.com> > Subject: RE: [dpdk-dev] [PATCH] net/i40e: add fdir nvgre parameters check > > > > > -----Original Message----- > > From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Wei Zhao > > Sent: Friday, December 1, 2017 4:47 PM > > To: dev@dpdk.org > > Cc: Lu, Wenzhuo <wenzhuo.lu@intel.com>; Xing, Beilei > > <beilei.xing@intel.com>; Zhao1, Wei <wei.zhao1@intel.com> > > Subject: [dpdk-dev] [PATCH] net/i40e: add fdir nvgre parameters check > > > > Add mask parameters check in nvgre parser for flow API. > > > > Fixes: 30965ca341278 ("net/i40e: add NVGRE flow parsing") > > > > Signed-off-by: Wei Zhao <wei.zhao1@intel.com> > > --- > > drivers/net/i40e/i40e_flow.c | 35 > +++++++++++++++++++++++++++++++++++ > > 1 file changed, 35 insertions(+) > > > > diff --git a/drivers/net/i40e/i40e_flow.c > > b/drivers/net/i40e/i40e_flow.c index > > 7e4936e..05e54f1 100644 > > --- a/drivers/net/i40e/i40e_flow.c > > +++ b/drivers/net/i40e/i40e_flow.c > > @@ -3610,6 +3610,41 @@ i40e_flow_parse_nvgre_pattern(__rte_unused > > struct rte_eth_dev *dev, > > "Invalid TNI mask"); > > return -rte_errno; > > } > > + if (nvgre_mask->protocol && > > + nvgre_mask->protocol != 0xFFFF) { > > + rte_flow_error_set(error, EINVAL, > > + > RTE_FLOW_ERROR_TYPE_ITEM, > > + item, > > + "Invalid NVGRE item"); > > + return -rte_errno; > > + } > > + if (nvgre_mask->c_k_s_rsvd0_ver && > > + nvgre_mask->c_k_s_rsvd0_ver != > > + rte_cpu_to_be_16(0x3000)) { > > If " c_k_s_rsvd0_ver must have value 0x2000 according to RFC 7637" , I think > here we should have mask 0xffff to make sure each bit of c_k_s_rsvd0_ver > be set correctly. > Yes, our old code is as your suggestion, but testpmd can not support config that parameter ,if that stv can not test this feature. so, we did a balance. > Regards > Qi > > + rte_flow_error_set(error, EINVAL, > > + > RTE_FLOW_ERROR_TYPE_ITEM, > > + item, > > + "Invalid NVGRE item"); > > + return -rte_errno; > > + } > > + if (nvgre_spec->c_k_s_rsvd0_ver != > > + rte_cpu_to_be_16(0x2000) && > > + nvgre_mask->c_k_s_rsvd0_ver) { > > + rte_flow_error_set(error, EINVAL, > > + > RTE_FLOW_ERROR_TYPE_ITEM, > > + item, > > + "Invalid NVGRE item"); > > + return -rte_errno; > > + } > > + if (nvgre_mask->protocol && > > + nvgre_spec->protocol != > > + rte_cpu_to_be_16(0x6558)) { > > + rte_flow_error_set(error, EINVAL, > > + > RTE_FLOW_ERROR_TYPE_ITEM, > > + item, > > + "Invalid NVGRE item"); > > + return -rte_errno; > > + } > > rte_memcpy(((uint8_t *)&tenant_id_be + 1), > > nvgre_spec->tni, 3); > > filter->tenant_id = > > -- > > 2.9.3 ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [dpdk-dev] [PATCH] net/i40e: add fdir nvgre parameters check 2017-12-22 2:10 ` Zhang, Qi Z 2017-12-22 2:26 ` Zhao1, Wei @ 2017-12-22 2:45 ` Zhao1, Wei 1 sibling, 0 replies; 7+ messages in thread From: Zhao1, Wei @ 2017-12-22 2:45 UTC (permalink / raw) To: Zhang, Qi Z, dev; +Cc: Lu, Wenzhuo, Xing, Beilei Hi，zhangqi > -----Original Message----- > From: Zhang, Qi Z > Sent: Friday, December 22, 2017 10:11 AM > To: Zhao1, Wei <wei.zhao1@intel.com>; dev@dpdk.org > Cc: Lu, Wenzhuo <wenzhuo.lu@intel.com>; Xing, Beilei > <beilei.xing@intel.com>; Zhao1, Wei <wei.zhao1@intel.com> > Subject: RE: [dpdk-dev] [PATCH] net/i40e: add fdir nvgre parameters check > > > > > -----Original Message----- > > From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Wei Zhao > > Sent: Friday, December 1, 2017 4:47 PM > > To: dev@dpdk.org > > Cc: Lu, Wenzhuo <wenzhuo.lu@intel.com>; Xing, Beilei > > <beilei.xing@intel.com>; Zhao1, Wei <wei.zhao1@intel.com> > > Subject: [dpdk-dev] [PATCH] net/i40e: add fdir nvgre parameters check > > > > Add mask parameters check in nvgre parser for flow API. > > > > Fixes: 30965ca341278 ("net/i40e: add NVGRE flow parsing") > > > > Signed-off-by: Wei Zhao <wei.zhao1@intel.com> > > --- > > drivers/net/i40e/i40e_flow.c | 35 > +++++++++++++++++++++++++++++++++++ > > 1 file changed, 35 insertions(+) > > > > diff --git a/drivers/net/i40e/i40e_flow.c > > b/drivers/net/i40e/i40e_flow.c index > > 7e4936e..05e54f1 100644 > > --- a/drivers/net/i40e/i40e_flow.c > > +++ b/drivers/net/i40e/i40e_flow.c > > @@ -3610,6 +3610,41 @@ i40e_flow_parse_nvgre_pattern(__rte_unused > > struct rte_eth_dev *dev, > > "Invalid TNI mask"); > > return -rte_errno; > > } > > + if (nvgre_mask->protocol && > > + nvgre_mask->protocol != 0xFFFF) { > > + rte_flow_error_set(error, EINVAL, > > + > RTE_FLOW_ERROR_TYPE_ITEM, > > + item, > > + "Invalid NVGRE item"); > > + return -rte_errno; > > + } > > + if (nvgre_mask->c_k_s_rsvd0_ver && > > + nvgre_mask->c_k_s_rsvd0_ver != > > + rte_cpu_to_be_16(0x3000)) { > > If " c_k_s_rsvd0_ver must have value 0x2000 according to RFC 7637" , I think > here we should have mask 0xffff to make sure each bit of c_k_s_rsvd0_ver > be set correctly. I will change c_k_s_rsvd0_ver mask check to 0Xffff, may be that is more reasonable. > > Regards > Qi > > + rte_flow_error_set(error, EINVAL, > > + > RTE_FLOW_ERROR_TYPE_ITEM, > > + item, > > + "Invalid NVGRE item"); > > + return -rte_errno; > > + } > > + if (nvgre_spec->c_k_s_rsvd0_ver != > > + rte_cpu_to_be_16(0x2000) && > > + nvgre_mask->c_k_s_rsvd0_ver) { > > + rte_flow_error_set(error, EINVAL, > > + > RTE_FLOW_ERROR_TYPE_ITEM, > > + item, > > + "Invalid NVGRE item"); > > + return -rte_errno; > > + } > > + if (nvgre_mask->protocol && > > + nvgre_spec->protocol != > > + rte_cpu_to_be_16(0x6558)) { > > + rte_flow_error_set(error, EINVAL, > > + > RTE_FLOW_ERROR_TYPE_ITEM, > > + item, > > + "Invalid NVGRE item"); > > + return -rte_errno; > > + } > > rte_memcpy(((uint8_t *)&tenant_id_be + 1), > > nvgre_spec->tni, 3); > > filter->tenant_id = > > -- > > 2.9.3 ^ permalink raw reply [flat|nested] 7+ messages in thread
* [dpdk-dev] [PATCH v2] net/i40e: add fdir nvgre parameters check 2017-12-01 8:47 [dpdk-dev] [PATCH] net/i40e: add fdir nvgre parameters check Wei Zhao 2017-12-22 2:10 ` Zhang, Qi Z @ 2017-12-22 5:11 ` Wei Zhao 2017-12-22 6:06 ` Zhang, Qi Z 1 sibling, 1 reply; 7+ messages in thread From: Wei Zhao @ 2017-12-22 5:11 UTC (permalink / raw) To: dev; +Cc: qi.z.zhang, Wei Zhao Add mask parameters check in nvgre parser for flow API. Fixes: 30965ca341278 ("net/i40e: add NVGRE flow parsing") Signed-off-by: Wei Zhao <wei.zhao1@intel.com> --- V2: -change c_k_s_rsvd0_ver mask check to 0xFFFF. --- drivers/net/i40e/i40e_flow.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c index 7e4936e..fa2e168 100644 --- a/drivers/net/i40e/i40e_flow.c +++ b/drivers/net/i40e/i40e_flow.c @@ -3610,6 +3610,41 @@ i40e_flow_parse_nvgre_pattern(__rte_unused struct rte_eth_dev *dev, "Invalid TNI mask"); return -rte_errno; } + if (nvgre_mask->protocol && + nvgre_mask->protocol != 0xFFFF) { + rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ITEM, + item, + "Invalid NVGRE item"); + return -rte_errno; + } + if (nvgre_mask->c_k_s_rsvd0_ver && + nvgre_mask->c_k_s_rsvd0_ver != + rte_cpu_to_be_16(0xFFFF)) { + rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ITEM, + item, + "Invalid NVGRE item"); + return -rte_errno; + } + if (nvgre_spec->c_k_s_rsvd0_ver != + rte_cpu_to_be_16(0x2000) && + nvgre_mask->c_k_s_rsvd0_ver) { + rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ITEM, + item, + "Invalid NVGRE item"); + return -rte_errno; + } + if (nvgre_mask->protocol && + nvgre_spec->protocol != + rte_cpu_to_be_16(0x6558)) { + rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ITEM, + item, + "Invalid NVGRE item"); + return -rte_errno; + } rte_memcpy(((uint8_t *)&tenant_id_be + 1), nvgre_spec->tni, 3); filter->tenant_id = -- 2.9.3 ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [dpdk-dev] [PATCH v2] net/i40e: add fdir nvgre parameters check 2017-12-22 5:11 ` [dpdk-dev] [PATCH v2] " Wei Zhao @ 2017-12-22 6:06 ` Zhang, Qi Z 2018-01-08 6:21 ` Zhang, Helin 0 siblings, 1 reply; 7+ messages in thread From: Zhang, Qi Z @ 2017-12-22 6:06 UTC (permalink / raw) To: Zhao1, Wei, dev > -----Original Message----- > From: Zhao1, Wei > Sent: Friday, December 22, 2017 1:11 PM > To: dev@dpdk.org > Cc: Zhang, Qi Z <qi.z.zhang@intel.com>; Zhao1, Wei <wei.zhao1@intel.com> > Subject: [PATCH v2] net/i40e: add fdir nvgre parameters check > > Add mask parameters check in nvgre parser for flow API. > > Fixes: 30965ca341278 ("net/i40e: add NVGRE flow parsing") > > Signed-off-by: Wei Zhao <wei.zhao1@intel.com> > > --- > > V2: > -change c_k_s_rsvd0_ver mask check to 0xFFFF. > --- > drivers/net/i40e/i40e_flow.c | 35 +++++++++++++++++++++++++++++++++++ > 1 file changed, 35 insertions(+) > > diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c index > 7e4936e..fa2e168 100644 > --- a/drivers/net/i40e/i40e_flow.c > +++ b/drivers/net/i40e/i40e_flow.c > @@ -3610,6 +3610,41 @@ i40e_flow_parse_nvgre_pattern(__rte_unused > struct rte_eth_dev *dev, > "Invalid TNI mask"); > return -rte_errno; > } > + if (nvgre_mask->protocol && > + nvgre_mask->protocol != 0xFFFF) { > + rte_flow_error_set(error, EINVAL, > + RTE_FLOW_ERROR_TYPE_ITEM, > + item, > + "Invalid NVGRE item"); > + return -rte_errno; > + } > + if (nvgre_mask->c_k_s_rsvd0_ver && > + nvgre_mask->c_k_s_rsvd0_ver != > + rte_cpu_to_be_16(0xFFFF)) { > + rte_flow_error_set(error, EINVAL, > + RTE_FLOW_ERROR_TYPE_ITEM, > + item, > + "Invalid NVGRE item"); > + return -rte_errno; > + } > + if (nvgre_spec->c_k_s_rsvd0_ver != > + rte_cpu_to_be_16(0x2000) && > + nvgre_mask->c_k_s_rsvd0_ver) { > + rte_flow_error_set(error, EINVAL, > + RTE_FLOW_ERROR_TYPE_ITEM, > + item, > + "Invalid NVGRE item"); > + return -rte_errno; > + } > + if (nvgre_mask->protocol && > + nvgre_spec->protocol != > + rte_cpu_to_be_16(0x6558)) { > + rte_flow_error_set(error, EINVAL, > + RTE_FLOW_ERROR_TYPE_ITEM, > + item, > + "Invalid NVGRE item"); > + return -rte_errno; > + } > rte_memcpy(((uint8_t *)&tenant_id_be + 1), > nvgre_spec->tni, 3); > filter->tenant_id = > -- > 2.9.3 Acked-by: Qi Zhang <qi.z.zhang@intel.com> ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [dpdk-dev] [PATCH v2] net/i40e: add fdir nvgre parameters check 2017-12-22 6:06 ` Zhang, Qi Z @ 2018-01-08 6:21 ` Zhang, Helin 0 siblings, 0 replies; 7+ messages in thread From: Zhang, Helin @ 2018-01-08 6:21 UTC (permalink / raw) To: Zhang, Qi Z, Zhao1, Wei, dev > -----Original Message----- > From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Zhang, Qi Z > Sent: Friday, December 22, 2017 2:06 PM > To: Zhao1, Wei; dev@dpdk.org > Subject: Re: [dpdk-dev] [PATCH v2] net/i40e: add fdir nvgre parameters check > > > > > -----Original Message----- > > From: Zhao1, Wei > > Sent: Friday, December 22, 2017 1:11 PM > > To: dev@dpdk.org > > Cc: Zhang, Qi Z <qi.z.zhang@intel.com>; Zhao1, Wei <wei.zhao1@intel.com> > > Subject: [PATCH v2] net/i40e: add fdir nvgre parameters check > > > > Add mask parameters check in nvgre parser for flow API. > > > > Fixes: 30965ca341278 ("net/i40e: add NVGRE flow parsing") > > > > Signed-off-by: Wei Zhao <wei.zhao1@intel.com> > Acked-by: Qi Zhang <qi.z.zhang@intel.com> Applied to dpdk-next-net-intel, thanks! /Helin ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2018-01-08 6:21 UTC | newest] Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2017-12-01 8:47 [dpdk-dev] [PATCH] net/i40e: add fdir nvgre parameters check Wei Zhao 2017-12-22 2:10 ` Zhang, Qi Z 2017-12-22 2:26 ` Zhao1, Wei 2017-12-22 2:45 ` Zhao1, Wei 2017-12-22 5:11 ` [dpdk-dev] [PATCH v2] " Wei Zhao 2017-12-22 6:06 ` Zhang, Qi Z 2018-01-08 6:21 ` Zhang, Helin
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).