From patchwork Tue Jan 9 21:06:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Gospodarek X-Patchwork-Id: 857753 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=greyhouse-net.20150623.gappssmtp.com header.i=@greyhouse-net.20150623.gappssmtp.com header.b="iJ5YZp6s"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zGPrR5lVNz9s0g for ; Wed, 10 Jan 2018 08:08:39 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757730AbeAIVIb (ORCPT ); Tue, 9 Jan 2018 16:08:31 -0500 Received: from mail-qk0-f193.google.com ([209.85.220.193]:38888 "EHLO mail-qk0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756027AbeAIVHJ (ORCPT ); Tue, 9 Jan 2018 16:07:09 -0500 Received: by mail-qk0-f193.google.com with SMTP id j185so9528816qkc.5 for ; Tue, 09 Jan 2018 13:07:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=greyhouse-net.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=EO3t2LOpIQKc8p5dAJYac1xW/GxN5o0lUGrR2hcVSok=; b=iJ5YZp6syicdn3MZ0OnuFh0q0VPr+wZetqCvscWUfbGNG3UM74FvoLUlVhndsatJOR ZUUPmJLvw0znpjBzuVEFXUeH/KOiPdoPZ4LGoIHQH10+pPnT88Mj2B7syUGrWXNRyB5U Y7NIq4jU0Vy1zWyd9J6eS773GqhUn/ptJTvLpqH3/o4tk79MigFlT7Oesm7RDv6ASz5F dxP660hsxPWtRDPEjA1fus39uZBCIzM2UemhawsXtHKGtULrkh9s5T0iEBeqNcivvzKa lxT/j8faStZte4nCvf6f+XxkpUT6XPNmZniJHBaCG20/0aBWcruemhzu8H2tbT8/9l5J 6frA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=EO3t2LOpIQKc8p5dAJYac1xW/GxN5o0lUGrR2hcVSok=; b=owQZAB5biTdE1i9gFPeEYao3/dxzIQSot8ggsrXruJziLiZSBh9K3CLx6wG3JKtQ0z o8kfO+AStcGz0dr8GXZV9qnlIc+2DmZNOOIh3p3/T+Umq1xhhLC3haBjXG+kLobxGqvi LkLl3TUaPEdXlAxyPeJNFI+X5EXoD/3LHuSLg9MdMkdlf4xeqR9CHF52g4D/KEt1NWTw VoMx2bkEuTH6ZRkhD7IbdbjBzIqcETXkRexOrA7nnK4DOosRpdn8HLW5pl6MOBS2qgpv AWCMPl00EuewgdJAcK0/udQjJOCzy0DOccD84ZeBdj70a59cqUqBbLgJgRHAFe0w+WhO j/Lw== X-Gm-Message-State: AKwxytcXS/M6MynjXbW3k7wKWVavAzxUCo+dw2lInd4ESjAHSNhO+SwQ z/iHVYlfe1n0ilD5I+HIzmL37u6c2M8= X-Google-Smtp-Source: ACJfBov+JG+VHO2jG4y90WpQb/tO/azgqHiG4JkkvRnZ+1A/+Pfboh9BhSvkmU817VSw9sUv+q1ICA== X-Received: by 10.55.53.21 with SMTP id c21mr1942559qka.38.1515532028191; Tue, 09 Jan 2018 13:07:08 -0800 (PST) Received: from localhost.localdomain ([192.19.231.250]) by smtp.gmail.com with ESMTPSA id o57sm9896650qtf.53.2018.01.09.13.07.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 09 Jan 2018 13:07:07 -0800 (PST) From: Andy Gospodarek To: netdev@vger.kernel.org Cc: mchan@broadcom.com, talgi@mellanox.com, ogerlitz@mellanox.com, Andy Gospodarek Subject: [PATCH net-next v4 08/10] net/dim: use struct net_dim_sample as arg to net_dim Date: Tue, 9 Jan 2018 16:06:19 -0500 Message-Id: <1515531981-14461-9-git-send-email-andy@greyhouse.net> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1515531981-14461-1-git-send-email-andy@greyhouse.net> References: <1515531981-14461-1-git-send-email-andy@greyhouse.net> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Andy Gospodarek Simplify the arguments net_dim() by formatting them into a struct net_dim_sample before calling the function. Signed-off-by: Andy Gospodarek Suggested-by: Tal Gilboa Acked-by: Tal Gilboa Acked-by: Saeed Mahameed --- drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c | 13 ++++++++----- include/linux/net_dim.h | 10 +++------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c index a1c94fd..f292bb3 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c @@ -78,11 +78,14 @@ int mlx5e_napi_poll(struct napi_struct *napi, int budget) for (i = 0; i < c->num_tc; i++) mlx5e_cq_arm(&c->sq[i].cq); - if (MLX5E_TEST_BIT(c->rq.state, MLX5E_RQ_STATE_AM)) - net_dim(&c->rq.dim, - c->rq.cq.event_ctr, - c->rq.stats.packets, - c->rq.stats.bytes); + if (MLX5E_TEST_BIT(c->rq.state, MLX5E_RQ_STATE_AM)) { + struct net_dim_sample dim_sample; + net_dim_sample(c->rq.cq.event_ctr, + c->rq.stats.packets, + c->rq.stats.bytes, + &dim_sample); + net_dim(&c->rq.dim, dim_sample); + } mlx5e_cq_arm(&c->rq.cq); mlx5e_cq_arm(&c->icosq.cq); diff --git a/include/linux/net_dim.h b/include/linux/net_dim.h index 741510f..1c7e450 100644 --- a/include/linux/net_dim.h +++ b/include/linux/net_dim.h @@ -342,21 +342,18 @@ static inline void net_dim_calc_stats(struct net_dim_sample *start, } static inline void net_dim(struct net_dim *dim, - u16 event_ctr, - u64 packets, - u64 bytes) + struct net_dim_sample end_sample) { - struct net_dim_sample end_sample; struct net_dim_stats curr_stats; u16 nevents; switch (dim->state) { case NET_DIM_MEASURE_IN_PROGRESS: - nevents = BIT_GAP(BITS_PER_TYPE(u16), event_ctr, + nevents = BIT_GAP(BITS_PER_TYPE(u16), + end_sample.event_ctr, dim->start_sample.event_ctr); if (nevents < NET_DIM_NEVENTS) break; - net_dim_sample(event_ctr, packets, bytes, &end_sample); net_dim_calc_stats(&dim->start_sample, &end_sample, &curr_stats); if (net_dim_decision(&curr_stats, dim)) { @@ -366,7 +363,6 @@ static inline void net_dim(struct net_dim *dim, } /* fall through */ case NET_DIM_START_MEASURE: - net_dim_sample(event_ctr, packets, bytes, &dim->start_sample); dim->state = NET_DIM_MEASURE_IN_PROGRESS; break; case NET_DIM_APPLY_NEW_PROFILE: