Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/565125/?format=api
{ "id": 565125, "url": "http://patchwork.ozlabs.org/api/patches/565125/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1452304221-8276-1-git-send-email-deepthi.kavalur@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": "<1452304221-8276-1-git-send-email-deepthi.kavalur@intel.com>", "list_archive_url": null, "date": "2016-01-09T01:50:21", "name": "[v2,next] i40e: add priv flag for automatic rule eviction", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "e221d323fbfa1970966d6e7e759e8b68bdfe7a38", "submitter": { "id": 67654, "url": "http://patchwork.ozlabs.org/api/people/67654/?format=api", "name": "Deepthi Kavalur", "email": "deepthi.kavalur@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/1452304221-8276-1-git-send-email-deepthi.kavalur@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/565125/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/565125/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 7452F140328\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSat, 9 Jan 2016 12:50:24 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id F2E7089717;\n\tSat, 9 Jan 2016 01:50:22 +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 sKxCv3y785WD; Sat, 9 Jan 2016 01:50:22 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 4B03187107;\n\tSat, 9 Jan 2016 01:50:22 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id 690B71C10DA\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tSat, 9 Jan 2016 01:50:21 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 635F23130C\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tSat, 9 Jan 2016 01:50:21 +0000 (UTC)", "from silver.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id 2zAXndgDk1+A for <intel-wired-lan@lists.osuosl.org>;\n\tSat, 9 Jan 2016 01:50:20 +0000 (UTC)", "from mga04.intel.com (mga04.intel.com [192.55.52.120])\n\tby silver.osuosl.org (Postfix) with ESMTP id 9FEE7215E5\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tSat, 9 Jan 2016 01:50:20 +0000 (UTC)", "from orsmga002.jf.intel.com ([10.7.209.21])\n\tby fmsmga104.fm.intel.com with ESMTP; 08 Jan 2016 17:50:20 -0800", "from dkavalur-mobl.amr.corp.intel.com (HELO\n\tlocalhost.localdomain.localdomain) ([134.134.176.184])\n\tby orsmga002.jf.intel.com with ESMTP; 08 Jan 2016 17:50:20 -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.20,541,1444719600\"; d=\"scan'208\";a=\"886895493\"", "From": "Deepthi Kavalur <deepthi.kavalur@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Fri, 8 Jan 2016 17:50:21 -0800", "Message-Id": "<1452304221-8276-1-git-send-email-deepthi.kavalur@intel.com>", "X-Mailer": "git-send-email 2.1.0", "Subject": "[Intel-wired-lan] [v2 next PATCH] i40e: add priv flag for automatic\n\trule eviction", "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\nThe X722 can support automatic rule eviction for automatically added\nflow director rules. Feature is (should be) disabled by default.\n\nSigned-off-by: Anjali Singhai Jain <anjali.singhai@intel.com>\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 | 3 +++\n drivers/net/ethernet/intel/i40e/i40e_txrx.c | 6 ++++--\n drivers/net/ethernet/intel/i40e/i40e_type.h | 4 ++++\n 5 files changed, 21 insertions(+), 2 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h\nindex 47f6c0a..0b71611 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e.h\n@@ -104,6 +104,7 @@\n #define I40E_PRIV_FLAGS_FD_ATR\t\tBIT(2)\n #define I40E_PRIV_FLAGS_VEB_STATS\tBIT(3)\n #define I40E_PRIV_FLAGS_PS\t\tBIT(4)\n+#define I40E_PRIV_FLAGS_HW_ATR_EVICT BIT(5)\n \n #define I40E_NVM_VERSION_LO_SHIFT 0\n #define I40E_NVM_VERSION_LO_MASK (0xff << I40E_NVM_VERSION_LO_SHIFT)\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\nindex 252a9dd..80c3f20 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\n@@ -232,6 +232,7 @@ static const char i40e_priv_flags_strings[][ETH_GSTRING_LEN] = {\n \t\"flow-director-atr\",\n \t\"veb-stats\",\n \t\"packet-split\",\n+\t\"hw-atr-eviction\",\n };\n \n #define I40E_PRIV_FLAGS_STR_LEN ARRAY_SIZE(i40e_priv_flags_strings)\n@@ -2706,6 +2707,8 @@ static u32 i40e_get_priv_flags(struct net_device *dev)\n \t\tI40E_PRIV_FLAGS_VEB_STATS : 0;\n \tret_flags |= pf->flags & I40E_FLAG_RX_PS_ENABLED ?\n \t\tI40E_PRIV_FLAGS_PS : 0;\n+\tret_flags |= pf->auto_disable_flags & I40E_FLAG_HW_ATR_EVICT_CAPABLE ?\n+\t\t0 : I40E_PRIV_FLAGS_HW_ATR_EVICT;\n \n \treturn ret_flags;\n }\n@@ -2762,6 +2765,12 @@ static int i40e_set_priv_flags(struct net_device *dev, u32 flags)\n \telse\n \t\tpf->flags &= ~I40E_FLAG_VEB_STATS_ENABLED;\n \n+\tif ((flags & I40E_PRIV_FLAGS_HW_ATR_EVICT) &&\n+\t\t\t\t (pf->flags & I40E_FLAG_HW_ATR_EVICT_CAPABLE))\n+\t\tpf->auto_disable_flags &= ~I40E_FLAG_HW_ATR_EVICT_CAPABLE;\n+\telse\n+\t\tpf->auto_disable_flags |= I40E_FLAG_HW_ATR_EVICT_CAPABLE;\n+\n \t/* if needed, issue reset to cause things to take effect */\n \tif (reset_required)\n \t\ti40e_do_reset(pf, BIT(__I40E_PF_RESET_REQUESTED));\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c\nindex 93a29d7..37297ce 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_main.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c\n@@ -8402,6 +8402,9 @@ static int i40e_sw_init(struct i40e_pf *pf)\n \t\t (pf->hw.aq.api_min_ver > 4))) {\n \t\t/* Supported in FW API version higher than 1.4 */\n \t\tpf->flags |= I40E_FLAG_GENEVE_OFFLOAD_CAPABLE;\n+\t\tpf->auto_disable_flags = I40E_FLAG_HW_ATR_EVICT_CAPABLE;\n+\t} else {\n+\t\tpf->auto_disable_flags = I40E_FLAG_HW_ATR_EVICT_CAPABLE;\n \t}\n \n \tpf->eeprom_version = 0xDEAD;\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c b/drivers/net/ethernet/intel/i40e/i40e_txrx.c\nindex 7ea2689..6694c4d 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c\n@@ -2039,7 +2039,8 @@ static void i40e_atr(struct i40e_ring *tx_ring, struct sk_buff *skb,\n \t/* Due to lack of space, no more new filters can be programmed */\n \tif (th->syn && (pf->auto_disable_flags & I40E_FLAG_FD_ATR_ENABLED))\n \t\treturn;\n-\tif (pf->flags & I40E_FLAG_HW_ATR_EVICT_CAPABLE) {\n+\tif ((pf->flags & I40E_FLAG_HW_ATR_EVICT_CAPABLE) &&\n+\t (!(pf->auto_disable_flags & I40E_FLAG_HW_ATR_EVICT_CAPABLE))) {\n \t\t/* HW ATR eviction will take care of removing filters on FIN\n \t\t * and RST packets.\n \t\t */\n@@ -2101,7 +2102,8 @@ static void i40e_atr(struct i40e_ring *tx_ring, struct sk_buff *skb,\n \t\t\tI40E_TXD_FLTR_QW1_CNTINDEX_SHIFT) &\n \t\t\tI40E_TXD_FLTR_QW1_CNTINDEX_MASK;\n \n-\tif (pf->flags & I40E_FLAG_HW_ATR_EVICT_CAPABLE)\n+\tif ((pf->flags & I40E_FLAG_HW_ATR_EVICT_CAPABLE) &&\n+\t (!(pf->auto_disable_flags & I40E_FLAG_HW_ATR_EVICT_CAPABLE)))\n \t\tdtype_cmd |= I40E_TXD_FLTR_QW1_ATR_MASK;\n \n \tfdir_desc->qindex_flex_ptype_vsi = cpu_to_le32(flex_ptype);\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_type.h b/drivers/net/ethernet/intel/i40e/i40e_type.h\nindex dd2da35..b59a021 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_type.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e_type.h\n@@ -1098,6 +1098,10 @@ enum i40e_filter_program_desc_pcmd {\n \t\t\t\t\t I40E_TXD_FLTR_QW1_CMD_SHIFT)\n #define I40E_TXD_FLTR_QW1_ATR_MASK\tBIT_ULL(I40E_TXD_FLTR_QW1_ATR_SHIFT)\n \n+#define I40E_TXD_FLTR_QW1_ATR_SHIFT\t(0xEULL + \\\n+\t\t\t\t\t I40E_TXD_FLTR_QW1_CMD_SHIFT)\n+#define I40E_TXD_FLTR_QW1_ATR_MASK\tBIT_ULL(I40E_TXD_FLTR_QW1_ATR_SHIFT)\n+\n #define I40E_TXD_FLTR_QW1_CNTINDEX_SHIFT 20\n #define I40E_TXD_FLTR_QW1_CNTINDEX_MASK\t(0x1FFUL << \\\n \t\t\t\t\t I40E_TXD_FLTR_QW1_CNTINDEX_SHIFT)\n", "prefixes": [ "v2", "next" ] }