Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754022AbbBTBEH (ORCPT ); Thu, 19 Feb 2015 20:04:07 -0500 Received: from TYO202.gate.nec.co.jp ([210.143.35.52]:37054 "EHLO tyo202.gate.nec.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753987AbbBTBEF (ORCPT ); Thu, 19 Feb 2015 20:04:05 -0500 From: Hiroshi Shimamoto To: "Skidmore, Donald C" , "vyasevic@redhat.com" , "Kirsher, Jeffrey T" CC: Alexander Duyck , =?utf-8?B?QmrDuHJuIE1vcms=?= , "e1000-devel@lists.sourceforge.net" , "netdev@vger.kernel.org" , "Choi, Sy Jong" , "linux-kernel@vger.kernel.org" , David Laight , Hayato Momma Subject: [PATCH v2 3/3] ixgbe: Add new ndo to allow VF multicast promiscuous mode Thread-Topic: [PATCH v2 3/3] ixgbe: Add new ndo to allow VF multicast promiscuous mode Thread-Index: AdBMqK/iyr+mPXpITtC290u8yo2+tg== Date: Fri, 20 Feb 2015 01:01:17 +0000 Message-ID: <7F861DC0615E0C47A872E6F3C5FCDDBD05E38867@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] Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from base64 to 8bit by nfs id t1K14Em1032474 Content-Length: 5529 Lines: 143 From: Hiroshi Shimamoto Implements the new netdev op to allow VF multicast promiscuous mode. 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, we can only use 30 IPv6 addresses. # ./ip link set dev eth0 vf 1 mc_promisc off Signed-off-by: Hiroshi Shimamoto Reviewed-by: Hayato Momma CC: Choi, Sy Jong --- drivers/net/ethernet/intel/ixgbe/ixgbe.h | 1 + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 7 ++++++ drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 35 ++++++++++++++++++++++++-- drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h | 2 ++ 4 files changed, 43 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe.h b/drivers/net/ethernet/intel/ixgbe/ixgbe.h index 41ed5ab..05293d7 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe.h +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe.h @@ -152,6 +152,7 @@ struct vf_data_storage { u16 tx_rate; u16 vlan_count; u8 spoofchk_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 70cc4c5..c169fba 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c @@ -3604,6 +3604,12 @@ static void ixgbe_configure_virtualization(struct ixgbe_adapter *adapter) if (hw->mac.ops.set_ethertype_anti_spoofing) hw->mac.ops.set_ethertype_anti_spoofing(hw, true, i); } + + /* Reconfigure multicast promiscuous mode */ + for (i = 0; i < adapter->num_vfs; i++) { + ixgbe_ndo_set_vf_mc_promisc(adapter->netdev, i, + adapter->vfinfo[i].mc_promisc_allowed); + } } static void ixgbe_set_rx_buffer_len(struct ixgbe_adapter *adapter) @@ -8052,6 +8058,7 @@ static const struct net_device_ops ixgbe_netdev_ops = { .ndo_set_vf_vlan = ixgbe_ndo_set_vf_vlan, .ndo_set_vf_rate = ixgbe_ndo_set_vf_bw, .ndo_set_vf_spoofchk = ixgbe_ndo_set_vf_spoofchk, + .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 965ad29..288f39f 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c @@ -108,8 +108,11 @@ static int __ixgbe_enable_sriov(struct ixgbe_adapter *adapter) for (i = 0; i < adapter->num_vfs; i++) { /* Enable spoof checking for all VFs */ adapter->vfinfo[i].spoofchk_enabled = true; - /* 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; } @@ -1016,7 +1019,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); @@ -1414,6 +1417,32 @@ int ixgbe_ndo_set_vf_spoofchk(struct net_device *netdev, int vf, bool setting) return 0; } +int ixgbe_ndo_set_vf_mc_promisc(struct net_device *netdev, int vf, bool setting) +{ + struct ixgbe_adapter *adapter = netdev_priv(netdev); + struct ixgbe_hw *hw = &adapter->hw; + u32 vmolr; + + 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) { @@ -1427,5 +1456,7 @@ int ixgbe_ndo_get_vf_config(struct net_device *netdev, ivi->vlan = adapter->vfinfo[vf].pf_vlan; ivi->qos = adapter->vfinfo[vf].pf_qos; ivi->spoofchk = adapter->vfinfo[vf].spoofchk_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 32c26d5..cfed199 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h @@ -47,6 +47,8 @@ int ixgbe_ndo_set_vf_vlan(struct net_device *netdev, int queue, u16 vlan, int ixgbe_ndo_set_vf_bw(struct net_device *netdev, int vf, int min_tx_rate, int max_tx_rate); int ixgbe_ndo_set_vf_spoofchk(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); -- 2.1.0 ????{.n?+???????+%?????ݶ??w??{.n?+????{??G?????{ay?ʇڙ?,j??f???h?????????z_??(?階?ݢj"???m??????G????????????&???~???iO???z??v?^?m???? ????????I?