From patchwork Mon Mar 17 17:06: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: 14019758 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 07970C35FFB for ; Mon, 17 Mar 2025 17:13:16 +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=VvGm01aLnT8L4b TpZLV6INmFNdDFP04WqPDV7IYp0oULrhDhUmlPXHgMt6I/oNBwGOA06T53Ko5exZLeKuwn+4uVy9U jGkNKL8dIBgitKEgsdv4dZ9epz5sl6cWacUOM13PvFvkES0XrYaFdDXbDriHgn8TsUuX+4YIblkpv p1gdQXs1r8Pvk+xaN/9ghTUYrxttCy6RjezKT6XATFj0YXKq3o9p2bUoS/KYbyegA1Z70atXgB3Qk C7ddLsc3tRmuDi19g2N3kGFrCRdqwHxNWfL4gX2xGN8AvqGHllcs5JErRHc3CuojAlcwkuSlfESJB tRXHa6zIMYUrRknQiOYA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tuE1X-00000003V9E-1bLy; Mon, 17 Mar 2025 17:13:11 +0000 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tuDwp-00000003TVQ-2h4d for linux-riscv@lists.infradead.org; Mon, 17 Mar 2025 17:08:20 +0000 Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-399676b7c41so700970f8f.3 for ; Mon, 17 Mar 2025 10:08:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1742231298; x=1742836098; 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=SwwEtTnbCbMEGIJPQwBjpMhLWv0Hwjkh0lMoESGqXETRUUx3c77nNq+Cpl//OFdltj NzC1QpUbXNlmexPK6ps+04iJaN2twYUO9VF2PfbC7H1QWWG7Q5zDCCGCp84s1cqm3CH8 TDsOc3cnuBrXZIMjpfvLseTPI//b3VI9ZlKBz/eEapEef7Ww1TRq60H9Kbgv38VF8Khl Z6zTVpcVpzF/xk2Q3YPkN/Qld+ZijLWa976999GIDfWlK5PvCfwdfKn0V7vPivp6Qw1X THn5FfNkVAPHPXjPjaW1fknfBpPtaqqcQrYozred0lnBU+vQDZswsOj2TOC0YHwJrfCg IN3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742231298; x=1742836098; 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=wgjGZPUy1Sjs5C0lzPL+pBZzFOPp7IrLtA727n1iMI5jsbQny3k8sOJ8Ewe26bE2BA Jk0d2tRE0KMtxrxvLR6yKw5hvvtUHMcZET6SGSgf+rTdqfwlRIm/ylh6acmhWlR98iXN nXsZOGWJoKHmDtFjFkibmwXmVZapbou3C7T1AURehYdhoQ6cUQ4r4nx6vXNSsE3NY8tg CVZOqaM4fF5A3Kx1XN0A315DOWkRev+J6qGwJWoRSOoWEosArpCT1JuONNUoRH/5LJ2o UAWKb1JYzD6NyNYhO5DJ/z/Cj/YVGpkRasTEN8tNSKmCTNd6T0YZqo+6uYhQ/8pRGcu5 auFw== X-Forwarded-Encrypted: i=1; AJvYcCXc23w3vENmrHtm2yZL01uBJxjHeYVFoi7cvOFJChHnHa2UvBL9KRMLhkFDBUZRhRcvHb33WtV6b+gDvQ==@lists.infradead.org X-Gm-Message-State: AOJu0YyeM8lBqMQB6QShZfQN2fxC8tJdyedwRlVzEvts/Hd7nICvpiaQ H4EJ/cqLe8Uq9lHCnAZh6M5aRA25npI1hrxSfl+jKjJqKAmusN6H4sySo3iIrQ0= X-Gm-Gg: ASbGncsjOhXmaXnshAUGB/y9CCzw7lukBw4BkDaGwdW6tjvIDJIYGN2F91snpCUOil+ QDkcuwJL5QirDcRUqLS3gsowp4gWsx/+T/c1rNatktxEHAewEYpyoIiUWez1jYifCG4kHFr8SiD KJ52VnsvgMLBaNo2HYXD5DwqITXyfP54Cai9k/118ztkKo97BO0ovEegw8JiwAQAY0tVds73Lpk Wu3tNEBPYnpoKApPdWUxJG+BI6Y8yvdXSi5lZtNwG9viAC1BDlMMAfprDPDmzW25oZrMyClaYZ3 Q8yfyCiH/SkI20ZhXI3VAW3J71KXDtIYkElHcCIQPYC6+A== X-Google-Smtp-Source: AGHT+IGA2Rdk6jf2tb4X7esu4pon4fXkJaTK84F8Y0BwgA61Xp90vVw97TtNBjS5pxzMobEPki6sdQ== X-Received: by 2002:a05:6000:1f8e:b0:391:253b:4046 with SMTP id ffacd0b85a97d-3971d51f3f8mr14939898f8f.16.1742231298143; Mon, 17 Mar 2025 10:08:18 -0700 (PDT) Received: from carbon-x1.. ([2a01:e0a:e17:9700:16d2:7456:6634:9626]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43d23cddb2asm96014505e9.39.2025.03.17.10.08.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Mar 2025 10:08:17 -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 , Andrew Jones Subject: [PATCH v4 10/18] riscv: misaligned: factorize trap handling Date: Mon, 17 Mar 2025 18:06:16 +0100 Message-ID: <20250317170625.1142870-11-cleger@rivosinc.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250317170625.1142870-1-cleger@rivosinc.com> References: <20250317170625.1142870-1-cleger@rivosinc.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250317_100819_682323_98B5F89A X-CRM114-Status: UNSURE ( 9.87 ) X-CRM114-Notice: Please train this message. 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,