From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id 7E2EE5A0A for ; Tue, 9 Jun 2015 04:57:22 +0200 (CEST) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga102.fm.intel.com with ESMTP; 08 Jun 2015 19:57:21 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.13,577,1427785200"; d="scan'208";a="707655407" Received: from pgsmsx107.gar.corp.intel.com ([10.221.44.105]) by orsmga001.jf.intel.com with ESMTP; 08 Jun 2015 19:57:19 -0700 Received: from shsmsx104.ccr.corp.intel.com (10.239.4.70) by PGSMSX107.gar.corp.intel.com (10.221.44.105) with Microsoft SMTP Server (TLS) id 14.3.224.2; Tue, 9 Jun 2015 10:55:26 +0800 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.109]) by SHSMSX104.ccr.corp.intel.com ([169.254.5.94]) with mapi id 14.03.0224.002; Tue, 9 Jun 2015 10:54:29 +0800 From: "Chen, Jing D" To: "He, Shaopeng" , "dev@dpdk.org" Thread-Topic: [PATCH 1/3] fm10k: update VLAN filter Thread-Index: AQHQnOAm/p6n5Hqov026zLSy377BQp2jg1yg Date: Tue, 9 Jun 2015 02:54:29 +0000 Message-ID: <4341B239C0EFF9468EE453F9E9F4604D016FA25D@shsmsx102.ccr.corp.intel.com> References: <1433213937-21690-1-git-send-email-shaopeng.he@intel.com> <1433213937-21690-2-git-send-email-shaopeng.he@intel.com> In-Reply-To: <1433213937-21690-2-git-send-email-shaopeng.he@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [dpdk-dev] [PATCH 1/3] fm10k: update VLAN filter X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Jun 2015 02:57:23 -0000 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 >=20 > VLAN filter was updated to add/delete one static entry in MAC table for e= ach > combination of VLAN and MAC address. More sanity checks were added. >=20 > Signed-off-by: Shaopeng He > --- > drivers/net/fm10k/fm10k.h | 23 +++++++++++++++++ > drivers/net/fm10k/fm10k_ethdev.c | 55 > +++++++++++++++++++++++++++++++++++++--- > 2 files changed, 75 insertions(+), 3 deletions(-) >=20 > 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 @@ >=20 > #define FM10K_VLAN_TAG_SIZE 4 >=20 > +/* 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 =3D 32. The val of lower 5 bits specifies the bit in the 32bit el= ement. > + * 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; > }; >=20 > /* > @@ -137,6 +157,9 @@ struct fm10k_adapter { > #define FM10K_DEV_PRIVATE_TO_MBXLOCK(adapter) \ > (&(((struct fm10k_adapter *)adapter)->info.mbx_lock)) >=20 > +#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 =3D 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 =3D dev->data; >=20 > - PMD_INIT_FUNC_TRACE(); > + hw =3D FM10K_DEV_PRIVATE_TO_HW(dev->data->dev_private); > + macvlan =3D FM10K_DEV_PRIVATE_TO_MACVLAN(dev->data- > >dev_private); >=20 > /* @todo - add support for the VF */ > if (hw->mac.type !=3D fm10k_mac_pf) > return -ENOTSUP; >=20 > - 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 =3D FM10K_VFTA_IDX(vlan_id); > + vid_bit =3D 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 =3D fm10k_update_vlan(hw, vlan_id, 0, on); > + if (FM10K_SUCCESS =3D=3D result) { > + if (on) { > + macvlan->vlan_num++; > + macvlan->vfta[vid_idx] |=3D vid_bit; > + } else { > + macvlan->vlan_num--; > + macvlan->vfta[vid_idx] &=3D ~vid_bit; > + } > + > + for (mac_index =3D 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 =3D fm10k_update_uc_addr()? If meeting any error, it should break. In the meanwhile, I think above if (on)...else... should be moved after th= e loop.=20 > + } > + } > + fm10k_mbx_unlock(hw); > + if (FM10K_SUCCESS =3D=3D result) > + return 0; > + else > + return (-EIO); > } >=20 > static inline int > @@ -1701,6 +1747,7 @@ eth_fm10k_dev_init(struct rte_eth_dev *dev) > { > struct fm10k_hw *hw =3D FM10K_DEV_PRIVATE_TO_HW(dev->data- > >dev_private); > int diag; > + struct fm10k_macvlan_filter_info *macvlan; >=20 > PMD_INIT_FUNC_TRACE(); >=20 > @@ -1715,6 +1762,8 @@ eth_fm10k_dev_init(struct rte_eth_dev *dev) > if (rte_eal_process_type() !=3D RTE_PROC_PRIMARY) > return 0; >=20 > + macvlan =3D 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 =3D dev->pci_dev->id.device_id; > -- > 1.9.3