Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/499533/?format=api
{ "id": 499533, "url": "http://patchwork.ozlabs.org/api/patches/499533/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1437684884-222825-12-git-send-email-catherine.sullivan@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": "<1437684884-222825-12-git-send-email-catherine.sullivan@intel.com>", "list_archive_url": null, "date": "2015-07-23T20:54:40", "name": "[next,S9,11/15] i40e: Strip VEB stats if they are disabled in HW", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "f7302b2faa9b1cbcefaa4e158a1f76a7eab04d72", "submitter": { "id": 13931, "url": "http://patchwork.ozlabs.org/api/people/13931/?format=api", "name": "Catherine Sullivan", "email": "catherine.sullivan@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/1437684884-222825-12-git-send-email-catherine.sullivan@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/499533/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/499533/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 fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\tby ozlabs.org (Postfix) with ESMTP id 242EF140D19\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri, 24 Jul 2015 06:53:56 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 56ED1A43A0;\n\tThu, 23 Jul 2015 20:53:55 +0000 (UTC)", "from fraxinus.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id KlogwtIT4MtW; Thu, 23 Jul 2015 20:53:54 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id DCC1BA438E;\n\tThu, 23 Jul 2015 20:53:54 +0000 (UTC)", "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id 15C2C1BFA6C\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 23 Jul 2015 20:53:54 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 1161291FF8\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 23 Jul 2015 20:53:54 +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 bFVqUE87MIzP for <intel-wired-lan@lists.osuosl.org>;\n\tThu, 23 Jul 2015 20:53:53 +0000 (UTC)", "from mga11.intel.com (mga11.intel.com [192.55.52.93])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 8906B91FF1\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 23 Jul 2015 20:53:53 +0000 (UTC)", "from fmsmga001.fm.intel.com ([10.253.24.23])\n\tby fmsmga102.fm.intel.com with ESMTP; 23 Jul 2015 13:53:53 -0700", "from catheri1-tigger.jf.intel.com ([134.134.176.92])\n\tby fmsmga001.fm.intel.com with ESMTP; 23 Jul 2015 13:53:53 -0700" ], "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.15,533,1432623600\"; d=\"scan'208\";a=\"753353409\"", "From": "Catherine Sullivan <catherine.sullivan@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Thu, 23 Jul 2015 16:54:40 -0400", "Message-Id": "<1437684884-222825-12-git-send-email-catherine.sullivan@intel.com>", "X-Mailer": "git-send-email 1.9.3", "In-Reply-To": "<1437684884-222825-1-git-send-email-catherine.sullivan@intel.com>", "References": "<1437684884-222825-1-git-send-email-catherine.sullivan@intel.com>", "Cc": "Anjali Singhai Jain <anjali.singhai@intel.com>", "Subject": "[Intel-wired-lan] [next PATCH S9 11/15] i40e: Strip VEB stats if\n\tthey are disabled in HW", "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": "From: Anjali Singhai Jain <anjali.singhai@intel.com>\n\nDue to performance reasons, VEB stats have been disabled in the hw. This\npatch adds code to check for that condition before accumulating these\nstats.\n\nSigned-off-by: Anjali Singhai Jain <anjali.singhai@intel.com>\nChange-ID: I7d805669476fedabb073790403703798ae5d878e\n---\n drivers/net/ethernet/intel/i40e/i40e.h | 1 +\n drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 9 ++++++---\n drivers/net/ethernet/intel/i40e/i40e_main.c | 13 +++++++++----\n 3 files changed, 16 insertions(+), 7 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h\nindex d821c99..5a25c2c 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e.h\n@@ -326,6 +326,7 @@ struct i40e_pf {\n #define I40E_FLAG_OUTER_UDP_CSUM_CAPABLE\tBIT_ULL(33)\n #define I40E_FLAG_128_QP_RSS_CAPABLE\t\tBIT_ULL(34)\n #define I40E_FLAG_WB_ON_ITR_CAPABLE\t\tBIT_ULL(35)\n+#define I40E_FLAG_VEB_STATS_ENABLED\t\tBIT_ULL(37)\n #define I40E_FLAG_MULTIPLE_TCP_UDP_RSS_PCTYPE\tBIT_ULL(38)\n #define I40E_FLAG_VEB_MODE_ENABLED\t\tBIT_ULL(40)\n \ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\nindex dd2b620..1345de2 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\n@@ -1264,7 +1264,8 @@ static int i40e_get_sset_count(struct net_device *netdev, int sset)\n \t\tif (vsi == pf->vsi[pf->lan_vsi] && pf->hw.partition_id == 1) {\n \t\t\tint len = I40E_PF_STATS_LEN(netdev);\n \n-\t\t\tif (pf->lan_veb != I40E_NO_VEB)\n+\t\t\tif ((pf->lan_veb != I40E_NO_VEB) &&\n+\t\t\t (pf->flags & I40E_FLAG_VEB_STATS_ENABLED))\n \t\t\t\tlen += I40E_VEB_STATS_TOTAL;\n \t\t\treturn len;\n \t\t} else {\n@@ -1337,7 +1338,8 @@ static void i40e_get_ethtool_stats(struct net_device *netdev,\n \tif (vsi != pf->vsi[pf->lan_vsi] || pf->hw.partition_id != 1)\n \t\treturn;\n \n-\tif (pf->lan_veb != I40E_NO_VEB) {\n+\tif ((pf->lan_veb != I40E_NO_VEB) &&\n+\t (pf->flags & I40E_FLAG_VEB_STATS_ENABLED)) {\n \t\tstruct i40e_veb *veb = pf->veb[pf->lan_veb];\n \t\tfor (j = 0; j < I40E_VEB_STATS_LEN; j++) {\n \t\t\tp = (char *)veb;\n@@ -1410,7 +1412,8 @@ static void i40e_get_strings(struct net_device *netdev, u32 stringset,\n \t\tif (vsi != pf->vsi[pf->lan_vsi] || pf->hw.partition_id != 1)\n \t\t\treturn;\n \n-\t\tif (pf->lan_veb != I40E_NO_VEB) {\n+\t\tif ((pf->lan_veb != I40E_NO_VEB) &&\n+\t\t (pf->flags & I40E_FLAG_VEB_STATS_ENABLED)) {\n \t\t\tfor (i = 0; i < I40E_VEB_STATS_LEN; i++) {\n \t\t\t\tsnprintf(p, ETH_GSTRING_LEN, \"veb.%s\",\n \t\t\t\t\ti40e_gstrings_veb_stats[i].stat_string);\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c\nindex 4f0660f..464fba3 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_main.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c\n@@ -5761,10 +5761,12 @@ static void i40e_watchdog_subtask(struct i40e_pf *pf)\n \t\tif (pf->vsi[i] && pf->vsi[i]->netdev)\n \t\t\ti40e_update_stats(pf->vsi[i]);\n \n-\t/* Update the stats for the active switching components */\n-\tfor (i = 0; i < I40E_MAX_VEB; i++)\n-\t\tif (pf->veb[i])\n-\t\t\ti40e_update_veb_stats(pf->veb[i]);\n+\tif (pf->flags & I40E_FLAG_VEB_STATS_ENABLED) {\n+\t\t/* Update the stats for the active switching components */\n+\t\tfor (i = 0; i < I40E_MAX_VEB; i++)\n+\t\t\tif (pf->veb[i])\n+\t\t\t\ti40e_update_veb_stats(pf->veb[i]);\n+\t}\n \n \ti40e_ptp_rx_hang(pf->vsi[pf->lan_vsi]);\n }\n@@ -7851,6 +7853,9 @@ static int i40e_sw_init(struct i40e_pf *pf)\n \tpf->lan_veb = I40E_NO_VEB;\n \tpf->lan_vsi = I40E_NO_VSI;\n \n+\t/* By default FW has this off for performance reasons */\n+\tpf->flags &= ~I40E_FLAG_VEB_STATS_ENABLED;\n+\n \t/* set up queue assignment tracking */\n \tsize = sizeof(struct i40e_lump_tracking)\n \t\t+ (sizeof(u16) * pf->hw.func_caps.num_tx_qp);\n", "prefixes": [ "next", "S9", "11/15" ] }