{"id":809212,"url":"http://patchwork.ozlabs.org/api/1.2/patches/809212/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20170903042117.28923-8-saeedm@mellanox.com/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/1.2/projects/7/?format=json","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-8-saeedm@mellanox.com>","list_archive_url":null,"date":"2017-09-03T04:21:07","name":"[net-next,07/17] net/mlx5e: Early-return on empty completion queues","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"3e9c4f7479852d3cbb4b2984b3f95ff1043a19ca","submitter":{"id":65299,"url":"http://patchwork.ozlabs.org/api/1.2/people/65299/?format=json","name":"Saeed Mahameed","email":"saeedm@mellanox.com"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/1.2/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/20170903042117.28923-8-saeedm@mellanox.com/mbox/","series":[{"id":1196,"url":"http://patchwork.ozlabs.org/api/1.2/series/1196/?format=json","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/809212/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/809212/checks/","tags":{},"related":[],"headers":{"Return-Path":"","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=)","Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xlKbl3cPbz9s7C\n\tfor ;\n\tSun, 3 Sep 2017 14:23:31 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1752408AbdICEXU (ORCPT );\n\tSun, 3 Sep 2017 00:23:20 -0400","from mail-il-dmz.mellanox.com ([193.47.165.129]:60018 \"EHLO\n\tmellanox.co.il\" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org\n\twith ESMTP id S1751082AbdICEWL (ORCPT\n\t); Sun, 3 Sep 2017 00:22:11 -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 v834M5l8017672;\n\tSun, 3 Sep 2017 07:22:06 +0300"],"From":"Saeed Mahameed ","To":"\"David S. Miller\" ","Cc":"netdev@vger.kernel.org, kernel-team@fb.com,\n\tTariq Toukan , Saeed Mahameed ","Subject":"[net-next 07/17] net/mlx5e: Early-return on empty completion queues","Date":"Sun, 3 Sep 2017 07:21:07 +0300","Message-Id":"<20170903042117.28923-8-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":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"From: Tariq Toukan \n\nNAPI context handles different kinds of completion queues\n(RX, TX, and others). Hence, upon a poll trial, some of them\nmight be empty.\nHere we early-return upon empty completion queues, as well as\nfull rx buffer, and save unnecessary logic and memory barriers.\n\nSigned-off-by: Tariq Toukan \nSigned-off-by: Saeed Mahameed \n---\n drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 40 ++++++++++++++-----------\n drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 16 +++++-----\n 2 files changed, 32 insertions(+), 24 deletions(-)","diff":"diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c\nindex 8af6577b7501..ab1213a3615e 100644\n--- a/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c\n+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c\n@@ -459,16 +459,19 @@ void mlx5e_dealloc_rx_mpwqe(struct mlx5e_rq *rq, u16 ix)\n bool mlx5e_post_rx_wqes(struct mlx5e_rq *rq)\n {\n \tstruct mlx5_wq_ll *wq = &rq->wq;\n+\tint err;\n \n \tif (unlikely(!test_bit(MLX5E_RQ_STATE_ENABLED, &rq->state)))\n \t\treturn false;\n \n+\tif (mlx5_wq_ll_is_full(wq))\n+\t\treturn false;\n+\n \tif (test_bit(MLX5E_RQ_STATE_UMR_WQE_IN_PROGRESS, &rq->state))\n \t\treturn true;\n \n-\twhile (!mlx5_wq_ll_is_full(wq)) {\n+\tdo {\n \t\tstruct mlx5e_rx_wqe *wqe = mlx5_wq_ll_get_wqe(wq, wq->head);\n-\t\tint err;\n \n \t\terr = rq->alloc_wqe(rq, wqe, wq->head);\n \t\tif (err == -EBUSY)\n@@ -479,14 +482,14 @@ bool mlx5e_post_rx_wqes(struct mlx5e_rq *rq)\n \t\t}\n \n \t\tmlx5_wq_ll_push(wq, be16_to_cpu(wqe->next.next_wqe_index));\n-\t}\n+\t} while (!mlx5_wq_ll_is_full(wq));\n \n \t/* ensure wqes are visible to device before updating doorbell record */\n \tdma_wmb();\n \n \tmlx5_wq_ll_update_db_record(wq);\n \n-\treturn !mlx5_wq_ll_is_full(wq);\n+\treturn !!err;\n }\n \n static void mlx5e_lro_update_hdr(struct sk_buff *skb, struct mlx5_cqe64 *cqe,\n@@ -981,7 +984,8 @@ void mlx5e_handle_rx_cqe_mpwrq(struct mlx5e_rq *rq, struct mlx5_cqe64 *cqe)\n int mlx5e_poll_rx_cq(struct mlx5e_cq *cq, int budget)\n {\n \tstruct mlx5e_rq *rq = container_of(cq, struct mlx5e_rq, cq);\n-\tstruct mlx5e_xdpsq *xdpsq = &rq->xdpsq;\n+\tstruct mlx5e_xdpsq *xdpsq;\n+\tstruct mlx5_cqe64 *cqe;\n \tint work_done = 0;\n \n \tif (unlikely(!test_bit(MLX5E_RQ_STATE_ENABLED, &rq->state)))\n@@ -990,12 +994,13 @@ int mlx5e_poll_rx_cq(struct mlx5e_cq *cq, int budget)\n \tif (cq->decmprs_left)\n \t\twork_done += mlx5e_decompress_cqes_cont(rq, cq, 0, budget);\n \n-\tfor (; work_done < budget; work_done++) {\n-\t\tstruct mlx5_cqe64 *cqe = mlx5_cqwq_get_cqe(&cq->wq);\n+\tcqe = mlx5_cqwq_get_cqe(&cq->wq);\n+\tif (!cqe)\n+\t\treturn 0;\n \n-\t\tif (!cqe)\n-\t\t\tbreak;\n+\txdpsq = &rq->xdpsq;\n \n+\tdo {\n \t\tif (mlx5_get_cqe_format(cqe) == MLX5_COMPRESSED) {\n \t\t\twork_done +=\n \t\t\t\tmlx5e_decompress_cqes_start(rq, cq,\n@@ -1006,7 +1011,7 @@ int mlx5e_poll_rx_cq(struct mlx5e_cq *cq, int budget)\n \t\tmlx5_cqwq_pop(&cq->wq);\n \n \t\trq->handle_rx_cqe(rq, cqe);\n-\t}\n+\t} while ((++work_done < budget) && (cqe = mlx5_cqwq_get_cqe(&cq->wq)));\n \n \tif (xdpsq->db.doorbell) {\n \t\tmlx5e_xmit_xdp_doorbell(xdpsq);\n@@ -1024,6 +1029,7 @@ int mlx5e_poll_rx_cq(struct mlx5e_cq *cq, int budget)\n bool mlx5e_poll_xdpsq_cq(struct mlx5e_cq *cq)\n {\n \tstruct mlx5e_xdpsq *sq;\n+\tstruct mlx5_cqe64 *cqe;\n \tstruct mlx5e_rq *rq;\n \tu16 sqcc;\n \tint i;\n@@ -1033,6 +1039,10 @@ bool mlx5e_poll_xdpsq_cq(struct mlx5e_cq *cq)\n \tif (unlikely(!test_bit(MLX5E_SQ_STATE_ENABLED, &sq->state)))\n \t\treturn false;\n \n+\tcqe = mlx5_cqwq_get_cqe(&cq->wq);\n+\tif (!cqe)\n+\t\treturn false;\n+\n \trq = container_of(sq, struct mlx5e_rq, xdpsq);\n \n \t/* sq->cc must be updated only after mlx5_cqwq_update_db_record(),\n@@ -1040,15 +1050,11 @@ bool mlx5e_poll_xdpsq_cq(struct mlx5e_cq *cq)\n \t */\n \tsqcc = sq->cc;\n \n-\tfor (i = 0; i < MLX5E_TX_CQ_POLL_BUDGET; i++) {\n-\t\tstruct mlx5_cqe64 *cqe;\n+\ti = 0;\n+\tdo {\n \t\tu16 wqe_counter;\n \t\tbool last_wqe;\n \n-\t\tcqe = mlx5_cqwq_get_cqe(&cq->wq);\n-\t\tif (!cqe)\n-\t\t\tbreak;\n-\n \t\tmlx5_cqwq_pop(&cq->wq);\n \n \t\twqe_counter = be16_to_cpu(cqe->wqe_counter);\n@@ -1066,7 +1072,7 @@ bool mlx5e_poll_xdpsq_cq(struct mlx5e_cq *cq)\n \t\t\t/* Recycle RX page */\n \t\t\tmlx5e_page_release(rq, di, true);\n \t\t} while (!last_wqe);\n-\t}\n+\t} while ((++i < MLX5E_TX_CQ_POLL_BUDGET) && (cqe = mlx5_cqwq_get_cqe(&cq->wq)));\n \n \tmlx5_cqwq_update_db_record(&cq->wq);\n \ndiff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c\nindex 31353e5c3c78..80d2121643ee 100644\n--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c\n+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c\n@@ -394,6 +394,7 @@ netdev_tx_t mlx5e_xmit(struct sk_buff *skb, struct net_device *dev)\n bool mlx5e_poll_tx_cq(struct mlx5e_cq *cq, int napi_budget)\n {\n \tstruct mlx5e_txqsq *sq;\n+\tstruct mlx5_cqe64 *cqe;\n \tu32 dma_fifo_cc;\n \tu32 nbytes;\n \tu16 npkts;\n@@ -405,6 +406,10 @@ bool mlx5e_poll_tx_cq(struct mlx5e_cq *cq, int napi_budget)\n \tif (unlikely(!test_bit(MLX5E_SQ_STATE_ENABLED, &sq->state)))\n \t\treturn false;\n \n+\tcqe = mlx5_cqwq_get_cqe(&cq->wq);\n+\tif (!cqe)\n+\t\treturn false;\n+\n \tnpkts = 0;\n \tnbytes = 0;\n \n@@ -416,15 +421,11 @@ bool mlx5e_poll_tx_cq(struct mlx5e_cq *cq, int napi_budget)\n \t/* avoid dirtying sq cache line every cqe */\n \tdma_fifo_cc = sq->dma_fifo_cc;\n \n-\tfor (i = 0; i < MLX5E_TX_CQ_POLL_BUDGET; i++) {\n-\t\tstruct mlx5_cqe64 *cqe;\n+\ti = 0;\n+\tdo {\n \t\tu16 wqe_counter;\n \t\tbool last_wqe;\n \n-\t\tcqe = mlx5_cqwq_get_cqe(&cq->wq);\n-\t\tif (!cqe)\n-\t\t\tbreak;\n-\n \t\tmlx5_cqwq_pop(&cq->wq);\n \n \t\twqe_counter = be16_to_cpu(cqe->wqe_counter);\n@@ -467,7 +468,8 @@ bool mlx5e_poll_tx_cq(struct mlx5e_cq *cq, int napi_budget)\n \t\t\tsqcc += wi->num_wqebbs;\n \t\t\tnapi_consume_skb(skb, napi_budget);\n \t\t} while (!last_wqe);\n-\t}\n+\n+\t} while ((++i < MLX5E_TX_CQ_POLL_BUDGET) && (cqe = mlx5_cqwq_get_cqe(&cq->wq)));\n \n \tmlx5_cqwq_update_db_record(&cq->wq);\n \n","prefixes":["net-next","07/17"]}