From patchwork Tue Feb 6 15:40:59 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: 13547545 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 CFC77C48297 for ; Tue, 6 Feb 2024 15:42:09 +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: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:In-Reply-To:References: List-Owner; bh=C6dPU4tW5OP8uLynSBJPP2M693KtVLmakJQu/2aSfY8=; b=q5DGZT2pCRofBY eClgVPlPPYhr/dHHaqfDWrqRx2LXUD6OsCJOTwNexxyRhTGsaR/2lcaAZw7QevAQufD0vBXUFE/ac AfDhRHkOwPQuiJ4+xxAatFeIKYBV5lPEFkRp6YHurLyp3biEcOMSyea2LkxjgY34ByXVKnKp/cT2k xPWyalPX+ILceQayDj+Rj94rfZ80+siobGcUQ0Z7gfRS1ac8i4Q9Gu/X7upAAhibQ54WeprR8TPLd X0wkAvAu+mU/drqhmx/qcll/bif74TkLb+JIz4Q509v4lp/DS8Tq5JaGV2IPG947SGabXRBkxQUrn 7iQEvPBnVJEYDEQEoWqg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rXNaI-000000088oe-3xEI; Tue, 06 Feb 2024 15:42:06 +0000 Received: from mail-pj1-x102f.google.com ([2607:f8b0:4864:20::102f]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rXNaF-000000088nD-3RJp for linux-riscv@lists.infradead.org; Tue, 06 Feb 2024 15:42:05 +0000 Received: by mail-pj1-x102f.google.com with SMTP id 98e67ed59e1d1-292655cb454so742768a91.0 for ; Tue, 06 Feb 2024 07:42:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1707234122; x=1707838922; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=0serQGLJfMuAm7UCmFlRU9sglml/pgZOh7w7pdhvabI=; b=Qr/xBbb6ZAdO38RNK+iN11501+YvoAKYGcgJRZAKQA3Ij2NRWyFqHEI0F11V0SkzWD O9tWxhB4buAPCHc5tI76R6/TJDsfcxYuuiSeSU2GlWqGet3xxfn3BvD1qIFBAfkZJPZi GHnuyWJeICLctgFiFLqFwh8W06V+E4CkwSHnxcqNQxO18x9S/40aCv6vvVBZz3g84hFt syN/fJUfQL595qIvGvmlOVD/13TlPc/zQZOzhMDYshLg2iekWNegiLLnAGi847fOPltv /iqcsaoPpJZujxe4igWSTxci8QXveM92+X5AFXVZLnPtqW29qF37exT21FMDhFJPFJgl zh8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707234122; x=1707838922; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=0serQGLJfMuAm7UCmFlRU9sglml/pgZOh7w7pdhvabI=; b=ZJZe8P7LWkZSNQDId0+ayt3YOMP4I8Y4EP9P+YnbWG+r3dapzf9/w9CYYFnwRwXcky sz+gWhbfIEZZLy9QNasp3JLCcEMwHVEfC3dXejoDpo9SaUWS7LsfIrdxIUIF60sO4hpF 0bVsQCc9Yjb4y1KJFHWVBcO/awgrfgXNfCwe/lEvpNoE9QpyU/Q+nCiRcGxQ/6VEVJqQ w4kPq0cUQo0j+r+R6EhWh7h6WX4aG2Bxdg4RdES7hii6ZKzGOe2VdGbSpk+MsDYtvLnb DnevgHba/NJ/1gxAQrfcs8zxtT98+8jUfyP3GiGo1nTbpyAYuOlyhv5lwaQPuZBQw5Hb kWPg== X-Gm-Message-State: AOJu0YyLzTB1uizjXzCaKfRwiqY5I47Bv4WlzT0zzDfIAhst66b02jxk a0sZw2dGgN02XdJ1KVJwb6VEz/1zg3prV1wtdaxjQfLY/ot9pqxOb8KK3sueQlU= X-Google-Smtp-Source: AGHT+IFMiM2uZXFaxsSt1Nw4LHlEplX/O/CZzHeieUF/qxwXcb9uaJCEqVrp6PvS/KS/7rS3FEo+Tw== X-Received: by 2002:a17:90b:1d0c:b0:296:9dd2:2dd4 with SMTP id on12-20020a17090b1d0c00b002969dd22dd4mr3027842pjb.2.1707234121881; Tue, 06 Feb 2024 07:42:01 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCWaBqnyH0ebZtH7mMP0+4qY9XgtTGkr3tgX5sFeZYjL2+z8OusJmTJ8EHv6DyExJnYaGtnEeRso7OHaiuN0RSVodWWPaXLWG1CGKY9IqGOAhUKwda51Abk/dZJ3ch1fCRAAT6eVou0Lzqo7g6LgUllOpYejlSRrWKir/X1YWD4bHYrjJU2pK2Aynua4CNz3JGWA5EWIruD40WwVAmtGhD/emAgGSFQX+knjPSiTmisfhgS5jrGW0XWvTflb84QxgJtZK53BeIkzp+2uFM2UtUi2D6PKnfH8Os2zaJTguXjmZfZH Received: from carbon-x1.. ([2a01:e0a:999:a3a0:20a2:d2ee:941a:156e]) by smtp.gmail.com with ESMTPSA id kx18-20020a17090b229200b0029454cca5c3sm1803609pjb.39.2024.02.06.07.41.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Feb 2024 07:42:01 -0800 (PST) From: =?utf-8?b?Q2zDqW1lbnQgTMOpZ2Vy?= To: Paul Walmsley , Palmer Dabbelt , Albert Ou , linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org Cc: =?utf-8?b?Q2zDqW1lbnQgTMOpZ2Vy?= , Ben Dooks , David Laight , Charlie Jenkins Subject: [PATCH v2] riscv: misaligned: remove CONFIG_RISCV_M_MODE specific code Date: Tue, 6 Feb 2024 16:40:59 +0100 Message-ID: <20240206154104.896809-1-cleger@rivosinc.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240206_074203_912830_DBC082B1 X-CRM114-Status: GOOD ( 22.44 ) 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 While reworking code to fix sparse errors, it appears that the RISCV_M_MODE specific could actually be removed and use the one for normal mode. Even though RISCV_M_MODE can do direct user memory access, using the user uaccess helpers is also going to work. Since there is no need anymore for specific accessors (load_u8()/store_u8()), we can directly use memcpy()/copy_{to/from}_user() and get rid of the copy loop entirely. __read_insn() is also fixed to use an unsigned long instead of a pointer which was cast in __user address space. The insn_addr parameter is now cast from unsigned lnog to the correct address space directly. Signed-off-by: Clément Léger Reviewed-by: Charlie Jenkins Reviewed-by: Conor Dooley --- The test used to validate these changes is the one used originally for S-mode misaligned support: https://github.com/clementleger/unaligned_test This test exercise (almost) all the supported instructions, all the registers for FPU instructions and is compiled with and without compressed instructions. For S-mode, you simply need a classic toolchain and export CROSS_COMPILE to match it. For M-mode validation, the following steps can be used: Build a nommu toolchain with buildroot toolchain: $ git clone https://github.com/buildroot/buildroot.git $ cd buildroot $ make O=build_nommu qemu_riscv64_nommu_virt_defconfig Test: $ git clone https://github.com/clementleger/unaligned_test.git $ cd unaligned_test $ make CFLAGS="-fPIC -Wl,-elf2flt=-r" CROSS_COMPILE=/build_nommu/host/bin/riscv64-buildroot-linux-uclibc- Copy the resulting elf files (unaligned & unaligned_c) to buildroot rootfs and rebuild it. $ cp unaligned unaligned_c /build_nommu/target/root $ cd /build_nommu/ $ make Kernel: $ make O=build_nommu nommu_virt_defconfig $ make O=build_nommu loader Either set the kernel initramfs or provide one on spike command line using the one built with buildroot Then to run it on spike (QEMU always emulate misaligned accesses and won't generate any misaligned exception): $ spike /build_nommu/loader --- V2: - Rebased on master - Align macro end "\" Link to v1: https://lore.kernel.org/linux-riscv/20231128165206.589240-1-cleger@rivosinc.com/ Notes: This patch is a complete rework of a previous one [1] and thus is not a V3. [1] https://lore.kernel.org/linux-riscv/d156242a-f104-4925-9736-624a4ba8210d@rivosinc.com/ --- arch/riscv/kernel/traps_misaligned.c | 106 +++++---------------------- 1 file changed, 17 insertions(+), 89 deletions(-) diff --git a/arch/riscv/kernel/traps_misaligned.c b/arch/riscv/kernel/traps_misaligned.c index 8ded225e8c5b..fb202dd18fe5 100644 --- a/arch/riscv/kernel/traps_misaligned.c +++ b/arch/riscv/kernel/traps_misaligned.c @@ -264,86 +264,14 @@ static unsigned long get_f32_rs(unsigned long insn, u8 fp_reg_offset, #define GET_F32_RS2C(insn, regs) (get_f32_rs(insn, 2, regs)) #define GET_F32_RS2S(insn, regs) (get_f32_rs(RVC_RS2S(insn), 0, regs)) -#ifdef CONFIG_RISCV_M_MODE -static inline int load_u8(struct pt_regs *regs, const u8 *addr, u8 *r_val) -{ - u8 val; - - asm volatile("lbu %0, %1" : "=&r" (val) : "m" (*addr)); - *r_val = val; - - return 0; -} - -static inline int store_u8(struct pt_regs *regs, u8 *addr, u8 val) -{ - asm volatile ("sb %0, %1\n" : : "r" (val), "m" (*addr)); - - return 0; -} - -static inline int get_insn(struct pt_regs *regs, ulong mepc, ulong *r_insn) -{ - register ulong __mepc asm ("a2") = mepc; - ulong val, rvc_mask = 3, tmp; - - asm ("and %[tmp], %[addr], 2\n" - "bnez %[tmp], 1f\n" -#if defined(CONFIG_64BIT) - __stringify(LWU) " %[insn], (%[addr])\n" -#else - __stringify(LW) " %[insn], (%[addr])\n" -#endif - "and %[tmp], %[insn], %[rvc_mask]\n" - "beq %[tmp], %[rvc_mask], 2f\n" - "sll %[insn], %[insn], %[xlen_minus_16]\n" - "srl %[insn], %[insn], %[xlen_minus_16]\n" - "j 2f\n" - "1:\n" - "lhu %[insn], (%[addr])\n" - "and %[tmp], %[insn], %[rvc_mask]\n" - "bne %[tmp], %[rvc_mask], 2f\n" - "lhu %[tmp], 2(%[addr])\n" - "sll %[tmp], %[tmp], 16\n" - "add %[insn], %[insn], %[tmp]\n" - "2:" - : [insn] "=&r" (val), [tmp] "=&r" (tmp) - : [addr] "r" (__mepc), [rvc_mask] "r" (rvc_mask), - [xlen_minus_16] "i" (XLEN_MINUS_16)); - - *r_insn = val; - - return 0; -} -#else -static inline int load_u8(struct pt_regs *regs, const u8 *addr, u8 *r_val) -{ - if (user_mode(regs)) { - return __get_user(*r_val, (u8 __user *)addr); - } else { - *r_val = *addr; - return 0; - } -} - -static inline int store_u8(struct pt_regs *regs, u8 *addr, u8 val) -{ - if (user_mode(regs)) { - return __put_user(val, (u8 __user *)addr); - } else { - *addr = val; - return 0; - } -} - -#define __read_insn(regs, insn, insn_addr) \ +#define __read_insn(regs, insn, insn_addr, type) \ ({ \ int __ret; \ \ if (user_mode(regs)) { \ - __ret = __get_user(insn, insn_addr); \ + __ret = __get_user(insn, (type __user *) insn_addr); \ } else { \ - insn = *(__force u16 *)insn_addr; \ + insn = *(type *)insn_addr; \ __ret = 0; \ } \ \ @@ -356,9 +284,8 @@ static inline int get_insn(struct pt_regs *regs, ulong epc, ulong *r_insn) if (epc & 0x2) { ulong tmp = 0; - u16 __user *insn_addr = (u16 __user *)epc; - if (__read_insn(regs, insn, insn_addr)) + if (__read_insn(regs, insn, epc, u16)) return -EFAULT; /* __get_user() uses regular "lw" which sign extend the loaded * value make sure to clear higher order bits in case we "or" it @@ -369,16 +296,14 @@ static inline int get_insn(struct pt_regs *regs, ulong epc, ulong *r_insn) *r_insn = insn; return 0; } - insn_addr++; - if (__read_insn(regs, tmp, insn_addr)) + epc += sizeof(u16); + if (__read_insn(regs, tmp, epc, u16)) return -EFAULT; *r_insn = (tmp << 16) | insn; return 0; } else { - u32 __user *insn_addr = (u32 __user *)epc; - - if (__read_insn(regs, insn, insn_addr)) + if (__read_insn(regs, insn, epc, u32)) return -EFAULT; if ((insn & __INSN_LENGTH_MASK) == __INSN_LENGTH_32) { *r_insn = insn; @@ -390,7 +315,6 @@ static inline int get_insn(struct pt_regs *regs, ulong epc, ulong *r_insn) return 0; } } -#endif union reg_data { u8 data_bytes[8]; @@ -409,7 +333,7 @@ int handle_misaligned_load(struct pt_regs *regs) unsigned long epc = regs->epc; unsigned long insn; unsigned long addr = regs->badaddr; - int i, fp = 0, shift = 0, len = 0; + int fp = 0, shift = 0, len = 0; perf_sw_event(PERF_COUNT_SW_ALIGNMENT_FAULTS, 1, regs, addr); @@ -490,9 +414,11 @@ int handle_misaligned_load(struct pt_regs *regs) return -EOPNOTSUPP; val.data_u64 = 0; - for (i = 0; i < len; i++) { - if (load_u8(regs, (void *)(addr + i), &val.data_bytes[i])) + if (user_mode(regs)) { + if (raw_copy_from_user(&val, (u8 __user *)addr, len)) return -1; + } else { + memcpy(&val, (u8 *)addr, len); } if (!fp) @@ -513,7 +439,7 @@ int handle_misaligned_store(struct pt_regs *regs) unsigned long epc = regs->epc; unsigned long insn; unsigned long addr = regs->badaddr; - int i, len = 0, fp = 0; + int len = 0, fp = 0; perf_sw_event(PERF_COUNT_SW_ALIGNMENT_FAULTS, 1, regs, addr); @@ -586,9 +512,11 @@ int handle_misaligned_store(struct pt_regs *regs) if (!IS_ENABLED(CONFIG_FPU) && fp) return -EOPNOTSUPP; - for (i = 0; i < len; i++) { - if (store_u8(regs, (void *)(addr + i), val.data_bytes[i])) + if (user_mode(regs)) { + if (raw_copy_to_user((u8 __user *)addr, &val, len)) return -1; + } else { + memcpy((u8 *)addr, &val, len); } regs->epc = epc + INSN_LEN(insn);