Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/606660/?format=api
{ "id": 606660, "url": "http://patchwork.ozlabs.org/api/patches/606660/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1459877947-8241-2-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": "<1459877947-8241-2-git-send-email-sridhar.samudrala@intel.com>", "list_archive_url": null, "date": "2016-04-05T17:39:07", "name": "[net-next,2/2] ixgbe: Add support for redirect action to cls_u32 offloads.", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "4126578c312653bc24455e1703ce6cd84a704e1f", "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/1459877947-8241-2-git-send-email-sridhar.samudrala@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/606660/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/606660/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 silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ozlabs.org (Postfix) with ESMTP id 3qfbnG3nRpz9t5W\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 6 Apr 2016 03:43:46 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id CCFAD2F20B;\n\tTue, 5 Apr 2016 17:43:45 +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 T+cVGujZ36xL; Tue, 5 Apr 2016 17:43:41 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id 9F8EB3087A;\n\tTue, 5 Apr 2016 17:43:41 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id A651C1C15E0\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 5 Apr 2016 17:43:39 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 9EAFE2F20B\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 5 Apr 2016 17:43:39 +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 vExh2GAFCbcG for <intel-wired-lan@lists.osuosl.org>;\n\tTue, 5 Apr 2016 17:43:38 +0000 (UTC)", "from mga11.intel.com (mga11.intel.com [192.55.52.93])\n\tby silver.osuosl.org (Postfix) with ESMTP id B08E22FEAE\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 5 Apr 2016 17:43:38 +0000 (UTC)", "from fmsmga002.fm.intel.com ([10.253.24.26])\n\tby fmsmga102.fm.intel.com with ESMTP; 05 Apr 2016 10:43:39 -0700", "from sri02.jf.intel.com ([10.166.39.21])\n\tby fmsmga002.fm.intel.com with ESMTP; 05 Apr 2016 10:43:38 -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,444,1455004800\"; d=\"scan'208\";a=\"952260621\"", "From": "Sridhar Samudrala <sridhar.samudrala@intel.com>", "To": "intel-wired-lan@lists.osuosl.org, jeffrey.t.kirsher@intel.com,\n\tjohn.r.fastabend@intel.com", "Date": "Tue, 5 Apr 2016 10:39:07 -0700", "Message-Id": "<1459877947-8241-2-git-send-email-sridhar.samudrala@intel.com>", "X-Mailer": "git-send-email 2.1.0", "In-Reply-To": "<1459877947-8241-1-git-send-email-sridhar.samudrala@intel.com>", "References": "<1459877947-8241-1-git-send-email-sridhar.samudrala@intel.com>", "Subject": "[Intel-wired-lan] [PATCH net-next 2/2] ixgbe: Add support for\n\tredirect action to cls_u32 offloads.", "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: Sridhar Samudrala <sridhar.samudrala@intel.com>\n\nThis patch enables 'redirect' to a SRIOV VF or a offloaded macvlan\ndevice queue via tc 'mirred' action.\n\nVerified with the following script that creates SRIOV VFs, offloaded\nmacvlan and adds tc u32 filters with redirect action to the associated\nnetdevs.\n\n # add ingress qdisc.\n tc qdisc add dev p4p1 ingress\n\n # enable hw tc offload.\n ethtool -K p4p1 hw-tc-offload on\n\n # create 4 sriov VFs and bring up the first one.\n echo 4 > /sys/class/net/p4p1/device/sriov_numvfs\n sleep 1\n ip link set p4p1 up\n ip link set p4p1_0 up\n\n # create a offloaded macvlan device and bring it up.\n ethtool -K p4p1 l2-fwd-offload on\n ip link add link p4p1 name mvlan_1 type macvlan\n ip link set mvlan_1 up\n\n # add u32 filter with action to redirect to VF netdev\n tc filter add dev p4p1 parent ffff: protocol ip prio 99 \\\n handle 800:0:1 u32 ht 800: \\\n match ip src 192.168.1.3/32 \\\n action mirred egress redirect dev p4p1_0\n\n # add u32 filter with action to redirect to macvlan netdev\n tc filter add dev p4p1 parent ffff: protocol ip prio 99 \\\n handle 800:0:2 u32 ht 800: \\\n match ip src 192.168.2.3/32 \\\n action mirred egress redirect dev mvlan_1\n\nSigned-off-by: Sridhar Samudrala <sridhar.samudrala@intel.com>\n---\n drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 96 +++++++++++++++++++++++----\n 1 file changed, 83 insertions(+), 13 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c\nindex 19bf386..df7b10a 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c\n@@ -53,6 +53,7 @@\n #include <net/vxlan.h>\n #include <net/pkt_cls.h>\n #include <net/tc_act/tc_gact.h>\n+#include <net/tc_act/tc_mirred.h>\n \n #include \"ixgbe.h\"\n #include \"ixgbe_common.h\"\n@@ -8222,6 +8223,85 @@ static int ixgbe_configure_clsu32_del_hnode(struct ixgbe_adapter *adapter,\n \treturn 0;\n }\n \n+#ifdef CONFIG_NET_CLS_ACT\n+static int handle_redirect_action(struct ixgbe_adapter *adapter, int ifindex,\n+\t\t\t\t u8 *queue, u64 *action)\n+{\n+\tunsigned int num_vfs = adapter->num_vfs, vf;\n+\tstruct net_device *upper;\n+\tstruct list_head *iter;\n+\n+\t/* redirect to a SRIOV VF */\n+\tfor (vf = 0; vf < num_vfs; ++vf) {\n+\t\tupper = pci_get_drvdata(adapter->vfinfo[vf].vfdev);\n+\t\tif (upper->ifindex == ifindex) {\n+\t\t\tif (adapter->num_rx_pools > 1)\n+\t\t\t\t*queue = vf * 2;\n+\t\t\telse\n+\t\t\t\t*queue = vf * adapter->num_rx_queues_per_pool;\n+\n+\t\t\t*action = vf+1;\n+\t\t\t*action <<= ETHTOOL_RX_FLOW_SPEC_RING_VF_OFF;\n+\t\t\treturn 0;\n+\t\t}\n+\t}\n+\n+\t/* redirect to a offloaded macvlan netdev */\n+\tnetdev_for_each_all_upper_dev_rcu(adapter->netdev, upper, iter) {\n+\t\tif (netif_is_macvlan(upper)) {\n+\t\t\tstruct macvlan_dev *dfwd = netdev_priv(upper);\n+\t\t\tstruct ixgbe_fwd_adapter *vadapter = dfwd->fwd_priv;\n+\n+\t\t\tif (vadapter && vadapter->netdev->ifindex == ifindex) {\n+\t\t\t\t*queue = adapter->rx_ring[vadapter->rx_base_queue]->reg_idx;\n+\t\t\t\t*action = *queue;\n+\t\t\t\treturn 0;\n+\t\t\t}\n+\t\t}\n+\t}\n+\n+\treturn -EINVAL;\n+}\n+\n+static int parse_tc_actions(struct ixgbe_adapter *adapter,\n+\t\t\t struct tcf_exts *exts, u64 *action, u8 *queue)\n+{\n+\tconst struct tc_action *a;\n+\tint err;\n+\n+\tif (tc_no_actions(exts))\n+\t\treturn -EINVAL;\n+\n+\ttc_for_each_action(a, exts) {\n+\n+\t\t/* Drop action */\n+\t\tif (is_tcf_gact_shot(a)) {\n+\t\t\t*action = IXGBE_FDIR_DROP_QUEUE;\n+\t\t\t*queue = IXGBE_FDIR_DROP_QUEUE;\n+\t\t\treturn 0;\n+\t\t}\n+\n+\t\t/* Redirect to a VF or a offloaded macvlan */\n+\t\tif (is_tcf_mirred_redirect(a)) {\n+\t\t\tint ifindex = tcf_mirred_ifindex(a);\n+\n+\t\t\terr = handle_redirect_action(adapter, ifindex, queue,\n+\t\t\t\t\t\t action);\n+\t\t\tif (err == 0)\n+\t\t\t\treturn err;\n+\t\t}\n+\t}\n+\n+\treturn -EINVAL;\n+}\n+#else\n+static int parse_tc_actions(struct ixgbe_adapter *adapter,\n+\t\t\t struct tcf_exts *exts, u64 *action, u8 *queue)\n+{\n+\treturn -EINVAL;\n+}\n+#endif /* CONFIG_NET_CLS_ACT */\n+\n static int ixgbe_configure_clsu32(struct ixgbe_adapter *adapter,\n \t\t\t\t __be16 protocol,\n \t\t\t\t struct tc_cls_u32_offload *cls)\n@@ -8231,9 +8311,6 @@ static int ixgbe_configure_clsu32(struct ixgbe_adapter *adapter,\n \tstruct ixgbe_mat_field *field_ptr;\n \tstruct ixgbe_fdir_filter *input;\n \tunion ixgbe_atr_input mask;\n-#ifdef CONFIG_NET_CLS_ACT\n-\tconst struct tc_action *a;\n-#endif\n \tint i, err = 0;\n \tu8 queue;\n \tu32 uhtid, link_uhtid;\n@@ -8335,18 +8412,11 @@ static int ixgbe_configure_clsu32(struct ixgbe_adapter *adapter,\n \tif (input->filter.formatted.flow_type == IXGBE_ATR_FLOW_TYPE_IPV4)\n \t\tmask.formatted.flow_type &= IXGBE_ATR_L4TYPE_IPV6_MASK;\n \n-#ifdef CONFIG_NET_CLS_ACT\n-\tif (list_empty(&cls->knode.exts->actions))\n+\terr = parse_tc_actions(adapter, cls->knode.exts, &input->action,\n+\t\t\t &queue);\n+\tif (err < 0)\n \t\tgoto err_out;\n \n-\tlist_for_each_entry(a, &cls->knode.exts->actions, list) {\n-\t\tif (!is_tcf_gact_shot(a))\n-\t\t\tgoto err_out;\n-\t}\n-#endif\n-\n-\tinput->action = IXGBE_FDIR_DROP_QUEUE;\n-\tqueue = IXGBE_FDIR_DROP_QUEUE;\n \tinput->sw_idx = loc;\n \n \tspin_lock(&adapter->fdir_perfect_lock);\n", "prefixes": [ "net-next", "2/2" ] }