From nobody Fri Nov 18 15:35:11 2022 X-Original-To: dev-commits-src-branches@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 4NDLSw0DxVz4hhLZ; Fri, 18 Nov 2022 15:35:12 +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 4NDLSv6tHZz3wrK; Fri, 18 Nov 2022 15:35:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668785712; 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=Mjl3jqwAvEfARv8f1yEX4XYg/pMUjDSRURDuT2rFy80=; b=NpCrIUlrzdzvrCNJmPeXTayP90rop6CcxMDthusGuSx9MX36a/l3o5WvqTWrz95KVsUOND IiDN3EavCtbqmMhesSe7xHHH20KBBjDj0VT5kZWEEju6xmdXOzaiss225vsgW3DdhMMcHg I5ilWC1aZaA2K29ZbeWKx5kyWKLWkjhwKioZpg5JjdADU964br6pk+sUDihybiV4eub75F E+wgM08MAuFpBU1C19aFw2dghKPzHtsHYMCg9FCnkGGwXyfzXlIFST5moqc/fF8MtmEd2z g+AXf0bQV8PtWj3Y7piDs6qLKfx0JV/9NmrVgs3siLahjg8WKD5uFpD+0gbZ4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668785712; 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=Mjl3jqwAvEfARv8f1yEX4XYg/pMUjDSRURDuT2rFy80=; b=wF+Q1Iv7dsx8DnFhpvT4uedl+73MkN4y2BZVfDnPzOzIV8+sGXovaAWeq4/m76nkrUFztv hdnmyPkswdEo/XuNf/Vn1kJQ3/zprANkjCR1zBMarwgbP8emFZNXGVg3Gj/7I0ZSzjE3TS DqUStLUvDrPqNFd1pnQxoPX5/XfutL4ULdJkp+f0dm0OFMuyCVG12JHgE+3h26mI7VLye6 aYRY3FXr5LIAl/Q3PKBdf4RmmdzbRT04Zx6qmtmU19FmYhbF2AYm4YmvZ+2kgXhA/95J1J F7egBMXKehY81gHLsDr/PP35zEF28sbN/d1n5ver/dYI8roqWItLOX+ZYw0i8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668785712; a=rsa-sha256; cv=none; b=pHonpxrELN8qxrM73cr5PSHdr/aEU0+WoygFpS+Nh5HQXeCwjYxbm8z53kTWIc6nr6PqLq KtaqeJnM8jojgemrkoy/8Nz95PsMgHxkEalw0vFPCW9/4p35V+Jfw4vGPbUR1S4uKkcLsm iXNw5sws2tW6PSam8d0MxR9bywCG65EhCtNlLKguV6bJKSngnF7G6YgfmWDLJBOfNn//pD kMhJ/AA/5JzC6YUEjaJh4Bv8xMZL6npKyYpkZl8cDeLngV93Wlptf4EpIS9O9JVLFHGgHc xJK2kXlFELBFq2Slcs1cRR0vPPxYxrZfyir0t1ronx5IK2rGf+Vru4g8euhIEQ== 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 4NDLSv5qPRz1QVg; Fri, 18 Nov 2022 15:35:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2AIFZBQh087363; Fri, 18 Nov 2022 15:35:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AIFZBkE087362; Fri, 18 Nov 2022 15:35:11 GMT (envelope-from git) Date: Fri, 18 Nov 2022 15:35:11 GMT Message-Id: <202211181535.2AIFZBkE087362@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: d3b97a1ea012 - stable/13 - bhyve: Define an accessor for net backend private data List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d3b97a1ea01233486ddc7693e8a53c59d331c8c2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d3b97a1ea01233486ddc7693e8a53c59d331c8c2 commit d3b97a1ea01233486ddc7693e8a53c59d331c8c2 Author: Mark Johnston AuthorDate: 2022-11-11 15:01:40 +0000 Commit: Mark Johnston CommitDate: 2022-11-18 15:17:35 +0000 bhyve: Define an accessor for net backend private data Use it to silence warnings about potential unaligned accesses. No functional change intended. Reviewed by: corvink, jhb Differential Revision: https://reviews.freebsd.org/D37289 (cherry picked from commit 0ced97acb05197cb2ef30932786eab0512f77e07) --- usr.sbin/bhyve/net_backends.c | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/usr.sbin/bhyve/net_backends.c b/usr.sbin/bhyve/net_backends.c index 5b4a2c0ae257..cc2a06592429 100644 --- a/usr.sbin/bhyve/net_backends.c +++ b/usr.sbin/bhyve/net_backends.c @@ -168,10 +168,12 @@ struct net_backend { /* Size of backend-specific private data. */ size_t priv_size; - /* Room for backend-specific data. */ - char opaque[0]; + /* Backend-specific private data follows. */ }; +#define NET_BE_PRIV(be) ((void *)((be) + 1)) +#define NET_BE_SIZE(be) (sizeof(*be) + (be)->priv_size) + SET_DECLARE(net_backend_set, struct net_backend); #define VNET_HDR_LEN sizeof(struct virtio_net_rxhdr) @@ -207,7 +209,7 @@ struct tap_priv { static void tap_cleanup(struct net_backend *be) { - struct tap_priv *priv = (struct tap_priv *)be->opaque; + struct tap_priv *priv = NET_BE_PRIV(be); if (priv->mevp) { mevent_delete(priv->mevp); @@ -222,7 +224,7 @@ static int tap_init(struct net_backend *be, const char *devname, nvlist_t *nvl, net_be_rxeof_t cb, void *param) { - struct tap_priv *priv = (struct tap_priv *)be->opaque; + struct tap_priv *priv = NET_BE_PRIV(be); char tbuf[80]; int opt = 1; #if defined(INET6) || defined(INET) @@ -323,7 +325,7 @@ tap_send(struct net_backend *be, const struct iovec *iov, int iovcnt) static ssize_t tap_peek_recvlen(struct net_backend *be) { - struct tap_priv *priv = (struct tap_priv *)be->opaque; + struct tap_priv *priv = NET_BE_PRIV(be); ssize_t ret; if (priv->bbuflen > 0) { @@ -353,7 +355,7 @@ tap_peek_recvlen(struct net_backend *be) static ssize_t tap_recv(struct net_backend *be, const struct iovec *iov, int iovcnt) { - struct tap_priv *priv = (struct tap_priv *)be->opaque; + struct tap_priv *priv = NET_BE_PRIV(be); ssize_t ret; if (priv->bbuflen > 0) { @@ -381,7 +383,7 @@ tap_recv(struct net_backend *be, const struct iovec *iov, int iovcnt) static void tap_recv_enable(struct net_backend *be) { - struct tap_priv *priv = (struct tap_priv *)be->opaque; + struct tap_priv *priv = NET_BE_PRIV(be); mevent_enable(priv->mevp); } @@ -389,7 +391,7 @@ tap_recv_enable(struct net_backend *be) static void tap_recv_disable(struct net_backend *be) { - struct tap_priv *priv = (struct tap_priv *)be->opaque; + struct tap_priv *priv = NET_BE_PRIV(be); mevent_disable(priv->mevp); } @@ -453,7 +455,7 @@ static int ng_init(struct net_backend *be, const char *devname, nvlist_t *nvl, net_be_rxeof_t cb, void *param) { - struct tap_priv *p = (struct tap_priv *)be->opaque; + struct tap_priv *p = NET_BE_PRIV(be); struct ngm_connect ngc; const char *value, *nodename; int sbsz; @@ -629,7 +631,7 @@ netmap_set_vnet_hdr_len(struct net_backend *be, int vnet_hdr_len) { int err; struct nmreq req; - struct netmap_priv *priv = (struct netmap_priv *)be->opaque; + struct netmap_priv *priv = NET_BE_PRIV(be); nmreq_init(&req, priv->ifname); req.nr_cmd = NETMAP_BDG_VNET_HDR; @@ -686,7 +688,7 @@ static int netmap_init(struct net_backend *be, const char *devname, nvlist_t *nvl, net_be_rxeof_t cb, void *param) { - struct netmap_priv *priv = (struct netmap_priv *)be->opaque; + struct netmap_priv *priv = NET_BE_PRIV(be); strlcpy(priv->ifname, devname, sizeof(priv->ifname)); priv->ifname[sizeof(priv->ifname) - 1] = '\0'; @@ -717,7 +719,7 @@ netmap_init(struct net_backend *be, const char *devname, static void netmap_cleanup(struct net_backend *be) { - struct netmap_priv *priv = (struct netmap_priv *)be->opaque; + struct netmap_priv *priv = NET_BE_PRIV(be); if (priv->mevp) { mevent_delete(priv->mevp); @@ -732,7 +734,7 @@ static ssize_t netmap_send(struct net_backend *be, const struct iovec *iov, int iovcnt) { - struct netmap_priv *priv = (struct netmap_priv *)be->opaque; + struct netmap_priv *priv = NET_BE_PRIV(be); struct netmap_ring *ring; ssize_t totlen = 0; int nm_buf_size; @@ -811,7 +813,7 @@ txsync: static ssize_t netmap_peek_recvlen(struct net_backend *be) { - struct netmap_priv *priv = (struct netmap_priv *)be->opaque; + struct netmap_priv *priv = NET_BE_PRIV(be); struct netmap_ring *ring = priv->rx; uint32_t head = ring->head; ssize_t totlen = 0; @@ -831,7 +833,7 @@ netmap_peek_recvlen(struct net_backend *be) static ssize_t netmap_recv(struct net_backend *be, const struct iovec *iov, int iovcnt) { - struct netmap_priv *priv = (struct netmap_priv *)be->opaque; + struct netmap_priv *priv = NET_BE_PRIV(be); struct netmap_slot *slot = NULL; struct netmap_ring *ring; void *iov_frag_buf; @@ -898,7 +900,7 @@ netmap_recv(struct net_backend *be, const struct iovec *iov, int iovcnt) static void netmap_recv_enable(struct net_backend *be) { - struct netmap_priv *priv = (struct netmap_priv *)be->opaque; + struct netmap_priv *priv = NET_BE_PRIV(be); mevent_enable(priv->mevp); } @@ -906,7 +908,7 @@ netmap_recv_enable(struct net_backend *be) static void netmap_recv_disable(struct net_backend *be) { - struct netmap_priv *priv = (struct netmap_priv *)be->opaque; + struct netmap_priv *priv = NET_BE_PRIV(be); mevent_disable(priv->mevp); } @@ -1021,7 +1023,7 @@ netbe_init(struct net_backend **ret, nvlist_t *nvl, net_be_rxeof_t cb, return (EINVAL); } - nbe = calloc(1, sizeof(*nbe) + tbe->priv_size); + nbe = calloc(1, NET_BE_SIZE(tbe)); *nbe = *tbe; /* copy the template */ nbe->fd = -1; nbe->sc = param;