From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by dpdk.org (Postfix) with ESMTP id B310C12A8 for ; Tue, 9 Jun 2015 09:18:12 +0200 (CEST) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP; 09 Jun 2015 00:18:12 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.13,579,1427785200"; d="scan'208";a="743455276" Received: from pgsmsx106.gar.corp.intel.com ([10.221.44.98]) by orsmga002.jf.intel.com with ESMTP; 09 Jun 2015 00:18:11 -0700 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by PGSMSX106.gar.corp.intel.com (10.221.44.98) with Microsoft SMTP Server (TLS) id 14.3.224.2; Tue, 9 Jun 2015 15:18:09 +0800 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.109]) by SHSMSX151.ccr.corp.intel.com ([169.254.3.168]) with mapi id 14.03.0224.002; Tue, 9 Jun 2015 15:18:08 +0800 From: "He, Shaopeng" To: "Chen, Jing D" , "dev@dpdk.org" Thread-Topic: [PATCH 1/3] fm10k: update VLAN filter Thread-Index: AQHQnOAmjaC4n5aiDUqmrEzvRgXnP52i/1iAgADN1xA= Date: Tue, 9 Jun 2015 07:18:07 +0000 Message-ID: References: <1433213937-21690-1-git-send-email-shaopeng.he@intel.com> <1433213937-21690-2-git-send-email-shaopeng.he@intel.com> <4341B239C0EFF9468EE453F9E9F4604D016FA25D@shsmsx102.ccr.corp.intel.com> In-Reply-To: <4341B239C0EFF9468EE453F9E9F4604D016FA25D@shsmsx102.ccr.corp.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 07:18:13 -0000 > -----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 >=20 > Hi, >=20 > > -----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 > > --- > > 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 =3D 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 =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; > > > > - 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); > > > > /* @todo - add support for the VF */ > > if (hw->mac.type !=3D 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 =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); >=20 >=20 > 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 = the > loop. Agree, make sense, thanks for the comment.