From nobody Thu Sep 4 20:01:43 2025 X-Original-To: dev-commits-src-main@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 4cHr3C6855z66gkC; Thu, 04 Sep 2025 20:01:43 +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 4cHr3C4Cq6z3YGq; Thu, 04 Sep 2025 20:01:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757016103; 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=nn2ENZf9QrWSKzrn7MYLweSvx7mhRTGC5aMCBIQq5tI=; b=eV9rnaVmVT4s5jeS4p+WIoL+xd/igS3fMI5o76IWTV+Ziyu5SzlI2JmeJ+LnFmnD4mkGR5 zZf2ZHz3BSptc7kqOB6mq+lwtQW40+6VnwR3C+FtxlpELkkQCKuv7fGD+yrlBA4hVDMHj+ u3FlTRSgzKVz4YAZ0ma1+3KWcAHB5BBdnNqoZUO31F0dNuFPRXyhB3z7gCcTDOw9s/aV7E 8xLrPlH1RBTVnJHqy33HbP8aP5v0BLl7BDHDdaHvD7mECYMS4srOUR6WR/2bpS4NyVjKmw 86lgWny0FfKU8wP6bO4W2UuGjxlaYinPkdixYDUJrQkKA0p9RgXZO0LnNQiSpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757016103; 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=nn2ENZf9QrWSKzrn7MYLweSvx7mhRTGC5aMCBIQq5tI=; b=aMZY2uDIUqHgOnbOLGO4tRBx/PT5jQ4Zz4kkMN93x+dhSVn4092V1DC2fZ+tCgron8EJAk WhZxOYD3J1vpQw46oP0Gdvt3JFUHt5zyGdS9zYYaicSwdF8l4gAnCGrgGBA2bvEDS0TPHp QtdlrRyvgboVabRcrNpyqf4p2NrgZz/mqfFIKt4ULPIKdoT80lxHpTk5hGxcXDBaQ3qsoV jpEMbFYFWDM7lFI/PtFFnSTXqjFwW9ONzf7II2AkPC8UrCGeA5jMYSRWQQQ8ZjqDibYT+6 QfBrLyWi4sdvTmGRRD7JXhp7bgHnJEK/hWhplTjBGX4l4cTvFQYdE6LPNieNJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757016103; a=rsa-sha256; cv=none; b=XM+LZYD5hn1rBRVC7AQhD7PLYCMY0EE81bjSspVmWGR/HpmKaVnqTU/WhVb0h5KzRaXdef 9JTAKz7C4Xnlx3kL/SFVaPHYIqL4vF/RPCpMRXdtQbVdcj+NVnAWIDIErDPUrr2qLARAaO Xs65GJm0TBDoALBKnyhkKhg5pCal0uk4hz98mBHqs22TEuXekq5f8QovjXjPS3GQnGeYZ6 PaV73RZ3X2qWIJsRqCO7jR49SCI+36uQLlv/P/HvRcCCIEzDfTOjCqxmKoIa7XX7F6HQzr yNqiaqu4YCML+4uIPgzJfubornYQq1tL3ikToNEBSV+rJi4+QTHsAe4XCHhsoQ== 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 4cHr3C3pjJz2pW; Thu, 04 Sep 2025 20:01:43 +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 584K1hxT042068; Thu, 4 Sep 2025 20:01:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 584K1hnf042065; Thu, 4 Sep 2025 20:01:43 GMT (envelope-from git) Date: Thu, 4 Sep 2025 20:01:43 GMT Message-Id: <202509042001.584K1hnf042065@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 2a346c8993cb - main - vtnet: Prefer "hardware" accounting for the multicast and total number of octets sent List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 2a346c8993cbb92a321a7c25bd9ac4dcaae352d1 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=2a346c8993cbb92a321a7c25bd9ac4dcaae352d1 commit 2a346c8993cbb92a321a7c25bd9ac4dcaae352d1 Author: Joyu Liao AuthorDate: 2025-09-04 20:00:28 +0000 Commit: Zhenlei Huang CommitDate: 2025-09-04 20:00:28 +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 --- sys/dev/virtio/network/if_vtnet.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/sys/dev/virtio/network/if_vtnet.c b/sys/dev/virtio/network/if_vtnet.c index ec4282e0741a..73f27ac147ff 100644 --- a/sys/dev/virtio/network/if_vtnet.c +++ b/sys/dev/virtio/network/if_vtnet.c @@ -3042,13 +3042,9 @@ vtnet_get_counter(if_t ifp, ift_counter cnt) case IFCOUNTER_OPACKETS: return (txaccum.vtxs_opackets); case IFCOUNTER_OBYTES: - if (!VTNET_ALTQ_ENABLED) - return (txaccum.vtxs_obytes); - /* FALLTHROUGH */ + return (txaccum.vtxs_obytes); case IFCOUNTER_OMCASTS: - if (!VTNET_ALTQ_ENABLED) - return (txaccum.vtxs_omcasts); - /* FALLTHROUGH */ + return (txaccum.vtxs_omcasts); default: return (if_get_counter_default(ifp, cnt)); }