Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/583779/?format=api
{ "id": 583779, "url": "http://patchwork.ozlabs.org/api/patches/583779/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1455668365-30782-1-git-send-email-jacob.e.keller@intel.com/", "project": { "id": 46, "url": "http://patchwork.ozlabs.org/api/projects/46/?format=api", "name": "Intel Wired Ethernet development", "link_name": "intel-wired-lan", "list_id": "intel-wired-lan.osuosl.org", "list_email": "intel-wired-lan@osuosl.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<1455668365-30782-1-git-send-email-jacob.e.keller@intel.com>", "list_archive_url": null, "date": "2016-02-17T00:19:24", "name": "[1/2] fm10k: use ethtool_rxfh_indir_default for default redirection table", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "b5eec8a368a310491a090d10fcbe5540f0e7d3c5", "submitter": { "id": 9784, "url": "http://patchwork.ozlabs.org/api/people/9784/?format=api", "name": "Jacob Keller", "email": "jacob.e.keller@intel.com" }, "delegate": { "id": 68, "url": "http://patchwork.ozlabs.org/api/users/68/?format=api", "username": "jtkirshe", "first_name": "Jeff", "last_name": "Kirsher", "email": "jeffrey.t.kirsher@intel.com" }, "mbox": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1455668365-30782-1-git-send-email-jacob.e.keller@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/583779/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/583779/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<intel-wired-lan-bounces@lists.osuosl.org>", "X-Original-To": [ "incoming@patchwork.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Delivered-To": [ "patchwork-incoming@bilbo.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Received": [ "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ozlabs.org (Postfix) with ESMTP id 6FA741401E7\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 17 Feb 2016 11:19:35 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id B75E592264;\n\tWed, 17 Feb 2016 00:19:34 +0000 (UTC)", "from whitealder.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id f5D2iyKIcQQR; Wed, 17 Feb 2016 00:19:30 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id ECEC89226D;\n\tWed, 17 Feb 2016 00:19:29 +0000 (UTC)", "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\tby ash.osuosl.org (Postfix) with ESMTP id 212001C171F\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 17 Feb 2016 00:19:28 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 1B8A1953B0\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 17 Feb 2016 00:19:28 +0000 (UTC)", "from hemlock.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id Dk0+tPZP3wO0 for <intel-wired-lan@lists.osuosl.org>;\n\tWed, 17 Feb 2016 00:19:27 +0000 (UTC)", "from mga11.intel.com (mga11.intel.com [192.55.52.93])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 72D48930C1\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 17 Feb 2016 00:19:27 +0000 (UTC)", "from orsmga002.jf.intel.com ([10.7.209.21])\n\tby fmsmga102.fm.intel.com with ESMTP; 16 Feb 2016 16:19:27 -0800", "from jekeller-desk.amr.corp.intel.com (HELO\n\tjekeller-desk.jekeller.internal) ([134.134.3.65])\n\tby orsmga002.jf.intel.com with ESMTP; 16 Feb 2016 16:19:27 -0800" ], "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "domain auto-whitelisted by SQLgrey-1.7.6", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.22,457,1449561600\"; d=\"scan'208\";a=\"913758296\"", "From": "Jacob Keller <jacob.e.keller@intel.com>", "To": "Intel Wired LAN <intel-wired-lan@lists.osuosl.org>", "Date": "Tue, 16 Feb 2016 16:19:24 -0800", "Message-Id": "<1455668365-30782-1-git-send-email-jacob.e.keller@intel.com>", "X-Mailer": "git-send-email 2.7.0.236.gda096a0.dirty", "Subject": "[Intel-wired-lan] [PATCH 1/2] fm10k: use ethtool_rxfh_indir_default\n\tfor default redirection table", "X-BeenThere": "intel-wired-lan@lists.osuosl.org", "X-Mailman-Version": "2.1.18-1", "Precedence": "list", "List-Id": "Intel Wired Ethernet Linux Kernel Driver Development\n\t<intel-wired-lan.lists.osuosl.org>", "List-Unsubscribe": "<http://lists.osuosl.org/mailman/options/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@lists.osuosl.org?subject=unsubscribe>", "List-Archive": "<http://lists.osuosl.org/pipermail/intel-wired-lan/>", "List-Post": "<mailto:intel-wired-lan@lists.osuosl.org>", "List-Help": "<mailto:intel-wired-lan-request@lists.osuosl.org?subject=help>", "List-Subscribe": "<http://lists.osuosl.org/mailman/listinfo/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@lists.osuosl.org?subject=subscribe>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "intel-wired-lan-bounces@lists.osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@lists.osuosl.org>" }, "content": "The fm10k driver used its own code for generating a default indirection\ntable on device load, which was not the same as the default generated by\nethtool when indir_size of 0 is passed to SRXFH. Take advantage of\nethtool_rxfh_indir_default() and simplify code to write the redirection\ntable to reduce some code duplication.\n\nSigned-off-by: Jacob Keller <jacob.e.keller@intel.com>\n---\nI have in fact verified this compiles and runs correctly, now.\n\n drivers/net/ethernet/intel/fm10k/fm10k.h | 2 ++\n drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c | 37 ++++++++++++++----------\n drivers/net/ethernet/intel/fm10k/fm10k_main.c | 24 +++++++--------\n 3 files changed, 34 insertions(+), 29 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/fm10k/fm10k.h b/drivers/net/ethernet/intel/fm10k/fm10k.h\nindex 83f386714e87..9c7fafef7cf6 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k.h\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k.h\n@@ -510,6 +510,8 @@ int fm10k_close(struct net_device *netdev);\n \n /* Ethtool */\n void fm10k_set_ethtool_ops(struct net_device *dev);\n+u32 fm10k_get_reta_size(struct net_device *netdev);\n+void fm10k_write_reta(struct fm10k_intfc *interface, const u32 *indir);\n \n /* IOV */\n s32 fm10k_iov_event(struct fm10k_intfc *interface);\ndiff --git a/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c b/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c\nindex 185fcbd8df1a..a1342be34be4 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c\n@@ -1095,11 +1095,31 @@ static int fm10k_set_priv_flags(struct net_device *netdev, u32 priv_flags)\n \treturn 0;\n }\n \n-static u32 fm10k_get_reta_size(struct net_device __always_unused *netdev)\n+u32 fm10k_get_reta_size(struct net_device __always_unused *netdev)\n {\n \treturn FM10K_RETA_SIZE * FM10K_RETA_ENTRIES_PER_REG;\n }\n \n+void fm10k_write_reta(struct fm10k_intfc *interface, const u32 *indir)\n+{\n+\tstruct fm10k_hw *hw = &interface->hw;\n+\tint i;\n+\n+\t/* record entries to reta table */\n+\tfor (i = 0; i < FM10K_RETA_SIZE; i++, indir += 4) {\n+\t\tu32 reta = indir[0] |\n+\t\t\t (indir[1] << 8) |\n+\t\t\t (indir[2] << 16) |\n+\t\t\t (indir[3] << 24);\n+\n+\t\tif (interface->reta[i] == reta)\n+\t\t\tcontinue;\n+\n+\t\tinterface->reta[i] = reta;\n+\t\tfm10k_write_reg(hw, FM10K_RETA(0, i), reta);\n+\t}\n+}\n+\n static int fm10k_get_reta(struct net_device *netdev, u32 *indir)\n {\n \tstruct fm10k_intfc *interface = netdev_priv(netdev);\n@@ -1123,7 +1143,6 @@ static int fm10k_get_reta(struct net_device *netdev, u32 *indir)\n static int fm10k_set_reta(struct net_device *netdev, const u32 *indir)\n {\n \tstruct fm10k_intfc *interface = netdev_priv(netdev);\n-\tstruct fm10k_hw *hw = &interface->hw;\n \tint i;\n \tu16 rss_i;\n \n@@ -1138,19 +1157,7 @@ static int fm10k_set_reta(struct net_device *netdev, const u32 *indir)\n \t\treturn -EINVAL;\n \t}\n \n-\t/* record entries to reta table */\n-\tfor (i = 0; i < FM10K_RETA_SIZE; i++, indir += 4) {\n-\t\tu32 reta = indir[0] |\n-\t\t\t (indir[1] << 8) |\n-\t\t\t (indir[2] << 16) |\n-\t\t\t (indir[3] << 24);\n-\n-\t\tif (interface->reta[i] == reta)\n-\t\t\tcontinue;\n-\n-\t\tinterface->reta[i] = reta;\n-\t\tfm10k_write_reg(hw, FM10K_RETA(0, i), reta);\n-\t}\n+\tfm10k_write_reta(interface, indir);\n \n \treturn 0;\n }\ndiff --git a/drivers/net/ethernet/intel/fm10k/fm10k_main.c b/drivers/net/ethernet/intel/fm10k/fm10k_main.c\nindex d3ff17da3c2a..43f3674501cc 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_main.c\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_main.c\n@@ -1943,7 +1943,8 @@ static void fm10k_assign_rings(struct fm10k_intfc *interface)\n static void fm10k_init_reta(struct fm10k_intfc *interface)\n {\n \tu16 i, rss_i = interface->ring_feature[RING_F_RSS].indices;\n-\tu32 reta, base;\n+\tstruct net_device *netdev = interface->netdev;\n+\tu32 reta, *indir;\n \n \t/* If the Rx flow indirection table has been configured manually, we\n \t * need to maintain it when possible.\n@@ -1968,21 +1969,16 @@ static void fm10k_init_reta(struct fm10k_intfc *interface)\n \t}\n \n repopulate_reta:\n-\t/* Populate the redirection table 4 entries at a time. To do this\n-\t * we are generating the results for n and n+2 and then interleaving\n-\t * those with the results with n+1 and n+3.\n-\t */\n-\tfor (i = FM10K_RETA_SIZE; i--;) {\n-\t\t/* first pass generates n and n+2 */\n-\t\tbase = ((i * 0x00040004) + 0x00020000) * rss_i;\n-\t\treta = (base & 0x3F803F80) >> 7;\n+\tindir = kcalloc(fm10k_get_reta_size(netdev),\n+\t\t\tsizeof(indir[0]), GFP_KERNEL);\n \n-\t\t/* second pass generates n+1 and n+3 */\n-\t\tbase += 0x00010001 * rss_i;\n-\t\treta |= (base & 0x3F803F80) << 1;\n+\t/* generate redirection table using the default kernel policy */\n+\tfor (i = 0; i < fm10k_get_reta_size(netdev); i++)\n+\t\tindir[i] = ethtool_rxfh_indir_default(i, rss_i);\n \n-\t\tinterface->reta[i] = reta;\n-\t}\n+\tfm10k_write_reta(interface, indir);\n+\n+\tkfree(indir);\n }\n \n /**\n", "prefixes": [ "1/2" ] }