From nobody Wed Nov 12 18:46:29 2025 X-Original-To: dev-commits-src-all@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 4d6C6Y4D0lz6GRCM; Wed, 12 Nov 2025 18:46:29 +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 4d6C6Y2Zkkz3fvF; Wed, 12 Nov 2025 18:46:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762973189; 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=mNw2EAZ3thz40b8V5o/GvuAOaTWdcVRDn+M1gswlI1g=; b=uKk00fWupHwUnUpuCPqgl97UxSu3vMrghbkVONkiSntSXOrxb1cM0t7IHgaiDShfOo1Pcy Y4+sQaDTR+cUrjZcVNwUI3+6wzKDsTsrrCwITML4C0ItdHiQejN+Mgyutk3LHAOcIEA1fc HfUv0aqjwrfBSTRcHAEvk4aNmZ3CXY4GaxoZlaQgdnjWeLfLUs/Ew8Zay03nZD+Rn1WmTp f9HnLIAxj41Qbf0QUX+DF+RxXAgOlM46RdUYkHQpP1vDMgz/CknghM2d0kkY0e2hRq3eY0 Q7rA1Zix6Jsa6HyUhvNYKFlwyFZyX9Q25xlJfd40TDLhVL5xVCokxpIuWxDJwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762973189; 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=mNw2EAZ3thz40b8V5o/GvuAOaTWdcVRDn+M1gswlI1g=; b=dJcxFj+zcLPERLK7iE2VspvBy43ihmc67l+3JTH9iJInGUkJLyI7vK3UtEF/2FzuB0EXb4 4LTEqF8oM1ALZgFqpr8OqKGJavxIHHL+LMdcIY4sIJl1pS+Vv8tQpomnBgmo7Bsr9ul33p KE5bEvf6aLB1x+p60lrH/irNgW6XApra8CpRSXMmFNpI5eOHn6QZrUVKNbnqRUaS8M3yhB w64jPIlxutby3aNBWjBmRKCSgwYl5djUrAE0ZfOUy2RR0sMrCVG8zg59sCoPDkTTELC9Wy e5mO5s+4dPtOSfsRtEv9BPQNGNl4zsheeLG5fJKO8lPntWfxP8b70xVKoNYdgQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762973189; a=rsa-sha256; cv=none; b=EIDhDPpMxPXe1TQLeeyDUYiYXdAvZ5KRtJOKOLb6WoaLU3nY8HZL8o+R9iSdzjLss4+gqx W7zhys91ECXnXVxtBohQdPZjk41v6T9k75IFWRwyeFZJBPYcD/KwSjtdDOJWZamk42PaR6 ErbFr8VNYhg/rOo4Aku+O9nIuQzBaanjbto+Yg5YlVRa3TP7+VHSIic7iZ8kXaap00Sb9g kL1znzf9218xf9jGIn+K74ydhVt/Ko7ZaTQ9j+jS+d4ONHsd6CxA94j6o1aD+fIslRc9Ga Cgo+UgqaJuEjQRvojYui51FmTpxxOCQmA4P8rNNVdm+b9Mhkx5hyzpOqdAhepA== 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 4d6C6Y1xk6zmgH; Wed, 12 Nov 2025 18:46: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 5ACIkTIw097781; Wed, 12 Nov 2025 18:46:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5ACIkTqS097778; Wed, 12 Nov 2025 18:46:29 GMT (envelope-from git) Date: Wed, 12 Nov 2025 18:46:29 GMT Message-Id: <202511121846.5ACIkTqS097778@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: b91bf9f0e2c4 - releng/15.0 - vtnet: don't provide VIRTIO_NET_HDR_F_DATA_VALID List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: b91bf9f0e2c4aa60b172f75e3065e103781da3f4 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=b91bf9f0e2c4aa60b172f75e3065e103781da3f4 commit b91bf9f0e2c4aa60b172f75e3065e103781da3f4 Author: Michael Tuexen AuthorDate: 2025-11-10 15:28:04 +0000 Commit: Colin Percival CommitDate: 2025-11-12 18:46:06 +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. Approved by: re (cperciva) Reviewed by: Timo Völker Differential Revision: https://reviews.freebsd.org/D53650 (cherry picked from commit 836b3cd9d7910aff5225e9e58189067ca03fae30) (cherry picked from commit 0ef06b5bccf43ca807e237122746dec122600157) --- 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;