From nobody Sat Sep 27 15:14:02 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cYrZg3JwVz68D94; Sat, 27 Sep 2025 15:14:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cYrZg0ZGNz44Hn; Sat, 27 Sep 2025 15:14:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758986043; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Kv7Mxi1FFRT02HY24l3jhGvncf2LYsqd7IaETEh53mY=; b=X4YcYAdVzqyVVyqgpxxMzzE3P80kryuLFOEnl3AT5nnQJIKR3dEYhYu/Jmj4wVb4RNRnrZ eRioZ5l1fg2LTWgAdYVAApDV3gh5PJCpdRoZ1bpiyG3E+iczz23TB91LAaTTx5e/zvicjd lPk11yPwxXnqTpzTYG2+ReE9sB4OjNyuR52x/yfecOh3knHpkNlp/dV9A9kbTXaau1aeDU qYByziJGJd9GrzSbgvKKeUoGvYUzPCzCgimlT5w4G/CdgkoGSbari/IOeYK8XKC03sHU44 wVuKJmv7DFzC9Se3cF9XO6lG/yGhEyX09ldRfnHWtQ/9TcXRZDnw60NHQOmyAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758986043; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Kv7Mxi1FFRT02HY24l3jhGvncf2LYsqd7IaETEh53mY=; b=mvxqyF6/qC3j60CSL1oR+EIzb58tGHN3jTPDQ+/IZKNUlI+ABSqgH/962gaYjpMeEok0aJ 6RqA5Kyn8mbmB9cz+3BC286Ey3sIrAdKKY9sPx3XSEvTX3j2RXBNgWdVFvuJ14j4pO1/vv 9re6r5OEMZhYtZY31zqGE8NovgxxxxYhrt+yDXzF+23kUztSnbQ60ucXnWUgc8Rak75kl6 yCM5mI1ADccWamo3xqDnztZZ6QNEZoAs5llHrp3+mP6MpT0r6kTqJMgvfNCXKmKmuGdDbg kZy0fKwRGajh50E3fQHtvV/fuohfmakqiqtkKMekfdHYz+GlYfENEWChlKKx2g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758986043; a=rsa-sha256; cv=none; b=tJnU5y8+O/y956naHgc73tt7X4BVZrTLRgA+hpOcdQVz/LaVg8zDjTCuC29ia3L4s8wMbr TRS1aiofhFvbow7JTEZGM+ebkKtVyMP9NMQtcsgVuLpwrbR4/OKjOIBk5t2qvjhnaS/mWS jor+GNTN0brZlduBu5i3uidm3dsFubCALeMLqZ0fwQ0m3rIQvflQUK94Xr/EsZGt+0ohEN KHJ+Waqsk1yA9F40SNSmqA20DVV1GoZ2ueubTTVUx1RUkT6E7UdV5djt1vgJzdBdCV9iBF /S/0WzfgPDYp3lCudYZtBaIQWjQyxNyZ9DjjddY/Zlp8g+c+IocaYl3wSz2gYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cYrZf5d1Hzg52; Sat, 27 Sep 2025 15:14:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58RFE2Ge083311; Sat, 27 Sep 2025 15:14:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58RFE2r8083308; Sat, 27 Sep 2025 15:14:02 GMT (envelope-from git) Date: Sat, 27 Sep 2025 15:14:02 GMT Message-Id: <202509271514.58RFE2r8083308@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 8049f85bdd8b - stable/14 - vtnet: Do "hardware" accounting for the total number of received octets List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8049f85bdd8b60560d7a4759afb762dc62033171 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=8049f85bdd8b60560d7a4759afb762dc62033171 commit 8049f85bdd8b60560d7a4759afb762dc62033171 Author: Joyu Liao AuthorDate: 2025-09-04 20:00:27 +0000 Commit: Zhenlei Huang CommitDate: 2025-09-27 15:11:37 +0000 vtnet: Do "hardware" accounting for the total number of received octets While here, advertise the IFCAP_HWSTATS capability to avoid the net stack from double counting it. Co-authored-by: zlei Reviewed by: zlei MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D44816 (cherry picked from commit a14d561e58529c9686a2efc47f4828ad82026e63) --- sys/dev/virtio/network/if_vtnet.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/dev/virtio/network/if_vtnet.c b/sys/dev/virtio/network/if_vtnet.c index 92cb659c92c3..355027391985 100644 --- a/sys/dev/virtio/network/if_vtnet.c +++ b/sys/dev/virtio/network/if_vtnet.c @@ -1178,6 +1178,7 @@ vtnet_setup_interface(struct vtnet_softc *sc) if (sc->vtnet_max_mtu >= ETHERMTU_JUMBO) if_setcapabilitiesbit(ifp, IFCAP_JUMBO_MTU, 0); if_setcapabilitiesbit(ifp, IFCAP_VLAN_MTU, 0); + if_setcapabilitiesbit(ifp, IFCAP_HWSTATS, 0); /* * Capabilities after here are not enabled by default. @@ -3047,6 +3048,8 @@ vtnet_get_counter(if_t ifp, ift_counter cnt) return (rxaccum.vrxs_iqdrops); case IFCOUNTER_IERRORS: return (rxaccum.vrxs_ierrors); + case IFCOUNTER_IBYTES: + return (rxaccum.vrxs_ibytes); case IFCOUNTER_OPACKETS: return (txaccum.vtxs_opackets); #ifndef VTNET_LEGACY_TX