Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/592194/?format=api
{ "id": 592194, "url": "http://patchwork.ozlabs.org/api/patches/592194/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1457120869-3489-1-git-send-email-sridhar.samudrala@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": "<1457120869-3489-1-git-send-email-sridhar.samudrala@intel.com>", "list_archive_url": null, "date": "2016-03-04T19:47:49", "name": "[net-next] net: ixgbe: Fix cls_u32 offload support for ports and fields with masks.", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "05ca08319556c25942dbbbd3a5a0b001a6e8f46b", "submitter": { "id": 65219, "url": "http://patchwork.ozlabs.org/api/people/65219/?format=api", "name": "Samudrala, Sridhar", "email": "sridhar.samudrala@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/1457120869-3489-1-git-send-email-sridhar.samudrala@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/592194/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/592194/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 hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\tby ozlabs.org (Postfix) with ESMTP id 6D5781401C7\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSat, 5 Mar 2016 06:51:50 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 7C12795D1E;\n\tFri, 4 Mar 2016 19:51:49 +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 bHNI17EFN0fJ; Fri, 4 Mar 2016 19:51:49 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 2019895C72;\n\tFri, 4 Mar 2016 19:51:49 +0000 (UTC)", "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\tby ash.osuosl.org (Postfix) with ESMTP id 095D71C0975\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 4 Mar 2016 19:51:48 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 0456795C72\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 4 Mar 2016 19:51:48 +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 Os0oDtY6TLku for <intel-wired-lan@lists.osuosl.org>;\n\tFri, 4 Mar 2016 19:51:47 +0000 (UTC)", "from mga01.intel.com (mga01.intel.com [192.55.52.88])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 3D12F95C6A\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 4 Mar 2016 19:51:47 +0000 (UTC)", "from orsmga001.jf.intel.com ([10.7.209.18])\n\tby fmsmga101.fm.intel.com with ESMTP; 04 Mar 2016 11:51:47 -0800", "from sri02.jf.intel.com ([10.166.39.21])\n\tby orsmga001.jf.intel.com with ESMTP; 04 Mar 2016 11:51:46 -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,537,1449561600\"; d=\"scan'208\";a=\"901566636\"", "From": "Sridhar Samudrala <sridhar.samudrala@intel.com>", "To": "intel-wired-lan@lists.osuosl.org, john.r.fastabend@intel.com,\n\tnetdev@vger.kernel.org", "Date": "Fri, 4 Mar 2016 11:47:49 -0800", "Message-Id": "<1457120869-3489-1-git-send-email-sridhar.samudrala@intel.com>", "X-Mailer": "git-send-email 2.1.0", "Subject": "[Intel-wired-lan] [PATCH net-next] net: ixgbe: Fix cls_u32 offload\n\tsupport for ports and fields with masks.", "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": "Fix support for 16 bit source/dest port matches in ixgbe model.\nu32 uses a single 32-bit key value for both source and destination ports\nstarting at offset 0. So replace the 2 functions with a single function\nthat takes this key value/mask to program both source and dest ports.\n\nRemove the incorrect check for mask in ixgbe_configure_clsu32()\n\nTested with the following filters:\n\n #tc qdisc add dev p4p1 ingress\n #tc filter add dev p4p1 parent ffff: protocol ip prio 99 \\\n\thandle 800:0:1 u32 ht 800: \\\n\tmatch ip dst 11.0.0.1/24 match ip src 11.0.0.2/24 action drop\n\n #tc filter del dev p4p1 parent ffff: protocol ip prio 99 \\\n\thandle 800:0:1 u32\n #tc filter add dev p4p1 parent ffff: protocol ip prio 99 \\\n\thandle 1: u32 divisor 1\n #tc filter add dev p4p1 parent ffff: protocol ip prio 99 \\\n\thandle 800:0:10 u32 ht 800: link 1: \\\n\toffset at 0 mask 0f00 shift 6 plus 0 eat match ip protocol 6 ff\n #tc filter add dev p4p1 parent ffff: protocol ip prio 99 \\\n\thandle 1:0:10 u32 ht 1: \\\n\tmatch tcp src 1024 ffff match tcp dst 80 ffff action drop\n\nSigned-off-by: Sridhar Samudrala <sridhar.samudrala@intel.com>\n---\n drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 3 +--\n drivers/net/ethernet/intel/ixgbe/ixgbe_model.h | 17 ++++-------------\n 2 files changed, 5 insertions(+), 15 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c\nindex 10ccd96..c520f98 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c\n@@ -8348,8 +8348,7 @@ static int ixgbe_configure_clsu32(struct ixgbe_adapter *adapter,\n \t\tint j;\n \n \t\tfor (j = 0; field_ptr[j].val; j++) {\n-\t\t\tif (field_ptr[j].off == off &&\n-\t\t\t field_ptr[j].mask == m) {\n+\t\t\tif (field_ptr[j].off == off) {\n \t\t\t\tfield_ptr[j].val(input, &mask, val, m);\n \t\t\t\tinput->filter.formatted.flow_type |=\n \t\t\t\t\tfield_ptr[j].type;\ndiff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_model.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_model.h\nindex ce48872..40d1730 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_model.h\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_model.h\n@@ -65,28 +65,19 @@ static struct ixgbe_mat_field ixgbe_ipv4_fields[] = {\n \t{ .val = NULL } /* terminal node */\n };\n \n-static inline int ixgbe_mat_prgm_sport(struct ixgbe_fdir_filter *input,\n+static inline int ixgbe_mat_prgm_ports(struct ixgbe_fdir_filter *input,\n \t\t\t\t union ixgbe_atr_input *mask,\n \t\t\t\t u32 val, u32 m)\n {\n \tinput->filter.formatted.src_port = val & 0xffff;\n \tmask->formatted.src_port = m & 0xffff;\n-\treturn 0;\n-};\n-\n-static inline int ixgbe_mat_prgm_dport(struct ixgbe_fdir_filter *input,\n-\t\t\t\t union ixgbe_atr_input *mask,\n-\t\t\t\t u32 val, u32 m)\n-{\n-\tinput->filter.formatted.dst_port = val & 0xffff;\n-\tmask->formatted.dst_port = m & 0xffff;\n+\tinput->filter.formatted.dst_port = val >> 16;\n+\tmask->formatted.dst_port = m >> 16;\n \treturn 0;\n };\n \n static struct ixgbe_mat_field ixgbe_tcp_fields[] = {\n-\t{.off = 0, .mask = 0xffff, .val = ixgbe_mat_prgm_sport,\n-\t .type = IXGBE_ATR_FLOW_TYPE_TCPV4},\n-\t{.off = 2, .mask = 0xffff, .val = ixgbe_mat_prgm_dport,\n+\t{.off = 0, .mask = 0xffffffff, .val = ixgbe_mat_prgm_ports,\n \t .type = IXGBE_ATR_FLOW_TYPE_TCPV4},\n \t{ .val = NULL } /* terminal node */\n };\n", "prefixes": [ "net-next" ] }