From patchwork Wed May 29 03:16:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Damato X-Patchwork-Id: 13677727 Received: from mail-oi1-f182.google.com (mail-oi1-f182.google.com [209.85.167.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1A76715B128 for ; Wed, 29 May 2024 03:20:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716952850; cv=none; b=WgFohhbtzuWqM7R+wQzuOph5GkdNsdb+PNc66Zff7fyfnB75A7DeYhYQIWqlRS+K/6ebNas+LvtWfOAHoi7jBVATz+zvLYfvSf7XBQkCTLM27FMFI1uwH4KAtAYXRdZJDDG7Y7KYB4qaqvV3q6pa/LDBA5+1lbEdEzmV63PdnQs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716952850; c=relaxed/simple; bh=BVpS8rKD6cvn1sPKzxoaeISlmBMwAbkMpGgmUZ9C45g=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ng3VUu3sHYNuwYrR+HrqwORH7qYj2rqyJnnDfjTgP1GA/qKZZjncelnpInTavNihuKpyeMBhaB2d4qTHKaWYQ47cMJJgWXic5mv60lq12FqOGDXStig+YS8ZxybgATP8kV/ndkEvt876jD0AE3HhMvK23A6rpvrP4KFohd7sToE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=fastly.com; spf=pass smtp.mailfrom=fastly.com; dkim=pass (1024-bit key) header.d=fastly.com header.i=@fastly.com header.b=Dn4myONj; arc=none smtp.client-ip=209.85.167.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=fastly.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=fastly.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=fastly.com header.i=@fastly.com header.b="Dn4myONj" Received: by mail-oi1-f182.google.com with SMTP id 5614622812f47-3d19dfb3dceso835318b6e.1 for ; Tue, 28 May 2024 20:20:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastly.com; s=google; t=1716952848; x=1717557648; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=5WirfrVmj6xSxuzh+j2j6GMDFSD8Lc9FPWQtGaC4uG4=; b=Dn4myONjX3wib2nS25vRddz2OQ9sEn/AFE7s5KC/oiSSncEUrRZTMZnWcxCpYtdn1n G1yCWxRtFWFxWfub+l0qqVsc/VdYClK1o3cR5ItSU8Qc8hXxs8V9GbUfIOuTJeKt47U6 sTqkMTCqH/qrtphC/10aU9YCLX+z0qusLaU58= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716952848; x=1717557648; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5WirfrVmj6xSxuzh+j2j6GMDFSD8Lc9FPWQtGaC4uG4=; b=KI046s/CIFQf5ng/vaQgw8mzv7P4z4GrxRkPz3VAdGElACasmMawYPrLPXD3jWlPm0 2tItFeaieAuqKYBlCuzRjtsU2dmN7KMSDu3rzc6j15X69x/FkaY/WmPyY5BlRzM9sSfY cNfzTuBOTPfd92iz3Pix2l609elix9si23Oa/E+DMbIvdQlL4VQAg+U6n4G/fAYrP+eb 9E2MQ6yUALh8Tnw1rpf/WuIxK+js+d2q4q0IpGlo+uveJUWw/AJjJG1TWiRoMFDcxqbF y4J47Fggd9QOkpa00S0gkBCeyKHMwBK9c4T/zUjx7bNIpgYvN3GL/tqLBEDWFo87obQh ms5g== X-Forwarded-Encrypted: i=1; AJvYcCW6VXZxmOazLVJohV+cngCYrQbC5Rlp+YoCgAV1xr7zjBxrP4Uw0mzqXNddc1Zec90qVX//VywkkO7WR1svUIvowxC7b+NLvw9IgQ== X-Gm-Message-State: AOJu0YyE8uM/mHv5B3MqP7jkdDaYWA/eVFZyyWG0UOgaz4eO/JuyORCN vgFKwo6KxED4F8HAgAbJZmaPGwgNJkHS7hGQCRMr4x7j3h2H7PjpbJx4UL5xUGQ= X-Google-Smtp-Source: AGHT+IHH9sy0SpZ3yb1feGf+fkpJAxcwJ0SYOomfUNtQqmdNd7SYvKLISg1dP1EawRO3hGcKzr9hBg== X-Received: by 2002:a05:6808:13c3:b0:3c9:92f3:d519 with SMTP id 5614622812f47-3d1a6019c51mr17456943b6e.4.1716952847979; Tue, 28 May 2024 20:20:47 -0700 (PDT) Received: from localhost.localdomain ([2620:11a:c019:0:65e:3115:2f58:c5fd]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-6f8fbd3ea03sm7156766b3a.39.2024.05.28.20.20.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 May 2024 20:20:47 -0700 (PDT) From: Joe Damato To: linux-kernel@vger.kernel.org, netdev@vger.kernel.org Cc: nalramli@fastly.com, Joe Damato , Saeed Mahameed , Tariq Toukan , Leon Romanovsky , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , linux-rdma@vger.kernel.org (open list:MELLANOX MLX5 core VPI driver) Subject: [RFC net-next v3 1/2] net/mlx5e: Add helpers to calculate txq and ch idx Date: Wed, 29 May 2024 03:16:26 +0000 Message-Id: <20240529031628.324117-2-jdamato@fastly.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240529031628.324117-1-jdamato@fastly.com> References: <20240529031628.324117-1-jdamato@fastly.com> Precedence: bulk X-Mailing-List: linux-rdma@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Add two helpers to: 1. Compute the txq_ix given a channel and a tc offset (tc_to_txq_ix). 2. Compute the channel index and tc offset given a txq_ix (txq_ix_to_chtc_ix). The first helper, tc_to_txq_ix, is used in place of the mathematical expressionin mlx5e_open_sqs when txq_ix values are computed. The second helper, txq_ix_to_chtc_ix, will be used in a following patch. Signed-off-by: Joe Damato Reviewed-by: Jacob Keller --- .../net/ethernet/mellanox/mlx5/core/en_main.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c index b758bc72ac36..ce15805ad55a 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c @@ -2312,6 +2312,22 @@ static int mlx5e_txq_get_qos_node_hw_id(struct mlx5e_params *params, int txq_ix, return 0; } +static inline int tc_to_txq_ix(struct mlx5e_channel *c, + struct mlx5e_params *params, + int tc) +{ + return c->ix + tc * params->num_channels; +} + +static inline void txq_ix_to_chtc_ix(struct mlx5e_params *params, int txq_ix, + int *ch_ix, int *tc_ix) +{ + if (params->num_channels) { + *ch_ix = txq_ix % params->num_channels; + *tc_ix = txq_ix / params->num_channels; + } +} + static int mlx5e_open_sqs(struct mlx5e_channel *c, struct mlx5e_params *params, struct mlx5e_channel_param *cparam) @@ -2319,7 +2335,7 @@ static int mlx5e_open_sqs(struct mlx5e_channel *c, int err, tc; for (tc = 0; tc < mlx5e_get_dcb_num_tc(params); tc++) { - int txq_ix = c->ix + tc * params->num_channels; + int txq_ix = tc_to_txq_ix(c, params, tc); u32 qos_queue_group_id; u32 tisn;