From nobody Sun Feb 8 20:37:04 2026 Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.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 E656F181312 for ; Thu, 2 May 2024 21:26:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714685198; cv=none; b=b77BHQn4S2pHzwaaypa0t9WUbJ98CH1Bv8afMVVLHY+h/xO8e/IlIK1RrC8h8n/UOjxH0ZCQahKxHfxmwbNW1IRgaFfp3X6matyxBKfCaOhdDNPclQAAIRXmHOp6tE2nO0WFVBtrm9mE0M3mjxwqzUqoZJ3Tdw0tiz4hfAF24BQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714685198; c=relaxed/simple; bh=FXv+vJcBCmEgOu5jScWUmm7QGv45QW6i+T+dLFjv6OY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=NY2Bw3VWhrC49Y6GuS0CAiFaNrMSCK/F0Q6pW7rH6HcEjPNnDqsN4GiDtC//eDFTJjWhnfqjuftNo1XSmL49CIvPrghhUYWp57QTkDBMkcsUjB7AhGQFYJmjEs4QuHreoEhhuwRAt9B11CCEJLmgJ51G1tuOQvOtUR6V+VTlNgQ= 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=DAANplb8; arc=none smtp.client-ip=209.85.210.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="DAANplb8" Received: by mail-pf1-f170.google.com with SMTP id d2e1a72fcca58-6f42e9221bbso1688946b3a.2 for ; Thu, 02 May 2024 14:26:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastly.com; s=google; t=1714685196; x=1715289996; 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=/jgR8JD3oQd88EH8HKGjA3Az+hSDzBJU5y5/SDxJYdM=; b=DAANplb8T8epsb7QiagB9494a98DfQ2G1zai+CmFE/BJ8x/eMqVrLKjRHIqjQX2O+v NrUQk4UPZkwKJUDoSfhOZx4KzHdh8Vt0kePRQiBoISWV7SmCvfHdL2WfuAzB68TCWciq xKDILOO6d1/zqZQ0fBpHQ9AXWw3e/xew+qfMM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714685196; x=1715289996; 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=/jgR8JD3oQd88EH8HKGjA3Az+hSDzBJU5y5/SDxJYdM=; b=FJ8YZ2cdxDdWYgqnbsXrKLX6IQU9cLd2RvJNOJeI3uc/P16YLFrGMdLyWLNSLApc3k IxSiuXygMecUJEJQsVn0PqITMj6+HBuz1hKzqpAeSzqDaEbMIwtPbXMFBEwg2zu6cycD 9j8CJ6OP0+krNf18R8yHHEVfjxgaWjv//i9WzhfpOxMFck+M21++Q/6mwtxIsNXu0PdH 1e97LSNXwliQwPGXJsQsXFU7NBOkaO3gpYMIwpQqJjSOQk9fmUqP/hMSinzOJf4vAsny eD8WD65aqRr7kcvYBRYe5RETPqRVK2SlBOrzns1t/QbQRcNyGeRMyDknNdZGWybxOs3P q93g== X-Gm-Message-State: AOJu0YzlTDOaLlqCs/1Jhru2Iq9JlFdvxdZg+ftOvNkxx6uyM/zU1aD/ 45tFi4NFw8XaaR2eP37/e99VEEYhKMH526J6nC/tftVFqdJX87Y2KxL12EjaqVy13kwO2+VdUbd TCHkMterLuOsYEBzadbPK/dqf7Q0iwDC0Y7MPCRmlozIbaR/R7Onc48B1phBduDcvdKNLOFdJNP X9TVvCX3H1FiDUAwuZ6j5Wgde9HGIxKxcRhFhUlLK5ED0= X-Google-Smtp-Source: AGHT+IHJviS1wozqDADgp5NssiZSlqz3RTUpOU3MNs7wdW2gVo+a7TIkffxM2G6uXIzsaRMwMWuSKg== X-Received: by 2002:a05:6a00:1305:b0:6ed:416d:e9a with SMTP id j5-20020a056a00130500b006ed416d0e9amr1014030pfu.7.1714685195864; Thu, 02 May 2024 14:26:35 -0700 (PDT) Received: from localhost.localdomain ([2620:11a:c019:0:65e:3115:2f58:c5fd]) by smtp.gmail.com with ESMTPSA id it21-20020a056a00459500b006f4401df6c9sm1371345pfb.113.2024.05.02.14.26.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 May 2024 14:26:35 -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 v3 1/3] net/mlx4: Track RX allocation failures in a stat Date: Thu, 2 May 2024 21:26:25 +0000 Message-Id: <20240502212628.381069-2-jdamato@fastly.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240502212628.381069-1-jdamato@fastly.com> References: <20240502212628.381069-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_rx.c | 4 +++- 1 file changed, 3 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..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 Feb 8 20:37:04 2026 Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) (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 81B89199E90 for ; Thu, 2 May 2024 21:26:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714685199; cv=none; b=avg1x0/A7SaH3N48ByJuDp5S8dcoHp2A+xIuGmn0qnp9k/f0vqjQu5R2xTgAh1j4D0+5kYSr7NbbkJZvV0ftfNDxwbxKaYZcNd1rp/4G4dU4GSn++nNRLLEkC2hDciV7oGmSTt3mPk3rcW9xmcsr2mHO+dQFM12ec/30yz4ze3U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714685199; c=relaxed/simple; bh=dJS8q1yCszBZ+lLPCiQajxvq+UjKIhzIwbPdmSX7BF0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=U+APohftu6zt4qD0Li1TnYVhLrJRLljg08qlry/oxlLH5YfAYYOoEaQs7IjjLzQmGAJCEHVdFPnGHSHZuTHMx2PId5eYDR25CaeeiymMspR4l6p/x6CWbWUcO/1qOkE2rkNsPoSs7NzuFw7+lZ1ByihisbQMpnb1aN/9OQkmREc= 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=L3pSwvEk; arc=none smtp.client-ip=209.85.210.179 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="L3pSwvEk" Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-6ed5109d924so7257793b3a.0 for ; Thu, 02 May 2024 14:26:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastly.com; s=google; t=1714685197; x=1715289997; 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=6/C+cLYdosM3H4Yw3Y6aWJybg0yb2tSDMEje896YPBQ=; b=L3pSwvEks/wXn9+4l6jb37/RVGMraaMhpG/24C5YjkLbkNJ3x7VIh020iE3uQjkFRp MOI0eJu9/UGFMwtjpRi1y+DfDOjux2/TDDvN1R5kA9ZApV54N4VGaOMVvZTJ2LTLvnpb TUazWCsqiIGQtz3kENyff8vx5eHyH3HoRWwdU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714685197; x=1715289997; 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=6/C+cLYdosM3H4Yw3Y6aWJybg0yb2tSDMEje896YPBQ=; b=V+0UYbFfg5hnKPAp7D5yxXtNr8VWwhOPQAi7pxc6nEX5r4sLAJKXHxVs/jDfQYTBLo OLepqkZXcIEvz/QDEx2dJrRTwphptuOactNJqm9F5u3oRn+anvRsWkt1eVnhoVlrtWB5 b2dkoem6mx4ikrd9mfcu5HB3P1uoC2JcvVx+dScW08t3tyJwRZpxT1o9pbxgNM1hlMKD fmuZEhokkXJl7Cn3v42NnsLCG6DMLHax2ochdPso/3Dqv8fkYvn0j3mMR5F4iRzs2UmK pvz+McC23lVZw4+FinhNK596TjKHl4jhpMEv2jtFUh68U8KFfc/0+KKnGhejI6Ry/ww+ IGHg== X-Gm-Message-State: AOJu0YwSA2+zleZpVw3N2J+VxoYaB3G+YhE/KiW93WPEAhkQvlsNz4DI 0DXp3TFVVOgDBJdIG1GbI3DpreOLh1BBEgqvzuTp4S1Ld0dS5rxIS+rIHbu4Rf6IUtKC2H0AIft m3LhT4LOPG8I/whuIGHglm/jCXqtCIsbUzwxKkxM53ozvtR3X1deM4z6QA5m800eojddJB3c8Fs LH138njUaOfsKFZQaV9UH86QD2MIgrnCk+8NO/iQp0jCI= X-Google-Smtp-Source: AGHT+IGnlpaC8zumkTxRpITcudE8g/yTTc8ly55djHSXPMF/0o0TmlF6310u5p0ntLwX43jWKgQQ2Q== X-Received: by 2002:a05:6a21:9990:b0:1af:66aa:f968 with SMTP id ve16-20020a056a21999000b001af66aaf968mr1170798pzb.20.1714685197492; Thu, 02 May 2024 14:26:37 -0700 (PDT) Received: from localhost.localdomain ([2620:11a:c019:0:65e:3115:2f58:c5fd]) by smtp.gmail.com with ESMTPSA id it21-20020a056a00459500b006f4401df6c9sm1371345pfb.113.2024.05.02.14.26.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 May 2024 14:26:37 -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 , Jakub Kicinski , "David S. Miller" , Eric Dumazet , Paolo Abeni , linux-rdma@vger.kernel.org (open list:MELLANOX MLX4 core VPI driver) Subject: [PATCH net-next v3 2/3] net/mlx4: link NAPI instances to queues and IRQs Date: Thu, 2 May 2024 21:26:26 +0000 Message-Id: <20240502212628.381069-3-jdamato@fastly.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240502212628.381069-1-jdamato@fastly.com> References: <20240502212628.381069-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 Feb 8 20:37:04 2026 Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.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 A08B11BF6F5 for ; Thu, 2 May 2024 21:26:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714685202; cv=none; b=Hv7Zjxbs/uyhJ5AzTz3Yq2tCufd1/fwXGvQakyEooddBE/H2ap1wp3ItB93xgyP7RPiSo6rKQ1RhNnJVclkDaL0nLqIYB6n87ER8k3hnJpfQh+GFc36wfcPuBhiREy8FaadpUAO9J7nCQacyO6SzuElv+BKo2M29D3NLaE63/Wo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714685202; c=relaxed/simple; bh=1kOXXplUo08+ODJHT/+Uy9/NKKn0D5hOO0fCSI3k7Oc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=UPi5A+vUVBoJsUKOIuFyZyn1Lmivql/H76QglNWIeyJ1J6Z9SlFwt2IRqduQja4QLgHJhxqJX3VCt5y469FsAe0lAfUtipNwvFPA1k+0fzjdPKKmcUEU1GjVo4sFilXZtSpZ0ZvBs6glXT5JIWqBa0auMBvAhsdLGUNYWssq3Hk= 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=nByT/CQk; arc=none smtp.client-ip=209.85.210.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="nByT/CQk" Received: by mail-pf1-f177.google.com with SMTP id d2e1a72fcca58-6ed9fc77bbfso6819581b3a.1 for ; Thu, 02 May 2024 14:26:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastly.com; s=google; t=1714685199; x=1715289999; 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=Nb3w24YsB4QKt3tkl4FaGZELaW6fLvSslAX1WvIMffs=; b=nByT/CQkSZTDQtziivWeY2UPupl+Dxr5VrsKBOEVK42NS+zJKtI0K6k1/kVp2/lN2a dib8HqOk7FIv5DS8L7+mIBRe2lZnisWCuhId3t3J4vt0FeJQO7EKjIcRY2R7wZyTub4C gJzFRqj3Mm/hLMaVu7d1PhTQBcyLnxyyocqbw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714685199; x=1715289999; 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=Nb3w24YsB4QKt3tkl4FaGZELaW6fLvSslAX1WvIMffs=; b=NJZbXe2IQwgV7nxlMOxXGkJXi/BduSMU6i+tA4SWlKTbH5ut3Ic3QcFYf3YtPxEoB1 eo/7IQUWLY6/jmBx1tZCMt58XhS2u3bgualGIDZCZLj+6rZa1mk7rfKOaORkBl865h2o YD3mDano1AT0YBmj2f4rKuyp79YbfNAJV6hdlPH9EanLoWERb4cXGVN2xRFn6go05dIN HZO3pT7f42vo8/DmctPFTPKTvfO336UoowySLLyjo2C15QAXXdPpmttULY3nWPyoMBb4 rKF0BM63IDBslrmrdIUlPizj7j4vBWha2cXZmvMASNRgmKKFOMy15bItWW/xnKn5Uch+ Ri/w== X-Gm-Message-State: AOJu0Yyu55pFjrCIIoODQeXzklUVixhaikp75TDU8eD7yzxddBJ5diRZ UyPJDW7PZ/A812p4kRPkxa78TzctSrBWmC3aFVE07acfGBMt93V7TwIgPLx/bqZHn0diy/g2hL5 PiYHfivl5KoSUY0zPMxPhkkTzON0dPPFVNaDUk5qe80Gct1Jl3MRRkCR6HwjXUbBPpg0vdcEiat v1XOfXGHT8E+KDSnP/7OUfaX1Cofkv7KQWfvNLiG6kUtg= X-Google-Smtp-Source: AGHT+IEPo3Y+zOYWFNH/+K23XID3oSDwAiGVF0Rhk4+kI4NT0CfE7SfrogwaZmFO853Jnfkv0aI4ow== X-Received: by 2002:a05:6a20:ddaa:b0:1a9:5ba1:3713 with SMTP id kw42-20020a056a20ddaa00b001a95ba13713mr1032630pzb.19.1714685199053; Thu, 02 May 2024 14:26:39 -0700 (PDT) Received: from localhost.localdomain ([2620:11a:c019:0:65e:3115:2f58:c5fd]) by smtp.gmail.com with ESMTPSA id it21-20020a056a00459500b006f4401df6c9sm1371345pfb.113.2024.05.02.14.26.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 May 2024 14:26:38 -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 , Jakub Kicinski , "David S. Miller" , Eric Dumazet , Paolo Abeni , linux-rdma@vger.kernel.org (open list:MELLANOX MLX4 core VPI driver) Subject: [PATCH net-next v3 3/3] net/mlx4: support per-queue statistics via netlink Date: Thu, 2 May 2024 21:26:27 +0000 Message-Id: <20240502212628.381069-4-jdamato@fastly.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240502212628.381069-1-jdamato@fastly.com> References: <20240502212628.381069-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