Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/461886/?format=api
{ "id": 461886, "url": "http://patchwork.ozlabs.org/api/patches/461886/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1429229172-143692-5-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": "<1429229172-143692-5-git-send-email-catherine.sullivan@intel.com>", "list_archive_url": null, "date": "2015-04-17T00:06:01", "name": "[net-next,S4,04/15] i40e/i40evf: Add stats to count Tunnel ATR hits", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "6d1d3d67ae78c27c1d13f83b44627f0dad5ba460", "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/1429229172-143692-5-git-send-email-catherine.sullivan@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/461886/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/461886/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 (fraxinus.osuosl.org [140.211.166.137])\n\tby ozlabs.org (Postfix) with ESMTP id A93A31402B0\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri, 17 Apr 2015 10:03:16 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 0834289E8A;\n\tFri, 17 Apr 2015 00:03:16 +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 Nnmxt84S4dRw; Fri, 17 Apr 2015 00:03:15 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 8F40E89E6E;\n\tFri, 17 Apr 2015 00:03:15 +0000 (UTC)", "from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137])\n\tby ash.osuosl.org (Postfix) with ESMTP id D56CE1C223A\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 17 Apr 2015 00:03:13 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id D257989E88\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 17 Apr 2015 00:03:13 +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 ZTxiR9jCIe_i for <intel-wired-lan@lists.osuosl.org>;\n\tFri, 17 Apr 2015 00:03:13 +0000 (UTC)", "from mga09.intel.com (mga09.intel.com [134.134.136.24])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 62A1E89E8A\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 17 Apr 2015 00:03:13 +0000 (UTC)", "from fmsmga003.fm.intel.com ([10.253.24.29])\n\tby orsmga102.jf.intel.com with ESMTP; 16 Apr 2015 17:03:13 -0700", "from catheri1-tigger.jf.intel.com ([134.134.176.92])\n\tby FMSMGA003.fm.intel.com with ESMTP; 16 Apr 2015 17:03:11 -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.11,591,1422950400\"; d=\"scan'208\";a=\"481989631\"", "From": "Catherine Sullivan <catherine.sullivan@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Thu, 16 Apr 2015 20:06:01 -0400", "Message-Id": "<1429229172-143692-5-git-send-email-catherine.sullivan@intel.com>", "X-Mailer": "git-send-email 1.9.3", "In-Reply-To": "<1429229172-143692-1-git-send-email-catherine.sullivan@intel.com>", "References": "<1429229172-143692-1-git-send-email-catherine.sullivan@intel.com>", "Cc": "Anjali Singhai Jain <anjali.singhai@intel.com>", "Subject": "[Intel-wired-lan] [net-next S4 04/15] i40e/i40evf: Add stats to\n\tcount Tunnel ATR hits", "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\nAdd a 3rd dynamic filter counter to track Tunneled ATR hits separately.\nEthtool port stat \"fdir_atr_tunnel_match\"\n\nSigned-off-by: Anjali Singhai Jain <anjali.singhai@intel.com>\nChange-ID: Idd978b6db2a462b5722397cd2ffd04ef055f8655\n---\n drivers/net/ethernet/intel/i40e/i40e.h | 3 +++\n drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 1 +\n drivers/net/ethernet/intel/i40e/i40e_main.c | 4 ++++\n drivers/net/ethernet/intel/i40e/i40e_txrx.c | 13 ++++++++++---\n drivers/net/ethernet/intel/i40e/i40e_type.h | 1 +\n drivers/net/ethernet/intel/i40evf/i40e_type.h | 1 +\n 6 files changed, 20 insertions(+), 3 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h\nindex 33c35d3..0bfa5a0 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e.h\n@@ -182,6 +182,7 @@ struct i40e_lump_tracking {\n enum i40e_fd_stat_idx {\n \tI40E_FD_STAT_ATR,\n \tI40E_FD_STAT_SB,\n+\tI40E_FD_STAT_ATR_TUNNEL,\n \tI40E_FD_STAT_PF_COUNT\n };\n #define I40E_FD_STAT_PF_IDX(pf_id) ((pf_id) * I40E_FD_STAT_PF_COUNT)\n@@ -189,6 +190,8 @@ enum i40e_fd_stat_idx {\n \t\t\t(I40E_FD_STAT_PF_IDX(pf_id) + I40E_FD_STAT_ATR)\n #define I40E_FD_SB_STAT_IDX(pf_id) \\\n \t\t\t(I40E_FD_STAT_PF_IDX(pf_id) + I40E_FD_STAT_SB)\n+#define I40E_FD_ATR_TUNNEL_STAT_IDX(pf_id) \\\n+\t\t\t(I40E_FD_STAT_PF_IDX(pf_id) + I40E_FD_STAT_ATR_TUNNEL)\n \n struct i40e_fdir_filter {\n \tstruct hlist_node fdir_node;\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\nindex e77b6bd..c568c90 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\n@@ -147,6 +147,7 @@ static struct i40e_stats i40e_gstrings_stats[] = {\n \tI40E_PF_STAT(\"rx_hwtstamp_cleared\", rx_hwtstamp_cleared),\n \tI40E_PF_STAT(\"fdir_flush_cnt\", fd_flush_cnt),\n \tI40E_PF_STAT(\"fdir_atr_match\", stats.fd_atr_match),\n+\tI40E_PF_STAT(\"fdir_atr_tunnel_match\", stats.fd_atr_tunnel_match),\n \tI40E_PF_STAT(\"fdir_sb_match\", stats.fd_sb_match),\n \n \t/* LPI stats */\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c\nindex c48c8d6..35a571d 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_main.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c\n@@ -1102,6 +1102,10 @@ static void i40e_update_pf_stats(struct i40e_pf *pf)\n \ti40e_stat_update32(hw, I40E_GLQF_PCNT(pf->fd_sb_cnt_idx),\n \t\t\t pf->stat_offsets_loaded,\n \t\t\t &osd->fd_sb_match, &nsd->fd_sb_match);\n+\ti40e_stat_update32(hw,\n+\t\t I40E_GLQF_PCNT(I40E_FD_ATR_TUNNEL_STAT_IDX(pf->hw.pf_id)),\n+\t\t pf->stat_offsets_loaded,\n+\t\t &osd->fd_atr_tunnel_match, &nsd->fd_atr_tunnel_match);\n \n \tval = rd32(hw, I40E_PRTPM_EEE_STAT);\n \tnsd->tx_lpi_status =\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c b/drivers/net/ethernet/intel/i40e/i40e_txrx.c\nindex f188790..268da01 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c\n@@ -2035,9 +2035,16 @@ static void i40e_atr(struct i40e_ring *tx_ring, struct sk_buff *skb,\n \t\t I40E_TXD_FLTR_QW1_FD_STATUS_SHIFT;\n \n \tdtype_cmd |= I40E_TXD_FLTR_QW1_CNT_ENA_MASK;\n-\tdtype_cmd |=\n-\t\t((u32)pf->fd_atr_cnt_idx << I40E_TXD_FLTR_QW1_CNTINDEX_SHIFT) &\n-\t\tI40E_TXD_FLTR_QW1_CNTINDEX_MASK;\n+\tif (!(tx_flags & I40E_TX_FLAGS_VXLAN_TUNNEL))\n+\t\tdtype_cmd |=\n+\t\t\t((u32)I40E_FD_ATR_STAT_IDX(pf->hw.pf_id) <<\n+\t\t\tI40E_TXD_FLTR_QW1_CNTINDEX_SHIFT) &\n+\t\t\tI40E_TXD_FLTR_QW1_CNTINDEX_MASK;\n+\telse\n+\t\tdtype_cmd |=\n+\t\t\t((u32)I40E_FD_ATR_TUNNEL_STAT_IDX(pf->hw.pf_id) <<\n+\t\t\tI40E_TXD_FLTR_QW1_CNTINDEX_SHIFT) &\n+\t\t\tI40E_TXD_FLTR_QW1_CNTINDEX_MASK;\n \n \tfdir_desc->qindex_flex_ptype_vsi = cpu_to_le32(flex_ptype);\n \tfdir_desc->rsvd = cpu_to_le32(0);\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_type.h b/drivers/net/ethernet/intel/i40e/i40e_type.h\nindex 568e855..9a5a75b 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_type.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e_type.h\n@@ -1133,6 +1133,7 @@ struct i40e_hw_port_stats {\n \t/* flow director stats */\n \tu64 fd_atr_match;\n \tu64 fd_sb_match;\n+\tu64 fd_atr_tunnel_match;\n \t/* EEE LPI */\n \tu32 tx_lpi_status;\n \tu32 rx_lpi_status;\ndiff --git a/drivers/net/ethernet/intel/i40evf/i40e_type.h b/drivers/net/ethernet/intel/i40evf/i40e_type.h\nindex ec9d83a..c463ec4 100644\n--- a/drivers/net/ethernet/intel/i40evf/i40e_type.h\n+++ b/drivers/net/ethernet/intel/i40evf/i40e_type.h\n@@ -1108,6 +1108,7 @@ struct i40e_hw_port_stats {\n \t/* flow director stats */\n \tu64 fd_atr_match;\n \tu64 fd_sb_match;\n+\tu64 fd_atr_tunnel_match;\n \t/* EEE LPI */\n \tu32 tx_lpi_status;\n \tu32 rx_lpi_status;\n", "prefixes": [ "net-next", "S4", "04/15" ] }