From nobody Mon Feb 9 19:41:38 2026 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 4f8w765HNSz6RvNQ for ; Mon, 09 Feb 2026 19:41:38 +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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f8w7630tkz3LLl for ; Mon, 09 Feb 2026 19:41:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770666098; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zucxPCYGM03adogDjydJq0cKK3aVdWUvp/wO9abEJD4=; b=atCQvdejfUyHcKOcI35oH/fXm4JyCGKPicA0k/PwIweqK9an1hO9cDuiu9cmAkH4Z3nuaT YZPEaegDRbfcJNdrWawWDxhMJpzDXjodowcntVl4pBynXJKTNkLqfyDyPHT+IidgUYo6hx vCBVjPqdMl0LCFgG3XXOO1xSXW7LkN1iz9zrRNkgL/S4NNR8ucYpVtxG1qF4kclmID4iPi 9PpTskQy0E/AF+TGomz9QITlnZhuzRoL9MH+v17TOyEi++LQpin3TtOWd3aCyF5zyNxtN8 4ylLNmDGYf6xzQ5y8NukodHbrAyhB/iTnjCTflsu40R9BZvXc+/c4jGqOcR2bw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770666098; a=rsa-sha256; cv=none; b=xLWKY5QzKZnF0z7A9N8CZsmOR1uGAPudtE48ICgYmixYo8F4RjQyj8Lxo03I+amMahkSeC 53onB2K98yw01CAu1ECiI+t4MICmgQYoBAPhN8Jttebtu/rYg3wn4DoKD5J8P/aB7/WK1u fhlFljdzq7PZSi7TOrmvC7WzrATQLHm8upI6NbxGUJ16zCq0YmgnRfdYzHDlPGBiU3gjst u0skj1xFve5/RJ9dBm82GCmiDUqJ3lSCljEV8HDn0dX5j1IjcKM8AluRDGgL4U5MYoC0eY 519eNK8v13o72Rx/cDkIMgF/wGmtW/sogLblryQvmglq4SD2aoaoORhqIIVSyg== 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=1770666098; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zucxPCYGM03adogDjydJq0cKK3aVdWUvp/wO9abEJD4=; b=BwWG2j5/hE9tEseq5mmWiLXTiknVfL8zL9HRkhS4DEEIr8t9TeQySD+w+bHCyD1wwFDYdy ElCgSvKlvQSratzQIWMZvr0GsOkyUdBR5q5nu99ldn/J591wrzIOAozohZtTMVggExZJJN XKCgljxkjsSG8Ah/4za/XwwnXiFnNtiiQ/bCzkSCRcWB/GcKlQEeCiTIQYkKuqwfDgXrHu ZtI4p9qjyEFBPJgGDsqXQsDLnp9N8He0ecJExws6YzwAYtWdb52Kwx8JAvf62O9CjxqQUm 1fPjlkv2m7rqtcpH8+0/kzggSmEco7vh58FENM1rziTQZRPUuXZ0PZfbxWHhkA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f8w762ZWDzmYn for ; Mon, 09 Feb 2026 19:41:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b3a9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Feb 2026 19:41:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Doongar Singh From: Mitchell Horne Subject: git: 4a7d42f35107 - stable/15 - riscv: Add macro for hfence.gvma instruction 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 4a7d42f35107a27c293e0a2b350d15e6829856c7 Auto-Submitted: auto-generated Date: Mon, 09 Feb 2026 19:41:38 +0000 Message-Id: <698a3872.3b3a9.469e6181@gitrepo.freebsd.org> The branch stable/15 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=4a7d42f35107a27c293e0a2b350d15e6829856c7 commit 4a7d42f35107a27c293e0a2b350d15e6829856c7 Author: Doongar Singh AuthorDate: 2026-01-26 16:18:22 +0000 Commit: Mitchell Horne CommitDate: 2026-02-09 19:38:23 +0000 riscv: Add macro for hfence.gvma instruction Add an inline function hfence_gvma() for hfence.gvma instruction. Signed-off-by: Doongar Singh Reviewed by: mhorne, markj Differential Revision: https://reviews.freebsd.org/D54857 (cherry picked from commit 972c488bf4117d9eb29e5753c6c5a2250154df3d) --- sys/riscv/include/cpufunc.h | 7 +++++++ sys/riscv/vmm/vmm_riscv.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/sys/riscv/include/cpufunc.h b/sys/riscv/include/cpufunc.h index 75b22632c546..c39f17131eb7 100644 --- a/sys/riscv/include/cpufunc.h +++ b/sys/riscv/include/cpufunc.h @@ -119,6 +119,13 @@ sfence_vma_asid_page(uint64_t asid, uintptr_t addr) : "memory"); } +static __inline void +hfence_gvma(void) +{ + + __asm __volatile("hfence.gvma" ::: "memory"); +} + #define rdcycle() csr_read64(cycle) #define rdtime() csr_read64(time) #define rdinstret() csr_read64(instret) diff --git a/sys/riscv/vmm/vmm_riscv.c b/sys/riscv/vmm/vmm_riscv.c index 0e46aca60fdf..5d39c96c682a 100644 --- a/sys/riscv/vmm/vmm_riscv.c +++ b/sys/riscv/vmm/vmm_riscv.c @@ -625,7 +625,7 @@ vmmops_run(void *vcpui, register_t pc, pmap_t pmap, struct vm_eventinfo *evinfo) * have been modified, it may be necessary to execute an HFENCE.GVMA * instruction (see Section 5.3.2) before or after writing hgatp. */ - __asm __volatile("hfence.gvma" ::: "memory"); + hfence_gvma(); csr_write(hgatp, pmap->pm_satp); if (has_sstc)