From nobody Wed Nov 12 18:46:30 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 4d6C6Z6gQ8z6GQt2; Wed, 12 Nov 2025 18:46:30 +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 4d6C6Z3Pctz3frW; Wed, 12 Nov 2025 18:46:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762973190; 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=E2WAN4N363p5bfDZywXiO4lkHdoJP5wNCzhiKMTfMoc=; b=hNXlu/8p9FpzZ2thlmOvQXi4tnbL7KEYyAsAg1gzFV45cFgojzAjv21IJk2tpfcuBUQYBb hpbl4fRZqMwJliBSbmzjV6qnJpzxaLly7WydLNyhIgKo+/nu3/R+mnU0v6DlMG6UngZ+LX DKGvRJUg0TIxX7vmMmkahuo9diEmQ9B0TYbhrtsECKMaTkSCwhdDtwflb8tNgcqSHrsJsH o91aKr9j27SxoMxrFwu0RbQiZon0mI8R26swsHFB5ckV/RtH0Ojq/2PIJsOeQ8rmzGRk4r JJFpHAW2hU3eXqMHRqHA3vok3qUyDQ2u3iDuGx4rx2pHmTd4CH2yMQ25feXwmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762973190; 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=E2WAN4N363p5bfDZywXiO4lkHdoJP5wNCzhiKMTfMoc=; b=f8zvyN5c2+Oz2LngvhZiVN6wy+zIebADfJl/H3sggMH2kStL6UuEo+dxlmEkFNBqsDL2FB WUCIuNBg9eOFQLZm7fkyqg1dZngLD2d+gDiLUwyImkWR9/HvZn2V8RF3JOpMvNtxvN1p7g 6M1y9y7sMGVylSwK8oon0S4kL5nj8SzYW9R8faTv8MbHl+QRMpnUgx/iWuNTEmTFR/nGrD kKQdT2VlBtagdfzIz0fcpmk4oWRaIqiRvCPT8svkGPIwu6LEUWeLZEzXiGnQFZGaQtzjH0 SRgKQTnGyVE96LHQtlbnNuwU1POGEUc7CzKO6Ha5XM1M0Hz1aMHRytrgqaKN1w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762973190; a=rsa-sha256; cv=none; b=m5dmoz5cYfqFtfjYi7hJKg3Wmj3/biuMdEZOvCnNVUZhpkjbuiMGcP6SZ0FBwSMFv0cEOd vYz0eWc/r1OTK0OwO+cJPzRjW9LfCzpRiWACD8ii7MsqjpgY/5s5+WavH0oxWz000rZjRo Em4CbqolG09jT7MasAHxMYWJ/YmkO+jJDJhH89wA37h6C+nBjV21AS313nwGAXsGwIFLJn ElHOaOL2Sdl2jgQH3OYX6V+dGmKR83ceE7NfA6e1cf2bK0WW7x5PLn7JcGA0XJpNcOvrym B4ieD0b9sWmnvlzBgT2HV4n5YJ9antuuh+Ou1zmizEyqa5KhXq0FSor7qNrB+w== 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 4d6C6Z2FRPzmgJ; Wed, 12 Nov 2025 18:46:30 +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 5ACIkUfl097821; Wed, 12 Nov 2025 18:46:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5ACIkULt097818; Wed, 12 Nov 2025 18:46:30 GMT (envelope-from git) Date: Wed, 12 Nov 2025 18:46:30 GMT Message-Id: <202511121846.5ACIkULt097818@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: c50312b774e1 - releng/15.0 - 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: c50312b774e1f26e90d743ad7e02072738923a03 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=c50312b774e1f26e90d743ad7e02072738923a03 commit c50312b774e1f26e90d743ad7e02072738923a03 Author: Michael Tuexen AuthorDate: 2025-11-10 15:34:53 +0000 Commit: Colin Percival CommitDate: 2025-11-12 18:46:09 +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. Approved by: re (cperciva) PR: 290773 Reviewed by: Timo Völker Tested by: lg@efficientip.com Differential Revision: https://reviews.freebsd.org/D53629 (cherry picked from commit 4c50ac68166caf7e08c5a9984d63fa91490fa50d) (cherry picked from commit 0fb0ba51d8bc1e6673e073c1c5a02922f997f6b8) --- 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)) {