Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d747c333 authored by Rajesh Borundia's avatar Rajesh Borundia Committed by David S. Miller
Browse files

qlcnic: Add mac learning support to SR-IOV VF. 



o SR-IOV VF can be uplinked to bridge/macvtap device.
  Enable mac learning to support communication through
  embedded switch.
o Learn vlan filters based on QLCNIC_VLAN_FILTERING flag.

Signed-off-by: default avatarRajesh Borundia <rajesh.borundia@qlogic.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 74b7ba1a

drivers/net/ethernet/qlogic/qlcnic/qlcnic.h

+12 −0
Original line number Diff line number Diff line
@@ -1019,6 +1019,8 @@ struct qlcnic_ipaddr { 
#define QLCNIC_DEL_VXLAN_PORT		0x200000

#endif



#define QLCNIC_VLAN_FILTERING		0x800000



#define QLCNIC_IS_MSI_FAMILY(adapter) \

	((adapter)->flags & (QLCNIC_MSI_ENABLED | QLCNIC_MSIX_ENABLED))

#define QLCNIC_IS_TSO_CAPABLE(adapter)  \
@@ -2355,6 +2357,16 @@ static inline bool qlcnic_83xx_vf_check(struct qlcnic_adapter *adapter) 
	return (device == PCI_DEVICE_ID_QLOGIC_VF_QLE834X) ? true : false;

}



static inline bool qlcnic_sriov_check(struct qlcnic_adapter *adapter)

{

	bool status;



	status = (qlcnic_sriov_pf_check(adapter) ||

		  qlcnic_sriov_vf_check(adapter)) ? true : false;



	return status;

}



static inline u32 qlcnic_get_vnic_func_count(struct qlcnic_adapter *adapter)

{

	if (qlcnic_84xx_check(adapter))

drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c

+4 −8
Original line number Diff line number Diff line
@@ -313,20 +313,16 @@ static void qlcnic_send_filter(struct qlcnic_adapter *adapter, 
	u16 vlan_id = 0;

	u8 hindex, hval;



	if (!qlcnic_sriov_pf_check(adapter)) {

	if (ether_addr_equal(phdr->h_source, adapter->mac_addr))

		return;

	} else {



	if (adapter->flags & QLCNIC_VLAN_FILTERING) {

		if (protocol == ETH_P_8021Q) {

			vh = (struct vlan_ethhdr *)skb->data;

			vlan_id = ntohs(vh->h_vlan_TCI);

		} else if (vlan_tx_tag_present(skb)) {

			vlan_id = vlan_tx_tag_get(skb);

		}



		if (ether_addr_equal(phdr->h_source, adapter->mac_addr) &&

		    !vlan_id)

			return;

	}



	memcpy(&src_addr, phdr->h_source, ETH_ALEN);

drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c

+12 −4
Original line number Diff line number Diff line
@@ -378,7 +378,8 @@ static int qlcnic_fdb_del(struct ndmsg *ndm, struct nlattr *tb[], 
	if (!adapter->fdb_mac_learn)

		return ndo_dflt_fdb_del(ndm, tb, netdev, addr);



	if (adapter->flags & QLCNIC_ESWITCH_ENABLED) {

	if ((adapter->flags & QLCNIC_ESWITCH_ENABLED) ||

	    qlcnic_sriov_check(adapter)) {

		if (is_unicast_ether_addr(addr)) {

			err = dev_uc_del(netdev, addr);

			if (!err)
@@ -402,7 +403,8 @@ static int qlcnic_fdb_add(struct ndmsg *ndm, struct nlattr *tb[], 
	if (!adapter->fdb_mac_learn)

		return ndo_dflt_fdb_add(ndm, tb, netdev, addr, flags);



	if (!(adapter->flags & QLCNIC_ESWITCH_ENABLED)) {

	if (!(adapter->flags & QLCNIC_ESWITCH_ENABLED) &&

	    !qlcnic_sriov_check(adapter)) {

		pr_info("%s: FDB e-switch is not enabled\n", __func__);

		return -EOPNOTSUPP;

	}
@@ -432,7 +434,8 @@ static int qlcnic_fdb_dump(struct sk_buff *skb, struct netlink_callback *ncb, 
	if (!adapter->fdb_mac_learn)

		return ndo_dflt_fdb_dump(skb, ncb, netdev, idx);



	if (adapter->flags & QLCNIC_ESWITCH_ENABLED)

	if ((adapter->flags & QLCNIC_ESWITCH_ENABLED) ||

	    qlcnic_sriov_check(adapter))

		idx = ndo_dflt_fdb_dump(skb, ncb, netdev, idx);



	return idx;
@@ -2809,6 +2812,8 @@ static int qlcnic_close(struct net_device *netdev) 
	return 0;

}



#define QLCNIC_VF_LB_BUCKET_SIZE 1



void qlcnic_alloc_lb_filters_mem(struct qlcnic_adapter *adapter)

{

	void *head;
@@ -2824,7 +2829,10 @@ void qlcnic_alloc_lb_filters_mem(struct qlcnic_adapter *adapter) 
	spin_lock_init(&adapter->mac_learn_lock);

	spin_lock_init(&adapter->rx_mac_learn_lock);



	if (qlcnic_82xx_check(adapter)) {

	if (qlcnic_sriov_vf_check(adapter)) {

		filter_size = QLCNIC_83XX_SRIOV_VF_MAX_MAC - 1;

		adapter->fhash.fbucket_size = QLCNIC_VF_LB_BUCKET_SIZE;

	} else if (qlcnic_82xx_check(adapter)) {

		filter_size = QLCNIC_LB_MAX_FILTERS;

		adapter->fhash.fbucket_size = QLCNIC_LB_BUCKET_SIZE;

	} else {

drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov.h

+1 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ enum qlcnic_bc_commands { 
	QLCNIC_BC_CMD_CFG_GUEST_VLAN = 0x3,

};



#define QLCNIC_83XX_SRIOV_VF_MAX_MAC 2

#define QLC_BC_CMD 1



struct qlcnic_trans_list {

drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_common.c

+45 −6
Original line number Diff line number Diff line
@@ -199,6 +199,7 @@ int qlcnic_sriov_init(struct qlcnic_adapter *adapter, int num_vfs) 
				goto qlcnic_destroy_async_wq;

			}

			sriov->vf_info[i].vp = vp;

			vp->vlan_mode = QLC_GUEST_VLAN_MODE;

			vp->max_tx_bw = MAX_BW;

			vp->spoofchk = false;

			random_ether_addr(vp->mac);
@@ -517,6 +518,8 @@ static int qlcnic_sriov_setup_vf(struct qlcnic_adapter *adapter, 
{

	int err;



	adapter->flags |= QLCNIC_VLAN_FILTERING;

	adapter->ahw->total_nic_func = 1;

	INIT_LIST_HEAD(&adapter->vf_mc_list);

	if (!qlcnic_use_msi_x && !!qlcnic_use_msi)

		dev_warn(&adapter->pdev->dev,
@@ -772,6 +775,7 @@ static int qlcnic_sriov_prepare_bc_hdr(struct qlcnic_bc_trans *trans, 
		cmd->req.arg = (u32 *)trans->req_pay;

		cmd->rsp.arg = (u32 *)trans->rsp_pay;

		cmd_op = cmd->req.arg[0] & 0xff;

		cmd->cmd_op = cmd_op;

		remainder = (trans->rsp_pay_size) % (bc_pay_sz);

		num_frags = (trans->rsp_pay_size) / (bc_pay_sz);

		if (remainder)
@@ -1409,14 +1413,19 @@ static int __qlcnic_sriov_issue_cmd(struct qlcnic_adapter *adapter, 
	if ((mbx_err_code == QLCNIC_MBX_RSP_OK) ||

	    (mbx_err_code == QLCNIC_MBX_PORT_RSP_OK)) {

		rsp = QLCNIC_RCODE_SUCCESS;

	} else {

		if (cmd->type == QLC_83XX_MBX_CMD_NO_WAIT) {

			rsp = QLCNIC_RCODE_SUCCESS;

		} else {

			rsp = mbx_err_code;

			if (!rsp)

				rsp = 1;



			dev_err(dev,

				"MBX command 0x%x failed with err:0x%x for VF %d\n",

				opcode, mbx_err_code, func);

		}

	}



err_out:

	if (rsp == QLCNIC_RCODE_TIMEOUT) {
@@ -1537,6 +1546,28 @@ void qlcnic_sriov_vf_set_multi(struct net_device *netdev) 
		}

	}



	/* configure unicast MAC address, if there is not sufficient space

	 * to store all the unicast addresses then enable promiscuous mode

	 */

	if (netdev_uc_count(netdev) > ahw->max_uc_count) {

		mode = VPORT_MISS_MODE_ACCEPT_ALL;

	} else if (!netdev_uc_empty(netdev)) {

		netdev_for_each_uc_addr(ha, netdev)

			qlcnic_vf_add_mc_list(netdev, ha->addr);

	}



	if (adapter->pdev->is_virtfn) {

		if (mode == VPORT_MISS_MODE_ACCEPT_ALL &&

		    !adapter->fdb_mac_learn) {

			qlcnic_alloc_lb_filters_mem(adapter);

			adapter->drv_mac_learn = 1;

			adapter->rx_mac_learn = true;

		} else {

			adapter->drv_mac_learn = 0;

			adapter->rx_mac_learn = false;

		}

	}



	qlcnic_nic_set_promisc(adapter, mode);

}
@@ -1830,6 +1861,12 @@ static int qlcnic_sriov_vf_idc_unknown_state(struct qlcnic_adapter *adapter) 
	return 0;

}



static void qlcnic_sriov_vf_periodic_tasks(struct qlcnic_adapter *adapter)

{

	if (adapter->fhash.fnum)

		qlcnic_prune_lb_filters(adapter);

}



static void qlcnic_sriov_vf_poll_dev_state(struct work_struct *work)

{

	struct qlcnic_adapter *adapter;
@@ -1861,6 +1898,8 @@ static void qlcnic_sriov_vf_poll_dev_state(struct work_struct *work) 
	}



	idc->prev_state = idc->curr_state;

	qlcnic_sriov_vf_periodic_tasks(adapter);



	if (!ret && test_bit(QLC_83XX_MODULE_LOADED, &idc->status))

		qlcnic_schedule_work(adapter, qlcnic_sriov_vf_poll_dev_state,

				     idc->delay);