Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/590131/?format=api
{ "id": 590131, "url": "http://patchwork.ozlabs.org/api/patches/590131/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20160229192613.24163.31830.stgit@john-Precision-Tower-5810/", "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": "<20160229192613.24163.31830.stgit@john-Precision-Tower-5810>", "list_archive_url": null, "date": "2016-02-29T19:26:13", "name": "[net-next] net: relax setup_tc ndo op handle restriction", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "af6d27cbc754f8f0f6b2cae60b2dc0e41fc502fb", "submitter": { "id": 20028, "url": "http://patchwork.ozlabs.org/api/people/20028/?format=api", "name": "John Fastabend", "email": "john.fastabend@gmail.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/20160229192613.24163.31830.stgit@john-Precision-Tower-5810/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/590131/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/590131/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 1482B140B99\n\tfor <incoming@patchwork.ozlabs.org>;\n\tTue, 1 Mar 2016 06:26:31 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 08C75A5982;\n\tMon, 29 Feb 2016 19:26:30 +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 VQjsQJfe86Rz; Mon, 29 Feb 2016 19:26:29 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 22D2D86F16;\n\tMon, 29 Feb 2016 19:26:29 +0000 (UTC)", "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\tby ash.osuosl.org (Postfix) with ESMTP id 0446A1C16EA\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 29 Feb 2016 19:26:28 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id F37A9A5960\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 29 Feb 2016 19:26:27 +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 pcusMyhYipCO for <intel-wired-lan@lists.osuosl.org>;\n\tMon, 29 Feb 2016 19:26:26 +0000 (UTC)", "from mail-pf0-f173.google.com (mail-pf0-f173.google.com\n\t[209.85.192.173])\n\tby fraxinus.osuosl.org (Postfix) with ESMTPS id B3B5E86F16\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 29 Feb 2016 19:26:26 +0000 (UTC)", "by mail-pf0-f173.google.com with SMTP id 4so19033139pfd.1\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 29 Feb 2016 11:26:26 -0800 (PST)", "from [127.0.1.1] ([72.168.145.122])\n\tby smtp.gmail.com with ESMTPSA id\n\tvy6sm39943500pac.38.2016.02.29.11.26.19\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tMon, 29 Feb 2016 11:26:25 -0800 (PST)" ], "Authentication-Results": "ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com header.b=A+OBNpSo;\n\tdkim-atps=neutral", "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "domain auto-whitelisted by SQLgrey-1.7.6", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\n\th=from:subject:to:cc:date:message-id:user-agent:mime-version\n\t:content-transfer-encoding;\n\tbh=QwA9/fpNQ7UxPsIhER2CbLN/HwG7DlSz35rKn1fMQ1g=;\n\tb=A+OBNpSovGX3skQa6B+GETgGtaTZZ+sNDYUZP6JoaF8L+MJeVxidm4LqfE5f01ehWT\n\t+Teks0o+NJ4Udi8DNt3E5oNB7Jw2GV3ENBH3KOrvIcLI5sOcQPpr6HsK0qYFgZ7rYPvW\n\t4CmfygtMmFABcZ0qc9OqG67s2wYsJkfCR6sJuI4M9J7xqneSNpBQSWXcScxzYdl/AnSD\n\tDzBtNodgM6+THiiZdvOHo/WtDvxUBTmnsZgcQzarYH2+e9Pq5+In/BupdjzejMRcc/2p\n\t/zdj9Nz9t4c76+6vj1l2gj1L4IMefm+BsyJZ1boF9eyBDCyNIYzOFbXTgw11Em12LAPw\n\ty9ew==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20130820;\n\th=x-gm-message-state:from:subject:to:cc:date:message-id:user-agent\n\t:mime-version:content-transfer-encoding;\n\tbh=QwA9/fpNQ7UxPsIhER2CbLN/HwG7DlSz35rKn1fMQ1g=;\n\tb=B5Rew1fiHjRF8okEWn8fE6RDsqIlQ8GS0bjRr1SQfwejVKf73G0qpqLhFhq2Fvp0hs\n\tPqx3zlP2L82ZIsEW5HZDkThVI7gPrbSMQ8H32N3lw+2WCsjWS8bGX17UfhGB7u40FAwh\n\tWUdon7nU/6Ph5SQiFgxf7qcfivBOi8L/Ymze4Dke8anhgaSoIKxueSGu+DfvMaL8iSnb\n\t0sIuqNfcAcMIcmFojIXBsDQ5s/o1Mzaykio7J5FbnxmQh3sikJzFeQKTpENGcSDNrwPl\n\t+dO1z2FbBmo/2zd/6lBNM0i0CkikNNvjhcXfzH0rcu6Wxr4dj6zsMVsO3F/GECnLH2ue\n\toZBg==", "X-Gm-Message-State": "AD7BkJKgeQE83IdgAalvc2F8za67O9T70djvuVEzV85STi4ksuQVaJaE4cj+2k6W1qstiA==", "X-Received": "by 10.98.13.86 with SMTP id v83mr24615204pfi.162.1456773986402; \n\tMon, 29 Feb 2016 11:26:26 -0800 (PST)", "From": "John Fastabend <john.fastabend@gmail.com>", "X-Google-Original-From": "John Fastabend <john.r.fastabend@intel.com>", "To": "intel-wired-lan@lists.osuosl.org, john.fastabend@gmail.com,\n\tjeffrey.t.kirsher@intel.com", "Date": "Mon, 29 Feb 2016 11:26:13 -0800", "Message-ID": "<20160229192613.24163.31830.stgit@john-Precision-Tower-5810>", "User-Agent": "StGit/0.17.1-dirty", "MIME-Version": "1.0", "Cc": "netdev@vger.kernel.org", "Subject": "[Intel-wired-lan] [net-next PATCH] net: relax setup_tc ndo op\n\thandle restriction", "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>", "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": "I added this check in setup_tc to multiple drivers,\n\n if (handle != TC_H_ROOT || tc->type != TC_SETUP_MQPRIO)\n\nUnfortunately restricting to TC_H_ROOT like this breaks the old\ninstantiation of mqprio to setup a hardware qdisc. This patch\nrelaxes the test to only check the type to make it equivalent\nto the check before I broke it. With this the old instantiation\ncontinues to work.\n\nA good smoke test is to setup mqprio with,\n\n# tc qdisc add dev eth4 root mqprio num_tc 8 \\\n map 0 1 2 3 4 5 6 7 \\\n queues 0@0 1@1 2@2 3@3 4@4 5@5 6@6 7@7\n\nFixes: e4c6734eaab9 (\"net: rework ndo tc op to consume additional qdisc handle paramete\")\nReported-by: Singh Krishneil <krishneil.k.singh@intel.com>\nReported-by: Jake Keller <jacob.e.keller@intel.com>\nCC: Murali Karicheri <m-karicheri2@ti.com>\nCC: Shradha Shah <sshah@solarflare.com>\nCC: Or Gerlitz <ogerlitz@mellanox.com>\nCC: Ariel Elior <ariel.elior@qlogic.com>\nCC: Jeff Kirsher <jeffrey.t.kirsher@intel.com>\nCC: Bruce Allan <bruce.w.allan@intel.com>\nCC: Jesse Brandeburg <jesse.brandeburg@intel.com>\nCC: Don Skidmore <donald.c.skidmore@intel.com>\nSigned-off-by: John Fastabend <john.r.fastabend@intel.com>\n---\n drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 2 +-\n drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 2 +-\n drivers/net/ethernet/broadcom/bnxt/bnxt.c | 2 +-\n drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 2 +-\n drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 2 +-\n drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 2 +-\n drivers/net/ethernet/sfc/tx.c | 2 +-\n drivers/net/ethernet/ti/netcp_core.c | 2 +-\n 8 files changed, 8 insertions(+), 8 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c\nindex 3360684..ebf9224 100644\n--- a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c\n+++ b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c\n@@ -1632,7 +1632,7 @@ static int xgbe_setup_tc(struct net_device *netdev, u32 handle, __be16 proto,\n \tstruct xgbe_prv_data *pdata = netdev_priv(netdev);\n \tu8 tc;\n \n-\tif (handle != TC_H_ROOT || tc_to_netdev->type != TC_SETUP_MQPRIO)\n+\tif (tc_to_netdev->type != TC_SETUP_MQPRIO)\n \t\treturn -EINVAL;\n \n \ttc = tc_to_netdev->tc;\ndiff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c\nindex 45843d1..a949783 100644\n--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c\n+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c\n@@ -4275,7 +4275,7 @@ int bnx2x_setup_tc(struct net_device *dev, u8 num_tc)\n int __bnx2x_setup_tc(struct net_device *dev, u32 handle, __be16 proto,\n \t\t struct tc_to_netdev *tc)\n {\n-\tif (handle != TC_H_ROOT || tc->type != TC_SETUP_MQPRIO)\n+\tif (tc->type != TC_SETUP_MQPRIO)\n \t\treturn -EINVAL;\n \treturn bnx2x_setup_tc(dev, tc->tc);\n }\ndiff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c\nindex ff1507f..f1a0a73 100644\n--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c\n+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c\n@@ -5383,7 +5383,7 @@ static int bnxt_setup_tc(struct net_device *dev, u32 handle, __be16 proto,\n \tstruct bnxt *bp = netdev_priv(dev);\n \tu8 tc;\n \n-\tif (handle != TC_H_ROOT || ntc->type != TC_SETUP_MQPRIO)\n+\tif (ntc->type != TC_SETUP_MQPRIO)\n \t\treturn -EINVAL;\n \n \ttc = ntc->tc;\ndiff --git a/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c b/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c\nindex dc1a821..d09a8dd 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c\n@@ -1207,7 +1207,7 @@ err_queueing_scheme:\n static int __fm10k_setup_tc(struct net_device *dev, u32 handle, __be16 proto,\n \t\t\t struct tc_to_netdev *tc)\n {\n-\tif (handle != TC_H_ROOT || tc->type != TC_SETUP_MQPRIO)\n+\tif (tc->type != TC_SETUP_MQPRIO)\n \t\treturn -EINVAL;\n \n \treturn fm10k_setup_tc(dev, tc->tc);\ndiff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c\nindex cf4b729..02139f3 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c\n@@ -8422,7 +8422,7 @@ int __ixgbe_setup_tc(struct net_device *dev, u32 handle, __be16 proto,\n \t\t}\n \t}\n \n-\tif (handle != TC_H_ROOT || tc->type != TC_SETUP_MQPRIO)\n+\tif (tc->type != TC_SETUP_MQPRIO)\n \t\treturn -EINVAL;\n \n \treturn ixgbe_setup_tc(dev, tc->tc);\ndiff --git a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c\nindex 96d95cb..a2d560a 100644\n--- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c\n+++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c\n@@ -72,7 +72,7 @@ int mlx4_en_setup_tc(struct net_device *dev, u8 up)\n static int __mlx4_en_setup_tc(struct net_device *dev, u32 handle, __be16 proto,\n \t\t\t struct tc_to_netdev *tc)\n {\n-\tif (handle != TC_H_ROOT || tc->type != TC_SETUP_MQPRIO)\n+\tif (tc->type != TC_SETUP_MQPRIO)\n \t\treturn -EINVAL;\n \n \treturn mlx4_en_setup_tc(dev, tc->tc);\ndiff --git a/drivers/net/ethernet/sfc/tx.c b/drivers/net/ethernet/sfc/tx.c\nindex 2cdb571..2337789 100644\n--- a/drivers/net/ethernet/sfc/tx.c\n+++ b/drivers/net/ethernet/sfc/tx.c\n@@ -571,7 +571,7 @@ int efx_setup_tc(struct net_device *net_dev, u32 handle, __be16 proto,\n \tunsigned tc, num_tc;\n \tint rc;\n \n-\tif (handle != TC_H_ROOT || ntc->type != TC_SETUP_MQPRIO)\n+\tif (ntc->type != TC_SETUP_MQPRIO)\n \t\treturn -EINVAL;\n \n \tnum_tc = ntc->tc;\ndiff --git a/drivers/net/ethernet/ti/netcp_core.c b/drivers/net/ethernet/ti/netcp_core.c\nindex ed0c30f..1d0942c 100644\n--- a/drivers/net/ethernet/ti/netcp_core.c\n+++ b/drivers/net/ethernet/ti/netcp_core.c\n@@ -1860,7 +1860,7 @@ static int netcp_setup_tc(struct net_device *dev, u32 handle, __be16 proto,\n \t/* setup tc must be called under rtnl lock */\n \tASSERT_RTNL();\n \n-\tif (handle != TC_H_ROOT || tc->type != TC_SETUP_MQPRIO)\n+\tif (tc->type != TC_SETUP_MQPRIO)\n \t\treturn -EINVAL;\n \n \t/* Sanity-check the number of traffic classes requested */\n", "prefixes": [ "net-next" ] }