From patchwork Wed Oct 18 22:51:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charlie Jenkins X-Patchwork-Id: 13428064 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 17DD9CDB483 for ; Wed, 18 Oct 2023 22:51:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9891580057; Wed, 18 Oct 2023 18:51:08 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 937EB8004A; Wed, 18 Oct 2023 18:51:08 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 78A2180057; Wed, 18 Oct 2023 18:51:08 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 5E1E28004A for ; Wed, 18 Oct 2023 18:51:08 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 2D8141604CE for ; Wed, 18 Oct 2023 22:51:08 +0000 (UTC) X-FDA: 81360079416.29.E698690 Received: from mail-oo1-f50.google.com (mail-oo1-f50.google.com [209.85.161.50]) by imf10.hostedemail.com (Postfix) with ESMTP id 44A1BC0003 for ; Wed, 18 Oct 2023 22:51:06 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=VW0Eycgp; dmarc=none; spf=pass (imf10.hostedemail.com: domain of charlie@rivosinc.com designates 209.85.161.50 as permitted sender) smtp.mailfrom=charlie@rivosinc.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1697669466; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=11HgkmJwUW4khfF5QifIk7vYcCQBT3/MHwOSE1WT73k=; b=lCVKmwpNKuJUD23O4NhGHNmKACWFWIxrUsL99rGjKJP+UJar2vPgrNRj3PU/vAWq2o26Ut KlcAva4HoE/+Q1Dd5gryAbGzlLt3np+cN2CwH2GwMDS6RLMsCoBo/4Jbgj3rK05rCNA+0g T4iWNdD3aNtW0f+cFnY37Yz/if0l0u4= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=VW0Eycgp; dmarc=none; spf=pass (imf10.hostedemail.com: domain of charlie@rivosinc.com designates 209.85.161.50 as permitted sender) smtp.mailfrom=charlie@rivosinc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1697669466; a=rsa-sha256; cv=none; b=3LUp4TFnKRf5Ge4rDmVgTxEqlHHYI9sEZTemLjLvrwKwKXioHky/WjmK49+EJp8qlIC9w5 1gNdM8WV6DkfxhdJiV/g/WCQNzUZ7iBrH2/KZG1AFdXfoTB5KC698esUGpxSyyV4+A9ESk Oa9ysasMq5rDzdX9eRfYG3HNt8C9uMo= Received: by mail-oo1-f50.google.com with SMTP id 006d021491bc7-57b68556d6dso4093362eaf.1 for ; Wed, 18 Oct 2023 15:51:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1697669465; x=1698274265; darn=kvack.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=11HgkmJwUW4khfF5QifIk7vYcCQBT3/MHwOSE1WT73k=; b=VW0EycgpRsJVJHBJNATWZAb1kVMYCk6tlrs6ZIV98IkVNI7r1MEgT40sVGdn1iJp8x Gv3b3kUpbbnrM1+SIzFq4cbOdMT/WiIzEuoZexV2vi0o2mF4CDUzVKTpzpE2Ew/LVhUa 8u/EpmTy9JywRzIfRANLoIskPoF5HlfhZ9Iv9fKiaYzjx2ciI7fmuEZNdkxRFxenWc5f ofBEkgKw+tKamSkVdGAvBqfVKyID3BLMpJZazcdw0taP5XCkMMov60lP54s8mGOIuwPG 7kVUwDZpBjBSiSpQIkQ8ATPlakJtJxt7tvkyCKcJydwc/vyu6NETvecIg1vg/lyG2cCA il0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697669465; x=1698274265; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=11HgkmJwUW4khfF5QifIk7vYcCQBT3/MHwOSE1WT73k=; b=XOI8whesD0IMg+CLQHyfe4Q6or2Gb+TnENLu8UBKodjZBFjLDUn8OKCL3m28zd7RV3 vS4FsVC1HVwWuNPdN1af2+Zgqoh6478eR16nxEP34wmHDQgPpZbJTMz41C7gfquZa/uM DC2UiEHse9nthWQCHZ+rTYnTqcs/zOUc+QvAsoMjugPL3aYS7rEvcnlizFc+SmGAJYuR 6MUInnpXRKPlbVkjlflqOvA+3adsjSWuqi6E81tCUnFxJCPfLxX0Kia8DbYzcD30LudL PjHO5e8OMY2cd21qaW5jtMaVVot8llg3l2tEc3+sdFMlRcb7csxA+fbmn93XFCM9orw9 L0QA== X-Gm-Message-State: AOJu0Yz7DpBicyekBGxjcdraRrw5T+HUltCAyDyhAwX9kmk6ow9GT1cX R8QLGRZpnD7tEcFeeRwZpzAxZw== X-Google-Smtp-Source: AGHT+IHtOQYS2QqSczOtKbP3AvdW10GZcd55pjsr0xvYcEdpuODA0HP9rHZl+9a7GcrYdsNIbBCSYg== X-Received: by 2002:a05:6820:2007:b0:57b:7ac4:7a94 with SMTP id by7-20020a056820200700b0057b7ac47a94mr629139oob.2.1697669465396; Wed, 18 Oct 2023 15:51:05 -0700 (PDT) Received: from charlie.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id r195-20020a4a37cc000000b00581e7506f2fsm641134oor.9.2023.10.18.15.51.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 15:51:04 -0700 (PDT) From: Charlie Jenkins Date: Wed, 18 Oct 2023 15:51:01 -0700 Subject: [PATCH v5 1/3] riscv: Avoid unaligned access when relocating modules MIME-Version: 1.0 Message-Id: <20231018-module_relocations-v5-1-dfee32d4dfc3@rivosinc.com> References: <20231018-module_relocations-v5-0-dfee32d4dfc3@rivosinc.com> In-Reply-To: <20231018-module_relocations-v5-0-dfee32d4dfc3@rivosinc.com> To: linux-riscv@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Eric Biederman , Kees Cook , Paul Walmsley , Palmer Dabbelt , Albert Ou , Andreas Schwab , Emil Renner Berthing , Samuel Holland , Charlie Jenkins , Emil Renner Berthing X-Mailer: b4 0.12.3 X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 44A1BC0003 X-Stat-Signature: fyhck6rpduibbfjkpywedfrmuna6fq8m X-HE-Tag: 1697669466-528435 X-HE-Meta: U2FsdGVkX18MkfZLy5tc+ujTY5GNDcnMSkQvEE+lsDSkZCUcsHBAY6IXnyuIQyOARieRDfZQwM36EzQKy3xxm2AkDP4ICWRrlJfatb6XBqhBBLl6nwjbEUSzxBS3r9A4o3qX5a3m938CAHsw6vrKpl9aSEq94i/ecTju+VguIrvBVBv4CAwibciTka+ywQjXxXCccJEiwjIIIrChODvWVMP+eTBRvh5wvu9jA1B7E1XyfvMsMERTBE6qsf0U3pg1X6FeKe7NKqOMUyj2YNUoAcXqnnwymEThQriCYGOG1l1wyB2Dj6T/K/E7YuMgKcI/Sqw5k1l3JrLmM/NHSCGD2w/5E9xyH7xIIp8gejXcNW9eDFAoP/2pFjBQoTDsaza+hCLDGBoJhfv95PjHdyXbpbsELlfuxDhLRPcFHiOTIUuj5njl631ksR3UwCDFmNAI6eeKwbWJzdvv8GI0Amns1DjU99qqih1sSKSE+XTxsOT+2pAGPP5IwO+u+gWiOwCdxAome3JcttHtQL2vMZVKfIxyawf2QeD9loBq9Ed5jyk82z1WDZ1ZiJHJKhd9JGRQlw82MnFTxwqWLri6U157cug9KyVvVynKEfz7A4jXj2HmsBW1bsadv9FGu9iFuBijKh3v/jnsVJbJzumIZumamKxxntGqKN/JbJSx1D4KCPj+sfx+lu+Ac7booTLrwkAigWR0vJamvCKEDQGFuuJL3kQqgAxoMPoDelHzdnl1TULGwzKnGw24RbwdjKo2wwkCPVNXYqZlFn53kmPulp4f/7IQxZP7HiO9xJAWOMI5Zv2vw/AAPI90ybWpudior/24Y4LtSv2VvMIDyUytZTodQOAUxzvSVCNu+0MTkexxkjWo3d5h64Uqv1rMqdtbnormtEOX6wYRzv3LLbTvJhp2fGnzQUOJ+uD1L0Ngq+zflbApmXvyi6+2vLMJ7tCAoWoL6ApwJX4twJkDJXlZAy0 /9vZDEXf m91ARSAixVuAN8jpdhCmdXOyBvgqE+77EiOxJOfwyzonMUXdo8ZHMFjgql5eTuMDg8RSqfB0cZa/BSBop27ZP7l7gZLmtu1FHSJieUzxZ3fzVIeA9i43u9qE4v6grpb7Wvlmdl/Q2op5Ik8iWv+CUOOjc1nM2hQbHooyPkY+z9wwFkVwDO6W43JuubPvuSyyS6fuacy2YkwgJjCcgpC67mY7f0go7w0OC2m6xsD2rdunEYvOZNRpXLiY/SXHc4G8l0ai5Swnox9KhDxZJUSNyo/3ztxU4U9FmF8YTnwycxZkZW6AUp3v4uB2i32T2dZgIFmpTApr22GNBuCpbN+FtFc+hLrcTAH3CjhgDmvTMWFAjvCjkvTJ/UNmVPaxm9GO9F6927saI4Yrc3EhGO8OGC1x085LWMyTzm+SnWJsgvKZYhj6YXhsIgaJ0ZP8bjCTNv98ko9cSww6adBw= X-Bogosity: Ham, tests=bogofilter, spamicity=0.013680, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: Emil Renner Berthing With the C-extension regular 32bit instructions are not necessarily aligned on 4-byte boundaries. RISC-V instructions are in fact an ordered list of 16bit little-endian "parcels", so access the instruction as such. This should also make the code work in case someone builds a big-endian RISC-V machine. Signed-off-by: Emil Renner Berthing Signed-off-by: Charlie Jenkins --- arch/riscv/kernel/module.c | 153 +++++++++++++++++++++++---------------------- 1 file changed, 77 insertions(+), 76 deletions(-) diff --git a/arch/riscv/kernel/module.c b/arch/riscv/kernel/module.c index 7c651d55fcbd..a9e94e939cb5 100644 --- a/arch/riscv/kernel/module.c +++ b/arch/riscv/kernel/module.c @@ -27,68 +27,86 @@ static bool riscv_insn_valid_32bit_offset(ptrdiff_t val) #endif } -static int apply_r_riscv_32_rela(struct module *me, u32 *location, Elf_Addr v) +static int riscv_insn_rmw(void *location, u32 keep, u32 set) +{ + u16 *parcel = location; + u32 insn = (u32)le16_to_cpu(parcel[0]) | (u32)le16_to_cpu(parcel[1]) << 16; + + insn &= keep; + insn |= set; + + parcel[0] = cpu_to_le32(insn); + parcel[1] = cpu_to_le16(insn >> 16); + return 0; +} + +static int riscv_insn_rvc_rmw(void *location, u16 keep, u16 set) +{ + u16 *parcel = location; + + *parcel = cpu_to_le16((le16_to_cpu(*parcel) & keep) | set); + return 0; +} + +static int apply_r_riscv_32_rela(struct module *me, void *location, Elf_Addr v) { if (v != (u32)v) { pr_err("%s: value %016llx out of range for 32-bit field\n", me->name, (long long)v); return -EINVAL; } - *location = v; + *(u32 *)location = v; return 0; } -static int apply_r_riscv_64_rela(struct module *me, u32 *location, Elf_Addr v) +static int apply_r_riscv_64_rela(struct module *me, void *location, Elf_Addr v) { *(u64 *)location = v; return 0; } -static int apply_r_riscv_branch_rela(struct module *me, u32 *location, +static int apply_r_riscv_branch_rela(struct module *me, void *location, Elf_Addr v) { - ptrdiff_t offset = (void *)v - (void *)location; + ptrdiff_t offset = (void *)v - location; u32 imm12 = (offset & 0x1000) << (31 - 12); u32 imm11 = (offset & 0x800) >> (11 - 7); u32 imm10_5 = (offset & 0x7e0) << (30 - 10); u32 imm4_1 = (offset & 0x1e) << (11 - 4); - *location = (*location & 0x1fff07f) | imm12 | imm11 | imm10_5 | imm4_1; - return 0; + return riscv_insn_rmw(location, 0x1fff07f, imm12 | imm11 | imm10_5 | imm4_1); } -static int apply_r_riscv_jal_rela(struct module *me, u32 *location, +static int apply_r_riscv_jal_rela(struct module *me, void *location, Elf_Addr v) { - ptrdiff_t offset = (void *)v - (void *)location; + ptrdiff_t offset = (void *)v - location; u32 imm20 = (offset & 0x100000) << (31 - 20); u32 imm19_12 = (offset & 0xff000); u32 imm11 = (offset & 0x800) << (20 - 11); u32 imm10_1 = (offset & 0x7fe) << (30 - 10); - *location = (*location & 0xfff) | imm20 | imm19_12 | imm11 | imm10_1; - return 0; + return riscv_insn_rmw(location, 0xfff, imm20 | imm19_12 | imm11 | imm10_1); } -static int apply_r_riscv_rvc_branch_rela(struct module *me, u32 *location, +static int apply_r_riscv_rvc_branch_rela(struct module *me, void *location, Elf_Addr v) { - ptrdiff_t offset = (void *)v - (void *)location; + ptrdiff_t offset = (void *)v - location; u16 imm8 = (offset & 0x100) << (12 - 8); u16 imm7_6 = (offset & 0xc0) >> (6 - 5); u16 imm5 = (offset & 0x20) >> (5 - 2); u16 imm4_3 = (offset & 0x18) << (12 - 5); u16 imm2_1 = (offset & 0x6) << (12 - 10); - *(u16 *)location = (*(u16 *)location & 0xe383) | - imm8 | imm7_6 | imm5 | imm4_3 | imm2_1; - return 0; + return riscv_insn_rvc_rmw(location, 0xe383, + imm8 | imm7_6 | imm5 | imm4_3 | imm2_1); } -static int apply_r_riscv_rvc_jump_rela(struct module *me, u32 *location, +static int apply_r_riscv_rvc_jump_rela(struct module *me, void *location, Elf_Addr v) { - ptrdiff_t offset = (void *)v - (void *)location; + ptrdiff_t offset = (void *)v - location; u16 imm11 = (offset & 0x800) << (12 - 11); u16 imm10 = (offset & 0x400) >> (10 - 8); u16 imm9_8 = (offset & 0x300) << (12 - 11); @@ -98,16 +116,14 @@ static int apply_r_riscv_rvc_jump_rela(struct module *me, u32 *location, u16 imm4 = (offset & 0x10) << (12 - 5); u16 imm3_1 = (offset & 0xe) << (12 - 10); - *(u16 *)location = (*(u16 *)location & 0xe003) | - imm11 | imm10 | imm9_8 | imm7 | imm6 | imm5 | imm4 | imm3_1; - return 0; + return riscv_insn_rvc_rmw(location, 0xe003, + imm11 | imm10 | imm9_8 | imm7 | imm6 | imm5 | imm4 | imm3_1); } -static int apply_r_riscv_pcrel_hi20_rela(struct module *me, u32 *location, +static int apply_r_riscv_pcrel_hi20_rela(struct module *me, void *location, Elf_Addr v) { - ptrdiff_t offset = (void *)v - (void *)location; - s32 hi20; + ptrdiff_t offset = (void *)v - location; if (!riscv_insn_valid_32bit_offset(offset)) { pr_err( @@ -116,23 +132,20 @@ static int apply_r_riscv_pcrel_hi20_rela(struct module *me, u32 *location, return -EINVAL; } - hi20 = (offset + 0x800) & 0xfffff000; - *location = (*location & 0xfff) | hi20; - return 0; + return riscv_insn_rmw(location, 0xfff, (offset + 0x800) & 0xfffff000); } -static int apply_r_riscv_pcrel_lo12_i_rela(struct module *me, u32 *location, +static int apply_r_riscv_pcrel_lo12_i_rela(struct module *me, void *location, Elf_Addr v) { /* * v is the lo12 value to fill. It is calculated before calling this * handler. */ - *location = (*location & 0xfffff) | ((v & 0xfff) << 20); - return 0; + return riscv_insn_rmw(location, 0xfffff, (v & 0xfff) << 20); } -static int apply_r_riscv_pcrel_lo12_s_rela(struct module *me, u32 *location, +static int apply_r_riscv_pcrel_lo12_s_rela(struct module *me, void *location, Elf_Addr v) { /* @@ -142,15 +155,12 @@ static int apply_r_riscv_pcrel_lo12_s_rela(struct module *me, u32 *location, u32 imm11_5 = (v & 0xfe0) << (31 - 11); u32 imm4_0 = (v & 0x1f) << (11 - 4); - *location = (*location & 0x1fff07f) | imm11_5 | imm4_0; - return 0; + return riscv_insn_rmw(location, 0x1fff07f, imm11_5 | imm4_0); } -static int apply_r_riscv_hi20_rela(struct module *me, u32 *location, +static int apply_r_riscv_hi20_rela(struct module *me, void *location, Elf_Addr v) { - s32 hi20; - if (IS_ENABLED(CONFIG_CMODEL_MEDLOW)) { pr_err( "%s: target %016llx can not be addressed by the 32-bit offset from PC = %p\n", @@ -158,22 +168,20 @@ static int apply_r_riscv_hi20_rela(struct module *me, u32 *location, return -EINVAL; } - hi20 = ((s32)v + 0x800) & 0xfffff000; - *location = (*location & 0xfff) | hi20; - return 0; + return riscv_insn_rmw(location, 0xfff, ((s32)v + 0x800) & 0xfffff000); } -static int apply_r_riscv_lo12_i_rela(struct module *me, u32 *location, +static int apply_r_riscv_lo12_i_rela(struct module *me, void *location, Elf_Addr v) { /* Skip medlow checking because of filtering by HI20 already */ s32 hi20 = ((s32)v + 0x800) & 0xfffff000; s32 lo12 = ((s32)v - hi20); - *location = (*location & 0xfffff) | ((lo12 & 0xfff) << 20); - return 0; + + return riscv_insn_rmw(location, 0xfffff, (lo12 & 0xfff) << 20); } -static int apply_r_riscv_lo12_s_rela(struct module *me, u32 *location, +static int apply_r_riscv_lo12_s_rela(struct module *me, void *location, Elf_Addr v) { /* Skip medlow checking because of filtering by HI20 already */ @@ -181,20 +189,18 @@ static int apply_r_riscv_lo12_s_rela(struct module *me, u32 *location, s32 lo12 = ((s32)v - hi20); u32 imm11_5 = (lo12 & 0xfe0) << (31 - 11); u32 imm4_0 = (lo12 & 0x1f) << (11 - 4); - *location = (*location & 0x1fff07f) | imm11_5 | imm4_0; - return 0; + + return riscv_insn_rmw(location, 0x1fff07f, imm11_5 | imm4_0); } -static int apply_r_riscv_got_hi20_rela(struct module *me, u32 *location, +static int apply_r_riscv_got_hi20_rela(struct module *me, void *location, Elf_Addr v) { - ptrdiff_t offset = (void *)v - (void *)location; - s32 hi20; + ptrdiff_t offset = (void *)v - location; /* Always emit the got entry */ if (IS_ENABLED(CONFIG_MODULE_SECTIONS)) { - offset = module_emit_got_entry(me, v); - offset = (void *)offset - (void *)location; + offset = (void *)module_emit_got_entry(me, v) - location; } else { pr_err( "%s: can not generate the GOT entry for symbol = %016llx from PC = %p\n", @@ -202,22 +208,19 @@ static int apply_r_riscv_got_hi20_rela(struct module *me, u32 *location, return -EINVAL; } - hi20 = (offset + 0x800) & 0xfffff000; - *location = (*location & 0xfff) | hi20; - return 0; + return riscv_insn_rmw(location, 0xfff, (offset + 0x800) & 0xfffff000); } -static int apply_r_riscv_call_plt_rela(struct module *me, u32 *location, +static int apply_r_riscv_call_plt_rela(struct module *me, void *location, Elf_Addr v) { - ptrdiff_t offset = (void *)v - (void *)location; + ptrdiff_t offset = (void *)v - location; u32 hi20, lo12; if (!riscv_insn_valid_32bit_offset(offset)) { /* Only emit the plt entry if offset over 32-bit range */ if (IS_ENABLED(CONFIG_MODULE_SECTIONS)) { - offset = module_emit_plt_entry(me, v); - offset = (void *)offset - (void *)location; + offset = (void *)module_emit_plt_entry(me, v) - location; } else { pr_err( "%s: target %016llx can not be addressed by the 32-bit offset from PC = %p\n", @@ -228,15 +231,14 @@ static int apply_r_riscv_call_plt_rela(struct module *me, u32 *location, hi20 = (offset + 0x800) & 0xfffff000; lo12 = (offset - hi20) & 0xfff; - *location = (*location & 0xfff) | hi20; - *(location + 1) = (*(location + 1) & 0xfffff) | (lo12 << 20); - return 0; + riscv_insn_rmw(location, 0xfff, hi20); + return riscv_insn_rmw(location + 4, 0xfffff, lo12 << 20); } -static int apply_r_riscv_call_rela(struct module *me, u32 *location, +static int apply_r_riscv_call_rela(struct module *me, void *location, Elf_Addr v) { - ptrdiff_t offset = (void *)v - (void *)location; + ptrdiff_t offset = (void *)v - location; u32 hi20, lo12; if (!riscv_insn_valid_32bit_offset(offset)) { @@ -248,18 +250,17 @@ static int apply_r_riscv_call_rela(struct module *me, u32 *location, hi20 = (offset + 0x800) & 0xfffff000; lo12 = (offset - hi20) & 0xfff; - *location = (*location & 0xfff) | hi20; - *(location + 1) = (*(location + 1) & 0xfffff) | (lo12 << 20); - return 0; + riscv_insn_rmw(location, 0xfff, hi20); + return riscv_insn_rmw(location + 4, 0xfffff, lo12 << 20); } -static int apply_r_riscv_relax_rela(struct module *me, u32 *location, +static int apply_r_riscv_relax_rela(struct module *me, void *location, Elf_Addr v) { return 0; } -static int apply_r_riscv_align_rela(struct module *me, u32 *location, +static int apply_r_riscv_align_rela(struct module *me, void *location, Elf_Addr v) { pr_err( @@ -268,49 +269,49 @@ static int apply_r_riscv_align_rela(struct module *me, u32 *location, return -EINVAL; } -static int apply_r_riscv_add16_rela(struct module *me, u32 *location, +static int apply_r_riscv_add16_rela(struct module *me, void *location, Elf_Addr v) { *(u16 *)location += (u16)v; return 0; } -static int apply_r_riscv_add32_rela(struct module *me, u32 *location, +static int apply_r_riscv_add32_rela(struct module *me, void *location, Elf_Addr v) { *(u32 *)location += (u32)v; return 0; } -static int apply_r_riscv_add64_rela(struct module *me, u32 *location, +static int apply_r_riscv_add64_rela(struct module *me, void *location, Elf_Addr v) { *(u64 *)location += (u64)v; return 0; } -static int apply_r_riscv_sub16_rela(struct module *me, u32 *location, +static int apply_r_riscv_sub16_rela(struct module *me, void *location, Elf_Addr v) { *(u16 *)location -= (u16)v; return 0; } -static int apply_r_riscv_sub32_rela(struct module *me, u32 *location, +static int apply_r_riscv_sub32_rela(struct module *me, void *location, Elf_Addr v) { *(u32 *)location -= (u32)v; return 0; } -static int apply_r_riscv_sub64_rela(struct module *me, u32 *location, +static int apply_r_riscv_sub64_rela(struct module *me, void *location, Elf_Addr v) { *(u64 *)location -= (u64)v; return 0; } -static int (*reloc_handlers_rela[]) (struct module *me, u32 *location, +static int (*reloc_handlers_rela[]) (struct module *me, void *location, Elf_Addr v) = { [R_RISCV_32] = apply_r_riscv_32_rela, [R_RISCV_64] = apply_r_riscv_64_rela, @@ -342,9 +343,9 @@ int apply_relocate_add(Elf_Shdr *sechdrs, const char *strtab, struct module *me) { Elf_Rela *rel = (void *) sechdrs[relsec].sh_addr; - int (*handler)(struct module *me, u32 *location, Elf_Addr v); + int (*handler)(struct module *me, void *location, Elf_Addr v); Elf_Sym *sym; - u32 *location; + void *location; unsigned int i, type; Elf_Addr v; int res; From patchwork Wed Oct 18 22:51:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charlie Jenkins X-Patchwork-Id: 13428065 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3D922CDB47E for ; Wed, 18 Oct 2023 22:51:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EBBFC80059; Wed, 18 Oct 2023 18:51:09 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E1B0E8004A; Wed, 18 Oct 2023 18:51:09 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C449480059; Wed, 18 Oct 2023 18:51:09 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id B0AB48004A for ; Wed, 18 Oct 2023 18:51:09 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 8D09DA0EA1 for ; Wed, 18 Oct 2023 22:51:09 +0000 (UTC) X-FDA: 81360079458.23.5ECA22F Received: from mail-oo1-f42.google.com (mail-oo1-f42.google.com [209.85.161.42]) by imf04.hostedemail.com (Postfix) with ESMTP id A5B7540010 for ; Wed, 18 Oct 2023 22:51:07 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=IUQfS6yI; spf=pass (imf04.hostedemail.com: domain of charlie@rivosinc.com designates 209.85.161.42 as permitted sender) smtp.mailfrom=charlie@rivosinc.com; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1697669467; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=S1uOkf1NiZkarUauiGeyDxtxxY4fQFa9Lo8cXzDP0vs=; b=2uA8Mba8PUoes/MIdEklarcdCY//lzF6unW0eQuokchBdpbI+nlZi6q1HC7SCQZBtTJVjf vPkO0ssg/fHoWjMGY6dcYPbAqPw6xG9Ast5rvrx/0EPgO0MQP9xm7/ruWybYpCfpDlIliQ hduhgCTM2PHwZzC5HIFYMeyKiaUaWY8= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1697669467; a=rsa-sha256; cv=none; b=8WSlRs0VnorrAdqaLMv4BWAW5ik4h6ew/TkWfzUwqRMr5x6xjaHe5kvvmZE355HBrphaH3 JNeyQJidsmzY0/V3IAWDzZekw8VP58enM2Pgmpj1FRw6U1bXCziVEOKtRi+1UY966h5uBG 4ej/j5yYqR8dBdZDg/poK1eftMsiBgg= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=IUQfS6yI; spf=pass (imf04.hostedemail.com: domain of charlie@rivosinc.com designates 209.85.161.42 as permitted sender) smtp.mailfrom=charlie@rivosinc.com; dmarc=none Received: by mail-oo1-f42.google.com with SMTP id 006d021491bc7-57de6e502fcso4281262eaf.3 for ; Wed, 18 Oct 2023 15:51:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1697669467; x=1698274267; darn=kvack.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=S1uOkf1NiZkarUauiGeyDxtxxY4fQFa9Lo8cXzDP0vs=; b=IUQfS6yIIjkcptBnjkubuk0LqdxYk5YVtiWwhfx298QJiRHph4ggnWyE5ECT/FZV5V oLI31jwOSzZkbTIl3kIZX9wuVNaBiLhQP70axHddd7Q9d4JGe/y3t+bgXDz+D+e2ZfYG 2H6vRdjULLh25R1Oio+ob53jKpCwHVVtoTORxdNebeppRium90ISt/KrEmmvzKzotEa6 XT13c4h68Miv4hhj1IpXPBI3LkeWtmrxwaWbhlz0sRW8zbPSrb/VlLYuNAAz1s+Dx9xF 2ulikuNnAirdD7j8wp+/+dUlcw7ALsTzxiI3qs/qvhbrG81V2V3i37Z3ySIW4WMGMOWC ACZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697669467; x=1698274267; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=S1uOkf1NiZkarUauiGeyDxtxxY4fQFa9Lo8cXzDP0vs=; b=u1/EKkd80wuuMBA6QfdK2NjnU9+yTqlIHuSfpwFd3dhc4cs2QB18oj3Y7Bjkmgl15D UL+wdzfVnMNL159U4C4+89gv6hOf7xr9HLpfuD3aQipaMc1gf+b2gKa/Ex7kWEcz0Osu xJkWOiKPvVPg1gCNT8mfn1/1ULKroTVO7jfQMHeRQoM22///W1R/YZqFY9CYxiuUZPzY EWy6IAB7VaVwcxHDmm+E5oTMBxVvPO/NX/ANvVFHfVg1qNQOqCkXhW2bZrZs3UPwXtXn Je5/9+yUVltapc12yiFqW6bNeIJg1mAlREBhXYSE4/Y/L9VtOTeKUJ6fUEr7MbYz+v/W uT1g== X-Gm-Message-State: AOJu0YyRQpmrx5yVOg57NQjR39fWNSzQqbRNT0zTJFE6z/YyKd089FuS oMb54JL3ISI2Wpwej3b9vxoIlA== X-Google-Smtp-Source: AGHT+IEtzWz8g24fWgfdHYEKhHWGC54JwBMSLU7IRf5/BYXnJUN90eqa3OVgEHJ/ffOIkrQrMaT9yA== X-Received: by 2002:a4a:c50a:0:b0:582:1a20:7cb8 with SMTP id i10-20020a4ac50a000000b005821a207cb8mr702837ooq.0.1697669466854; Wed, 18 Oct 2023 15:51:06 -0700 (PDT) Received: from charlie.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id r195-20020a4a37cc000000b00581e7506f2fsm641134oor.9.2023.10.18.15.51.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 15:51:06 -0700 (PDT) From: Charlie Jenkins Date: Wed, 18 Oct 2023 15:51:02 -0700 Subject: [PATCH v5 2/3] riscv: Add remaining module relocations MIME-Version: 1.0 Message-Id: <20231018-module_relocations-v5-2-dfee32d4dfc3@rivosinc.com> References: <20231018-module_relocations-v5-0-dfee32d4dfc3@rivosinc.com> In-Reply-To: <20231018-module_relocations-v5-0-dfee32d4dfc3@rivosinc.com> To: linux-riscv@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Eric Biederman , Kees Cook , Paul Walmsley , Palmer Dabbelt , Albert Ou , Andreas Schwab , Emil Renner Berthing , Samuel Holland , Charlie Jenkins X-Mailer: b4 0.12.3 X-Rspamd-Queue-Id: A5B7540010 X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: 43qdummiiikoggxecmd14bdgduy7mpem X-HE-Tag: 1697669467-271227 X-HE-Meta: U2FsdGVkX1/lqQMPo7a18VVutnHSRtqcpAyKHl4z5x4kgay8KHXJ3b0q855hUEdZR7bYJFdB8dRDcx868cFr3donpXk5onZmWVSUYgSKO1uSZOSB9ykZ8rUINAYSosKnfVe4zOr10xF2LMLHXgPxkoEx40tde7GkJRkVnSIGR8CeJyiILq2HeUKUM247eYsk8Q5TiB0XkZmHYp+XBixhWD6LxzP76OQe9MsFPXT4zgV7UIqOVgeTqKQWan6y4+mxEmgAUOKGdFgZ7HwyFDPZP+hAyGrCN4tYQleCzSvpN0rXyg4XZA70tOpYQyhrjdk6OEVHCdCg3IWK51njctREvog0y+6rVQfxjRE9qmUBkS69Qor6v7vJlYRVwMIt2+rsI4FbVOMUUDxfZ+7rEV02G0gBtw34cwBXo800tEr/mMOdBnOFpvumbZq7Iu2iufVRt/glTsAElJ9yguhXmf9i9DBQtLPVGiXdUTKqGgBhRRfFQQQx3O1mN62QusVEpLHmV8rfEtsz0V1cDTZioFHL6dkiaRCmEVccxC8rEsZQeE/bptrWzSyeTr8Jny+e0n37Av7f1h5ugR31wE2wnHXxZGWSTrsckXmBnHcoEC0zjI2X0+NGzCcM1kw+kv/Tn8jmjy4HTjv94NTIm6sbIibF4JiKzGJOsZL8wuU530Gq6NA1ffHJiVOfE++Uk95y+IVGBtOp6ZHpGLaJYpDyQIhvImWk8BcuSXkdQ0TKiUSR0jgXqpAjTPmP4DKVcnBRc5VzJJZdW1GRiuQXnh83FhqU5rHT2AaeUhUmzwW4Ac6WEA15Wq8a1ZxFJo5k1Bi2tX3E7U1gAzZvYqQSPU1AQdlGw4C6zYwtMW9JuCjdSFBBhVkqb0TYkdLf/wfW9i2ZRrhPlvINzR+RD9VUcxPMWZNi3WIeABlRCktLE0PnLcwSOzIvFqqKruigwZk4TrjfSKn+FWN0EEkPuclmdyqX26l eOAZpqRK PGn79P3Lzfw96uOvizQRK10SKQ3xZ3wj1MlLiYMuYTisgiVqCVGZnbeyVsuCR6y98QlQ322sA0dXW5R6AwxnvXHi/DXhcATPFbVT03t4cTrDTc9BIrPcU+2TvdBPQDr/bKbK5tzqxG76hQUxID8zdjMyIWCqmaV1EDwWiZizU066odx5zZmxKD0rdPYbv4vGfU5cvW/uoVf+vw0VoyGk1QiTLm+ATFLZvGHRbWsiAIaO5l8p9m/xQtxPFHxAm5UQQ4IMEHQvkKa0Qoo/m+yPwOmn+GJLWP4SvPlSPwN7ox8PA2jgMozjrthPmyV+isqXUv6cgEhA06uCcGdS2azjEXaeTSTfT03xlCwj9VktSx1IDNeZGU53mW5ItGcHMM5D+Q7r1eKMDZFgor8KrFExbL6wGPr5pvDZMBWjVwjm8smJ5fS6tZEvGbwI/KqEy6QgE3SkTGInSEvIa28w= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000207, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Add all final module relocations and add error logs explaining the ones that are not supported. Signed-off-by: Charlie Jenkins --- arch/riscv/include/uapi/asm/elf.h | 5 +- arch/riscv/kernel/module.c | 220 +++++++++++++++++++++++++++++++++----- 2 files changed, 199 insertions(+), 26 deletions(-) diff --git a/arch/riscv/include/uapi/asm/elf.h b/arch/riscv/include/uapi/asm/elf.h index d696d6610231..11a71b8533d5 100644 --- a/arch/riscv/include/uapi/asm/elf.h +++ b/arch/riscv/include/uapi/asm/elf.h @@ -49,6 +49,7 @@ typedef union __riscv_fp_state elf_fpregset_t; #define R_RISCV_TLS_DTPREL64 9 #define R_RISCV_TLS_TPREL32 10 #define R_RISCV_TLS_TPREL64 11 +#define R_RISCV_IRELATIVE 58 /* Relocation types not used by the dynamic linker */ #define R_RISCV_BRANCH 16 @@ -81,7 +82,6 @@ typedef union __riscv_fp_state elf_fpregset_t; #define R_RISCV_ALIGN 43 #define R_RISCV_RVC_BRANCH 44 #define R_RISCV_RVC_JUMP 45 -#define R_RISCV_LUI 46 #define R_RISCV_GPREL_I 47 #define R_RISCV_GPREL_S 48 #define R_RISCV_TPREL_I 49 @@ -93,6 +93,9 @@ typedef union __riscv_fp_state elf_fpregset_t; #define R_RISCV_SET16 55 #define R_RISCV_SET32 56 #define R_RISCV_32_PCREL 57 +#define R_RISCV_PLT32 59 +#define R_RISCV_SET_ULEB128 60 +#define R_RISCV_SUB_ULEB128 61 #endif /* _UAPI_ASM_RISCV_ELF_H */ diff --git a/arch/riscv/kernel/module.c b/arch/riscv/kernel/module.c index a9e94e939cb5..3a3d342c09be 100644 --- a/arch/riscv/kernel/module.c +++ b/arch/riscv/kernel/module.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include @@ -269,6 +270,12 @@ static int apply_r_riscv_align_rela(struct module *me, void *location, return -EINVAL; } +static int apply_r_riscv_add8_rela(struct module *me, void *location, Elf_Addr v) +{ + *(u8 *)location += (u8)v; + return 0; +} + static int apply_r_riscv_add16_rela(struct module *me, void *location, Elf_Addr v) { @@ -290,6 +297,12 @@ static int apply_r_riscv_add64_rela(struct module *me, void *location, return 0; } +static int apply_r_riscv_sub8_rela(struct module *me, void *location, Elf_Addr v) +{ + *(u8 *)location -= (u8)v; + return 0; +} + static int apply_r_riscv_sub16_rela(struct module *me, void *location, Elf_Addr v) { @@ -311,31 +324,162 @@ static int apply_r_riscv_sub64_rela(struct module *me, void *location, return 0; } -static int (*reloc_handlers_rela[]) (struct module *me, void *location, - Elf_Addr v) = { - [R_RISCV_32] = apply_r_riscv_32_rela, - [R_RISCV_64] = apply_r_riscv_64_rela, - [R_RISCV_BRANCH] = apply_r_riscv_branch_rela, - [R_RISCV_JAL] = apply_r_riscv_jal_rela, - [R_RISCV_RVC_BRANCH] = apply_r_riscv_rvc_branch_rela, - [R_RISCV_RVC_JUMP] = apply_r_riscv_rvc_jump_rela, - [R_RISCV_PCREL_HI20] = apply_r_riscv_pcrel_hi20_rela, - [R_RISCV_PCREL_LO12_I] = apply_r_riscv_pcrel_lo12_i_rela, - [R_RISCV_PCREL_LO12_S] = apply_r_riscv_pcrel_lo12_s_rela, - [R_RISCV_HI20] = apply_r_riscv_hi20_rela, - [R_RISCV_LO12_I] = apply_r_riscv_lo12_i_rela, - [R_RISCV_LO12_S] = apply_r_riscv_lo12_s_rela, - [R_RISCV_GOT_HI20] = apply_r_riscv_got_hi20_rela, - [R_RISCV_CALL_PLT] = apply_r_riscv_call_plt_rela, - [R_RISCV_CALL] = apply_r_riscv_call_rela, - [R_RISCV_RELAX] = apply_r_riscv_relax_rela, - [R_RISCV_ALIGN] = apply_r_riscv_align_rela, - [R_RISCV_ADD16] = apply_r_riscv_add16_rela, - [R_RISCV_ADD32] = apply_r_riscv_add32_rela, - [R_RISCV_ADD64] = apply_r_riscv_add64_rela, - [R_RISCV_SUB16] = apply_r_riscv_sub16_rela, - [R_RISCV_SUB32] = apply_r_riscv_sub32_rela, - [R_RISCV_SUB64] = apply_r_riscv_sub64_rela, +static int dynamic_linking_not_supported(struct module *me, void *location, + Elf_Addr v) +{ + pr_err("%s: Dynamic linking not supported in kernel modules PC = %p\n", + me->name, location); + return -EINVAL; +} + +static int tls_not_supported(struct module *me, void *location, Elf_Addr v) +{ + pr_err("%s: Thread local storage not supported in kernel modules PC = %p\n", + me->name, location); + return -EINVAL; +} + +static int apply_r_riscv_sub6_rela(struct module *me, void *location, Elf_Addr v) +{ + *(u8 *)location = (*(u8 *)location - ((u8)v & 0x3F)) & 0x3F; + return 0; +} + +static int apply_r_riscv_set6_rela(struct module *me, void *location, Elf_Addr v) +{ + *(u8 *)location = ((*(u8 *)location & 0xc0) | ((u8)v & 0x3F)); + return 0; +} + +static int apply_r_riscv_set8_rela(struct module *me, void *location, Elf_Addr v) +{ + *(u8 *)location = (u8)v; + return 0; +} + +static int apply_r_riscv_set16_rela(struct module *me, void *location, + Elf_Addr v) +{ + *(u16 *)location = (u16)v; + return 0; +} + +static int apply_r_riscv_set32_rela(struct module *me, void *location, + Elf_Addr v) +{ + *(u32 *)location = (u32)v; + return 0; +} + +static int apply_r_riscv_32_pcrel_rela(struct module *me, void *location, + Elf_Addr v) +{ + *(u32 *)location = v - (unsigned long)location; + return 0; +} + +static int apply_r_riscv_plt32_rela(struct module *me, void *location, + Elf_Addr v) +{ + ptrdiff_t offset = (void *)v - location; + + if (!riscv_insn_valid_32bit_offset(offset)) { + /* Only emit the plt entry if offset over 32-bit range */ + if (IS_ENABLED(CONFIG_MODULE_SECTIONS)) { + offset = (void *)module_emit_plt_entry(me, v) - location; + } else { + pr_err("%s: target %016llx can not be addressed by the 32-bit offset from PC = %p\n", + me->name, (long long)v, location); + return -EINVAL; + } + } + + *(u32 *)location = (u32)offset; + return 0; +} + +static int apply_r_riscv_set_uleb128(struct module *me, void *location, Elf_Addr v) +{ + /* + * Relocation is only performed if R_RISCV_SET_ULEB128 is followed by + * R_RISCV_SUB_ULEB128 so do computation there + */ + return 0; +} + +static int apply_r_riscv_sub_uleb128(struct module *me, void *location, Elf_Addr v) +{ + if (v >= 128) { + pr_err("%s: uleb128 must be in [0, 127] (not %ld) at PC = %p\n", + me->name, (unsigned long)v, location); + return -EINVAL; + } + + *(u32 *)location = (*(u32 *)location & ~((u32)127)) | (v & 127); + return 0; +} + +/* + * Relocations defined in the riscv-elf-psabi-doc. + * This handles static linking only. + */ +static int (*reloc_handlers_rela[])(struct module *me, u32 *location, + Elf_Addr v) = { + [R_RISCV_32] = apply_r_riscv_32_rela, + [R_RISCV_64] = apply_r_riscv_64_rela, + [R_RISCV_RELATIVE] = dynamic_linking_not_supported, + [R_RISCV_COPY] = dynamic_linking_not_supported, + [R_RISCV_JUMP_SLOT] = dynamic_linking_not_supported, + [R_RISCV_TLS_DTPMOD32] = dynamic_linking_not_supported, + [R_RISCV_TLS_DTPMOD64] = dynamic_linking_not_supported, + [R_RISCV_TLS_DTPREL32] = dynamic_linking_not_supported, + [R_RISCV_TLS_DTPREL64] = dynamic_linking_not_supported, + [R_RISCV_TLS_TPREL32] = dynamic_linking_not_supported, + [R_RISCV_TLS_TPREL64] = dynamic_linking_not_supported, + /* 12-15 undefined */ + [R_RISCV_BRANCH] = apply_r_riscv_branch_rela, + [R_RISCV_JAL] = apply_r_riscv_jal_rela, + [R_RISCV_CALL] = apply_r_riscv_call_rela, + [R_RISCV_CALL_PLT] = apply_r_riscv_call_plt_rela, + [R_RISCV_GOT_HI20] = apply_r_riscv_got_hi20_rela, + [R_RISCV_TLS_GOT_HI20] = tls_not_supported, + [R_RISCV_TLS_GD_HI20] = tls_not_supported, + [R_RISCV_PCREL_HI20] = apply_r_riscv_pcrel_hi20_rela, + [R_RISCV_PCREL_LO12_I] = apply_r_riscv_pcrel_lo12_i_rela, + [R_RISCV_PCREL_LO12_S] = apply_r_riscv_pcrel_lo12_s_rela, + [R_RISCV_HI20] = apply_r_riscv_hi20_rela, + [R_RISCV_LO12_I] = apply_r_riscv_lo12_i_rela, + [R_RISCV_LO12_S] = apply_r_riscv_lo12_s_rela, + [R_RISCV_TPREL_HI20] = tls_not_supported, + [R_RISCV_TPREL_LO12_I] = tls_not_supported, + [R_RISCV_TPREL_LO12_S] = tls_not_supported, + [R_RISCV_TPREL_ADD] = tls_not_supported, + [R_RISCV_ADD8] = apply_r_riscv_add8_rela, + [R_RISCV_ADD16] = apply_r_riscv_add16_rela, + [R_RISCV_ADD32] = apply_r_riscv_add32_rela, + [R_RISCV_ADD64] = apply_r_riscv_add64_rela, + [R_RISCV_SUB8] = apply_r_riscv_sub8_rela, + [R_RISCV_SUB16] = apply_r_riscv_sub16_rela, + [R_RISCV_SUB32] = apply_r_riscv_sub32_rela, + [R_RISCV_SUB64] = apply_r_riscv_sub64_rela, + /* 41-42 reserved for future standard use */ + [R_RISCV_ALIGN] = apply_r_riscv_align_rela, + [R_RISCV_RVC_BRANCH] = apply_r_riscv_rvc_branch_rela, + [R_RISCV_RVC_JUMP] = apply_r_riscv_rvc_jump_rela, + /* 46-50 reserved for future standard use */ + [R_RISCV_RELAX] = apply_r_riscv_relax_rela, + [R_RISCV_SUB6] = apply_r_riscv_sub6_rela, + [R_RISCV_SET6] = apply_r_riscv_set6_rela, + [R_RISCV_SET8] = apply_r_riscv_set8_rela, + [R_RISCV_SET16] = apply_r_riscv_set16_rela, + [R_RISCV_SET32] = apply_r_riscv_set32_rela, + [R_RISCV_32_PCREL] = apply_r_riscv_32_pcrel_rela, + [R_RISCV_IRELATIVE] = dynamic_linking_not_supported, + [R_RISCV_PLT32] = apply_r_riscv_plt32_rela, + [R_RISCV_SET_ULEB128] = apply_r_riscv_set_uleb128, + [R_RISCV_SUB_ULEB128] = apply_r_riscv_sub_uleb128, + /* 62-191 reserved for future standard use */ + /* 192-255 nonstandard ABI extensions */ }; int apply_relocate_add(Elf_Shdr *sechdrs, const char *strtab, @@ -349,6 +493,9 @@ int apply_relocate_add(Elf_Shdr *sechdrs, const char *strtab, unsigned int i, type; Elf_Addr v; int res; + bool uleb128_set_exists = false; + u32 *uleb128_set_loc; + unsigned long uleb128_set_sym_val; pr_debug("Applying relocate section %u to %u\n", relsec, sechdrs[relsec].sh_info); @@ -426,6 +573,29 @@ int apply_relocate_add(Elf_Shdr *sechdrs, const char *strtab, me->name); return -EINVAL; } + } else if (type == R_RISCV_SET_ULEB128) { + if (uleb128_set_exists) { + pr_err("%s: riscv psABI requires the next ULEB128 relocation to come after a R_RISCV_SET_ULEB128 is an R_RISCV_SUB_ULEB128, not another R_RISCV_SET_ULEB128.\n", + me->name); + return -EINVAL; + } + uleb128_set_exists = true; + uleb128_set_loc = location; + uleb128_set_sym_val = + ((Elf_Sym *)sechdrs[symindex].sh_addr + + ELF_RISCV_R_SYM(rel[i].r_info)) + ->st_value + + rel[i].r_addend; + } else if (type == R_RISCV_SUB_ULEB128) { + if (uleb128_set_exists && uleb128_set_loc == location) { + /* Calculate set and subtraction */ + v = uleb128_set_sym_val - v; + } else { + pr_err("%s: R_RISCV_SUB_ULEB128 must always be paired with the first R_RISCV_SET_ULEB128 that comes before it. PC = %p\n", + me->name, location); + return -EINVAL; + } + uleb128_set_exists = false; } res = handler(me, location, v); From patchwork Wed Oct 18 22:51:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charlie Jenkins X-Patchwork-Id: 13428066 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id A9C3FCDB482 for ; Wed, 18 Oct 2023 22:51:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9B0928005E; Wed, 18 Oct 2023 18:51:12 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 90FF58004A; Wed, 18 Oct 2023 18:51:12 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6C7B98005E; Wed, 18 Oct 2023 18:51:12 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 54D9D8004A for ; Wed, 18 Oct 2023 18:51:12 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 2C537803BC for ; Wed, 18 Oct 2023 22:51:12 +0000 (UTC) X-FDA: 81360079584.18.CE9F381 Received: from mail-oo1-f48.google.com (mail-oo1-f48.google.com [209.85.161.48]) by imf19.hostedemail.com (Postfix) with ESMTP id 25F411A0016 for ; Wed, 18 Oct 2023 22:51:08 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=pUzPJDkd; dmarc=none; spf=pass (imf19.hostedemail.com: domain of charlie@rivosinc.com designates 209.85.161.48 as permitted sender) smtp.mailfrom=charlie@rivosinc.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1697669469; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=ozAkGUmu/g2vPdjYsuI5geKJqXaONTU37MWQT8rh8Io=; b=hU/T9wgWgMiYMZy4p3JAmDwKzaRk3NPUsdfWvU58CmSaWu53pVl2LD8yrm32DJgULmsPul N9ode8sAOLBbJwDzTyI7tlAr48UUNZfEePiigdWFluT22738DtTe31XHFsPneeUVnoSlmO qGAn8faOLFBFwTHjTGZFV86msj1ikbk= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=pUzPJDkd; dmarc=none; spf=pass (imf19.hostedemail.com: domain of charlie@rivosinc.com designates 209.85.161.48 as permitted sender) smtp.mailfrom=charlie@rivosinc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1697669469; a=rsa-sha256; cv=none; b=accYOScr3YkWcURCYCpIKGdBpFPp6Sx9WKKLgwoSMBL7GiOGG3fXI95S73rixIhE0w1Hhn QZLi5Gl2N+/QOALsP7ggEnkW5S7pc2MqxZ7J19JV/v4roaloMsOspKgX3GFmwr56TjDRQo GwLBFwQtUpLlmjGeBPQ6rPFKXziEYaU= Received: by mail-oo1-f48.google.com with SMTP id 006d021491bc7-581e819cf28so1103473eaf.3 for ; Wed, 18 Oct 2023 15:51:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1697669468; x=1698274268; darn=kvack.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=ozAkGUmu/g2vPdjYsuI5geKJqXaONTU37MWQT8rh8Io=; b=pUzPJDkdnvIbvg3ALcbBbFc0V1emfV02av13e4q4AdqshlTI9jOjypCFg+x9CD2PHh qvpOkzPTBW+93RuyAgskPT5EOwYIIwaiHxobnZp/dtOSdgwq8Puj6xVrJ2/C3UqknGZL n1/CMidT3fra3bcA/GxzSVf9nBRJ08iBLd6wLHiQ1o1fRxJOAzPoJ7Miz+Y8nLe5vpyA tbJNZhH6T5WrGaMOvjoOtp0+7WNR+hIQCmZ/NP1RC50LefpeKYK1lGCV9w/XU0ytPTuQ D+qEIRoyiw0BGNOp/eIJvcelVL8EJmnHGXNmjsiyOR5h8cmIqI/03u8/qyw2it/xbS/c jUGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697669468; x=1698274268; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ozAkGUmu/g2vPdjYsuI5geKJqXaONTU37MWQT8rh8Io=; b=QC5jNvoGplklNGOXRScBlyRI6IBYds6XnUbkB9WiTatLbxsW8ft4OB7qCnL/8a6ZOl YIvUgLTAM8BGaMpNaPzb9CD9vTewIEs0ZWpZSfnehhWUJHI4ML1S1G1CFaa0ExE1zfD9 iUY7bb1Yl2B5W4jJ8b2vlDPXyviQ36f4Em2VDwfsmS4sfz6rGAXoy08JZ6c/tS6B5xTM Ve9L79Dvbu966bbS9lB6GaJrK1VSP3mC/Zgkr8ZjPfRyNIx7KK4HocJXFa4oG8nOWsbq mRPermTaAHFhOI1ViFSOqx0SrMTuspnD3oMJsffJ3sUqGTJmVXrF2CqJMWlxwESR5POc k/xw== X-Gm-Message-State: AOJu0YzH+Xv/3uuXHbPJ/6JZYE/GvncFILRC3R5Dh1VR2q1KzwPNzNqP bGJq4ySQTt2YI+VyCagZ9usnDw== X-Google-Smtp-Source: AGHT+IHNA+QzIyRBjLZTBxsb6UeEKgsbDuMnE4kRFrzU3mKQZGgci8IZ+QjZBkEHu6Jx3kRgx05QMg== X-Received: by 2002:a4a:c50c:0:b0:573:3fe0:cdd6 with SMTP id i12-20020a4ac50c000000b005733fe0cdd6mr553181ooq.6.1697669468275; Wed, 18 Oct 2023 15:51:08 -0700 (PDT) Received: from charlie.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id r195-20020a4a37cc000000b00581e7506f2fsm641134oor.9.2023.10.18.15.51.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 15:51:07 -0700 (PDT) From: Charlie Jenkins Date: Wed, 18 Oct 2023 15:51:03 -0700 Subject: [PATCH v5 3/3] riscv: Add tests for riscv module loading MIME-Version: 1.0 Message-Id: <20231018-module_relocations-v5-3-dfee32d4dfc3@rivosinc.com> References: <20231018-module_relocations-v5-0-dfee32d4dfc3@rivosinc.com> In-Reply-To: <20231018-module_relocations-v5-0-dfee32d4dfc3@rivosinc.com> To: linux-riscv@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Eric Biederman , Kees Cook , Paul Walmsley , Palmer Dabbelt , Albert Ou , Andreas Schwab , Emil Renner Berthing , Samuel Holland , Charlie Jenkins X-Mailer: b4 0.12.3 X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 25F411A0016 X-Stat-Signature: s4kzymr4t73d7rbz9wfjow7ctxcxagda X-HE-Tag: 1697669468-170337 X-HE-Meta: U2FsdGVkX19SisQflWZ3mfhm/ReDn4Bu+KzoprlFMwxctmmSi+WJ1orNMio19NK8C6ajUvBIDQSqbFB0Nc23soalJbl8FbLhasNH3JEUYVfNt+SUPqTUNLogjzzgsj+JJqyYKlLQ67kp94iVqM44+U1gQeLAf7UDnBPW1StU/aLgnG/4wFxttiVAN19dqUWH/dnLjw7g1rIaQyzH1FSVL+zLbJXwnS6Z0JA250EF5eIRXBdSok3uCLBKgobDqcFanflOHaRhI+kxffUK0Opf3AXCXg9EpKm1lEqC9XC5Nx8JpQBYP++7DK46Gn8VszQN/qj6wLYgD5Pv/XH5nJmyn00WqlZ8QA5tlc7pHgPNJNm1ePh9UkFqM98qmNAwAbTpclTwF4kpUDmJ7vFlmNxf/3c4lrkHCeXCVVPOtypGmZRIU2+AQGaO89RCq9LdtI2tkFbvp4De/2Bmn9GpG4u3tQCrTtycZJtoCprcDWJUYCekAQ+oAtKTapbtsE5E7UI0gT96bS2NYQNJ6PhW/bZJYntvNlFc4Sli3Xia0bm+azuK9X9cz9ENN9g4CHpkafrTGm/Y20aMMGN90d1pRbi1WHALIHfBR3OMpb/xBCbw4lv2Vt9PHt6CVm/dwDTucepEfoN46ADOiSWBACiJX/Gew3ADf2jWQg78s/TVx30SzlULm4zrxE/a8wNfDad6hxsjr9oRex91LViVYYuFFZ+hwTvAUEfNc/0PQDUxkhw7TnlvCo735YXX/ehgpEvB/8xajjStilbzaBoBk71ZSCquIrFiT5BWPw0es/DandOe0kakn+/YWVNsr5lo3y4qlU4oT9Y8uKF/IHY2mGIPP8ct140Ufb/DvaOHmdPqLhHGJ9w63jjHX9/6SHF/fB6LHfss1z3xP/9K6XgZU9lKAJFQ79CaOLzkQJyBK6cNT4Jb/tj+k7GEjzW7fVbC/vJup1W8kAMOGE0J3UHvfd/gWd/ gAg8h7q7 sai2OT84K9UaVrajTnMGRsuG2woJaH6pUflBfnqCIaZgVUZXApynE+PlXCbZg946+Y0HFiqWRM3LeOzHpU8QKJRIo5dVYf3CGZ7I7LmRo/EoGXfqVw1xn3sb5AH8Nwr5/Agz65QGlZYEU8bjCUASLjJCCgQf/NpnCaFPBMksb9SYILb8fdmxHDYVp9AUpDBNMd1ez5pwEaIU1yLkyRd3WfrO1UN38pPRAyZ4Kl3fOdoZv8/ASWZhcn2mreQ6U5gsQd6SlVzcaY+tn9e0mWoOaIpmN4wymSYttpapTWkGLzHQPCF41Mo5Vsk4eCRMzhKVh0qxKee9H3PHtz7ROx4Fmp+cvEGcAfqqOYmjj00U+s2HeyN9r/eIKfjXnrOmC3X434Pc5KeOtSJzJbGPjnqqWqSUdZ/HzCu2s51Eayc983Sdac13UZaXSA0q3IY3yatPQ/topCbk+4NSV5oxq+CEdvsGRb2+jLt4mrLzxtHAiuQfHxZAh6QOKPIzPSVQlz3MrzP8XQgNrpENdaiE= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000940, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Add test cases for the two main groups of relocations added: SUB and SET, along with uleb128 which is a bit different because SUB and SET are required to happen together. Signed-off-by: Charlie Jenkins --- arch/riscv/Kconfig.debug | 1 + arch/riscv/kernel/Makefile | 1 + arch/riscv/kernel/tests/Kconfig.debug | 35 +++++++++ arch/riscv/kernel/tests/Makefile | 1 + arch/riscv/kernel/tests/module_test/Makefile | 15 ++++ .../tests/module_test/test_module_linking_main.c | 85 ++++++++++++++++++++++ arch/riscv/kernel/tests/module_test/test_set16.S | 23 ++++++ arch/riscv/kernel/tests/module_test/test_set32.S | 20 +++++ arch/riscv/kernel/tests/module_test/test_set6.S | 23 ++++++ arch/riscv/kernel/tests/module_test/test_set8.S | 23 ++++++ arch/riscv/kernel/tests/module_test/test_sub16.S | 22 ++++++ arch/riscv/kernel/tests/module_test/test_sub32.S | 22 ++++++ arch/riscv/kernel/tests/module_test/test_sub6.S | 22 ++++++ arch/riscv/kernel/tests/module_test/test_sub64.S | 27 +++++++ arch/riscv/kernel/tests/module_test/test_sub8.S | 22 ++++++ arch/riscv/kernel/tests/module_test/test_uleb128.S | 20 +++++ 16 files changed, 362 insertions(+) diff --git a/arch/riscv/Kconfig.debug b/arch/riscv/Kconfig.debug index e69de29bb2d1..eafe17ebf710 100644 --- a/arch/riscv/Kconfig.debug +++ b/arch/riscv/Kconfig.debug @@ -0,0 +1 @@ +source "arch/riscv/kernel/tests/Kconfig.debug" diff --git a/arch/riscv/kernel/Makefile b/arch/riscv/kernel/Makefile index 95cf25d48405..bb99657252f4 100644 --- a/arch/riscv/kernel/Makefile +++ b/arch/riscv/kernel/Makefile @@ -57,6 +57,7 @@ obj-y += stacktrace.o obj-y += cacheinfo.o obj-y += patch.o obj-y += probes/ +obj-y += tests/ obj-$(CONFIG_MMU) += vdso.o vdso/ obj-$(CONFIG_RISCV_M_MODE) += traps_misaligned.o diff --git a/arch/riscv/kernel/tests/Kconfig.debug b/arch/riscv/kernel/tests/Kconfig.debug new file mode 100644 index 000000000000..5dba64e8e977 --- /dev/null +++ b/arch/riscv/kernel/tests/Kconfig.debug @@ -0,0 +1,35 @@ +# SPDX-License-Identifier: GPL-2.0-only +menu "arch/riscv/kernel Testing and Coverage" + +config AS_HAS_ULEB128 + def_bool $(as-instr,.reloc label$(comma) R_RISCV_SET_ULEB128$(comma) 127\n.reloc label$(comma) R_RISCV_SUB_ULEB128$(comma) 127\nlabel:\n.word 0) + +menuconfig RUNTIME_KERNEL_TESTING_MENU + bool "arch/riscv/kernel runtime Testing" + def_bool y + help + Enable riscv kernel runtime testing. + +if RUNTIME_KERNEL_TESTING_MENU + +config RISCV_MODULE_LINKING_KUNIT + bool "KUnit test riscv module linking at runtime" if !KUNIT_ALL_TESTS + depends on KUNIT + default KUNIT_ALL_TESTS + help + Enable this option to test riscv module linking at boot. This will + enable a module called "test_module_linking". + + KUnit tests run during boot and output the results to the debug log + in TAP format (http://testanything.org/). Only useful for kernel devs + running the KUnit test harness, and not intended for inclusion into a + production build. + + For more information on KUnit and unit tests in general please refer + to the KUnit documentation in Documentation/dev-tools/kunit/. + + If unsure, say N. + +endif # RUNTIME_TESTING_MENU + +endmenu # "arch/riscv/kernel runtime Testing" diff --git a/arch/riscv/kernel/tests/Makefile b/arch/riscv/kernel/tests/Makefile new file mode 100644 index 000000000000..7d6c76cffe20 --- /dev/null +++ b/arch/riscv/kernel/tests/Makefile @@ -0,0 +1 @@ +obj-$(CONFIG_RISCV_MODULE_LINKING_KUNIT) += module_test/ diff --git a/arch/riscv/kernel/tests/module_test/Makefile b/arch/riscv/kernel/tests/module_test/Makefile new file mode 100644 index 000000000000..d7a6fd8943de --- /dev/null +++ b/arch/riscv/kernel/tests/module_test/Makefile @@ -0,0 +1,15 @@ +obj-m += test_module_linking.o + +test_sub := test_sub6.o test_sub8.o test_sub16.o test_sub32.o test_sub64.o + +test_set := test_set6.o test_set8.o test_set16.o test_set32.o + +test_module_linking-objs += $(test_sub) + +test_module_linking-objs += $(test_set) + +ifeq ($(CONFIG_AS_HAS_ULEB128),y) +test_module_linking-objs += test_uleb128.o +endif + +test_module_linking-objs += test_module_linking_main.o diff --git a/arch/riscv/kernel/tests/module_test/test_module_linking_main.c b/arch/riscv/kernel/tests/module_test/test_module_linking_main.c new file mode 100644 index 000000000000..49820352f1df --- /dev/null +++ b/arch/riscv/kernel/tests/module_test/test_module_linking_main.c @@ -0,0 +1,85 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2023 Rivos Inc. + */ + +#include +#include +#include +#include + +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("Test module linking"); + +extern int test_set32(void); +extern int test_set16(void); +extern int test_set8(void); +extern int test_set6(void); +extern long test_sub64(void); +extern int test_sub32(void); +extern int test_sub16(void); +extern int test_sub8(void); +extern int test_sub6(void); + +#ifdef CONFIG_AS_HAS_ULEB128 +extern int test_uleb(void); +#endif + +#define CHECK_EQ(lhs, rhs) KUNIT_ASSERT_EQ(test, lhs, rhs) + +void run_test_set(struct kunit *test); +void run_test_sub(struct kunit *test); +void run_test_uleb(struct kunit *test); + +void run_test_set(struct kunit *test) +{ + int val32 = test_set32(); + int val16 = test_set16(); + int val8 = test_set8(); + int val6 = test_set6(); + + CHECK_EQ(val32, 0); + CHECK_EQ(val16, 0); + CHECK_EQ(val8, 0); + CHECK_EQ(val6, 0); +} + +void run_test_sub(struct kunit *test) +{ + int val64 = test_sub64(); + int val32 = test_sub32(); + int val16 = test_sub16(); + int val8 = test_sub8(); + int val6 = test_sub6(); + + CHECK_EQ(val64, 0); + CHECK_EQ(val32, 0); + CHECK_EQ(val16, 0); + CHECK_EQ(val8, 0); + CHECK_EQ(val6, 0); +} + +#ifdef CONFIG_AS_HAS_ULEB128 +void run_test_uleb(struct kunit *test) +{ + int valuleb = test_uleb(); + + CHECK_EQ(valuleb, 0); +} +#endif + +static struct kunit_case __refdata riscv_module_linking_test_cases[] = { + KUNIT_CASE(run_test_set), + KUNIT_CASE(run_test_sub), +#ifdef CONFIG_AS_HAS_ULEB128 + KUNIT_CASE(run_test_uleb), +#endif + {} +}; + +static struct kunit_suite riscv_module_linking_test_suite = { + .name = "riscv_checksum", + .test_cases = riscv_module_linking_test_cases, +}; + +kunit_test_suites(&riscv_module_linking_test_suite); diff --git a/arch/riscv/kernel/tests/module_test/test_set16.S b/arch/riscv/kernel/tests/module_test/test_set16.S new file mode 100644 index 000000000000..2be0e441a12e --- /dev/null +++ b/arch/riscv/kernel/tests/module_test/test_set16.S @@ -0,0 +1,23 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Copyright (C) 2023 Rivos Inc. + */ + +.text +.global test_set16 +test_set16: + lw a0, set16 + la t0, set16 +#ifdef CONFIG_32BIT + slli t0, t0, 16 + srli t0, t0, 16 +#else + slli t0, t0, 48 + srli t0, t0, 48 +#endif + sub a0, a0, t0 + ret +.data +set16: + .reloc set16, R_RISCV_SET16, set16 + .word 0 diff --git a/arch/riscv/kernel/tests/module_test/test_set32.S b/arch/riscv/kernel/tests/module_test/test_set32.S new file mode 100644 index 000000000000..de0444537e67 --- /dev/null +++ b/arch/riscv/kernel/tests/module_test/test_set32.S @@ -0,0 +1,20 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Copyright (C) 2023 Rivos Inc. + */ + +.text +.global test_set32 +test_set32: + lw a0, set32 + la t0, set32 +#ifndef CONFIG_32BIT + slli t0, t0, 32 + srli t0, t0, 32 +#endif + sub a0, a0, t0 + ret +.data +set32: + .reloc set32, R_RISCV_SET32, set32 + .word 0 diff --git a/arch/riscv/kernel/tests/module_test/test_set6.S b/arch/riscv/kernel/tests/module_test/test_set6.S new file mode 100644 index 000000000000..c39ce4c219eb --- /dev/null +++ b/arch/riscv/kernel/tests/module_test/test_set6.S @@ -0,0 +1,23 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Copyright (C) 2023 Rivos Inc. + */ + +.text +.global test_set6 +test_set6: + lw a0, set6 + la t0, set6 +#ifdef CONFIG_32BIT + slli t0, t0, 26 + srli t0, t0, 26 +#else + slli t0, t0, 58 + srli t0, t0, 58 +#endif + sub a0, a0, t0 + ret +.data +set6: + .reloc set6, R_RISCV_SET6, set6 + .word 0 diff --git a/arch/riscv/kernel/tests/module_test/test_set8.S b/arch/riscv/kernel/tests/module_test/test_set8.S new file mode 100644 index 000000000000..a656173f6f99 --- /dev/null +++ b/arch/riscv/kernel/tests/module_test/test_set8.S @@ -0,0 +1,23 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Copyright (C) 2023 Rivos Inc. + */ + +.text +.global test_set8 +test_set8: + lw a0, set8 + la t0, set8 +#ifdef CONFIG_32BIT + slli t0, t0, 24 + srli t0, t0, 24 +#else + slli t0, t0, 56 + srli t0, t0, 56 +#endif + sub a0, a0, t0 + ret +.data +set8: + .reloc set8, R_RISCV_SET8, set8 + .word 0 diff --git a/arch/riscv/kernel/tests/module_test/test_sub16.S b/arch/riscv/kernel/tests/module_test/test_sub16.S new file mode 100644 index 000000000000..c561e155d1db --- /dev/null +++ b/arch/riscv/kernel/tests/module_test/test_sub16.S @@ -0,0 +1,22 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Copyright (C) 2023 Rivos Inc. + */ + +.text +.global test_sub16 +test_sub16: + lh a0, sub16 + addi a0, a0, -32 + ret +first: + .rept 8 + .word 0 + .endr +second: + +.data +sub16: + .reloc sub16, R_RISCV_ADD16, second + .reloc sub16, R_RISCV_SUB16, first + .half 0 diff --git a/arch/riscv/kernel/tests/module_test/test_sub32.S b/arch/riscv/kernel/tests/module_test/test_sub32.S new file mode 100644 index 000000000000..93232c70cae6 --- /dev/null +++ b/arch/riscv/kernel/tests/module_test/test_sub32.S @@ -0,0 +1,22 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Copyright (C) 2023 Rivos Inc. + */ + +.text +.global test_sub32 +test_sub32: + lw a0, sub32 + addi a0, a0, -32 + ret +first: + .rept 8 + .word 0 + .endr +second: + +.data +sub32: + .reloc sub32, R_RISCV_ADD32, second + .reloc sub32, R_RISCV_SUB32, first + .word 0 diff --git a/arch/riscv/kernel/tests/module_test/test_sub6.S b/arch/riscv/kernel/tests/module_test/test_sub6.S new file mode 100644 index 000000000000..d9c9526ceb62 --- /dev/null +++ b/arch/riscv/kernel/tests/module_test/test_sub6.S @@ -0,0 +1,22 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Copyright (C) 2023 Rivos Inc. + */ + +.text +.global test_sub6 +test_sub6: + lb a0, sub6 + addi a0, a0, -32 + ret +first: + .rept 8 + .word 0 + .endr +second: + +.data +sub6: + .reloc sub6, R_RISCV_SET6, second + .reloc sub6, R_RISCV_SUB6, first + .byte 0 diff --git a/arch/riscv/kernel/tests/module_test/test_sub64.S b/arch/riscv/kernel/tests/module_test/test_sub64.S new file mode 100644 index 000000000000..6d260e2a5d98 --- /dev/null +++ b/arch/riscv/kernel/tests/module_test/test_sub64.S @@ -0,0 +1,27 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Copyright (C) 2023 Rivos Inc. + */ + +.text +.global test_sub64 +test_sub64: +#ifdef CONFIG_32BIT + lw a0, sub64 +#else + ld a0, sub64 +#endif + addi a0, a0, -32 + ret +first: + .rept 8 + .word 0 + .endr +second: + +.data +sub64: + .reloc sub64, R_RISCV_ADD64, second + .reloc sub64, R_RISCV_SUB64, first + .word 0 + .word 0 diff --git a/arch/riscv/kernel/tests/module_test/test_sub8.S b/arch/riscv/kernel/tests/module_test/test_sub8.S new file mode 100644 index 000000000000..af7849115d4d --- /dev/null +++ b/arch/riscv/kernel/tests/module_test/test_sub8.S @@ -0,0 +1,22 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Copyright (C) 2023 Rivos Inc. + */ + +.text +.global test_sub8 +test_sub8: + lb a0, sub8 + addi a0, a0, -32 + ret +first: + .rept 8 + .word 0 + .endr +second: + +.data +sub8: + .reloc sub8, R_RISCV_ADD8, second + .reloc sub8, R_RISCV_SUB8, first + .byte 0 diff --git a/arch/riscv/kernel/tests/module_test/test_uleb128.S b/arch/riscv/kernel/tests/module_test/test_uleb128.S new file mode 100644 index 000000000000..db9f301092d0 --- /dev/null +++ b/arch/riscv/kernel/tests/module_test/test_uleb128.S @@ -0,0 +1,20 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Copyright (C) 2023 Rivos Inc. + */ + +.text +.global test_uleb +test_uleb: + ld a0, second + addi a0, a0, -127 + ret +.data +first: + .rept 127 + .byte 0 + .endr +second: + .reloc second, R_RISCV_SET_ULEB128, second + .reloc second, R_RISCV_SUB_ULEB128, first + .dword 0