From nobody Mon Feb 19 04:50:05 2024 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 4TdVT93b4zz592ty; Mon, 19 Feb 2024 04:50: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TdVT91xZFz51b7; Mon, 19 Feb 2024 04:50:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708318205; 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=RpDdJz2oJOvq6rS2WX+1zKveE/GgKpRSsF06O4aS2YY=; b=MAnlHc3POaM6+zVsXdgRhzpDTE7TJ/HzIWSxi8nbv40S11O7JtU0qLtMkftX37fhGZjWyV YrpTOz6n44uAHIDTLCQOlTr+pRmvDD/1Duyoa6mFAJx/fD73M0o3Ld/c5QZbCo6vo474LL Kbza/GHHFkcCB4CXlbK2s7OIBLv4EHLF8+8G8MagE2ipB0exEtMdcU7iHshHaXN+0+Z7ub l53cmRwKLM75XmjdGOl2GDjpTIsT9VazgEZYhJ6CUXvp/X0JFpSRQqjMOv8Bw9xq3gAbR9 xIBk+6wgGzNSzn8ivb52zvSSn+Ibl4tX3S43Fqr4J2dxwUJF88Q+jqMj5d2QQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708318205; 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=RpDdJz2oJOvq6rS2WX+1zKveE/GgKpRSsF06O4aS2YY=; b=K33y5aPtCZtDknInAVlEK4skxJzbBDxOFF0R0UX0DsOzdJ1gdT1ChkXytz89s+J+RXp3TL vJi0CTClGk1BFBc00PzbK8UizC2AZk4eOut8qqMl2y5OuAelPayhmuoo9OZ7C4Y/sjPFlx c+t/qYT1FlWxSqSQ5UmTVMsuFvD6EQk0XJIf+wqeU/eLU6iIHPy8ZnkzcClHn6g6gm+o+H L/sEbqSK9/czM8B1LEBu8Wt1llGJOGYJl0M4y1aqKZRsnuBlTazSDP4ZFoClnyOdMso/H0 MxYnovhRzQfK/vEzezGYrIkqMhuDFG6B63AXH1YFxI+Qb+iC/plgFW7PaY3gDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708318205; a=rsa-sha256; cv=none; b=LRYiw9pctSotaeliJwDMSTBHDuk0XqdZ6HOgDaulZ7EoTxlsfjF5tpJeKv9CTVz9P+oUgb UTenXXdcM59GOpu8wEjYod+uG+VzmQBcLc3EmldiLuhKiXJPNPau/8hu5B+YWUZQalpIRQ eIsiNeiMCFgl/siZv5azMWa0T3nvi2s/Kfg/dgUqms/u5KnKPuNtiO97Oo1F0jMz2cAPcK B/8/XCWGHJuI5kdQOUb6sQW4z7YJ91sID73/EHPtbekhr6Ygxnqml5sahMceeRTv8nBBEi ZlO6+GIbVhfnZR4P6g2FBiwTX80D4Tj5u1mScgMFWjtWdiAIitiU3MtI0qNCvQ== 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 4TdVT90mbCzL8Y; Mon, 19 Feb 2024 04:50:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41J4o5QW080006; Mon, 19 Feb 2024 04:50:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41J4o5YJ080002; Mon, 19 Feb 2024 04:50:05 GMT (envelope-from git) Date: Mon, 19 Feb 2024 04:50:05 GMT Message-Id: <202402190450.41J4o5YJ080002@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 1dc264a126b1 - stable/13 - vtnet: Account for the padding when selecting allocation size 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1dc264a126b13e0e20b13bbcd69451c5d4b63f7c Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=1dc264a126b13e0e20b13bbcd69451c5d4b63f7c commit 1dc264a126b13e0e20b13bbcd69451c5d4b63f7c Author: Warner Losh AuthorDate: 2024-02-05 05:43:39 +0000 Commit: Warner Losh CommitDate: 2024-02-19 04:46:43 +0000 vtnet: Account for the padding when selecting allocation size While we account for the padding in the length of the mbuf we use, we do not account for it when we 'guess' the size of the mbuf to allocate based in the MTU of the device. This leads to a situation where we might fail if the mtu is close to a bucket size (say 2018) such that the added padding would push us over the edge for a full-sized packet. mtu of 2018 is super rare (2016 and 2020 would both work), but fix it none-the-less. It's a shame we can't just set VTNET_RX_HEADER_PAD to 2 in this case. The 4 seems hard-coded somewhere I've not found documented (I think it's in the protocol given the comments about VIRTIO_F_ANY_LAYOUT). Sponsored by: Netflix Reviewed by: bz Differential Revision: https://reviews.freebsd.org/D43656 (cherry picked from commit d9e0e42627613b56abf0f8fa1ad601e5690d775c) --- sys/dev/virtio/network/if_vtnet.c | 9 +++++++++ sys/dev/virtio/network/if_vtnetvar.h | 8 +++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/sys/dev/virtio/network/if_vtnet.c b/sys/dev/virtio/network/if_vtnet.c index 3945826f91a0..ae35d658e1bb 100644 --- a/sys/dev/virtio/network/if_vtnet.c +++ b/sys/dev/virtio/network/if_vtnet.c @@ -1237,6 +1237,15 @@ vtnet_rx_cluster_size(struct vtnet_softc *sc, int mtu) } else framesz = sizeof(struct vtnet_rx_header); framesz += sizeof(struct ether_vlan_header) + mtu; +#ifndef __NO_STRICT_ALIGNMENT + /* + * Account for the offsetting we'll do elsewhere so we allocate the + * right size for the mtu. + */ + if (sc->vtnet_hdr_size % 4 == 0) { + framesz += ETHER_ALIGN; + } +#endif if (framesz <= MCLBYTES) return (MCLBYTES); diff --git a/sys/dev/virtio/network/if_vtnetvar.h b/sys/dev/virtio/network/if_vtnetvar.h index 318066421072..e4c1934dfc81 100644 --- a/sys/dev/virtio/network/if_vtnetvar.h +++ b/sys/dev/virtio/network/if_vtnetvar.h @@ -232,7 +232,13 @@ vtnet_software_lro(struct vtnet_softc *sc) */ #define VTNET_VLAN_FILTER_NWORDS (4096 / 32) -/* We depend on these being the same size (and same layout). */ +/* + * We depend on all of the hdr structures being even, and matching the standard + * length. As well, we depend on two being identally sized (with the same + * layout). + */ +CTASSERT(sizeof(struct virtio_net_hdr_v1) == 12); +CTASSERT(sizeof(struct virtio_net_hdr) == 10); CTASSERT(sizeof(struct virtio_net_hdr_mrg_rxbuf) == sizeof(struct virtio_net_hdr_v1));