From patchwork Thu Aug 29 23:34:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 13784025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 24270CA0ECC for ; Thu, 29 Aug 2024 23:37:15 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sjof0-0002wG-3m; Thu, 29 Aug 2024 19:34:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sjoex-0002pK-Vo for qemu-devel@nongnu.org; Thu, 29 Aug 2024 19:34:36 -0400 Received: from mail-pj1-x1035.google.com ([2607:f8b0:4864:20::1035]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sjoeu-00038F-Kq for qemu-devel@nongnu.org; Thu, 29 Aug 2024 19:34:35 -0400 Received: by mail-pj1-x1035.google.com with SMTP id 98e67ed59e1d1-2d3ce556df9so958731a91.0 for ; Thu, 29 Aug 2024 16:34:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1724974471; x=1725579271; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=7pauwM0+hP6l/++RwE00z55KwBTr5ElLKZY19bWfmTk=; b=cqovEt4FHMZS+GM7v7rkXRJBXYIa9x5ztmCUBSeCiVwoyW6xvt8p2eBR0YKnU+noNF 0uc41VE9JGztcJQONHjXK5jDFkIopuOLijcnoxRD0CspzptWgwXX2slc5OlnsWcbeFTM RxjdCO1SkYop6v6JHPpj6XUnGx7QkUkaV/rkFu92iYn7bnrO7w9eHDJpK2wg1ZxGOtjd TzErk1Q0/DJ6WmjqE8evOLer6SYzpaoQmVyRpDLWrp0IMG3ilUG8/TALfwK3sg1JnnkQ nkBtyvn3x6PDqQOUSFZ6u5Fptr8DIaxDw1e83kdWXGFsdCJp/JmVXnqgCtm6bRsWI/bi v07g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724974471; x=1725579271; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7pauwM0+hP6l/++RwE00z55KwBTr5ElLKZY19bWfmTk=; b=h9XLnRBRUTYTh36DJ4Kp10ZdxZCZmZOIOj9Gif1Z40/viiEMF4VgpbAylU31xotZLo y8yGYypEO6zdk77B+sdi98vXvrenxFO5dfaQcmOgTPhqt09S3mObNIujhGmS+3qmMSUF iejcYjwgbFEBcmzejN84+tew5E3KtKfjONz9v40Knr7A2Jqj19G32vPSZXXGyx7m8kRh btnP/plPK+0JkMHRuD4a4Z3ZBxkrywgBw4+mrZfKaNB8v5zhWV5A5eyh8cLh9q/45BSf nTdh7oYa9oYmryETCDQk761T+AoDPOJUcAvvGHtLJNWasaHVNeR3W1hWbgm0QNjGvlMb EJOA== X-Forwarded-Encrypted: i=1; AJvYcCUIGb9VV44xRMJL3XL8j+Wx8dqVh6wMXirjuuYGIF1knaWEvAeb7ko7Or7moYnD+sbdl4Cgv05dcBrf@nongnu.org X-Gm-Message-State: AOJu0YzI31Q0R9h2RoEAK4cBUOEQaYn8c1y9MQJugWjCN7HOnWDLqtlR iMSmUoYTBW37KsWNSacz2tZb46xMy49r0V488fCHs+0BRjiewkKGwPZla0u6mpE= X-Google-Smtp-Source: AGHT+IELBniDkyLcmWQsB9toxZBF5yjLHx8ql6qQofX4qK9VHid+5bz4gsOBB4E4W9sTKBfYLbQhuw== X-Received: by 2002:a17:90a:2f04:b0:2c9:6514:39ff with SMTP id 98e67ed59e1d1-2d8563a03dbmr4814580a91.33.1724974470901; Thu, 29 Aug 2024 16:34:30 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2d85b13df55sm2331074a91.27.2024.08.29.16.34.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Aug 2024 16:34:30 -0700 (PDT) From: Deepak Gupta To: qemu-riscv@nongnu.org, qemu-devel@nongnu.org Cc: palmer@dabbelt.com, Alistair.Francis@wdc.com, bmeng.cn@gmail.com, liwei1518@gmail.com, dbarboza@ventanamicro.com, zhiwei_liu@linux.alibaba.com, jim.shu@sifive.com, andy.chiu@sifive.com, kito.cheng@sifive.com, Deepak Gupta , Richard Henderson , Alistair Francis Subject: [PATCH v12 01/20] target/riscv: expose *envcfg csr and priv to qemu-user as well Date: Thu, 29 Aug 2024 16:34:05 -0700 Message-ID: <20240829233425.1005029-2-debug@rivosinc.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240829233425.1005029-1-debug@rivosinc.com> References: <20240829233425.1005029-1-debug@rivosinc.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1035; envelope-from=debug@rivosinc.com; helo=mail-pj1-x1035.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Execution environment config CSR controlling user env and current privilege state shouldn't be limited to qemu-system only. *envcfg CSRs control enabling of features in next lesser mode. In some cases bits *envcfg CSR can be lit up by kernel as part of kernel policy or software (user app) can choose to opt-in by issuing a system call (e.g. prctl). In case of qemu-user, it should be no different because qemu is providing underlying execution environment facility and thus either should provide some default value in *envcfg CSRs or react to system calls (prctls) initiated from application. priv is set to PRV_U and menvcfg/senvcfg set to 0 for qemu-user on reest. `henvcfg` has been left for qemu-system only because it is not expected that someone will use qemu-user where application is expected to have hypervisor underneath which is controlling its execution environment. If such a need arises then `henvcfg` could be exposed as well. Relevant discussion: https://lore.kernel.org/all/CAKmqyKOTVWPFep2msTQVdUmJErkH+bqCcKEQ4hAnyDFPdWKe0Q@mail.gmail.com/ Signed-off-by: Deepak Gupta Suggested-by: Richard Henderson Reviewed-by: Alistair Francis Reviewed-by: Richard Henderson --- target/riscv/cpu.c | 5 +++++ target/riscv/cpu.h | 9 +++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index 33ef4eb795..c4ea1d4038 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -1011,7 +1011,12 @@ static void riscv_cpu_reset_hold(Object *obj, ResetType type) } pmp_unlock_entries(env); +#else + env->priv = PRV_U; + env->senvcfg = 0; + env->menvcfg = 0; #endif + env->xl = riscv_cpu_mxl(env); riscv_cpu_update_mask(env); cs->exception_index = RISCV_EXCP_NONE; diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index 87742047ce..270a2a031c 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -226,8 +226,12 @@ struct CPUArchState { uint32_t elf_flags; #endif -#ifndef CONFIG_USER_ONLY target_ulong priv; + /* CSRs for execution environment configuration */ + uint64_t menvcfg; + target_ulong senvcfg; + +#ifndef CONFIG_USER_ONLY /* This contains QEMU specific information about the virt state. */ bool virt_enabled; target_ulong geilen; @@ -429,12 +433,9 @@ struct CPUArchState { target_ulong upmmask; target_ulong upmbase; - /* CSRs for execution environment configuration */ - uint64_t menvcfg; uint64_t mstateen[SMSTATEEN_MAX_COUNT]; uint64_t hstateen[SMSTATEEN_MAX_COUNT]; uint64_t sstateen[SMSTATEEN_MAX_COUNT]; - target_ulong senvcfg; uint64_t henvcfg; #endif target_ulong cur_pmmask;