From nobody Fri Dec 19 16:41:51 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 4dXtbg31hHz6M1sY for ; Fri, 19 Dec 2025 16:41:51 +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 4dXtbg28RVz3ntc for ; Fri, 19 Dec 2025 16:41:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766162511; 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=4uEVGyQVjyWEteFa/Bz7CMSl8QIGRfxjHEJ5oVXMt8I=; b=J9pNTJ+xI6EAmbGfoFmXCYmlX4LXRfxatiwcMvrK9CAwEwLb7d+lQqpyJKuTiiKKOWYo0q VeWiGFCegEHhL2qdNgw2RTX9hfx/NVgnvKQr2qB+wh4+bGCbxJ95XFMlk1bfZzxf+WcDDv wnGkhQNxEnQrAHilKYCwx0P5/7roEIp4ecOicpraJ1bD+sOKdgtEu0vGijS/42phTCJ0y+ +AfjTmEp7YitxdEpPLDCKdL4MGWZERzEOoos7uILXvR1aU8SdqR199Ql5sqf34Nv8nOmXd a+EEIY+pmz3HSMTWKB9nt2lsndNnGaS32FHYtM1EJZk2Yx8imIFsiikATSHGHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766162511; 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=4uEVGyQVjyWEteFa/Bz7CMSl8QIGRfxjHEJ5oVXMt8I=; b=k7NBQXKwbPloIg5YQYLWy1CulpUhksi8GsHjX2Q/OZr5XPpCapx6TCsO7NAu6CxiDFO2ja Zg5zMTKJLNoUZGPx+j7oFqMqrPr1jB0FOIpCZepq4rO+TfTU/41wzE4jygMgJetooE9rY/ /JiWGR1ng6Nzm+OrQXkOTXrzuLP6EghgZthXH4DJlWnJUqY52syCHuMP0lva0qg9y23GMK hF8lTegAZ69SaAOtLfocE7GNiDBLgSN5ZVugfiApKdOCwMLiiXA8+TODCCTho0MXxDv9iC ZpNej9AM64uTOe6e7+tp/2rI44inbw0D1/7FHX4L1a3Ggk/oY2uiPzuxRRA0Iw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766162511; a=rsa-sha256; cv=none; b=cSufFwgshEX2u0Q/ex2IdGCTBFlLKomMuV+fEmVwUXt6IrG+93XGEDAnG8im21sRz+wn36 JPf61brJHDf2FZsoZAq2rdsfQq4Z6euGUXmBAmi4DFrH1r7K0B5Nz7yskrHda+zAbktYEO AVTi9OGShhonq5oMjYuY+ICVFdeEs4jvSxRT9PNAE6gSknmJbvc/PS1UeliCRH7sqGvW8C JBOedIffMjFjMlKaZxMVy6lj9Jpncj0oSRAOTsmZw2M9Bvq3GLuTD7fqcCMKrik4ett5EG 6zgvOvThbAKK/8+3c08AgLagS0OzvrEmwGvXTYdnXQp+p7c5cP4BCEPMkfUTJA== 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 4dXtbg1fbbz1V2 for ; Fri, 19 Dec 2025 16:41:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id b4dd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 19 Dec 2025 16:41:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 634d9c0d111b - main - vtnet: expose features 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: 634d9c0d111b630c3d63a1cf25d15c32a37afab8 Auto-Submitted: auto-generated Date: Fri, 19 Dec 2025 16:41:51 +0000 Message-Id: <6945804f.b4dd.7d2d2c49@gitrepo.freebsd.org> The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=634d9c0d111b630c3d63a1cf25d15c32a37afab8 commit 634d9c0d111b630c3d63a1cf25d15c32a37afab8 Author: Michael Tuexen AuthorDate: 2025-12-19 16:38:35 +0000 Commit: Michael Tuexen CommitDate: 2025-12-19 16:38:35 +0000 vtnet: expose features via sysctl tree Right now the 64-bit flags field needs to be casted to a 32-bit field, because clang warns if more than 32-bits are used. Once clang is fixed, this restriction will be removed and more bits will be added. Reviewed by: markj, Timo Völker MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D54288 --- share/man/man4/vtnet.4 | 4 +++- sys/dev/virtio/network/if_vtnet.c | 18 ++++++++++++++++++ sys/dev/virtio/network/virtio_net.h | 8 ++++++++ 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/share/man/man4/vtnet.4 b/share/man/man4/vtnet.4 index 4ef8693305cf..926f504d8070 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 December 18, 2025 +.Dd December 19, 2025 .Dt VTNET 4 .Os .Sh NAME @@ -274,6 +274,8 @@ 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. +.It Va dev.vtnet. Ns Ar X Ns Va .features +The features of the interface as defined by the virtio specification. .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 58cef9b34449..73f34808e008 100644 --- a/sys/dev/virtio/network/if_vtnet.c +++ b/sys/dev/virtio/network/if_vtnet.c @@ -4399,6 +4399,21 @@ vtnet_setup_stat_sysctl(struct sysctl_ctx_list *ctx, "Times the transmit interrupt task rescheduled itself"); } +static int +vtnet_sysctl_features(SYSCTL_HANDLER_ARGS) +{ + struct sbuf sb; + struct vtnet_softc *sc = (struct vtnet_softc *)arg1; + int error; + + sbuf_new_for_sysctl(&sb, NULL, 0, req); + sbuf_printf(&sb, "%b", (uint32_t)sc->vtnet_features, + VIRTIO_NET_FEATURE_BITS); + error = sbuf_finish(&sb); + sbuf_delete(&sb); + return (error); +} + static int vtnet_sysctl_flags(SYSCTL_HANDLER_ARGS) { @@ -4437,6 +4452,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, "features", + CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_MPSAFE, sc, 0, + vtnet_sysctl_features, "A", "Features"); SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "flags", CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_MPSAFE, sc, 0, vtnet_sysctl_flags, "A", "Flags"); diff --git a/sys/dev/virtio/network/virtio_net.h b/sys/dev/virtio/network/virtio_net.h index e61a4a993052..f4256664fba8 100644 --- a/sys/dev/virtio/network/virtio_net.h +++ b/sys/dev/virtio/network/virtio_net.h @@ -57,6 +57,14 @@ #define VIRTIO_NET_F_CTRL_MAC_ADDR (1ULL << 23) /* Set MAC address */ #define VIRTIO_NET_F_SPEED_DUPLEX (1ULL << 63) /* Device set linkspeed and duplex */ +/* virtio net feature flag descriptions for use with printf(9) %b identifier. */ +#define VIRTIO_NET_FEATURE_BITS \ + "\20\200CSUM\201GUEST_CSUM\202CTRL_GUEST_OFFLOADS\203MTU\205MAC\206GSO" \ + "\207GUEST_TSO4\210GUEST_TSO6\211GUEST_ECN\212GUEST_UFO\213HOST_TSO4" \ + "\214HOST_TSO6\215HOST_ECN\216HOST_UFO\217MRG_RXBUF\220STATUS\221CTRL_VQ" \ + "\222CTRL_RX\223CTRL_VLAN\224CTRL_RX_EXTRA\225GUEST_ANNOUNCE\226MQ" \ + "\227CTRL_MAC_ADDR\277SPEED_DUPLEX" + #define VIRTIO_NET_S_LINK_UP 1 /* Link is up */ #define VIRTIO_NET_S_ANNOUNCE 2 /* Announcement is needed */