From patchwork Wed Jun 17 11:45:04 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hiroshi Shimamoto X-Patchwork-Id: 485368 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 D7732140293 for ; Wed, 17 Jun 2015 21:46:54 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756605AbbFQLqu (ORCPT ); Wed, 17 Jun 2015 07:46:50 -0400 Received: from TYO201.gate.nec.co.jp ([210.143.35.51]:32880 "EHLO tyo201.gate.nec.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754707AbbFQLqr convert rfc822-to-8bit (ORCPT ); Wed, 17 Jun 2015 07:46:47 -0400 Received: from mailgate3.nec.co.jp ([10.7.69.160]) by tyo201.gate.nec.co.jp (8.13.8/8.13.4) with ESMTP id t5HBkQoI026555; Wed, 17 Jun 2015 20:46:26 +0900 (JST) Received: from mailsv.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 t5HBkQ702245; Wed, 17 Jun 2015 20:46:26 +0900 (JST) Received: from mail02.kamome.nec.co.jp (mail02.kamome.nec.co.jp [10.25.43.5]) by mailsv.nec.co.jp (8.13.8/8.13.4) with ESMTP id t5HBkQcC000546; Wed, 17 Jun 2015 20:46:26 +0900 (JST) Received: from bpxc99gp.gisp.nec.co.jp ([10.38.151.144] [10.38.151.144]) by mail01b.kamome.nec.co.jp with ESMTP id BT-MMP-740542; Wed, 17 Jun 2015 20:45:06 +0900 Received: from BPXM14GP.gisp.nec.co.jp ([169.254.1.74]) by BPXC16GP.gisp.nec.co.jp ([10.38.151.144]) with mapi id 14.03.0224.002; Wed, 17 Jun 2015 20:45:04 +0900 From: Hiroshi Shimamoto To: "Skidmore, Donald C" , "Rose, Gregory V" , "Kirsher, Jeffrey T" , "intel-wired-lan@lists.osuosl.org" CC: "nhorman@redhat.com" , "jogreene@redhat.com" , Linux Netdev List , "Choi, Sy Jong" , Rony Efraim , Or Gerlitz , Edward Cree , David Miller , "sassmann@redhat.com" Subject: [PATCH v6 3/3] ixgbe, ixgbevf: Add new mbox API to enable MC promiscuous mode Thread-Topic: [PATCH v6 3/3] ixgbe, ixgbevf: Add new mbox API to enable MC promiscuous mode Thread-Index: AdCo8t68LDn8NQ3WT+GumqO7NF911A== Date: Wed, 17 Jun 2015 11:45:04 +0000 Message-ID: <7F861DC0615E0C47A872E6F3C5FCDDBD05EE18CD@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 The limitation of the number of multicast address for VF is not enough for the large scale server with SR-IOV feature. IPv6 requires the multicast MAC address for each IP address to handle the Neighbor Solicitation message. We couldn't assign over 30 IPv6 addresses to a single VF interface. The easy way to solve this is enabling multicast promiscuous mode. It is good to have a functionality to enable multicast promiscuous mode for each VF from VF driver. This patch introduces the new mbox API, IXGBE_VF_SET_MC_PROMISC, to enable/disable multicast promiscuous mode in VF. If multicast promiscuous mode is enabled the VF can receive all multicast packets. With this patch, the ixgbevf driver automatically enable multicast promiscuous mode when the number of multicast addresses is over than 30 if possible. PF only allow to enbale VF multicast promiscuous mode if the VF is trusted. If not trusted, PF returns an error to VF and VF will fallback the previous behavior, that only 30 multicast addresses are registered to the filter. Signed-off-by: Hiroshi Shimamoto CC: Choi, Sy Jong --- drivers/net/ethernet/intel/ixgbe/ixgbe.h | 1 + drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.h | 2 + drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 55 +++++++++++++++++++++++ drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 3 ++ drivers/net/ethernet/intel/ixgbevf/mbx.h | 2 + drivers/net/ethernet/intel/ixgbevf/vf.c | 49 +++++++++++++++++++- drivers/net/ethernet/intel/ixgbevf/vf.h | 1 + 7 files changed, 112 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe.h b/drivers/net/ethernet/intel/ixgbe/ixgbe.h index 7f76c12..054db64 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe.h +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe.h @@ -146,6 +146,7 @@ struct vf_data_storage { u16 vlans_enabled; bool clear_to_send; bool pf_set_mac; + bool mc_promisc; u16 pf_vlan; /* When set, guest VLAN config not allowed. */ u16 pf_qos; u16 tx_rate; diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.h index b1e4703..703d40b 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.h +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.h @@ -102,6 +102,8 @@ enum ixgbe_pfvf_api_rev { #define IXGBE_VF_GET_RETA 0x0a /* VF request for RETA */ #define IXGBE_VF_GET_RSS_KEY 0x0b /* get RSS key */ +#define IXGBE_VF_SET_MC_PROMISC 0x0c /* VF requests MC promiscuous */ + /* length of permanent address message returned from PF */ #define IXGBE_VF_PERMADDR_MSG_LEN 4 /* word in permanent address message with the current multicast type */ diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c index 826f88e..925d9c6 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c @@ -119,6 +119,9 @@ static int __ixgbe_enable_sriov(struct ixgbe_adapter *adapter) /* Untrust all VFs */ adapter->vfinfo[i].trusted = false; + + /* Turn multicast promiscuous mode off for all VFs */ + adapter->vfinfo[i].mc_promisc = false; } return 0; @@ -335,6 +338,12 @@ static int ixgbe_set_vf_multicasts(struct ixgbe_adapter *adapter, u32 mta_reg; u32 vmolr = IXGBE_READ_REG(hw, IXGBE_VMOLR(vf)); + /* Disable multicast promiscuous first */ + if (adapter->vfinfo[vf].mc_promisc) { + vmolr &= ~IXGBE_VMOLR_MPE; + adapter->vfinfo[vf].mc_promisc = false; + } + /* only so many hash values supported */ entries = min(entries, IXGBE_MAX_VF_MC_ENTRIES); @@ -660,6 +669,7 @@ static int ixgbe_vf_reset_msg(struct ixgbe_adapter *adapter, u32 vf) u32 msgbuf[4] = {0, 0, 0, 0}; u8 *addr = (u8 *)(&msgbuf[1]); u32 q_per_pool = __ALIGN_MASK(1, ~vmdq->mask); + u32 vmolr; int i; e_info(probe, "VF Reset msg received from vf %d\n", vf); @@ -721,6 +731,12 @@ static int ixgbe_vf_reset_msg(struct ixgbe_adapter *adapter, u32 vf) IXGBE_WRITE_REG(hw, IXGBE_PVFTDWBALn(q_per_pool, vf, i), 0); } + /* Disable multicast promiscuous on reset */ + vmolr = IXGBE_READ_REG(hw, IXGBE_VMOLR(vf)); + vmolr &= ~IXGBE_VMOLR_MPE; + IXGBE_WRITE_REG(hw, IXGBE_VMOLR(vf), vmolr); + adapter->vfinfo[vf].mc_promisc = false; + /* reply to reset with ack and vf mac address */ msgbuf[0] = IXGBE_VF_RESET; if (!is_zero_ether_addr(vf_mac)) { @@ -1004,6 +1020,42 @@ static int ixgbe_get_vf_rss_key(struct ixgbe_adapter *adapter, return 0; } +static int ixgbe_set_vf_mc_promisc(struct ixgbe_adapter *adapter, + u32 *msgbuf, u32 vf) +{ + bool enable = !!msgbuf[1]; /* msgbuf contains the flag to enable */ + struct ixgbe_hw *hw; + u32 vmolr; + + switch (adapter->vfinfo[vf].vf_api) { + case ixgbe_mbox_api_12: + break; + default: + return -1; + } + + if (adapter->vfinfo[vf].mc_promisc == enable) + return 0; + + /* Don't enable MC promisc unless VF is trusted */ + if (enable && !adapter->vfinfo[vf].trusted) + return -1; + + hw = &adapter->hw; + vmolr = IXGBE_READ_REG(hw, IXGBE_VMOLR(vf)); + + if (enable) + vmolr |= IXGBE_VMOLR_MPE; + else + vmolr &= ~IXGBE_VMOLR_MPE; + + IXGBE_WRITE_REG(hw, IXGBE_VMOLR(vf), vmolr); + + adapter->vfinfo[vf].mc_promisc = enable; + + return 0; +} + static int ixgbe_rcv_msg_from_vf(struct ixgbe_adapter *adapter, u32 vf) { u32 mbx_size = IXGBE_VFMAILBOX_SIZE; @@ -1066,6 +1118,9 @@ static int ixgbe_rcv_msg_from_vf(struct ixgbe_adapter *adapter, u32 vf) case IXGBE_VF_GET_RSS_KEY: retval = ixgbe_get_vf_rss_key(adapter, msgbuf, vf); break; + case IXGBE_VF_SET_MC_PROMISC: + retval = ixgbe_set_vf_mc_promisc(adapter, msgbuf, vf); + break; default: e_err(drv, "Unhandled Msg %8.8x\n", msgbuf[0]); retval = IXGBE_ERR_MBX; diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c index 88298a3..24b15b1 100644 --- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c +++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c @@ -2217,6 +2217,9 @@ void ixgbevf_down(struct ixgbevf_adapter *adapter) IXGBE_TXDCTL_SWFLSH); } + /* drop multicast promiscuous mode flag */ + adapter->hw.mac.mc_promisc = false; + if (!pci_channel_offline(adapter->pdev)) ixgbevf_reset(adapter); diff --git a/drivers/net/ethernet/intel/ixgbevf/mbx.h b/drivers/net/ethernet/intel/ixgbevf/mbx.h index 82f44e0..ca6f8e9 100644 --- a/drivers/net/ethernet/intel/ixgbevf/mbx.h +++ b/drivers/net/ethernet/intel/ixgbevf/mbx.h @@ -112,6 +112,8 @@ enum ixgbe_pfvf_api_rev { #define IXGBE_VF_GET_RETA 0x0a /* VF request for RETA */ #define IXGBE_VF_GET_RSS_KEY 0x0b /* get RSS hash key */ +#define IXGBE_VF_SET_MC_PROMISC 0x0c /* VF requests MC promiscuous */ + /* length of permanent address message returned from PF */ #define IXGBE_VF_PERMADDR_MSG_LEN 4 /* word in permanent address message with the current multicast type */ diff --git a/drivers/net/ethernet/intel/ixgbevf/vf.c b/drivers/net/ethernet/intel/ixgbevf/vf.c index d1339b0..d98aa8c 100644 --- a/drivers/net/ethernet/intel/ixgbevf/vf.c +++ b/drivers/net/ethernet/intel/ixgbevf/vf.c @@ -120,6 +120,9 @@ static s32 ixgbevf_reset_hw_vf(struct ixgbe_hw *hw) ether_addr_copy(hw->mac.perm_addr, addr); hw->mac.mc_filter_type = msgbuf[IXGBE_VF_MC_TYPE_WORD]; + /* after reset, MC promiscuous mode is disabled */ + hw->mac.mc_promisc = false; + return 0; } @@ -423,6 +426,34 @@ static void ixgbevf_write_msg_read_ack(struct ixgbe_hw *hw, mbx->ops.read_posted(hw, retmsg, size); } +static s32 ixgbevf_request_mc_promisc_vf(struct ixgbe_hw *hw) +{ + u32 msgbuf[IXGBE_VFMAILBOX_SIZE]; + int err; + + memset(msgbuf, 0, sizeof(msgbuf)); + + /* enabling multicast promiscuous */ + msgbuf[0] = IXGBE_VF_SET_MC_PROMISC; + msgbuf[1] = 1; + + err = hw->mbx.ops.write_posted(hw, msgbuf, 2); + if (err) + return err; + err = hw->mbx.ops.read_posted(hw, msgbuf, 2); + if (err) + return err; + + msgbuf[0] &= ~IXGBE_VT_MSGTYPE_CTS; + + if (msgbuf[0] == (IXGBE_VF_SET_MC_PROMISC | IXGBE_VT_MSGTYPE_NACK)) + return -EPERM; + + hw->mac.mc_promisc = true; + + return 0; +} + /** * ixgbevf_update_mc_addr_list_vf - Update Multicast addresses * @hw: pointer to the HW structure @@ -448,8 +479,22 @@ static s32 ixgbevf_update_mc_addr_list_vf(struct ixgbe_hw *hw, */ cnt = netdev_mc_count(netdev); - if (cnt > 30) + if (cnt > 30) { + /* If the API has the capability to handle MC promiscuous + * mode, turn it on. + */ + switch (hw->api_version) { + case ixgbe_mbox_api_12: + if (hw->mac.mc_promisc || + !ixgbevf_request_mc_promisc_vf(hw)) { + return 0; + } + break; + default: + break; + } cnt = 30; + } msgbuf[0] = IXGBE_VF_SET_MULTICAST; msgbuf[0] |= cnt << IXGBE_VT_MSGINFO_SHIFT; @@ -465,6 +510,8 @@ static s32 ixgbevf_update_mc_addr_list_vf(struct ixgbe_hw *hw, ixgbevf_write_msg_read_ack(hw, msgbuf, IXGBE_VFMAILBOX_SIZE); + hw->mac.mc_promisc = false; + return 0; } diff --git a/drivers/net/ethernet/intel/ixgbevf/vf.h b/drivers/net/ethernet/intel/ixgbevf/vf.h index d40f036..f910b78 100644 --- a/drivers/net/ethernet/intel/ixgbevf/vf.h +++ b/drivers/net/ethernet/intel/ixgbevf/vf.h @@ -86,6 +86,7 @@ struct ixgbe_mac_info { enum ixgbe_mac_type type; s32 mc_filter_type; + bool mc_promisc; bool get_link_status; u32 max_tx_queues;