From nobody Sun Dec 14 12:18:04 2025 Received: from mail-pg1-f170.google.com (mail-pg1-f170.google.com [209.85.215.170]) (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 D946A83A0D for ; Thu, 9 May 2024 20:51:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715287869; cv=none; b=k+3Qe+mLbXOnSVdTfVKdEbf0b5x4qx+CHAis8GFMcISvb/YSS1DIPr1a/2X7UkKtqFtdF5gZ2Y6OA9B+iJMqC5/PiqOjP2/rTcxEAdc4QxBVtT1miMHx/3AZTm5P1zhBULAlmd4686ojMwNtg/kvueKgDIry7w3imxvGQ4i8hB8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715287869; c=relaxed/simple; bh=AO4ibM0f40u0LST8xsBvynBO/brqWCLwYZxK5Wpm0nw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ZUuOYOeu84n6w25aPwITm6NRQf/atFR2hgqLlTWe2iDDpHk2GSWA2ltJWa7AFnze5rdxxz3bTmQzCViBL6sJV7W3Lc3ujMbWkPcBpU+BZF9Ufi5DpT7wdEVJAwhSajKvifr7Nkox0H9hSWyrsdtnfp+ipLvCAXa4kf3LvIBLuNE= 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=Ed67/4tf; arc=none smtp.client-ip=209.85.215.170 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="Ed67/4tf" Received: by mail-pg1-f170.google.com with SMTP id 41be03b00d2f7-620e30d8f37so1109982a12.2 for ; Thu, 09 May 2024 13:51:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastly.com; s=google; t=1715287866; x=1715892666; 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=mK9jRCqJy/IAjt4V55hSSH/H3KvUaHNlqx/4tUOcg/w=; b=Ed67/4tfRKob+rHwqlGfFIl6bqdWmz9So+IxPDc4LHg5gndY/4YzTkAYeIdM4Tp9Yk OrrehrbByqoUzvelU3q/x5TzL98DIlmdYARhEYkZnbXNhud9tvOvxMhnphWq5Taxcb7P tzRfNG/9JxVKihzIGfjBgX1vUmbScnaNzEhuE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715287866; x=1715892666; 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=mK9jRCqJy/IAjt4V55hSSH/H3KvUaHNlqx/4tUOcg/w=; b=lq7HeTE8udkjCQceHYr6Z1GVX01RqGJn9RFOvEzJqafPvr4lp+oztu2bUf4jHe2q7o nYchSsi6ryQG7MVD8sm79lx7czhV9vhjUv9Z6fv1PWhr0h3Pqs83fr+9nH43LGZRpYBe 4Ul1cbl2h/ga8ZPkV5HYCveQfdl1S3+plLvI4eC3IJ8q8NjG753y4WHWsICLkxjZW0kJ 7qnY1DewCXTD74z/lpD1ohPFLtGBnSzZSfWB47QP2cfDveGpEqQF1ezPcCCHxNdaylV2 Nfp2Mj0kfjhdeJHxExZ46k27SbEUbZQhcBcHZi0e76x8H4BLgKTK/bx6ZrFBURRBB1j6 Nsrw== X-Gm-Message-State: AOJu0YzuFuafgpp4RYProWAYZ2hk4SyqsCWsY34VzkeF2aVR78On38fO pOvWsiIHvppquWqbpfyffR5aju6JOm+MBVGhP54cQ1xhm03ENZYoD/8/UfJS0o6+sAL+Yg3cO3U zDPXtKlfWSPzFhzn4XRLO9PHDLNBvtD6DzKjRATx5j5TYkvEpbdVO26NbR0+VEZu70v6hgzbsYg CKOxzQYiFsUa03DbTwbNlyBV4cmYXBJcriUccBJuOoQio= X-Google-Smtp-Source: AGHT+IHla1dQrim4j3USXrIXGvmfovYHjmRSCd80Xn+OwNzfQ8XNKU71RDvgr85iegLA1EQwUc2zpw== X-Received: by 2002:a05:6a21:99aa:b0:1af:7180:494f with SMTP id adf61e73a8af0-1afde1b6f3dmr1283476637.41.1715287865782; Thu, 09 May 2024 13:51:05 -0700 (PDT) Received: from localhost.localdomain ([2620:11a:c019:0:65e:3115:2f58:c5fd]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1ef0badb959sm18677365ad.85.2024.05.09.13.51.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 May 2024 13:51:05 -0700 (PDT) From: Joe Damato To: linux-kernel@vger.kernel.org, netdev@vger.kernel.org Cc: mkarsten@uwaterloo.ca, nalramli@fastly.com, Joe Damato , Tariq Toukan , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , linux-rdma@vger.kernel.org (open list:MELLANOX MLX4 core VPI driver) Subject: [PATCH net-next v4 1/3] net/mlx4: Track RX allocation failures in a stat Date: Thu, 9 May 2024 20:50:54 +0000 Message-Id: <20240509205057.246191-2-jdamato@fastly.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240509205057.246191-1-jdamato@fastly.com> References: <20240509205057.246191-1-jdamato@fastly.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" mlx4_en_alloc_frags currently returns -ENOMEM when mlx4_alloc_page fails but does not increment a stat field when this occurs. A new field called alloc_fail has been added to struct mlx4_en_rx_ring which is now incremented in mlx4_en_rx_ring when -ENOMEM occurs. Signed-off-by: Joe Damato Tested-by: Martin Karsten --- drivers/net/ethernet/mellanox/mlx4/en_rx.c | 4 +++- drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/mellanox/mlx4/en_rx.c b/drivers/net/ether= net/mellanox/mlx4/en_rx.c index 8328df8645d5..15c57e9517e9 100644 --- a/drivers/net/ethernet/mellanox/mlx4/en_rx.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_rx.c @@ -82,8 +82,10 @@ static int mlx4_en_alloc_frags(struct mlx4_en_priv *priv, =20 for (i =3D 0; i < priv->num_frags; i++, frags++) { if (!frags->page) { - if (mlx4_alloc_page(priv, frags, gfp)) + if (mlx4_alloc_page(priv, frags, gfp)) { + ring->alloc_fail++; return -ENOMEM; + } ring->rx_alloc_pages++; } rx_desc->data[i].addr =3D cpu_to_be64(frags->dma + diff --git a/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h b/drivers/net/eth= ernet/mellanox/mlx4/mlx4_en.h index efe3f97b874f..cd70df22724b 100644 --- a/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h +++ b/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h @@ -355,6 +355,7 @@ struct mlx4_en_rx_ring { unsigned long xdp_tx; unsigned long xdp_tx_full; unsigned long dropped; + unsigned long alloc_fail; int hwtstamp_rx_filter; cpumask_var_t affinity_mask; struct xdp_rxq_info xdp_rxq; --=20 2.25.1 From nobody Sun Dec 14 12:18:04 2025 Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) (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 C93955338D for ; Thu, 9 May 2024 20:51:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715287871; cv=none; b=CafvHOcRHcDFdVKdPhlpkIlY4tgBZn0MTRtLe/B1OvLO7M4taFg7vpX5/ZX6fyU6Pj5tO/fMinw6Yq/HOe00HLOG0tyfrH/XWFxOxn2Zd94sCc+QjGX26lKCqlzSdn0eDHBjiGSBPrM/DyBw4m7kM1xYLKxgAKPs9oqrC2732TA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715287871; c=relaxed/simple; bh=gCbabcQaR8Ix1K97TkMliO2FSC7RBAC3W9/BPXaCzC8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=p3AJ3cJ0ovu6roR2tVj6yRlHxif4v+vIOhpAuO5cG8P6IAeUGT3qOOHdV+Et3qm/x265MvDF3I4zDuamNeJEWmrn1buKm5dM6IVOD0tifY5mYxtQmd1R+AcrXhOZRhiqmAsigKqY8YkQkp6ZRBziz/Qr6brPEUNTcjZDaZLY1Q4= 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=qKSiSiwN; arc=none smtp.client-ip=209.85.214.171 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="qKSiSiwN" Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-1ed835f3c3cso11423555ad.3 for ; Thu, 09 May 2024 13:51:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastly.com; s=google; t=1715287868; x=1715892668; 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=KmgZyGJ6WZhyygeOTuBznvTKrsssXOFJdYN+KnXDyKU=; b=qKSiSiwNW1uI8ORsZds65zVBrjsrTwxnHMSNcSTWaLJ4RTCfIFfa4i+/rOoRyAchtZ u93CRfrF+wrqfHIqnGIZ2GGeL+41X57AWe4PkWxYRlZXqKYqpBippEgUA+entGOvGxLN ciQYslYIIw6GhPwhMYnJDx0Qih0fBxovHA0As= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715287868; x=1715892668; 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=KmgZyGJ6WZhyygeOTuBznvTKrsssXOFJdYN+KnXDyKU=; b=Ol7dQOvRhUy7d3zpr136veA5U00nhNkybpxIHlA2SXCaOOrRJ7zL0FHsqBHDppY7Uk GLeVyx1H178GvN8CnPuW5jlTajBqnmng0WGFsKZTcWFqb+r6D61dX/JrhF5l/JNsfJ6A Q/fpZHb3Z9UKHeqKUhaHt2sgWOchrBC5C5tu7j0iMpaApF7RG0N9spZYdmE5nRL5nQqj hQjgEBnXrbDhEDMVkQfgosPI0aZFHH1jddHNhcOUnVJbhPdp+wRj4XChNq9SHfpbymBH pNnia2g4V5cueB/1Lr4i9Z8O9Ujl0acY2rV2QNZuIPC2t+oSfgK3eP9TIdCEoyoSH0EN Xokg== X-Gm-Message-State: AOJu0YywLSsg6HNZTRdOY9kjUbQFKfTO9CLqulbBttBdoHKrWcYxDHx2 tQo5+VvheudRe15cFrjw23EDagyLXplsk7YgKiBhWKmVsHmh8N6oab55URkUDcbKfJnyjw1hfqb nkPVTBBYdSaur7lA8NpZaSuSbgp25VDMUq8JtU6dzz6OVfj+r9YbNM6urSUjAS8/u+WV6XFDCwa r1cZGx+29chx8LchROaP/o37Oao0JyZmsCXKIk+YTbDXU= X-Google-Smtp-Source: AGHT+IFAC02y7XWbzyZ9poYznCRhteDMrS6y/6vnrp3VuOJIRuyyMgREUL36urHGU3CvlHCx24DmMQ== X-Received: by 2002:a17:902:d4c2:b0:1ec:ad62:fe87 with SMTP id d9443c01a7336-1ef44059628mr10146585ad.56.1715287867290; Thu, 09 May 2024 13:51:07 -0700 (PDT) Received: from localhost.localdomain ([2620:11a:c019:0:65e:3115:2f58:c5fd]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1ef0badb959sm18677365ad.85.2024.05.09.13.51.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 May 2024 13:51:06 -0700 (PDT) From: Joe Damato To: linux-kernel@vger.kernel.org, netdev@vger.kernel.org Cc: mkarsten@uwaterloo.ca, nalramli@fastly.com, Joe Damato , Jakub Kicinski , Tariq Toukan , "David S. Miller" , Eric Dumazet , Paolo Abeni , linux-rdma@vger.kernel.org (open list:MELLANOX MLX4 core VPI driver) Subject: [PATCH net-next v4 2/3] net/mlx4: link NAPI instances to queues and IRQs Date: Thu, 9 May 2024 20:50:55 +0000 Message-Id: <20240509205057.246191-3-jdamato@fastly.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240509205057.246191-1-jdamato@fastly.com> References: <20240509205057.246191-1-jdamato@fastly.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Make mlx4 compatible with the newly added netlink queue GET APIs. Signed-off-by: Joe Damato Tested-by: Martin Karsten Acked-by: Jakub Kicinski --- drivers/net/ethernet/mellanox/mlx4/en_cq.c | 14 ++++++++++++++ drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 1 + 2 files changed, 15 insertions(+) diff --git a/drivers/net/ethernet/mellanox/mlx4/en_cq.c b/drivers/net/ether= net/mellanox/mlx4/en_cq.c index 1184ac5751e1..461cc2c79c71 100644 --- a/drivers/net/ethernet/mellanox/mlx4/en_cq.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_cq.c @@ -126,6 +126,7 @@ int mlx4_en_activate_cq(struct mlx4_en_priv *priv, stru= ct mlx4_en_cq *cq, cq_idx =3D cq_idx % priv->rx_ring_num; rx_cq =3D priv->rx_cq[cq_idx]; cq->vector =3D rx_cq->vector; + irq =3D mlx4_eq_get_irq(mdev->dev, cq->vector); } =20 if (cq->type =3D=3D RX) @@ -142,18 +143,23 @@ int mlx4_en_activate_cq(struct mlx4_en_priv *priv, st= ruct mlx4_en_cq *cq, if (err) goto free_eq; =20 + cq->cq_idx =3D cq_idx; cq->mcq.event =3D mlx4_en_cq_event; =20 switch (cq->type) { case TX: cq->mcq.comp =3D mlx4_en_tx_irq; netif_napi_add_tx(cq->dev, &cq->napi, mlx4_en_poll_tx_cq); + netif_napi_set_irq(&cq->napi, irq); napi_enable(&cq->napi); + netif_queue_set_napi(cq->dev, cq_idx, NETDEV_QUEUE_TYPE_TX, &cq->napi); break; case RX: cq->mcq.comp =3D mlx4_en_rx_irq; netif_napi_add(cq->dev, &cq->napi, mlx4_en_poll_rx_cq); + netif_napi_set_irq(&cq->napi, irq); napi_enable(&cq->napi); + netif_queue_set_napi(cq->dev, cq_idx, NETDEV_QUEUE_TYPE_RX, &cq->napi); break; case TX_XDP: /* nothing regarding napi, it's shared with rx ring */ @@ -189,6 +195,14 @@ void mlx4_en_destroy_cq(struct mlx4_en_priv *priv, str= uct mlx4_en_cq **pcq) void mlx4_en_deactivate_cq(struct mlx4_en_priv *priv, struct mlx4_en_cq *c= q) { if (cq->type !=3D TX_XDP) { + enum netdev_queue_type qtype; + + if (cq->type =3D=3D RX) + qtype =3D NETDEV_QUEUE_TYPE_RX; + else + qtype =3D NETDEV_QUEUE_TYPE_TX; + + netif_queue_set_napi(cq->dev, cq->cq_idx, qtype, NULL); napi_disable(&cq->napi); netif_napi_del(&cq->napi); } diff --git a/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h b/drivers/net/eth= ernet/mellanox/mlx4/mlx4_en.h index cd70df22724b..28b70dcc652e 100644 --- a/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h +++ b/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h @@ -380,6 +380,7 @@ struct mlx4_en_cq { #define MLX4_EN_OPCODE_ERROR 0x1e =20 const struct cpumask *aff_mask; + int cq_idx; }; =20 struct mlx4_en_port_profile { --=20 2.25.1 From nobody Sun Dec 14 12:18:04 2025 Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) (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 52CDD8594C for ; Thu, 9 May 2024 20:51:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715287874; cv=none; b=ltyBi2f+RYy8UGs8yf3U+yv3XgjSshOd/jBfWd0L0OCiXNF3vTObFkMND7rtfe1cLWp3zh1hOQDzALXeg1UY23dfuiP8aCNs7QmEtnQzEO8UinlEg7UUlddMCAKfyqhB1ZnLpKeoV0H0nOrKqcP3Q3ByfyaFap585TxtNSNOqhY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715287874; c=relaxed/simple; bh=jh0q0ulQ5LcPy3XQUg0Ue3n4pGfewvXGaX+N3ICGH+Y=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=bGEDKufsvxZR7Km5+K35YRookfADO/ilEs7e7tW4BbqoF3JU2hhny2ABmaOYQoFC+7lQ94HPjmMHauWxdPtk5b/nnsDnn80/IGCo8Ln0O3SqM1A/FboMPV1bkzDpswcOuAqmW8CF5ptF/XH//vVaBgEwcQtCelBpDN9MIDIeo1Y= 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=jXh2kqeU; arc=none smtp.client-ip=209.85.214.177 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="jXh2kqeU" Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-1e83a2a4f2cso8219855ad.1 for ; Thu, 09 May 2024 13:51:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastly.com; s=google; t=1715287869; x=1715892669; 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=No8/jmvB2lIMy6tK61c0Wm+y+Z2VaVEhQDXdDb8ENDg=; b=jXh2kqeUaVQ0nhfXGHTIL23aws5KMCR8Yscd7r1sehBwfSwQRHDjCnXqcnG0IRr0oH 3a+hKH2nHUvzXiXJA9/y/H35CGqSW2LAh6Wx5h13meATPrwl3nalSImdxrrhXHWILNuv 4JPlAyjSq+MMJEmRPYcZXa80RgNMRcWQWZ1i8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715287869; x=1715892669; 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=No8/jmvB2lIMy6tK61c0Wm+y+Z2VaVEhQDXdDb8ENDg=; b=rjgk6kTy2f8b8RllptdGNjokgXDUrbBU+cvzh5pUrMJG7gjTQFDlapT5Qjq9rQnNRH ZPlpxTdrQwi509/Thc7PqwGb46q6N+q22BHmY1iSFFZc239Jo4scpUnrqxdfG5R/V305 MMcvIuLvZojUACgjFuI1CdLP4WeGYomV+r0kDgkUJ9dMQ/q5ovlKR40TjWbeo6to7eV8 4VUezAjcSx2TU+uRqDrRGPJXC3oVbGOzmn1DRiqbK8z/wp54/dE1QJnkoHwCOABYJThe 8F3qVePAWyHgC7PdhfzxK+IRDywQxh1/iUTX2ipY2LB2oY7rBDq6dmuxFplogvLBjyQU JHXw== X-Gm-Message-State: AOJu0YxvM3ystQaMTz0vDWzQOPUsaloAVlIU5DpxkMAGWlzdtg7G+mRo aiUcSJZ6+QzdZVEW9LHiLu3g4AN3WEQisDgq4Uyh5QEkrOHmFOmvAktAVGQHIgWIC2LKF093WqM KYoLNcVCqPMoz7EcmFgPMSASPOLSgM64oxjXypS94+t8tPs7x+4W0tJBqznUfbVEXUNjFTGejzz WCbR33NTqp1WhkvhmelK9TE+FzVaVqkLhckeEbcrH/ouo= X-Google-Smtp-Source: AGHT+IFdJzoOlK3+2PZn0yWAVQ5SUDkUUcQQGgjCs9iyqPeiJ5XXgMJqnpVya2oFF/6RdwbW0XGY1w== X-Received: by 2002:a17:902:f812:b0:1eb:1474:5ef5 with SMTP id d9443c01a7336-1ef43d2ea72mr6154495ad.33.1715287868873; Thu, 09 May 2024 13:51:08 -0700 (PDT) Received: from localhost.localdomain ([2620:11a:c019:0:65e:3115:2f58:c5fd]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1ef0badb959sm18677365ad.85.2024.05.09.13.51.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 May 2024 13:51:08 -0700 (PDT) From: Joe Damato To: linux-kernel@vger.kernel.org, netdev@vger.kernel.org Cc: mkarsten@uwaterloo.ca, nalramli@fastly.com, Joe Damato , Tariq Toukan , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , linux-rdma@vger.kernel.org (open list:MELLANOX MLX4 core VPI driver) Subject: [PATCH net-next v4 3/3] net/mlx4: support per-queue statistics via netlink Date: Thu, 9 May 2024 20:50:56 +0000 Message-Id: <20240509205057.246191-4-jdamato@fastly.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240509205057.246191-1-jdamato@fastly.com> References: <20240509205057.246191-1-jdamato@fastly.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Make mlx4 compatible with the newly added netlink queue stats API. Signed-off-by: Joe Damato Tested-by: Martin Karsten --- .../net/ethernet/mellanox/mlx4/en_netdev.c | 73 +++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/drivers/net/e= thernet/mellanox/mlx4/en_netdev.c index 4c089cfa027a..fd79e957b5d8 100644 --- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c @@ -43,6 +43,7 @@ #include #include #include +#include =20 #include #include @@ -3099,6 +3100,77 @@ void mlx4_en_set_stats_bitmap(struct mlx4_dev *dev, last_i +=3D NUM_PHY_STATS; } =20 +static void mlx4_get_queue_stats_rx(struct net_device *dev, int i, + struct netdev_queue_stats_rx *stats) +{ + struct mlx4_en_priv *priv =3D netdev_priv(dev); + const struct mlx4_en_rx_ring *ring; + + spin_lock_bh(&priv->stats_lock); + + if (!priv->port_up || mlx4_is_master(priv->mdev->dev)) + goto out_unlock; + + ring =3D priv->rx_ring[i]; + stats->packets =3D READ_ONCE(ring->packets); + stats->bytes =3D READ_ONCE(ring->bytes); + stats->alloc_fail =3D READ_ONCE(ring->alloc_fail); + +out_unlock: + spin_unlock_bh(&priv->stats_lock); +} + +static void mlx4_get_queue_stats_tx(struct net_device *dev, int i, + struct netdev_queue_stats_tx *stats) +{ + struct mlx4_en_priv *priv =3D netdev_priv(dev); + const struct mlx4_en_tx_ring *ring; + + spin_lock_bh(&priv->stats_lock); + + if (!priv->port_up || mlx4_is_master(priv->mdev->dev)) + goto out_unlock; + + ring =3D priv->tx_ring[TX][i]; + stats->packets =3D READ_ONCE(ring->packets); + stats->bytes =3D READ_ONCE(ring->bytes); + +out_unlock: + spin_unlock_bh(&priv->stats_lock); +} + +static void mlx4_get_base_stats(struct net_device *dev, + struct netdev_queue_stats_rx *rx, + struct netdev_queue_stats_tx *tx) +{ + struct mlx4_en_priv *priv =3D netdev_priv(dev); + + spin_lock_bh(&priv->stats_lock); + + if (!priv->port_up || mlx4_is_master(priv->mdev->dev)) + goto out_unlock; + + if (priv->rx_ring_num) { + rx->packets =3D 0; + rx->bytes =3D 0; + rx->alloc_fail =3D 0; + } + + if (priv->tx_ring_num[TX]) { + tx->packets =3D 0; + tx->bytes =3D 0; + } + +out_unlock: + spin_unlock_bh(&priv->stats_lock); +} + +static const struct netdev_stat_ops mlx4_stat_ops =3D { + .get_queue_stats_rx =3D mlx4_get_queue_stats_rx, + .get_queue_stats_tx =3D mlx4_get_queue_stats_tx, + .get_base_stats =3D mlx4_get_base_stats, +}; + int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port, struct mlx4_en_port_profile *prof) { @@ -3262,6 +3334,7 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int= port, netif_set_real_num_tx_queues(dev, priv->tx_ring_num[TX]); netif_set_real_num_rx_queues(dev, priv->rx_ring_num); =20 + dev->stat_ops =3D &mlx4_stat_ops; dev->ethtool_ops =3D &mlx4_en_ethtool_ops; =20 /* --=20 2.25.1