| Message ID | 1491401037-28611-1-git-send-email-bernard.iremonger@intel.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | Ferruh Yigit |
| Headers | show |
| Context | Check | Description |
|---|---|---|
| ci/checkpatch | success | coding style OK |
| ci/Intel-compilation | success | Compilation OK |
> -----Original Message----- > From: Iremonger, Bernard > Sent: Wednesday, April 5, 2017 10:04 PM > To: dev@dpdk.org; Xing, Beilei <beilei.xing@intel.com> > Cc: Lu, Wenzhuo <wenzhuo.lu@intel.com>; Iremonger, Bernard > <bernard.iremonger@intel.com> > Subject: [PATCH v2] net/i40e: fix QinQ eth pattern parsing > > The eth keyword only should be accepted. > > Fixes: d46e85af6b5c ("net/i40e: parse QinQ pattern") > > Signed-off-by: Bernard Iremonger <bernard.iremonger@intel.com> Acked-by: Beilei Xing <beilei.xing@intel.com>
On 4/6/2017 5:54 AM, Xing, Beilei wrote: > >> -----Original Message----- >> From: Iremonger, Bernard >> Sent: Wednesday, April 5, 2017 10:04 PM >> To: dev@dpdk.org; Xing, Beilei <beilei.xing@intel.com> >> Cc: Lu, Wenzhuo <wenzhuo.lu@intel.com>; Iremonger, Bernard >> <bernard.iremonger@intel.com> >> Subject: [PATCH v2] net/i40e: fix QinQ eth pattern parsing >> >> The eth keyword only should be accepted. >> >> Fixes: d46e85af6b5c ("net/i40e: parse QinQ pattern") >> >> Signed-off-by: Bernard Iremonger <bernard.iremonger@intel.com> > > Acked-by: Beilei Xing <beilei.xing@intel.com> Applied to dpdk-next-net/master, thanks.
diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c index 9f541eaff..3cf0e5a70 100644 --- a/drivers/net/i40e/i40e_flow.c +++ b/drivers/net/i40e/i40e_flow.c @@ -1740,6 +1740,13 @@ i40e_flow_parse_mpls_filter(struct rte_eth_dev *dev, return ret; } +/* 1. Last in item should be NULL as range is not supported. + * 2. Supported filter types: QINQ. + * 3. Mask of fields which need to be matched should be + * filled with 1. + * 4. Mask of fields which needn't to be matched should be + * filled with 0. + */ static int i40e_flow_parse_qinq_pattern(__rte_unused struct rte_eth_dev *dev, const struct rte_flow_item *pattern, @@ -1747,8 +1754,6 @@ i40e_flow_parse_qinq_pattern(__rte_unused struct rte_eth_dev *dev, struct i40e_tunnel_filter_conf *filter) { const struct rte_flow_item *item = pattern; - const struct rte_flow_item_eth *eth_spec; - const struct rte_flow_item_eth *eth_mask; const struct rte_flow_item_vlan *vlan_spec = NULL; const struct rte_flow_item_vlan *vlan_mask = NULL; const struct rte_flow_item_vlan *i_vlan_spec = NULL; @@ -1770,13 +1775,11 @@ i40e_flow_parse_qinq_pattern(__rte_unused struct rte_eth_dev *dev, item_type = item->type; switch (item_type) { case RTE_FLOW_ITEM_TYPE_ETH: - eth_spec = (const struct rte_flow_item_eth *)item->spec; - eth_mask = (const struct rte_flow_item_eth *)item->mask; - if (eth_spec && eth_mask) { + if (item->spec || item->mask) { rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ITEM, item, - "Invalid ether spec/mask"); + "Invalid ETH item"); return -rte_errno; } break;
The eth keyword only should be accepted. Fixes: d46e85af6b5c ("net/i40e: parse QinQ pattern") Signed-off-by: Bernard Iremonger <bernard.iremonger@intel.com> --- Changes in v2: rebased to latest dpdk-next-net Document the i40e_flow_parse_qinq_pattern function. Parse the eth keyword in similar way to mpls parsing function. drivers/net/i40e/i40e_flow.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)