From nobody Sun Feb 8 00:49:32 2026 Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) (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 B0F8F30E0C0 for ; Sun, 25 Jan 2026 22:08:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769378905; cv=none; b=Bd8yPDEqAOL+seg3NbbIA/AZDitCJZaDXMVw2JyNzuBzakW0Scsz1rEkKvFtwpxas3Wk54nDn8SJA6KClySLSgfJDM9Br/UdnW5UgZcObJg0duJuxA4f71umt2lKI/A0tQm/FqITjjq3BdrN+CxvCE7k9O9PtI6RiNUELA2t8uo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769378905; c=relaxed/simple; bh=WR5uq6D5CL2+zYPX3ErQbINKVuF54ruQFnm911fVzGM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=b+wm8QLZSoVfD0pqQJnyU7IN529acR6d0R91l3eVf7Smxj2v3/aUHH0pH9k4pNBc3SybX6CBxIr9Wi7z/JUu0316LnlfGkkrTRd7eFNXkLMLxIHM6OQEf7PhM078wtOVumUxXTLbOM4plbm1bcBsW2f+FIEadfNhhJH/LJpo1fI= 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=WYppz4s/; arc=none smtp.client-ip=209.85.216.53 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="WYppz4s/" Received: by mail-pj1-f53.google.com with SMTP id 98e67ed59e1d1-352e2c59264so2778407a91.0 for ; Sun, 25 Jan 2026 14:08:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1769378904; x=1769983704; 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=g3EJ6TxN7ZDz04YTrVqZvmwk994KH4aI44usL/+rv9E=; b=WYppz4s/OEmLIljPruiSeSOS9n2nTRmwCCaRnLHjPfZlXgYrUBdZesbMFOZS0nQFrP 6ugnkOVCrIiyvR8cCRB/bR2Eql5aFhT/qQfPZTVOM15QtbboslPGr/kEe8oFU0ao/aV8 8g1rNmODb4FFNl6yEPbC7WSvfpErrWjO6jqfNrLfkkOuYgKA4ZmNj/Atyvtzwe4Bk7gN kwXa93l4Og0yNPBY32IXyBvWeAmUFXkseAcNySmy7LE1awGL6UsS2B4urHKMZBgdT8Qt y3tYe4S1QXWANvzQN71by1kg1/y529rRuklvhfiSN2jlj7ic4Xsh+I1YukGN5ZEcm2RB aAfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769378904; x=1769983704; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=g3EJ6TxN7ZDz04YTrVqZvmwk994KH4aI44usL/+rv9E=; b=b1n0Ck1VlHGZ4g7Y0RT9/oadCbi3VNaecDtIK5yuF1ynj9lgKKnkVjk5vykzHgSlgy P7N2mU1McFMFyDCgEhu+OMXWV9Fb3WfG/70vfyqpyAu/mp4gOnxz3T8YAzzcjnbhFHoq I/CIljvzTdco6b8I1r2gqAgojPhx4s33t9KGQmQtPHadzNmkd9rrtFyhh5Q1rjUcLhGG ieRjCfYNfWneUDSj4ZVa+AfBECdsfTRe+5NtDHzfhtWMfWlL4Lzjmd15VKWRm68wZyUs hHnFRneBt/EAKNkic1DKrBC6dgzDliLA/EhNDO1iZoSGJxUdhjAs4JVe7dv7J4X7kRlk nHMA== X-Forwarded-Encrypted: i=1; AJvYcCX+KM3JPz5jUGkk2t+IFYkI/QpwTcZDG7Ub3V5HrsFJFTHQ+RZVvQeaY1WKYfGcJvIgsxHOLQpVu2OUw8s=@vger.kernel.org X-Gm-Message-State: AOJu0YwcCQNnxHSWfbqBiMEzXofrr7FHjYqZMF6uf079lFs3fc3t5GHZ b2y0pvf7guWAgi5zKe7Wb0jpc8S/CunQv69Le++5YE1yO9TBUnI2lZV6 X-Gm-Gg: AZuq6aK0tEZurZr7fJcGXH9UgkMCR1guu0IRaCD/zxM6dnf6g9CgY2RIQSxgvg+y4RG 6q8tvrlwO5hbaUzoT1ni8prY+mNtgrwXXLu7FFcrHlYj0yA7pA/0wx0y93rsdZ45e32aY4klmpo huQW6lSQR/jEXJg0AfRu/wSga3r2C8OIs+xVR43Mi6EWPC/VIpLWe9P22sxHmQo+h6cBIBLOkvJ lLnNXugoHxNRbir73srnF5h0snc+DQTUywBUW8e/ZXAOiDv1TEHjakmMNwP4emSkX7EdXS48qG6 pqb44ewVqZdWddkvP0iP5IZjYY7LJNxjLyzo+xOGqNX4Su2Qwwsn0CYQG2AM7Jv2Io69goIwdfb ln1qm/PGy3KMZvX6IF4erhMAaq3L7Wbr2uLUslz3bRmOb4UUAcU1eHb0hvxvSb7D7NdDaZ1YlEZ yQnEafsQS5+Bcr48XjmJLxw1HaJP7CC1XxJTQG9orlIgO+eBXBsKvkCqq0jbtA X-Received: by 2002:a17:90b:45:b0:349:3fe8:e7df with SMTP id 98e67ed59e1d1-353c4167b7bmr2107663a91.22.1769378903982; Sun, 25 Jan 2026 14:08:23 -0800 (PST) Received: from d.home.mmyangfl.tk ([45.32.227.231]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-8231873e60fsm7651286b3a.48.2026.01.25.14.08.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jan 2026 14:08:23 -0800 (PST) From: David Yang To: netdev@vger.kernel.org Cc: David Yang , Lorenzo Bianconi , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next v2 1/2] u64_stats: Allow u64_stats_add() to accept s64 Date: Mon, 26 Jan 2026 06:07:49 +0800 Message-ID: <20260125220753.3984326-2-mmyangfl@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260125220753.3984326-1-mmyangfl@gmail.com> References: <20260125220753.3984326-1-mmyangfl@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" The current u64_stats_add() accepts only unsigned long, which makes no sense as u64_stats_set() accepts u64 already, and causes unnecessary narrowing on 32-bit architectures. Moreover, since there's no u64_stats_sub(), users may be tempted to reuse it for decrements, which already happened on nft_counter_reset() in net/netfilter/nft_counter.c . Change to s64 to allow both positive and negative values. Signed-off-by: David Yang --- include/linux/u64_stats_sync.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/linux/u64_stats_sync.h b/include/linux/u64_stats_sync.h index 457879938fc1..e77f2b30bac7 100644 --- a/include/linux/u64_stats_sync.h +++ b/include/linux/u64_stats_sync.h @@ -84,7 +84,7 @@ static inline void u64_stats_set(u64_stats_t *p, u64 val) local64_set(&p->v, val); } =20 -static inline void u64_stats_add(u64_stats_t *p, unsigned long val) +static inline void u64_stats_add(u64_stats_t *p, s64 val) { local64_add(val, &p->v); } @@ -125,7 +125,7 @@ static inline void u64_stats_set(u64_stats_t *p, u64 va= l) p->v =3D val; } =20 -static inline void u64_stats_add(u64_stats_t *p, unsigned long val) +static inline void u64_stats_add(u64_stats_t *p, s64 val) { p->v +=3D val; } --=20 2.51.0 From nobody Sun Feb 8 00:49:32 2026 Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.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 7D2B930CDA9 for ; Sun, 25 Jan 2026 22:08:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769378910; cv=none; b=cM7VTon3gGeE4inNIoSTbHilDwjdJstRxb3twbwN/Y6dQRJaYLalk9sbJRxnGLcx4Hpc+lltKAPOxeZBMD8ebuh0jU2eoZaXu3VQgG86Fa+B3JYftbY/C27OXGnJpgmZI0BQRsbc+UCcGdL3uiOdt73XQ906REc7XzrE7vOwRVU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769378910; c=relaxed/simple; bh=wTJ8qzQ8hWxnoJK1rQ3XfBHcjbpSs55zlCB+7x/zDzQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rpOHYZQMvkTJzNbnkhLUyjn8ebyCVTjDhsl/mXpbpPIAnqinF5jCbgMzIztPDdhCYlYkfilDTZn6S1GqBjq5BvZas8K2cF1Wl04UgKPIkJqkakhgqZRGbZfva1jBDLd1fwbZBf3bGira0DqU75zMzYPk/FuFeo7zQe1MbhnSw3s= 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=COW0xMGw; arc=none smtp.client-ip=209.85.210.182 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="COW0xMGw" Received: by mail-pf1-f182.google.com with SMTP id d2e1a72fcca58-81df6a302b1so3500797b3a.2 for ; Sun, 25 Jan 2026 14:08:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1769378908; x=1769983708; 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=VpLzaZNrjlWsLrvFCVaRso+CbpWjXp9kenKiBrfGf7Q=; b=COW0xMGwo64xfxEuke/s9w0jRoHyljHKQdOi3w7AyMjcZyfJwDsfcqD4dRqzcTKNFR 20/5jAzvTWeti3t4ltWywS3fpl34Kw+Q5tLhZaIo5uMlnoJcaj7VsMxk2ONDgziz1bju yEQNV4bSwGR/k+3ZMszDyUcQ3hJpiXy6x7v0cQwsAAJapDS7/xtyhrChSKtXLHpioMn2 2GkoGAlQuEZHH9CYTGunoHSVQGya2jp6vOGzq0knhfw9PPQ/ppZwIVXMeylMTJFsEfHm Kig7yp/y/cUfWFJk/AQ1YJ8IVgoRShjDJ43zC6abAGdbOlN2YNtcixclBYw9XE6dSQN0 9GVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769378908; x=1769983708; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=VpLzaZNrjlWsLrvFCVaRso+CbpWjXp9kenKiBrfGf7Q=; b=HBNPnPwyfH1tvepYoJh4qXZAvlKpie8RWPuWp77h5mG027kNWb7mTUvuQvaOxyKBm4 ETCr0s+fS2rDoo8nxdDbDJEcEqRrvRJl1IbeikzdLn786z2LXuTg8nmh36K22yjOe9Aw f2ppCDQPqa9g/k8JbKGYqRXHlkTthfLN1Xt6D1DgumCwfz9KIBTPZRU7AA8gAI3CcPSh bmPLCDeokeQOXOsgb2kum4Ab/ZTv3epv2bIsLBBMzZvbEEjUORHR+6303Rk3bSP/e4jH oiSd3qJUbWLm0djPonH7T84Idq0PpEknhn+pXCBCrbJlRhJY3vO23HJXKuN9sOtJtrbl XK8Q== X-Forwarded-Encrypted: i=1; AJvYcCWPTzlorld0F0ObxkP5g7jGeUB0aZ7DjQU6JduPVZaDbOAu3xjP2wEUt8NaxkBJkCYz+v2nML2YTeLcThE=@vger.kernel.org X-Gm-Message-State: AOJu0YxewDsBXkZ2AdWIZbHL3O0wYxFBiHq2P/EbAf6r5zr0qU+4893t wiKax5aFSIqAfS6dSOP/o5/5wpftZJ4XWsd40UnKTD/6hnVWM/bklaX+ X-Gm-Gg: AZuq6aJBcTqamh34FLLqgyT0yGRj1cWoIlwrfRvJ27X8aZTCbQthEZ1VggDzPvu432p YgX1cGOYeBUouBb/f/Ar6NMwpO1wrjWY03W8cwtIAHnn5kTzGvFqzDW0Fvw0ZXfgPCLvfoITOlY Rx895LKyjCZCIxPgc5X/z76ljSnif2QNj0zSY9DzXbhUJS20YjQJG98dXtCX8MhtsCz9Xo0Ciko 0aPXvTsPrPZ372KHc5irVC5A1kOBKiwy4Wc5k302BIvOV/VKRPRUY8PhUBeMgqyql7X5pWekdal UUGiSY1K7pq9MwQHaWDniCQaorZmpjKE8GKscyx21GrXjdiG3CDg1YYhzLIIEWlyKYgMY2LkG9J j0puf9pl/TRRvgeJHWAYNbg7s8G9ghQgZjiw4nySqOV5lz93mqewrH7fDJLmKA7qwtmuOODxpoz R9XpOP4LsoztLPTAZB5PT54qiDcXu9O2MxOFiCwGQhvdfu8tm/LQ== X-Received: by 2002:a05:6a00:8087:b0:823:a81:fe85 with SMTP id d2e1a72fcca58-823412bb5c2mr2275538b3a.54.1769378907690; Sun, 25 Jan 2026 14:08:27 -0800 (PST) Received: from d.home.mmyangfl.tk ([45.32.227.231]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-8231873e60fsm7651286b3a.48.2026.01.25.14.08.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jan 2026 14:08:27 -0800 (PST) From: David Yang To: netdev@vger.kernel.org Cc: David Yang , Lorenzo Bianconi , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next v2 2/2] net: airoha: Use u64_stats_t with u64_stats_sync properly Date: Mon, 26 Jan 2026 06:07:50 +0800 Message-ID: <20260125220753.3984326-3-mmyangfl@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260125220753.3984326-1-mmyangfl@gmail.com> References: <20260125220753.3984326-1-mmyangfl@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" On 64bit arches, struct u64_stats_sync is empty and provides no help against load/store tearing. Convert to u64_stats_t to ensure atomic operations. Signed-off-by: David Yang Acked-by: Lorenzo Bianconi --- drivers/net/ethernet/airoha/airoha_eth.c | 153 +++++++++++++---------- drivers/net/ethernet/airoha/airoha_eth.h | 34 ++--- 2 files changed, 102 insertions(+), 85 deletions(-) diff --git a/drivers/net/ethernet/airoha/airoha_eth.c b/drivers/net/etherne= t/airoha/airoha_eth.c index 62bcbbbe2a95..fe53aa93a003 100644 --- a/drivers/net/ethernet/airoha/airoha_eth.c +++ b/drivers/net/ethernet/airoha/airoha_eth.c @@ -1466,137 +1466,154 @@ static void airoha_update_hw_stats(struct airoha_= gdm_port *port) { struct airoha_eth *eth =3D port->qdma->eth; u32 val, i =3D 0; + u64 val64; =20 spin_lock(&port->stats.lock); u64_stats_update_begin(&port->stats.syncp); =20 /* TX */ val =3D airoha_fe_rr(eth, REG_FE_GDM_TX_OK_PKT_CNT_H(port->id)); - port->stats.tx_ok_pkts +=3D ((u64)val << 32); + val64 =3D (u64)val << 32; val =3D airoha_fe_rr(eth, REG_FE_GDM_TX_OK_PKT_CNT_L(port->id)); - port->stats.tx_ok_pkts +=3D val; + val64 +=3D val; + u64_stats_add(&port->stats.tx_ok_pkts, val64); =20 val =3D airoha_fe_rr(eth, REG_FE_GDM_TX_OK_BYTE_CNT_H(port->id)); - port->stats.tx_ok_bytes +=3D ((u64)val << 32); + val64 =3D (u64)val << 32; val =3D airoha_fe_rr(eth, REG_FE_GDM_TX_OK_BYTE_CNT_L(port->id)); - port->stats.tx_ok_bytes +=3D val; + val64 +=3D val; + u64_stats_add(&port->stats.tx_ok_bytes, val64); =20 val =3D airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_DROP_CNT(port->id)); - port->stats.tx_drops +=3D val; + u64_stats_add(&port->stats.tx_drops, val); =20 val =3D airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_BC_CNT(port->id)); - port->stats.tx_broadcast +=3D val; + u64_stats_add(&port->stats.tx_broadcast, val); =20 val =3D airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_MC_CNT(port->id)); - port->stats.tx_multicast +=3D val; + u64_stats_add(&port->stats.tx_multicast, val); =20 val =3D airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_RUNT_CNT(port->id)); - port->stats.tx_len[i] +=3D val; + val64 =3D val; =20 val =3D airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_E64_CNT_H(port->id)); - port->stats.tx_len[i] +=3D ((u64)val << 32); + val64 +=3D (u64)val << 32; val =3D airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_E64_CNT_L(port->id)); - port->stats.tx_len[i++] +=3D val; + val64 +=3D val; + u64_stats_add(&port->stats.tx_len[i++], val64); =20 val =3D airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_L64_CNT_H(port->id)); - port->stats.tx_len[i] +=3D ((u64)val << 32); + val64 =3D (u64)val << 32; val =3D airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_L64_CNT_L(port->id)); - port->stats.tx_len[i++] +=3D val; + val64 +=3D val; + u64_stats_add(&port->stats.tx_len[i++], val64); =20 val =3D airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_L127_CNT_H(port->id)); - port->stats.tx_len[i] +=3D ((u64)val << 32); + val64 =3D (u64)val << 32; val =3D airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_L127_CNT_L(port->id)); - port->stats.tx_len[i++] +=3D val; + val64 +=3D val; + u64_stats_add(&port->stats.tx_len[i++], val64); =20 val =3D airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_L255_CNT_H(port->id)); - port->stats.tx_len[i] +=3D ((u64)val << 32); + val64 =3D (u64)val << 32; val =3D airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_L255_CNT_L(port->id)); - port->stats.tx_len[i++] +=3D val; + val64 +=3D val; + u64_stats_add(&port->stats.tx_len[i++], val64); =20 val =3D airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_L511_CNT_H(port->id)); - port->stats.tx_len[i] +=3D ((u64)val << 32); + val64 =3D (u64)val << 32; val =3D airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_L511_CNT_L(port->id)); - port->stats.tx_len[i++] +=3D val; + val64 +=3D val; + u64_stats_add(&port->stats.tx_len[i++], val64); =20 val =3D airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_L1023_CNT_H(port->id)); - port->stats.tx_len[i] +=3D ((u64)val << 32); + val64 =3D (u64)val << 32; val =3D airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_L1023_CNT_L(port->id)); - port->stats.tx_len[i++] +=3D val; + val64 +=3D val; + u64_stats_add(&port->stats.tx_len[i++], val64); =20 val =3D airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_LONG_CNT(port->id)); - port->stats.tx_len[i++] +=3D val; + u64_stats_add(&port->stats.tx_len[i++], val); =20 /* RX */ val =3D airoha_fe_rr(eth, REG_FE_GDM_RX_OK_PKT_CNT_H(port->id)); - port->stats.rx_ok_pkts +=3D ((u64)val << 32); + val64 =3D (u64)val << 32; val =3D airoha_fe_rr(eth, REG_FE_GDM_RX_OK_PKT_CNT_L(port->id)); - port->stats.rx_ok_pkts +=3D val; + val64 +=3D val; + u64_stats_add(&port->stats.rx_ok_pkts, val64); =20 val =3D airoha_fe_rr(eth, REG_FE_GDM_RX_OK_BYTE_CNT_H(port->id)); - port->stats.rx_ok_bytes +=3D ((u64)val << 32); + val64 =3D (u64)val << 32; val =3D airoha_fe_rr(eth, REG_FE_GDM_RX_OK_BYTE_CNT_L(port->id)); - port->stats.rx_ok_bytes +=3D val; + val64 +=3D val; + u64_stats_add(&port->stats.rx_ok_bytes, val64); =20 val =3D airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_DROP_CNT(port->id)); - port->stats.rx_drops +=3D val; + u64_stats_add(&port->stats.rx_drops, val); =20 val =3D airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_BC_CNT(port->id)); - port->stats.rx_broadcast +=3D val; + u64_stats_add(&port->stats.rx_broadcast, val); =20 val =3D airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_MC_CNT(port->id)); - port->stats.rx_multicast +=3D val; + u64_stats_add(&port->stats.rx_multicast, val); =20 val =3D airoha_fe_rr(eth, REG_FE_GDM_RX_ERROR_DROP_CNT(port->id)); - port->stats.rx_errors +=3D val; + u64_stats_add(&port->stats.rx_errors, val); =20 val =3D airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_CRC_ERR_CNT(port->id)); - port->stats.rx_crc_error +=3D val; + u64_stats_add(&port->stats.rx_crc_error, val); =20 val =3D airoha_fe_rr(eth, REG_FE_GDM_RX_OVERFLOW_DROP_CNT(port->id)); - port->stats.rx_over_errors +=3D val; + u64_stats_add(&port->stats.rx_over_errors, val); =20 val =3D airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_FRAG_CNT(port->id)); - port->stats.rx_fragment +=3D val; + u64_stats_add(&port->stats.rx_fragment, val); =20 val =3D airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_JABBER_CNT(port->id)); - port->stats.rx_jabber +=3D val; + u64_stats_add(&port->stats.rx_jabber, val); =20 i =3D 0; val =3D airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_RUNT_CNT(port->id)); - port->stats.rx_len[i] +=3D val; + val64 =3D val; =20 val =3D airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_E64_CNT_H(port->id)); - port->stats.rx_len[i] +=3D ((u64)val << 32); + val64 +=3D (u64)val << 32; val =3D airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_E64_CNT_L(port->id)); - port->stats.rx_len[i++] +=3D val; + val64 +=3D val; + u64_stats_add(&port->stats.rx_len[i++], val64); =20 val =3D airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_L64_CNT_H(port->id)); - port->stats.rx_len[i] +=3D ((u64)val << 32); + val64 =3D (u64)val << 32; val =3D airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_L64_CNT_L(port->id)); - port->stats.rx_len[i++] +=3D val; + val64 +=3D val; + u64_stats_add(&port->stats.rx_len[i++], val64); =20 val =3D airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_L127_CNT_H(port->id)); - port->stats.rx_len[i] +=3D ((u64)val << 32); + val64 =3D (u64)val << 32; val =3D airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_L127_CNT_L(port->id)); - port->stats.rx_len[i++] +=3D val; + val64 +=3D val; + u64_stats_add(&port->stats.rx_len[i++], val64); =20 val =3D airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_L255_CNT_H(port->id)); - port->stats.rx_len[i] +=3D ((u64)val << 32); + val64 =3D (u64)val << 32; val =3D airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_L255_CNT_L(port->id)); - port->stats.rx_len[i++] +=3D val; + val64 +=3D val; + u64_stats_add(&port->stats.rx_len[i++], val64); =20 val =3D airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_L511_CNT_H(port->id)); - port->stats.rx_len[i] +=3D ((u64)val << 32); + val64 =3D (u64)val << 32; val =3D airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_L511_CNT_L(port->id)); - port->stats.rx_len[i++] +=3D val; + val64 +=3D val; + u64_stats_add(&port->stats.rx_len[i++], val64); =20 val =3D airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_L1023_CNT_H(port->id)); - port->stats.rx_len[i] +=3D ((u64)val << 32); + val64 =3D (u64)val << 32; val =3D airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_L1023_CNT_L(port->id)); - port->stats.rx_len[i++] +=3D val; + val64 +=3D val; + u64_stats_add(&port->stats.rx_len[i++], val64); =20 val =3D airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_LONG_CNT(port->id)); - port->stats.rx_len[i++] +=3D val; + u64_stats_add(&port->stats.rx_len[i++], val); =20 /* reset mib counters */ airoha_fe_set(eth, REG_FE_GDM_MIB_CLEAR(port->id), @@ -1795,16 +1812,16 @@ static void airoha_dev_get_stats64(struct net_devic= e *dev, airoha_update_hw_stats(port); do { start =3D u64_stats_fetch_begin(&port->stats.syncp); - storage->rx_packets =3D port->stats.rx_ok_pkts; - storage->tx_packets =3D port->stats.tx_ok_pkts; - storage->rx_bytes =3D port->stats.rx_ok_bytes; - storage->tx_bytes =3D port->stats.tx_ok_bytes; - storage->multicast =3D port->stats.rx_multicast; - storage->rx_errors =3D port->stats.rx_errors; - storage->rx_dropped =3D port->stats.rx_drops; - storage->tx_dropped =3D port->stats.tx_drops; - storage->rx_crc_errors =3D port->stats.rx_crc_error; - storage->rx_over_errors =3D port->stats.rx_over_errors; + storage->rx_packets =3D u64_stats_read(&port->stats.rx_ok_pkts); + storage->tx_packets =3D u64_stats_read(&port->stats.tx_ok_pkts); + storage->rx_bytes =3D u64_stats_read(&port->stats.rx_ok_bytes); + storage->tx_bytes =3D u64_stats_read(&port->stats.tx_ok_bytes); + storage->multicast =3D u64_stats_read(&port->stats.rx_multicast); + storage->rx_errors =3D u64_stats_read(&port->stats.rx_errors); + storage->rx_dropped =3D u64_stats_read(&port->stats.rx_drops); + storage->tx_dropped =3D u64_stats_read(&port->stats.tx_drops); + storage->rx_crc_errors =3D u64_stats_read(&port->stats.rx_crc_error); + storage->rx_over_errors =3D u64_stats_read(&port->stats.rx_over_errors); } while (u64_stats_fetch_retry(&port->stats.syncp, start)); } =20 @@ -2057,13 +2074,13 @@ static void airoha_ethtool_get_mac_stats(struct net= _device *dev, airoha_update_hw_stats(port); do { start =3D u64_stats_fetch_begin(&port->stats.syncp); - stats->FramesTransmittedOK =3D port->stats.tx_ok_pkts; - stats->OctetsTransmittedOK =3D port->stats.tx_ok_bytes; - stats->MulticastFramesXmittedOK =3D port->stats.tx_multicast; - stats->BroadcastFramesXmittedOK =3D port->stats.tx_broadcast; - stats->FramesReceivedOK =3D port->stats.rx_ok_pkts; - stats->OctetsReceivedOK =3D port->stats.rx_ok_bytes; - stats->BroadcastFramesReceivedOK =3D port->stats.rx_broadcast; + stats->FramesTransmittedOK =3D u64_stats_read(&port->stats.tx_ok_pkts); + stats->OctetsTransmittedOK =3D u64_stats_read(&port->stats.tx_ok_bytes); + stats->MulticastFramesXmittedOK =3D u64_stats_read(&port->stats.tx_multi= cast); + stats->BroadcastFramesXmittedOK =3D u64_stats_read(&port->stats.tx_broad= cast); + stats->FramesReceivedOK =3D u64_stats_read(&port->stats.rx_ok_pkts); + stats->OctetsReceivedOK =3D u64_stats_read(&port->stats.rx_ok_bytes); + stats->BroadcastFramesReceivedOK =3D u64_stats_read(&port->stats.rx_broa= dcast); } while (u64_stats_fetch_retry(&port->stats.syncp, start)); } =20 @@ -2098,12 +2115,12 @@ airoha_ethtool_get_rmon_stats(struct net_device *de= v, int i; =20 start =3D u64_stats_fetch_begin(&port->stats.syncp); - stats->fragments =3D hw_stats->rx_fragment; - stats->jabbers =3D hw_stats->rx_jabber; + stats->fragments =3D u64_stats_read(&hw_stats->rx_fragment); + stats->jabbers =3D u64_stats_read(&hw_stats->rx_jabber); for (i =3D 0; i < ARRAY_SIZE(airoha_ethtool_rmon_ranges) - 1; i++) { - stats->hist[i] =3D hw_stats->rx_len[i]; - stats->hist_tx[i] =3D hw_stats->tx_len[i]; + stats->hist[i] =3D u64_stats_read(&hw_stats->rx_len[i]); + stats->hist_tx[i] =3D u64_stats_read(&hw_stats->tx_len[i]); } } while (u64_stats_fetch_retry(&port->stats.syncp, start)); } diff --git a/drivers/net/ethernet/airoha/airoha_eth.h b/drivers/net/etherne= t/airoha/airoha_eth.h index 20e602d61e61..b2e9bd849f8b 100644 --- a/drivers/net/ethernet/airoha/airoha_eth.h +++ b/drivers/net/ethernet/airoha/airoha_eth.h @@ -215,24 +215,24 @@ struct airoha_hw_stats { struct u64_stats_sync syncp; =20 /* get_stats64 */ - u64 rx_ok_pkts; - u64 tx_ok_pkts; - u64 rx_ok_bytes; - u64 tx_ok_bytes; - u64 rx_multicast; - u64 rx_errors; - u64 rx_drops; - u64 tx_drops; - u64 rx_crc_error; - u64 rx_over_errors; + u64_stats_t rx_ok_pkts; + u64_stats_t tx_ok_pkts; + u64_stats_t rx_ok_bytes; + u64_stats_t tx_ok_bytes; + u64_stats_t rx_multicast; + u64_stats_t rx_errors; + u64_stats_t rx_drops; + u64_stats_t tx_drops; + u64_stats_t rx_crc_error; + u64_stats_t rx_over_errors; /* ethtool stats */ - u64 tx_broadcast; - u64 tx_multicast; - u64 tx_len[7]; - u64 rx_broadcast; - u64 rx_fragment; - u64 rx_jabber; - u64 rx_len[7]; + u64_stats_t tx_broadcast; + u64_stats_t tx_multicast; + u64_stats_t tx_len[7]; + u64_stats_t rx_broadcast; + u64_stats_t rx_fragment; + u64_stats_t rx_jabber; + u64_stats_t rx_len[7]; }; =20 enum { --=20 2.51.0