From patchwork Mon Mar 10 15:12:16 2025 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: 14010358 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 B8677C35FF3 for ; Mon, 10 Mar 2025 15:47:47 +0000 (UTC) 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=LWyN2HA9Zz/Oi6kWmpTIPB2zuBmS30gp46WURUnSLOs=; b=YiC6tXBbB+D9LZ JQxjoAvCv7glRf7zTjKYbW9uoV+hDkCDirEbs5Vyi0uoiw3N3PTwL8oaWCr3o+nytffbLR+ZIBATT dbm4yq3RLyABKnaS/SWKhEC7/U/MtF3Kr76JhFD1rQGJB+jMPAq+07XeO8N8HOh3i6pfDAYJkqy/o 4l9CeZJ0qCcsTD0CpzraacnxVrOqOHv2JJwmiJtmHMlFV8yq7BxHM5cAQm6A+bchMmtIFFLnxkliM r0yKR2cD0veJMDX5GmlgaceBKlSnQoO1YflvJYjpbUhF+Q/HAoh338t3jHaDizX+fr6qFLnMENcBp W2584j2iYPBzCEoziMIg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1trfLy-00000003G3a-2mtG; Mon, 10 Mar 2025 15:47:42 +0000 Received: from mail-pl1-x631.google.com ([2607:f8b0:4864:20::631]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1trepP-000000037rS-0yED for linux-riscv@lists.infradead.org; Mon, 10 Mar 2025 15:14:04 +0000 Received: by mail-pl1-x631.google.com with SMTP id d9443c01a7336-224100e9a5cso80779775ad.2 for ; Mon, 10 Mar 2025 08:14:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741619642; x=1742224442; 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=z9Vwlc46bZsQyt2QxW9m2l1M9vTOam7Mm6HyDDfLEZk=; b=sIWiSGeaaYiTiz5eDV/+CIVr+sOLZzK9JjZcSvi/YcTMkFZcW468BSAT8yYcxdWmZv MSA2xP5+YWsR0OUOb00/o3v8WUMrB3nWrkgJ69xSh6tD5ZmroLCrjgLQNFq+yKR7gsXW kN+sYbVNDQ+lvsOrYcyeZ7/FNlaXx0xXKZeSpXdW9mWqIeHc9Rw+n6Y5Icfar7W1YCX9 vK1qPpce4Fm2zVZxmDyqAC0m2/8z0lnKN4I3X8RQFvYazHMgwUNaOj3Dz5A8f3swBMoj 5VGLOHSVZ1XZpWVfRoIEWnRk5LeCtOOniLdAd7XYGpizTlgfAt6hkY8daTwpLSOPzvGw J+rg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741619642; x=1742224442; 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=z9Vwlc46bZsQyt2QxW9m2l1M9vTOam7Mm6HyDDfLEZk=; b=cUf9tj+Df+JbQlhPyjQvEu35S0DRyezD8I0tsHnKXQtFK53ZR410rRQhl2SnZ8bUwr c9VuI18ymmdCaKwLt6SP8D43MM/Jga4sjr8JEWEo5WgYUYRT4LndQD7zmNDZvpZCSo5g XkAG8gh0XRHrJ8ypyV6xLB493P/zUpYpSeR/VMzOwqrGQJ9UjKAeI540NiQtBN1WWuXj 0EAFR9c2bcic+xcNnsfbDI0b5G9K15lSi49mtdRCtV/ZJFYvb3VbcNXVj9353+M0YxPr /uD1bicq6nn0/SqZHlOK6yFNYFlvT6sRkJLIXZbD5jDafsNWebO2hhI/m5zo2iQoZ38V NYrg== X-Forwarded-Encrypted: i=1; AJvYcCXJh2YZWBFaZ8RUa/MwoJrtz0GIpfaiqGUcY+81vnHQpDdpxi0DjMLcnwpNix4legmoIVXxOhDCPrGsMw==@lists.infradead.org X-Gm-Message-State: AOJu0YzthBqgwkBn/XRrr+WE4koAcPHfr1Rn7rdWx612kkeXQMrDwmrX 9+iZQxxPrRxvi7zt06MT4Mz1g1pyqxg8lRqM4LtfIko6mfF2+j+YEjCLZjkLeLM= X-Gm-Gg: ASbGncv+kNruk1KXZaoaB/RduEbVe54rmXA+nup4g866h8IFHyC/kN9/F30MNtcTDqj tE+Dsuf5FnPKoh4uibW7jEBYsuUDObAk1xwpQqAmKjt4IoVAFzX+c4cOnzA43ZRwj48UstF/d8c pLD5aR9irTqXn8IZyAzG4/22H+09SjC/rwlflhaeJMqOuPl8zIR8m7xlKGva3QFbYoha7L35khA qTOJnUuK434uvWCHLjs6bQBihdzNfqkWpVRpVF4MzrsTv1/5TXqwrcRGF44GzlaT2Q1t79j3SMv C8I4kG8agWPXpMdRLZ/+WHlXCRZkf5uOv8rfsL67tuvI9A== X-Google-Smtp-Source: AGHT+IE/Wftdkd3zlZdL/ywUH78DLaDAVcrFF4WfEuA9Q1JYQZM9C8xhDZMPOQ9HkccIr+uMejIbbw== X-Received: by 2002:a17:903:298b:b0:21f:4649:fd49 with SMTP id d9443c01a7336-22428c221dbmr239345965ad.49.1741619642512; Mon, 10 Mar 2025 08:14:02 -0700 (PDT) Received: from carbon-x1.. ([2a01:e0a:e17:9700:16d2:7456:6634:9626]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-224109e99dfsm79230515ad.91.2025.03.10.08.13.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 08:14:02 -0700 (PDT) From: =?utf-8?b?Q2zDqW1lbnQgTMOpZ2Vy?= To: Paul Walmsley , Palmer Dabbelt , Anup Patel , Atish Patra , Shuah Khan , Jonathan Corbet , linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, kvm@vger.kernel.org, kvm-riscv@lists.infradead.org, linux-kselftest@vger.kernel.org Cc: =?utf-8?b?Q2zDqW1lbnQgTMOpZ2Vy?= , Samuel Holland Subject: [PATCH v3 09/17] riscv: misaligned: factorize trap handling Date: Mon, 10 Mar 2025 16:12:16 +0100 Message-ID: <20250310151229.2365992-10-cleger@rivosinc.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250310151229.2365992-1-cleger@rivosinc.com> References: <20250310151229.2365992-1-cleger@rivosinc.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250310_081403_262070_2B9397AA X-CRM114-Status: GOOD ( 10.54 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org misaligned accesses traps are not nmi and should be treated as normal one using irqentry_enter()/exit(). Since both load/store and user/kernel should use almost the same path and that we are going to add some code around that, factorize it. Signed-off-by: Clément Léger --- arch/riscv/kernel/traps.c | 49 ++++++++++++++++----------------------- 1 file changed, 20 insertions(+), 29 deletions(-) diff --git a/arch/riscv/kernel/traps.c b/arch/riscv/kernel/traps.c index 8ff8e8b36524..55d9f3450398 100644 --- a/arch/riscv/kernel/traps.c +++ b/arch/riscv/kernel/traps.c @@ -198,47 +198,38 @@ asmlinkage __visible __trap_section void do_trap_insn_illegal(struct pt_regs *re DO_ERROR_INFO(do_trap_load_fault, SIGSEGV, SEGV_ACCERR, "load access fault"); -asmlinkage __visible __trap_section void do_trap_load_misaligned(struct pt_regs *regs) +enum misaligned_access_type { + MISALIGNED_STORE, + MISALIGNED_LOAD, +}; + +static void do_trap_misaligned(struct pt_regs *regs, enum misaligned_access_type type) { - if (user_mode(regs)) { - irqentry_enter_from_user_mode(regs); + irqentry_state_t state = irqentry_enter(regs); + if (type == MISALIGNED_LOAD) { if (handle_misaligned_load(regs)) do_trap_error(regs, SIGBUS, BUS_ADRALN, regs->epc, - "Oops - load address misaligned"); - - irqentry_exit_to_user_mode(regs); + "Oops - load address misaligned"); } else { - irqentry_state_t state = irqentry_nmi_enter(regs); - - if (handle_misaligned_load(regs)) + if (handle_misaligned_store(regs)) do_trap_error(regs, SIGBUS, BUS_ADRALN, regs->epc, - "Oops - load address misaligned"); - - irqentry_nmi_exit(regs, state); + "Oops - store (or AMO) address misaligned"); } + + irqentry_exit(regs, state); } -asmlinkage __visible __trap_section void do_trap_store_misaligned(struct pt_regs *regs) +asmlinkage __visible __trap_section void do_trap_load_misaligned(struct pt_regs *regs) { - if (user_mode(regs)) { - irqentry_enter_from_user_mode(regs); - - if (handle_misaligned_store(regs)) - do_trap_error(regs, SIGBUS, BUS_ADRALN, regs->epc, - "Oops - store (or AMO) address misaligned"); - - irqentry_exit_to_user_mode(regs); - } else { - irqentry_state_t state = irqentry_nmi_enter(regs); - - if (handle_misaligned_store(regs)) - do_trap_error(regs, SIGBUS, BUS_ADRALN, regs->epc, - "Oops - store (or AMO) address misaligned"); + do_trap_misaligned(regs, MISALIGNED_LOAD); +} - irqentry_nmi_exit(regs, state); - } +asmlinkage __visible __trap_section void do_trap_store_misaligned(struct pt_regs *regs) +{ + do_trap_misaligned(regs, MISALIGNED_STORE); } + DO_ERROR_INFO(do_trap_store_fault, SIGSEGV, SEGV_ACCERR, "store (or AMO) access fault"); DO_ERROR_INFO(do_trap_ecall_s,