From nobody Wed Nov 12 08:38:45 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 4d5xdL0yy0z6Gf0n; Wed, 12 Nov 2025 08:38:46 +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 4d5xdL0F7Tz3CVp; Wed, 12 Nov 2025 08:38:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762936726; 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=X3rB1UJ14zN/kWZU9JW7i3WxKCQAzRHaHdvWvMDjGhQ=; b=SxVGNZCrnq/Oyff/ElA8yO/CGHYdw2R1YYztboJPSk333Rf7325/ZCEdE20QHlc60vIte6 Pz57IofpsVUOmrbMj2VcP8AsPf7xoTwwPnZls136PldVgJODr5X/XPzDugUrMPTbXSrpRh MBi6ddlT6peRPbhw+RQk1ghBTbezMcCt7REHJf6wmt+Gu4djXG1505L+JyarclwDSQf5i3 tzoGqgnvYsII/B+yBrJt5hYskP73vzIVl9eB9Yi70hxqHBlXuGxt4qvSQmYE+eE/w3RvdR VpmFYIT5qGcsS80UDMu619Og2eEDNOeuJVFfPIcPr3AYnuFcX3SLHAce2O4m0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762936726; 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=X3rB1UJ14zN/kWZU9JW7i3WxKCQAzRHaHdvWvMDjGhQ=; b=uQBPUMBvmrtpsnHX8GmS3i3Y3fwsZCgy7fVDYkQm0+rt9I7AHy+RJAwbGYqmbVKTSrLLkf SIZH8m6iDHMhR+FhqVoRNSBCw6GtE3mBiE34rRs2V5s27n5w/ApOh8D9SFwH/FrAwhOjCD A/kyK5euhZhg4ade9bbABA90DOcjahfvwLQIXbKn9gKz941tpPf5jIkABlzdbbWOWgLNwr OmzHuxQT6H4l+cOmaKoNpNLHJZylkvXSWaiHAaI7H0mB3Pmvo1KYfhvPs5kZerlQRMZy+A z8Vhb8DLkKFw5fbSj5F49CKaTdJHELIIecnHHreLnvzmm0DO0jA0C1eyICP2hA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762936726; a=rsa-sha256; cv=none; b=Y6i0Eg+YJBDo6K9AugFZFx6pD0oq0HtbF0CSMvGVsRXIeAxchiHmeEidjo32xbT4UJh+eH 58zJY5rrfRaJWH0cgxIGmHXRUTlDD+nHYqReUvcwDfKjV/1Pu176D7T4gdYnL51Oor+a5y jp1Du1z4K3pBcifJmDvnV6nlxh1Cp/Na+FelkOye+tBGLN0PlSUFYeBzPXVd+wBpVUJZYV Ikl8GQrOWc1J87xqGOlJeltZjfi4eJLFeYkmRiFtLwts/OSy4R8mVGlXo95poGv8r/7WTe CvKm3f9cA2SLq3c5m1KYOs46dE9C+qoaLYzwmN1rGa1ApesgSXNa42LqQqli4Q== 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 4d5xdK6Lg7zBjZ; Wed, 12 Nov 2025 08:38:45 +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 5AC8cjmS047014; Wed, 12 Nov 2025 08:38:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AC8cjMv047011; Wed, 12 Nov 2025 08:38:45 GMT (envelope-from git) Date: Wed, 12 Nov 2025 08:38:45 GMT Message-Id: <202511120838.5AC8cjMv047011@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: ca38822e05d7 - stable/14 - vtnet: don't provide VIRTIO_NET_HDR_F_DATA_VALID 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/14 X-Git-Reftype: branch X-Git-Commit: ca38822e05d7343aa0eab86ebed3685f15f5ac31 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=ca38822e05d7343aa0eab86ebed3685f15f5ac31 commit ca38822e05d7343aa0eab86ebed3685f15f5ac31 Author: Michael Tuexen AuthorDate: 2025-11-10 15:28:04 +0000 Commit: Michael Tuexen CommitDate: 2025-11-12 08:37:08 +0000 vtnet: don't provide VIRTIO_NET_HDR_F_DATA_VALID According to section 5.1.6.2.1 of version 1.3 of the virtio specification, the driver MUST NOT set VIRTIO_NET_HDR_F_DATA_VALID in the flags. So don't do that. Reviewed by: Timo Völker Differential Revision: https://reviews.freebsd.org/D53650 (cherry picked from commit 836b3cd9d7910aff5225e9e58189067ca03fae30) --- sys/dev/virtio/network/if_vtnet.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/sys/dev/virtio/network/if_vtnet.c b/sys/dev/virtio/network/if_vtnet.c index 846b2d49b15d..8c08a81820e7 100644 --- a/sys/dev/virtio/network/if_vtnet.c +++ b/sys/dev/virtio/network/if_vtnet.c @@ -2503,10 +2503,6 @@ vtnet_txq_offload(struct vtnet_txq *txq, struct mbuf *m, hdr->csum_start = vtnet_gtoh16(sc, csum_start); hdr->csum_offset = vtnet_gtoh16(sc, m->m_pkthdr.csum_data); txq->vtntx_stats.vtxs_csum++; - } else if ((flags & (CSUM_DATA_VALID | CSUM_PSEUDO_HDR)) && - (proto == IPPROTO_TCP || proto == IPPROTO_UDP) && - (m->m_pkthdr.csum_data == 0xFFFF)) { - hdr->flags |= VIRTIO_NET_HDR_F_DATA_VALID; } if (flags & (CSUM_IP_TSO | CSUM_IP6_TSO)) { @@ -2620,8 +2616,7 @@ vtnet_txq_encap(struct vtnet_txq *txq, struct mbuf **m_head, int flags) m->m_flags &= ~M_VLANTAG; } - if (m->m_pkthdr.csum_flags & - (VTNET_CSUM_ALL_OFFLOAD | CSUM_DATA_VALID)) { + if (m->m_pkthdr.csum_flags & VTNET_CSUM_ALL_OFFLOAD) { m = vtnet_txq_offload(txq, m, hdr); if ((*m_head = m) == NULL) { error = ENOBUFS;