upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

vtnet: Avoid ifdefs based on __NO_STRICT_ALIGNMENT

Browse source 
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

(cherry picked from commit 0ea4b4084845bfeedc8c692e4d34252023b78cb3)
This commit is contained in:
Warner Losh 2024-02-04 22:43:49 -07:00
parent 96e37f6936
commit a9600913b4
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
sys/dev/virtio/network/if_vtnet.c
View file

@ -90,6 +90,12 @@
#include <machine/in_cksum.h>
#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);
@ -1232,15 +1238,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);
@ -1552,15 +1556,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;
@ -1587,14 +1589,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;