From patchwork Mon Feb 10 21:35:40 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: 13969372 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 EFD2CC021A6 for ; Mon, 10 Feb 2025 21:45:43 +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=jfasQ0+VIo02fe Lsr/Ub0CRc5BB8xMXsp0ffXMh1zDJKnBWyhc0Bjq8EmNVy40yrclIDXqLJMDmusestuiQWRdI+GvZ UOeJWP15X63mkYWzGQJQbgoUVkec+wLK3qejOnOAuS43K+iNApAuIvaBRbWxIrVFXMqqZB335ywqy Ir0Xf238Be0l84aQ7X6yQvhJE+D3UkY5VPxRyzBTm+O4mQ/0Dwg45ZvRzVZAw76DPsB9/DHyGj/Hq qaZWioP0epoXH1v9RlznWlQX3UUf7WIDEUiT6zJ9DIsTpLiJx5nVBC7y/jhK0+c27PxMPJ4H4Y8hZ fpAcVP17Ror/ts9VkFWA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1thbb1-00000001YPH-3Hv4; Mon, 10 Feb 2025 21:45:39 +0000 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1thbRu-00000001VPF-2a7e for linux-riscv@lists.infradead.org; Mon, 10 Feb 2025 21:36:16 +0000 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-43932b9b09aso25636285e9.3 for ; Mon, 10 Feb 2025 13:36:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1739223373; x=1739828173; 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=UGVeWfQH1jzgIQjTEzb3/Jn4H08G3wuad16+lnHRDs3KtcpUGMa29MFsKvvjGgAsyZ 1rPdiYWJ0wjJ0P1f8Qmxhf124m63pdM/cBuDxfy0OWBWLezKxOWScb5pzuzPjYJUdfmu pM4pkWEJic26XcrpVKD6Gte7gCg+M1uqZox+sBaP8iYeFJaxuZaHKwhdLSPLH3chOolu DQTzgMYqw0jtRoQ5Zm9R5ibe1oQIQkD3ie9ewfEeMVx8Nc/cTklHuS4P4AqD2NFibxnO i1GL7eMJO4dhhiTY3kMCAQKQ3unMjTfboyfJ3BQL6nAKECc3qHVCh7r0zuW7uC96KsRN kJcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739223373; x=1739828173; 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=UkoxV+vUBnZuBQGRWIigHP1BtOwT/hEd8hxL+rc54TdNfN0l0QhsScKCFYLse5qZny dByfPHY7PgismgNJWUXM58Km0/NnKZHFrqtU5Nht1ZMf7H3ZuAuTm2KRMEiXu6o3sZeU LPH4L2kgJ0+4zocrMUiT48kwXQ+/sJnasYnb2DM1eu+dYHUvrPyCMWXXFTmZQr2Bb174 k2MJa326aPA91l5DmgkyrdOzhlfSZzmcdr7Yw8sUeHEdmdrk5428qsraBGC693szhqKm bmy1rQm1pvTvcaz0ghIa0HRvKRjJ6tjeMrpLFlcGxzBhtG5SI144p3W0GJNBgRST3PD8 ub9A== X-Forwarded-Encrypted: i=1; AJvYcCXtFLB37vkxYztPZG68rDRcxgLQnmn1NGbw/v0Qi0p02AJxiYWFEEsZg1WB0aswylgXLf4gz3RXWwZjkg==@lists.infradead.org X-Gm-Message-State: AOJu0YxMJK4W9f6eVk2PrVA8qWBfZnA8ht26dZAnoURBNzXZNE9iYHIY aWf1ccWyMkFv29xvNMi5DbmFL9VuYUxRWBmVCTp/pEsY9rYeefFReXD906QgIuk= X-Gm-Gg: ASbGncsWz5LcSvKRqLjEYaOE1QOWxnzBPgIk2TzKl3LUwQzsGXsyNleqyCv8RCTMVI+ xgds3FQ2kH596uCRQlGsE8B0lyOmekXqhdt1QnLLgMKRUW6iY8oMg3FwZDtc+3+NPsWzFdFZk6D R7VQGKAh6M0KNEr13e+prsmVcb9S25mQWeiITGuoLwkPzwVJoOBlO2RXw909FPhFRb0cMSCk1Mq 8ve33mb6Zvymq79gU4BAOTb6MYSuBGc19WQ1QgARvPdHDNOXgcsEpeMguCWWG82hDnOSn9Xz3JQ E3TbMp8lfeZANXxW X-Google-Smtp-Source: AGHT+IFIy2UHszvgSyStziow4xh4NgDeIiWhARHb24tahmr62iRvzSTuU8RezdSX8BLezNfYx/izdg== X-Received: by 2002:a05:600c:1da8:b0:431:5c3d:1700 with SMTP id 5b1f17b1804b1-439249a7534mr117351975e9.21.1739223372921; Mon, 10 Feb 2025 13:36:12 -0800 (PST) Received: from carbon-x1.. ([2a01:e0a:e17:9700:16d2:7456:6634:9626]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4394376118esm47541515e9.40.2025.02.10.13.36.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Feb 2025 13:36:12 -0800 (PST) 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 v2 07/15] riscv: misaligned: factorize trap handling Date: Mon, 10 Feb 2025 22:35:40 +0100 Message-ID: <20250210213549.1867704-8-cleger@rivosinc.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250210213549.1867704-1-cleger@rivosinc.com> References: <20250210213549.1867704-1-cleger@rivosinc.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250210_133614_655906_C1588406 X-CRM114-Status: GOOD ( 10.43 ) 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,