From nobody Sun Oct 5 14:37:49 2025 Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) (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 B7B2E1917F0; Sat, 2 Aug 2025 02:46:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754102809; cv=none; b=uVJIFZ/6lPA8x5KcE3uQ1TzMdTMtlC7kqdig2nGVzFh34biA6sgms65oRUqAvzLaaVcR0oY134PKdZ9qahZlSDV8PkMkNdNQfhxEZOSGrPVzQ+sE0kQePurT3WNotK31rLjJLrb/6TEfI5aAr3u0fYRlw0664qjVylL6R/SI9Co= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754102809; c=relaxed/simple; bh=CBRWugJOp0HWh4O1uxAbjFWkvcjAfo90Uk/yXGNiuvk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=anBA7IxVvQXZXWd4ihqEWnKZjt5051RZvhbI6fUqRK3b6p9Pw4QSC1JB+hvdUGkatFUDgfTud1O/4Txo9uP6MQ1RUBJ1lTiejkpXPpx/VVIE6wWGDzgJD9j5GMESdQH0a8G3V6AR0k9McohALIxFWFN8otbzXY6D6XWa7Pkho8I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=fp6QixMf; arc=none smtp.client-ip=209.85.128.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="fp6QixMf" Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-45618ddd62fso17105945e9.3; Fri, 01 Aug 2025 19:46:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1754102806; x=1754707606; 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=qy5A+Unrm1WOpi3y5RSzodSnZ2nO/DZmik1djpd7RO8=; b=fp6QixMfx8ynnvJtwoo4zvGOyY3pPSxvKGSVG33MzJ1h2doTV/YY9+ruRjRjth+64t e8K9Cia/lmmGa/OqImsL8HscBb3DkqKOslcohQEi5g16oeYAm7IR56WxZUo49Jbtkhts O2MK3kGQ77d/LPcFO9hOzCbZF0E0P1zevIoJI/aS2NgrcI2qzkweOP1QYKvg7II0s441 khbm6UCO21JMrcsBX2aKv4u+iaeWmKq5TEPJzvJ5ozfE7uCMbIUZDLKu+hHQqWEWsmx7 8VByBZHIpr/LOcEnOTlB4aLZKfwk1swT23g9sLBiU20m87e2LHzyfVVQXGRWLqRq5KrL xSNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754102806; x=1754707606; 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=qy5A+Unrm1WOpi3y5RSzodSnZ2nO/DZmik1djpd7RO8=; b=tKupPz2anpufAnlqPmkYIIF67p2ScR1bcHjQ27zH+sYHtivkXjtj90L4+4Aewt1hQ0 u3jSgyRg4JXBu1B13LOiEls4hNwC9wC2OIU05ULVH8fD5y+3NnqDEnwZXQXXkTX4nzYH JNyqflQcIPHDH+q3EAPq0gqTtjMECLfrTm8NYU0rvmKT2/e7zNXzbRf3Ch1AT3qZafuY HkvaMVQvnEVoRjQHTt/TiATSeCJDe6xRaC9jwhzWOuULg8ZOTUx/2YTsZchRfOvlnPWB VbNASVLtjCU6RW7aML3Xr+aBUt4nqsZcw6zXsnsaKSqzxSsTShoudipe7ZoE7YI3hQC0 LmtQ== X-Forwarded-Encrypted: i=1; AJvYcCXegux7UxrcuiYC5n/2AMInpf4eZ5qGfoyHnk0cHBxfuQ8WN4v63IkhRBDBFLEpFw5N9RVLqO+ZqguvJIU=@vger.kernel.org X-Gm-Message-State: AOJu0YyX1r27vEekY99MkMVd2UZ8r9e/fqHKwWxfRiW1PW2VSV5dumry t0P3OveUPbAahwL5iILbX/iSasjuE09vIjYTSTjE8Ti6fTbAA6fUYn6aGl3dTQ== X-Gm-Gg: ASbGnctVOzZQmT81Uzfv/pwyg13HRyJ+XzvQOt2zY1OqLo55zCapCmSC4cXEtLCwkKI dPUgSo3hHOdYTmf+dhpUJybo7HNFUyospK9e3cw9OXpnQqytTdZawxX8AZhx8RYlx2S2TurwxlE 40chVKo/dcUtmCNBjpkCj0lVjpoPyf7A/Va6p5e8Q2d3wPka5MBZ4fZq1gZSs168faiFjwtCgM8 dV0iuYkzLb4fArMcc1AJP6nZPfuXABI50bhfVYTnqD5W9Ijh9W+hCf80hPbgIeO3eBeJLLnWLfD EggYA+/kNX0avNyoyfeA8gF3V+7ub3k0PJfhxQHsMlIwUBJnXTN8vqiUUpTz56VYBWZG4SqHK9k 0khoFf3FiVSwd3NqCkOhI X-Google-Smtp-Source: AGHT+IFgaYOugESTsPfQ+QwJblm6z4dfzGMvlR//kYHseURm805R2n5IlJGtjdOIFyd8Sv9R8F05Rg== X-Received: by 2002:a05:600c:1c89:b0:456:2cd9:fc41 with SMTP id 5b1f17b1804b1-458b6b5872fmr10056545e9.20.1754102805336; Fri, 01 Aug 2025 19:46:45 -0700 (PDT) Received: from localhost ([2a03:2880:31ff:70::]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-458953cfeaesm133814155e9.16.2025.08.01.19.46.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Aug 2025 19:46:44 -0700 (PDT) From: Mohsin Bashir To: netdev@vger.kernel.org Cc: alexanderduyck@fb.com, andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com, horms@kernel.org, kernel-team@meta.com, kuba@kernel.org, linux-kernel@vger.kernel.org, mohsin.bashr@gmail.com, pabeni@redhat.com, sdf@fomichev.me, vadim.fedorenko@linux.dev Subject: [PATCH net 1/2] eth: fbnic: Fix tx_dropped reporting Date: Fri, 1 Aug 2025 19:46:35 -0700 Message-ID: <20250802024636.679317-2-mohsin.bashr@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20250802024636.679317-1-mohsin.bashr@gmail.com> References: <20250802024636.679317-1-mohsin.bashr@gmail.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" Correctly copy the tx_dropped stats from the fbd->hw_stats to the rtnl_link_stats64 struct. Fixes: 5f8bd2ce8269 ("eth: fbnic: add support for TMI stats") Signed-off-by: Jakub Kicinski Signed-off-by: Mohsin Bashir Reviewed-by: Simon Horman --- drivers/net/ethernet/meta/fbnic/fbnic_netdev.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/meta/fbnic/fbnic_netdev.c b/drivers/net/e= thernet/meta/fbnic/fbnic_netdev.c index 7bd7812d9c06..dc295e1b8516 100644 --- a/drivers/net/ethernet/meta/fbnic/fbnic_netdev.c +++ b/drivers/net/ethernet/meta/fbnic/fbnic_netdev.c @@ -420,16 +420,16 @@ static void fbnic_get_stats64(struct net_device *dev, tx_packets =3D stats->packets; tx_dropped =3D stats->dropped; =20 - stats64->tx_bytes =3D tx_bytes; - stats64->tx_packets =3D tx_packets; - stats64->tx_dropped =3D tx_dropped; - /* Record drops from Tx HW Datapath */ tx_dropped +=3D fbd->hw_stats.tmi.drop.frames.value + fbd->hw_stats.tti.cm_drop.frames.value + fbd->hw_stats.tti.frame_drop.frames.value + fbd->hw_stats.tti.tbi_drop.frames.value; =20 + stats64->tx_bytes =3D tx_bytes; + stats64->tx_packets =3D tx_packets; + stats64->tx_dropped =3D tx_dropped; + for (i =3D 0; i < fbn->num_tx_queues; i++) { struct fbnic_ring *txr =3D fbn->tx[i]; =20 --=20 2.47.3 From nobody Sun Oct 5 14:37:49 2025 Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) (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 60D1E19F464; Sat, 2 Aug 2025 02:46:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754102812; cv=none; b=T6sYuaPlqOeQ5QEz1f5+bI44jHgTS1r29FxXUTSUlzWdvBYTme1dqOdeq2IjxvopFuV3EPiHoXMag8BWqEg0iUBSXlL/CeokTas00Pwwk60jwU9WN3Vr83Lh4SBI8GgfenvQWfLK57lXi0bu/8KfcQBtHNZ17ehhKTi+gEVMOHA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754102812; c=relaxed/simple; bh=ELOCPvBFHPOyVs7fLxvQFkxpCvhuApIqkjxST0zsWKQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sb9I90wUgV1QNydVIpoShzTTBaAWFRWno+Qrhy88+Yzm5QaRl06fhWe8CUSMjZKlzKoOFKxFW8bcwadwtOZmnlCHULpQI4nwt484MaRBo1KRKllII8sGkeh34wYemfKXG0pMYTvmiA/esNDt7E9G1/QZtBYgxNQxb+oUICHWMZg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=hZdHvuaM; arc=none smtp.client-ip=209.85.221.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="hZdHvuaM" Received: by mail-wr1-f48.google.com with SMTP id ffacd0b85a97d-3b78310b296so1687094f8f.2; Fri, 01 Aug 2025 19:46:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1754102808; x=1754707608; 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=kAmHPL0z8d4qsKmnvk0WknZ0ahVVo0+kbEydX9GrYIo=; b=hZdHvuaMbvLicliiXzGgucdLg0OoPDK2j1Dy0g95yrecZRDwoExOoJ/SG7qh3KileV U70b8Z0nM3hJR69Ka/903nWtkKILRD/lTtIXgrIMEVr1GIDdJwsPrQAto7QSbhMoFS23 x3LBhkVVhdlHx+9iCP40YUMMS7+/oV0btHD65TgP+cuSiPa946fSpAQV6rCRdSCH85g7 pk4ZPi/yTtPlqbEGfFRZQtSee7DjW4rMxwX51OGMFTYIfvTBtpxgs8sK/VvbcfiTR6Tx aiucCXolZXtvTugwhiQSF0k6W9S6c0lpkbsS/sx1KJdn6IVurXtVG+It3I5y8AWicvqu QDZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754102808; x=1754707608; 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=kAmHPL0z8d4qsKmnvk0WknZ0ahVVo0+kbEydX9GrYIo=; b=tcD80xgE2FLUWKFhkS83OflrTd876lHSBHr9F+R6F15JREMo5b4V60zCPdy6WiSoLd tVZTvvy/yHBOb+Fj9Ae/tc+OKVEIdu9b/Kq4xI/NCxraOoXh+om6FSQVANFLiH4jevVQ 4URGrykD+jzx33VzrQh9ZA6DKBd4Oz7OhDCzu8TlJWKQNiQ2RNMk/j88iyIAuQpw88yM An36NjJQEpP5b/r5mHMensYNjdFLqaVp5n/+4pCY7jEVss6Ns1o4+xqRcypaxQJOKxVg FdEVJAvKyJTtQDJKbO861wfLdNQZesX2qTIZOUfAtcPonOlQNTxvKIgvQ/vPZZVAPjGV NQiw== X-Forwarded-Encrypted: i=1; AJvYcCVcU94E5NqLZSWOJ+lEFDNc+c13BmLi4QGLbO4Nx7BKQVFjzSU13fiq71ZHCd1QxJVi6mG4SIK6MLr+NAE=@vger.kernel.org X-Gm-Message-State: AOJu0Yx7Jet1frq4K9ZuzLBZlcTz94Jn909YRv7RwVTER7g26Nm2yfnc +OsLuO5aUrsXjcii+ZHmXHs7Nx1ZYectnS4c5zR3zvuBhs2HLXPMq+PqqhS6EQ== X-Gm-Gg: ASbGncsor1t4lVUcyb3kzBQ0zjZhNM81eU70ldoFBJVwdzLNIAXB9FTKGAw7V7UTO5/ F9/oyZbnrvIjQvZ1+C8SJ3Xv6tURHdFWrhCslakdJg8FNceNKOtPzt5Bd6W7qy20VGhe78/m9/+ rJj/Yn7r8EPUV1+Zg3xzBtgBtFvDp9blCneGIfBt9AvBzJ2U0lgZLFYH5nu0SSAACiL05dwMRRC ou1zT4mPZYZGK48qrdaDJvFJKVgkUuHzqU7w2Z2SYcvhcHxU5Rjoqouz0O1dz9Lu5BZ26h2PA8J aHd05BecdOLtj7Egomrkm29fcuemeCT2Bzx6COKwwvmcPN8TAviYo0we+6zA3f1wd3yFPGCJbdP FKccJ6MPbz9OYHdRZ2KU= X-Google-Smtp-Source: AGHT+IEvSRusjovldvowvFtXLZQ+GP7u9AjrqRHFxEIEHePf9ZnlmxVrtOuYypqeMDu6ol5h9vU9Pw== X-Received: by 2002:a05:6000:2289:b0:3b7:8d80:e382 with SMTP id ffacd0b85a97d-3b8d94698f1mr1359538f8f.4.1754102808190; Fri, 01 Aug 2025 19:46:48 -0700 (PDT) Received: from localhost ([2a03:2880:31ff:5::]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3b79c453333sm7979922f8f.45.2025.08.01.19.46.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Aug 2025 19:46:47 -0700 (PDT) From: Mohsin Bashir To: netdev@vger.kernel.org Cc: alexanderduyck@fb.com, andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com, horms@kernel.org, kernel-team@meta.com, kuba@kernel.org, linux-kernel@vger.kernel.org, mohsin.bashr@gmail.com, pabeni@redhat.com, sdf@fomichev.me, vadim.fedorenko@linux.dev Subject: [PATCH net 2/2] eth: fbnic: Lock the tx_dropped update Date: Fri, 1 Aug 2025 19:46:36 -0700 Message-ID: <20250802024636.679317-3-mohsin.bashr@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20250802024636.679317-1-mohsin.bashr@gmail.com> References: <20250802024636.679317-1-mohsin.bashr@gmail.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" Wrap copying of drop stats on TX path from fbd->hw_stats by the hw_stats_lock. Currently, it is being performed outside the lock and another thread accessing fbd->hw_stats can lead to inconsistencies. Fixes: 5f8bd2ce8269 ("eth: fbnic: add support for TMI stats") Signed-off-by: Jakub Kicinski Signed-off-by: Mohsin Bashir --- drivers/net/ethernet/meta/fbnic/fbnic_netdev.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/ethernet/meta/fbnic/fbnic_netdev.c b/drivers/net/e= thernet/meta/fbnic/fbnic_netdev.c index dc295e1b8516..d0e381ad7bee 100644 --- a/drivers/net/ethernet/meta/fbnic/fbnic_netdev.c +++ b/drivers/net/ethernet/meta/fbnic/fbnic_netdev.c @@ -421,10 +421,12 @@ static void fbnic_get_stats64(struct net_device *dev, tx_dropped =3D stats->dropped; =20 /* Record drops from Tx HW Datapath */ + spin_lock(&fbd->hw_stats_lock); tx_dropped +=3D fbd->hw_stats.tmi.drop.frames.value + fbd->hw_stats.tti.cm_drop.frames.value + fbd->hw_stats.tti.frame_drop.frames.value + fbd->hw_stats.tti.tbi_drop.frames.value; + spin_unlock(&fbd->hw_stats_lock); =20 stats64->tx_bytes =3D tx_bytes; stats64->tx_packets =3D tx_packets; --=20 2.47.3