From patchwork Fri Apr 10 01:07:36 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hiroshi Shimamoto X-Patchwork-Id: 459871 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 7A5F61401F0 for ; Fri, 10 Apr 2015 11:09:59 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932082AbbDJBJk (ORCPT ); Thu, 9 Apr 2015 21:09:40 -0400 Received: from TYO202.gate.nec.co.jp ([210.143.35.52]:46232 "EHLO tyo202.gate.nec.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754857AbbDJBJh (ORCPT ); Thu, 9 Apr 2015 21:09:37 -0400 Received: from mailgate3.nec.co.jp ([10.7.69.192]) by tyo202.gate.nec.co.jp (8.13.8/8.13.4) with ESMTP id t3A18rlg001944; Fri, 10 Apr 2015 10:08:53 +0900 (JST) Received: from mailsv4.nec.co.jp (imss62.nec.co.jp [10.7.69.157]) by mailgate3.nec.co.jp (8.11.7/3.7W-MAILGATE-NEC) with ESMTP id t3A18qt21971; Fri, 10 Apr 2015 10:08:52 +0900 (JST) Received: from mail01b.kamome.nec.co.jp (mail01b.kamome.nec.co.jp [10.25.43.2]) by mailsv4.nec.co.jp (8.13.8/8.13.4) with ESMTP id t3A18qZs021021; Fri, 10 Apr 2015 10:08:52 +0900 (JST) Received: from bpxc99gp.gisp.nec.co.jp ([10.38.151.141] [10.38.151.141]) by mail01b.kamome.nec.co.jp with ESMTP id BT-MMP-584300; Fri, 10 Apr 2015 10:07:38 +0900 Received: from BPXM14GP.gisp.nec.co.jp ([169.254.1.73]) by BPXC13GP.gisp.nec.co.jp ([10.38.151.141]) with mapi id 14.03.0174.002; Fri, 10 Apr 2015 10:07:37 +0900 From: Hiroshi Shimamoto To: Jeff Kirsher , Alexander Duyck , intel-wired-lan CC: Or Gerlitz , "vyasevic@redhat.com" , "e1000-devel@lists.sourceforge.net" , "netdev@vger.kernel.org" , "Choi, Sy Jong" , "linux-kernel@vger.kernel.org" , David Laight , Hayato Momma , Edward Cree , =?utf-8?B?QmrDuHJuIE1vcms=?= Subject: [PATCH v4 3/3] ixgbe: Add new ndo to allow VF multicast promiscuous mode Thread-Topic: [PATCH v4 3/3] ixgbe: Add new ndo to allow VF multicast promiscuous mode Thread-Index: AdBzKmQNJYklnKhIS1SLO9UAa7OXKQ== Date: Fri, 10 Apr 2015 01:07:36 +0000 Message-ID: <7F861DC0615E0C47A872E6F3C5FCDDBD05E7EC5C@BPXM14GP.gisp.nec.co.jp> Accept-Language: ja-JP, en-US Content-Language: ja-JP X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.205.5.123] MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Hiroshi Shimamoto Implements the new netdev op to allow VF multicast promiscuous mode. The multicast promiscuous mode is not allowed for all VFs by default. The administrator can allow to VF multicast promiscuous mode for only trusted VM. After allowing multicast promiscuous mode from the host, we can use over 30 IPv6 addresses on VM. # ip link set dev eth0 vf 1 mc_promisc on When disallowing multicast promiscuous mode, ixgbevf can only handle 30 IPv6 addresses at most. # ip link set dev eth0 vf 1 mc_promisc off Signed-off-by: Hiroshi Shimamoto Reviewed-by: Hayato Momma CC: Choi, Sy Jong --- v4: Put reconfiguration of MC promiscuous mode into the previous loop. drivers/net/ethernet/intel/ixgbe/ixgbe.h | 1 + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 5 ++++ drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 32 ++++++++++++++++++++++++-- drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h | 2 ++ 4 files changed, 38 insertions(+), 2 deletions(-) -- 2.1.0 Tested-by: Phil Schmitt diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe.h b/drivers/net/ethernet/intel/ixgbe/ixgbe.h index 08e65b6..4a9f74d 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe.h +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe.h @@ -153,6 +153,7 @@ struct vf_data_storage { u16 vlan_count; u8 spoofchk_enabled; bool rss_query_enabled; + u8 mc_promisc_allowed; unsigned int vf_api; }; diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index 2f41403..a85991d 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c @@ -3662,6 +3662,10 @@ static void ixgbe_configure_virtualization(struct ixgbe_adapter *adapter) /* Enable/Disable RSS query feature */ ixgbe_ndo_set_vf_rss_query_en(adapter->netdev, i, adapter->vfinfo[i].rss_query_enabled); + + /* Reconfigure multicast promiscuous mode */ + ixgbe_ndo_set_vf_mc_promisc(adapter->netdev, i, + adapter->vfinfo[i].mc_promisc_allowed); } } @@ -8165,6 +8169,7 @@ static const struct net_device_ops ixgbe_netdev_ops = { .ndo_set_vf_rate = ixgbe_ndo_set_vf_bw, .ndo_set_vf_spoofchk = ixgbe_ndo_set_vf_spoofchk, .ndo_set_vf_rss_query_en = ixgbe_ndo_set_vf_rss_query_en, + .ndo_set_vf_mc_promisc = ixgbe_ndo_set_vf_mc_promisc, .ndo_get_vf_config = ixgbe_ndo_get_vf_config, .ndo_get_stats64 = ixgbe_get_stats64, #ifdef CONFIG_IXGBE_DCB diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c index 615f651..42b24a0 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c @@ -117,8 +117,11 @@ static int __ixgbe_enable_sriov(struct ixgbe_adapter *adapter) */ adapter->vfinfo[i].rss_query_enabled = 0; - /* Turn multicast promiscuous mode off for all VFs */ + /* Disallow VF multicast promiscuous capability + * and turn it off for all VFs + */ adapter->vfinfo[i].mc_promisc = false; + adapter->vfinfo[i].mc_promisc_allowed = false; } return 0; @@ -1068,7 +1071,7 @@ static int ixgbe_set_vf_mc_promisc(struct ixgbe_adapter *adapter, adapter->vfinfo[vf].mc_promisc = enable; - if (enable) + if (enable && adapter->vfinfo[vf].mc_promisc_allowed) return ixgbe_enable_vf_mc_promisc(adapter, vf); else return ixgbe_disable_vf_mc_promisc(adapter, vf); @@ -1492,6 +1495,30 @@ int ixgbe_ndo_set_vf_rss_query_en(struct net_device *netdev, int vf, return 0; } +int ixgbe_ndo_set_vf_mc_promisc(struct net_device *netdev, int vf, bool setting) +{ + struct ixgbe_adapter *adapter = netdev_priv(netdev); + + if (vf >= adapter->num_vfs) + return -EINVAL; + + /* nothing to do */ + if (adapter->vfinfo[vf].mc_promisc_allowed == setting) + return 0; + + adapter->vfinfo[vf].mc_promisc_allowed = setting; + + /* if VF requests multicast promiscuous */ + if (adapter->vfinfo[vf].mc_promisc) { + if (setting) + ixgbe_enable_vf_mc_promisc(adapter, vf); + else + ixgbe_disable_vf_mc_promisc(adapter, vf); + } + + return 0; +} + int ixgbe_ndo_get_vf_config(struct net_device *netdev, int vf, struct ifla_vf_info *ivi) { @@ -1506,5 +1533,6 @@ int ixgbe_ndo_get_vf_config(struct net_device *netdev, ivi->qos = adapter->vfinfo[vf].pf_qos; ivi->spoofchk = adapter->vfinfo[vf].spoofchk_enabled; ivi->rss_query_en = adapter->vfinfo[vf].rss_query_enabled; + ivi->mc_promisc = adapter->vfinfo[vf].mc_promisc_allowed; return 0; } diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h index 2c197e6..bf5b8f1 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h @@ -49,6 +49,8 @@ int ixgbe_ndo_set_vf_bw(struct net_device *netdev, int vf, int min_tx_rate, int ixgbe_ndo_set_vf_spoofchk(struct net_device *netdev, int vf, bool setting); int ixgbe_ndo_set_vf_rss_query_en(struct net_device *netdev, int vf, bool setting); +int ixgbe_ndo_set_vf_mc_promisc(struct net_device *netdev, + int vf, bool setting); int ixgbe_ndo_get_vf_config(struct net_device *netdev, int vf, struct ifla_vf_info *ivi); void ixgbe_check_vf_rate_limit(struct ixgbe_adapter *adapter);