From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id 6B6C95A0A for ; Tue, 9 Jun 2015 10:31:45 +0200 (CEST) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga103.jf.intel.com with ESMTP; 09 Jun 2015 01:31:45 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.13,579,1427785200"; d="scan'208";a="743492542" Received: from pgsmsx102.gar.corp.intel.com ([10.221.44.80]) by orsmga002.jf.intel.com with ESMTP; 09 Jun 2015 01:31:43 -0700 Received: from shsmsx104.ccr.corp.intel.com (10.239.4.70) by PGSMSX102.gar.corp.intel.com (10.221.44.80) with Microsoft SMTP Server (TLS) id 14.3.224.2; Tue, 9 Jun 2015 16:31:42 +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 16:31:41 +0800 From: "He, Shaopeng" To: "Chen, Jing D" , "dev@dpdk.org" Thread-Topic: [PATCH 2/3] fm10k: add MAC filter Thread-Index: AQHQnOAnwMVyB+O7skCbm1ZaTwBSRp2jB+gAgADHVLA= Date: Tue, 9 Jun 2015 08:31:40 +0000 Message-ID: References: <1433213937-21690-1-git-send-email-shaopeng.he@intel.com> <1433213937-21690-3-git-send-email-shaopeng.he@intel.com> <4341B239C0EFF9468EE453F9E9F4604D016FA27C@shsmsx102.ccr.corp.intel.com> In-Reply-To: <4341B239C0EFF9468EE453F9E9F4604D016FA27C@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 2/3] fm10k: add MAC 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 08:31:46 -0000 > -----Original Message----- > From: Chen, Jing D > Sent: Tuesday, June 09, 2015 11:25 AM > To: He, Shaopeng; dev@dpdk.org > Cc: Qiu, Michael > Subject: RE: [PATCH 2/3] fm10k: add MAC 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 2/3] fm10k: add MAC filter > > > > MAC filter function was newly added, each PF and VF can have up to 64 > > MAC addresses. VF filter needs support from PF host, which is not avail= able > now. > > > > Signed-off-by: Shaopeng He > > --- > > drivers/net/fm10k/fm10k.h | 3 +- > > drivers/net/fm10k/fm10k_ethdev.c | 90 > > ++++++++++++++++++++++++++++++++++++---- > > 2 files changed, 85 insertions(+), 8 deletions(-) > > > > diff --git a/drivers/net/fm10k/fm10k.h b/drivers/net/fm10k/fm10k.h > > index 3b95b72..f5be5f8 100644 > > --- a/drivers/net/fm10k/fm10k.h > > +++ b/drivers/net/fm10k/fm10k.h > > @@ -110,7 +110,7 @@ > > #define FM10K_VLAN_TAG_SIZE 4 > > > > /* Maximum number of MAC addresses per PF/VF */ > > -#define FM10K_MAX_MACADDR_NUM 1 > > +#define FM10K_MAX_MACADDR_NUM 64 > > > > #define FM10K_UINT32_BIT_SIZE (CHAR_BIT * sizeof(uint32_t)) > > #define FM10K_VFTA_SIZE (4096 / FM10K_UINT32_BIT_SIZE) > > @@ -125,6 +125,7 @@ > > > > struct fm10k_macvlan_filter_info { > > uint16_t vlan_num; /* Total VLAN number */ > > + uint16_t mac_num; /* Total mac number */ > > uint32_t vfta[FM10K_VFTA_SIZE]; /* VLAN bitmap */ > > }; > > > > diff --git a/drivers/net/fm10k/fm10k_ethdev.c > > b/drivers/net/fm10k/fm10k_ethdev.c > > index d2f3e44..4f23bf1 100644 > > --- a/drivers/net/fm10k/fm10k_ethdev.c > > +++ b/drivers/net/fm10k/fm10k_ethdev.c > > @@ -54,6 +54,10 @@ > > #define BIT_MASK_PER_UINT32 ((1 << CHARS_PER_UINT32) - 1) > > > > static void fm10k_close_mbx_service(struct fm10k_hw *hw); > > +static int > > +fm10k_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int > > +on); static void fm10k_MAC_filter_set(struct rte_eth_dev *dev, const > > +u8 *mac, bool add); > > > > static void > > fm10k_mbx_initlock(struct fm10k_hw *hw) @@ -668,14 +672,11 @@ > > fm10k_dev_start(struct rte_eth_dev *dev) > > } > > > > if (hw->mac.default_vid && hw->mac.default_vid <=3D > > ETHER_MAX_VLAN_ID) { > > - fm10k_mbx_lock(hw); > > /* Update default vlan */ > > - hw->mac.ops.update_vlan(hw, hw->mac.default_vid, 0, > > true); > > + fm10k_vlan_filter_set(dev, hw->mac.default_vid, true); > > > > /* Add default mac/vlan filter to PF/Switch manger */ > > - hw->mac.ops.update_uc_addr(hw, hw->mac.dglort_map, > > hw->mac.addr, > > - hw->mac.default_vid, true, 0); > > - fm10k_mbx_unlock(hw); > > + fm10k_MAC_filter_set(dev, hw->mac.addr, true); > > } > > > > return 0; > > @@ -781,7 +782,7 @@ fm10k_dev_infos_get(struct rte_eth_dev *dev, > > dev_info->max_rx_pktlen =3D FM10K_MAX_PKT_SIZE; > > dev_info->max_rx_queues =3D hw->mac.max_queues; > > dev_info->max_tx_queues =3D hw->mac.max_queues; > > - dev_info->max_mac_addrs =3D 1; > > + dev_info->max_mac_addrs =3D FM10K_MAX_MACADDR_NUM; > > dev_info->max_hash_mac_addrs =3D 0; > > dev_info->max_vfs =3D FM10K_MAX_VF_NUM; > > dev_info->max_vmdq_pools =3D ETH_64_POOLS; > > @@ -820,6 +821,7 @@ static int > > fm10k_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int > > on) { > > s32 result; > > + uint16_t mac_num =3D 0; > > uint32_t vid_idx, vid_bit, mac_index; > > struct fm10k_hw *hw; > > struct fm10k_macvlan_filter_info *macvlan; @@ -864,9 +866,15 @@ > > fm10k_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int > > on) > > mac_index++) { > > if (is_zero_ether_addr(&data- > > >mac_addrs[mac_index])) > > continue; > > + if (mac_num > macvlan->mac_num - 1) { > > + PMD_INIT_LOG(ERR, "MAC address number > > " > > + "not match"); > > + break; > > + } > > fm10k_update_uc_addr(hw, hw->mac.dglort_map, > > data->mac_addrs[mac_index].addr_bytes, > > vlan_id, on, 0); > > + mac_num++; > > } > > } > > fm10k_mbx_unlock(hw); > > @@ -876,6 +884,71 @@ fm10k_vlan_filter_set(struct rte_eth_dev *dev, > > uint16_t vlan_id, int on) > > return (-EIO); > > } > > > > +/* Add/Remove a MAC address, and update filters */ static void > > +fm10k_MAC_filter_set(struct rte_eth_dev *dev, const u8 *mac, bool > > +add) { > > + uint32_t i, j, k; > > + struct fm10k_hw *hw; > > + struct fm10k_macvlan_filter_info *macvlan; > > + > > + 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; > > + >=20 > Since it only supports PF, it's better to clarify in the log. Accept, thanks for the comment