From patchwork Sun Mar 29 16:11:37 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vlad Zolotarov X-Patchwork-Id: 455811 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 0758814010F for ; Mon, 30 Mar 2015 03:12:04 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752636AbbC2QL5 (ORCPT ); Sun, 29 Mar 2015 12:11:57 -0400 Received: from mail-wi0-f180.google.com ([209.85.212.180]:38096 "EHLO mail-wi0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752572AbbC2QLy (ORCPT ); Sun, 29 Mar 2015 12:11:54 -0400 Received: by wibgn9 with SMTP id gn9so94288653wib.1 for ; Sun, 29 Mar 2015 09:11:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=HKpU0gwI/2MBuiEciUsqxl12nAg9nWkAKIq9gWjCsE8=; b=eWdTTdHvZbWVznZlDor0OFsB9KmPQVAUhbNOpjAwx5UrV2Jf37ytzYSqwpXU5WHSF3 FjodI2kRRyz+QVP3G/CfyWC/Ryw4/MHGrlMygNaYtL5MlbuirbbZv/XSyl9GN/nP/2c5 1bcSlhlB6ZfXm0S8JnDoGgiS6TixI1XYbAzvKfuhwZ3Leu5Ek4Fl6TkRLTWOLR+yKXuc P3+iAibI2faZEcOzjxl0dgmYnjMKZeE7KTn9Q7rXpkPOt553sih4S4ThP+Zq66gzRf9c TlZmlXIpekE0Hmm817c8KUi41FTLwKqxQEQpT3e/vGmOvxad7Ch1GY3hfId5n9cy4ye6 EHWg== X-Gm-Message-State: ALoCoQkSKP8qaGNsMXzhUi6kQgV7AjGselxWxG/PEu8eUgyFWf4aTiW2+i8pJnfgqOvBSrsTE8Np X-Received: by 10.180.107.198 with SMTP id he6mr14732628wib.68.1427645513274; Sun, 29 Mar 2015 09:11:53 -0700 (PDT) Received: from vladz-laptop.cloudius-systems.com. ([212.143.139.214]) by mx.google.com with ESMTPSA id hq4sm6558496wib.0.2015.03.29.09.11.51 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 29 Mar 2015 09:11:52 -0700 (PDT) From: Vlad Zolotarov To: netdev@vger.kernel.org Cc: jeffrey.t.kirsher@intel.com, avi@cloudius-systems.com, gleb@cloudius-systems.com, Vlad Zolotarov Subject: [PATCH net-next v9 7/7] ixgbevf: Add the appropriate ethtool ops to query RSS indirection table and key Date: Sun, 29 Mar 2015 19:11:37 +0300 Message-Id: <1427645497-8339-8-git-send-email-vladz@cloudius-systems.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1427645497-8339-1-git-send-email-vladz@cloudius-systems.com> References: <1427645497-8339-1-git-send-email-vladz@cloudius-systems.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Added get_rxfh_indir_size, get_rxfh_key_size and get_rxfh ethtool_ops callbacks implementations. This enables the ethtool's "-x" and "--show-rxfh[-indir]" options for VF devices. This patch adds the support for 82599 and x540 devices only. Support for other devices will be added later. Signed-off-by: Vlad Zolotarov --- New in v9: - Use IXGBEVF_RSS_HASH_KEY_SIZE macro. New in v6: - Added a required get_rxnfc callback to ixgbevf_ethtool_ops. New in v4: - Removed not needed braces in if-statement in ixgbevf_get_rxfh_indir_size(). New in v3: - Added a proper support for x550 devices: return the correct redirection table size. New in v2: - Added a detailed description to the patch. --- drivers/net/ethernet/intel/ixgbevf/ethtool.c | 58 ++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/drivers/net/ethernet/intel/ixgbevf/ethtool.c b/drivers/net/ethernet/intel/ixgbevf/ethtool.c index e83c85b..4d2f59f 100644 --- a/drivers/net/ethernet/intel/ixgbevf/ethtool.c +++ b/drivers/net/ethernet/intel/ixgbevf/ethtool.c @@ -794,6 +794,60 @@ static int ixgbevf_set_coalesce(struct net_device *netdev, return 0; } +static int ixgbevf_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *info, + u32 *rules __always_unused) +{ + struct ixgbevf_adapter *adapter = netdev_priv(dev); + + switch (info->cmd) { + case ETHTOOL_GRXRINGS: + info->data = adapter->num_rx_queues; + return 0; + default: + hw_dbg(&adapter->hw, "Command parameters not supported\n"); + return -EOPNOTSUPP; + } +} + +static u32 ixgbevf_get_rxfh_indir_size(struct net_device *netdev) +{ + struct ixgbevf_adapter *adapter = netdev_priv(netdev); + + if (adapter->hw.mac.type >= ixgbe_mac_X550_vf) + return 64; + else + return 128; +} + +static u32 ixgbevf_get_rxfh_key_size(struct net_device *netdev) +{ + return IXGBEVF_RSS_HASH_KEY_SIZE; +} + +static int ixgbevf_get_rxfh(struct net_device *netdev, u32 *indir, u8 *key, + u8 *hfunc) +{ + struct ixgbevf_adapter *adapter = netdev_priv(netdev); + int err; + + if (hfunc) + *hfunc = ETH_RSS_HASH_TOP; + + if (indir) { + err = ixgbevf_get_reta(adapter, indir); + if (err) + return err; + } + + if (key) { + err = ixgbevf_get_rss_key(adapter, key); + if (err) + return err; + } + + return 0; +} + static const struct ethtool_ops ixgbevf_ethtool_ops = { .get_settings = ixgbevf_get_settings, .get_drvinfo = ixgbevf_get_drvinfo, @@ -811,6 +865,10 @@ static const struct ethtool_ops ixgbevf_ethtool_ops = { .get_ethtool_stats = ixgbevf_get_ethtool_stats, .get_coalesce = ixgbevf_get_coalesce, .set_coalesce = ixgbevf_set_coalesce, + .get_rxnfc = ixgbevf_get_rxnfc, + .get_rxfh_indir_size = ixgbevf_get_rxfh_indir_size, + .get_rxfh_key_size = ixgbevf_get_rxfh_key_size, + .get_rxfh = ixgbevf_get_rxfh, }; void ixgbevf_set_ethtool_ops(struct net_device *netdev)