From patchwork Mon Jan 5 14:46:42 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vlad Zolotarov X-Patchwork-Id: 425346 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 4EDA2140081 for ; Tue, 6 Jan 2015 01:47:09 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754039AbbAEOrD (ORCPT ); Mon, 5 Jan 2015 09:47:03 -0500 Received: from mail-wi0-f174.google.com ([209.85.212.174]:58219 "EHLO mail-wi0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754010AbbAEOrA (ORCPT ); Mon, 5 Jan 2015 09:47:00 -0500 Received: by mail-wi0-f174.google.com with SMTP id h11so3427889wiw.13 for ; Mon, 05 Jan 2015 06:46:59 -0800 (PST) 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=zNf8ZALA7q3gz5ndEpfmD/ykZaztvhzBvWwaxtwXo28=; b=fXWbaGoo2aLa+6vhmuyAl5RJtiHFUPR8mtpD99NWA8uguYqLGSezIjiFRLY0uVUiuY OYzbUw1cURxEGpnSugxCLMDj76RdP13X2kL8E0I4cjxr5Sr7QgGFK4lL6CPPMj/+BcIa 1dfUyuQLDrGQ84KOnY+PnmumeAVxAVUj0pg0DIhTHRQtBiVIpOpaNeu+CCnT7qaPGgw1 gWKcF/UFGHHkmevASuuL/FI1MuiT0Sk7Bxz16HzTGnG6mwIQdFXlWIgDnTGtj0T/iOrX Kx83Z3m1KvOtCCwho5T+zSEdVBT0gUm4aMzkhN+f+It5vpceeHOs9LwsoAzCLqjO3565 gELQ== X-Gm-Message-State: ALoCoQmOxR3L3RUHQg5V5qvg6a5fD/3i2uD83MUU/fKm3l2bCUc/HnB1Y/EpauLjYsowRCBgFGFZ X-Received: by 10.194.201.137 with SMTP id ka9mr184409859wjc.66.1420469219221; Mon, 05 Jan 2015 06:46:59 -0800 (PST) Received: from vladz-laptop.cloudius-systems.com. (system.cloudius-systems.com. [84.94.198.183]) by mx.google.com with ESMTPSA id hn2sm75697066wjc.5.2015.01.05.06.46.56 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Jan 2015 06:46:58 -0800 (PST) From: Vlad Zolotarov To: netdev@vger.kernel.org Cc: gleb@cloudius-systems.com, avi@cloudius-systems.com, jeffrey.t.kirsher@intel.com, Vlad Zolotarov Subject: [PATCH net-next v4 5/5] ixgbevf: Add the appropriate ethtool ops to query RSS indirection table and key Date: Mon, 5 Jan 2015 16:46:42 +0200 Message-Id: <1420469202-1847-6-git-send-email-vladz@cloudius-systems.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1420469202-1847-1-git-send-email-vladz@cloudius-systems.com> References: <1420469202-1847-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 "-n rx-flow-hash" options for 82599 VF devices. Signed-off-by: Vlad Zolotarov --- 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 | 42 ++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/drivers/net/ethernet/intel/ixgbevf/ethtool.c b/drivers/net/ethernet/intel/ixgbevf/ethtool.c index cc0e5b7..ddf2d82 100644 --- a/drivers/net/ethernet/intel/ixgbevf/ethtool.c +++ b/drivers/net/ethernet/intel/ixgbevf/ethtool.c @@ -792,6 +792,45 @@ static int ixgbevf_set_coalesce(struct net_device *netdev, return 0; } +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 40; +} + +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->hw, indir); + if (err) + return err; + } + + if (key) { + err = ixgbevf_get_rss_key(&adapter->hw, 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, @@ -809,6 +848,9 @@ 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_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)