From nobody Sat May 10 20:43:21 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
dkim=fail header.i=@wdc.com;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=fail(p=none dis=none) header.from=wdc.com
ARC-Seal: i=1; a=rsa-sha256; t=1620729654; cv=none;
d=zohomail.com; s=zohoarc;
b=bXv1NwQVHzbHIVi+WQ2UuYHvh+7YYsov9fkfp6PA9uihDBpU0EgWvgSmdrv4Xu29dofxCk0amWCI1t7tikyfwbAV3bm5lroCczXl64VLCAX2EH+hcJu7tEpnT1zXO2TV1nO1uhHN3D8GN2MhgNjDU8Nx3AEexvDQ4jU0eMiMdK4=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1620729654;
h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To;
bh=0tv6iSxRMpsPrmxSXZinke4/7rT4ADgkC7S8rEBhUp8=;
b=X3noSOpE86yLwTIpXmng15+Us4y91N+Mf+CJQDUyqIHbmlQI2ReTu4dGTqlcUMed5m4uJ9AWSaxTuuQGVQJoi+PsNpVqwGVMyNt7osTxj6VCcaC0uWBNz/4eEca1XyIwEeCGkLW6EhV+icei4nwirQ70jGLFf6rLXicZWSatc4w=
ARC-Authentication-Results: i=1; mx.zohomail.com;
dkim=fail header.i=@wdc.com;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=fail header.from=<alistair.francis@wdc.com> (p=none dis=none)
header.from=<alistair.francis@wdc.com>
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 16207296547211019.8893478188098;
Tue, 11 May 2021 03:40:54 -0700 (PDT)
Received: from localhost ([::1]:53450 helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces+importer=patchew.org@nongnu.org>)
id 1lgPor-0001yB-IF
for importer@patchew.org; Tue, 11 May 2021 06:40:53 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:38214)
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1)
(envelope-from <prvs=7584e029c=alistair.francis@wdc.com>)
id 1lgPWb-0001ax-Ij
for qemu-devel@nongnu.org; Tue, 11 May 2021 06:22:01 -0400
Received: from esa5.hgst.iphmx.com ([216.71.153.144]:41098)
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1)
(envelope-from <prvs=7584e029c=alistair.francis@wdc.com>)
id 1lgPWX-0006V6-9d
for qemu-devel@nongnu.org; Tue, 11 May 2021 06:22:01 -0400
Received: from uls-op-cesaip01.wdc.com (HELO uls-op-cesaep01.wdc.com)
([199.255.45.14])
by ob1.hgst.iphmx.com with ESMTP; 11 May 2021 18:21:20 +0800
Received: from uls-op-cesaip01.wdc.com ([10.248.3.36])
by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;
11 May 2021 03:01:20 -0700
Received: from unknown (HELO alistair-risc6-laptop.wdc.com) ([10.225.165.48])
by uls-op-cesaip01.wdc.com with ESMTP; 11 May 2021 03:21:18 -0700
DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple;
d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com;
t=1620728516; x=1652264516;
h=from:to:cc:subject:date:message-id:in-reply-to:
references:mime-version:content-transfer-encoding;
bh=pBBAC61+EEfqzPyFG9Ss2AtmUcGJb3aUIYDnVeOutq0=;
b=qITCLzJyJlf1ZM6QP9+7eTeFIkvW66KIbCMGZX4hpwJ9uRXisHORj2Vz
NuNFt1kAcs+yQ8vow3lfpfYChf5lw0l/eFlGU1Zf1uEWw4aEbND8pihqI
eakiYRyGtZlhg20scW905hFqe/bfrh5CIziS/OiSb0rmh36dXpvsj0ZcB
GtXy26cV/mn1uWiICwWyk+p/S7Qrliwg42WxYC3lFG/4r6/RFvFYqw+oJ
DX3qtzFFolaDTAzTxOfCT57L8huLboWt6p+tWHAhPJQYzFPYfkYQfQm2s
6tlhOkXDFaWOEtpP7vdQPZc7uQX7nP7HmL3yFEuc6SZMhOcZomXT/BVkK A==;
IronPort-SDR:
gx2HZEvBV/V7bAw+lBf8CHKrAJZleckvkhMvaHe5/EQ4ymXpzPbknzg/PXJkRAXHxZGDCDpK0G
DOAiGBEb5eJ0qaKYZbyWjhvMEyjBik0tubiVGWdOn6+S9oyZgBQK/jaNLjlDeY6rH99SrgM6UK
AXmew6JngYqCufbxNbKHK4JSathE3HYX84ZgFnF0pcgXfdGend6RQYAeZcwjTgVAoZ8FK9OFbc
p3Z7EpyiKgcM2gLYhBwlC7Yaiv8mngGC7oMtQFurytoF0v46rH0BG4QE+1bP+V7v9qXaHghC22
ncA=
X-IronPort-AV: E=Sophos;i="5.82,290,1613404800"; d="scan'208";a="167735438"
IronPort-SDR:
G39gwkAA74R+izZcUba8x9tLdI2V0/C0yVY9CuYl+TwYl2hzmpIwsqjQJmw70TXb+7zSY9ZjIX
B/omDzZwSJHfx1I60XxY9a43h4HOLDG8BSnMrFSAPBeuWcaGeikN//4EBQs94Ew8MiN90MnKl1
HL77nemfyEQMk/qS2d4OM9qIHKbYWhLHeCQ20x6CvambR/3IJUmO6AslLwJEMk3PrAvWS0RcVP
DOBByzU31c6Kxsjv9amOedquXHP3Xpey0iIocDZKSQtUU0TlxcxU3v9d3UnwKOdtNgK3Zh/dt5
R2ad/GF8oLkHMRiCrs01KL/R
IronPort-SDR:
KcmOYzf+mCc6s6S8BUF2MJbPpaGkchKhgQI2gQT0m8ZK7VGb80KxLkwo7swUuJd3VIxNcSZBab
4cVImVG49Q56FxnVlLQhF6ElEZhSncCsjB5zfbWBN8wUvespZKjj3iuLSoR9T5Zbosm8Ja3lS2
8gpU8IWcGSsO/KT4lbAAU+PuVfZnO6jjHOMNat2Gf3KkJpa+Ud2Ms+/F1h/T9Pvb6+8rRYlvBO
dFYDujpzkUX0GRQf9SyEaSkTVNM4LtU5nvY2odMliyVNB7KB1nKfUA+8vrgzscMoZUahCvq6yE
NxY=
WDCIronportException: Internal
From: Alistair Francis <alistair.francis@wdc.com>
To: peter.maydell@linaro.org
Subject: [PULL v3 24/42] target/riscv: Implementation of enhanced PMP (ePMP)
Date: Tue, 11 May 2021 20:19:33 +1000
Message-Id: <20210511101951.165287-25-alistair.francis@wdc.com>
X-Mailer: git-send-email 2.31.1
In-Reply-To: <20210511101951.165287-1-alistair.francis@wdc.com>
References: <20210511101951.165287-1-alistair.francis@wdc.com>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17
as permitted sender) client-ip=209.51.188.17;
envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Received-SPF: pass client-ip=216.71.153.144;
envelope-from=prvs=7584e029c=alistair.francis@wdc.com;
helo=esa5.hgst.iphmx.com
X-Spam_score_int: -27
X-Spam_score: -2.8
X-Spam_bar: --
X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_PASS=-0.001,
SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Cc: Hou Weiying <weiying_hou@outlook.com>, qemu-devel@nongnu.org,
Hongzheng-Li <Ethan.Lee.QNL@gmail.com>,
Alistair Francis <alistair.francis@wdc.com>, alistair23@gmail.com,
Bin Meng <bmeng.cn@gmail.com>, Myriad-Dreamin <camiyoru@gmail.com>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: "Qemu-devel" <qemu-devel-bounces+importer=patchew.org@nongnu.org>
X-ZohoMail-DKIM: fail (Header signature does not verify)
Content-Type: text/plain; charset="utf-8"
From: Hou Weiying <weiying_hou@outlook.com>
This commit adds support for ePMP v0.9.1.
The ePMP spec can be found in:
https://docs.google.com/document/d/1Mh_aiHYxemL0umN3GTTw8vsbmzHZ_nxZXgjgOUz=
bvc8
Signed-off-by: Hongzheng-Li <Ethan.Lee.QNL@gmail.com>
Signed-off-by: Hou Weiying <weiying_hou@outlook.com>
Signed-off-by: Myriad-Dreamin <camiyoru@gmail.com>
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Message-id: fef23b885f9649a4d54e7c98b168bdec5d297bb1.1618812899.git.alistai=
r.francis@wdc.com
[ Changes by AF:
- Rebase on master
- Update to latest spec
- Use a switch case to handle ePMP MML permissions
- Fix a few bugs
]
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
---
target/riscv/pmp.c | 154 ++++++++++++++++++++++++++++++++++++++++++---
1 file changed, 146 insertions(+), 8 deletions(-)
diff --git a/target/riscv/pmp.c b/target/riscv/pmp.c
index e35988eec2..e1f5776316 100644
--- a/target/riscv/pmp.c
+++ b/target/riscv/pmp.c
@@ -90,11 +90,42 @@ static inline uint8_t pmp_read_cfg(CPURISCVState *env, =
uint32_t pmp_index)
static void pmp_write_cfg(CPURISCVState *env, uint32_t pmp_index, uint8_t =
val)
{
if (pmp_index < MAX_RISCV_PMPS) {
- if (!pmp_is_locked(env, pmp_index)) {
- env->pmp_state.pmp[pmp_index].cfg_reg =3D val;
- pmp_update_rule(env, pmp_index);
+ bool locked =3D true;
+
+ if (riscv_feature(env, RISCV_FEATURE_EPMP)) {
+ /* mseccfg.RLB is set */
+ if (MSECCFG_RLB_ISSET(env)) {
+ locked =3D false;
+ }
+
+ /* mseccfg.MML is not set */
+ if (!MSECCFG_MML_ISSET(env) && !pmp_is_locked(env, pmp_index))=
{
+ locked =3D false;
+ }
+
+ /* mseccfg.MML is set */
+ if (MSECCFG_MML_ISSET(env)) {
+ /* not adding execute bit */
+ if ((val & PMP_LOCK) !=3D 0 && (val & PMP_EXEC) !=3D PMP_E=
XEC) {
+ locked =3D false;
+ }
+ /* shared region and not adding X bit */
+ if ((val & PMP_LOCK) !=3D PMP_LOCK &&
+ (val & 0x7) !=3D (PMP_WRITE | PMP_EXEC)) {
+ locked =3D false;
+ }
+ }
} else {
+ if (!pmp_is_locked(env, pmp_index)) {
+ locked =3D false;
+ }
+ }
+
+ if (locked) {
qemu_log_mask(LOG_GUEST_ERROR, "ignoring pmpcfg write - locked=
\n");
+ } else {
+ env->pmp_state.pmp[pmp_index].cfg_reg =3D val;
+ pmp_update_rule(env, pmp_index);
}
} else {
qemu_log_mask(LOG_GUEST_ERROR,
@@ -217,6 +248,32 @@ static bool pmp_hart_has_privs_default(CPURISCVState *=
env, target_ulong addr,
{
bool ret;
=20
+ if (riscv_feature(env, RISCV_FEATURE_EPMP)) {
+ if (MSECCFG_MMWP_ISSET(env)) {
+ /*
+ * The Machine Mode Whitelist Policy (mseccfg.MMWP) is set
+ * so we default to deny all, even for M-mode.
+ */
+ *allowed_privs =3D 0;
+ return false;
+ } else if (MSECCFG_MML_ISSET(env)) {
+ /*
+ * The Machine Mode Lockdown (mseccfg.MML) bit is set
+ * so we can only execute code in M-mode with an applicable
+ * rule. Other modes are disabled.
+ */
+ if (mode =3D=3D PRV_M && !(privs & PMP_EXEC)) {
+ ret =3D true;
+ *allowed_privs =3D PMP_READ | PMP_WRITE;
+ } else {
+ ret =3D false;
+ *allowed_privs =3D 0;
+ }
+
+ return ret;
+ }
+ }
+
if ((!riscv_feature(env, RISCV_FEATURE_PMP)) || (mode =3D=3D PRV_M)) {
/*
* Privileged spec v1.10 states if HW doesn't implement any PMP en=
try
@@ -294,13 +351,94 @@ bool pmp_hart_has_privs(CPURISCVState *env, target_ul=
ong addr,
pmp_get_a_field(env->pmp_state.pmp[i].cfg_reg);
=20
/*
- * If the PMP entry is not off and the address is in range, do the=
priv
- * check
+ * Convert the PMP permissions to match the truth table in the
+ * ePMP spec.
*/
+ const uint8_t epmp_operation =3D
+ ((env->pmp_state.pmp[i].cfg_reg & PMP_LOCK) >> 4) |
+ ((env->pmp_state.pmp[i].cfg_reg & PMP_READ) << 2) |
+ (env->pmp_state.pmp[i].cfg_reg & PMP_WRITE) |
+ ((env->pmp_state.pmp[i].cfg_reg & PMP_EXEC) >> 2);
+
if (((s + e) =3D=3D 2) && (PMP_AMATCH_OFF !=3D a_field)) {
- *allowed_privs =3D PMP_READ | PMP_WRITE | PMP_EXEC;
- if ((mode !=3D PRV_M) || pmp_is_locked(env, i)) {
- *allowed_privs &=3D env->pmp_state.pmp[i].cfg_reg;
+ /*
+ * If the PMP entry is not off and the address is in range,
+ * do the priv check
+ */
+ if (!MSECCFG_MML_ISSET(env)) {
+ /*
+ * If mseccfg.MML Bit is not set, do pmp priv check
+ * This will always apply to regular PMP.
+ */
+ *allowed_privs =3D PMP_READ | PMP_WRITE | PMP_EXEC;
+ if ((mode !=3D PRV_M) || pmp_is_locked(env, i)) {
+ *allowed_privs &=3D env->pmp_state.pmp[i].cfg_reg;
+ }
+ } else {
+ /*
+ * If mseccfg.MML Bit set, do the enhanced pmp priv check
+ */
+ if (mode =3D=3D PRV_M) {
+ switch (epmp_operation) {
+ case 0:
+ case 1:
+ case 4:
+ case 5:
+ case 6:
+ case 7:
+ case 8:
+ *allowed_privs =3D 0;
+ break;
+ case 2:
+ case 3:
+ case 14:
+ *allowed_privs =3D PMP_READ | PMP_WRITE;
+ break;
+ case 9:
+ case 10:
+ *allowed_privs =3D PMP_EXEC;
+ break;
+ case 11:
+ case 13:
+ *allowed_privs =3D PMP_READ | PMP_EXEC;
+ break;
+ case 12:
+ case 15:
+ *allowed_privs =3D PMP_READ;
+ break;
+ }
+ } else {
+ switch (epmp_operation) {
+ case 0:
+ case 8:
+ case 9:
+ case 12:
+ case 13:
+ case 14:
+ *allowed_privs =3D 0;
+ break;
+ case 1:
+ case 10:
+ case 11:
+ *allowed_privs =3D PMP_EXEC;
+ break;
+ case 2:
+ case 4:
+ case 15:
+ *allowed_privs =3D PMP_READ;
+ break;
+ case 3:
+ case 6:
+ *allowed_privs =3D PMP_READ | PMP_WRITE;
+ break;
+ case 5:
+ *allowed_privs =3D PMP_READ | PMP_EXEC;
+ break;
+ case 7:
+ *allowed_privs =3D PMP_READ | PMP_WRITE | PMP_EXEC;
+ break;
+ }
+ }
}
=20
ret =3D ((privs & *allowed_privs) =3D=3D privs);
--=20
2.31.1