From nobody Thu Dec 18 14:45:10 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 4dXD3V1k82z6L5Yg for ; Thu, 18 Dec 2025 14:45:10 +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 4dXD3V0lQ9z3WWn for ; Thu, 18 Dec 2025 14:45:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766069110; 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=A1X134/94OXBJy1FrCzwni9DeudEBuUV4jaqoz+0eg4=; b=y2W7fGiIir+YpyRtmmJ7JnvaNi3XXkGUNML9zv7kKpWn7WryFm77uyJxKlcp8fGxSoogxW OoOoRhMP27HfLQ+kyBoPSP5FeGqmb9+OIZljCNOFl6LdiDNx0wbkD3ObRVsWDuyX4Dw3mI mkbGd6qw0OtrRuNZpIehoBzBnHAtVIorDtFzDPyTbDjuJCN90tUBRVSSzJ2vpw6jDb/0A5 XA/ayVgs7x2tAPy/OfyekNAfNGA2gJJiN1GwKeTorYpYOxdWaY+nz0rHqDwZfYxg0qZjyS T/fi3RD+gSpa+GMcrPyXoAo/ExFOY/DUnlCNt4TcwD6OVifTelhyrN774k6C1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766069110; 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=A1X134/94OXBJy1FrCzwni9DeudEBuUV4jaqoz+0eg4=; b=kVZQ37MuyMeuQ7aq5RiXcfh1rSHxqTN5RS7lItb6kYIqTdFpMLtKDg2SsCpLc6qnxVq2UK lyWiWnnxYuSODDzL5yMGc3j6h7x2H3s2l0qok/KFOfJjXsfIUV8OPACUHmO6VZcwmFPOCR lsA2oR2O5YR1fAU4hotw1reD37gYwfVbWiZUNaF01Hxg8J1LE9mgq/qyBxsrremdEBupng ukIfdZAdvf2v3fJSudIM8C21a5NbL4IodNPvYicuatc7ZZxhIl10AcP1dntAjphspIdvJE rmc5lmho4SPXlITrJYTAWZW2FZxujE1DABp4MkVb3zKPGFInKWw3yCxQ9lAJPA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766069110; a=rsa-sha256; cv=none; b=NQEfHVGsUtn0HyZi70dwLBs52A2cIyT5ernYrgRI5Jq18Wn1FWBQKN8VGzs8qqhlJtxJSJ 8XxEDUW1HbQoOd6whro4EVwWU57TE10dtg0/cEWW/EyZv3Qk3JexmJHkAaGVok7opKqO+3 1YKGxa2FkWob/CaA9/YZBzVuILCH6ASBpVPHCdL6Zv7feCuk9jqB1M3YJ+Q+I6YYvaXMU4 V4Y1x+Fbs0/0QDkETCu+3E5aG+Dn60ewMwmA0Smmld8lTfCfXJJSyBIWZbfK7DluNgTTxm usSQiv1tbjJEie7mP1gD9iSCxhxOhbYLGc9S8BTTMKrE2dwUTDSKuf3IxR0Pzw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dXD3V0KjXzjM0 for ; Thu, 18 Dec 2025 14:45:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39916 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 18 Dec 2025 14:45:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: e3a0571ad74d - main - vtnet: expose flags via sysctl tree 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e3a0571ad74d8429a95fcae9efc1d91cc109a337 Auto-Submitted: auto-generated Date: Thu, 18 Dec 2025 14:45:10 +0000 Message-Id: <69441376.39916.119146bf@gitrepo.freebsd.org> The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=e3a0571ad74d8429a95fcae9efc1d91cc109a337 commit e3a0571ad74d8429a95fcae9efc1d91cc109a337 Author: Michael Tuexen AuthorDate: 2025-12-18 14:42:13 +0000 Commit: Michael Tuexen CommitDate: 2025-12-18 14:42:13 +0000 vtnet: expose flags via sysctl tree Provide the flags used for a vtnet interface via the sysctl tree. This is mostly used for debugging purposes. Reviewed by: Timo Völker MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D54283 --- share/man/man4/vtnet.4 | 4 +++- sys/dev/virtio/network/if_vtnet.c | 20 ++++++++++++++++++++ sys/dev/virtio/network/if_vtnetvar.h | 5 +++++ 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/share/man/man4/vtnet.4 b/share/man/man4/vtnet.4 index fd41b36882a6..92f72030fc31 100644 --- a/share/man/man4/vtnet.4 +++ b/share/man/man4/vtnet.4 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd September 30, 2025 +.Dd December 18, 2025 .Dt VTNET 4 .Os .Sh NAME @@ -271,6 +271,8 @@ The number of active virtqueue pairs. The number of requested virtqueue pairs. .It Va dev.vtnet. Ns Ar X Ns Va .max_vq_pairs The maximum number of supported virtqueue pairs. +.It Va dev.vtnet. Ns Ar X Ns Va .flags +The flags of the interface. Mostly for debugging purposes. .El .Sh SEE ALSO .Xr arp 4 , diff --git a/sys/dev/virtio/network/if_vtnet.c b/sys/dev/virtio/network/if_vtnet.c index d9daa5bfd70a..58cef9b34449 100644 --- a/sys/dev/virtio/network/if_vtnet.c +++ b/sys/dev/virtio/network/if_vtnet.c @@ -40,6 +40,7 @@ #include #include #include +#include #include #include #include @@ -4398,6 +4399,22 @@ vtnet_setup_stat_sysctl(struct sysctl_ctx_list *ctx, "Times the transmit interrupt task rescheduled itself"); } +static int +vtnet_sysctl_flags(SYSCTL_HANDLER_ARGS) +{ + struct vtnet_softc *sc; + struct sbuf *sb; + int error; + + sb = sbuf_new_auto(); + sc = (struct vtnet_softc *)arg1; + sbuf_printf(sb, "%b", sc->vtnet_flags, VTNET_FLAGS_BITS); + sbuf_finish(sb); + error = SYSCTL_OUT(req, sbuf_data(sb), sbuf_len(sb) + 1); + sbuf_delete(sb); + return (error); +} + static void vtnet_setup_sysctl(struct vtnet_softc *sc) { @@ -4420,6 +4437,9 @@ vtnet_setup_sysctl(struct vtnet_softc *sc) SYSCTL_ADD_INT(ctx, child, OID_AUTO, "act_vq_pairs", CTLFLAG_RD, &sc->vtnet_act_vq_pairs, 0, "Number of active virtqueue pairs"); + SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "flags", + CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_MPSAFE, sc, 0, + vtnet_sysctl_flags, "A", "Flags"); vtnet_setup_stat_sysctl(ctx, child, sc); } diff --git a/sys/dev/virtio/network/if_vtnetvar.h b/sys/dev/virtio/network/if_vtnetvar.h index cab7ced639a7..eb5e6784b07f 100644 --- a/sys/dev/virtio/network/if_vtnetvar.h +++ b/sys/dev/virtio/network/if_vtnetvar.h @@ -191,6 +191,11 @@ struct vtnet_softc { char vtnet_mtx_name[16]; uint8_t vtnet_hwaddr[ETHER_ADDR_LEN]; }; +/* vtnet flag descriptions for use with printf(9) %b identifier. */ +#define VTNET_FLAGS_BITS \ + "\20\1MODERN\2MAC\3CTRL_VQ\4CTRL_RX\5CTRL_MAC\6VLAN_FILTER\7TSO_ECN" \ + "\10MRG_RXBUFS\11LRO_NOMRG\12MQ\13INDIRECT\14EVENT_IDX\15SUSPENDED" \ + "\16FIXUP_NEEDS_CSUM\17SW_LRO" static bool vtnet_modern(struct vtnet_softc *sc)