{"id":809208,"url":"http://patchwork.ozlabs.org/api/1.2/patches/809208/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20170903042117.28923-3-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-3-saeedm@mellanox.com>","list_archive_url":null,"date":"2017-09-03T04:21:02","name":"[net-next,02/17] net/mlx5e: Replace multiplication by stride size with a shift","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"76ead5287e7ff4eccfe9010fa286e71d35751b7b","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-3-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/809208/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/809208/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 3xlKbN4rrSz9s7C\n\tfor ;\n\tSun, 3 Sep 2017 14:23:12 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751313AbdICEWN (ORCPT );\n\tSun, 3 Sep 2017 00:22:13 -0400","from mail-il-dmz.mellanox.com ([193.47.165.129]:59978 \"EHLO\n\tmellanox.co.il\" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org\n\twith ESMTP id S1750858AbdICEWL (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:05 +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 v834M5l3017672;\n\tSun, 3 Sep 2017 07:22:05 +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 02/17] net/mlx5e: Replace multiplication by stride size\n\twith a shift","Date":"Sun, 3 Sep 2017 07:21:02 +0300","Message-Id":"<20170903042117.28923-3-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\nIn RX data-path, use shift operations instead of a regular multiplication\nby stride size, as it is a power of two.\n\nSigned-off-by: Tariq Toukan \nSigned-off-by: Saeed Mahameed \n---\n drivers/net/ethernet/mellanox/mlx5/core/en.h | 2 +-\n drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 4 ++--\n drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 4 ++--\n 3 files changed, 5 insertions(+), 5 deletions(-)","diff":"diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en.h b/drivers/net/ethernet/mellanox/mlx5/core/en.h\nindex d964db286c95..44bd8df905ca 100644\n--- a/drivers/net/ethernet/mellanox/mlx5/core/en.h\n+++ b/drivers/net/ethernet/mellanox/mlx5/core/en.h\n@@ -535,8 +535,8 @@ struct mlx5e_rq {\n \t\tstruct {\n \t\t\tstruct mlx5e_mpw_info *info;\n \t\t\tvoid *mtt_no_align;\n-\t\t\tu16 stride_sz;\n \t\t\tu16 num_strides;\n+\t\t\tu8 log_stride_sz;\n \t\t} mpwqe;\n \t};\n \tstruct {\ndiff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c\nindex 94761d0e1b33..7a25d952c922 100644\n--- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c\n+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c\n@@ -615,10 +615,10 @@ static int mlx5e_alloc_rq(struct mlx5e_channel *c,\n \t\t\tgoto err_rq_wq_destroy;\n \t\t}\n \n-\t\trq->mpwqe.stride_sz = BIT(params->mpwqe_log_stride_sz);\n+\t\trq->mpwqe.log_stride_sz = params->mpwqe_log_stride_sz;\n \t\trq->mpwqe.num_strides = BIT(params->mpwqe_log_num_strides);\n \n-\t\trq->buff.wqe_sz = rq->mpwqe.stride_sz * rq->mpwqe.num_strides;\n+\t\trq->buff.wqe_sz = rq->mpwqe.num_strides << rq->mpwqe.log_stride_sz;\n \t\tbyte_count = rq->buff.wqe_sz;\n \n \t\terr = mlx5e_create_rq_umr_mkey(mdev, rq);\ndiff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c\nindex 1b50f1e7e48a..aa5cc1590859 100644\n--- a/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c\n+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c\n@@ -304,7 +304,7 @@ static inline void mlx5e_add_skb_frag_mpwqe(struct mlx5e_rq *rq,\n \t\t\t\t\t u32 page_idx, u32 frag_offset,\n \t\t\t\t\t u32 len)\n {\n-\tunsigned int truesize = ALIGN(len, rq->mpwqe.stride_sz);\n+\tunsigned int truesize = ALIGN(len, BIT(rq->mpwqe.log_stride_sz));\n \n \tdma_sync_single_for_cpu(rq->pdev,\n \t\t\t\twi->umr.dma_info[page_idx].addr + frag_offset,\n@@ -910,7 +910,7 @@ static inline void mlx5e_mpwqe_fill_rx_skb(struct mlx5e_rq *rq,\n \t\t\t\t\t struct sk_buff *skb)\n {\n \tu16 stride_ix = mpwrq_get_cqe_stride_index(cqe);\n-\tu32 wqe_offset = stride_ix * rq->mpwqe.stride_sz;\n+\tu32 wqe_offset = stride_ix << rq->mpwqe.log_stride_sz;\n \tu32 head_offset = wqe_offset & (PAGE_SIZE - 1);\n \tu32 page_idx = wqe_offset >> PAGE_SHIFT;\n \tu32 head_page_idx = page_idx;\n","prefixes":["net-next","02/17"]}