{"id":809210,"url":"http://patchwork.ozlabs.org/api/1.2/patches/809210/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20170903042117.28923-6-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-6-saeedm@mellanox.com>","list_archive_url":null,"date":"2017-09-03T04:21:05","name":"[net-next,05/17] net/mlx5e: Small enhancements for RX MPWQE allocation and free","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"9b7afecab0d5327194136e565bd00c611c4b9915","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-6-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/809210/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/809210/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 3xlKbZ2j1Bz9s7C\n\tfor ;\n\tSun, 3 Sep 2017 14:23:22 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1752828AbdICEXV (ORCPT );\n\tSun, 3 Sep 2017 00:23:21 -0400","from mail-il-dmz.mellanox.com ([193.47.165.129]:59998 \"EHLO\n\tmellanox.co.il\" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org\n\twith ESMTP id S1751070AbdICEWL (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 v834M5l6017672;\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 05/17] net/mlx5e: Small enhancements for RX MPWQE\n\tallocation and free","Date":"Sun, 3 Sep 2017 07:21:05 +0300","Message-Id":"<20170903042117.28923-6-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\nThe dma offset of a MPWQE (Multi-Packet WQE) in memory region\nis fixed for all rounds. Calculate it once on creation time,\ninstead of in runtime. This also obsoletes the wqe argument in\nthe function.\n\nIn addition, optimize dma_info iterator calculation.\n\nSigned-off-by: Tariq Toukan \nSigned-off-by: Saeed Mahameed \n---\n drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 6 ++++++\n drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 18 ++++++------------\n 2 files changed, 12 insertions(+), 12 deletions(-)","diff":"diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c\nindex 591e0dca9671..5aa4681f7c3c 100644\n--- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c\n+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c\n@@ -674,6 +674,12 @@ static int mlx5e_alloc_rq(struct mlx5e_channel *c,\n \tfor (i = 0; i < wq_sz; i++) {\n \t\tstruct mlx5e_rx_wqe *wqe = mlx5_wq_ll_get_wqe(&rq->wq, i);\n \n+\t\tif (rq->wq_type == MLX5_WQ_TYPE_LINKED_LIST_STRIDING_RQ) {\n+\t\t\tu64 dma_offset = (u64)mlx5e_get_wqe_mtt_offset(rq, i) << PAGE_SHIFT;\n+\n+\t\t\twqe->data.addr = cpu_to_be64(dma_offset);\n+\t\t}\n+\n \t\twqe->data.byte_count = cpu_to_be32(byte_count);\n \t\twqe->data.lkey = rq->mkey_be;\n \t}\ndiff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c\nindex db372dcecbe0..fb3b83609aea 100644\n--- a/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c\n+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c\n@@ -374,18 +374,15 @@ static inline void mlx5e_post_umr_wqe(struct mlx5e_rq *rq, u16 ix)\n }\n \n static int mlx5e_alloc_rx_umr_mpwqe(struct mlx5e_rq *rq,\n-\t\t\t\t struct mlx5e_rx_wqe *wqe,\n \t\t\t\t u16 ix)\n {\n \tstruct mlx5e_mpw_info *wi = &rq->mpwqe.info[ix];\n-\tu64 dma_offset = (u64)mlx5e_get_wqe_mtt_offset(rq, ix) << PAGE_SHIFT;\n \tint pg_strides = mlx5e_mpwqe_strides_per_page(rq);\n+\tstruct mlx5e_dma_info *dma_info = &wi->umr.dma_info[0];\n \tint err;\n \tint i;\n \n-\tfor (i = 0; i < MLX5_MPWRQ_PAGES_PER_WQE; i++) {\n-\t\tstruct mlx5e_dma_info *dma_info = &wi->umr.dma_info[i];\n-\n+\tfor (i = 0; i < MLX5_MPWRQ_PAGES_PER_WQE; i++, dma_info++) {\n \t\terr = mlx5e_page_alloc_mapped(rq, dma_info);\n \t\tif (unlikely(err))\n \t\t\tgoto err_unmap;\n@@ -395,14 +392,12 @@ static int mlx5e_alloc_rx_umr_mpwqe(struct mlx5e_rq *rq,\n \n \tmemset(wi->skbs_frags, 0, sizeof(*wi->skbs_frags) * MLX5_MPWRQ_PAGES_PER_WQE);\n \twi->consumed_strides = 0;\n-\twqe->data.addr = cpu_to_be64(dma_offset);\n \n \treturn 0;\n \n err_unmap:\n \twhile (--i >= 0) {\n-\t\tstruct mlx5e_dma_info *dma_info = &wi->umr.dma_info[i];\n-\n+\t\tdma_info--;\n \t\tpage_ref_sub(dma_info->page, pg_strides);\n \t\tmlx5e_page_release(rq, dma_info, true);\n \t}\n@@ -413,11 +408,10 @@ static int mlx5e_alloc_rx_umr_mpwqe(struct mlx5e_rq *rq,\n void mlx5e_free_rx_mpwqe(struct mlx5e_rq *rq, struct mlx5e_mpw_info *wi)\n {\n \tint pg_strides = mlx5e_mpwqe_strides_per_page(rq);\n+\tstruct mlx5e_dma_info *dma_info = &wi->umr.dma_info[0];\n \tint i;\n \n-\tfor (i = 0; i < MLX5_MPWRQ_PAGES_PER_WQE; i++) {\n-\t\tstruct mlx5e_dma_info *dma_info = &wi->umr.dma_info[i];\n-\n+\tfor (i = 0; i < MLX5_MPWRQ_PAGES_PER_WQE; i++, dma_info++) {\n \t\tpage_ref_sub(dma_info->page, pg_strides - wi->skbs_frags[i]);\n \t\tmlx5e_page_release(rq, dma_info, true);\n \t}\n@@ -447,7 +441,7 @@ int mlx5e_alloc_rx_mpwqe(struct mlx5e_rq *rq, struct mlx5e_rx_wqe *wqe, u16 ix)\n {\n \tint err;\n \n-\terr = mlx5e_alloc_rx_umr_mpwqe(rq, wqe, ix);\n+\terr = mlx5e_alloc_rx_umr_mpwqe(rq, ix);\n \tif (unlikely(err))\n \t\treturn err;\n \tset_bit(MLX5E_RQ_STATE_UMR_WQE_IN_PROGRESS, &rq->state);\n","prefixes":["net-next","05/17"]}