From nobody Sun May 19 15:29:21 2024 Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) (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 298C0125AE for ; Fri, 26 Apr 2024 18:34:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714156451; cv=none; b=tmcQTOw9Y9x3yBnyqmyatDLo/13UIr+fmnklk4P66pXmdJLrWpgT2Wc7apxxoMs2q0P8Qlql5gYzv3xPjqaK3JXrpeE+duC+13ZhvODWom+pn+16FzegLEMWbqRnvIKWdyf1mUrebLUMPPaCd25rOz73I0gFF3IXOXcf1GBmwmg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714156451; c=relaxed/simple; bh=vHW1DL0lxBdtpusUhIuDr8YiecZhEDqf3QUX1YWqzBU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=CySsZb/DXVVbvL5c/cpxSq1JXTsSPEpLbDKwsGkaEQbs/gxqEX0gwFtDUqpc3jQhdDeoCEfvoWbnGQJZUfs1QcSYiO1gYtIcMCh3gwPTJUhXyWiDm8LUmAWQ1Zm6EKXY410lBPBYJeURLfUr8E7CHNnaDoFkjvIb3D4g4cBbZ3w= 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=SiRoxZi6; arc=none smtp.client-ip=209.85.214.172 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="SiRoxZi6" Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-1e83a2a4f2cso17102655ad.1 for ; Fri, 26 Apr 2024 11:34:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastly.com; s=google; t=1714156448; x=1714761248; 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=aqaAQgdA856jvIs7dAW5ZIMPYVryl65URaMxVc//Sq0=; b=SiRoxZi6yDcS7xehwrjfxyCY3jGc6AAAdpeCGyiTmJmoT7ywIEGPo7WZ+YiSXnO1Nf SOHhjebIOgI4KiAdoB6ZlxyTP6SQKI4aBarpXaiOy7G986qTar+Hi0TpPtdFzLTZZyJ+ sGj5NWmI1QoHbMyyVsh2/RrSDh5dU0IsQn7Yk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714156448; x=1714761248; 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=aqaAQgdA856jvIs7dAW5ZIMPYVryl65URaMxVc//Sq0=; b=ZFtx5Qo9qC/YBlXr+UFUIfQgFeB6u9cpQMDl7/NbFRWWds8U17wjZ7R9jrEL6DLrUO 8beObqC/EkHH9QEcxBJWzpmjV8Ld/r9aHAZCP2K6i5p604UrpbnJ1v1ZeTny1sATFmHP UI9/OvMjWaTu19TyPI1BlSkbveAVZjbw7DxHMxKE0b4cAshTm722WQhsAA51IsexNy3v s4T8gmtjf7LCaTSWZUXgMkAc5/wjNm1ccvNXJLbXla94KTtQ8NCNpdY1KvJ/o2xLXt1+ i8+86kiOqFwPJEDJ5bUtf6BiT5ENam1+66olwpO/6r0rA5hEkktDAcP4+0qCbYbalt7D w95A== X-Gm-Message-State: AOJu0YzjTEDcT7wCXt3Y0wd2aUgE2vdbnkf4skuvud20h2ogEvBZHnYC czCSvVV8TRsy3dT9gna77j0DKQEXguqva1uV02zHMsOrCeZaEIqzOg6MlpLmKx5A0vpqqwqbY/b iayYtqT30PpZgrpVRR3s/oOK1cI+7m+UamIUa5Kr6ePpBdlwwIXTobexrQWt74v10pNvg7Pf18f UDMeVEttBavDpuum9JDEEDr3jQPUOH8XehH6uopNGFoD4= X-Google-Smtp-Source: AGHT+IGmOBABSwmeCyrHpqNf6ZoNtezrLaurXRxgwMJaiE7lf1v3+4wY7GFcM3RlNtf1RT1PE1g6qw== X-Received: by 2002:a17:903:1205:b0:1e4:ccf6:209f with SMTP id l5-20020a170903120500b001e4ccf6209fmr4140136plh.28.1714156447894; Fri, 26 Apr 2024 11:34:07 -0700 (PDT) Received: from localhost.localdomain ([2620:11a:c019:0:65e:3115:2f58:c5fd]) by smtp.gmail.com with ESMTPSA id j23-20020a170902759700b001deecb4f897sm15713152pll.100.2024.04.26.11.34.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Apr 2024 11:34:07 -0700 (PDT) From: Joe Damato To: linux-kernel@vger.kernel.org, netdev@vger.kernel.org, tariqt@nvidia.com, saeedm@nvidia.com Cc: mkarsten@uwaterloo.ca, gal@nvidia.com, nalramli@fastly.com, Joe Damato , "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 v2 1/3] net/mlx4: Track RX allocation failures in a stat Date: Fri, 26 Apr 2024 18:33:53 +0000 Message-Id: <20240426183355.500364-2-jdamato@fastly.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240426183355.500364-1-jdamato@fastly.com> References: <20240426183355.500364-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. struct mlx4_en_rx_ring has a dropped field which is tabulated in mlx4_en_DUMP_ETH_STATS, but never incremented by the driver. This change modifies mlx4_en_alloc_frags to increment mlx4_en_rx_ring's dropped field for the -ENOMEM case. Signed-off-by: Joe Damato Tested-by: Martin Karsten --- drivers/net/ethernet/mellanox/mlx4/en_port.c | 5 ++++- drivers/net/ethernet/mellanox/mlx4/en_rx.c | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx4/en_port.c b/drivers/net/eth= ernet/mellanox/mlx4/en_port.c index 532997eba698..47541f7666f2 100644 --- a/drivers/net/ethernet/mellanox/mlx4/en_port.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_port.c @@ -151,7 +151,7 @@ void mlx4_en_fold_software_stats(struct net_device *dev) { struct mlx4_en_priv *priv =3D netdev_priv(dev); struct mlx4_en_dev *mdev =3D priv->mdev; - unsigned long packets, bytes; + unsigned long packets, bytes, dropped; int i; =20 if (!priv->port_up || mlx4_is_master(mdev->dev)) @@ -159,14 +159,17 @@ void mlx4_en_fold_software_stats(struct net_device *d= ev) =20 packets =3D 0; bytes =3D 0; + dropped =3D 0; for (i =3D 0; i < priv->rx_ring_num; i++) { const struct mlx4_en_rx_ring *ring =3D priv->rx_ring[i]; =20 packets +=3D READ_ONCE(ring->packets); bytes +=3D READ_ONCE(ring->bytes); + dropped +=3D READ_ONCE(ring->dropped); } dev->stats.rx_packets =3D packets; dev->stats.rx_bytes =3D bytes; + dev->stats.rx_missed_errors =3D dropped; =20 packets =3D 0; bytes =3D 0; diff --git a/drivers/net/ethernet/mellanox/mlx4/en_rx.c b/drivers/net/ether= net/mellanox/mlx4/en_rx.c index 8328df8645d5..573ae10300c7 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->dropped++; return -ENOMEM; + } ring->rx_alloc_pages++; } rx_desc->data[i].addr =3D cpu_to_be64(frags->dma + --=20 2.25.1 From nobody Sun May 19 15:29:21 2024 Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) (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 CE8991B7FD for ; Fri, 26 Apr 2024 18:34:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714156452; cv=none; b=DBbM910UlNKUcS7NdnoAHDfSZjXlXRu3MO31VKL3yCPCofj410MuGYKUWyh5HbDRUvUFdSEeI1cXbZ1uwLaSqPZYp+//FsjZ9q1EcCnn7/bQpooZquQdYq24YPMX+3KOyTxhTVE5eOPVfeUjfd7BFKn6ff5/wezkb/JRzLxTdNg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714156452; c=relaxed/simple; bh=z7MYz1SqSvvk6nW/0aA7VzXJvv/C3aolR9fi0nj1t1s=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=NtYN7llIxyovT5rG2lE+ZiP5IEsnGPGY+GLKGgp7NhqzFIJ+IHdSuspLcck1WF33K6cYU+H12UEeVfbdfzYIige7nOZDWq8xWNxpDNWlI6Z4Ppml34e90sKRXeR9SlfJn/v9XBX9KiyNuFQUqIIq9PsHU+w/n1kVVFusqeph9qM= 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=KL+zdN+O; arc=none smtp.client-ip=209.85.214.175 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="KL+zdN+O" Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-1eab16c8d83so19387855ad.3 for ; Fri, 26 Apr 2024 11:34:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastly.com; s=google; t=1714156450; x=1714761250; 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=Fnj34GfYIADDHYe9QxZ0tA9OymLxhmbsRufEPA1lFlk=; b=KL+zdN+OIMESqIa6bHCDBUP0MeSrePl/9WrD9dDeQyUV38WjUjwZVZkegN9eicu1n/ C5AlXmcUSk5/K+vhkRbKprDH9VKAUN18Rm5ObjKMNAU/jXidI+ZNCjk5daJjHc98tNbY CqDsu57b/mMsZ4aZPGRdRdfK+K8ijGo1FrVXc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714156450; x=1714761250; 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=Fnj34GfYIADDHYe9QxZ0tA9OymLxhmbsRufEPA1lFlk=; b=m56amYPJLQoGZrVX3k7KKEWe7lmg4/rU32LhtnvKMBu0dfUqre0Dc3suvZESbJrxA7 pdfBtd9rqGHp+55I4Py7IxxJvpWOCkdSWZNTlHzaM12+zepUkkt4cq5GIsyVjG9FUsFc jFXswcjpYf9r5VhPA8Zr/U4AzmYXX7sFMD6i3fldN+31dRxClFc+PFpUm4vh+0Lz2myF AeLG0rAsJKJ6ENefl7ofRNGU9WNLiW9JmykZ5cV4QFrNrFupD3+W9YG3eMXeHtrVdE+O ZNtK2vHFz042B3iwmDi6UBZEkUkyvYFocSCqTRA5mls1swH1OnquZGZrI+cagQ6jYokP zWqw== X-Gm-Message-State: AOJu0YyLTRZ2DvX9GVsCDzuNlJPgZDqBYJa4X3W9PMtxJSve1BlkiLQq iqClpYERzXzJQCeHRP0IX0JPeYo9rJnO8sxMjUOo638j692A9HFdlMQLOSjshcYhAqu8pUP/uK4 0ncBBsXQltS6EXEV0RNNcWDrp7WnC33ZqfRyAwyVbKVVmsEgD2ExKP1eGMqypNpdor39JehxORl qhf0dOaGxUs1mcJkIKwR56O/6Kgp+fw9rakqMbWh+/ZBw= X-Google-Smtp-Source: AGHT+IGZIOzj2H8FqiVmmHXgMXRX0ZqydYegzeUCwj981ToCy0Qyjz0/sEw94VO7ZNVIcGwOrkdcCQ== X-Received: by 2002:a17:902:b20f:b0:1ea:fb65:a0c9 with SMTP id t15-20020a170902b20f00b001eafb65a0c9mr3018377plr.20.1714156449597; Fri, 26 Apr 2024 11:34:09 -0700 (PDT) Received: from localhost.localdomain ([2620:11a:c019:0:65e:3115:2f58:c5fd]) by smtp.gmail.com with ESMTPSA id j23-20020a170902759700b001deecb4f897sm15713152pll.100.2024.04.26.11.34.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Apr 2024 11:34:09 -0700 (PDT) From: Joe Damato To: linux-kernel@vger.kernel.org, netdev@vger.kernel.org, tariqt@nvidia.com, saeedm@nvidia.com Cc: mkarsten@uwaterloo.ca, gal@nvidia.com, nalramli@fastly.com, Joe Damato , "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 v2 2/3] net/mlx4: link NAPI instances to queues and IRQs Date: Fri, 26 Apr 2024 18:33:54 +0000 Message-Id: <20240426183355.500364-3-jdamato@fastly.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240426183355.500364-1-jdamato@fastly.com> References: <20240426183355.500364-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 efe3f97b874f..896f985549a4 100644 --- a/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h +++ b/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h @@ -379,6 +379,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 May 19 15:29:21 2024 Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) (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 503FB2134B for ; Fri, 26 Apr 2024 18:34:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714156453; cv=none; b=g8f3gmXB1eOFoQx5oPBYmNX4sQVIaN3AA3HHAnANdA7z7L1yKmB4vxdHOiSi9IXvO5olSNnqpzCAlNVOFT02Fb4BZdW6ELYK7ji8XDWTzcdt3+rwrD0olF557EXx4KwD/13NzriC6hlN3I+dh/47HGAVBmjhmC0YdU4KHioQrGU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714156453; c=relaxed/simple; bh=MLuvGJ/zA1iclcyHt/GxmXZCz5tS19mI8X3ZFBvh8do=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=uXM5O8R7+oRwIxhrUMkxVpCW5L35EDXN2UDKEEpMngvMI/w+H+oAF9ypocSQu7uvgfol4hTIVwNkFJAbjtrdUjUa8Q4Hlo6lKWwAnTbbLJb2J2MBODvurR2lklR0NjtLuSkqd9cB10UOTtCBbagPb2oeDjFfTePOgF9Tn7NcoWY= 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=PS19TAq3; arc=none smtp.client-ip=209.85.214.175 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="PS19TAq3" Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-1e8fce77bb2so19293315ad.0 for ; Fri, 26 Apr 2024 11:34:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastly.com; s=google; t=1714156451; x=1714761251; 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=FvWkUDJTV88ioDILsOGCqcHdicMQ5/7lOhgwRuMptVU=; b=PS19TAq3fZDuOmElwvm4aY25ENEM+vR9XOJEbtlR79rMVLfExkKE6Uvdbv8KmpW09j a5ztdq/SlHm4DXkzwTnKWl3y3YmCri8fBi2T7vvAqqDM4TdiSTFKA8I83JMXcW4LBF3V tP9zfEduvPwtYPXBp1Ys7sj6odRVHm3eW4Qv8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714156451; x=1714761251; 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=FvWkUDJTV88ioDILsOGCqcHdicMQ5/7lOhgwRuMptVU=; b=QjklNIiV25MtS5V6qoVNxsmL4TEpz0c8mIShIEjEWF0iddF6TCoQ6F2FehuabCgTNY 7bt9w8tWOGE2QqIg3ASK2jBei/QmqgXDQteC2iA+7YFggmbjLwKbXaluqCRchMCoRJV4 REh3tMzKHHXSD3hi68WQClYUTkBEpdlvCB3B1OCPC2SaIfs14mO924LlovyXWu0yxDte f3LAF15bo7afKrZhLdH38Sj1ObjI2hKaHRr3n9qISsIwrkXjlPGDeWhQCDzY6qMASS7B BjTd59Wj3yUQOa/ma5FWjahIMlnV31OHfLbit6OArBYQ50yw/dn12dgPoNOAQmH1ANUl 5Pjw== X-Gm-Message-State: AOJu0YygXvLx9yDYNcp4CeiYCMEgmY1EfuovClLB08ruG8qfEkLeuqj2 9chZKLodgBlrOJfehW53hl4zUmwLODNu/yBYQSn+8ilGoGDbYFNNmZWWQ7xPfmi7T+HO9Feed8+ LjftpzzcPDlicluVrNsqGlSpYTs/E0mGUn7QncuVKN8vETT3Q8xnmC5cOQUgmpFILAmWE0DE3dW VwgkHbButX8rpz/7Qf5Q+C8f8PvhgzHZixBBGFGz2l3Kg= X-Google-Smtp-Source: AGHT+IEL2BH46uz5mSu+XJ6KKa6VNvwHhbLsO2C+ij6hWATE+1ghZzydX50iems5S/LvEF8wTN3Zjw== X-Received: by 2002:a17:902:c40f:b0:1e9:cf94:5bea with SMTP id k15-20020a170902c40f00b001e9cf945beamr4414909plk.35.1714156451222; Fri, 26 Apr 2024 11:34:11 -0700 (PDT) Received: from localhost.localdomain ([2620:11a:c019:0:65e:3115:2f58:c5fd]) by smtp.gmail.com with ESMTPSA id j23-20020a170902759700b001deecb4f897sm15713152pll.100.2024.04.26.11.34.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Apr 2024 11:34:10 -0700 (PDT) From: Joe Damato To: linux-kernel@vger.kernel.org, netdev@vger.kernel.org, tariqt@nvidia.com, saeedm@nvidia.com Cc: mkarsten@uwaterloo.ca, gal@nvidia.com, nalramli@fastly.com, Joe Damato , "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 v2 3/3] net/mlx4: support per-queue statistics via netlink Date: Fri, 26 Apr 2024 18:33:55 +0000 Message-Id: <20240426183355.500364-4-jdamato@fastly.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240426183355.500364-1-jdamato@fastly.com> References: <20240426183355.500364-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 Reviewed-by: Jakub Kicinski --- .../net/ethernet/mellanox/mlx4/en_netdev.c | 79 +++++++++++++++++++ 1 file changed, 79 insertions(+) diff --git a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/drivers/net/e= thernet/mellanox/mlx4/en_netdev.c index 5d3fde63b273..6875f8c5103a 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,83 @@ 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; + + if (i < 0 || i >=3D priv->rx_ring_num) + 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->dropped); + +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; + + if (i < 0 || i >=3D priv->tx_ring_num[TX]) + 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 +3340,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