From nobody Thu Apr 23 18:16:16 2026 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 4g1kmw6pG7z6bFxw for ; Thu, 23 Apr 2026 18:16:16 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g1kmw1Zqfz3QyB for ; Thu, 23 Apr 2026 18:16:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776968176; 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=YJ27Y0kxqlcQyQmvDrLKUYzBt3w1W37HXHbC381/0rQ=; b=hS4Wx8z2UyhfHGZ24P6iyq5ZQl9cTe2y9ajzwmm8kiWSihQRhPecIccxtIMPANqoIrj7PC dsByt9tuYVbppJOEuT41Ij+dzn/yi0V4BqbqYTbU2dqH7XXJqjQgk87tdEBAXpnggjVHxv bftIOo8+UTGGPAKndlDVstjyaDbf4QjDe4ARoXRMZYXCeBH9pMGfEzXzAlBOl9WecXAvd9 ztykCCjX2p09IM/Cma5CgUGnzA9LtynMWc//1Pvomjck9fZONMUfQNgwKSEJt231vQiJ5d L8CCdaknRJP6NI4vigKuOTPeBRc9GchJfZriLTgltLtB7dvHa9IHF57A75ur6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776968176; a=rsa-sha256; cv=none; b=wzwfixNQ+jiaR13Kv7CfHovXuh9W8b4w/bCxXa8PHkYLp+Qz7UPtNOanw8VRs4tCtmvfar aQRWF0D4LtGB+H3Mjw/Hqb+FoeJuqAOMs1qYJnt1MK2JNU2sSgpi219en6uqaj9A56T0Wl VdreXSy6aQh62v0kahPI3yZVqfWxE5gaVIkzJL3erfE6BNlfnVPEnDZ/M3/xqjiVWIbW1U TfMDZR3SVPXcTA9yCPs4GU0FIP9Ds/J6UKU+DLHpHoaNOuE/lC4VQ3apD7ve4PO+v0gYmp uMm8wnL4W0S+3F5jyoRMbZ519NpkTPfHfXLvEgCGnxNiiojMWWTBiiDUIwbsvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776968176; 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=YJ27Y0kxqlcQyQmvDrLKUYzBt3w1W37HXHbC381/0rQ=; b=YomnfqkCS0rdrCVYWa57PTgK4KfP/IcNuYpOnfIxg9+dxwbt99fGKYZT3J/bDnQ9sHWtxp hifAOaC1LKMxqmtN99Q5yxULkhI8GhxblDxW9rcCg9/piAkQirPNv7DLGYoSF+BoFcI6z1 z7rmekUae6Bn3Thi8xqz724+WMJg8pIGKR8F+aqU3uYYfAB1j9PQfSB7AGpZG2zDOdeOcX 9Jdiv0KFEbMNJGJq8lrPc6braXG2zQ/yI60dfQ3KC7o+wJixUSKpPD/DC5B6eSeSEscEJL 6DOCwNADhn7GmvOHTVVQojNe/jQeWibv7Uhz5AYaGuDMvRwjCRKjrrnr14Qs3g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g1kmw13cNzBhN for ; Thu, 23 Apr 2026 18:16:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 450b0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 23 Apr 2026 18:16:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 025b39b85420 - main - gve: Convert a couple of structure members from vm_offset_t to char * 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 025b39b854202b316f4c5ec3e00d727115ac0eaa Auto-Submitted: auto-generated Date: Thu, 23 Apr 2026 18:16:16 +0000 Message-Id: <69ea61f0.450b0.758bce37@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=025b39b854202b316f4c5ec3e00d727115ac0eaa commit 025b39b854202b316f4c5ec3e00d727115ac0eaa Author: John Baldwin AuthorDate: 2026-04-23 17:05:54 +0000 Commit: John Baldwin CommitDate: 2026-04-23 17:05:54 +0000 gve: Convert a couple of structure members from vm_offset_t to char * Effort: CHERI upstreaming Reviewed by: kib Sponsored by: AFRL, DARPA Pull Request: https://github.com/freebsd/freebsd-src/pull/2068 --- sys/dev/gve/gve.h | 4 ++-- sys/dev/gve/gve_qpl.c | 12 ++++++------ sys/dev/gve/gve_tx.c | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/sys/dev/gve/gve.h b/sys/dev/gve/gve.h index 64c2a0481817..1a163cfcbce0 100644 --- a/sys/dev/gve/gve.h +++ b/sys/dev/gve/gve.h @@ -166,7 +166,7 @@ struct gve_queue_page_list { uint32_t id; uint32_t num_dmas; uint32_t num_pages; - vm_offset_t kva; + char *kva; vm_page_t *pages; struct gve_dma_handle *dmas; }; @@ -350,7 +350,7 @@ struct gve_rx_ring { * uses it. */ struct gve_tx_fifo { - vm_offset_t base; /* address of base of FIFO */ + char *base; /* address of base of FIFO */ uint32_t size; /* total size */ volatile int available; /* how much space is still available */ uint32_t head; /* offset to write at */ diff --git a/sys/dev/gve/gve_qpl.c b/sys/dev/gve/gve_qpl.c index 1c6a58372365..f04e82497fa4 100644 --- a/sys/dev/gve/gve_qpl.c +++ b/sys/dev/gve/gve_qpl.c @@ -46,8 +46,8 @@ gve_free_qpl(struct gve_priv *priv, struct gve_queue_page_list *qpl) } if (qpl->kva) { - pmap_qremove((void *)qpl->kva, qpl->num_pages); - kva_free(qpl->kva, PAGE_SIZE * qpl->num_pages); + pmap_qremove(qpl->kva, qpl->num_pages); + kva_free((vm_offset_t)qpl->kva, PAGE_SIZE * qpl->num_pages); } for (i = 0; i < qpl->num_pages; i++) { @@ -104,9 +104,9 @@ gve_alloc_qpl(struct gve_priv *priv, uint32_t id, int npages, bool single_kva) qpl->pages = malloc(npages * sizeof(*qpl->pages), M_GVE_QPL, M_WAITOK | M_ZERO); - qpl->kva = 0; + qpl->kva = NULL; if (single_kva) { - qpl->kva = kva_alloc(PAGE_SIZE * npages); + qpl->kva = (char *)kva_alloc(PAGE_SIZE * npages); if (!qpl->kva) { device_printf(priv->dev, "Failed to create the single kva for QPL %d\n", id); err = ENOMEM; @@ -128,14 +128,14 @@ gve_alloc_qpl(struct gve_priv *priv, uint32_t id, int npages, bool single_kva) } pmap_qenter(qpl->dmas[i].cpu_addr, &(qpl->pages[i]), 1); } else - qpl->dmas[i].cpu_addr = (void *)(qpl->kva + (PAGE_SIZE * i)); + qpl->dmas[i].cpu_addr = qpl->kva + (PAGE_SIZE * i); qpl->num_pages++; } if (single_kva) - pmap_qenter((void *)qpl->kva, qpl->pages, npages); + pmap_qenter(qpl->kva, qpl->pages, npages); for (i = 0; i < npages; i++) { err = gve_dmamap_create(priv, /*size=*/PAGE_SIZE, /*align=*/PAGE_SIZE, diff --git a/sys/dev/gve/gve_tx.c b/sys/dev/gve/gve_tx.c index 84e3a4c4eb9f..5e0611e1d6e4 100644 --- a/sys/dev/gve/gve_tx.c +++ b/sys/dev/gve/gve_tx.c @@ -735,7 +735,7 @@ gve_xmit(struct gve_tx_ring *tx, struct mbuf *mbuf) pkt_len); m_copydata(mbuf, 0, first_seg_len, - (char *)tx->fifo.base + info->iov[hdr_nfrags - 1].iov_offset); + tx->fifo.base + info->iov[hdr_nfrags - 1].iov_offset); gve_dma_sync_for_device(tx->com.qpl, info->iov[hdr_nfrags - 1].iov_offset, info->iov[hdr_nfrags - 1].iov_len); @@ -755,7 +755,7 @@ gve_xmit(struct gve_tx_ring *tx, struct mbuf *mbuf) info->iov[i].iov_offset, is_ipv6, l3_off, tso_mss); m_copydata(mbuf, copy_offset, info->iov[i].iov_len, - (char *)tx->fifo.base + info->iov[i].iov_offset); + tx->fifo.base + info->iov[i].iov_offset); gve_dma_sync_for_device(tx->com.qpl, info->iov[i].iov_offset, info->iov[i].iov_len); copy_offset += info->iov[i].iov_len;