[dpdk-dev,v2,1/4] net/i40e: rework tunnel filter functions
Checks
Commit Message
Rework tunnel filter functions to align with the
new command buffer for add/remove cloud filter.
Signed-off-by: Beilei Xing <beilei.xing@intel.com>
---
drivers/net/i40e/i40e_ethdev.c | 100 +++++++++++++++++++++++++++--------------
drivers/net/i40e/i40e_ethdev.h | 1 +
drivers/net/i40e/i40e_flow.c | 28 +++++++-----
3 files changed, 86 insertions(+), 43 deletions(-)
Comments
> -----Original Message-----
> From: Xing, Beilei
> Sent: Thursday, March 23, 2017 6:46 PM
> To: Wu, Jingjing <jingjing.wu@intel.com>
> Cc: Zhang, Helin <helin.zhang@intel.com>; dev@dpdk.org
> Subject: [PATCH v2 1/4] net/i40e: rework tunnel filter functions
>
> Rework tunnel filter functions to align with the new command buffer for
> add/remove cloud filter.
>
> Signed-off-by: Beilei Xing <beilei.xing@intel.com>
> ---
> drivers/net/i40e/i40e_ethdev.c | 100 +++++++++++++++++++++++++++----------
> ----
> drivers/net/i40e/i40e_ethdev.h | 1 +
> drivers/net/i40e/i40e_flow.c | 28 +++++++-----
> 3 files changed, 86 insertions(+), 43 deletions(-)
>
> @@ -10289,13 +10307,29 @@ i40e_tunnel_filter_restore(struct i40e_pf *pf)
> struct i40e_tunnel_filter_list
> *tunnel_list = &pf->tunnel.tunnel_list;
> struct i40e_tunnel_filter *f;
> - struct i40e_aqc_add_remove_cloud_filters_element_data cld_filter;
> + struct i40e_aqc_add_rm_cloud_filt_elem_ext cld_filter;
> + bool big_buffer = 0;
>
> TAILQ_FOREACH(f, tunnel_list, rules) {
> memset(&cld_filter, 0, sizeof(cld_filter));
> - rte_memcpy(&cld_filter, &f->input, sizeof(f->input));
> - cld_filter.queue_number = f->queue;
> - i40e_aq_add_cloud_filters(hw, vsi->seid, &cld_filter, 1);
> + ether_addr_copy((struct ether_addr *)&f->input.outer_mac,
> + (struct ether_addr *)&cld_filter.element.outer_mac);
> + ether_addr_copy((struct ether_addr *)&f->input.inner_mac,
> + (struct ether_addr *)&cld_filter.element.inner_mac);
> + cld_filter.element.inner_vlan = f->input.inner_vlan;
> + cld_filter.element.flags = f->input.flags;
> + cld_filter.element.tenant_id = f->input.tenant_id;
> + cld_filter.element.queue_number = f->queue;
> + rte_memcpy(cld_filter.general_fields,
> + f->input.general_fields,
> + sizeof(f->input.general_fields));
> +
> + if (big_buffer)
> + i40e_aq_add_cloud_filters_big_buffer(hw, vsi->seid,
> + &cld_filter, 1);
> + else
> + i40e_aq_add_cloud_filters(hw, vsi->seid,
> + &cld_filter.element, 1);
> }
Big_buffer is always 0, why we need to check it?
> -----Original Message-----
> From: Wu, Jingjing
> Sent: Monday, March 27, 2017 5:47 PM
> To: Xing, Beilei <beilei.xing@intel.com>
> Cc: Zhang, Helin <helin.zhang@intel.com>; dev@dpdk.org; Iremonger,
> Bernard <bernard.iremonger@intel.com>
> Subject: RE: [PATCH v2 1/4] net/i40e: rework tunnel filter functions
>
>
>
> > -----Original Message-----
> > From: Xing, Beilei
> > Sent: Thursday, March 23, 2017 6:46 PM
> > To: Wu, Jingjing <jingjing.wu@intel.com>
> > Cc: Zhang, Helin <helin.zhang@intel.com>; dev@dpdk.org
> > Subject: [PATCH v2 1/4] net/i40e: rework tunnel filter functions
> >
> > Rework tunnel filter functions to align with the new command buffer
> > for add/remove cloud filter.
> >
> > Signed-off-by: Beilei Xing <beilei.xing@intel.com>
> > ---
> > drivers/net/i40e/i40e_ethdev.c | 100
> > +++++++++++++++++++++++++++----------
> > ----
> > drivers/net/i40e/i40e_ethdev.h | 1 +
> > drivers/net/i40e/i40e_flow.c | 28 +++++++-----
> > 3 files changed, 86 insertions(+), 43 deletions(-)
> >
>
>
> > @@ -10289,13 +10307,29 @@ i40e_tunnel_filter_restore(struct i40e_pf *pf)
> > struct i40e_tunnel_filter_list
> > *tunnel_list = &pf->tunnel.tunnel_list;
> > struct i40e_tunnel_filter *f;
> > - struct i40e_aqc_add_remove_cloud_filters_element_data cld_filter;
> > + struct i40e_aqc_add_rm_cloud_filt_elem_ext cld_filter;
> > + bool big_buffer = 0;
> >
> > TAILQ_FOREACH(f, tunnel_list, rules) {
> > memset(&cld_filter, 0, sizeof(cld_filter));
> > - rte_memcpy(&cld_filter, &f->input, sizeof(f->input));
> > - cld_filter.queue_number = f->queue;
> > - i40e_aq_add_cloud_filters(hw, vsi->seid, &cld_filter, 1);
> > + ether_addr_copy((struct ether_addr *)&f->input.outer_mac,
> > + (struct ether_addr *)&cld_filter.element.outer_mac);
> > + ether_addr_copy((struct ether_addr *)&f->input.inner_mac,
> > + (struct ether_addr *)&cld_filter.element.inner_mac);
> > + cld_filter.element.inner_vlan = f->input.inner_vlan;
> > + cld_filter.element.flags = f->input.flags;
> > + cld_filter.element.tenant_id = f->input.tenant_id;
> > + cld_filter.element.queue_number = f->queue;
> > + rte_memcpy(cld_filter.general_fields,
> > + f->input.general_fields,
> > + sizeof(f->input.general_fields));
> > +
> > + if (big_buffer)
> > + i40e_aq_add_cloud_filters_big_buffer(hw, vsi->seid,
> > + &cld_filter, 1);
> > + else
> > + i40e_aq_add_cloud_filters(hw, vsi->seid,
> > + &cld_filter.element, 1);
> > }
>
> Big_buffer is always 0, why we need to check it?
Big_buffer will be 1 if the filter_type is MPLSoGRE/MPLSoUDP. But MPLS enabling in the next patchset. Will update in next version.
@@ -410,7 +410,7 @@ static int i40e_sw_ethertype_filter_insert(struct i40e_pf *pf,
struct i40e_ethertype_filter *filter);
static int i40e_tunnel_filter_convert(
- struct i40e_aqc_add_remove_cloud_filters_element_data *cld_filter,
+ struct i40e_aqc_add_rm_cloud_filt_elem_ext *cld_filter,
struct i40e_tunnel_filter *tunnel_filter);
static int i40e_sw_tunnel_filter_insert(struct i40e_pf *pf,
struct i40e_tunnel_filter *tunnel_filter);
@@ -6717,24 +6717,27 @@ i40e_dev_get_filter_type(uint16_t filter_type, uint16_t *flag)
/* Convert tunnel filter structure */
static int
-i40e_tunnel_filter_convert(struct i40e_aqc_add_remove_cloud_filters_element_data
- *cld_filter,
- struct i40e_tunnel_filter *tunnel_filter)
+i40e_tunnel_filter_convert(
+ struct i40e_aqc_add_rm_cloud_filt_elem_ext *cld_filter,
+ struct i40e_tunnel_filter *tunnel_filter)
{
- ether_addr_copy((struct ether_addr *)&cld_filter->outer_mac,
+ ether_addr_copy((struct ether_addr *)&cld_filter->element.outer_mac,
(struct ether_addr *)&tunnel_filter->input.outer_mac);
- ether_addr_copy((struct ether_addr *)&cld_filter->inner_mac,
+ ether_addr_copy((struct ether_addr *)&cld_filter->element.inner_mac,
(struct ether_addr *)&tunnel_filter->input.inner_mac);
- tunnel_filter->input.inner_vlan = cld_filter->inner_vlan;
- if ((rte_le_to_cpu_16(cld_filter->flags) &
+ tunnel_filter->input.inner_vlan = cld_filter->element.inner_vlan;
+ if ((rte_le_to_cpu_16(cld_filter->element.flags) &
I40E_AQC_ADD_CLOUD_FLAGS_IPV6) ==
I40E_AQC_ADD_CLOUD_FLAGS_IPV6)
tunnel_filter->input.ip_type = I40E_TUNNEL_IPTYPE_IPV6;
else
tunnel_filter->input.ip_type = I40E_TUNNEL_IPTYPE_IPV4;
- tunnel_filter->input.flags = cld_filter->flags;
- tunnel_filter->input.tenant_id = cld_filter->tenant_id;
- tunnel_filter->queue = cld_filter->queue_number;
+ tunnel_filter->input.flags = cld_filter->element.flags;
+ tunnel_filter->input.tenant_id = cld_filter->element.tenant_id;
+ tunnel_filter->queue = cld_filter->element.queue_number;
+ rte_memcpy(tunnel_filter->input.general_fields,
+ cld_filter->general_fields,
+ sizeof(cld_filter->general_fields));
return 0;
}
@@ -6813,15 +6816,16 @@ i40e_dev_tunnel_filter_set(struct i40e_pf *pf,
int val, ret = 0;
struct i40e_hw *hw = I40E_PF_TO_HW(pf);
struct i40e_vsi *vsi = pf->main_vsi;
- struct i40e_aqc_add_remove_cloud_filters_element_data *cld_filter;
- struct i40e_aqc_add_remove_cloud_filters_element_data *pfilter;
+ struct i40e_aqc_add_rm_cloud_filt_elem_ext *cld_filter;
+ struct i40e_aqc_add_rm_cloud_filt_elem_ext *pfilter;
struct i40e_tunnel_rule *tunnel_rule = &pf->tunnel;
struct i40e_tunnel_filter *tunnel, *node;
struct i40e_tunnel_filter check_filter; /* Check if filter exists */
+ bool big_buffer = 0;
cld_filter = rte_zmalloc("tunnel_filter",
- sizeof(struct i40e_aqc_add_remove_cloud_filters_element_data),
- 0);
+ sizeof(struct i40e_aqc_add_rm_cloud_filt_elem_ext),
+ 0);
if (NULL == cld_filter) {
PMD_DRV_LOG(ERR, "Failed to alloc memory.");
@@ -6829,24 +6833,28 @@ i40e_dev_tunnel_filter_set(struct i40e_pf *pf,
}
pfilter = cld_filter;
- ether_addr_copy(&tunnel_filter->outer_mac, (struct ether_addr*)&pfilter->outer_mac);
- ether_addr_copy(&tunnel_filter->inner_mac, (struct ether_addr*)&pfilter->inner_mac);
+ ether_addr_copy(&tunnel_filter->outer_mac,
+ (struct ether_addr *)&pfilter->element.outer_mac);
+ ether_addr_copy(&tunnel_filter->inner_mac,
+ (struct ether_addr *)&pfilter->element.inner_mac);
- pfilter->inner_vlan = rte_cpu_to_le_16(tunnel_filter->inner_vlan);
+ pfilter->element.inner_vlan =
+ rte_cpu_to_le_16(tunnel_filter->inner_vlan);
if (tunnel_filter->ip_type == RTE_TUNNEL_IPTYPE_IPV4) {
ip_type = I40E_AQC_ADD_CLOUD_FLAGS_IPV4;
ipv4_addr = rte_be_to_cpu_32(tunnel_filter->ip_addr.ipv4_addr);
- rte_memcpy(&pfilter->ipaddr.v4.data,
+ rte_memcpy(&pfilter->element.ipaddr.v4.data,
&rte_cpu_to_le_32(ipv4_addr),
- sizeof(pfilter->ipaddr.v4.data));
+ sizeof(pfilter->element.ipaddr.v4.data));
} else {
ip_type = I40E_AQC_ADD_CLOUD_FLAGS_IPV6;
for (i = 0; i < 4; i++) {
convert_ipv6[i] =
rte_cpu_to_le_32(rte_be_to_cpu_32(tunnel_filter->ip_addr.ipv6_addr[i]));
}
- rte_memcpy(&pfilter->ipaddr.v6.data, &convert_ipv6,
- sizeof(pfilter->ipaddr.v6.data));
+ rte_memcpy(&pfilter->element.ipaddr.v6.data,
+ &convert_ipv6,
+ sizeof(pfilter->element.ipaddr.v6.data));
}
/* check tunneled type */
@@ -6868,17 +6876,18 @@ i40e_dev_tunnel_filter_set(struct i40e_pf *pf,
}
val = i40e_dev_get_filter_type(tunnel_filter->filter_type,
- &pfilter->flags);
+ &pfilter->element.flags);
if (val < 0) {
rte_free(cld_filter);
return -EINVAL;
}
- pfilter->flags |= rte_cpu_to_le_16(
+ pfilter->element.flags |= rte_cpu_to_le_16(
I40E_AQC_ADD_CLOUD_FLAGS_TO_QUEUE |
ip_type | (tun_type << I40E_AQC_ADD_CLOUD_TNL_TYPE_SHIFT));
- pfilter->tenant_id = rte_cpu_to_le_32(tunnel_filter->tenant_id);
- pfilter->queue_number = rte_cpu_to_le_16(tunnel_filter->queue_id);
+ pfilter->element.tenant_id = rte_cpu_to_le_32(tunnel_filter->tenant_id);
+ pfilter->element.queue_number =
+ rte_cpu_to_le_16(tunnel_filter->queue_id);
/* Check if there is the filter in SW list */
memset(&check_filter, 0, sizeof(check_filter));
@@ -6895,7 +6904,12 @@ i40e_dev_tunnel_filter_set(struct i40e_pf *pf,
}
if (add) {
- ret = i40e_aq_add_cloud_filters(hw, vsi->seid, cld_filter, 1);
+ if (big_buffer)
+ ret = i40e_aq_add_cloud_filters_big_buffer(hw,
+ vsi->seid, cld_filter, 1);
+ else
+ ret = i40e_aq_add_cloud_filters(hw,
+ vsi->seid, &cld_filter->element, 1);
if (ret < 0) {
PMD_DRV_LOG(ERR, "Failed to add a tunnel filter.");
return ret;
@@ -6904,8 +6918,12 @@ i40e_dev_tunnel_filter_set(struct i40e_pf *pf,
rte_memcpy(tunnel, &check_filter, sizeof(check_filter));
ret = i40e_sw_tunnel_filter_insert(pf, tunnel);
} else {
- ret = i40e_aq_remove_cloud_filters(hw, vsi->seid,
- cld_filter, 1);
+ if (big_buffer)
+ ret = i40e_aq_remove_cloud_filters_big_buffer(
+ hw, vsi->seid, cld_filter, 1);
+ else
+ ret = i40e_aq_remove_cloud_filters(hw, vsi->seid,
+ &cld_filter->element, 1);
if (ret < 0) {
PMD_DRV_LOG(ERR, "Failed to delete a tunnel filter.");
return ret;
@@ -10289,13 +10307,29 @@ i40e_tunnel_filter_restore(struct i40e_pf *pf)
struct i40e_tunnel_filter_list
*tunnel_list = &pf->tunnel.tunnel_list;
struct i40e_tunnel_filter *f;
- struct i40e_aqc_add_remove_cloud_filters_element_data cld_filter;
+ struct i40e_aqc_add_rm_cloud_filt_elem_ext cld_filter;
+ bool big_buffer = 0;
TAILQ_FOREACH(f, tunnel_list, rules) {
memset(&cld_filter, 0, sizeof(cld_filter));
- rte_memcpy(&cld_filter, &f->input, sizeof(f->input));
- cld_filter.queue_number = f->queue;
- i40e_aq_add_cloud_filters(hw, vsi->seid, &cld_filter, 1);
+ ether_addr_copy((struct ether_addr *)&f->input.outer_mac,
+ (struct ether_addr *)&cld_filter.element.outer_mac);
+ ether_addr_copy((struct ether_addr *)&f->input.inner_mac,
+ (struct ether_addr *)&cld_filter.element.inner_mac);
+ cld_filter.element.inner_vlan = f->input.inner_vlan;
+ cld_filter.element.flags = f->input.flags;
+ cld_filter.element.tenant_id = f->input.tenant_id;
+ cld_filter.element.queue_number = f->queue;
+ rte_memcpy(cld_filter.general_fields,
+ f->input.general_fields,
+ sizeof(f->input.general_fields));
+
+ if (big_buffer)
+ i40e_aq_add_cloud_filters_big_buffer(hw, vsi->seid,
+ &cld_filter, 1);
+ else
+ i40e_aq_add_cloud_filters(hw, vsi->seid,
+ &cld_filter.element, 1);
}
}
@@ -513,6 +513,7 @@ struct i40e_tunnel_filter_input {
enum i40e_tunnel_iptype ip_type;
uint16_t flags; /* Filter type flag */
uint32_t tenant_id; /* Tenant id to match */
+ uint16_t general_fields[32]; /* Big buffer */
};
struct i40e_tunnel_filter {
@@ -1725,23 +1725,31 @@ i40e_flow_destroy_tunnel_filter(struct i40e_pf *pf,
{
struct i40e_hw *hw = I40E_PF_TO_HW(pf);
struct i40e_vsi *vsi = pf->main_vsi;
- struct i40e_aqc_add_remove_cloud_filters_element_data cld_filter;
+ struct i40e_aqc_add_rm_cloud_filt_elem_ext cld_filter;
struct i40e_tunnel_rule *tunnel_rule = &pf->tunnel;
struct i40e_tunnel_filter *node;
+ bool big_buffer = 0;
int ret = 0;
memset(&cld_filter, 0, sizeof(cld_filter));
ether_addr_copy((struct ether_addr *)&filter->input.outer_mac,
- (struct ether_addr *)&cld_filter.outer_mac);
+ (struct ether_addr *)&cld_filter.element.outer_mac);
ether_addr_copy((struct ether_addr *)&filter->input.inner_mac,
- (struct ether_addr *)&cld_filter.inner_mac);
- cld_filter.inner_vlan = filter->input.inner_vlan;
- cld_filter.flags = filter->input.flags;
- cld_filter.tenant_id = filter->input.tenant_id;
- cld_filter.queue_number = filter->queue;
-
- ret = i40e_aq_remove_cloud_filters(hw, vsi->seid,
- &cld_filter, 1);
+ (struct ether_addr *)&cld_filter.element.inner_mac);
+ cld_filter.element.inner_vlan = filter->input.inner_vlan;
+ cld_filter.element.flags = filter->input.flags;
+ cld_filter.element.tenant_id = filter->input.tenant_id;
+ cld_filter.element.queue_number = filter->queue;
+ rte_memcpy(cld_filter.general_fields,
+ filter->input.general_fields,
+ sizeof(cld_filter.general_fields));
+
+ if (big_buffer)
+ ret = i40e_aq_remove_cloud_filters_big_buffer(hw, vsi->seid,
+ &cld_filter, 1);
+ else
+ ret = i40e_aq_remove_cloud_filters(hw, vsi->seid,
+ &cld_filter.element, 1);
if (ret < 0)
return ret;