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);