From nobody Mon Jan 26 16:23:20 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 4f0DNm2Vlxz6QT94 for ; Mon, 26 Jan 2026 16:23:20 +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 4f0DNm1ZRvz3Cbr for ; Mon, 26 Jan 2026 16:23:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769444600; 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=hiv2vUkCN/pD9fgeJtudisP36IWA1NhyxsoPKzNxYzo=; b=LXgQI4H74gcqKsd9CmniPiCE/QlM6P1pJvOGoLzv4DOPTK2Vwik9yVk9uLnvCEV+7nRD9+ cFdhkmVoiO0oqSmKv/msl2jmIDk7BDuRqo0a+rRz3ojzQPmyijsULKKDGh4TTZ3Rn4zR79 ZXXllJvKgNpY7xndGm5xf6yu2LGcKB1oTLDN48u+1CCZ7CvSxRQ8N7HPD6AP/dvKKZ9aym Td7EW1TwEvsn3FcWsGGU2UHhaY8mGnLz2Y1FzkJHgETuYkbv8PA7k7zClhYt2LSITiM+e3 cfpqfdx7vHR9RrAREkpkrokocvFya1qNHpLFS/yWPKVKyzR4S4tHTbxGwbHrpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769444600; 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=hiv2vUkCN/pD9fgeJtudisP36IWA1NhyxsoPKzNxYzo=; b=F+ciIShiTcHmuXKzfjPRTtPLT5MOxuiSAPWw/gLz9Yx8OWHNSgidCKgv7vY1bjopkEdgKi lwQJgAfzz89zf0DaJt49zZqhgHgcVZzmVRfmrttNa6+YTVObdYF1BlK3ilxkkfuywFUX3q DUYy4aW/0LGcX0LFHXyFldOK4sSSeFlMVGHQ9I5br8j0YEDQEAQRvDl1xPhfr4VacVFH6H hDUkCDH2DTZO0g/oSHLpsYd8AcWsc1b+xfBY7gVky1RwatDuCNNMhxczXjo5tPM5QSO+48 Pqetpvb6v6/linwWXuwJZFNmfGLzVOx+if9gv1uYgt7M/QqJyydXfZKJfdHneg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769444600; a=rsa-sha256; cv=none; b=C+6IeP5Ox1IfxmVQqwDgaM90COBKduVzvbujDudWHZzivONliMCmNF+DPJaGYGTURo2foC uHPbhOfTFcOFlVsykJ+HbSsVe9Jjp+cnC0qLjD8q4TbWIDeOWqKSFUD6uucu4Om3akgbAC Bh0SWSxhg5Opm3+TYYHpzwOfUoQFPyAoEFgXPtnJtZpSn84C8QkclAL7RLQoVl83+mmUig evGGdOrtSDx028lpNgEZWsj9LBT14W1/dxcVyYaPppidECOh7P+C0KZRqdsCMq98yX6T9l ibunWm7APUTDneKkBZ9HnjmFyg0r72CFz0zYUFL1zUf7KKOU+MG2kfc6/85dqA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f0DNm16Z6zChj for ; Mon, 26 Jan 2026 16:23:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c6b5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 26 Jan 2026 16:23:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Doongar Singh From: Mitchell Horne Subject: git: 972c488bf411 - main - riscv: Add macro for hfence.gvma instruction 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: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 972c488bf4117d9eb29e5753c6c5a2250154df3d Auto-Submitted: auto-generated Date: Mon, 26 Jan 2026 16:23:20 +0000 Message-Id: <697794f8.3c6b5.4b26c93@gitrepo.freebsd.org> The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=972c488bf4117d9eb29e5753c6c5a2250154df3d commit 972c488bf4117d9eb29e5753c6c5a2250154df3d Author: Doongar Singh AuthorDate: 2026-01-26 16:18:22 +0000 Commit: Mitchell Horne CommitDate: 2026-01-26 16:23:16 +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 --- 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 cfd3decd8cfa..fe2ca5c07789 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)