From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 03F3F258CEC for ; Mon, 14 Jul 2025 17:35:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.156.1 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752514528; cv=none; b=QVPj+mmz2TI3OMTTq3kCp0+zCcrcz4IbH+aMENF1PHdAibogzDz+uUm+Wl/n82nhJHxBLRAkTrRiyvPwUIgX9Tm0LxyQ+17IBg6976NwwQCBnzk7n/ZceKScfcCP4Y1xxVIindKojcigZLvpDdb+A/AM8rc7N024Qxmybr+ZyKY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752514528; c=relaxed/simple; bh=NYF/wUA+27P5BT0FOAmz6/PjBJ8jVs46MKZ/MU5mOQE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=p3pmHhv8Zqu71+le7W57uaDOPyiGIj+8sHWgN6BLa4CDxTavc0LMYp8ZNPsOJJKEyBHsKNj2K2AZyfdZ2QV8yipJsWRsurldfY//sUw6qMvfSxcaGkT+aGzNCOrSTwOiBF0ajBqsCema5chdA05wX4FczNhAVuJPWErM7MQRS+U= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=J2bh50Ng; arc=none smtp.client-ip=148.163.156.1 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="J2bh50Ng" Received: from pps.filterd (m0356517.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 56EDMiJK023923; Mon, 14 Jul 2025 17:35:19 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=i7XNepWE1PTv0IwuJ GDIC7w2ZU3n7ix1rtvNlnwTAcQ=; b=J2bh50NgLGx4M53lEh0M4C5zlDNwpFeJ6 M94zMdIS1PZOA+9fkNRb6pGcK93X/3u8cU7REU660A1kjNDSbXHNAv9DNhcczbyr FwxRqAXGspBi1hQNiKErBUWnWw16IHH8goscPgFOtDNT+j2pIwblBJw7XUXN17NJ GO/pQvvmlbowzJwDlP9cmUjhcEAx3peaXrIIzoM/+xWawSb3qYtQHojnkvbp1iay xll5pUbtVevPii/ZIkf7E07GF+e/1h/c2TRByR9MFFqGf6LvtPd7tDhqpLIcfXvr HMHaoUl7wKasD1bv4gQVMstzR6pcbaqa3fVK8YgNJNcIUexmNCsoQ== Received: from ppma13.dal12v.mail.ibm.com (dd.9e.1632.ip4.static.sl-reverse.com [50.22.158.221]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 47ufeeu2n8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 14 Jul 2025 17:35:19 +0000 (GMT) Received: from pps.filterd (ppma13.dal12v.mail.ibm.com [127.0.0.1]) by ppma13.dal12v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 56EFDMTg000722; Mon, 14 Jul 2025 17:35:18 GMT Received: from smtprelay07.wdc07v.mail.ibm.com ([172.16.1.74]) by ppma13.dal12v.mail.ibm.com (PPS) with ESMTPS id 47v48kxmwc-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 14 Jul 2025 17:35:18 +0000 Received: from smtpav01.wdc07v.mail.ibm.com (smtpav01.wdc07v.mail.ibm.com [10.39.53.228]) by smtprelay07.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 56EHZGL011403776 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 14 Jul 2025 17:35:16 GMT Received: from smtpav01.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id B82B958059; Mon, 14 Jul 2025 17:35:16 +0000 (GMT) Received: from smtpav01.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C722058065; Mon, 14 Jul 2025 17:35:15 +0000 (GMT) Received: from localhost.localdomain (unknown [9.61.243.148]) by smtpav01.wdc07v.mail.ibm.com (Postfix) with ESMTP; Mon, 14 Jul 2025 17:35:15 +0000 (GMT) From: Mingming Cao To: netdev@vger.kernel.org Cc: kuba@kernel.org, horms@kernel.org, bjking1@linux.ibm.com, haren@linux.ibm.com, ricklind@linux.ibm.com, davemarq@linux.ibm.com, mmc@linux.ibm.com Subject: [PATCH v3 net-next 2/2] ibmvnic: Use ndo_get_stats64 to fix inaccurate SAR reporting Date: Mon, 14 Jul 2025 13:35:07 -0400 Message-Id: <20250714173507.73096-3-mmc@linux.ibm.com> X-Mailer: git-send-email 2.39.3 (Apple Git-146) In-Reply-To: <20250714173507.73096-1-mmc@linux.ibm.com> References: <20250714173507.73096-1-mmc@linux.ibm.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzE0MDEwOCBTYWx0ZWRfX8Unvsw0Ir1TO hjNDOK76NZjao5aNAaf4n7LuYM9PdMtwRMdmdcjc8RGsHLIUFuu3jz+A6yr//waSGxl+HFw4GcS QjgNT8EBW4aaHfkkjfN1t4UnG2qiyb4t5L8wB3cDWHUgcR5BRIKqmlZRbUrCSlS92mJDbeZz5it VMw8wxAu7oz0szVxPYA+F8MP9fAg3SeNP5jns7wVajbBo7ZnWyNAlxV9J7FO1nlknpMg++WM9O5 IJHvI+TQGP7UcMAhWDWv8uKEO13/U6+US+YJNfij4cEn5N6gu04G/4cL4Ap6wGfZ1g5FGvFSLcY jhzgeYz9tgEkaGpP+rHtQphbrDKlNBW9nCRGbR+CdUZSBPTfAhHdUDUmp0d5yZV2GpD5Gq/EODV Dn8FczzBjCPLePqCHlSV5qPDnuEEQWs4gthOA6gp0aAfIbhggzkH3FP7+nTv9TW8B/0Db99Q X-Proofpoint-ORIG-GUID: ugcqVJt_-4clBAo6sef0JT5Ovd-GKtCJ X-Authority-Analysis: v=2.4 cv=C9/pyRP+ c=1 sm=1 tr=0 ts=68753fd7 cx=c_pps a=AfN7/Ok6k8XGzOShvHwTGQ==:117 a=AfN7/Ok6k8XGzOShvHwTGQ==:17 a=Wb1JkmetP80A:10 a=VnNF1IyMAAAA:8 a=WXPv24T5S-jwTN21q9UA:9 X-Proofpoint-GUID: ugcqVJt_-4clBAo6sef0JT5Ovd-GKtCJ X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.7,FMLib:17.12.80.40 definitions=2025-07-14_01,2025-07-14_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 phishscore=0 impostorscore=0 spamscore=0 suspectscore=0 priorityscore=1501 lowpriorityscore=0 mlxlogscore=999 bulkscore=0 adultscore=0 clxscore=1015 mlxscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2507140108 VNIC testing on multi-core Power systems showed SAR stats drift and packet rate inconsistencies under load. Implements ndo_get_stats64 to provide safe aggregation of queue-level atomic64 counters into rtnl_link_stats64 for use by tools like 'ip -s', 'ifconfig', and 'sar'. Switch to ndo_get_stats64 to align SAR reporting with the standard kernel interface for retrieving netdev stats. This removes redundant per-adapter stat updates, reduces overhead, eliminates cacheline bouncing from hot path updates, and improves the accuracy of reported packet rates. Signed-off-by: Mingming Cao Reviewed by: Brian King Reviewed by: Dave Marquardt --- drivers/net/ethernet/ibm/ibmvnic.c | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c index 79fdba4293a4..6dd7809b1bc7 100644 --- a/drivers/net/ethernet/ibm/ibmvnic.c +++ b/drivers/net/ethernet/ibm/ibmvnic.c @@ -2312,8 +2312,6 @@ static void ibmvnic_tx_scrq_clean_buffer(struct ibmvnic_adapter *adapter, tx_pool->num_buffers - 1 : tx_pool->consumer_index - 1; tx_buff = &tx_pool->tx_buff[index]; - adapter->netdev->stats.tx_packets--; - adapter->netdev->stats.tx_bytes -= tx_buff->skb->len; atomic64_dec(&adapter->tx_stats_buffers[queue_num].batched_packets); if (atomic64_sub_return(tx_buff->skb->len, &adapter->tx_stats_buffers[queue_num].bytes) < 0) { @@ -2325,9 +2323,9 @@ static void ibmvnic_tx_scrq_clean_buffer(struct ibmvnic_adapter *adapter, atomic64_read(&adapter->tx_stats_buffers[queue_num].bytes), tx_buff->skb->len); } + atomic64_inc(&adapter->tx_stats_buffers[queue_num].dropped_packets); dev_kfree_skb_any(tx_buff->skb); tx_buff->skb = NULL; - adapter->netdev->stats.tx_dropped++; } ind_bufp->index = 0; @@ -2655,9 +2653,6 @@ static netdev_tx_t ibmvnic_xmit(struct sk_buff *skb, struct net_device *netdev) } out: rcu_read_unlock(); - netdev->stats.tx_dropped += tx_dropped; - netdev->stats.tx_bytes += tx_bytes; - netdev->stats.tx_packets += tx_bpackets + tx_dpackets; adapter->tx_send_failed += tx_send_failed; adapter->tx_map_failed += tx_map_failed; atomic64_add(tx_bpackets, &adapter->tx_stats_buffers[queue_num].batched_packets); @@ -3460,6 +3455,25 @@ static int ibmvnic_reset(struct ibmvnic_adapter *adapter, return -ret; } +static void ibmvnic_get_stats64(struct net_device *netdev, + struct rtnl_link_stats64 *stats) +{ + struct ibmvnic_adapter *adapter = netdev_priv(netdev); + int i; + + for (i = 0; i < adapter->req_rx_queues; i++) { + stats->rx_packets += atomic64_read(&adapter->rx_stats_buffers[i].packets); + stats->rx_bytes += atomic64_read(&adapter->rx_stats_buffers[i].bytes); + } + + for (i = 0; i < adapter->req_tx_queues; i++) { + stats->tx_packets += atomic64_read(&adapter->tx_stats_buffers[i].batched_packets); + stats->tx_packets += atomic64_read(&adapter->tx_stats_buffers[i].direct_packets); + stats->tx_bytes += atomic64_read(&adapter->tx_stats_buffers[i].bytes); + stats->tx_dropped += atomic64_read(&adapter->tx_stats_buffers[i].dropped_packets); + } +} + static void ibmvnic_tx_timeout(struct net_device *dev, unsigned int txqueue) { struct ibmvnic_adapter *adapter = netdev_priv(dev); @@ -3575,8 +3589,6 @@ static int ibmvnic_poll(struct napi_struct *napi, int budget) length = skb->len; napi_gro_receive(napi, skb); /* send it up */ - netdev->stats.rx_packets++; - netdev->stats.rx_bytes += length; atomic64_inc(&adapter->rx_stats_buffers[scrq_num].packets); atomic64_add(length, &adapter->rx_stats_buffers[scrq_num].bytes); frames_processed++; @@ -3686,6 +3698,7 @@ static const struct net_device_ops ibmvnic_netdev_ops = { .ndo_set_rx_mode = ibmvnic_set_multi, .ndo_set_mac_address = ibmvnic_set_mac, .ndo_validate_addr = eth_validate_addr, + .ndo_get_stats64 = ibmvnic_get_stats64, .ndo_tx_timeout = ibmvnic_tx_timeout, .ndo_change_mtu = ibmvnic_change_mtu, .ndo_features_check = ibmvnic_features_check, -- 2.39.3 (Apple Git-146)