From nobody Sat Sep 27 15:14:03 2025 X-Original-To: dev-commits-src-all@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 4cYrZj03Q1z68DFR; Sat, 27 Sep 2025 15:14:05 +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 4cYrZh0HJmz4481; Sat, 27 Sep 2025 15:14:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758986044; 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=dvxvdriXJkurYEKCKWdtyzZTWPaopSiuvS1pR44oFm0=; b=bUf5xaZLv9IU1GFfA2jHPA2M3RL5wf9oPBoj7jmJPXjd5JneITluJKOO9fn70mvuPDYPeq 9DVmffH3F4c2PrsHW7+hUcs5SPP9w4fKSWUBANMjcEgRvXeMzSISVdQfMaSgYO0Hvw5Kqp 3A424aoDcLVlXXzPoi3VpOv5f+Uk9w1CwkvERHWOCP70pxsiWVbSDTw4JLWtyN3+5PADJy ubRpzr276JRbXNCWG7R+kQdlm1hspJ4uVYRrjcDnWEXF/JV+WzQ++4m/IILD7AjTKa8oNe JJquRaphzcsi2koNirYHQUJ61jNpjbWsX6x31qdRRUCfFAYsQaycGDWOuhTAFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758986044; 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=dvxvdriXJkurYEKCKWdtyzZTWPaopSiuvS1pR44oFm0=; b=F2cYTXFQ3ts56QshXfD8oH+hxRWH7gNRuSfCPPKUZK6xzvvWu1wgjXW8n5TdvCVdVD//ye WcO2gH8j3Zb+VHK1od66Lfv4c0mZIOBJ8B3Dxi+0wH+6DFoLOXwzpbgWnNPcw/65kAadTC 7nqFGDc6sUt/eJohqtERzLrAeIh4rWjQjyk/iE4J2+xyXdViJXYBNUHv2d6w92MtTYfY9m Uh8LprAfuNYM+YoTWtwumSOY4nf27m1XeLcAFegoy/XFe5AAh8Xm1SWmJKDgXRDDQ4Xahy ++68OPVkeh+FqGFgXgOgbVIVXiIDYKHbSKlFHXzfAYbx4G/ALlLQ05QZ9M2R7A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758986044; a=rsa-sha256; cv=none; b=l1uWF1b61E9C8I3yJ6l5Mav6GUC6u8vpD6bWynwea5wcxtJCU7cpNfvLpou6ubeDEBIKha odUHUNsS3RdYh1sqYXjj0gBoPK6Ttb0ZHqnyYulUwFg+AmtHvW3tnh+HbVCM104AyDHCNZ mNhw+wtgZWeZKQ3Hs9+YqUUoTYZHxGRxu6smUZz6k4VbvuJAl9JcMb/e+0YPO05yeAdCjf FFhUrOJz8QVRp2jTVqtkM0DgJEgI+plN4LhfyTj5762/zV7H+dTqmEV6be3negL4fAjxTe pKkO40ZEf/fdLey8G223Hj+ly6LYKYcpTpHRHCOk2i0Tm696/cqqw4MaWoQJbQ== 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 4cYrZg6hGXzg53; Sat, 27 Sep 2025 15:14:03 +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 58RFE3jI083346; Sat, 27 Sep 2025 15:14:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58RFE3fl083343; Sat, 27 Sep 2025 15:14:03 GMT (envelope-from git) Date: Sat, 27 Sep 2025 15:14:03 GMT Message-Id: <202509271514.58RFE3fl083343@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: 7d680875473d - stable/14 - vtnet: Prefer "hardware" accounting for the multicast and total number of octets sent List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 7d680875473d4abc056d0e6ad354842d8909bbdc Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=7d680875473d4abc056d0e6ad354842d8909bbdc commit 7d680875473d4abc056d0e6ad354842d8909bbdc Author: Joyu Liao AuthorDate: 2025-09-04 20:00:28 +0000 Commit: Zhenlei Huang CommitDate: 2025-09-27 15:11:37 +0000 vtnet: Prefer "hardware" accounting for the multicast and total number of octets sent When ALTQ is enabled, this driver does "hardware" accounting and soft accounting at the same time. Prefer the "hardware" one to make the logic simpler. Reviewed by: zlei MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D44817 (cherry picked from commit 2a346c8993cbb92a321a7c25bd9ac4dcaae352d1) --- sys/dev/virtio/network/if_vtnet.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/dev/virtio/network/if_vtnet.c b/sys/dev/virtio/network/if_vtnet.c index 355027391985..949b3ba0e5bb 100644 --- a/sys/dev/virtio/network/if_vtnet.c +++ b/sys/dev/virtio/network/if_vtnet.c @@ -3052,12 +3052,10 @@ vtnet_get_counter(if_t ifp, ift_counter cnt) return (rxaccum.vrxs_ibytes); case IFCOUNTER_OPACKETS: return (txaccum.vtxs_opackets); -#ifndef VTNET_LEGACY_TX case IFCOUNTER_OBYTES: return (txaccum.vtxs_obytes); case IFCOUNTER_OMCASTS: return (txaccum.vtxs_omcasts); -#endif default: return (if_get_counter_default(ifp, cnt)); }