From mboxrd@z Thu Jan 1 00:00:00 1970 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 5F39AE94139 for ; Sat, 7 Oct 2023 00:41:24 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 61D0B80016; Fri, 6 Oct 2023 20:41:23 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5CCEF80008; Fri, 6 Oct 2023 20:41:23 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 46D9D80016; Fri, 6 Oct 2023 20:41:23 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 3A7DC80008 for ; Fri, 6 Oct 2023 20:41:23 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 122E91A02E5 for ; Sat, 7 Oct 2023 00:41:23 +0000 (UTC) X-FDA: 81316811646.21.85BA7EA Received: from mail-pg1-f182.google.com (mail-pg1-f182.google.com [209.85.215.182]) by imf16.hostedemail.com (Postfix) with ESMTP id 24CE9180008 for ; Sat, 7 Oct 2023 00:41:20 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=eqMVEkh3; spf=pass (imf16.hostedemail.com: domain of charlie@rivosinc.com designates 209.85.215.182 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=1696639281; 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=y5ObyqDOjztoDhC5t8E2lz3oLVXfFznkcrpNtj4QO6o=; b=ZRqMbPULPECmD3ygjiXC178ddR2Rqc1OvAmLxbxzjQHO8WW9Q0fNorgr9tXtrjLL+ocHnN a0H+GAr99OmgUZ+THrpIyIF1g1l56qBFMHl8gK3Db+f+l+My9OC7hfpIr/VYRU405CbirT q5cOKbmZ/OWO8q+YTkVUz5mfIArNlzQ= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1696639281; a=rsa-sha256; cv=none; b=0oUxSQwl+qbvvbq85EzyaHirFKhaxmZ2sx/vodUwdt+FqEB3W/+3kg6xGEa+2ERc7Arclj xmzbpzmtgJJR7+uNIFCrGVOAVYH2uigtR2qzW20fAoZ/xnAgpqn5cQyaIgTe/23Tfsfkap A60VWYsDagtF7LfCpN2J47+Q6hOlk5A= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=eqMVEkh3; spf=pass (imf16.hostedemail.com: domain of charlie@rivosinc.com designates 209.85.215.182 as permitted sender) smtp.mailfrom=charlie@rivosinc.com; dmarc=none Received: by mail-pg1-f182.google.com with SMTP id 41be03b00d2f7-577fb90bb76so1618583a12.2 for ; Fri, 06 Oct 2023 17:41:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1696639279; x=1697244079; 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=y5ObyqDOjztoDhC5t8E2lz3oLVXfFznkcrpNtj4QO6o=; b=eqMVEkh3sQV+cnyoFBdApHcSYz9oR2heOeVR+niZHSvF7JKjXxkW/nJBCdDc9WCNt7 qs3R/ExfEwKGiv0/MFRPgeLcewW5ZavyD9JWeI07gMvGPnst4fujwQ/6RGWNyPKi20xC 6Qz0rBiuSQDkjxuufNIC6vF+Yqb33ZoA6LtJFeF7ZAbfcHVXI9ZBplZVTKx/bh+CmiTJ i0NYH4aBHEo3FwIA7VKWqcCozYg/8juYsUhWYdkDM8y8o9an2zRUd3cPi0FT97GSacLV 3UHVTSQeIBvLIN+S66giiJFKLZLhL77M89qGBLxhWbNzO1WhIYHYCi5JbssfOy6omaGR lVfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696639279; x=1697244079; 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=y5ObyqDOjztoDhC5t8E2lz3oLVXfFznkcrpNtj4QO6o=; b=m/3u5Nvl2FV/UKvdLdUoDWKV4c9t6M7781lxdQNO/DKLfxXSFdr1YC6i/QssDeFdCB vC7dqMR28MUFtxbxvzgs8V/Jgu1jHwI+5W/gWshRUKhsJYNi1wr6SrKZGyGGvI4/DCVq YeYkjs3AwfGO9tgtbKUDkv2+ExiMPlrjEAV1M+TvkjOJ9YN7fSeRTeomFPVnIGp7RHdJ +by+lFCFLb+WKv1BTInqC+hMTmKZubX3oC2L1Gru5ECr7BjAYpKn9Bi5JsXUVZC1I+c2 x2YmLg3g6M80hMQzUGUcjIJgONE1lCIzb76KBXL94APNcxH9e9kxO7ZTzC96qmuTSoX9 17ew== X-Gm-Message-State: AOJu0YxC2t8QpY76kaTtu6CZ4SjtHECo2oh/88zHuRoBuJ5FOqenSZEK EePrBe/EIPO+x65Bkh3F+JihGCBhJcurdpTyanQ= X-Google-Smtp-Source: AGHT+IHky70QBVvPzgEDItk7mYVORVvgukP/9hhiMTEl2hvCRW/wMJj0Xsi46NbUX0pwqScluqGBnA== X-Received: by 2002:a05:6a20:144c:b0:14e:a1f0:a8ea with SMTP id a12-20020a056a20144c00b0014ea1f0a8eamr9888603pzi.3.1696639279458; Fri, 06 Oct 2023 17:41:19 -0700 (PDT) Received: from charlie.ba.rivosinc.com ([66.220.2.162]) by smtp.gmail.com with ESMTPSA id x16-20020a170902ec9000b001c582de968dsm4534540plg.72.2023.10.06.17.41.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 17:41:19 -0700 (PDT) From: Charlie Jenkins Date: Fri, 06 Oct 2023 17:41:06 -0700 Subject: [PATCH v2 1/2] riscv: Add remaining module relocations MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20231006-module_relocations-v2-1-47566453fedc@rivosinc.com> References: <20231006-module_relocations-v2-0-47566453fedc@rivosinc.com> In-Reply-To: <20231006-module_relocations-v2-0-47566453fedc@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 , Charlie Jenkins X-Mailer: b4 0.12.3 X-Rspamd-Queue-Id: 24CE9180008 X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: qepeugyf44e7h8714ypcrx7t7oxw8rgm X-HE-Tag: 1696639280-250185 X-HE-Meta: U2FsdGVkX1/fvmQTpkBaUzwJmzA8TwnsqF/XOgvqyvPb91RlXb8WGWWYq7h/KAvejBqVpAUoxIUFFVLYP5wbNceXmSVJVxqo22lRc3XEf5FYfXDmXUkgK7RLdQ0tzeqe2NsEQkNOuiDNweEVTA5zFWCka3aveYQSHL5PLOc4fsKnkPtl//BMw+DPjyCa6YEE5bsm2k9k94P5nfL3xyMH6CIS0v20VD+qDfIY0b7ywr3dcL+f0FfEO9OUSv2LHJ1/rpVGeNXC7of97tiQ1W7I9gFR69Y0k2j/4/7c4mXF473Nm1EMBKsUZcA42afVXk0j7Sp9Rkl4I2CJqlu/975sfjCCiGdkjSg37nYWz7ZVGrEeNAM5YvQRwYWfrABf+2Oi/gImSlxcr5UBcVAsH4jJPQeTTa+4ZCi8dzmoFcSPeu4131iLwy1DfZJmwqJApz45Spd/yHJNg6A2KEGOwxQMTXh6PcO8qhvUrinZWPuECfx+dBzGjCuCrovkb4Pcx2Vcws6jsiVK/Tp8BQBo2Mczr4ZaJ/bEfX9qgvFrUheWJmy97h5nZI8soSt6I4r6v16D56XQx5kysmcDA8LqeA389MGlb+xxCCr4fQqsfJMU6PDK/O/gaHfZjihJYc1Xsximu7jGXIQ2gdyiJSOVrm+Gyhj1aaZ9QJGt/Z1+i/7eLBG0FcicO5fjKRcmg1mzpQ6FNGXNDjYAIdeu7mBH9IMWIfQbpXpY0qtQpJdjgkESCokV2ix9F3RJbWrbFD31WYQ+PY1IkSOE8WEn6bchxms4cJxCaLccTGNtZbY0aA60pMe0uu3/J6TRpj0atCKcbElLUItPMWjwXxQokaQ7koYlOeEez62taQL552lhvOdv1Jz9vDNG5gt+UYxRZha43e6DxgIW4DfSRY837g4F87n8U74c8UBFuTG1qry3Mx0XAtDh+I1f/C9Ei7vBu8RHI3RcJzY68ehtsRd0RMdBVOH IKd6Zh6z 7AXiWFy72lYZddbFc8jA/Mt3YZdJ+KfOADaMwDEg35OR8sz4Ln5ix42olZdr9TCq8QWz+vziSoT/2fn1aizSulYUBGkTUEoePR//yztbPuYNFVWlyqwLWEQpPdlmhwno5chQ1JEr81m4ryI7jjbpQO1vXRlDfFsqzhLBuv9vBLoUTX6bFjiDHxzaZyR+XISycjhTU1zSRbOw7cfx9kD9aJnQX44bnACEqOp1vn1e3yvvkil2LSkXgKBjQkJE/SHwAf+v0/Zsdmgb0RG4quykkBFaHa3+H+0O7vbNhN3KQikkTsoCGaK2YSxX/YmjsISZMs91lfhBjg+f3B6yQ6ErQ40yAYHBOUnCZ6AnQoGJQQcnxhy3Fi7xy4QlNHtjloaWcpm4CXdGZrBWQnb6gMC5OYMO+upJzQS8zBygneTCnqkGQaZaZb1CICYhDNtOrBDP12dSmCLRd0Tv+Y8A= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000361, 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 | 6 +- arch/riscv/kernel/module.c | 247 ++++++++++++++++++++++++++++++++++---- 2 files changed, 227 insertions(+), 26 deletions(-) diff --git a/arch/riscv/include/uapi/asm/elf.h b/arch/riscv/include/uapi/asm/elf.h index d696d6610231..a9307a1c9ceb 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,7 @@ 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_RVC_LUI 46 #define R_RISCV_GPREL_I 47 #define R_RISCV_GPREL_S 48 #define R_RISCV_TPREL_I 49 @@ -93,6 +94,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 7c651d55fcbd..61d5cdbe609d 100644 --- a/arch/riscv/kernel/module.c +++ b/arch/riscv/kernel/module.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include @@ -253,6 +254,30 @@ static int apply_r_riscv_call_rela(struct module *me, u32 *location, return 0; } +static int apply_r_riscv_rvc_lui_rela(struct module *me, u32 *location, + Elf_Addr v) +{ + // Get high 6 bits of 18 bit absolute address + s32 imm = ((s32)v + 0x800) >> 12; + + if (v != sign_extend32(v, 6)) { + pr_err("%s: target %016llx can not be addressed by the 6-bit offset from PC = %p\n", + me->name, (long long)v, location); + return -EINVAL; + } + + if (imm == 0) { + // imm = 0 is invalid for c.lui, convert to c.li + *location = (*location & 0x0F83) | 0x4000; + } else { + u16 imm17 = ((((s32)v + 0x800) & 0x20000) >> (17 - 12)); + u16 imm16_12 = ((((s32)v + 0x800) & 0x1f000) >> (12 - 2)); + *location = (*location & 0xef83) | imm17 | imm16_12; + } + + return 0; +} + static int apply_r_riscv_relax_rela(struct module *me, u32 *location, Elf_Addr v) { @@ -268,6 +293,12 @@ static int apply_r_riscv_align_rela(struct module *me, u32 *location, return -EINVAL; } +static int apply_r_riscv_add8_rela(struct module *me, u32 *location, Elf_Addr v) +{ + *(u8 *)location += (u8)v; + return 0; +} + static int apply_r_riscv_add16_rela(struct module *me, u32 *location, Elf_Addr v) { @@ -289,6 +320,12 @@ static int apply_r_riscv_add64_rela(struct module *me, u32 *location, return 0; } +static int apply_r_riscv_sub8_rela(struct module *me, u32 *location, Elf_Addr v) +{ + *(u8 *)location -= (u8)v; + return 0; +} + static int apply_r_riscv_sub16_rela(struct module *me, u32 *location, Elf_Addr v) { @@ -310,31 +347,150 @@ static int apply_r_riscv_sub64_rela(struct module *me, u32 *location, return 0; } -static int (*reloc_handlers_rela[]) (struct module *me, u32 *location, - Elf_Addr v) = { - [R_RISCV_32] = apply_r_riscv_32_rela, - [R_RISCV_64] = apply_r_riscv_64_rela, - [R_RISCV_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, u32 *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, u32 *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, u32 *location, Elf_Addr v) +{ + *(u8 *)location -= (u8)v & 0x3F; + return 0; +} + +static int apply_r_riscv_set6_rela(struct module *me, u32 *location, Elf_Addr v) +{ + *(u8 *)location = (*(u8 *)location & 0xc0) | ((u8)v & 0x3F); + return 0; +} + +static int apply_r_riscv_set8_rela(struct module *me, u32 *location, Elf_Addr v) +{ + *(u8 *)location = (u8)v; + return 0; +} + +static int apply_r_riscv_set16_rela(struct module *me, u32 *location, + Elf_Addr v) +{ + *(u16 *)location = (u16)v; + return 0; +} + +static int apply_r_riscv_set32_rela(struct module *me, u32 *location, + Elf_Addr v) +{ + *(u32 *)location = (u32)v; + return 0; +} + +static int apply_r_riscv_32_pcrel_rela(struct module *me, u32 *location, + Elf_Addr v) +{ + *(u32 *)location = (u32)v; + return 0; +} + +static int apply_r_riscv_plt32_rela(struct module *me, u32 *location, + Elf_Addr v) +{ + *(u32 *)location = (u32)v; + return 0; +} + +static int apply_r_riscv_set_uleb128(struct module *me, u32 *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, u32 *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; + } + + *location = v; + return 0; +} + +/* + * Relocations defined in the riscv-elf-psabi-doc. + * This handles static linking only. + */ +static int (*reloc_handlers_rela[])(struct module *me, u32 *location, + Elf_Addr v) = { + [R_RISCV_32] = apply_r_riscv_32_rela, + [R_RISCV_64] = apply_r_riscv_64_rela, + [R_RISCV_RELATIVE] = dynamic_linking_not_supported, + [R_RISCV_COPY] = dynamic_linking_not_supported, + [R_RISCV_JUMP_SLOT] = dynamic_linking_not_supported, + [R_RISCV_TLS_DTPMOD32] = dynamic_linking_not_supported, + [R_RISCV_TLS_DTPMOD64] = dynamic_linking_not_supported, + [R_RISCV_TLS_DTPREL32] = dynamic_linking_not_supported, + [R_RISCV_TLS_DTPREL64] = dynamic_linking_not_supported, + [R_RISCV_TLS_TPREL32] = dynamic_linking_not_supported, + [R_RISCV_TLS_TPREL64] = dynamic_linking_not_supported, + /* 12-15 undefined */ + [R_RISCV_BRANCH] = apply_r_riscv_branch_rela, + [R_RISCV_JAL] = apply_r_riscv_jal_rela, + [R_RISCV_CALL] = apply_r_riscv_call_rela, + [R_RISCV_CALL_PLT] = apply_r_riscv_call_plt_rela, + [R_RISCV_GOT_HI20] = apply_r_riscv_got_hi20_rela, + [R_RISCV_TLS_GOT_HI20] = tls_not_supported, + [R_RISCV_TLS_GD_HI20] = tls_not_supported, + [R_RISCV_PCREL_HI20] = apply_r_riscv_pcrel_hi20_rela, + [R_RISCV_PCREL_LO12_I] = apply_r_riscv_pcrel_lo12_i_rela, + [R_RISCV_PCREL_LO12_S] = apply_r_riscv_pcrel_lo12_s_rela, + [R_RISCV_HI20] = apply_r_riscv_hi20_rela, + [R_RISCV_LO12_I] = apply_r_riscv_lo12_i_rela, + [R_RISCV_LO12_S] = apply_r_riscv_lo12_s_rela, + [R_RISCV_TPREL_HI20] = tls_not_supported, + [R_RISCV_TPREL_LO12_I] = tls_not_supported, + [R_RISCV_TPREL_LO12_S] = tls_not_supported, + [R_RISCV_TPREL_ADD] = tls_not_supported, + [R_RISCV_ADD8] = apply_r_riscv_add8_rela, + [R_RISCV_ADD16] = apply_r_riscv_add16_rela, + [R_RISCV_ADD32] = apply_r_riscv_add32_rela, + [R_RISCV_ADD64] = apply_r_riscv_add64_rela, + [R_RISCV_SUB8] = apply_r_riscv_sub8_rela, + [R_RISCV_SUB16] = apply_r_riscv_sub16_rela, + [R_RISCV_SUB32] = apply_r_riscv_sub32_rela, + [R_RISCV_SUB64] = apply_r_riscv_sub64_rela, + /* 41-42 reserved for future standard use */ + [R_RISCV_ALIGN] = apply_r_riscv_align_rela, + [R_RISCV_RVC_BRANCH] = apply_r_riscv_rvc_branch_rela, + [R_RISCV_RVC_JUMP] = apply_r_riscv_rvc_jump_rela, + [R_RISCV_RVC_LUI] = apply_r_riscv_rvc_lui_rela, + /* 47-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, @@ -425,6 +581,47 @@ int apply_relocate_add(Elf_Shdr *sechdrs, const char *strtab, me->name); return -EINVAL; } + } else if (type == R_RISCV_SUB_ULEB128) { + unsigned long set_loc; + u32 set_type; + unsigned long set_sym_val; + + bool has_corresponding_relocation = false; + + /* R_RISCV_SET_ULEB128 must appear before the SUB */ + for (unsigned int j = i; j >= 0; j--) { + set_loc = sechdrs[sechdrs[relsec].sh_info] + .sh_addr + + rel[j].r_offset; + set_type = ELF_RISCV_R_TYPE(rel[j].r_info); + + /* + * Find the SET relocation that is targeting the + * same position as the SUB + */ + if (set_type == R_RISCV_SET_ULEB128 && + set_loc == (unsigned long)location) { + Elf_Sym *corresponding_sym = + (Elf_Sym *)sechdrs[symindex] + .sh_addr + + ELF_RISCV_R_SYM(rel[j].r_info); + + set_sym_val = + corresponding_sym->st_value + + rel[j].r_addend; + has_corresponding_relocation = true; + break; + } + } + + if (has_corresponding_relocation) { + /* Calculate set and subtraction */ + v = set_sym_val - v; + } else { + pr_err("%s: R_RISCV_SUB_ULEB128 must always be paired with a R_RISCV_SET_ULEB128 that comes before it. PC = %p\n", + me->name, location); + return -EINVAL; + } } res = handler(me, location, v); -- 2.34.1