From patchwork Thu Oct 19 21:41:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charlie Jenkins X-Patchwork-Id: 13429890 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 5934FC004C0 for ; Thu, 19 Oct 2023 21:41:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E4EE5800BE; Thu, 19 Oct 2023 17:41:31 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DB14A800BC; Thu, 19 Oct 2023 17:41:31 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C7940800BE; Thu, 19 Oct 2023 17:41:31 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id B83DD800BC for ; Thu, 19 Oct 2023 17:41:31 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 728BD1A13F6 for ; Thu, 19 Oct 2023 21:41:31 +0000 (UTC) X-FDA: 81363532782.24.65D70B3 Received: from mail-ot1-f52.google.com (mail-ot1-f52.google.com [209.85.210.52]) by imf27.hostedemail.com (Postfix) with ESMTP id 7E8D34000E for ; Thu, 19 Oct 2023 21:41:29 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=c1OpIZgn; dmarc=none; spf=pass (imf27.hostedemail.com: domain of charlie@rivosinc.com designates 209.85.210.52 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=1697751689; 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=JPdcqeeh8Bf9EGE+8/jmc0H00aqfMiFrNQMgnFZ959KC89ygEURJ3SZg63XceOBUyf+TQ8 TqBqXgVuon1VGoDUrqhQbAn0tQ9q5cpVbij1RClibvJWAzNOO+OJEwwdjVlzutaNaazprA 4V0TzlTJpykIa3CU35X0RL8svl/XlNY= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=c1OpIZgn; dmarc=none; spf=pass (imf27.hostedemail.com: domain of charlie@rivosinc.com designates 209.85.210.52 as permitted sender) smtp.mailfrom=charlie@rivosinc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1697751689; a=rsa-sha256; cv=none; b=x/JbfO4RdfIx6SXUrBUVMVHT/hM/dmrvkEvZv461odUq85FNA2zqF80rDoTFmhscjqooFY tHPSmQuq4VnsOMbtgafSj3r/2MEnbuHuAk3ec4/MstsR1Ok5ilI3EoXXbxj29DHSYnkIJN XSL1qX9rXAxgxAKz2vT1Kk8lZatCqeI= Received: by mail-ot1-f52.google.com with SMTP id 46e09a7af769-6ce2988d62eso115996a34.1 for ; Thu, 19 Oct 2023 14:41:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1697751688; x=1698356488; 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=c1OpIZgn34OV0QTY6w/kkwMbxans37X2MPtKgg/Emwk/Fs+vq9WSirzcKvtOpkQT0J honzsuzr9UtL7kvlpctCmnGSMldhuaH1kX5ttwMd6MXCO0SgUpNhvhOMjUCBlPFIjKLm SAF99tBXrb81UHqzCVyeaEFYd/SSimterYaoY/v91WRyUvKbCF0wAJ6StfbklJSPti6C fFtdsL7fJpNmv4/eDVp35qdKH430EhzINtaNEO4Be7cYyDBXRFaABv8j8pXK9TOl1eJA miJxJGOS2y7DLWONclgZvO7/qapTDeq3M9q8AvFWgOrKVNx5JvA57S/Y48lMRMq+9Rtc BijQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697751688; x=1698356488; 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=WNqPfh6tuNjqKBCqlG1Boe62exwKwzdnft35+Hv0Pd+GB/uyjm2TS+k6ccSu3gEDla nng4P9uE/uTNaf4X/Y9aUk2zCvyAHaK84jcQ174RQQk+yHnvG+MTdROWD4EA7h4+fHrb pMqqbbB1TJJLq0BP86CW894ZbCnFv3fJ5EjfynJ0NjxZDNKYY6pXc5zswGsGGn04aluO pVNKnLfVQ4CyrQdH3t6+r5HIMV/uEXYvb+/AXaUgiv90RTATjriagJ5RZcq+WqwyNgoP Quc3eNkXUFkujWGPVxbbsDzRTNbWYPgynmcxeLVkKJa7PWzu1KOttCk0fLwOcIdJGImg cD8w== X-Gm-Message-State: AOJu0Yxu1Wh/90zU/IlBQM82dRJvEABqKPoemub9dbhzVw1W+CuYMslm gByqwl+HP/POAbsn77/rAUmUeA== X-Google-Smtp-Source: AGHT+IEE+8xuYsQMXwMYXaplFxUkaKCbIJOJmgM54RyAhax4BrCFE6tLKTa7uDWpLGJQx/InDquIZg== X-Received: by 2002:a05:6830:2b0b:b0:6b9:4155:7dbd with SMTP id l11-20020a0568302b0b00b006b941557dbdmr78880otv.0.1697751688625; Thu, 19 Oct 2023 14:41:28 -0700 (PDT) Received: from charlie.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id x19-20020a9d6293000000b006ce2c785ac7sm81812otk.8.2023.10.19.14.41.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Oct 2023 14:41:28 -0700 (PDT) From: Charlie Jenkins Date: Thu, 19 Oct 2023 14:41:24 -0700 Subject: [PATCH v6 1/3] riscv: Avoid unaligned access when relocating modules MIME-Version: 1.0 Message-Id: <20231019-module_relocations-v6-1-94726e644321@rivosinc.com> References: <20231019-module_relocations-v6-0-94726e644321@rivosinc.com> In-Reply-To: <20231019-module_relocations-v6-0-94726e644321@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-Rspamd-Queue-Id: 7E8D34000E X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: jjzbrkmx3rk353cfszaoamp9f38qkf8m X-HE-Tag: 1697751689-306733 X-HE-Meta: U2FsdGVkX1+8mNKEDqFvGqHjCMM0vPsqCew1ushoMEq6IwL6Kn17DHOHncQknidEauKYrdJ5oJvwLA2gGmZSEulOqddJLzBYguqkT8h49pL98oZtllI5C21dzR980rqaGiKfKz38nWWNm/WopMqQyhTIfptZBJ+yjVKcv0u1lQoeZKsiA1Pmd4/nWcmYD72MpZJGxCKKQkDQrs3tID9ziylvBhygkJStD6xfDVysNTgRRp+jVu88Gop+On0uMV8EJI9Utl7X8NozDWlwwCxoCoJ+xoF6sLxiDhb27aJiUzEkXiJRbgZZtdPRNDyF7e6KbqqP/mWcGh9/wM/TTWNaCYNwiY/oX48zPlMfliwP8KUYd4uHoBfNonVnfLDNRPZxEzQzFTJUOyb+5aRuSA6jx8tL03wTLWTRaQ5VB/XkaFDnxGnqynUw49wIlDTbyCoDw+LGx42HP2hVtol6ZNnr/q/3ZlkNUXBcRffORNcbj01SoxHvFkbOKl/75tG/oWpRpRrbrBeojpE0XP/jDztkPx/Lh5WMz/blu+nXEom6/k35IXMOHil2ynPdTfF7PvpxwpCOu7ly3OkOX5gh5I+t2/v0ANHW0QqcMC6qs56NWb3oWBakEuxrIroErl5PXHg32IuKxxtjAyC2E27sZUDtSIfFPZbn+x0p5nR733/qO7C2dxsbRpOpw68JZtclQtrrOi1ZvT95im9PTY5sRxI5QVqLqFnWLSf2xSQ7kvOf+WZpZg83DKHRvrFUignyfab9q7PczhVyslopRHgfZrX1dO49jj0ekdwKScmV6AURyGrUfXJ7rcg8FVoa+SSA3WS5Gbj7FfF2jt8AY/l9s7f0x05YBpfm0eWUlo8H6Vz0ouOI53gwD3svTQqAT2q72AEvPeM9B9VKi+OH66ENrTJPSvrytqgLFGYDax5mbg8YF4dVYAK/Oh53CXCOBnbV3CNzRgg07lGVm/7e4qllJfd dzjrauJ4 TqPdVu+N0TBZk2aDHJk7pnFMiKeYsO2R++zix5MYDM4Id+gqSf0dVDwQOJKo7bLgqdl1nb5sTk2446V4LeGbLiAzh4osWq2OTwIwwlgYmOMsiowXvoJ8Jj9wlHo6SybrgSEWU7M4effrbuw+BbC9Kl0+22A3GkSFEd4juMLjXawJ0ApoQdzNdGflVeJq8CF7E1nuoScTeNVC1utiHoXh1te6Q1J8d9uYyiCZLGyL8wSPLrsaYBvNxMpKouikuP/b5M3CWoPP2NxBlGBvUpj5Bu1w6GbOGEwVCAg/kDslp4S7wpBFcgOXClYcpL6jRN3bvqfDLItlTN1p/sl53GFekTGEja2yV/AQ0Qyz22PRxDQ/s/xuUPdtAgsiD3zqFwQwshVLWtESiRG+ufl9RiZa1HPuNOvmjwFqulzls7rF7nPxwzW7ls0O/mq8/AuwlyatIpYeulXE3mU3Y/U8= X-Bogosity: Ham, tests=bogofilter, spamicity=0.002396, 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 Thu Oct 19 21:41:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charlie Jenkins X-Patchwork-Id: 13429891 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 95D85C001DF for ; Thu, 19 Oct 2023 21:41:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B6A76800BF; Thu, 19 Oct 2023 17:41:33 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id ACA9F800BC; Thu, 19 Oct 2023 17:41:33 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 91E69800BF; Thu, 19 Oct 2023 17:41:33 -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 7C52B800BC for ; Thu, 19 Oct 2023 17:41:33 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 47579C13EB for ; Thu, 19 Oct 2023 21:41:33 +0000 (UTC) X-FDA: 81363532866.08.DD40A20 Received: from mail-ot1-f43.google.com (mail-ot1-f43.google.com [209.85.210.43]) by imf06.hostedemail.com (Postfix) with ESMTP id 3886418001E for ; Thu, 19 Oct 2023 21:41:30 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=n25WMUN1; dmarc=none; spf=pass (imf06.hostedemail.com: domain of charlie@rivosinc.com designates 209.85.210.43 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=1697751691; 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=X2Y69yanGmhW7K1h2LnXXTt/W/Mad4dz07HXYt4yVrc=; b=SzQQ6B7i3el8MuIZDRhlMwwMRXHJNLTOEIiiHLbQ8LtbAWLgR8M4kkM0a+cMIg9BdNcKns eNsgrUGUgiqIS+rpRNFOLIUnuTAdh9J7xwi7S63QaQJs1MCtQESlr4Upk8rJdordjymZkx 0PZCNvqGGNK1r5GfjnsdkQ1SlcPu73w= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=n25WMUN1; dmarc=none; spf=pass (imf06.hostedemail.com: domain of charlie@rivosinc.com designates 209.85.210.43 as permitted sender) smtp.mailfrom=charlie@rivosinc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1697751691; a=rsa-sha256; cv=none; b=E2bh2Uu3CIujoOdu4SI0E2vIXpSA0ykJb7jUDJSSTLfH0sBXL5n0iijOHmjH/i1IZNm3QM gaKdCd7S1ZV+5S/4voTQYb5zEXhUCVBfRZ9JHoC4XZ4t/k9V6W2oEEvjjgKAAqAdcTDDWL +iGmhVru+uJ54m8ssGbGsOebCZM4Zcw= Received: by mail-ot1-f43.google.com with SMTP id 46e09a7af769-6ce2988d62eso116004a34.1 for ; Thu, 19 Oct 2023 14:41:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1697751690; x=1698356490; 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=X2Y69yanGmhW7K1h2LnXXTt/W/Mad4dz07HXYt4yVrc=; b=n25WMUN1/Y0mxtN+W3rglBLbx5zy9smRr/At+g8hD2M+jlcUaiFFfxpy2Z7u/4QWPt o9khCUdDi8C30Vp1tzNDGhuje8PsjWzDT+oLnuWtcycyL3Kl/LuvFpKVcOGB0s/H6YQA pJfy8aMJcmANjwiO0zntpam1PRi3KuO40BGGKZJMpEaSy0BYQ+z8vgzsnlhAkrhz0xTW 3zugvIh921TZIquAfs0AxVXPusg8TxuqqC3ISJhWnzLdE9YG82k9wLysARUm2jfwM3Ek LPOaG9Vlc7xj1d332CbiNT2lEsLmqeENiZS9DPGg6lHVKtR8DRAmQDT2mKTtQgXZeS0V selA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697751690; x=1698356490; 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=X2Y69yanGmhW7K1h2LnXXTt/W/Mad4dz07HXYt4yVrc=; b=vmVse4vN7LnFTpoxMlzCztYHrdAHLsXiPBsInmjIJPIBeOxO7dU4hBPPKPH0ZuWjja xjn8AtyjA08veL2PMe/VcfPpGazm94qZ3iQnWGpB7OI+pRsBgHbjUOLszct3racedPv6 l7Il9bGEFaS/TOsE6uTuUEYKZEK6rq/auVNFUaRLy/ny2DiDh0eLm3lNluhxioWdrpPi 6xzZ7jpSpYvKI53BgDJwoI/oZ2JrXI4hJX2HQmoa8FuR8uqzBFVOPrzq208fFZSwO+Ew /xNMfWZJ46muJJn/rU7On4kosMwHn+5WSb6aPMxFyX46MdTELzCSXHQKd6PDxlHYvcjQ IdnA== X-Gm-Message-State: AOJu0YxaAecv6ep+/s2QpfOtrLqdH3kpJH1JNRRcXXOrSyJNdPCTmFI1 ZteYsTZPyt05TBmmlI/uatB75Q== X-Google-Smtp-Source: AGHT+IEZSudwIziT/294tw/hjkboOU+kR2erPB1ur7M5JUxRVYbKDTHrJWItwUJ9qaU2X7/4BkMnIA== X-Received: by 2002:a9d:6d83:0:b0:6b9:5734:135f with SMTP id x3-20020a9d6d83000000b006b95734135fmr17999otp.28.1697751690236; Thu, 19 Oct 2023 14:41:30 -0700 (PDT) Received: from charlie.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id x19-20020a9d6293000000b006ce2c785ac7sm81812otk.8.2023.10.19.14.41.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Oct 2023 14:41:29 -0700 (PDT) From: Charlie Jenkins Date: Thu, 19 Oct 2023 14:41:25 -0700 Subject: [PATCH v6 2/3] riscv: Add remaining module relocations MIME-Version: 1.0 Message-Id: <20231019-module_relocations-v6-2-94726e644321@rivosinc.com> References: <20231019-module_relocations-v6-0-94726e644321@rivosinc.com> In-Reply-To: <20231019-module_relocations-v6-0-94726e644321@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: 3886418001E X-Stat-Signature: 6i7qi8wwpzza95c7wttn54knh3jjn4u6 X-HE-Tag: 1697751690-891133 X-HE-Meta: U2FsdGVkX1+DZKHSVQX1/NfuwWcdQcrcU+h14j1hGygjnvJakI2cpc/d2Oogfj5wyQwOyQSIyibqRXafQ2vRMmwegvqZXVYWDJIksI34VgCSpCXCVO8UXrZUzgJb5/VbYzrlqxnbq8zIZmaegOxRNVGjydIWtXEumWxLjIV3vVRXctCro7aCo9PAb1xBi7y/q6XaMsWS4r7ewMFNW+WG87A1S67cFZ+/IhWuLH/lNt2GDixU9ZUKZhY491qroTgzMX2bC2OqAcARknfWpJB6uhGbw0bgx4itvUCZBu/CCfKFy0euJqz6lc3DH/7eaCmLabK+l5TENOjjI57WjtNoXkoTkmvQIULuYBSDc8z9ZkZzShvJHkZMtQwScuqRH4eISbfNCzZ4xES7pUmvj2JOzkUA0iIUAt4xAjrXvHNEWKB9Qt2UPJHt/mEuPhssLNl0Xy0MvFGFdf9lCYJFeVzbe3uuqkxNAWOc7EwPzTS9RsPIJlz3DQb99JrYe+O6li5wfTWfNwejaE7lvw/CI7iTso4arnhSodjitGtQkHSU8ISHDEYI1jOC9Y6X62mLFv3Hc3LbmieilFGhzES/aURMF1vKRd2tZYvCBlrzCZrxAGv/pJo8Bq4PWZCppj+TOYBLQpph5Jyu2HIjAAlDl9f2edpL5+p0pazgy95PalsbW3PAG3I6adWR4EKowVHAEAnw7f1N3N7AF6x1Ft3igcSrTfp6yYTzf+eLPVzHaABSz03FN8gMXsSUEVyLQgFzGJqKJqtuOpB6FTgbjwx0/jRCcf+JN9Z0UnUJgzbSBwgQg79vlO8taT2qGL0XVFAvq5o+CoOFCNZXSjtA/kh+7SZGyAGF7SHhlxzxmvO+aMC0Hc+UfRh+91iPQ+LNIvgXOqkKL71+mjTOzI60sQpk8EPfMTNt5VitcK50RyTUXHQN9MIIiHR8ma/hJwldBLARDgOmJJiYZ2V43D90omOcFDv OPndupCA huXqe9jeoFHeddpyMmmXjFoWTC2waElWbCqQ5/vNr1DcSoxEesOVF+jr9zdfggXHPNFoYTlhMqMw0h0anpmrCkpRnVF+jOZ9Yb2wEInKycZ+setjC6e61D9bYyPrfhMofPUOJDvnN9of9KsFWFHgb6EIn9sqPl5KhMd7ufg0V/CjqYJYCorG9lkbaHhYsKthBTF3NJnwaQnoEqvs53KBLV3IAJvneGxAkm5TeT0dssYxVdi8fy0P67x3cvIdhxIjMEn6aRqhfFdC4CWEGdGLA1HgRWhtNaOE4pNiiayFJqGUVSSRioDZXN8UL0jMmVYmaQSfHeFuAjN6SUejcO79rYhoXBTbuFttKMaFregeYax3ObIa+VRpHyK/5DERGbWV2btXcbZkHii0hJQQo1RfOpz772BbejJ8GdWMvCdlpdEV83EUA/sumvyMjM/lkyPHvItT08hgxYUME8HY= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000001, 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 | 217 +++++++++++++++++++++++++++++++++----- 2 files changed, 195 insertions(+), 27 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..938eb5fa763f 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, void *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_found = false; + void *uleb128_set_loc; + unsigned long uleb128_set_sym_val; pr_debug("Applying relocate section %u to %u\n", relsec, sechdrs[relsec].sh_info); @@ -384,7 +531,17 @@ int apply_relocate_add(Elf_Shdr *sechdrs, const char *strtab, v = sym->st_value + rel[i].r_addend; - if (type == R_RISCV_PCREL_LO12_I || type == R_RISCV_PCREL_LO12_S) { + if (uleb128_set_found) { + if (type == R_RISCV_SUB_ULEB128 && uleb128_set_loc == location) { + /* Calculate set and subtraction */ + v = uleb128_set_sym_val - v; + uleb128_set_found = false; + } else { + pr_err("%s: R_RISCV_SUB_ULEB128 must always be paired with an R_RISCV_SET_ULEB128, with the same offset, that comes before immediately it. PC = %p\n", + me->name, location); + return -EINVAL; + } + } else if (type == R_RISCV_PCREL_LO12_I || type == R_RISCV_PCREL_LO12_S) { unsigned int j; for (j = 0; j < sechdrs[relsec].sh_size / sizeof(*rel); j++) { @@ -426,6 +583,14 @@ int apply_relocate_add(Elf_Shdr *sechdrs, const char *strtab, me->name); return -EINVAL; } + } else if (type == R_RISCV_SET_ULEB128) { + uleb128_set_found = true; + uleb128_set_loc = location; + uleb128_set_sym_val = v; + } else if (type == R_RISCV_SUB_ULEB128) { + pr_err("%s: R_RISCV_SUB_ULEB128 must always be immediately preceded by an R_RISCV_SET_ULEB128 with the same offset. PC = %p\n", + me->name, location); + return -EINVAL; } res = handler(me, location, v); From patchwork Thu Oct 19 21:41:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charlie Jenkins X-Patchwork-Id: 13429892 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 8DDC8C07545 for ; Thu, 19 Oct 2023 21:41:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E507F800C0; Thu, 19 Oct 2023 17:41:34 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E023B800BC; Thu, 19 Oct 2023 17:41:34 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C063C800C0; Thu, 19 Oct 2023 17:41:34 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id AA6D4800BC for ; Thu, 19 Oct 2023 17:41:34 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 7855014138C for ; Thu, 19 Oct 2023 21:41:34 +0000 (UTC) X-FDA: 81363532908.05.AFEEFA3 Received: from mail-oi1-f178.google.com (mail-oi1-f178.google.com [209.85.167.178]) by imf28.hostedemail.com (Postfix) with ESMTP id A6800C0009 for ; Thu, 19 Oct 2023 21:41:32 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=kNkK58Dg; spf=pass (imf28.hostedemail.com: domain of charlie@rivosinc.com designates 209.85.167.178 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=1697751692; 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=ogTeVHe3gyFD/7CJS1/ewq+78Fjavm6vVbjO5A94GvmF3mYzWd7V+t+UOT7D633Qj6XXQj YdMBKYSYfEQttUpy9nMWbtyIkFsvXtutFDZfw7HgSEQHg186iWRK/5TiqNSodC7au1hd5+ jM7L1g6WxP+z4L7YFGb3XWt+d6e9+SY= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1697751692; a=rsa-sha256; cv=none; b=Yh3atQollpyr4IIJs/CWzXxyzZNlwJz0tirFsEgM7bNUz4aDJt6jMMyOh6rRlU4dtz3pQz euq6X9SUY8qeNYbNXK1OEZPSAu6PLWbSuZyVIHVhVVpjR6HwIT3eU3tsKZEUOIziT3FyD9 Xbqnrxgr9YeakczKfVkDU6l81vEvnpE= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=kNkK58Dg; spf=pass (imf28.hostedemail.com: domain of charlie@rivosinc.com designates 209.85.167.178 as permitted sender) smtp.mailfrom=charlie@rivosinc.com; dmarc=none Received: by mail-oi1-f178.google.com with SMTP id 5614622812f47-3add37de892so142280b6e.1 for ; Thu, 19 Oct 2023 14:41:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1697751692; x=1698356492; 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=kNkK58Dg9LVrujERIqW3Nle9Th4eddsPUl1knJtgpVq89nedHFu2yM+X9BRaFCRXo/ vn3EUtmMzPBea6PzFu/nY0MAya/i7+ft1YJzi5SXdAbAjBKC6NHl4i5MtucQSOjIkLk8 lsNrG98rqzNXPHLFo9yX1pIycxPvZFgkfLyqFCD5nRRfgK/33IznLXbooxNM6wfllmRJ Z0z2ZL1G7zYGcjBGEQyfwAq5LtsyWlbYQz9/DOH315L5pGtPPS7I6knsD+pIiSj8phew +jtEGExpu3DI8OYNPAMt00EdZUaDZ4YfFkHP0XRgpPBaukuFLsbAqz9eMsVoGCedDSLX V5PQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697751692; x=1698356492; 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=AqE/rZlyBmkaB7LdEXd+ab595YJD1rq7AkiNC0pLaeLgDCMkt861G3xFKLUMBvKj/o 0DWTTm1ye8RmAdpl5Q9VLJ+WnspcWxnan674d+WLFfRqY4nLRrSvY/baivPSgr0lD2JJ yyXshOlD0TQfvD58XSOJV+OKQjQKrOTwCuuN212tsf0KMQ+79Dn1hsu/XDIHESOY1mY1 C21334YkBwuzXJa/rGnfm1szlEizzzxEZ7RpleWz48IdyeyzrYtWvgMoISe+G5/FPyBR oNRG06YRnUfeVW1k/CSY0JmYXWmT16SsVeZhBgZIjfBcG56/QRDmsZxQEhEFu1x6dAru l7WQ== X-Gm-Message-State: AOJu0Yw99jvYGejPuQbKYpvHEKqC0HDd4pHvXCOTnaX3YaHfWmCLY9uC L+K7XS1d8IznMEwt01J311T/gg== X-Google-Smtp-Source: AGHT+IEljrofNoN94x7na4QLki2sG4viIyrDKY/ruvd88QfcKlJJu1SSapq9pzvq0HL+u6r60tnkjQ== X-Received: by 2002:a05:6808:1983:b0:3b2:f5be:4fd5 with SMTP id bj3-20020a056808198300b003b2f5be4fd5mr76801oib.14.1697751691691; Thu, 19 Oct 2023 14:41:31 -0700 (PDT) Received: from charlie.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id x19-20020a9d6293000000b006ce2c785ac7sm81812otk.8.2023.10.19.14.41.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Oct 2023 14:41:31 -0700 (PDT) From: Charlie Jenkins Date: Thu, 19 Oct 2023 14:41:26 -0700 Subject: [PATCH v6 3/3] riscv: Add tests for riscv module loading MIME-Version: 1.0 Message-Id: <20231019-module_relocations-v6-3-94726e644321@rivosinc.com> References: <20231019-module_relocations-v6-0-94726e644321@rivosinc.com> In-Reply-To: <20231019-module_relocations-v6-0-94726e644321@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-Stat-Signature: 3pr4bd9pdpkmk3fb5neh9i4rfgcrym4i X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: A6800C0009 X-Rspam-User: X-HE-Tag: 1697751692-850195 X-HE-Meta: U2FsdGVkX1+Ro7HMIpj6UgIkXbfEVqHLpOfHWWpVlsMnritXmKblcLtNxIrthydyHLwqvocRAZsDOo+8liv6Vyo5G7MQlFczvl49UMMMy45YLKJtF79QqO0oRR2dKi0DbtQmBMZTIqwDiBJ4FT1Y0chcDeWd7ZZP2gCbWSW7QKBKZDM9BBr158/vPp1A7yPu6KTtiwzUkxLs/b7ujiKtEDYpAXO1l4TgSJ/IUvqkjhTu2g0+EnscYufNhmFNWAA2Ts7Fh2mvIuRT+G+ecD3VfD29SwOzmMqDpRXxGKsV/VFdOlZosd2t9ickjbMUoDN8lOsV4VkQAWqJnG6XnXAjwnWzBhBPjdKtzOJ64lP/noA7P0zomQy0zNuZSSXhrCjGgai+Xd+eme/gHoKBx6aiPGgE3LHr3MURGLEMeFDU5gxV5NS8vDj2qtutjsTr5fm6YBi2TAh7DNXcGKdtgNS+QfOJj3W9sFi40KxR+sCFSl1BkgyR9isv/9R5NI12QkyGHFJNtca2FKAKp60jqCOvJ6o7Icd60tE8Kt20Cx6oPmAk8hfHFYb4Eq4sX9Lz+yejYadbxs9pm4RGcE9h9Z4VSy2OFK8zcyGWR4HkHfMbqk2A706gVNu1yvxPDb/tSLSzo8yvBuqfX534W5WmySPtn+7viuxMi35FLdT9lK+lONJksfoSRIWjT2tBk+l0tDvUIIcDcU5Ynz7tDR9LNW3CkD0oge5RDyVDLbd9yzmzXCs9liYiQftm50skKk4fV0KK0VpsBPmfRjUm8GgKNRxBWSBnHDrChHFQqvNnauCh8S8u3kyjV4skwoV9vJMrGJ/sYFQqgasTsqCbNBWjVxZ63bzLJEWIFpsKAXFySIcMNh//JOsT0jWrhKCOl2Uwna26eGPm/4GCOoK0gG5T48sjta52T8TnIu9KOMHgFk6y6Ely0CRK3SZUyHo1nca82WjGdVK/wjuWQyNx0jsXD/F FHAkL0Cj vrRewbqWdHr5TzzbMUjkFnREqGXZ5+7X0woTpe/WQiRcXhfSx1vTVySTpDns7/KZJgNu28PXs4jBuZIpzPIb0MhRTGnrkpsuk8JolnDmRERODJvID+A9v84REeQsJP3PSAymEVMLE8D4CJuRChzBOZ3RAPE6gSWtcRfzuivlA0f5xT9LHLv3DWdvVz5zs72gZXOACvDmE25wHGV62K2/aPvPcR8VdfUY82yK0gUQ1fgpgbxlE2J2qNSvphLhep52R3QAlKhhGz8YhLaeDXst7WNw1bPxpRAsilcC50nz/HydC7q4K2cjoXi6PxnmA9ZA1/K1dC69SjjQLhKd2Ef2UJz4LIpbz4PKV4Kf3NVxiu+zLBx02bjw3riCShE4qMr+Ptl13Qxcz8DoSSeoJJusD2HmPXjpE5Y93rF5KZPZd+MJh6hTFGR9+BIGXM32xsNfyuVL2t1kiMJkTtnEdpgYH6x8mER0DsbxCej/CtCBbvnQWlTiKcyFWiS/hVkjBjCk+gckOg996n1frK2M= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000249, 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