Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/1.2/patches/809201/?format=api
{ "id": 809201, "url": "http://patchwork.ozlabs.org/api/1.2/patches/809201/?format=api", "web_url": "http://patchwork.ozlabs.org/project/netdev/patch/20170903042117.28923-17-saeedm@mellanox.com/", "project": { "id": 7, "url": "http://patchwork.ozlabs.org/api/1.2/projects/7/?format=api", "name": "Linux network development", "link_name": "netdev", "list_id": "netdev.vger.kernel.org", "list_email": "netdev@vger.kernel.org", "web_url": null, "scm_url": null, "webscm_url": null, "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20170903042117.28923-17-saeedm@mellanox.com>", "list_archive_url": null, "date": "2017-09-03T04:21:16", "name": "[net-next,16/17] net/mlx5e: Stop NAPI when irq balancer changes affinity", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "4ddf2a36287b1e0362a8fe93195e747c18ccc04f", "submitter": { "id": 65299, "url": "http://patchwork.ozlabs.org/api/1.2/people/65299/?format=api", "name": "Saeed Mahameed", "email": "saeedm@mellanox.com" }, "delegate": { "id": 34, "url": "http://patchwork.ozlabs.org/api/1.2/users/34/?format=api", "username": "davem", "first_name": "David", "last_name": "Miller", "email": "davem@davemloft.net" }, "mbox": "http://patchwork.ozlabs.org/project/netdev/patch/20170903042117.28923-17-saeedm@mellanox.com/mbox/", "series": [ { "id": 1196, "url": "http://patchwork.ozlabs.org/api/1.2/series/1196/?format=api", "web_url": "http://patchwork.ozlabs.org/project/netdev/list/?series=1196", "date": "2017-09-03T04:21:09", "name": "[net-next,01/17] net/mlx5e: Reorganize struct mlx5e_rq", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/1196/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/809201/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/809201/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<netdev-owner@vger.kernel.org>", "X-Original-To": "patchwork-incoming@ozlabs.org", "Delivered-To": "patchwork-incoming@ozlabs.org", "Authentication-Results": "ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=<UNKNOWN>)", "Received": [ "from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xlKZq4cDtz9s7C\n\tfor <patchwork-incoming@ozlabs.org>;\n\tSun, 3 Sep 2017 14:22:43 +1000 (AEST)", "(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751934AbdICEWj (ORCPT <rfc822;patchwork-incoming@ozlabs.org>);\n\tSun, 3 Sep 2017 00:22:39 -0400", "from mail-il-dmz.mellanox.com ([193.47.165.129]:60120 \"EHLO\n\tmellanox.co.il\" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org\n\twith ESMTP id S1751482AbdICEWP (ORCPT\n\t<rfc822;netdev@vger.kernel.org>); Sun, 3 Sep 2017 00:22:15 -0400", "from Internal Mail-Server by MTLPINE1 (envelope-from\n\tsaeedm@mellanox.com)\n\twith ESMTPS (AES256-SHA encrypted); 3 Sep 2017 07:22:06 +0300", "from sws.mtl.labs.mlnx (reg-l-vrt-045-015.mtl.labs.mlnx\n\t[10.135.45.15])\n\tby labmailer.mlnx (8.13.8/8.13.8) with ESMTP id v834M5lH017672;\n\tSun, 3 Sep 2017 07:22:06 +0300" ], "From": "Saeed Mahameed <saeedm@mellanox.com>", "To": "\"David S. Miller\" <davem@davemloft.net>", "Cc": "netdev@vger.kernel.org, kernel-team@fb.com,\n\tTariq Toukan <tariqt@mellanox.com>, Saeed Mahameed <saeedm@mellanox.com>", "Subject": "[net-next 16/17] net/mlx5e: Stop NAPI when irq balancer changes\n\taffinity", "Date": "Sun, 3 Sep 2017 07:21:16 +0300", "Message-Id": "<20170903042117.28923-17-saeedm@mellanox.com>", "X-Mailer": "git-send-email 2.13.0", "In-Reply-To": "<20170903042117.28923-1-saeedm@mellanox.com>", "References": "<20170903042117.28923-1-saeedm@mellanox.com>", "Sender": "netdev-owner@vger.kernel.org", "Precedence": "bulk", "List-ID": "<netdev.vger.kernel.org>", "X-Mailing-List": "netdev@vger.kernel.org" }, "content": "From: Tariq Toukan <tariqt@mellanox.com>\n\nNAPI context keeps rescheduling on same CPU as long as it's busy.\nThis doesn't give the oppurtunity for changes in irq affinities\nto take effect.\nFix that by calling napi_complete_done() upon a change in affinity.\nThis would stop the NAPI and reschedule it on the new CPU.\n\nSigned-off-by: Tariq Toukan <tariqt@mellanox.com>\nSigned-off-by: Saeed Mahameed <saeedm@mellanox.com>\n---\n drivers/net/ethernet/mellanox/mlx5/core/en.h | 3 +++\n drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 5 +++++\n drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c | 20 ++++++++++++++++++--\n 3 files changed, 26 insertions(+), 2 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en.h b/drivers/net/ethernet/mellanox/mlx5/core/en.h\nindex 7c046ae8b18e..1388a1e2f835 100644\n--- a/drivers/net/ethernet/mellanox/mlx5/core/en.h\n+++ b/drivers/net/ethernet/mellanox/mlx5/core/en.h\n@@ -582,6 +582,9 @@ struct mlx5e_channel {\n \t__be32 mkey_be;\n \tu8 num_tc;\n \n+\t/* data path - accessed per napi poll */\n+\tstruct irq_desc *irq_desc;\n+\n \t/* control */\n \tstruct mlx5e_priv *priv;\n \tstruct mlx5_core_dev *mdev;\ndiff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c\nindex b2f689ec0d72..20f34131d4e5 100644\n--- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c\n+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c\n@@ -1761,7 +1761,9 @@ static int mlx5e_open_channel(struct mlx5e_priv *priv, int ix,\n \tstruct net_device *netdev = priv->netdev;\n \tint cpu = mlx5e_get_cpu(priv, ix);\n \tstruct mlx5e_channel *c;\n+\tunsigned int irq;\n \tint err;\n+\tint eqn;\n \n \tc = kzalloc_node(sizeof(*c), GFP_KERNEL, cpu_to_node(cpu));\n \tif (!c)\n@@ -1778,6 +1780,9 @@ static int mlx5e_open_channel(struct mlx5e_priv *priv, int ix,\n \tc->num_tc = params->num_tc;\n \tc->xdp = !!params->xdp_prog;\n \n+\tmlx5_vector2eqn(priv->mdev, ix, &eqn, &irq);\n+\tc->irq_desc = irq_to_desc(irq);\n+\n \tnetif_napi_add(netdev, &c->napi, mlx5e_napi_poll, 64);\n \n \terr = mlx5e_open_cq(c, icocq_moder, &cparam->icosq_cq, &c->icosq.cq);\ndiff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c\nindex 92d9aa1cddd6..e906b754415c 100644\n--- a/drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c\n+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c\n@@ -30,8 +30,20 @@\n * SOFTWARE.\n */\n \n+#include <linux/irq.h>\n #include \"en.h\"\n \n+static inline bool mlx5e_channel_no_affinity_change(struct mlx5e_channel *c)\n+{\n+\tint current_cpu = smp_processor_id();\n+\tconst struct cpumask *aff;\n+\tstruct irq_data *idata;\n+\n+\tidata = irq_desc_get_irq_data(c->irq_desc);\n+\taff = irq_data_get_affinity_mask(idata);\n+\treturn cpumask_test_cpu(current_cpu, aff);\n+}\n+\n int mlx5e_napi_poll(struct napi_struct *napi, int budget)\n {\n \tstruct mlx5e_channel *c = container_of(napi, struct mlx5e_channel,\n@@ -51,8 +63,12 @@ int mlx5e_napi_poll(struct napi_struct *napi, int budget)\n \n \tbusy |= c->rq.post_wqes(&c->rq);\n \n-\tif (busy)\n-\t\treturn budget;\n+\tif (busy) {\n+\t\tif (likely(mlx5e_channel_no_affinity_change(c)))\n+\t\t\treturn budget;\n+\t\tif (work_done == budget)\n+\t\t\twork_done--;\n+\t}\n \n \tif (unlikely(!napi_complete_done(napi, work_done)))\n \t\treturn work_done;\n", "prefixes": [ "net-next", "16/17" ] }