From nobody Mon Feb 05 05:45:33 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 4TSwMf1w7Bz59Cl3; Mon, 5 Feb 2024 05:45:34 +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 4TSwMf1P6vz4CfN; Mon, 5 Feb 2024 05:45:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707111934; 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=Mjw71poVTtMjCtAlzkHcDSRvw7oEy2WN4bWSsNK83vI=; b=gxJqtVodD2WFh/erGISkQ0yIIDt3M1CKIP3dRJ268p8PKt9cKKXUiP5E7R0gf/EDynfdmo 3dd7B9ZNZkX/m0NNRKx2TOTZfOCp4R2UINFyvVWz9Vqpq9hykKATAg4FWNt5xiPloJz+wY gy9deXcpaZynG6M/AAB0Q6KRgLKgJnRlf35vmAK4B6MVBIKlLTjn/01FyqaxVYqv6Vtqa7 NcwI6BxtgWFtcVL4Jpl70jPmO6tKaMgrPmXXDiqoZ1FF7qDDcHAAvU8oPHgfNdCHKBDdE7 Xm5FcUSg+jCn2GBCcp5J80jYbldoPfk2hdheb+/OyisiB+YsvHAgiB7oBNBYEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707111934; 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=Mjw71poVTtMjCtAlzkHcDSRvw7oEy2WN4bWSsNK83vI=; b=LYeH5tF4Tr7U5ScZcjSjtDWdlySukFmCcFZmOXmi6Gkko30XLAqGCloicEf4NlOTuz9MQn HpQoubKqIgJ6Y9xj4OOg4+Wnwi8Pbl8JV3Gnek0Wl01dgNWvVqOyxrDLwQPQlCHI1/hSza mw+EZ50W+vqbbVoQD+G0dD6C+MBdGdLUASYUiskqLCQp+szLwiSUGYiEoNu/i2sBsJU6MY G289rzE5pEN9L6UmHXbdx/brqK/ODuru3ghyEZtq4ZhtvmZTh7x4bAkUErYs/5du9Xc9RF nElt8MfSnR6Bjp/d0jwcA05TKqdfo9kEnKHmA5RD/+ekwFSWfDeFQrEJWHXhLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707111934; a=rsa-sha256; cv=none; b=QZ1rX/7W/vhGPP39uXrmUo4djfsNDpXnpZku5N/vEi8IRK1mdAbRopw90/I0+k6VVp/yBF Lau0o75E/+6a8AOT9zEbhWsntWH1QDJZtHzRbB2P53flVXw5LpC1bTjq52/8tDZybVxUHp RHi8uHXhQlN+Bgzx6+I91Fj53TC9ygdbX4gAxaabo8WzXORwwovaLmXxrW6wMAlBPrdbX4 hnEW2HSGhFHh/QBpWrcZUUc8y/G81rIouiis2yjrC8imC80lDq2+WVijOZ2T1FLLbrc4mW g8Ur/BkpMDC7wcuj0ipsuMTlmv5eIUbNoBYnxKYeBzDtw5Xl/eNrHs9lGIhCHg== 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 4TSwMf0KrFzSrF; Mon, 5 Feb 2024 05:45:34 +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 4155jXZC073982; Mon, 5 Feb 2024 05:45:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4155jXIQ073979; Mon, 5 Feb 2024 05:45:33 GMT (envelope-from git) Date: Mon, 5 Feb 2024 05:45:33 GMT Message-Id: <202402050545.4155jXIQ073979@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: d9e0e4262761 - main - 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/main X-Git-Reftype: branch X-Git-Commit: d9e0e42627613b56abf0f8fa1ad601e5690d775c Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=d9e0e42627613b56abf0f8fa1ad601e5690d775c commit d9e0e42627613b56abf0f8fa1ad601e5690d775c Author: Warner Losh AuthorDate: 2024-02-05 05:43:39 +0000 Commit: Warner Losh CommitDate: 2024-02-05 05:43:39 +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 --- 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 11c640bccdeb..3d85fee122c7 100644 --- a/sys/dev/virtio/network/if_vtnet.c +++ b/sys/dev/virtio/network/if_vtnet.c @@ -1223,6 +1223,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 6c2e6e90107a..d690ad3bf63c 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));