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 D7E82CDB47E for ; Wed, 18 Oct 2023 18:31:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6C1288D0186; Wed, 18 Oct 2023 14:31:08 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6711E8D0016; Wed, 18 Oct 2023 14:31:08 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 511A88D0186; Wed, 18 Oct 2023 14:31:08 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 3BDDC8D0016 for ; Wed, 18 Oct 2023 14:31:08 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 0086A1CA65C for ; Wed, 18 Oct 2023 18:31:07 +0000 (UTC) X-FDA: 81359424216.12.F769C1A Received: from mail-yw1-f180.google.com (mail-yw1-f180.google.com [209.85.128.180]) by imf02.hostedemail.com (Postfix) with ESMTP id CAA8D80016 for ; Wed, 18 Oct 2023 18:31:05 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=e60ODSUL; spf=pass (imf02.hostedemail.com: domain of charlie@rivosinc.com designates 209.85.128.180 as permitted sender) smtp.mailfrom=charlie@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1697653866; a=rsa-sha256; cv=none; b=DIuqqvUGjsSfigcXk1BCCvsQs5Cf6wCEPzE3MakvoWUTmglMuX9XdSRN59kdG+jy+qISh+ 493iw/A6I/v2DFQSrNc6dTZLee3Ae6pcNqsLfbPxAbBjrfLYdlgA1tgSOaxtBCBToOKFnR dTg1eozZkHHePKe5o7E9ApTWIp0cwU8= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=e60ODSUL; spf=pass (imf02.hostedemail.com: domain of charlie@rivosinc.com designates 209.85.128.180 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=1697653866; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=IHUD6sASExs/GXz3U87JmB/giRzmLpe5GxsMQInFySk=; b=DsamqcJTuXRKqkD1RYNM8L17ecUJNELLCbj+bt7AWA8Fe4cDM0xleoTmsYDpwexLUZ0vq5 /K07E2xO/MbUIYwHvXvdxYk82kPJfBNApgwZiLt2JvBAQkzBbrg/VdzyicJLMteIb7kIKu veb7hexqJ6dlyAp1usrgQc5YoKKZoiA= Received: by mail-yw1-f180.google.com with SMTP id 00721157ae682-5a8ada42c2aso21983607b3.3 for ; Wed, 18 Oct 2023 11:31:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1697653865; x=1698258665; darn=kvack.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=IHUD6sASExs/GXz3U87JmB/giRzmLpe5GxsMQInFySk=; b=e60ODSULcgGvZejhNynSB687FRo461Dn0VPGBUZMyYAYe1hRxO9o0m3gQ0HAS9f+/o V1lmZ4jzfGRp6jENIFkSHCFXUrCYc6Ghq3vXzTP9gsfooVUVNoZ8WZOesJQGDi2eewHv sfBeVs9cAGSg19nzfxzEYkwex2i61gJBYXEqZAjihZJt7LJ2YMKKx1WYqemJC+UX8Y/K qTK1ut+DkMDjR7VrUmzx2Hcj0ik1c3Jp7uQWiIKG1jSLpnQkaTagYC3Mw/gUEpOlr/Fv YXzi7HSDsVJ2IjBP0PF8DN9zPZaK/oA8Ga23dXjItBGUo1lQ87Xc1ORs9SuvVJuBNRDW 4SkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697653865; x=1698258665; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=IHUD6sASExs/GXz3U87JmB/giRzmLpe5GxsMQInFySk=; b=kN26FV+DLhk2rYCQvJgTxVlQGBga9UATwfNdCWfowjalEP3p8s+TB5GtVqrVVzYrb/ T82GDZQ+NiO8oq+GDhYvcpxo/mXYOUXPcTxoA5E57RU/fqQBAUZcQHSTePi884KWVPKq ZrNxy+5bgylw2QsFwd3Khs/0APMQJiREFRjgYe9VGsheD8MNeGa5HB5P2w7jSAqCFe50 N7N6QY0bMmkDMg1heq06B+3qdO57y78cnApnoVYwTdRVh8f7/ur4DrnwYFdAPOJb2amb 9DrVlynpe361S36YCINNt+65lC0BRdH3iwijOeGIRn9zJoJSDPo7KpqxK+35PEngF2Ab 6Yxw== X-Gm-Message-State: AOJu0YyHxxQEzzXlZavlPHQhlK7cHQk1+tUV5+mXjB1Fuju6fhfDwuiQ P+F4itnq+qn+64aIPINY+5GqsA== X-Google-Smtp-Source: AGHT+IFQaGgVrwHXJazEcctfK/sJKSWbuonzH4gNdGVcLIC5LWa08vWj6PJu5tXvvU8uHJMregz7BA== X-Received: by 2002:a05:690c:1b:b0:59f:72a6:da0e with SMTP id bc27-20020a05690c001b00b0059f72a6da0emr80934ywb.41.1697653864677; Wed, 18 Oct 2023 11:31:04 -0700 (PDT) Received: from ghost ([208.116.208.98]) by smtp.gmail.com with ESMTPSA id g8-20020a05620a218800b007759e9b0eb8sm147121qka.99.2023.10.18.11.31.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 11:31:04 -0700 (PDT) Date: Wed, 18 Oct 2023 11:31:00 -0700 From: Charlie Jenkins To: Emil Renner Berthing Cc: linux-riscv@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Eric Biederman , Kees Cook , Paul Walmsley , Palmer Dabbelt , Albert Ou Subject: Re: [PATCH v4 1/2] riscv: Add remaining module relocations Message-ID: References: <20231017-module_relocations-v4-0-937f5ef316f0@rivosinc.com> <20231017-module_relocations-v4-1-937f5ef316f0@rivosinc.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: CAA8D80016 X-Stat-Signature: ystm9ra176arb5inb9xr4q8y7geraa31 X-Rspam-User: X-HE-Tag: 1697653865-678587 X-HE-Meta: U2FsdGVkX19EpRRrKY6HeMx29eX+7fLkGTQhTmrYifD9dA/CEALyjtKQ41Iwh2K9U8f9IYtmbpEiZ3NHiaPoSsQEXRBJIdVjRJoZTrxe/JTzWLZxq+ZJGTf1GXxX4Xtm6GaDtlQnv10X4hG0nRveaSqLKabgdv5egH3Xkc0fk8kytOS+lwoL1kpeHDlRb+MGar2nSFQXYLD2xlN4rwbm+Plq0W9K0FIZaoYa6o/PS4xTTLhrGV6o/v71doUxaqlQza9S5jSLBDRkKgR3ZtspHlaaSMbc3XOk4VEs0SvOQIF2zIa4Ob7xkSzlx9y8upyh6nP4d7jVwS8fg4KG5Iz7gZ5TFzkdvHRH7b3WysgWQXeTxd1e34qAvj/0Ay816G8257Nv88KHmyYaWJqQNcv9Am344BC+DiF5ASDVfVJ3B1L8UIfCnCuvclBQkUWZ8RRoECYGyMrAYHPWP797VjPTcSNPUnx28xusJD8jWXCkX8FD9nAZJk8fedu4EL5Sr+ifSQG+Qra4sLM6lM9i4ZCJr7mksqf30qMaaRTI4+252URxqRJ4D7HsuuB5kDuKJpurJo6yS2DQ9C9KOgL6pZHkg/E6fDXokYEgkKh2iTETTgXm+D2UldHBlNBIIuf8Q60S+tVP9F1rfDnIYuUM+nlXL7REewvMF27n6bO6/8FuLVuRWn2md9APryL+p8xNbtSotRCP04r5Sd8cN4Ar14pGDicpIhz7QE1gkkOuGzg6WADCHJC/tqrL6nMJkKpw+5exIOfsy4vtWtUNvQEFLyY/jI6RXrHstHfmgsYXEXbuuy/c+66mfMqx5sDs8Qynr9s/k0Bj9rrqLSh/SMWDkxeoyA+mgvJ9+DkdwHr9gt738dVxfoQZoctx5C8HDHQYPGbmlKSIg79r5vZBpLoB474j0ZlGY1iMhuRWPfHuRQDCnSIPZ18k0L01XtwYTVu11lQVN77yZZNGmXBrC8yMlON kWjuFcrK ucQh5tjQX4M1lR2xvMMzRNjNa0lFyq7FOpyaXwEEAny9A8uK9/Jcj3YpWolKWMxulcfQ+holRAdpkfIdggcSecQEjTZizXtjEnyMub9CTc09bj9Mi6JUsi87BkpTWdkyRW/d2etwsT2MuUHIrIRqu/esmjd9C2XKvjUrgf3hX/2Z4w/knpFr29EaezyXl6+zZ6sRGXA36hOHP7dZHPP2GKSAab7daIPypCPMjV6qkaj5uqu7FxM4+mZWg85PPruIme2+LkMk7SLFVQEgqazJn9G9/wLcg0j5lXcTcPODhDz1bhHAA8nML/BY/yqKvfA2zmRIakU5Ss6zkrNoLKKjCzdEYjxtruKCcrCXaWj04xOpJ3nNtof8oq87EMzBQJuTJRnFikvghFS2Z6NkX+B3BVDdW8jXahOv8qME73ydfzGzwSjGxT6pmMsIbsJyuNwnNakOdJucz95eLNyY8IP1RAPgl1yzujcPBmJKD+wqohSbS5EUamvTsrD+B4LBCVncGGRPN/73l3FCvvwlZWhWNjPF4J7f4rt6DSFtrX0BAb+iiGEmvMoWGP4jGQw7qFXCzZN9u 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: On Wed, Oct 18, 2023 at 05:17:44AM -0700, Emil Renner Berthing wrote: > Charlie Jenkins wrote: > > 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 | 207 +++++++++++++++++++++++++++++++++----- > > 2 files changed, 186 insertions(+), 26 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 7c651d55fcbd..e860726352ac 100644 > > --- a/arch/riscv/kernel/module.c > > +++ b/arch/riscv/kernel/module.c > > @@ -7,6 +7,7 @@ > > #include > > #include > > #include > > +#include > > #include > > #include > > #include > > @@ -268,6 +269,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 +296,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 +323,149 @@ 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 = (*location - ((u8)v & 0x3F)) & 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, > > + /* 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 */ > > }; > > Hi Charlie, > > This is not a critique of this patch, but all these callbacks take a > u32 *location and > because of the compressed instructions this pointer may not be > aligned, so a lot of > the callbacks end up doing unaligned access which may fault to an > M-mode handler on > some platforms. > > I once sent a patch to fix this: > https://lore.kernel.org/linux-riscv/20220224152456.493365-2-kernel@esmil.dk/ > > Maybe that's something you want to look into while touching this code anyway. > > /Emil Oh nice, I will pick up that patch and change the "native-endian" wording to be "little-endian" in the commit. - Charlie > > > > int apply_relocate_add(Elf_Shdr *sechdrs, const char *strtab, > > @@ -348,6 +479,10 @@ int apply_relocate_add(Elf_Shdr *sechdrs, const char *strtab, > > unsigned int i, type; > > Elf_Addr v; > > int res; > > + bool uleb128_set_exists = false; > > + u32 *uleb128_set_loc; > > + unsigned long uleb128_set_sym_val; > > + > > > > pr_debug("Applying relocate section %u to %u\n", relsec, > > sechdrs[relsec].sh_info); > > @@ -425,6 +560,28 @@ int apply_relocate_add(Elf_Shdr *sechdrs, const char *strtab, > > me->name); > > return -EINVAL; > > } > > + } else if (type == R_RISCV_SET_ULEB128) { > > + if (uleb128_set_exists) { > > + pr_err("%s: riscv psABI requires the next ULEB128 relocation to come after a R_RISCV_SET_ULEB128 is an R_RISCV_SUB_ULEB128, not another R_RISCV_SET_ULEB128.\n", > > + me->name); > > + return -EINVAL; > > + } > > + uleb128_set_exists = true; > > + uleb128_set_loc = location; > > + uleb128_set_sym_val = > > + ((Elf_Sym *)sechdrs[symindex].sh_addr + > > + ELF_RISCV_R_SYM(rel[i].r_info)) > > + ->st_value + > > + rel[i].r_addend; > > + } else if (type == R_RISCV_SUB_ULEB128) { > > + if (uleb128_set_exists && uleb128_set_loc == location) { > > + /* Calculate set and subtraction */ > > + v = uleb128_set_sym_val - v; > > + } else { > > + pr_err("%s: R_RISCV_SUB_ULEB128 must always be paired with the first R_RISCV_SET_ULEB128 that comes before it. PC = %p\n", > > + me->name, location); > > + return -EINVAL; > > + } > > } > > > > res = handler(me, location, v); > > > > -- > > 2.34.1 > > > > > > _______________________________________________ > > linux-riscv mailing list > > linux-riscv@lists.infradead.org > > http://lists.infradead.org/mailman/listinfo/linux-riscv