diff mbox

[dpdk-dev,1/3] fm10k: update VLAN filter

Message ID 1433213937-21690-2-git-send-email-shaopeng.he@intel.com (mailing list archive)
State Superseded, archived
Headers

Commit Message

He, Shaopeng June 2, 2015, 2:58 a.m. UTC 
  VLAN filter was updated to add/delete one static entry in MAC table for each
combination of VLAN and MAC address. More sanity checks were added.

Signed-off-by: Shaopeng He <shaopeng.he@intel.com>
---
 drivers/net/fm10k/fm10k.h        | 23 +++++++++++++++++
 drivers/net/fm10k/fm10k_ethdev.c | 55 +++++++++++++++++++++++++++++++++++++---
 2 files changed, 75 insertions(+), 3 deletions(-)

Comments

Chen, Jing D June 9, 2015, 2:54 a.m. UTC | #1 
Hi,

> -----Original Message-----
> From: He, Shaopeng
> Sent: Tuesday, June 02, 2015 10:59 AM
> To: dev@dpdk.org
> Cc: Chen, Jing D; Qiu, Michael; He, Shaopeng
> Subject: [PATCH 1/3] fm10k: update VLAN filter
> 
> VLAN filter was updated to add/delete one static entry in MAC table for each
> combination of VLAN and MAC address. More sanity checks were added.
> 
> Signed-off-by: Shaopeng He <shaopeng.he@intel.com>
> ---
>  drivers/net/fm10k/fm10k.h        | 23 +++++++++++++++++
>  drivers/net/fm10k/fm10k_ethdev.c | 55
> +++++++++++++++++++++++++++++++++++++---
>  2 files changed, 75 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/net/fm10k/fm10k.h b/drivers/net/fm10k/fm10k.h
> index ad7a7d1..3b95b72 100644
> --- a/drivers/net/fm10k/fm10k.h
> +++ b/drivers/net/fm10k/fm10k.h
> @@ -109,11 +109,31 @@
> 
>  #define FM10K_VLAN_TAG_SIZE 4
> 
> +/* Maximum number of MAC addresses per PF/VF */
> +#define FM10K_MAX_MACADDR_NUM       1
> +
> +#define FM10K_UINT32_BIT_SIZE      (CHAR_BIT * sizeof(uint32_t))
> +#define FM10K_VFTA_SIZE            (4096 / FM10K_UINT32_BIT_SIZE)
> +
> +/* vlan_id is a 12 bit number.
> + * The VFTA array is actually a 4096 bit array, 128 of 32bit elements.
> + * 2^5 = 32. The val of lower 5 bits specifies the bit in the 32bit element.
> + * The higher 7 bit val specifies VFTA array index.
> + */
> +#define FM10K_VFTA_BIT(vlan_id)    (1 << ((vlan_id) & 0x1F))
> +#define FM10K_VFTA_IDX(vlan_id)    ((vlan_id) >> 5)
> +
> +struct fm10k_macvlan_filter_info {
> +	uint16_t vlan_num;       /* Total VLAN number */
> +	uint32_t vfta[FM10K_VFTA_SIZE];        /* VLAN bitmap */
> +};
> +
>  struct fm10k_dev_info {
>  	volatile uint32_t enable;
>  	volatile uint32_t glort;
>  	/* Protect the mailbox to avoid race condition */
>  	rte_spinlock_t    mbx_lock;
> +	struct fm10k_macvlan_filter_info    macvlan;
>  };
> 
>  /*
> @@ -137,6 +157,9 @@ struct fm10k_adapter {
>  #define FM10K_DEV_PRIVATE_TO_MBXLOCK(adapter) \
>  	(&(((struct fm10k_adapter *)adapter)->info.mbx_lock))
> 
> +#define FM10K_DEV_PRIVATE_TO_MACVLAN(adapter) \
> +		(&(((struct fm10k_adapter *)adapter)->info.macvlan))
> +
>  struct fm10k_rx_queue {
>  	struct rte_mempool *mp;
>  	struct rte_mbuf **sw_ring;
> diff --git a/drivers/net/fm10k/fm10k_ethdev.c
> b/drivers/net/fm10k/fm10k_ethdev.c
> index 3a26480..d2f3e44 100644
> --- a/drivers/net/fm10k/fm10k_ethdev.c
> +++ b/drivers/net/fm10k/fm10k_ethdev.c
> @@ -819,15 +819,61 @@ fm10k_dev_infos_get(struct rte_eth_dev *dev,
>  static int
>  fm10k_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on)
>  {
> -	struct fm10k_hw *hw = FM10K_DEV_PRIVATE_TO_HW(dev->data-
> >dev_private);
> +	s32 result;
> +	uint32_t vid_idx, vid_bit, mac_index;
> +	struct fm10k_hw *hw;
> +	struct fm10k_macvlan_filter_info *macvlan;
> +	struct rte_eth_dev_data *data = dev->data;
> 
> -	PMD_INIT_FUNC_TRACE();
> +	hw = FM10K_DEV_PRIVATE_TO_HW(dev->data->dev_private);
> +	macvlan = FM10K_DEV_PRIVATE_TO_MACVLAN(dev->data-
> >dev_private);
> 
>  	/* @todo - add support for the VF */
>  	if (hw->mac.type != fm10k_mac_pf)
>  		return -ENOTSUP;
> 
> -	return fm10k_update_vlan(hw, vlan_id, 0, on);
> +	if (vlan_id > ETH_VLAN_ID_MAX) {
> +		PMD_INIT_LOG(ERR, "Invalid vlan_id: must be < 4096");
> +		return (-EINVAL);
> +	}
> +
> +	vid_idx = FM10K_VFTA_IDX(vlan_id);
> +	vid_bit = FM10K_VFTA_BIT(vlan_id);
> +	/* this VLAN ID is already in the VLAN filter table, return SUCCESS */
> +	if (on && (macvlan->vfta[vid_idx] & vid_bit))
> +		return 0;
> +	/* this VLAN ID is NOT in the VLAN filter table, cannot remove */
> +	if (!on && !(macvlan->vfta[vid_idx] & vid_bit)) {
> +		PMD_INIT_LOG(ERR, "Invalid vlan_id: not existing "
> +			"in the VLAN filter table");
> +		return (-EINVAL);
> +	}
> +
> +	fm10k_mbx_lock(hw);
> +	result = fm10k_update_vlan(hw, vlan_id, 0, on);
> +	if (FM10K_SUCCESS == result) {
> +		if (on) {
> +			macvlan->vlan_num++;
> +			macvlan->vfta[vid_idx] |= vid_bit;
> +		} else {
> +			macvlan->vlan_num--;
> +			macvlan->vfta[vid_idx] &= ~vid_bit;
> +		}
> +
> +		for (mac_index = 0; mac_index <
> FM10K_MAX_MACADDR_NUM;
> +				mac_index++) {
> +			if (is_zero_ether_addr(&data-
> >mac_addrs[mac_index]))
> +				continue;
> +			fm10k_update_uc_addr(hw, hw->mac.dglort_map,
> +				data->mac_addrs[mac_index].addr_bytes,
> +				vlan_id, on, 0);


Result = fm10k_update_uc_addr()? If meeting any error, it should break.
In the meanwhile,  I think above if (on)...else... should be moved after the
loop. 

> +		}
> +	}
> +	fm10k_mbx_unlock(hw);
> +	if (FM10K_SUCCESS == result)
> +		return 0;
> +	else
> +		return (-EIO);
>  }
> 
>  static inline int
> @@ -1701,6 +1747,7 @@ eth_fm10k_dev_init(struct rte_eth_dev *dev)
>  {
>  	struct fm10k_hw *hw = FM10K_DEV_PRIVATE_TO_HW(dev->data-
> >dev_private);
>  	int diag;
> +	struct fm10k_macvlan_filter_info *macvlan;
> 
>  	PMD_INIT_FUNC_TRACE();
> 
> @@ -1715,6 +1762,8 @@ eth_fm10k_dev_init(struct rte_eth_dev *dev)
>  	if (rte_eal_process_type() != RTE_PROC_PRIMARY)
>  		return 0;
> 
> +	macvlan = FM10K_DEV_PRIVATE_TO_MACVLAN(dev->data-
> >dev_private);
> +	memset(macvlan, 0, sizeof(*macvlan));
>  	/* Vendor and Device ID need to be set before init of shared code */
>  	memset(hw, 0, sizeof(*hw));
>  	hw->device_id = dev->pci_dev->id.device_id;
> --
> 1.9.3
He, Shaopeng June 9, 2015, 7:18 a.m. UTC | #2 
> -----Original Message-----
> From: Chen, Jing D
> Sent: Tuesday, June 09, 2015 10:54 AM
> To: He, Shaopeng; dev@dpdk.org
> Cc: Qiu, Michael
> Subject: RE: [PATCH 1/3] fm10k: update VLAN filter
> 
> Hi,
> 
> > -----Original Message-----
> > From: He, Shaopeng
> > Sent: Tuesday, June 02, 2015 10:59 AM
> > To: dev@dpdk.org
> > Cc: Chen, Jing D; Qiu, Michael; He, Shaopeng
> > Subject: [PATCH 1/3] fm10k: update VLAN filter
> >
> > VLAN filter was updated to add/delete one static entry in MAC table
> > for each combination of VLAN and MAC address. More sanity checks were
> added.
> >
> > Signed-off-by: Shaopeng He <shaopeng.he@intel.com>
> > ---
> >  drivers/net/fm10k/fm10k.h        | 23 +++++++++++++++++
> >  drivers/net/fm10k/fm10k_ethdev.c | 55
> > +++++++++++++++++++++++++++++++++++++---
> >  2 files changed, 75 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/net/fm10k/fm10k.h b/drivers/net/fm10k/fm10k.h
> > index ad7a7d1..3b95b72 100644
> > --- a/drivers/net/fm10k/fm10k.h
> > +++ b/drivers/net/fm10k/fm10k.h
> > @@ -109,11 +109,31 @@
> >
> >  #define FM10K_VLAN_TAG_SIZE 4
> >
> > +/* Maximum number of MAC addresses per PF/VF */
> > +#define FM10K_MAX_MACADDR_NUM       1
> > +
> > +#define FM10K_UINT32_BIT_SIZE      (CHAR_BIT * sizeof(uint32_t))
> > +#define FM10K_VFTA_SIZE            (4096 / FM10K_UINT32_BIT_SIZE)
> > +
> > +/* vlan_id is a 12 bit number.
> > + * The VFTA array is actually a 4096 bit array, 128 of 32bit elements.
> > + * 2^5 = 32. The val of lower 5 bits specifies the bit in the 32bit element.
> > + * The higher 7 bit val specifies VFTA array index.
> > + */
> > +#define FM10K_VFTA_BIT(vlan_id)    (1 << ((vlan_id) & 0x1F))
> > +#define FM10K_VFTA_IDX(vlan_id)    ((vlan_id) >> 5)
> > +
> > +struct fm10k_macvlan_filter_info {
> > +	uint16_t vlan_num;       /* Total VLAN number */
> > +	uint32_t vfta[FM10K_VFTA_SIZE];        /* VLAN bitmap */
> > +};
> > +
> >  struct fm10k_dev_info {
> >  	volatile uint32_t enable;
> >  	volatile uint32_t glort;
> >  	/* Protect the mailbox to avoid race condition */
> >  	rte_spinlock_t    mbx_lock;
> > +	struct fm10k_macvlan_filter_info    macvlan;
> >  };
> >
> >  /*
> > @@ -137,6 +157,9 @@ struct fm10k_adapter {  #define
> > FM10K_DEV_PRIVATE_TO_MBXLOCK(adapter) \
> >  	(&(((struct fm10k_adapter *)adapter)->info.mbx_lock))
> >
> > +#define FM10K_DEV_PRIVATE_TO_MACVLAN(adapter) \
> > +		(&(((struct fm10k_adapter *)adapter)->info.macvlan))
> > +
> >  struct fm10k_rx_queue {
> >  	struct rte_mempool *mp;
> >  	struct rte_mbuf **sw_ring;
> > diff --git a/drivers/net/fm10k/fm10k_ethdev.c
> > b/drivers/net/fm10k/fm10k_ethdev.c
> > index 3a26480..d2f3e44 100644
> > --- a/drivers/net/fm10k/fm10k_ethdev.c
> > +++ b/drivers/net/fm10k/fm10k_ethdev.c
> > @@ -819,15 +819,61 @@ fm10k_dev_infos_get(struct rte_eth_dev *dev,
> > static int  fm10k_vlan_filter_set(struct rte_eth_dev *dev, uint16_t
> > vlan_id, int on)  {
> > -	struct fm10k_hw *hw = FM10K_DEV_PRIVATE_TO_HW(dev->data-
> > >dev_private);
> > +	s32 result;
> > +	uint32_t vid_idx, vid_bit, mac_index;
> > +	struct fm10k_hw *hw;
> > +	struct fm10k_macvlan_filter_info *macvlan;
> > +	struct rte_eth_dev_data *data = dev->data;
> >
> > -	PMD_INIT_FUNC_TRACE();
> > +	hw = FM10K_DEV_PRIVATE_TO_HW(dev->data->dev_private);
> > +	macvlan = FM10K_DEV_PRIVATE_TO_MACVLAN(dev->data-
> > >dev_private);
> >
> >  	/* @todo - add support for the VF */
> >  	if (hw->mac.type != fm10k_mac_pf)
> >  		return -ENOTSUP;
> >
> > -	return fm10k_update_vlan(hw, vlan_id, 0, on);
> > +	if (vlan_id > ETH_VLAN_ID_MAX) {
> > +		PMD_INIT_LOG(ERR, "Invalid vlan_id: must be < 4096");
> > +		return (-EINVAL);
> > +	}
> > +
> > +	vid_idx = FM10K_VFTA_IDX(vlan_id);
> > +	vid_bit = FM10K_VFTA_BIT(vlan_id);
> > +	/* this VLAN ID is already in the VLAN filter table, return SUCCESS */
> > +	if (on && (macvlan->vfta[vid_idx] & vid_bit))
> > +		return 0;
> > +	/* this VLAN ID is NOT in the VLAN filter table, cannot remove */
> > +	if (!on && !(macvlan->vfta[vid_idx] & vid_bit)) {
> > +		PMD_INIT_LOG(ERR, "Invalid vlan_id: not existing "
> > +			"in the VLAN filter table");
> > +		return (-EINVAL);
> > +	}
> > +
> > +	fm10k_mbx_lock(hw);
> > +	result = fm10k_update_vlan(hw, vlan_id, 0, on);
> > +	if (FM10K_SUCCESS == result) {
> > +		if (on) {
> > +			macvlan->vlan_num++;
> > +			macvlan->vfta[vid_idx] |= vid_bit;
> > +		} else {
> > +			macvlan->vlan_num--;
> > +			macvlan->vfta[vid_idx] &= ~vid_bit;
> > +		}
> > +
> > +		for (mac_index = 0; mac_index <
> > FM10K_MAX_MACADDR_NUM;
> > +				mac_index++) {
> > +			if (is_zero_ether_addr(&data-
> > >mac_addrs[mac_index]))
> > +				continue;
> > +			fm10k_update_uc_addr(hw, hw->mac.dglort_map,
> > +				data->mac_addrs[mac_index].addr_bytes,
> > +				vlan_id, on, 0);
> 
> 
> Result = fm10k_update_uc_addr()? If meeting any error, it should break.
> In the meanwhile,  I think above if (on)...else... should be moved after the
> loop.
Agree, make sense, thanks for the comment.
Michael Qiu June 9, 2015, 3:51 p.m. UTC | #3 
On 2015/6/2 10:59, He, Shaopeng wrote:
> VLAN filter was updated to add/delete one static entry in MAC table for each
> combination of VLAN and MAC address. More sanity checks were added.
>
> Signed-off-by: Shaopeng He <shaopeng.he@intel.com>
> ---
>  drivers/net/fm10k/fm10k.h        | 23 +++++++++++++++++
>  drivers/net/fm10k/fm10k_ethdev.c | 55 +++++++++++++++++++++++++++++++++++++---
>  2 files changed, 75 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/fm10k/fm10k.h b/drivers/net/fm10k/fm10k.h
> index ad7a7d1..3b95b72 100644
> --- a/drivers/net/fm10k/fm10k.h
> +++ b/drivers/net/fm10k/fm10k.h
> @@ -109,11 +109,31 @@
>  
>  #define FM10K_VLAN_TAG_SIZE 4
>  
> +/* Maximum number of MAC addresses per PF/VF */
> +#define FM10K_MAX_MACADDR_NUM       1
> +
> +#define FM10K_UINT32_BIT_SIZE      (CHAR_BIT * sizeof(uint32_t))
> +#define FM10K_VFTA_SIZE            (4096 / FM10K_UINT32_BIT_SIZE)
> +
> +/* vlan_id is a 12 bit number.
> + * The VFTA array is actually a 4096 bit array, 128 of 32bit elements.
> + * 2^5 = 32. The val of lower 5 bits specifies the bit in the 32bit element.
> + * The higher 7 bit val specifies VFTA array index.
> + */
> +#define FM10K_VFTA_BIT(vlan_id)    (1 << ((vlan_id) & 0x1F))
> +#define FM10K_VFTA_IDX(vlan_id)    ((vlan_id) >> 5)
> +
> +struct fm10k_macvlan_filter_info {
> +	uint16_t vlan_num;       /* Total VLAN number */
> +	uint32_t vfta[FM10K_VFTA_SIZE];        /* VLAN bitmap */
> +};
> +
>  struct fm10k_dev_info {
>  	volatile uint32_t enable;
>  	volatile uint32_t glort;
>  	/* Protect the mailbox to avoid race condition */
>  	rte_spinlock_t    mbx_lock;
> +	struct fm10k_macvlan_filter_info    macvlan;
>  };
>  
>  /*
> @@ -137,6 +157,9 @@ struct fm10k_adapter {
>  #define FM10K_DEV_PRIVATE_TO_MBXLOCK(adapter) \
>  	(&(((struct fm10k_adapter *)adapter)->info.mbx_lock))
>  
> +#define FM10K_DEV_PRIVATE_TO_MACVLAN(adapter) \
> +		(&(((struct fm10k_adapter *)adapter)->info.macvlan))
> +
>  struct fm10k_rx_queue {
>  	struct rte_mempool *mp;
>  	struct rte_mbuf **sw_ring;
> diff --git a/drivers/net/fm10k/fm10k_ethdev.c b/drivers/net/fm10k/fm10k_ethdev.c
> index 3a26480..d2f3e44 100644
> --- a/drivers/net/fm10k/fm10k_ethdev.c
> +++ b/drivers/net/fm10k/fm10k_ethdev.c
> @@ -819,15 +819,61 @@ fm10k_dev_infos_get(struct rte_eth_dev *dev,
>  static int
>  fm10k_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on)
>  {
> -	struct fm10k_hw *hw = FM10K_DEV_PRIVATE_TO_HW(dev->data->dev_private);
> +	s32 result;
> +	uint32_t vid_idx, vid_bit, mac_index;
> +	struct fm10k_hw *hw;
> +	struct fm10k_macvlan_filter_info *macvlan;
> +	struct rte_eth_dev_data *data = dev->data;
>  
> -	PMD_INIT_FUNC_TRACE();
> +	hw = FM10K_DEV_PRIVATE_TO_HW(dev->data->dev_private);
> +	macvlan = FM10K_DEV_PRIVATE_TO_MACVLAN(dev->data->dev_private);
>  
>  	/* @todo - add support for the VF */
>  	if (hw->mac.type != fm10k_mac_pf)
>  		return -ENOTSUP;
>  
> -	return fm10k_update_vlan(hw, vlan_id, 0, on);
> +	if (vlan_id > ETH_VLAN_ID_MAX) {
> +		PMD_INIT_LOG(ERR, "Invalid vlan_id: must be < 4096");
> +		return (-EINVAL);
> +	}
> +
> +	vid_idx = FM10K_VFTA_IDX(vlan_id);
> +	vid_bit = FM10K_VFTA_BIT(vlan_id);
> +	/* this VLAN ID is already in the VLAN filter table, return SUCCESS */
> +	if (on && (macvlan->vfta[vid_idx] & vid_bit))
> +		return 0;
> +	/* this VLAN ID is NOT in the VLAN filter table, cannot remove */
> +	if (!on && !(macvlan->vfta[vid_idx] & vid_bit)) {
> +		PMD_INIT_LOG(ERR, "Invalid vlan_id: not existing "
> +			"in the VLAN filter table");
> +		return (-EINVAL);
> +	}
> +
> +	fm10k_mbx_lock(hw);
> +	result = fm10k_update_vlan(hw, vlan_id, 0, on);

Would it make sense about release the lock here? So that to make sure we
do not hold this lock for a long time.


> +	if (FM10K_SUCCESS == result) {
> +		if (on) {
> +			macvlan->vlan_num++;
> +			macvlan->vfta[vid_idx] |= vid_bit;
> +		} else {
> +			macvlan->vlan_num--;
> +			macvlan->vfta[vid_idx] &= ~vid_bit;
> +		}
> +
> +		for (mac_index = 0; mac_index < FM10K_MAX_MACADDR_NUM;
> +				mac_index++) {
> +			if (is_zero_ether_addr(&data->mac_addrs[mac_index]))
> +				continue;
> +			fm10k_update_uc_addr(hw, hw->mac.dglort_map,
> +				data->mac_addrs[mac_index].addr_bytes,
> +				vlan_id, on, 0);
> +		}
> +	}
> +	fm10k_mbx_unlock(hw);
> +	if (FM10K_SUCCESS == result)
> +		return 0;
> +	else
> +		return (-EIO);
>  }
>  
>  static inline int
> @@ -1701,6 +1747,7 @@ eth_fm10k_dev_init(struct rte_eth_dev *dev)
>  {
>  	struct fm10k_hw *hw = FM10K_DEV_PRIVATE_TO_HW(dev->data->dev_private);
>  	int diag;
> +	struct fm10k_macvlan_filter_info *macvlan;
>  
>  	PMD_INIT_FUNC_TRACE();
>  
> @@ -1715,6 +1762,8 @@ eth_fm10k_dev_init(struct rte_eth_dev *dev)
>  	if (rte_eal_process_type() != RTE_PROC_PRIMARY)
>  		return 0;
>  
> +	macvlan = FM10K_DEV_PRIVATE_TO_MACVLAN(dev->data->dev_private);
> +	memset(macvlan, 0, sizeof(*macvlan));
>  	/* Vendor and Device ID need to be set before init of shared code */
>  	memset(hw, 0, sizeof(*hw));
>  	hw->device_id = dev->pci_dev->id.device_id;
He, Shaopeng June 10, 2015, 5:52 a.m. UTC | #4 
> -----Original Message-----
> From: Qiu, Michael
> Sent: Tuesday, June 09, 2015 11:52 PM
> To: He, Shaopeng; dev@dpdk.org
> Cc: Chen, Jing D
> Subject: Re: [PATCH 1/3] fm10k: update VLAN filter
> 
> On 2015/6/2 10:59, He, Shaopeng wrote:
> > VLAN filter was updated to add/delete one static entry in MAC table
> > for each combination of VLAN and MAC address. More sanity checks were
> added.
> >
> > Signed-off-by: Shaopeng He <shaopeng.he@intel.com>
> > ---
> >  drivers/net/fm10k/fm10k.h        | 23 +++++++++++++++++
> >  drivers/net/fm10k/fm10k_ethdev.c | 55
> > +++++++++++++++++++++++++++++++++++++---
> >  2 files changed, 75 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/net/fm10k/fm10k.h b/drivers/net/fm10k/fm10k.h
> > index ad7a7d1..3b95b72 100644
> > --- a/drivers/net/fm10k/fm10k.h
> > +++ b/drivers/net/fm10k/fm10k.h
> > @@ -109,11 +109,31 @@
> >
> >  #define FM10K_VLAN_TAG_SIZE 4
> >
> > +/* Maximum number of MAC addresses per PF/VF */
> > +#define FM10K_MAX_MACADDR_NUM       1
> > +
> > +#define FM10K_UINT32_BIT_SIZE      (CHAR_BIT * sizeof(uint32_t))
> > +#define FM10K_VFTA_SIZE            (4096 / FM10K_UINT32_BIT_SIZE)
> > +
> > +/* vlan_id is a 12 bit number.
> > + * The VFTA array is actually a 4096 bit array, 128 of 32bit elements.
> > + * 2^5 = 32. The val of lower 5 bits specifies the bit in the 32bit element.
> > + * The higher 7 bit val specifies VFTA array index.
> > + */
> > +#define FM10K_VFTA_BIT(vlan_id)    (1 << ((vlan_id) & 0x1F))
> > +#define FM10K_VFTA_IDX(vlan_id)    ((vlan_id) >> 5)
> > +
> > +struct fm10k_macvlan_filter_info {
> > +	uint16_t vlan_num;       /* Total VLAN number */
> > +	uint32_t vfta[FM10K_VFTA_SIZE];        /* VLAN bitmap */
> > +};
> > +
> >  struct fm10k_dev_info {
> >  	volatile uint32_t enable;
> >  	volatile uint32_t glort;
> >  	/* Protect the mailbox to avoid race condition */
> >  	rte_spinlock_t    mbx_lock;
> > +	struct fm10k_macvlan_filter_info    macvlan;
> >  };
> >
> >  /*
> > @@ -137,6 +157,9 @@ struct fm10k_adapter {  #define
> > FM10K_DEV_PRIVATE_TO_MBXLOCK(adapter) \
> >  	(&(((struct fm10k_adapter *)adapter)->info.mbx_lock))
> >
> > +#define FM10K_DEV_PRIVATE_TO_MACVLAN(adapter) \
> > +		(&(((struct fm10k_adapter *)adapter)->info.macvlan))
> > +
> >  struct fm10k_rx_queue {
> >  	struct rte_mempool *mp;
> >  	struct rte_mbuf **sw_ring;
> > diff --git a/drivers/net/fm10k/fm10k_ethdev.c
> > b/drivers/net/fm10k/fm10k_ethdev.c
> > index 3a26480..d2f3e44 100644
> > --- a/drivers/net/fm10k/fm10k_ethdev.c
> > +++ b/drivers/net/fm10k/fm10k_ethdev.c
> > @@ -819,15 +819,61 @@ fm10k_dev_infos_get(struct rte_eth_dev *dev,
> > static int  fm10k_vlan_filter_set(struct rte_eth_dev *dev, uint16_t
> > vlan_id, int on)  {
> > -	struct fm10k_hw *hw = FM10K_DEV_PRIVATE_TO_HW(dev->data-
> >dev_private);
> > +	s32 result;
> > +	uint32_t vid_idx, vid_bit, mac_index;
> > +	struct fm10k_hw *hw;
> > +	struct fm10k_macvlan_filter_info *macvlan;
> > +	struct rte_eth_dev_data *data = dev->data;
> >
> > -	PMD_INIT_FUNC_TRACE();
> > +	hw = FM10K_DEV_PRIVATE_TO_HW(dev->data->dev_private);
> > +	macvlan = FM10K_DEV_PRIVATE_TO_MACVLAN(dev->data-
> >dev_private);
> >
> >  	/* @todo - add support for the VF */
> >  	if (hw->mac.type != fm10k_mac_pf)
> >  		return -ENOTSUP;
> >
> > -	return fm10k_update_vlan(hw, vlan_id, 0, on);
> > +	if (vlan_id > ETH_VLAN_ID_MAX) {
> > +		PMD_INIT_LOG(ERR, "Invalid vlan_id: must be < 4096");
> > +		return (-EINVAL);
> > +	}
> > +
> > +	vid_idx = FM10K_VFTA_IDX(vlan_id);
> > +	vid_bit = FM10K_VFTA_BIT(vlan_id);
> > +	/* this VLAN ID is already in the VLAN filter table, return SUCCESS */
> > +	if (on && (macvlan->vfta[vid_idx] & vid_bit))
> > +		return 0;
> > +	/* this VLAN ID is NOT in the VLAN filter table, cannot remove */
> > +	if (!on && !(macvlan->vfta[vid_idx] & vid_bit)) {
> > +		PMD_INIT_LOG(ERR, "Invalid vlan_id: not existing "
> > +			"in the VLAN filter table");
> > +		return (-EINVAL);
> > +	}
> > +
> > +	fm10k_mbx_lock(hw);
> > +	result = fm10k_update_vlan(hw, vlan_id, 0, on);
> 
> Would it make sense about release the lock here? So that to make sure we
> do not hold this lock for a long time.
Agree, make sense, thanks for the suggestion!
diff mbox

Patch

diff --git a/drivers/net/fm10k/fm10k.h b/drivers/net/fm10k/fm10k.h
index ad7a7d1..3b95b72 100644
--- a/drivers/net/fm10k/fm10k.h
+++ b/drivers/net/fm10k/fm10k.h
@@ -109,11 +109,31 @@ 
 
 #define FM10K_VLAN_TAG_SIZE 4
 
+/* Maximum number of MAC addresses per PF/VF */
+#define FM10K_MAX_MACADDR_NUM       1
+
+#define FM10K_UINT32_BIT_SIZE      (CHAR_BIT * sizeof(uint32_t))
+#define FM10K_VFTA_SIZE            (4096 / FM10K_UINT32_BIT_SIZE)
+
+/* vlan_id is a 12 bit number.
+ * The VFTA array is actually a 4096 bit array, 128 of 32bit elements.
+ * 2^5 = 32. The val of lower 5 bits specifies the bit in the 32bit element.
+ * The higher 7 bit val specifies VFTA array index.
+ */
+#define FM10K_VFTA_BIT(vlan_id)    (1 << ((vlan_id) & 0x1F))
+#define FM10K_VFTA_IDX(vlan_id)    ((vlan_id) >> 5)
+
+struct fm10k_macvlan_filter_info {
+	uint16_t vlan_num;       /* Total VLAN number */
+	uint32_t vfta[FM10K_VFTA_SIZE];        /* VLAN bitmap */
+};
+
 struct fm10k_dev_info {
 	volatile uint32_t enable;
 	volatile uint32_t glort;
 	/* Protect the mailbox to avoid race condition */
 	rte_spinlock_t    mbx_lock;
+	struct fm10k_macvlan_filter_info    macvlan;
 };
 
 /*
@@ -137,6 +157,9 @@  struct fm10k_adapter {
 #define FM10K_DEV_PRIVATE_TO_MBXLOCK(adapter) \
 	(&(((struct fm10k_adapter *)adapter)->info.mbx_lock))
 
+#define FM10K_DEV_PRIVATE_TO_MACVLAN(adapter) \
+		(&(((struct fm10k_adapter *)adapter)->info.macvlan))
+
 struct fm10k_rx_queue {
 	struct rte_mempool *mp;
 	struct rte_mbuf **sw_ring;
diff --git a/drivers/net/fm10k/fm10k_ethdev.c b/drivers/net/fm10k/fm10k_ethdev.c
index 3a26480..d2f3e44 100644
--- a/drivers/net/fm10k/fm10k_ethdev.c
+++ b/drivers/net/fm10k/fm10k_ethdev.c
@@ -819,15 +819,61 @@  fm10k_dev_infos_get(struct rte_eth_dev *dev,
 static int
 fm10k_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on)
 {
-	struct fm10k_hw *hw = FM10K_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+	s32 result;
+	uint32_t vid_idx, vid_bit, mac_index;
+	struct fm10k_hw *hw;
+	struct fm10k_macvlan_filter_info *macvlan;
+	struct rte_eth_dev_data *data = dev->data;
 
-	PMD_INIT_FUNC_TRACE();
+	hw = FM10K_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+	macvlan = FM10K_DEV_PRIVATE_TO_MACVLAN(dev->data->dev_private);
 
 	/* @todo - add support for the VF */
 	if (hw->mac.type != fm10k_mac_pf)
 		return -ENOTSUP;
 
-	return fm10k_update_vlan(hw, vlan_id, 0, on);
+	if (vlan_id > ETH_VLAN_ID_MAX) {
+		PMD_INIT_LOG(ERR, "Invalid vlan_id: must be < 4096");
+		return (-EINVAL);
+	}
+
+	vid_idx = FM10K_VFTA_IDX(vlan_id);
+	vid_bit = FM10K_VFTA_BIT(vlan_id);
+	/* this VLAN ID is already in the VLAN filter table, return SUCCESS */
+	if (on && (macvlan->vfta[vid_idx] & vid_bit))
+		return 0;
+	/* this VLAN ID is NOT in the VLAN filter table, cannot remove */
+	if (!on && !(macvlan->vfta[vid_idx] & vid_bit)) {
+		PMD_INIT_LOG(ERR, "Invalid vlan_id: not existing "
+			"in the VLAN filter table");
+		return (-EINVAL);
+	}
+
+	fm10k_mbx_lock(hw);
+	result = fm10k_update_vlan(hw, vlan_id, 0, on);
+	if (FM10K_SUCCESS == result) {
+		if (on) {
+			macvlan->vlan_num++;
+			macvlan->vfta[vid_idx] |= vid_bit;
+		} else {
+			macvlan->vlan_num--;
+			macvlan->vfta[vid_idx] &= ~vid_bit;
+		}
+
+		for (mac_index = 0; mac_index < FM10K_MAX_MACADDR_NUM;
+				mac_index++) {
+			if (is_zero_ether_addr(&data->mac_addrs[mac_index]))
+				continue;
+			fm10k_update_uc_addr(hw, hw->mac.dglort_map,
+				data->mac_addrs[mac_index].addr_bytes,
+				vlan_id, on, 0);
+		}
+	}
+	fm10k_mbx_unlock(hw);
+	if (FM10K_SUCCESS == result)
+		return 0;
+	else
+		return (-EIO);
 }
 
 static inline int
@@ -1701,6 +1747,7 @@  eth_fm10k_dev_init(struct rte_eth_dev *dev)
 {
 	struct fm10k_hw *hw = FM10K_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 	int diag;
+	struct fm10k_macvlan_filter_info *macvlan;
 
 	PMD_INIT_FUNC_TRACE();
 
@@ -1715,6 +1762,8 @@  eth_fm10k_dev_init(struct rte_eth_dev *dev)
 	if (rte_eal_process_type() != RTE_PROC_PRIMARY)
 		return 0;
 
+	macvlan = FM10K_DEV_PRIVATE_TO_MACVLAN(dev->data->dev_private);
+	memset(macvlan, 0, sizeof(*macvlan));
 	/* Vendor and Device ID need to be set before init of shared code */
 	memset(hw, 0, sizeof(*hw));
 	hw->device_id = dev->pci_dev->id.device_id;