From nobody Sun Jun 21 16:14:38 2026 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 4gjxHM0W4sz6hH5g for ; Sun, 21 Jun 2026 16:14:39 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gjxHL6hYkz49TV for ; Sun, 21 Jun 2026 16:14:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782058479; 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=ccJy8fdCRMSMjEsBWtIfSGSyGCSFfqQUMU4/SgzftgQ=; b=WZ+rs4eOzJjC+rIzvZbZYMrtmx/H+HlnKlqTCmNr23JfQUTXOk7q7T4jmwL+17CA7m+MJV jC/4ihsGQenPhmRNFH+WXy2DqI4hzASNvc4SfVaM/JEuXl+Gqgl//+Mu34JRlpIz38licR W7bbl7Oy/+v5Ht1UhkytYIQ0m0jKZwTR7eBghpph9m5InsRoF5jm6Z18gXAgOKOc7V2cPX PXSY8eOI1xM5kBkeTGDKFmiq8An19erjyeIG4pjEloVwRsP3tFseXTKZ1U13GHHQOIlsJz S7mhZD6gDWD69MEA1CPFUd/UXd+SQfJDV45MmB486Nrb9q07tiCjsPq7zznwNw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782058479; a=rsa-sha256; cv=none; b=pWBMAAUMz5RgT2e2tYCNOsHxM0R/fBxptoHdi8xMIDhSv9qXHB5NHVeVCDlc/BmpeSGdpV oBUnR51Xf1cb7ILZOGU4DoM28zGseqEosya9CINSCfLXXgFuKbC5ic4XMv0h7zlee//7st +saNGCiQMXkB/58IgAfmN64tyyvSImYVSfyQRsT/Xa3J4w4TFIp4YHBqHGYfPvGuInkAEg RECzoVmvXqOL3MyWDJypATfCEzawVONZ0+1OpKVKLVleSZLenkSgTtQdu2b/zRfHbKADn8 y8WRxd3/3HySNxbasBiYWMkI9EX3O1nuhmae4qD/YeUQTAQ1f9BR2g2QI+SsVQ== 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=1782058479; 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=ccJy8fdCRMSMjEsBWtIfSGSyGCSFfqQUMU4/SgzftgQ=; b=OpEmSGxo3FpPbUz+h0cgMq7JOjLiNQncreaeFgR4eJdWz+/60idFetNsxrSvNMoRXF4BGX EgeGT1i/KHg33GTHAn5TYtIMfVTUx0/RCsEGRIrxqimHqmBVRRdMI3jalWU8akNpqVChFB Fcd4bXkZbWMF2Yo0V8lCU6GxeMHkq6fqOUWGoQN2AZi9tzz6foVERftbsvJE21925CexRX Enz+U+1Xq3xusQAciLQNRK/tM2dRw5+KL7FC/pBbXifM4J2qnH+ZHXTZE531dquko11W/T HIcYO8opwQ75eK1yIPs8DPIia0z1eOWzcmWq7S/O4Us+/DDagm8NKNUnZweRdw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gjxHL5X6Wz1Mpg for ; Sun, 21 Jun 2026 16:14:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18a6f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 21 Jun 2026 16:14:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 2ee2ef607f60 - main - pmap: prefer memcpy over bcopy 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2ee2ef607f6087757efd62b814cbf2400ef58ef2 Auto-Submitted: auto-generated Date: Sun, 21 Jun 2026 16:14:38 +0000 Message-Id: <6a380dee.18a6f.3dabc4ef@gitrepo.freebsd.org> The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=2ee2ef607f6087757efd62b814cbf2400ef58ef2 commit 2ee2ef607f6087757efd62b814cbf2400ef58ef2 Author: Brooks Davis AuthorDate: 2026-06-21 15:47:23 +0000 Commit: Brooks Davis CommitDate: 2026-06-21 16:08:12 +0000 pmap: prefer memcpy over bcopy Alter pmap_copy_page(s) to use memcpy rather than the deprecated bcopy. We'll be adding non-provenance preserving versions for CHERI support and would like to avoid introducing variants of deprecated APIs just to maintain symmetry. Reviewed by: kib Suggested by: emaste Sponsored by: Innovate UK Differential Revision: https://reviews.freebsd.org/D57687 --- sys/amd64/amd64/pmap.c | 2 +- sys/arm/arm/pmap-v6.c | 10 +++++----- sys/arm64/arm64/pmap.c | 4 ++-- sys/riscv/riscv/pmap.c | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index 691fac8c89b4..b37700a53aec 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -8317,7 +8317,7 @@ pmap_copy_pages(vm_page_t ma[], vm_offset_t a_offset, vm_page_t mb[], mapped = pmap_map_io_transient(pages, vaddr, 2, false); a_cp = (char *)vaddr[0] + a_pg_offset; b_cp = (char *)vaddr[1] + b_pg_offset; - bcopy(a_cp, b_cp, cnt); + memcpy(b_cp, a_cp, cnt); if (__predict_false(mapped)) pmap_unmap_io_transient(pages, vaddr, 2, false); a_offset += cnt; diff --git a/sys/arm/arm/pmap-v6.c b/sys/arm/arm/pmap-v6.c index 2b0ebebefaec..5fcfc663e292 100644 --- a/sys/arm/arm/pmap-v6.c +++ b/sys/arm/arm/pmap-v6.c @@ -2194,7 +2194,7 @@ pte1_copy_nosync(pt1_entry_t *spte1p, pt1_entry_t *dpte1p, vm_offset_t sva, idx = pte1_index(sva); count = (pte1_index(eva) - idx + 1) * sizeof(pt1_entry_t); - bcopy(spte1p + idx, dpte1p + idx, count); + memcpy(dpte1p + idx, spte1p + idx, count); } static __inline void @@ -2205,7 +2205,7 @@ pt2tab_copy_nosync(pt2_entry_t *spte2p, pt2_entry_t *dpte2p, vm_offset_t sva, idx = pt2tab_index(sva); count = (pt2tab_index(eva) - idx + 1) * sizeof(pt2_entry_t); - bcopy(spte2p + idx, dpte2p + idx, count); + memcpy(dpte2p + idx, spte2p + idx, count); } /* @@ -5926,7 +5926,7 @@ pmap_zero_page_area(vm_page_t m, int off, int size) /* * pmap_copy_page copies the specified (machine independent) * page by mapping the page into virtual memory and using - * bcopy to copy the page, one machine dependent page at a + * memcpy to copy the page, one machine dependent page at a * time. */ void @@ -5948,7 +5948,7 @@ pmap_copy_page(vm_page_t src, vm_page_t dst) PTE2_AP_KR | PTE2_NM, vm_page_pte2_attr(src))); pte2_store(cmap2_pte2p, PTE2_KERN_NG(VM_PAGE_TO_PHYS(dst), PTE2_AP_KRW, vm_page_pte2_attr(dst))); - bcopy(pc->pc_cmap1_addr, pc->pc_cmap2_addr, PAGE_SIZE); + memcpy(pc->pc_cmap2_addr, pc->pc_cmap1_addr, PAGE_SIZE); pte2_clear(cmap1_pte2p); tlb_flush((vm_offset_t)pc->pc_cmap1_addr); pte2_clear(cmap2_pte2p); @@ -5994,7 +5994,7 @@ pmap_copy_pages(vm_page_t ma[], vm_offset_t a_offset, vm_page_t mb[], tlb_flush_local((vm_offset_t)pc->pc_cmap2_addr); a_cp = pc->pc_cmap1_addr + a_pg_offset; b_cp = pc->pc_cmap2_addr + b_pg_offset; - bcopy(a_cp, b_cp, cnt); + memcpy(b_cp, a_cp, cnt); a_offset += cnt; b_offset += cnt; xfersize -= cnt; diff --git a/sys/arm64/arm64/pmap.c b/sys/arm64/arm64/pmap.c index 2eabdef6d27c..2ef639965deb 100644 --- a/sys/arm64/arm64/pmap.c +++ b/sys/arm64/arm64/pmap.c @@ -6988,7 +6988,7 @@ pmap_zero_page_area(vm_page_t m, int off, int size) /* * pmap_copy_page copies the specified (machine independent) * page by mapping the page into virtual memory and using - * bcopy to copy the page, one machine dependent page at a + * memcpy to copy the page, one machine dependent page at a * time. */ void @@ -7043,7 +7043,7 @@ pmap_copy_pages(vm_page_t ma[], vm_offset_t a_offset, vm_page_t mb[], } else { b_cp = (char *)PHYS_TO_DMAP(p_b) + b_pg_offset; } - bcopy(a_cp, b_cp, cnt); + memcpy(b_cp, a_cp, cnt); a_offset += cnt; b_offset += cnt; xfersize -= cnt; diff --git a/sys/riscv/riscv/pmap.c b/sys/riscv/riscv/pmap.c index 1f3fd8c24b81..0461400f2a7c 100644 --- a/sys/riscv/riscv/pmap.c +++ b/sys/riscv/riscv/pmap.c @@ -4055,7 +4055,7 @@ pmap_zero_page_area(vm_page_t m, int off, int size) /* * pmap_copy_page copies the specified (machine independent) * page by mapping the page into virtual memory and using - * bcopy to copy the page, one machine dependent page at a + * memcpy to copy the page, one machine dependent page at a * time. */ void @@ -4098,7 +4098,7 @@ pmap_copy_pages(vm_page_t ma[], vm_offset_t a_offset, vm_page_t mb[], } else { b_cp = (char *)PHYS_TO_DMAP(p_b) + b_pg_offset; } - bcopy(a_cp, b_cp, cnt); + memcpy(b_cp, a_cp, cnt); a_offset += cnt; b_offset += cnt; xfersize -= cnt;