From nobody Mon Feb 9 07:55:15 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1596891989; cv=none; d=zohomail.com; s=zohoarc; b=BXnp5GVW6Ym14ckP7Skq1DI+y+mkhv0Cx0EIfOFZ4FFtP0HOgUQz/WvC75eaTpsTgocLDBTfahli4NG2xV1PPUpBfy60Xamgu4bmWyVVBlyv7XngWu8ji57xIjsV2h35f0SlrSU4HgztZHwYXo7qrm1wkI4TMLqiGkml6tVszAw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596891989; 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=IqYdAZooT8lM28ETEjL5hU1NnnBa1o7OjjnUhzOuR3Y=; b=MpbrRzSUHM2m1r++sT9u2vz4F9lvVIuxGr3XBZH3hlxg4U0/ZiQkuN4A2fvg5m0sr/yncgnr5gpTf+yoswsTaaU2ihJGvnjyxs35+A7O3EemTa5AwxUAHTca5toRTeipTIabt69chW+fLz96QnDG0CI7BMvEVJ3F6HgUnvIqHgM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1596891989495539.8647532784656; Sat, 8 Aug 2020 06:06:29 -0700 (PDT) Received: from localhost ([::1]:45856 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k4OYN-0005X1-QU for importer@patchew.org; Sat, 08 Aug 2020 09:06:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54038) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k4KsS-0000jj-5G; Sat, 08 Aug 2020 05:10:56 -0400 Received: from mail-pj1-x1043.google.com ([2607:f8b0:4864:20::1043]:55604) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k4KsQ-0000bM-4Y; Sat, 08 Aug 2020 05:10:55 -0400 Received: by mail-pj1-x1043.google.com with SMTP id 2so2165283pjx.5; Sat, 08 Aug 2020 02:10:53 -0700 (PDT) Received: from localhost.localdomain (183178047145.ctinets.com. [183.178.47.145]) by smtp.gmail.com with ESMTPSA id i11sm13312700pjv.30.2020.08.08.02.10.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 08 Aug 2020 02:10:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=IqYdAZooT8lM28ETEjL5hU1NnnBa1o7OjjnUhzOuR3Y=; b=FZ89hNCg5E4Um6oxdgXwESusEbjxji5pxx1l1cIebwGYZS8XI7kIcDKWKrbkoNaHql ZYkpR8vbUNY3pvxzO/y2U+Q2iIpVv/JqSozWx5XFXCySxr6Z/VTGZm6Kp7UZt55t4S78 rQEPwgAJ8/ZgyYz5sRdsQIxtu3jEyssZL71x7Wv4fxAfEwt1wDd4X/OP011jOhuE1DBn yuj86esER2+h0B4jCeruMloxJ+GvBflxm146YuV+RRN4BqLyGNr+nxtx4pwX7cs0jiyD 2TW0URTDhipfH4qXlkTb9tVWfqfNJFlcHi21dvcV9yvm3BaPYnMOe157QXwFt+CV7s6M dZzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=IqYdAZooT8lM28ETEjL5hU1NnnBa1o7OjjnUhzOuR3Y=; b=HCIAWka3MyMY1e12fm8iR1YcC9VR6/V9cBPMN4nrxaJ2ilMTj9RNwz7u81aUKHZV6S ggq2InOIVxHyq48qhtyZxjLddxKcn4yF/256bfTMKZ6jSyWLyihKeufV7xAIEgySb72t SBF03mGk0/WgolVec6mYIrl47T96FUJJF5bakk3mUEsyJw2jAnPYbuL6mUbaNXWDD1dW wX7d/H66W7YhxlQTfclloCeVBvqSVdaZgN0nsQurnuZitmZcL8t4BF+1arm9dWiDIyBo MsQPScWhjXH606VndF/L6HkDitTJeZogLGFKLzarMrKmQuSQxwAJ4FUoB0YBlN2lpPay gIUQ== X-Gm-Message-State: AOAM532tHrUKmyxhoHMSiETf7rJTpqinMv7esVz+ZeytBoXMI0WfyuXB SVOAxj5c4aVYgqXRoBk0eztmYOviEbcZKg== X-Google-Smtp-Source: ABdhPJx43Hf8Nd0dXu/jhposdQ03b7fvkBnCiJS3tn4w22VYioWDlEoXQmUlkkPP8jetJcnJ6spr/g== X-Received: by 2002:a17:90a:8d0b:: with SMTP id c11mr17922923pjo.196.1596877851775; Sat, 08 Aug 2020 02:10:51 -0700 (PDT) From: Hongzheng-Li X-Google-Original-From: Hongzheng-Li To: qemu-riscv@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH 2/4] Implementation of enhanced PMP(ePMP) support Date: Sat, 8 Aug 2020 17:09:48 +0800 Message-Id: <20200808090950.13-3-Ethan.Lee.QNL@gmail.com> X-Mailer: git-send-email 2.24.1.windows.2 In-Reply-To: <20200808090950.13-1-Ethan.Lee.QNL@gmail.com> References: <20200808090950.13-1-Ethan.Lee.QNL@gmail.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=2607:f8b0:4864:20::1043; envelope-from=ethan.lee.qnl@gmail.com; helo=mail-pj1-x1043.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Sat, 08 Aug 2020 08:59:47 -0400 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Hou Weiying , sagark@eecs.berkeley.edu, kbastian@mail.uni-paderborn.de, Hongzheng-Li , Alistair.Francis@wdc.com, palmer@dabbelt.com, Myriad-Dreamin Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Hou Weiying The ePMP can be found in: https://docs.google.com/document/d/1Mh_aiHYxemL0umN3GTTw8vsbmzHZ_nxZXgjgOUz= bvc8/edit#heading=3Dh.9wsr1lnxtwe2 Signed-off-by: Hongzheng-Li Signed-off-by: Hou Weiying Signed-off-by: Myriad-Dreamin --- target/riscv/pmp.c | 134 ++++++++++++++++++++++++++++++++++---- target/riscv/pmp.h | 12 ++++ target/riscv/trace-events | 4 ++ 3 files changed, 138 insertions(+), 12 deletions(-) diff --git a/target/riscv/pmp.c b/target/riscv/pmp.c index 0e6b640fbd..8df389cecd 100644 --- a/target/riscv/pmp.c +++ b/target/riscv/pmp.c @@ -34,6 +34,26 @@ static void pmp_write_cfg(CPURISCVState *env, uint32_t a= ddr_index, static uint8_t pmp_read_cfg(CPURISCVState *env, uint32_t addr_index); static void pmp_update_rule(CPURISCVState *env, uint32_t pmp_index); =20 +static char mode_to_char(int mode) +{ + char ret =3D 0; + switch (mode) { + case PRV_U: + ret =3D 'u'; + break; + case PRV_S: + ret =3D 's'; + break; + case PRV_H: + ret =3D 'h'; + break; + case PRV_M: + ret =3D 'm'; + break; + } + return ret; +} + /* * Accessor method to extract address matching type 'a field' from cfg reg */ @@ -99,7 +119,28 @@ 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)) { + /* + * mseccfg.RLB is set + */ + if (MSECCFG_RLB_ISSET(env) || + /* + * mseccfg.MML is set + */ + (MSECCFG_MML_ISSET(env) && + /* + * m model and not adding X bit + */ + (((val & PMP_LOCK) !=3D 0 && (val & PMP_EXEC) !=3D PMP_EXEC) || + /* + * shared region and not adding X bit + */ + ((val & PMP_LOCK) !=3D PMP_LOCK && + (val & 0x7) !=3D (PMP_WRITE | PMP_EXEC)))) || + /* + * mseccfg.MML is not set + */ + (!MSECCFG_MML_ISSET(env) && !pmp_is_locked(env, pmp_index)) + ){ env->pmp_state.pmp[pmp_index].cfg_reg =3D val; pmp_update_rule(env, pmp_index); } else { @@ -230,6 +271,18 @@ bool pmp_hart_has_privs(CPURISCVState *env, target_ulo= ng addr, =20 /* Short cut if no rules */ if (0 =3D=3D pmp_get_num_rules(env)) { + if (MSECCFG_MMWP_ISSET(env)) { + qemu_log_mask(LOG_GUEST_ERROR, + "pmp violation - %c mode access denied\n", + mode_to_char(mode)); + return false; + } + if (MSECCFG_MML_ISSET(env) && (mode !=3D PRV_M || (privs & PMP_EXE= C))) { + qemu_log_mask(LOG_GUEST_ERROR, + "pmp violation - %c mode access denied\n", + mode_to_char(mode)); + return false; + } return true; } =20 @@ -261,16 +314,65 @@ bool pmp_hart_has_privs(CPURISCVState *env, target_ul= ong addr, const uint8_t a_field =3D 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 - */ 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 + */ + 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 (env->pmp_state.pmp[i].cfg_reg & PMP_LOCK) { + /* + * Shared Region + */ + if ((env->pmp_state.pmp[i].cfg_reg & + (PMP_READ | PMP_WRITE)) =3D=3D PMP_WRITE) { + allowed_privs =3D PMP_EXEC | ((mode =3D=3D PRV_M && + (env->pmp_state.pmp[i].cfg_reg & PMP_EXEC)) ? + PMP_READ : 0); + } else { + allowed_privs =3D env->pmp_state.pmp[i].cfg_reg & + (PMP_READ | PMP_WRITE | PMP_EXEC); + + if (mode !=3D PRV_M && allowed_privs) { + qemu_log_mask(LOG_GUEST_ERROR, + "pmp violation - %c mode access denied\n", + mode_to_char(mode)); + ret =3D 0; + break; + } + } + } else { + /* + * Shared Region + */ + if ((env->pmp_state.pmp[i].cfg_reg & + (PMP_READ | PMP_WRITE)) =3D=3D PMP_WRITE) { + allowed_privs =3D PMP_READ | ((mode =3D=3D PRV_M || + (env->pmp_state.pmp[i].cfg_reg & PMP_EXEC)) ? + PMP_WRITE : 0); + } else { + allowed_privs =3D env->pmp_state.pmp[i].cfg_reg & + (PMP_READ | PMP_WRITE | PMP_EXEC); + if (mode =3D=3D PRV_M && allowed_privs) { + qemu_log_mask(LOG_GUEST_ERROR, + "pmp violation - m mode access denied\= n"); + ret =3D 0; + break; + } + } + } } - if ((privs & allowed_privs) =3D=3D privs) { ret =3D 1; break; @@ -284,15 +386,23 @@ bool pmp_hart_has_privs(CPURISCVState *env, target_ul= ong addr, /* No rule matched */ if (ret =3D=3D -1) { if (mode =3D=3D PRV_M) { - ret =3D 1; /* Privileged spec v1.10 states if no PMP entry mat= ches an - * M-Mode access, the access succeeds */ + ret =3D !MSECCFG_MMWP_ISSET(env); /* PMP Enhancements */ + if (MSECCFG_MML_ISSET(env) && (privs & PMP_EXEC)) { + ret =3D 0; + } } else { ret =3D 0; /* Other modes are not allowed to succeed if they d= on't * match a rule, but there are rules. We've checked = for * no rule earlier in this function. */ } } - + if (ret) { + trace_pmp_hart_has_privs_pass_match( + env->mhartid, addr, size, privs, mode); + } else { + trace_pmp_hart_has_privs_violation( + env->mhartid, addr, size, privs, mode); + } return ret =3D=3D 1 ? true : false; } =20 diff --git a/target/riscv/pmp.h b/target/riscv/pmp.h index 8e19793132..7db2069204 100644 --- a/target/riscv/pmp.h +++ b/target/riscv/pmp.h @@ -36,6 +36,12 @@ typedef enum { PMP_AMATCH_NAPOT /* Naturally aligned power-of-two region */ } pmp_am_t; =20 +typedef enum { + MSECCFG_MML =3D 1 << 0, + MSECCFG_MMWP =3D 1 << 1, + MSECCFG_RLB =3D 1 << 2 +} mseccfg_field_t; + typedef struct { target_ulong addr_reg; uint8_t cfg_reg; @@ -58,7 +64,13 @@ target_ulong pmpcfg_csr_read(CPURISCVState *env, uint32_= t reg_index); void pmpaddr_csr_write(CPURISCVState *env, uint32_t addr_index, target_ulong val); target_ulong pmpaddr_csr_read(CPURISCVState *env, uint32_t addr_index); +void mseccfg_csr_write(CPURISCVState *env, target_ulong val); +target_ulong mseccfg_csr_read(CPURISCVState *env); bool pmp_hart_has_privs(CPURISCVState *env, target_ulong addr, target_ulong size, pmp_priv_t priv, target_ulong mode); =20 +#define MSECCFG_MML_ISSET(env) get_field(env->mseccfg, MSECCFG_MML) +#define MSECCFG_MMWP_ISSET(env) get_field(env->mseccfg, MSECCFG_MMWP) +#define MSECCFG_RLB_ISSET(env) get_field(env->mseccfg, MSECCFG_RLB) + #endif diff --git a/target/riscv/trace-events b/target/riscv/trace-events index 4b6c652ae9..4f877f90f7 100644 --- a/target/riscv/trace-events +++ b/target/riscv/trace-events @@ -6,3 +6,7 @@ pmpcfg_csr_read(uint64_t mhartid, uint32_t reg_index, uint6= 4_t val) "hart %" PRI pmpcfg_csr_write(uint64_t mhartid, uint32_t reg_index, uint64_t val) "hart= %" PRIu64 ": write reg%" PRIu32", val: 0x%" PRIx64 pmpaddr_csr_read(uint64_t mhartid, uint32_t addr_index, uint64_t val) "har= t %" PRIu64 ": read addr%" PRIu32", val: 0x%" PRIx64 pmpaddr_csr_write(uint64_t mhartid, uint32_t addr_index, uint64_t val) "ha= rt %" PRIu64 ": write addr%" PRIu32", val: 0x%" PRIx64 +mseccfg_csr_read(uint64_t mhartid, uint64_t val) "hart %" PRIu64 ": read m= seccfg, val: 0x%" PRIx64 +mseccfg_csr_write(uint64_t mhartid, uint64_t val) "hart %" PRIu64 ": write= mseccfg, val: 0x%" PRIx64 +pmp_hart_has_privs_pass_match(uint64_t mhartid, uint64_t addr, uint64_t si= ze, uint64_t privs, uint64_t mode) "hart %"PRId64 "pass PMP 0 match addr:%"= PRIu64" size:%"PRIu64 "privs: %"PRIu64 "mode: %"PRIu64 +pmp_hart_has_privs_violation(uint64_t mhartid, uint64_t addr, uint64_t siz= e, uint64_t privs, uint64_t mode) "hart %"PRId64 "pass PMP 0 match addr:%"P= RIu64" size:%"PRIu64 "privs: %"PRIu64 "mode: %"PRIu64 --=20 2.20.1