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;