From patchwork Tue Jan 10 00:59:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Samudrala, Sridhar" X-Patchwork-Id: 713023 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3tyDG03YVHz9ssP for ; Tue, 10 Jan 2017 12:00:08 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 172C4863A4; Tue, 10 Jan 2017 01:00:07 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id tLniosE-GJ8Z; Tue, 10 Jan 2017 01:00:05 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id A39FD866A8; Tue, 10 Jan 2017 01:00:04 +0000 (UTC) X-Original-To: intel-wired-lan@lists.osuosl.org Delivered-To: intel-wired-lan@lists.osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id E88601BFC35 for ; Tue, 10 Jan 2017 00:59:58 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id E67F92307F for ; Tue, 10 Jan 2017 00:59:58 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 3y03txPA1Dn8 for ; Tue, 10 Jan 2017 00:59:55 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by silver.osuosl.org (Postfix) with ESMTPS id 063142E718 for ; Tue, 10 Jan 2017 00:59:55 +0000 (UTC) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga105.jf.intel.com with ESMTP; 09 Jan 2017 16:59:54 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="5.33,341,1477983600"; d="scan'208"; a="1081130891" Received: from sri-mi-02.jf.intel.com ([10.166.188.51]) by orsmga001.jf.intel.com with ESMTP; 09 Jan 2017 16:59:53 -0800 From: Sridhar Samudrala To: alexander.h.duyck@intel.com, john.r.fastabend@intel.com, anjali.singhai@intel.com, jakub.kicinski@netronome.com, davem@davemloft.net, scott.d.peterson@intel.com, gerlitz.or@gmail.com, jiri@resnulli.us, intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org Date: Mon, 9 Jan 2017 16:59:46 -0800 Message-Id: <1484009990-3018-4-git-send-email-sridhar.samudrala@intel.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1484009990-3018-1-git-send-email-sridhar.samudrala@intel.com> References: <1484009990-3018-1-git-send-email-sridhar.samudrala@intel.com> Subject: [Intel-wired-lan] [next-queue v3 PATCH 3/7] i40e: Sync link state between VFs and VFPRs X-BeenThere: intel-wired-lan@lists.osuosl.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Intel Wired Ethernet Linux Kernel Driver Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-wired-lan-bounces@lists.osuosl.org Sender: "Intel-wired-lan" This patch enables - reflecting the link state of VFPR based on VF admin state & link state of VF based on admin state of VFPR. - bringing up/down the VFPR sends a notification to update VF link state. - bringing up/down the VF will cause the link state update of VFPR. - enable/disable VF link state via ndo_set_vf_link_state will update the admin state of associated VFPR. PF: enp5s0f0, VFs: enp5s2,enp5s2f1 VFPRs:enp5s0f0-vf0, enp5s0f0-vf1 # rmmod i40e; modprobe i40e # devlink dev eswitch set pci/0000:05:00.0 mode switchdev # echo 2 > /sys/class/net/enp5s0f0/device/sriov_numvfs # ip link set enp5s2 up # ip link set enp5s0f0-vf0 up # ip link set enp5s0f0-vf1 up /* enp5s2 UP -> enp5s0f0-vf0 CARRIER ON */ # ip link show enp5s0f0-vf0 215: enp5s0f0-vf0: mtu 1500 qdisc fq_codel state UP mode DEFAULT group default qlen 1000 link/ether 68:05:ca:2e:72:68 brd ff:ff:ff:ff:ff:ff /* enp5s0f0-vf0 UP -> enp5s2 CARRIER ON */ # ip link show enp5s2 218: enp5s2: mtu 1500 qdisc mq state UP mode DEFAULT group default qlen 1000 link/ether ea:4d:60:bc:6f:85 brd ff:ff:ff:ff:ff:ff /* enp5s2f1 DOWN -> enp5s0f0-vf1 NO-CARRIER */ # ip link show enp5s0f0-vf1 216: enp5s0f0-vf1: mtu 1500 qdisc fq_codel state DOWN mode DEFAULT group default qlen 1000 link/ether 68:05:ca:2e:72:68 brd ff:ff:ff:ff:ff:ff # ip link set enp5s0f0-vf0 down # ip link set enp5s2f1 up /* enp5s0-vf0 DOWN -> enp5s2 NO_CARRIER */ # ip link show enp5s2 218: enp5s2: mtu 1500 qdisc mq state DOWN mode DEFAULT group default qlen 1000 link/ether ea:4d:60:bc:6f:85 brd ff:ff:ff:ff:ff:ff # ip -d link show enp5s0f0 213: enp5s0f0: mtu 1500 qdisc noop portid 6805ca27268 state DOWN mode DEFAULT group default qlen 1000 link/ether 68:05:ca:2e:72:68 brd ff:ff:ff:ff:ff:ff promiscuity 0 addrgenmode eui64 vf 0 MAC 00:00:00:00:00:00, spoof checking on, link-state disable, trust off vf 1 MAC 00:00:00:00:00:00, spoof checking on, link-state enable, trust off Signed-off-by: Sridhar Samudrala --- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 54 ++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c index f9927dc..275113c 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c @@ -1029,6 +1029,13 @@ void i40e_reset_vf(struct i40e_vf *vf, bool flr) **/ static int i40e_vfpr_netdev_open(struct net_device *dev) { + struct i40e_vfpr_netdev_priv *priv = netdev_priv(dev); + struct i40e_vf *vf = priv->vf; + + vf->link_forced = true; + vf->link_up = true; + i40e_vc_notify_vf_link_state(vf); + return 0; } @@ -1040,6 +1047,13 @@ static int i40e_vfpr_netdev_open(struct net_device *dev) **/ static int i40e_vfpr_netdev_stop(struct net_device *dev) { + struct i40e_vfpr_netdev_priv *priv = netdev_priv(dev); + struct i40e_vf *vf = priv->vf; + + vf->link_forced = true; + vf->link_up = false; + i40e_vc_notify_vf_link_state(vf); + return 0; } @@ -1126,6 +1140,13 @@ int i40e_alloc_vfpr_netdev(struct i40e_vf *vf, u16 vf_num) /* Delete broadcast filter for VF */ i40e_update_vf_broadcast_filter(vf, false); + /* Reset VF link as we are changing the mode to 'switchdev'. VFPR netdev + * needs to be brought up to enable VF link. + */ + vf->link_forced = true; + vf->link_up = false; + i40e_vc_notify_vf_link_state(vf); + return 0; } @@ -1150,6 +1171,10 @@ void i40e_free_vfpr_netdev(struct i40e_vf *vf) /* Add broadcast filter to VF */ i40e_update_vf_broadcast_filter(vf, true); + + /* In legacy mode, VF link is not controlled by VFPR */ + vf->link_forced = false; + i40e_vc_notify_vf_link_state(vf); } /** @@ -1907,8 +1932,17 @@ static int i40e_vc_enable_queues_msg(struct i40e_vf *vf, u8 *msg, u16 msglen) goto error_param; } + if (vf->link_forced && !vf->link_up) { + aq_ret = I40E_ERR_PARAM; + goto error_param; + } + if (i40e_vsi_start_rings(pf->vsi[vf->lan_vsi_idx])) aq_ret = I40E_ERR_TIMEOUT; + + if ((aq_ret == 0) && vf->vfpr_netdev) + netif_carrier_on(vf->vfpr_netdev); + error_param: /* send the response to the VF */ return i40e_vc_send_resp_to_vf(vf, I40E_VIRTCHNL_OP_ENABLE_QUEUES, @@ -1946,8 +1980,16 @@ static int i40e_vc_disable_queues_msg(struct i40e_vf *vf, u8 *msg, u16 msglen) goto error_param; } + if (vf->link_forced && vf->link_up) { + aq_ret = I40E_ERR_PARAM; + goto error_param; + } + i40e_vsi_stop_rings(pf->vsi[vf->lan_vsi_idx]); + if ((aq_ret == 0) && vf->vfpr_netdev) + netif_carrier_off(vf->vfpr_netdev); + error_param: /* send the response to the VF */ return i40e_vc_send_resp_to_vf(vf, I40E_VIRTCHNL_OP_DISABLE_QUEUES, @@ -3183,6 +3225,7 @@ int i40e_ndo_set_vf_link_state(struct net_device *netdev, int vf_id, int link) struct i40e_netdev_priv *np = netdev_priv(netdev); struct i40e_pf *pf = np->vsi->back; struct i40e_virtchnl_pf_event pfe; + struct net_device *vfpr_netdev; struct i40e_hw *hw = &pf->hw; struct i40e_vf *vf; int abs_vf_id; @@ -3225,6 +3268,17 @@ int i40e_ndo_set_vf_link_state(struct net_device *netdev, int vf_id, int link) ret = -EINVAL; goto error_out; } + + vfpr_netdev = vf->vfpr_netdev; + if (vfpr_netdev) { + unsigned int flags = vfpr_netdev->flags; + + if (vf->link_up) + dev_change_flags(vfpr_netdev, flags | IFF_UP); + else + dev_change_flags(vfpr_netdev, flags & ~IFF_UP); + } + /* Notify the VF of its new link state */ i40e_aq_send_msg_to_vf(hw, abs_vf_id, I40E_VIRTCHNL_OP_EVENT, 0, (u8 *)&pfe, sizeof(pfe), NULL);