From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1F305291154 for ; Tue, 22 Apr 2025 16:23:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.182 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745339040; cv=none; b=fsO6Zeg4amC715cJ6BTEGhbgZ9HDHiLn0y4RmIw3Y35aXQTshyrGQeX3MCnvZMOk28RpEtMWLhcpLsic5mX8F0AuRmedrG3fGZ16zooylKVrF3GHlng8WH0qIYWCZtBIdAKz4ZI0+U37GV5vY691A6VxwrMqpnCqlIbLYUcQ4hg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745339040; c=relaxed/simple; bh=V4nZxr4vEp4NslLZ6gP5Cj+UGh59lnUcLVrhxabmvA8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=YWErN1lo106wdhSZJTv5p8EKwMjkkC2bmXhmATccRYFnP0MDX5R8yKYWkw4+WNA3+FtGE4U94uvYfcWilrzhgKokgEy7ffggwk6wUNwHFbyhPAaJL5BsnOyCb1CoomAX85YJNZbM75CRaeZsLEEvH3r9fBKONReptvpdEPyMUaE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com; spf=pass smtp.mailfrom=rivosinc.com; dkim=pass (2048-bit key) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.b=JdH93SHe; arc=none smtp.client-ip=209.85.210.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rivosinc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.b="JdH93SHe" Received: by mail-pf1-f182.google.com with SMTP id d2e1a72fcca58-7376e311086so7446172b3a.3 for ; Tue, 22 Apr 2025 09:23:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1745339038; x=1745943838; darn=vger.kernel.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=FmBbq7nPpmDt102f7nSiOG4D5hySZc1qJkWls9LUQzY=; b=JdH93SHel48IZ5OWTDCO0Wi55H+m9vSaDn9fQETtDX9rpGJrDCxLk759iW5FzLWp+K zUZc5m/3f4OLMJhdQnhYlUnWMQB3wRFscRinMeOrgus59tlTuFd4lWT5Y4LfzMz3IsGr 58aXvdQSB4HPLTlAW8/PFnN9t6wiFsx37Egia87TWyYgpIcgqxmZMACUsu+rnt/KyuWQ VWOOCfLtklVqVvC3db+OmbICmkaPR5546b0j4Zc0JtI0thm56ODvxxVU85VD7JK0dKqO es8fUlzK1D35rNNfJTOVCASrzgPuG55uZGO8rzGCcz16Oo5I9mm1FqIO+bRw4KMHhadK wxEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745339038; x=1745943838; 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=FmBbq7nPpmDt102f7nSiOG4D5hySZc1qJkWls9LUQzY=; b=AXcKwU1i1HeFYVqE4IQi0tgRZ8rnkqBTtzwoHPNaUxvTYZNU8Aqm7pDS51M2APEqN6 1QNY6vT7TRNBmZPepcOt/5YiqMGZAIuw/bOFr0EUMnzwJQlDMZm4ST61tx5muNqQpT7m VzOCc9IrPCZLaoWYXiVMPixshHGIjNhk2+LEwCGBYa+h5DAQt89Fb0pybZtT420FkQdA W2K4zSqRbEQTn0SyrEskgq3aqBca7i/0zzaRkWaHCY6TfXcdpM6BaTjzK4Om/Dz9ukgE 8aBSugwIGHClmkuuG/CFUMrCKFnt+sMgVYds9qMvD13jVyRkTU8dViXteJ8PmLR/03te pMuQ== X-Forwarded-Encrypted: i=1; AJvYcCVyq8KO6hPe7K6ZZVIK9TCuuvYC1y7gk4NpHS3rB18v2xO/6YWSfpK02w9SvXBNkLh+u+Wrzp8890VyVmM=@vger.kernel.org X-Gm-Message-State: AOJu0Yxt3hFil25E59fYNHFSerExm4lRtB6PzDlKf2Ni5tLNVp36TA4v Nk78aLZOpk5WjuUV2eKIoEy72VJo94tF5eV5Ymty0G0WHGUk0BpDmlUvnPBIOrY= X-Gm-Gg: ASbGncvKMtneeMeiBQOggxSeieihIIID5IcGmUi1F1UP6mUZ6zhnij6Ixy/tFd4uwCj lmHRE1AX0RweOpdhHwDvFFAESlGWvnqvWx2D6Vj4WRYzkBHKRVEPw4Ipt047WnirIG9XHvy217t jb5sYSdqV44G0sGDWk/Vxpl3WzdJPCUnANHs5qQm8Sycr/ViRca8a8ZmeQ4u+boekN3/NK/eAE8 2giIVekj9MDaFmgCGt4qvqkhg5QtJXUdbIwuls+U8/5r3okvFsDJbczt3aSNI568QK3lO3a6qpF wIvu+5DUUnmDXqjcVrUiY/jJ1rxOaozPkFMxBkDCXg== X-Google-Smtp-Source: AGHT+IHJ0hD1BX6oP9p44ibBdnegPGhkVm172MRAQDe1UgxH2sSUHeHwPJE2BCcGpoc9ezKvgoF/MA== X-Received: by 2002:a05:6a20:394e:b0:1f5:8eb1:d5d2 with SMTP id adf61e73a8af0-203cbc5594bmr24479521637.13.1745339038438; Tue, 22 Apr 2025 09:23:58 -0700 (PDT) Received: from carbon-x1.. ([2a01:e0a:e17:9700:16d2:7456:6634:9626]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73dbf8e13e1sm8850825b3a.46.2025.04.22.09.23.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Apr 2025 09:23:57 -0700 (PDT) From: =?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?= To: linux-doc@vger.kernel.org (open list:DOCUMENTATION), linux-kernel@vger.kernel.org (open list), linux-riscv@lists.infradead.org (open list:RISC-V ARCHITECTURE), linux-kselftest@vger.kernel.org (open list:KERNEL SELFTEST FRAMEWORK) Cc: =?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?= , Jonathan Corbet , Paul Walmsley , Palmer Dabbelt , Albert Ou , Alexandre Ghiti , Shuah Khan , Andrew Jones , Samuel Holland Subject: [PATCH v2 1/5] riscv: misaligned: factorize trap handling Date: Tue, 22 Apr 2025 18:23:08 +0200 Message-ID: <20250422162324.956065-2-cleger@rivosinc.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250422162324.956065-1-cleger@rivosinc.com> References: <20250422162324.956065-1-cleger@rivosinc.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 | 66 +++++++++++++++++++++------------------ 1 file changed, 36 insertions(+), 30 deletions(-) diff --git a/arch/riscv/kernel/traps.c b/arch/riscv/kernel/traps.c index 8ff8e8b36524..b1d991c78a23 100644 --- a/arch/riscv/kernel/traps.c +++ b/arch/riscv/kernel/traps.c @@ -198,47 +198,53 @@ 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 const struct { + const char *type_str; + int (*handler)(struct pt_regs *regs); +} misaligned_handler[] = { + [MISALIGNED_STORE] = { + .type_str = "Oops - store (or AMO) address misaligned", + .handler = handle_misaligned_store, + }, + [MISALIGNED_LOAD] = { + .type_str = "Oops - load address misaligned", + .handler = handle_misaligned_load, + }, +}; + +static void do_trap_misaligned(struct pt_regs *regs, enum misaligned_access_type type) { - if (user_mode(regs)) { + irqentry_state_t state; + + if (user_mode(regs)) irqentry_enter_from_user_mode(regs); + else + state = irqentry_nmi_enter(regs); - if (handle_misaligned_load(regs)) - do_trap_error(regs, SIGBUS, BUS_ADRALN, regs->epc, - "Oops - load address misaligned"); + if (misaligned_handler[type].handler(regs)) + do_trap_error(regs, SIGBUS, BUS_ADRALN, regs->epc, + misaligned_handler[type].type_str); + if (user_mode(regs)) irqentry_exit_to_user_mode(regs); - } else { - irqentry_state_t state = irqentry_nmi_enter(regs); - - if (handle_misaligned_load(regs)) - do_trap_error(regs, SIGBUS, BUS_ADRALN, regs->epc, - "Oops - load address misaligned"); - + else irqentry_nmi_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, -- 2.49.0