From nobody Wed Nov 12 08:41:04 2025 X-Original-To: dev-commits-src-branches@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 4d5xh10Pdlz6Gf2l; Wed, 12 Nov 2025 08:41: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 4d5xh072x8z3Dlj; Wed, 12 Nov 2025 08:41:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762936865; 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=3rBzXkY1PzZRMtcyA3Mn63ViXev2gokEz9fpY1wzMBQ=; b=McPQnEULjw1VikDajLNoRFN/FrJI8cY0duYmRZSECk0xYtUP1QlyeTbBStkpl/VWsNL+OI PCp/3+CchBPX8wcPByUX7dZARNYw1jchtG40/JGZZne9UXC7Fa2pSuw7CVDQrRntYNgszb X7+jgS6FXKriw/kaDkp6YzaXCcstGqmCeOVue3M97qILqiCgXoZZ2YFvW6VmnXasZcB44U kEmlE/CbfYl0ZRzkyW3tYpU2qeNVj2ffNpe2QNa4U+OIrR6ZBqGktotuoqL0WhrQeDZaqA Cm9S1mtd8edkS0aHoML58S5CzuYAqb812XjeWSMzTtRwG6Kd07tTQ4ljzYZdGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762936865; 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=3rBzXkY1PzZRMtcyA3Mn63ViXev2gokEz9fpY1wzMBQ=; b=gi3m1zDkznKvPkziUaOIZm+JCfnt0WuIiKxcC58SQKznX94cD3M//kkEN+JUg3DOmsf0Mq xV/928P+Rj30NC0SUMVQ12pAeQEnN6tVMiP+YP4DXUO0WDwgvq36n2xLTJtrBvAIWriRo8 epCKoXEelNUpQKmFPYy0AhxMkMIlgkxWfwAi5bJtIvQQJEx510cXRoAGSxnq+Myxql7qfI YxE/hs/BHk8Pa5o1msk0A6jWbeWTyuhZ7zRDwdwMntvkWzlFhcfvXUFLAf/LbVMzOjJKHZ Vs42lZ4JPlamRNmtkX7ek+a+FsNxYnLeECAoUDAngBiULeizQdceSXKcshAH4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762936865; a=rsa-sha256; cv=none; b=CwcC5JgBw0N7BBqaqu9dXEuzvG82wE1Trbkero/OacqbTyLvhMRbSGhXg+Wf21qx6vbMZZ 16F3D2Pw7qzV8aKrKGnWjyzedNxzQTp/N+6qmxshYPuxekhLdn8guAztCigYaZImpbKRIX IsgKJBcIB8Xw2sthwbPmguo/0GJAKGAJlYRV/F4EWDnfjy/a+ipGoiJi7VFyDXPisrLJao aVhLcrARTPS/FX110DVRVD1m3NztpQ2iUcrSL31nsMx9ZuCQXxcwoEtZljOrQ/Mu81lWDr D/FNFRjIYdq84F1fy9X8BPapWqpPd18OtdyXxt/Hc5VinSKLgo/SJjmPW3uNPQ== 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 4d5xh067FNzBw1; Wed, 12 Nov 2025 08:41:04 +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 5AC8f4jv058720; Wed, 12 Nov 2025 08:41:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AC8f4ks058717; Wed, 12 Nov 2025 08:41:04 GMT (envelope-from git) Date: Wed, 12 Nov 2025 08:41:04 GMT Message-Id: <202511120841.5AC8f4ks058717@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 0fb0ba51d8bc - stable/15 - vtnet: fix enabling/disabling tso List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/15 X-Git-Reftype: branch X-Git-Commit: 0fb0ba51d8bc1e6673e073c1c5a02922f997f6b8 Auto-Submitted: auto-generated The branch stable/15 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=0fb0ba51d8bc1e6673e073c1c5a02922f997f6b8 commit 0fb0ba51d8bc1e6673e073c1c5a02922f997f6b8 Author: Michael Tuexen AuthorDate: 2025-11-10 15:34:53 +0000 Commit: Michael Tuexen CommitDate: 2025-11-12 08:40:44 +0000 vtnet: fix enabling/disabling tso Transmit segment offloading depends on transmit checksum offloading. Enforce that constraint. This also fixes a bug, since if_hwassist bits are from the CSUM_ space, not from the IFCAP_ space. PR: 290773 Reviewed by: Timo Völker Tested by: lg@efficientip.com Differential Revision: https://reviews.freebsd.org/D53629 (cherry picked from commit 4c50ac68166caf7e08c5a9984d63fa91490fa50d) --- sys/dev/virtio/network/if_vtnet.c | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/sys/dev/virtio/network/if_vtnet.c b/sys/dev/virtio/network/if_vtnet.c index a61b0aac0bfa..d9daa5bfd70a 100644 --- a/sys/dev/virtio/network/if_vtnet.c +++ b/sys/dev/virtio/network/if_vtnet.c @@ -1346,20 +1346,40 @@ vtnet_ioctl_ifcap(struct vtnet_softc *sc, struct ifreq *ifr) VTNET_CORE_LOCK_ASSERT(sc); if (mask & IFCAP_TXCSUM) { + if (if_getcapenable(ifp) & IFCAP_TXCSUM && + if_getcapenable(ifp) & IFCAP_TSO4) { + /* Disable tso4, because txcsum will be disabled. */ + if_setcapenablebit(ifp, 0, IFCAP_TSO4); + if_sethwassistbits(ifp, 0, CSUM_IP_TSO); + mask &= ~IFCAP_TSO4; + } if_togglecapenable(ifp, IFCAP_TXCSUM); if_togglehwassist(ifp, VTNET_CSUM_OFFLOAD); } if (mask & IFCAP_TXCSUM_IPV6) { + if (if_getcapenable(ifp) & IFCAP_TXCSUM_IPV6 && + if_getcapenable(ifp) & IFCAP_TSO6) { + /* Disable tso6, because txcsum6 will be disabled. */ + if_setcapenablebit(ifp, 0, IFCAP_TSO6); + if_sethwassistbits(ifp, 0, CSUM_IP6_TSO); + mask &= ~IFCAP_TSO6; + } if_togglecapenable(ifp, IFCAP_TXCSUM_IPV6); if_togglehwassist(ifp, VTNET_CSUM_OFFLOAD_IPV6); } if (mask & IFCAP_TSO4) { - if_togglecapenable(ifp, IFCAP_TSO4); - if_togglehwassist(ifp, IFCAP_TSO4); + if (if_getcapenable(ifp) & (IFCAP_TXCSUM | IFCAP_TSO4)) { + /* tso4 can only be enabled, if txcsum is enabled. */ + if_togglecapenable(ifp, IFCAP_TSO4); + if_togglehwassist(ifp, CSUM_IP_TSO); + } } if (mask & IFCAP_TSO6) { - if_togglecapenable(ifp, IFCAP_TSO6); - if_togglehwassist(ifp, IFCAP_TSO6); + if (if_getcapenable(ifp) & (IFCAP_TXCSUM_IPV6 | IFCAP_TSO6)) { + /* tso6 can only be enabled, if txcsum6 is enabled. */ + if_togglecapenable(ifp, IFCAP_TSO6); + if_togglehwassist(ifp, CSUM_IP6_TSO); + } } if (mask & (IFCAP_RXCSUM | IFCAP_RXCSUM_IPV6 | IFCAP_LRO)) {