From patchwork Tue Oct 31 07:24:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charlie Jenkins X-Patchwork-Id: 13441127 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 53E56C4332F for ; Tue, 31 Oct 2023 07:25:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 86E368D0013; Tue, 31 Oct 2023 03:25:03 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7F9F58D0012; Tue, 31 Oct 2023 03:25:03 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4C3308D0013; Tue, 31 Oct 2023 03:25:03 -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 3CE688D0012 for ; Tue, 31 Oct 2023 03:25:03 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 125AA160320 for ; Tue, 31 Oct 2023 07:25:03 +0000 (UTC) X-FDA: 81404920086.29.6BE043A Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by imf28.hostedemail.com (Postfix) with ESMTP id 1735DC0023 for ; Tue, 31 Oct 2023 07:25:00 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b="g+UFmsq/"; spf=pass (imf28.hostedemail.com: domain of charlie@rivosinc.com designates 209.85.214.178 as permitted sender) smtp.mailfrom=charlie@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1698737101; a=rsa-sha256; cv=none; b=qhNcgDU5JVh0eKCZj/jOncbzE8OgoK/XfmT0qAb0jn0S5b26ZAM3Fs2nyGtyk3Tf9VYD3+ bsfOwuK5CZ2vS+KBuuqMIoVOQREo899odHgHrSGEPW+BmGHIRjNPrB2yk/wJ1zTH8TSU/b 15DBVQDzdDte3meEr5uAfyaVZJPnZc4= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b="g+UFmsq/"; spf=pass (imf28.hostedemail.com: domain of charlie@rivosinc.com designates 209.85.214.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=1698737101; 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=UTQTrEM0Ckg1jgLOOpMAQcFp4y4NEBj37r2pyzew1nQ=; b=qAEdg16ovqwARVYlDEym7n2R/jIKinVYnPFMLPSQhOxPfC7x2inbPFODBA9/7B28vjHRGf b+jolZfvjJZO3EvjIKQgqjWUxh4cknR17yRlJRdOvyheKc4l4kI1DNqJTpSMK2zBwqcDRo TZ3v74HMsVTPBTiphhPTMjFodZNH9qY= Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-1cc29f39e7aso21509225ad.0 for ; Tue, 31 Oct 2023 00:25:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1698737100; x=1699341900; 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=UTQTrEM0Ckg1jgLOOpMAQcFp4y4NEBj37r2pyzew1nQ=; b=g+UFmsq/5vhCA9DLBSalw7bC8HmNmiRTVXHXQKtOUHbqfUn1e3TPE6hsSDN64EQBRK pt1379YkEWI+Sq/LI6PH8cZYM7Pp9og51k8vdiyzp0KFqhIqRyuO8S+N7x+3qzxQ8YFp xADYbR/PyzYtzwnrT2AGSGylq/IHzt6pmE+448PWWBQyRs2uVJsXiC1fPyMBkaiJbt0f u9WSxpcAiUzbEzAXp8MO5eXciEgiozcNUGCQJ6JQcJT0Rn3k3/j9KPtaNsCHeCIAHsNt tEkT5VMldoCH7Q0UhJEg48MCgKmKAhguApPp8LqKWK2EkwikJQCfzk1X+ZCMD7UR7e2y DN9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698737100; x=1699341900; 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=UTQTrEM0Ckg1jgLOOpMAQcFp4y4NEBj37r2pyzew1nQ=; b=KaJnHlo/9KvnEB64OXOZwTcFB+Rvfh5gHw3Y0VDEnmsgYZdbVjuGiWO09lti4mFlwW 9vmujbU4OaTmBsy6lenheHMZwvKyh7eQM0RDzUYhEsi4CzUGBYNKSCkT+AkOAhw/dbLk KbB1R4RwSJFla6kCjiNHjkMjTPXTTbgRecvvnyMPUl0Svz2kG9yN47lQXr2SjLcv6oHV M7OPZAjI9KMSqzguWWmP8bZuKLQEtq8NWD10DTQJD1fehHDCRZFH/2eQi1cIz/DiiULk 4Gmka51y74r4pXb7wdQdE7x25WjNvusMu3k6fmiGIxi6L85PSuFMDtfSnxFZztQiqD4R zD2w== X-Gm-Message-State: AOJu0YyfosKnjfmPdcZ8HWZwZlpVCTHcEfAKq5I+S/6q24Y0CpRmQv24 2MMyyYBBgoX9JqQjXU0WugOS/w== X-Google-Smtp-Source: AGHT+IEuqO2oStMxZCET40/atuuM8JAy5Tj7yYzACbdHVvsu00ceBZf4tTVDqK9qhGh4hVJ2qk1TcA== X-Received: by 2002:a17:902:c7c2:b0:1c0:bcbc:d64 with SMTP id r2-20020a170902c7c200b001c0bcbc0d64mr7714412pla.51.1698737100000; Tue, 31 Oct 2023 00:25:00 -0700 (PDT) Received: from charlie.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id c4-20020a170902d90400b001c74876f018sm652575plz.18.2023.10.31.00.24.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Oct 2023 00:24:59 -0700 (PDT) From: Charlie Jenkins Date: Tue, 31 Oct 2023 00:24:51 -0700 Subject: [PATCH v7 2/3] riscv: Add remaining module relocations MIME-Version: 1.0 Message-Id: <20231031-module_relocations-v7-2-6f4719b64bf7@rivosinc.com> References: <20231031-module_relocations-v7-0-6f4719b64bf7@rivosinc.com> In-Reply-To: <20231031-module_relocations-v7-0-6f4719b64bf7@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 , Nelson Chu , Charlie Jenkins X-Mailer: b4 0.12.3 X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 1735DC0023 X-Stat-Signature: woqffmao1mssatg7miiomu3dapsjkoiu X-Rspam-User: X-HE-Tag: 1698737100-875084 X-HE-Meta: U2FsdGVkX1/sqTAbPrHj/UdA+WBMQKsR0c025DXY2A1zyJXsYxNQczUFtlYSe5nPyyTIiJcUK0RBViztzp7lm97v1SDekt0EhmPuu7i71nopFDRFlDirAF7VgA35WWDrkopxxDaY90bUoYyfGgcw2gouWipIGsHSUA5GW1AmYhtPPhOFuB8wmAniosTv2uphENnV+hlOarIk5Y1tZ5bT8lX05rsr0QgVmGlt/wmQYIWQNtCx9YzMXcBiuMYmcbYZoSrhaLxmRD2B8gAfGXabY/LecMFd0KSdmWohOn0vzO6ohSOyC+OqNCDge2M60GOyH2nQn5iekn3trO+h4AddWGOqY5S0EeYVFkLwse7R9mzAKxLPSuf1mH0qeLP9UE1la0Y1lLwR+MYAjj8QTc4z80mVDSGMPVL2rogFahZpNo2zLz66YDgwXKwunrF0euIWiQYbg89vcQC7Xb1WQkNmXfr9b0JLVCh+dylQA5e+eGyai/TPPGiac5LI6TTKcwuJJKhuCYpcvBrKPMTvIW5KUvXa7LgxUdifP/y8Ju1PHGGx7xHBeea/FgCVEl8xSi5Vwx+4VfJSDbbRciHue1O3Xbe7zYk275lw9SZNkY4DkoFCK0COoc1dVriMHBqQlCeHfrRZJ8+NRfg4btseS+D3cpLWVVPlzCIzKwqaQ8QYJqeBruQp6QmVpgaQwetyHrwkraJbpKQJ5j9/iyHx/g4miBEezf5BjlQVvuru/fjqHwbKZ5Go5vJ//HIlf9aDN1NUvoK9hVDrDD1l6Y8cTvgVuGDMdsKSeXPCY0b/Xbv80hCctib11N4buU0wpwHnFnnZjrmdOMy3hGBDgv/I83v1lMVF61D4fSQ8Q6U8hd727tF90K5NYvGNLap1z5kJWsi9d/Zda5XNWJplsAWCpbK+c2epvfkdYVergpup3suKYxacZm++XT1C+IhPUfRT2b79KcnVPXfnzRYOUSMO9tB yiyiu55P 6ruDgh8lIA09kE7qp1ZmBYSyI/x6A1aM1K87odnZgkQN5fPsZSCQrPa0iXI2+oqDYjOj4nA0vRWEU1BWi8mt39R35BtCGs6KcAMLGJRtlbdl2BB8k4qOVfZxzHqwX2BNTyf0GQqrRJhoePyVM0YB9kvkOX8YSgBt+b+m5M42k6vrbrNo97HNOjwF1GWF4gjwW6kgL39K9X3/ILORbhZ2NIO9rdyHwRVCyU20sRh8wwLAPoQtR+4LzKhV70/4KsgrRZhv1nrEvwZtjMm8jhiaa20NOHnze8eNJOipOroONxBkFebuu38TOBVUlD9gSjHP/NjpS1LqRY7L//ENGoGY8FZzjgOqnPatK6//bHcZtrFloU3ApnP5pO0/0WP/aG2f7PYDdVZXd6nKr84p4LorUiu+3weQifJ/p4JVWcAMYCb+lnPD/AGLd5GQFK7t2UUgE1TU9iwgFY33xc8c= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Add all final module relocations and add error logs explaining the ones that are not supported. Implement overflow checks for ADD/SUB/SET/ULEB128 relocations. Signed-off-by: Charlie Jenkins --- arch/riscv/include/uapi/asm/elf.h | 5 +- arch/riscv/kernel/module.c | 534 ++++++++++++++++++++++++++++++++++++-- 2 files changed, 511 insertions(+), 28 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..230172ecb26e 100644 --- a/arch/riscv/kernel/module.c +++ b/arch/riscv/kernel/module.c @@ -7,6 +7,9 @@ #include #include #include +#include +#include +#include #include #include #include @@ -14,6 +17,27 @@ #include #include +struct used_bucket { + struct list_head head; + struct hlist_head *bucket; +}; + +struct relocation_head { + struct hlist_node node; + struct list_head *rel_entry; + void *location; +}; + +struct relocation_entry { + struct list_head head; + Elf_Addr value; + unsigned int type; +}; + +struct hlist_head *relocation_hashtable; + +struct list_head used_buckets_list; + /* * The auipc+jalr instruction pair can reach any PC-relative offset * in the range [-2^31 - 2^11, 2^31 - 2^11) @@ -269,6 +293,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 +320,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,33 +347,470 @@ 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) +{ + *(long *)location = v; + return 0; +} + +static int apply_r_riscv_sub_uleb128(struct module *me, void *location, Elf_Addr v) +{ + *(long *)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, 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 */ +}; + +static bool accumulate_relocations[] = { + [R_RISCV_32] = false, + [R_RISCV_64] = false, + [R_RISCV_RELATIVE] = false, + [R_RISCV_COPY] = false, + [R_RISCV_JUMP_SLOT] = false, + [R_RISCV_TLS_DTPMOD32] = false, + [R_RISCV_TLS_DTPMOD64] = false, + [R_RISCV_TLS_DTPREL32] = false, + [R_RISCV_TLS_DTPREL64] = false, + [R_RISCV_TLS_TPREL32] = false, + [R_RISCV_TLS_TPREL64] = false, + /* 12-15 undefined */ + [R_RISCV_BRANCH] = false, + [R_RISCV_JAL] = false, + [R_RISCV_CALL] = false, + [R_RISCV_CALL_PLT] = false, + [R_RISCV_GOT_HI20] = false, + [R_RISCV_TLS_GOT_HI20] = false, + [R_RISCV_TLS_GD_HI20] = false, + [R_RISCV_PCREL_HI20] = false, + [R_RISCV_PCREL_LO12_I] = false, + [R_RISCV_PCREL_LO12_S] = false, + [R_RISCV_HI20] = false, + [R_RISCV_LO12_I] = false, + [R_RISCV_LO12_S] = false, + [R_RISCV_TPREL_HI20] = false, + [R_RISCV_TPREL_LO12_I] = false, + [R_RISCV_TPREL_LO12_S] = false, + [R_RISCV_TPREL_ADD] = false, + [R_RISCV_ADD8] = true, + [R_RISCV_ADD16] = true, + [R_RISCV_ADD32] = true, + [R_RISCV_ADD64] = true, + [R_RISCV_SUB8] = true, + [R_RISCV_SUB16] = true, + [R_RISCV_SUB32] = true, + [R_RISCV_SUB64] = true, + /* 41-42 reserved for future standard use */ + [R_RISCV_ALIGN] = false, + [R_RISCV_RVC_BRANCH] = false, + [R_RISCV_RVC_JUMP] = false, + /* 46-50 reserved for future standard use */ + [R_RISCV_RELAX] = false, + [R_RISCV_SUB6] = true, + [R_RISCV_SET6] = true, + [R_RISCV_SET8] = true, + [R_RISCV_SET16] = true, + [R_RISCV_SET32] = true, + [R_RISCV_32_PCREL] = false, + [R_RISCV_IRELATIVE] = false, + [R_RISCV_PLT32] = false, + [R_RISCV_SET_ULEB128] = true, + [R_RISCV_SUB_ULEB128] = true, + /* 62-191 reserved for future standard use */ + /* 192-255 nonstandard ABI extensions */ +}; + +static int accumulation_not_supported(struct module *me, void *location, long buffer) +{ + pr_err("%s: Internal error. Only ADD/SUB/SET/ULEB128 should be accumulated.", me->name); + return -EINVAL; +} + +static int apply_6_bit_accumulation(struct module *me, void *location, long buffer) +{ + if (buffer != (buffer & 0x3F)) { + pr_err("%s: value %ld out of range for 6-bit relocation.\n", + me->name, buffer); + return -EINVAL; + } + *(u8 *)location = ((*(u8 *)location & 0xc0) | ((u8)buffer & 0x3F)); + return 0; +} + +static int apply_8_bit_accumulation(struct module *me, void *location, long buffer) +{ + if (buffer != (u8)buffer) { + pr_err("%s: value %ld out of range for 8-bit relocation.\n", + me->name, buffer); + return -EINVAL; + } + *(u8 *)location = (u8)buffer; + return 0; +} + +static int apply_16_bit_accumulation(struct module *me, void *location, long buffer) +{ + if (buffer != (u16)buffer) { + pr_err("%s: value %ld out of range for 16-bit relocation.\n", + me->name, buffer); + return -EINVAL; + } + *(u16 *)location = (u16)buffer; + return 0; +} + +static int apply_32_bit_accumulation(struct module *me, void *location, long buffer) +{ + if (buffer != (u32)buffer) { + pr_err("%s: value %ld out of range for 32-bit relocation.\n", + me->name, buffer); + return -EINVAL; + } + *(u32 *)location = (u32)buffer; + return 0; +} + +static int apply_64_bit_accumulation(struct module *me, void *location, long buffer) +{ + *(u64 *)location = (u64)buffer; + return 0; +} + +static int apply_uleb128_accumulation(struct module *me, void *location, long buffer) +{ + /* + * ULEB128 is a variable length encoding. Encode the buffer into + * the ULEB128 data format. + */ + while (buffer != 0) { + *(u8 *)location = (u8)buffer & 0x7F; + buffer >>= 7; + *(u8 *)location |= (buffer != 0) << 7; + location = (u8 *)location + 1; + } + return 0; +} + +/* + * Need to duplicate this a third time to capture the handlers for accumulation. + */ +static int (*accumulate_handlers[])(struct module *me, void *location, long buffer) = { + [R_RISCV_32] = accumulation_not_supported, + [R_RISCV_64] = accumulation_not_supported, + [R_RISCV_RELATIVE] = accumulation_not_supported, + [R_RISCV_COPY] = accumulation_not_supported, + [R_RISCV_JUMP_SLOT] = accumulation_not_supported, + [R_RISCV_TLS_DTPMOD32] = accumulation_not_supported, + [R_RISCV_TLS_DTPMOD64] = accumulation_not_supported, + [R_RISCV_TLS_DTPREL32] = accumulation_not_supported, + [R_RISCV_TLS_DTPREL64] = accumulation_not_supported, + [R_RISCV_TLS_TPREL32] = accumulation_not_supported, + [R_RISCV_TLS_TPREL64] = accumulation_not_supported, + /* 12-15 undefined */ + [R_RISCV_BRANCH] = accumulation_not_supported, + [R_RISCV_JAL] = accumulation_not_supported, + [R_RISCV_CALL] = accumulation_not_supported, + [R_RISCV_CALL_PLT] = accumulation_not_supported, + [R_RISCV_GOT_HI20] = accumulation_not_supported, + [R_RISCV_TLS_GOT_HI20] = accumulation_not_supported, + [R_RISCV_TLS_GD_HI20] = accumulation_not_supported, + [R_RISCV_PCREL_HI20] = accumulation_not_supported, + [R_RISCV_PCREL_LO12_I] = accumulation_not_supported, + [R_RISCV_PCREL_LO12_S] = accumulation_not_supported, + [R_RISCV_HI20] = accumulation_not_supported, + [R_RISCV_LO12_I] = accumulation_not_supported, + [R_RISCV_LO12_S] = accumulation_not_supported, + [R_RISCV_TPREL_HI20] = accumulation_not_supported, + [R_RISCV_TPREL_LO12_I] = accumulation_not_supported, + [R_RISCV_TPREL_LO12_S] = accumulation_not_supported, + [R_RISCV_TPREL_ADD] = accumulation_not_supported, + [R_RISCV_ADD8] = apply_8_bit_accumulation, + [R_RISCV_ADD16] = apply_16_bit_accumulation, + [R_RISCV_ADD32] = apply_32_bit_accumulation, + [R_RISCV_ADD64] = apply_64_bit_accumulation, + [R_RISCV_SUB8] = apply_8_bit_accumulation, + [R_RISCV_SUB16] = apply_16_bit_accumulation, + [R_RISCV_SUB32] = apply_32_bit_accumulation, + [R_RISCV_SUB64] = apply_64_bit_accumulation, + /* 41-42 reserved for future standard use */ + [R_RISCV_ALIGN] = accumulation_not_supported, + [R_RISCV_RVC_BRANCH] = accumulation_not_supported, + [R_RISCV_RVC_JUMP] = accumulation_not_supported, + /* 46-50 reserved for future standard use */ + [R_RISCV_RELAX] = accumulation_not_supported, + [R_RISCV_SUB6] = apply_6_bit_accumulation, + [R_RISCV_SET6] = apply_6_bit_accumulation, + [R_RISCV_SET8] = apply_8_bit_accumulation, + [R_RISCV_SET16] = apply_16_bit_accumulation, + [R_RISCV_SET32] = apply_32_bit_accumulation, + [R_RISCV_32_PCREL] = accumulation_not_supported, + [R_RISCV_IRELATIVE] = accumulation_not_supported, + [R_RISCV_PLT32] = accumulation_not_supported, + [R_RISCV_SET_ULEB128] = apply_uleb128_accumulation, + [R_RISCV_SUB_ULEB128] = apply_uleb128_accumulation, + /* 62-191 reserved for future standard use */ + /* 192-255 nonstandard ABI extensions */ }; +void process_accumulated_relocations(struct module *me) +{ + /* + * Only ADD/SUB/SET/ULEB128 should end up here. + * + * Each bucket may have more than one relocation location. All + * relocations for a location are stored in a list in a bucket. + * + * Relocations are applied to a temp variable before being stored to the + * provided location to check for overflow. This also allows ULEB128 to + * properly decide how many entries are needed before storing to + * location. The final value is stored into location using the handler + * for the last relocation to an address. + * + * Three layers of indexing: + * - Each of the buckets in use + * - Groups of relocations in each bucket by location address + * - Each relocation entry for a location address + */ + struct used_bucket *bucket_iter; + struct relocation_head *rel_head_iter; + struct relocation_entry *rel_entry_iter; + int curr_type; + void *location; + long buffer; + + list_for_each_entry(bucket_iter, &used_buckets_list, head) { + hlist_for_each_entry(rel_head_iter, bucket_iter->bucket, node) { + buffer = 0; + location = rel_head_iter->location; + list_for_each_entry(rel_entry_iter, rel_head_iter->rel_entry, head) { + curr_type = rel_entry_iter->type; + reloc_handlers_rela[curr_type](me, &buffer, rel_entry_iter->value); + kfree(rel_entry_iter); + } + accumulate_handlers[curr_type](me, location, buffer); + kfree(rel_head_iter); + } + kfree(bucket_iter); + } + + kfree(relocation_hashtable); +} + +int add_relocation_to_accumulate(struct module *me, int type, void *location, + unsigned int hashtable_bits, Elf_Addr v) +{ + struct relocation_entry *entry; + struct relocation_head *rel_head; + struct hlist_head *current_head; + struct hlist_node *first; + struct used_bucket *bucket; + unsigned long hash; + + entry = kmalloc(sizeof(*entry), GFP_KERNEL); + INIT_LIST_HEAD(&entry->head); + entry->type = type; + entry->value = v; + + hash = hash_min((unsigned long)location, hashtable_bits); + + current_head = &relocation_hashtable[hash]; + first = current_head->first; + + /* Find matching location (if any) */ + bool found = false; + struct relocation_head *rel_head_iter; + + hlist_for_each_entry(rel_head_iter, current_head, node) { + if (rel_head_iter->location == location) { + found = true; + rel_head = rel_head_iter; + break; + } + } + + if (!found) { + rel_head = kmalloc(sizeof(*rel_head), GFP_KERNEL); + rel_head->rel_entry = + kmalloc(sizeof(struct list_head), GFP_KERNEL); + INIT_LIST_HEAD(rel_head->rel_entry); + rel_head->location = location; + INIT_HLIST_NODE(&rel_head->node); + if (!current_head->first) { + bucket = + kmalloc(sizeof(struct used_bucket), GFP_KERNEL); + INIT_LIST_HEAD(&bucket->head); + bucket->bucket = current_head; + list_add(&bucket->head, &used_buckets_list); + } + hlist_add_head(&rel_head->node, current_head); + } + + /* Add relocation to head of discovered rel_head */ + list_add_tail(&entry->head, rel_head->rel_entry); + + return 0; +} + +unsigned int initialize_relocation_hashtable(unsigned int num_relocations) +{ + /* Can safely assume that bits is not greater than sizeof(long) */ + unsigned long hashtable_size = roundup_pow_of_two(num_relocations); + unsigned int hashtable_bits = ilog2(hashtable_size); + + /* + * Double size of hashtable if num_relocations * 1.25 is greater than + * hashtable_size. + */ + int should_double_size = ((num_relocations + (num_relocations >> 2)) > (hashtable_size)); + + hashtable_bits += should_double_size; + + hashtable_size <<= should_double_size; + + relocation_hashtable = kmalloc_array(hashtable_size, + sizeof(*relocation_hashtable), + GFP_KERNEL); + __hash_init(relocation_hashtable, hashtable_size); + + INIT_LIST_HEAD(&used_buckets_list); + + return hashtable_bits; +} + int apply_relocate_add(Elf_Shdr *sechdrs, const char *strtab, unsigned int symindex, unsigned int relsec, struct module *me) @@ -349,11 +822,13 @@ int apply_relocate_add(Elf_Shdr *sechdrs, const char *strtab, unsigned int i, type; Elf_Addr v; int res; + unsigned int num_relocations = sechdrs[relsec].sh_size / sizeof(*rel); + unsigned int hashtable_bits = initialize_relocation_hashtable(num_relocations); pr_debug("Applying relocate section %u to %u\n", relsec, sechdrs[relsec].sh_info); - for (i = 0; i < sechdrs[relsec].sh_size / sizeof(*rel); i++) { + for (i = 0; i < num_relocations; i++) { /* This is where to make the change */ location = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr + rel[i].r_offset; @@ -428,11 +903,16 @@ int apply_relocate_add(Elf_Shdr *sechdrs, const char *strtab, } } - res = handler(me, location, v); + if (accumulate_relocations[type]) + res = add_relocation_to_accumulate(me, type, location, hashtable_bits, v); + else + res = handler(me, location, v); if (res) return res; } + process_accumulated_relocations(me); + return 0; }