From patchwork Thu Apr 18 13:54:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?Q2zDqW1lbnQgTMOpZ2Vy?= X-Patchwork-Id: 1925025 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=o9aQWyjr; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.a=rsa-sha256 header.s=20230601 header.b=rVMP8xR7; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=opensbi-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=patchwork.ozlabs.org) Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VKzn33Fjlz1yPv for ; Thu, 18 Apr 2024 23:55:19 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=lCMZGP/fwTt0hG5can2QHUz6Rt0l9hpxiTb14mh/7JI=; b=o9aQWyjrBu1OAJ EOIGqrda/C+eo44R66DjLre/7t0oYpa8k2xhmrWAFk0d3WCtq7WyAhZlPrzbhu348qhh/48DjyRnj AUVyxQaB45JIapnpLwyofn5eqlXymE6zGBRDVruacyw9mkuE0easFC/rgbysNdxCwdpAKWMwCvc8n ix6nnxGQPIpDNl56Zw/yn+VW/PLcF0rjpu1nVzWBOyW109ESMxpX6GqAVJ5wgHl4Rux491/yeaKJz e6gw8zHlUO8YBnf1Rkbo2/8nOwTIFYEMcmXCYorWmp8EV8LW7B2o1+gHJvrqCE04zAGRuFptUK/Re 2LjQWZWX0X1/BkqXMIUg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rxSEH-00000002SQd-3Rje; Thu, 18 Apr 2024 13:55:09 +0000 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rxSED-00000002SNF-3W5R for opensbi@lists.infradead.org; Thu, 18 Apr 2024 13:55:07 +0000 Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-349a35aba9dso159927f8f.3 for ; Thu, 18 Apr 2024 06:55:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1713448503; x=1714053303; darn=lists.infradead.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=lSeLUx8OobGb6CO/YYKNZsPIzJfveQ9cDBVkoluaALY=; b=rVMP8xR7EBtkIfr1CiUTyWMwDb0CVZD7aARk1ViSmKEo2hRTp5SCg1fdDKs/gB9i17 HYofAmSFTdVCt8ID6dypsM9u7st2dKt3A0pp0V9YC8E6sleeefxoZ26fUP9JdcGGLxMu HF/gwKS0xzn4uxYjmOim667SsXTw4aDpJ51VofMDZBd4GONu4BhJ0kwEEAyCyC2QTzLh z9pSOdqIrIahOCGi9dWRAFQgGE5t6o/sEFcnqAuStFIZSox2TiGoU8B2m350PvD8+CAZ 3iYP2yMkRO8JHaVhpTifmGeQVnfhKXVpvvDDPGF5SQVadZBEk1nfuR52vZmdvs5mNGos N28w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713448503; x=1714053303; 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=lSeLUx8OobGb6CO/YYKNZsPIzJfveQ9cDBVkoluaALY=; b=UwJ3o7NSzJJvf229pGkIYoq3Q1LKR7dbBQ/TAgW8dm8Q7FNI5Kmvhcjva9q6IHOrkX 0Wj7proSs/4+FgEA6EyXzoBREzDTqWww+jKFQYpNt3ciUhWJV35ij6h5Ih2B9gyRId5C GHNzUizgk84JaDK4GToxzs9bc8bXrfPX7z78fkWM5gG6ebuTME/UUJPFVUPjMfshs1mJ gbaFV0p8DAcpNox7djsUWoJncMQWYUcSR5UadlrQToozjP6P7Hdo6GAXX69cu5UXkG9u cNvm3oo37g3v9M3gk2YoRiFMMvNpuUG6RAs9J4YBImM2kjUHBflkUCKYjzahoqXbAwtu GbJg== X-Gm-Message-State: AOJu0Yz3khiwX+CVuLrodjNSeE2b6D/nZr8XS6od/O0ytQdXCgqf7aDt vHes6O+wdTCZ0AflGid6KSx8uHWr2NemOwrRHUOgBw7KSuNSgIr2ppfUN6eXa2LoP7GylbLD2qr mVXY= X-Google-Smtp-Source: AGHT+IH5wmGyEtJFppTqTYiNSTP042srijuDD0UHULQrAonlugkCVpXkAILs0t4+TILRRMfhQmqjvQ== X-Received: by 2002:a05:6000:d04:b0:343:7228:f715 with SMTP id dt4-20020a0560000d0400b003437228f715mr1719833wrb.0.1713448502951; Thu, 18 Apr 2024 06:55:02 -0700 (PDT) Received: from carbon-x1.. ([2a01:e0a:999:a3a0:7b64:4d1d:16d8:e38b]) by smtp.gmail.com with ESMTPSA id n17-20020adfe791000000b00349be95b5cesm1875409wrm.101.2024.04.18.06.55.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Apr 2024 06:55:02 -0700 (PDT) From: =?utf-8?b?Q2zDqW1lbnQgTMOpZ2Vy?= To: opensbi@lists.infradead.org, Atish Patra , Anup Patel Cc: =?utf-8?b?Q2zDqW1lbnQgTMOpZ2Vy?= , Ved Shanbhogue Subject: [RFC PATCH 1/4] lib: sbi: factorize previous virtualization mode read from regs Date: Thu, 18 Apr 2024 15:54:17 +0200 Message-ID: <20240418135421.1452709-2-cleger@rivosinc.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240418135421.1452709-1-cleger@rivosinc.com> References: <20240418135421.1452709-1-cleger@rivosinc.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240418_065505_913233_AE688629 X-CRM114-Status: UNSURE ( 9.87 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 0.0 (/) X-Spam-Report: =?unknown-8bit?q?Spam_detection_software=2C_running_on_the_sy?= =?unknown-8bit?q?stem_=22bombadil=2Einfradead=2Eorg=22=2C?= =?unknown-8bit?q?_has_NOT_identified_this_incoming_email_as_spam=2E__The_ori?= =?unknown-8bit?q?ginal?= =?unknown-8bit?q?_message_has_been_attached_to_this_so_you_can_view_it_or_la?= =?unknown-8bit?q?bel?= =?unknown-8bit?q?_similar_future_email=2E__If_you_have_any_questions=2C_see?= =?unknown-8bit?q?_the_administrator_of_that_system_for_details=2E?= =?unknown-8bit?q?_?= =?unknown-8bit?q?_Content_preview=3A__The_same_pattern_is_used_at_multiple_p?= =?unknown-8bit?q?laces_to_verify_in_which?= =?unknown-8bit?q?_mode_the_exception_was_actually_taken=2E_Factorize_it=2E_S?= =?unknown-8bit?q?igned-off-by=3A_Cl=C3=A9ment?= =?unknown-8bit?q?_L=C3=A9ger_=3Ccleger=40rivosinc=2Ecom=3E_---_include/sbi/s?= =?unknown-8bit?q?bi=5Ftrap=2Eh_=7C_9_+++++++++_lib/sbi/sbi=5Femulate=5Fcsr?= =?unknown-8bit?q?=2Ec?= =?unknown-8bit?q?_=7C_12_++_lib/sbi/sbi=5Ftrap=2Ec_=7C_6_+-----_3_files_chan?= =?unknown-8bit?q?ged=2C_12_insertions=28+_=5B=2E=2E=2E=5D?= =?unknown-8bit?q?_?= =?unknown-8bit?q?_?= =?unknown-8bit?q?_Content_analysis_details=3A___=280=2E0_points=2C_5=2E0_req?= =?unknown-8bit?q?uired=29?= =?unknown-8bit?q?_?= =?unknown-8bit?q?_pts_rule_name______________description?= =?unknown-8bit?q?_----_----------------------_------------------------------?= =?unknown-8bit?q?--------------------?= =?unknown-8bit?q?_-0=2E0_RCVD=5FIN=5FDNSWL=5FNONE_____RBL=3A_Sender_listed_a?= =?unknown-8bit?q?t_https=3A//www=2Ednswl=2Eorg/=2C_no?= =?unknown-8bit?q?_trust?= =?unknown-8bit?b?IFsyYTAwOjE0NTA6NDg2NDoyMDowOjA6MDo0MmIgbGlzdGVkIGluXQ==?= =?unknown-8bit?b?IFtsaXN0LmRuc3dsLm9yZ10=?= =?unknown-8bit?q?_0=2E0_SPF=5FHELO=5FNONE__________SPF=3A_HELO_does_not_publ?= =?unknown-8bit?q?ish_an_SPF_Record?= =?unknown-8bit?q?_-0=2E0_SPF=5FPASS_______________SPF=3A_sender_matches_SPF_?= =?unknown-8bit?q?record?= =?unknown-8bit?q?_-0=2E1_DKIM=5FVALID_____________Message_has_at_least_one_v?= =?unknown-8bit?q?alid_DKIM_or_DK_signature?= =?unknown-8bit?q?_0=2E1_DKIM=5FSIGNED____________Message_has_a_DKIM_or_DK_si?= =?unknown-8bit?q?gnature=2C_not_necessarily_valid?= X-BeenThere: opensbi@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "opensbi" Errors-To: opensbi-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org The same pattern is used at multiple places to verify in which mode the exception was actually taken. Factorize it. Signed-off-by: Clément Léger --- include/sbi/sbi_trap.h | 9 +++++++++ lib/sbi/sbi_emulate_csr.c | 12 ++---------- lib/sbi/sbi_trap.c | 6 +----- 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/include/sbi/sbi_trap.h b/include/sbi/sbi_trap.h index f7c170e..b0c47ce 100644 --- a/include/sbi/sbi_trap.h +++ b/include/sbi/sbi_trap.h @@ -236,6 +236,15 @@ static inline unsigned long sbi_regs_gva(const struct sbi_trap_regs *regs) #endif } +static inline bool sbi_regs_from_virt(const struct sbi_trap_regs *regs) +{ +#if __riscv_xlen == 32 + return (regs->mstatusH & MSTATUSH_MPV) ? true : false; +#else + return (regs->mstatus & MSTATUS_MPV) ? true : false; +#endif +} + int sbi_trap_redirect(struct sbi_trap_regs *regs, const struct sbi_trap_info *trap); diff --git a/lib/sbi/sbi_emulate_csr.c b/lib/sbi/sbi_emulate_csr.c index 5f3b111..4036946 100644 --- a/lib/sbi/sbi_emulate_csr.c +++ b/lib/sbi/sbi_emulate_csr.c @@ -48,11 +48,7 @@ int sbi_emulate_csr_read(int csr_num, struct sbi_trap_regs *regs, int ret = 0; struct sbi_scratch *scratch = sbi_scratch_thishart_ptr(); ulong prev_mode = (regs->mstatus & MSTATUS_MPP) >> MSTATUS_MPP_SHIFT; -#if __riscv_xlen == 32 - bool virt = (regs->mstatusH & MSTATUSH_MPV) ? true : false; -#else - bool virt = (regs->mstatus & MSTATUS_MPV) ? true : false; -#endif + bool virt = sbi_regs_from_virt(regs); switch (csr_num) { case CSR_HTIMEDELTA: @@ -163,11 +159,7 @@ int sbi_emulate_csr_write(int csr_num, struct sbi_trap_regs *regs, { int ret = 0; ulong prev_mode = (regs->mstatus & MSTATUS_MPP) >> MSTATUS_MPP_SHIFT; -#if __riscv_xlen == 32 - bool virt = (regs->mstatusH & MSTATUSH_MPV) ? true : false; -#else - bool virt = (regs->mstatus & MSTATUS_MPV) ? true : false; -#endif + bool virt = sbi_regs_from_virt(regs); switch (csr_num) { case CSR_HTIMEDELTA: diff --git a/lib/sbi/sbi_trap.c b/lib/sbi/sbi_trap.c index b4f3a17..8bd2183 100644 --- a/lib/sbi/sbi_trap.c +++ b/lib/sbi/sbi_trap.c @@ -103,11 +103,7 @@ int sbi_trap_redirect(struct sbi_trap_regs *regs, const struct sbi_trap_info *trap) { ulong hstatus, vsstatus, prev_mode; -#if __riscv_xlen == 32 - bool prev_virt = (regs->mstatusH & MSTATUSH_MPV) ? true : false; -#else - bool prev_virt = (regs->mstatus & MSTATUS_MPV) ? true : false; -#endif + bool prev_virt = sbi_regs_from_virt(regs); /* By default, we redirect to HS-mode */ bool next_virt = false;