Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/610119/?format=api
{ "id": 610119, "url": "http://patchwork.ozlabs.org/api/patches/610119/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1460542112-20166-6-git-send-email-harshitha.ramamurthy@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": "<1460542112-20166-6-git-send-email-harshitha.ramamurthy@intel.com>", "list_archive_url": null, "date": "2016-04-13T10:08:25", "name": "[next,S34,05/12] i40e: Flow-based side-band filter count and its use for input set change", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": false, "hash": "845dc7b2b3afe631f9b88aa0eab0370065b3ea35", "submitter": { "id": 68642, "url": "http://patchwork.ozlabs.org/api/people/68642/?format=api", "name": "Harshitha Ramamurthy", "email": "harshitha.ramamurthy@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/1460542112-20166-6-git-send-email-harshitha.ramamurthy@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/610119/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/610119/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<intel-wired-lan-bounces@lists.osuosl.org>", "X-Original-To": [ "incoming@patchwork.ozlabs.org", "intel-wired-lan@osuosl.org" ], "Delivered-To": [ "patchwork-incoming@bilbo.ozlabs.org", "intel-wired-lan@osuosl.org" ], "Received": [ "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ozlabs.org (Postfix) with ESMTP id 3qlX4s5t4vz9sD5\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 14 Apr 2016 04:14:21 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id BB58D33A05;\n\tWed, 13 Apr 2016 18:14:20 +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 iwb-rsr5kxaK; Wed, 13 Apr 2016 18:14:18 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id 761D533A28;\n\tWed, 13 Apr 2016 18:14:17 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id 9BB6E1C10B8\n\tfor <intel-wired-lan@osuosl.org>;\n\tWed, 13 Apr 2016 18:14:14 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 8F9A533A05\n\tfor <intel-wired-lan@osuosl.org>;\n\tWed, 13 Apr 2016 18:14:14 +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 ppQBKnRi6Wpd for <intel-wired-lan@osuosl.org>;\n\tWed, 13 Apr 2016 18:14:12 +0000 (UTC)", "from mga09.intel.com (mga09.intel.com [134.134.136.24])\n\tby silver.osuosl.org (Postfix) with ESMTP id 7BE3D33A15\n\tfor <intel-wired-lan@osuosl.org>;\n\tWed, 13 Apr 2016 18:14:11 +0000 (UTC)", "from fmsmga002.fm.intel.com ([10.253.24.26])\n\tby orsmga102.jf.intel.com with ESMTP; 13 Apr 2016 11:14:12 -0700", "from harshitha-linux1.jf.intel.com ([10.166.45.81])\n\tby fmsmga002.fm.intel.com with ESMTP; 13 Apr 2016 11:14:12 -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.24,480,1455004800\"; d=\"scan'208\";a=\"957967587\"", "From": "Harshitha Ramamurthy <harshitha.ramamurthy@intel.com>", "To": "intel-wired-lan@osuosl.org", "Date": "Wed, 13 Apr 2016 03:08:25 -0700", "Message-Id": "<1460542112-20166-6-git-send-email-harshitha.ramamurthy@intel.com>", "X-Mailer": "git-send-email 2.4.3", "In-Reply-To": "<1460542112-20166-1-git-send-email-harshitha.ramamurthy@intel.com>", "References": "<1460542112-20166-1-git-send-email-harshitha.ramamurthy@intel.com>", "Subject": "[Intel-wired-lan] [next PATCH S34 05/12] i40e: Flow-based side-band\n\tfilter count and its use for input set change", "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: Kiran Patil <kiran.patil@intel.com>\n\nThis patch keeps track of side-band filters based on flow-type.\nIt is used to handle detection of input set mask changes per\nflow-type.\n\nSigned-off-by: Kiran Patil <kiran.patil@intel.com>\nChange-Id: I5f308dbd33d3c6ae9f5db301b5989b6089f61dce\n---\nTesting Hints :\n\tethtool -N p5p2 flow-type tcp4 src-ip 192.168.0.2 \\\n\t\t dst-ip 192.168.0.1 action 40\n\tethtool -N p5p2 flow-type udp4 src-ip 192.168.0.2 \\\n\t\t dst-ip 192.168.0.1 src-port 1000 action 41\nMade sure that, able to change input set mask independently based on\nflow-type.\n\n drivers/net/ethernet/intel/i40e/i40e.h | 9 +++++++++\n drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 9 +++++++--\n drivers/net/ethernet/intel/i40e/i40e_txrx.c | 24 +++++++++++++++++++++---\n 3 files changed, 37 insertions(+), 5 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h\nindex 1f48e10..ceb848a 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e.h\n@@ -308,6 +308,15 @@ struct i40e_pf {\n \tu32 fd_atr_cnt;\n \tu32 fd_tcp_rule;\n \n+\t/* Book-keeping of side-band filter count per flow-type.\n+\t * This is used to detect and handle input set changes for\n+\t * respective flow-type.\n+\t */\n+\tu16 fd_tcp4_filter_cnt;\n+\tu16 fd_udp4_filter_cnt;\n+\tu16 fd_sctp4_filter_cnt;\n+\tu16 fd_ip4_filter_cnt;\n+\n \tstruct i40e_udp_port_config udp_ports[I40E_MAX_PF_UDP_OFFLOAD_PORTS];\n \tu16 pending_udp_bitmap;\n \ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\nindex ada448b..865c8db 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\n@@ -2500,6 +2500,7 @@ static int i40e_handle_input_set(struct i40e_vsi *vsi,\n {\n \tbool inset_mask_change = false;\n \tstruct i40e_pf *pf;\n+\tu16 filter_cnt;\n \tu64 val;\n \tu8 idx;\n \n@@ -2510,9 +2511,11 @@ static int i40e_handle_input_set(struct i40e_vsi *vsi,\n \tswitch (fsp->flow_type & FLOW_TYPE_MASK) {\n \tcase TCP_V4_FLOW:\n \t\tidx = I40E_FILTER_PCTYPE_NONF_IPV4_TCP;\n+\t\tfilter_cnt = pf->fd_tcp4_filter_cnt;\n \t\tbreak;\n \tcase UDP_V4_FLOW:\n \t\tidx = I40E_FILTER_PCTYPE_NONF_IPV4_UDP;\n+\t\tfilter_cnt = pf->fd_udp4_filter_cnt;\n \t\tbreak;\n \tdefault:\n \t\t/* for all other flow types */\n@@ -2578,8 +2581,10 @@ static int i40e_handle_input_set(struct i40e_vsi *vsi,\n \t\t\tnetif_err(pf, drv, vsi->netdev, \"Change of input set is not supported when MFP mode is enabled\\n\");\n \t\t\treturn -EOPNOTSUPP;\n \t\t}\n-\t\tif (pf->fdir_pf_active_filters) {\n-\t\t\tnetif_err(pf, drv, vsi->netdev, \"Change of input set is not supported when there are existing filters. Please delete them and re-try\\n\");\n+\n+\t\tif (filter_cnt) {\n+\t\t\tnetif_err(pf, drv, vsi->netdev, \"Change of input set is not supported when there are existing filter(%u) for specified flow-type: %u. Please delete them and re-try\\n\",\n+\t\t\t\t filter_cnt, fsp->flow_type & FLOW_TYPE_MASK);\n \t\t\treturn -EOPNOTSUPP;\n \t\t}\n \ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c b/drivers/net/ethernet/intel/i40e/i40e_txrx.c\nindex 05293f6..808922b 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c\n@@ -235,8 +235,14 @@ static int i40e_add_del_fdir_udpv4(struct i40e_vsi *vsi,\n \t\t\t\t \"Filter deleted for PCTYPE %d loc = %d\\n\",\n \t\t\t\t fd_data->pctype, fd_data->fd_id);\n \t}\n-\tif (err)\n+\tif (err) {\n \t\tkfree(raw_packet);\n+\t} else {\n+\t\tif (add)\n+\t\t\tpf->fd_udp4_filter_cnt++;\n+\t\telse\n+\t\t\tpf->fd_udp4_filter_cnt--;\n+\t}\n \n \treturn err ? -EOPNOTSUPP : 0;\n }\n@@ -315,8 +321,14 @@ static int i40e_add_del_fdir_tcpv4(struct i40e_vsi *vsi,\n \t\t\t\t fd_data->pctype, fd_data->fd_id);\n \t}\n \n-\tif (err)\n+\tif (err) {\n \t\tkfree(raw_packet);\n+\t} else {\n+\t\tif (add)\n+\t\t\tpf->fd_tcp4_filter_cnt++;\n+\t\telse\n+\t\t\tpf->fd_tcp4_filter_cnt--;\n+\t}\n \n \treturn err ? -EOPNOTSUPP : 0;\n }\n@@ -393,8 +405,14 @@ static int i40e_add_del_fdir_ipv4(struct i40e_vsi *vsi,\n \t\t}\n \t}\n \n-\tif (err)\n+\tif (err) {\n \t\tkfree(raw_packet);\n+\t} else {\n+\t\tif (add)\n+\t\t\tpf->fd_ip4_filter_cnt++;\n+\t\telse\n+\t\t\tpf->fd_ip4_filter_cnt--;\n+\t}\n \n \treturn err ? -EOPNOTSUPP : 0;\n }\n", "prefixes": [ "next", "S34", "05/12" ] }