From nobody Mon Apr 28 16:30:54 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 4ZmTTW1z9Sz5vYYm; Mon, 28 Apr 2025 16:30:55 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZmTTW0fTwz3WDS; Mon, 28 Apr 2025 16:30:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745857855; 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=+/KH9BxTtX0/bp2bM5LteOuH6aKj/EDHYLirrWlGoss=; b=TBmqfMtkR07r6ewjDI6E2HLZ2loP5UGzh69uy7LIugLBmbcE7yDeJ3xuufm0rtWPlgDh7z 6Waz+srqDDOELRme3mjeeq+SdhQvZyMpLIZWH9OEaJLILBxeNopebBsNaVHb2yXCwsFvVV S5a+Y4hWqYJZXsFAU4RuuV7G2wc7zpNgnAkgL4/XdTj8RfZXuC00WU4Omijn+Dhe3J6R77 U8b1/xbfzyF+gtlL7tkIDnaNIomwgkXkZUIuLnXlJQDmfs47Swz6ZJab+EL688lipKt+1K BmOpxCHAXCnit2nOmiElbMRzpFd2XVK4bImExEuN8jFuVHFSxpjAYuDZUcUbog== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745857855; a=rsa-sha256; cv=none; b=g4jx3ZYgcXJFxXnlwGI85lQv48HXQoToMPYS6T9XPM2kvAN87lxY5VBDrHZTEXmnDSHDFN pNUsXREeTMuv9NHg/cSlscga0mpSw9/G2ZKKT3fdXSn56UPe+DroNKp2m+e3OBYhJLsa5p ExDj21gRWAZScsx5mcj4mB2H72LNi+AtslygnlxZiWw3Rb/Peo1cnv8Dj2CH2bu6+ouim8 MTQ79p6E85LdAUqFTp+umtIlKuffF8Z/inpbt6kn54x//j21IZR3fYKUuUbXxpZucEn2tr URUDPL1qF08m+5QncZ5QOMhCx36sBR/ggtVGHFZ751CoAodIobCcPB3k2g0ovg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745857855; 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=+/KH9BxTtX0/bp2bM5LteOuH6aKj/EDHYLirrWlGoss=; b=EPXxAne5MX1D/G34SF7SnlyM43LS7J1oSSPEApgJlo0sGSK4ghQli8vJUgiMPrNtr/o9Jm WOBM1I/jJ6rzuYdOzw/wX5AbAfZa/vFzc9yoJAA8WgGBUDrFEFYIblt6u5sAlAjRKt32Ez izhJM1dy5a2BxaO1IsmO8Yw7B2APxH4Yaa8rlbRRkkkf8wi372rS28y4hnqn9pwybhIp9i YE3GWeG7Dl4qLP24PbPv5trgsjCwsbPDCaqsNwzdP1hD+N9lTw0T5MbsXTsvDjs0qDx587 jIbukBHEG9laI54hKhrNAyJNMepq6AlADP9nFGBEM3jluop3c/iSOFOmbGtKrw== 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 4ZmTTW0FCszjyP; Mon, 28 Apr 2025 16:30:55 +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 53SGUsoh089143; Mon, 28 Apr 2025 16:30:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53SGUscg089140; Mon, 28 Apr 2025 16:30:54 GMT (envelope-from git) Date: Mon, 28 Apr 2025 16:30:54 GMT Message-Id: <202504281630.53SGUscg089140@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 108e5d07805e - main - vtnet(4): Added tunable hw.vtnet.altq_disable 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 108e5d07805e6bced5e74fb986a65100022b8e87 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=108e5d07805e6bced5e74fb986a65100022b8e87 commit 108e5d07805e6bced5e74fb986a65100022b8e87 Author: Bjoern Jakobsen AuthorDate: 2025-04-28 06:18:32 +0000 Commit: Warner Losh CommitDate: 2025-04-28 16:30:36 +0000 vtnet(4): Added tunable hw.vtnet.altq_disable Signed-off-by: Bjoern Jakobsen Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1679 --- sys/dev/virtio/network/if_vtnet.c | 13 +++++++++++++ sys/dev/virtio/network/if_vtnetvar.h | 4 +++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/sys/dev/virtio/network/if_vtnet.c b/sys/dev/virtio/network/if_vtnet.c index 5060861ca7e0..ddc691744190 100644 --- a/sys/dev/virtio/network/if_vtnet.c +++ b/sys/dev/virtio/network/if_vtnet.c @@ -309,6 +309,19 @@ static int vtnet_lro_mbufq_depth = 0; SYSCTL_UINT(_hw_vtnet, OID_AUTO, lro_mbufq_depth, CTLFLAG_RDTUN, &vtnet_lro_mbufq_depth, 0, "Depth of software LRO mbuf queue"); +/* Deactivate ALTQ Support */ +static int vtnet_altq_disable = 0; +SYSCTL_INT(_hw_vtnet, OID_AUTO, altq_disable, CTLFLAG_RDTUN, + &vtnet_altq_disable, 0, "Disables ALTQ Support"); + +/* + * For the driver to be considered as having altq enabled, + * it must be compiled with an ALTQ capable kernel, + * and the tunable hw.vtnet.altq_disable must be zero + */ +#define VTNET_ALTQ_ENABLED (VTNET_ALTQ_CAPABLE && (!vtnet_altq_disable)) + + static uma_zone_t vtnet_tx_header_zone; static struct virtio_feature_desc vtnet_feature_desc[] = { diff --git a/sys/dev/virtio/network/if_vtnetvar.h b/sys/dev/virtio/network/if_vtnetvar.h index 46dad385345d..b47b15543dce 100644 --- a/sys/dev/virtio/network/if_vtnetvar.h +++ b/sys/dev/virtio/network/if_vtnetvar.h @@ -29,8 +29,10 @@ #ifndef _IF_VTNETVAR_H #define _IF_VTNETVAR_H +#define VTNET_ALTQ_CAPABLE (0) #ifdef ALTQ -#define VTNET_LEGACY_TX +#undef VTNET_ALTQ_CAPABLE +#define VTNET_ALTQ_CAPABLE (1) #endif struct vtnet_softc;