From nobody Mon Feb 5 05:45:35 2024 X-Original-To: dev-commits-src-main@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 4TSwMg4Pv8z59Cvj; Mon, 5 Feb 2024 05:45:35 +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 4TSwMg1ys8z4Ck6; Mon, 5 Feb 2024 05:45:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707111935; 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=0bVNlYmBHhgRgdEwMWR+ZzVbupOJI41TvtCevF27wPY=; b=nv9B2bsN+16kWjV7rE26PrbU+KrblR8zo7d+D/YkEF6YcjjYcdCXge1iN+OrETnfCEBrOS Hxy/uIHE7NQ69hRCKqBoQkXHOoz2zaMr1RQ1nOYJLW462wYTrqsYC8G32bA54h/CeE80KU IHuCWH7RWcy3snLjwRPB+dOE+uDHNbMMhS/ZNF0af+kZPdTB7r0DRU6wYuUZlKD1LtvQwU TX4WTeOND3Nd0SRyFe6NNAy1RuEw2hTUgsNZdQAwoADHG9UZZUnhMtKvEWpUnTju69t56E PtO0QR02mrvAody3rvpKDrE8k1CFzjOUlFxjSOsbooOH7INSHgp4yKqTeA9GPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707111935; 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=0bVNlYmBHhgRgdEwMWR+ZzVbupOJI41TvtCevF27wPY=; b=uzgYDSJ82KeVkMRuwlPSj9S3nMKXlHlh3X1Aw2vi/NWPfUAz7Ie+3q26FHKQT1FNtStI/x MKo5DbgHVP4NSG31TxpvfCmjAUeRV7QiYq+ABH8bDLuJJgp3n3RIyLCeDokXt96tI3crg5 pCyMG2IyISAO9BncWkHCL97rLEBlYgvgLVb7vOHJvvE/Cc4ATMlJkLp15TC/+u/G6BThAe 7+EBHn74/kgeBIvwhbnLcR+Kobake98IcQbERiqwwIrdxVjtvRgBmMP523SPaoQ9EL4rrx Gw0tUk5E6mUqtk5tA2rZeZopzeUgQY2AyqtaJaILRziaEPX7netgrQ6DcR7RZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707111935; a=rsa-sha256; cv=none; b=UdFejgqtxR7SwSI/xVbOKaBAnSoh4IeAO6IXQ8wCR2vSghZ50dW0QuV82SWoqJbNNDRDDo 5nljv0dVod//R9XzFqAiplWu2O/hWG3FRm+vKIL3jCgTAlfzmm692C4XiPauXtrXIP22MO cHQ54y5Hse412TCTKbjezQY45cEUCR+OxGcocYeHH+pfUnQFLIvLrIhLBYDONmWlIBcJ3M yilYZIovpr7dsZRx5LODLsIRgWvHhmiZaXhnMdEbn4zcxblQ61OvLNLM8dOT9/t3nhonSR LvfR19d/0u6Wb53ofCIXGHtYz2ZTBfcIG5lpbECGAy0nxvhGYY8MqMTZK2vRIg== 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 4TSwMg12RvzSZV; Mon, 5 Feb 2024 05:45:35 +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 4155jZe5074027; Mon, 5 Feb 2024 05:45:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4155jZ9s074024; Mon, 5 Feb 2024 05:45:35 GMT (envelope-from git) Date: Mon, 5 Feb 2024 05:45:35 GMT Message-Id: <202402050545.4155jZ9s074024@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: 0ea4b4084845 - main - vtnet: Avoid ifdefs based on __NO_STRICT_ALIGNMENT List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 0ea4b4084845bfeedc8c692e4d34252023b78cb3 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=0ea4b4084845bfeedc8c692e4d34252023b78cb3 commit 0ea4b4084845bfeedc8c692e4d34252023b78cb3 Author: Warner Losh AuthorDate: 2024-02-05 05:43:49 +0000 Commit: Warner Losh CommitDate: 2024-02-05 05:43:49 +0000 vtnet: Avoid ifdefs based on __NO_STRICT_ALIGNMENT Some platforms require an adjustment of the ethernet hearders. Rather than make this be on __NO_STRICT_ALIGNMENT being defined, define VTNET_ETHER_ALIGN to be either 0 or ETHER_ALIGN (aka 2). Add a test to the if statements to only do them when != 0. This eliminates the #ifdef sprinkled in the code, still communicates the intent and gives the same compiled results. Sponsored by: Netflix Reviewed by: bz, bryanv Differential Revision: https://reviews.freebsd.org/D43654 --- sys/dev/virtio/network/if_vtnet.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/sys/dev/virtio/network/if_vtnet.c b/sys/dev/virtio/network/if_vtnet.c index 3d85fee122c7..1c731b496f12 100644 --- a/sys/dev/virtio/network/if_vtnet.c +++ b/sys/dev/virtio/network/if_vtnet.c @@ -89,6 +89,12 @@ #include #endif +#ifdef __NO_STRICT_ALIGNMENT +#define VTNET_ETHER_ALIGN 0 +#else /* Strict alignment */ +#define VTNET_ETHER_ALIGN ETHER_ALIGN +#endif + static int vtnet_modevent(module_t, int, void *); static int vtnet_probe(device_t); @@ -1223,15 +1229,13 @@ 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; + if (VTNET_ETHER_ALIGN != 0 && sc->vtnet_hdr_size % 4 == 0) { + framesz += VTNET_ETHER_ALIGN; } -#endif if (framesz <= MCLBYTES) return (MCLBYTES); @@ -1543,15 +1547,13 @@ vtnet_rx_alloc_buf(struct vtnet_softc *sc, int nbufs, struct mbuf **m_tailp) } m->m_len = size; -#ifndef __NO_STRICT_ALIGNMENT /* * Need to offset the mbuf if the header we're going to add * will misalign. */ - if (sc->vtnet_hdr_size % 4 == 0) { - m_adj(m, ETHER_ALIGN); + if (VTNET_ETHER_ALIGN != 0 && sc->vtnet_hdr_size % 4 == 0) { + m_adj(m, VTNET_ETHER_ALIGN); } -#endif if (m_head != NULL) { m_tail->m_next = m; m_tail = m; @@ -1578,14 +1580,12 @@ vtnet_rxq_replace_lro_nomrg_buf(struct vtnet_rxq *rxq, struct mbuf *m0, sc = rxq->vtnrx_sc; clustersz = sc->vtnet_rx_clustersz; -#ifndef __NO_STRICT_ALIGNMENT /* * Need to offset the mbuf if the header we're going to add will * misalign, account for that here. */ - if (sc->vtnet_hdr_size % 4 == 0) - clustersz -= ETHER_ALIGN; -#endif + if (VTNET_ETHER_ALIGN != 0 && sc->vtnet_hdr_size % 4 == 0) + clustersz -= VTNET_ETHER_ALIGN; m_prev = NULL; m_tail = NULL;