From nobody Wed Nov 12 08:40:29 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 4d5xgL0FFxz6Gf5C; Wed, 12 Nov 2025 08:40: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 4d5xgK6pkCz3DF0; Wed, 12 Nov 2025 08:40:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762936830; 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=tl4Jh+bfDdFxOQDUK18uOLIdrV1tmfFkj5TYbnKf0Nk=; b=Rv+AzSDbmdB+JlBUZDkcy+KzrRwcPiItqzBul7/XkEXlqVj+C5zrPzqY4mCVinHIGI6vlA aYywQXHQeQRHpvJWDcK4oLFm+hEG8VCOH3yF4e+EotKpsnHKCvSkax/lU+yaKTBPk/VzkU zqQC5/wKerC+xo55iTlSY7A59SLUIOzOEz9ezfddOMH2vuyhRuYBF82RHFA2rOgxHW+8Kw eWFb0xc/TOScdF4Xfb75Lysy4bbZXCSlqQ+BuTf4Kh565fxpN1iEhPgSIVM5dDJ8fPVyF2 tK7Y1g69xcAOiINSc7K4aUIwwkZpyNuvZTqCNNTLyGHdJQiHYowzSsnIXqay+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762936830; 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=tl4Jh+bfDdFxOQDUK18uOLIdrV1tmfFkj5TYbnKf0Nk=; b=TQDelil3bKra7vM+6OuO3r1feO6flESqHBidoKKzAIlP5pmgKst5OoPZdUZbCWFRViJbae dAPyqr6CMx2z7fw743fl7TpCbqOQfavFGw9G8OBnL/iNyXHqvDB108QX6NPlaZq7oWAQBP nOBB1Y76dfejEmWsNW8gz5DXsbvITkLW2Oc8jwxVbh959I413N8mYXTxXg96kBewlMDVRg e1hcCX3Zrz84vxWMgwG34EtR8oxU6Gf0yjd1ShZBD3WPuw1qNiApwAT1V3J/xQuMCyguB9 SBdrUvZCxif5IA5/Rdq5gZqyR6ufKVIjWDwtNWkswlaKp4E1GAD+qDqynnXBNA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762936830; a=rsa-sha256; cv=none; b=nSLcC+uY3htY3/RBYwe9P4BY34pP5yjJmIKWlnLEt8ERqoSJbzP2/3crvF85/ZXWPHqVN2 TlUEKt4nHNXOv2F8/io50vLT1182b4X4Spo6ifB2nCfJfcQraLkrn162E1fJVamniS20fJ p65sfC0UfcdHAXIEQWcf/HxEp7LxKbbB/SFzsJWFsnvATJCUpHsmZL4NAomODBZX63V5jc OqxwCLSQCwY1TqCwqHSrZhoTbDDn1ewZlocxS4pGwBOvL7VTA5cRe/ASboknMch87Ti5Z+ yh+TkQ8MztzgpVXTB8/O84wlssW7v9HpFkKQKg3xTkM8kThi8yBXj5qXnvwpGg== 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 4d5xgK6PnLz9rw; Wed, 12 Nov 2025 08:40:29 +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 5AC8eTxI056518; Wed, 12 Nov 2025 08:40:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AC8eTSC056515; Wed, 12 Nov 2025 08:40:29 GMT (envelope-from git) Date: Wed, 12 Nov 2025 08:40:29 GMT Message-Id: <202511120840.5AC8eTSC056515@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: 0ef06b5bccf4 - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: 0ef06b5bccf43ca807e237122746dec122600157 Auto-Submitted: auto-generated The branch stable/15 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=0ef06b5bccf43ca807e237122746dec122600157 commit 0ef06b5bccf43ca807e237122746dec122600157 Author: Michael Tuexen AuthorDate: 2025-11-10 15:28:04 +0000 Commit: Michael Tuexen CommitDate: 2025-11-12 08:33:33 +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 471c6b3714b2..a61b0aac0bfa 100644 --- a/sys/dev/virtio/network/if_vtnet.c +++ b/sys/dev/virtio/network/if_vtnet.c @@ -2505,10 +2505,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)) { @@ -2622,8 +2618,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;