From patchwork Tue Oct 31 07:24:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charlie Jenkins X-Patchwork-Id: 13441126 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 A9A9DC00144 for ; Tue, 31 Oct 2023 07:25:03 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 70F5E6B0165; Tue, 31 Oct 2023 03:25:02 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 584D78D0012; Tue, 31 Oct 2023 03:25:02 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3FEE36B0167; Tue, 31 Oct 2023 03:25:02 -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 310DE6B0165 for ; Tue, 31 Oct 2023 03:25:02 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 0176D8075B for ; Tue, 31 Oct 2023 07:25:01 +0000 (UTC) X-FDA: 81404920044.07.295DEB5 Received: from mail-pg1-f169.google.com (mail-pg1-f169.google.com [209.85.215.169]) by imf06.hostedemail.com (Postfix) with ESMTP id 1187B180009 for ; Tue, 31 Oct 2023 07:24:59 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=qye03MTe; dmarc=none; spf=pass (imf06.hostedemail.com: domain of charlie@rivosinc.com designates 209.85.215.169 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=1698737100; 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=URk3OdUManeok/shpPwBhUNFZ0p313A2y5YhZgjx0S8=; b=GbfYbPjvMthrclqhqdZtmvXPiCG5aSy8P440MmMcNUxXptHqwU6qDiZLTnB5dXHLs5iYOu Ydl3+ZkAVyaVDj3JfRSQ9GeE234z34NnvijH4GG9q1fnElrXQUQNFX35li5u/On37XJzzD Yp6DEvj2OLfW6g/yfPVsTfNdzn7Ylco= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=qye03MTe; dmarc=none; spf=pass (imf06.hostedemail.com: domain of charlie@rivosinc.com designates 209.85.215.169 as permitted sender) smtp.mailfrom=charlie@rivosinc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1698737100; a=rsa-sha256; cv=none; b=Y2J3mfpxAA4dy3AKzXH7wGe6iaKYqunW+Skq4vg4CEfjivvGqyAS9rJOcH9oiDYCpwLuNR WnVt45dV51PA/u4dbmjkkVaIameM0FgzSD5F1hB63LzMPJfcmBJYJLCjqvRCfFdiRldXZK /myD1DdLdI1e4UfPFJ58sktjSY0gEcc= Received: by mail-pg1-f169.google.com with SMTP id 41be03b00d2f7-5a9bf4fbd3fso4249616a12.1 for ; Tue, 31 Oct 2023 00:24:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1698737099; x=1699341899; 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=URk3OdUManeok/shpPwBhUNFZ0p313A2y5YhZgjx0S8=; b=qye03MTeFqAHu2HvX6vN3dUM4m9Evqs7wqd4AwQBbAffKeRbIVxvgb4l/eMNWahECb 0LcBjLcKxiJ6QzBAxIqa6+Q0uCE+PrJG4Aj0oTjAjOZPZWQ6WioxMHux6YEfS9HGddWR PALYMSYDz9h5IWHSMsNIqB3806cnrkCtYd6/UzFFW9/BaKJbbxCQ6eQ15LyfOoraSqEc tmu6QuwzElOi/wLPq0W4fPRHGMBicYkhSquWR4H7jC3pwGze0dr93Rt+JWukw5D2F0Zq M/Mt0SSqox9Azx6J0FmVNVJWaG/sKhbaLVmaeRGrMZPH5iF1rtx+XM30OfeVKRboR4nw H0uA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698737099; x=1699341899; 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=URk3OdUManeok/shpPwBhUNFZ0p313A2y5YhZgjx0S8=; b=jeTkEC172QXrA/fR8TyrWePL52vDdnzsM3UXKXIxvOy+VxbsWCOajn+pdycWqOuWw4 dMl9ukjCCU6/rKKo3l3IeKDarCJcUQ0/+GoIRRI6Rs1t1KR+fqbVoiXnSneLrWSZtY8X CDnvQ3bAh5yryhCHB8jzc3DAByvBigGBPC993Ki3q/9+jCkY0jPaeEb1JltLIFmn3axd I6lc47DLGDuMYd+ePidP6tD+0Cc70tm39IF6LBCZ8mNWuLEZSsFKy6zyxClB2XS4abhe zYf/1EXkQEmDtNdai2bSBsahtmqVU7J3YLwXtV4+alvi8Z7znxA41E3OdW1UdSXT23IC eOPg== X-Gm-Message-State: AOJu0YyrlBvdJr+vsK//SEJp2/iAdIHxsqxcLWW5hQnm9fPCJ+qyys0P y7/DbJn9ExIPq3xKzFfNB4gtZQ== X-Google-Smtp-Source: AGHT+IGMiYHXnhGdC7cRoaxFCEKMq3w/10RpLtJzNqO9zNSb0eOy2g2uER1RInnmVou5GpnGB/rkDw== X-Received: by 2002:a05:6a20:748b:b0:17a:de5d:1d7e with SMTP id p11-20020a056a20748b00b0017ade5d1d7emr15340331pzd.55.1698737098947; Tue, 31 Oct 2023 00:24:58 -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.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Oct 2023 00:24:58 -0700 (PDT) From: Charlie Jenkins Date: Tue, 31 Oct 2023 00:24:50 -0700 Subject: [PATCH v7 1/3] riscv: Avoid unaligned access when relocating modules MIME-Version: 1.0 Message-Id: <20231031-module_relocations-v7-1-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 , Emil Renner Berthing X-Mailer: b4 0.12.3 X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 1187B180009 X-Stat-Signature: uwxqyf9xy3jfknnzus3ij5zz1mf6cztg X-Rspam-User: X-HE-Tag: 1698737099-755492 X-HE-Meta: U2FsdGVkX1+z+QuSO7AuFgq8nXcfNqK6dy6/OFzE96CdXb+KLUomKMzSaPGX/D0kVCahT8dxRNfKrSPkAjPpj87C79Zj2h70zkqyJVS2FkL5BhWGc28S4bArVIM7FTRp6eHeiOmtG5+htRQ0gEKPoQBIa6QogWwusRxfeqHOMbRm4Pyem/V62oJEFPUs4hy4i5GPrZsxJvh6RKdkibaj4Bzy5I0XYUA2TORFdXPH2c8xbeFBRugPlRGJ+Egs4aiBVoISd/Lf2an/soEN7Gne7aiK9t+xi0PAePIYn0j+E2MlLg8cX1axT6Ibpw7I43ztpCEnNNDzPeahXQBLOE5oxRpYTYfPPSSbre/i4Fl8ALidPX0G6jkGIbqPVWEaQxbyDj/C+4wDsQzWKUVRDesQxzuUmOIt3r2mbQhPEHyxyDkDf+2SS1R0sZTszkOTVkZNtmoirV0Em0NVx62iLp4ceM1tN8fDML5g7kBDogxIHEl7GKUormaWHFBTP5V6KuzAc52LlY/Oz8efFo5gT0wgSMrOipoBtqq8Zl40kb2gVZHdB7v2HHE+avgLL2yv2JnMbgUTiC5xenRfPJUjFnVmiWXLWjzpIWFjlQ2N5baoaGpxMTokjzZIJ4lPAuxkS6FSsvD/kea8quc7gGe+5dCFojU4Tzx5H0t8Io4Tybp2Xir0IoZiS49xwj3AZRr0InDY7QIx03ghp3I5DJpLLDvAOVnhqJ5Uqk7cKacOEy+8HpxJmnO1XnLHm/hHvuEARIT+phf6Ui5ZsJ4syhqVANqit4+G7v25pOgC+liPiYytj4ST5KM/xiqoigERr0q6NupmGVV9eH5ZxBBRxAJfZFCS5PzWkV1XGb+T18SC8X9AY3x3TQRsbt9ez+wiNITR2nogTLf/ET0KqPLwIloy0+zn0Vu+QPHhtFjn36AlLZfX//kerpk5zJBaMYeX9yCpE4UhMHhz9uQTYW58pGmQ7/v p5HxsgYw vMCAv0mXvC36rV/d1T7bWCcLGKKyDrdgI7XxARgslpj5w6jguzNvj6FUgHqrnVcSWBIPNptgmuTJ78Q8DDncOcdVgWrOy++0NfIjLuq/t5IZl4rJrqpVGwsbzE6NhMSYVrjj4mfBrOryIpYODfZ8xqQ0aL7QfIODJZOkTRroJ6YiK4Ys3QXRQEdg6CnjTlSDRhxrHpwKzSlwXUSxp27CcdphIuVdBWM/oPCCC60gvbzgh+DEOlAJ3ZSUOZEfvQR6sabhYCe24jndxVS4wh4lB2tGGQKGEGXFbN7rRp1vQGTMVqlfy0sUgh0/gnnvErdonPDhNJ8hT/va6FKs/4kL97dv4qyba+LtOOEafoUKW4y5o03StWAyi2AAoUzLUutCLeJApDS5B17uHDI0KwWyxAfiLDOcVMu0+kRhDu221Zn3IlqWiyy9hG8C3ZENtrfOT0IWIFaPk2ghJdJw= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000871, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: 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; 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; } From patchwork Tue Oct 31 07:24:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charlie Jenkins X-Patchwork-Id: 13441128 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 06AD5C4167D for ; Tue, 31 Oct 2023 07:25:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 822058D0014; Tue, 31 Oct 2023 03:25:04 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7A8DB8D0012; Tue, 31 Oct 2023 03:25:04 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5614F8D0014; Tue, 31 Oct 2023 03:25:04 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 2BF818D0012 for ; Tue, 31 Oct 2023 03:25:04 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 00723C06D7 for ; Tue, 31 Oct 2023 07:25:03 +0000 (UTC) X-FDA: 81404920086.24.7C662E8 Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by imf05.hostedemail.com (Postfix) with ESMTP id 1408310000A for ; Tue, 31 Oct 2023 07:25:01 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b="RiNX/2fA"; dmarc=none; spf=pass (imf05.hostedemail.com: domain of charlie@rivosinc.com designates 209.85.214.182 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=1698737102; 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=5i3k60W5/54VCxlVjAMqVLQstP2YA2cW2PpQMpTpfy4=; b=EvcoIo5QzQFlRj0lwb3jK0E6XU4ct88pFzALwbICjhAoP5RzenuBZJFxUgTKIk10IwaUml MsBlSWdVetk0MIhgkgqWI4uoeZ8WMdghCjxTYbkwjsk5mmTHVDS3CA/ALHZoZFNeS533vy ixBG/FtD1lJsElGkQpCd0+TOqZTaECU= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b="RiNX/2fA"; dmarc=none; spf=pass (imf05.hostedemail.com: domain of charlie@rivosinc.com designates 209.85.214.182 as permitted sender) smtp.mailfrom=charlie@rivosinc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1698737102; a=rsa-sha256; cv=none; b=4aZ0+6rdx6XFzq3EEhJ/95M6/Hc65Mm8AKN5bapyPAFMwgdpGZ7WdqPEQ0wCb1o93YgMJh QMktqPr2BZhUrLA7K9vH69lu3kxCLyIAcok7kYuQc+w+imv3nkrqDhnEuy29VelLYx9AM1 f1t8w7An0s5gmdntpgCoFjv2fNpCE4o= Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-1c434c33ec0so40966155ad.3 for ; Tue, 31 Oct 2023 00:25:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1698737101; x=1699341901; 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=5i3k60W5/54VCxlVjAMqVLQstP2YA2cW2PpQMpTpfy4=; b=RiNX/2fA0Ah4C2r7QhSkOSP2+Ers7Ufz/rOyMttSER1Kc/4HXcTOHtRmbxd8570IdK kxAB4WHSeZkJD8326QgEAW809cY6Y71wg/r9V5WkwCkWGXedI1aurenmMh/1BKUQD3yO Ha1dWCj1lxkmr2iXNBnZxIjItr6IxOvKlmbHc43gZHE/j1GvJg7KsM3VjUTiApf6LeDV XFusvnqTqAs9oPepYNX+JgjdbiITEFnHbakE99k0t2lHNvnVFgSS/64RbuufrIzcUDro eeBACMF6xG+2o7x53ePM6CDEDaXi+BiTE2mp//IOJhdsgPSrAag1sqZHFRnkwEbW1J96 7mQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698737101; x=1699341901; 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=5i3k60W5/54VCxlVjAMqVLQstP2YA2cW2PpQMpTpfy4=; b=ntJF5ClX7VwRmBXab/leiajMAEuBV483F9mBpiv910RpK80GTG8TfVRFLcRVWVOaSe xUxpkNDow9wyCCpTI7UNEmxY4sgaKPykMWn8nLOZ1HthztzxTodmvE/HHE+7YZcnLDtr lFkR6GF33EzNpVRb/yOWKSfE1m+PdF/0+Utcp50aMAJxM3GEtQuJ9v0d3JLo2aRs7bPZ UIdSJnC1jyPBb+Pm8ekWkYSzUE7Khfd1SO6DlmW5ZKDWTMAftbfEsDkfKFDTi6OPQTsl ulIUNq3f5rx9MHFMs8yjX5y6SkyDQffD2oMZ9u+fi4CL8k56jcGHDI35yB6Lq2RNDK+J y6hg== X-Gm-Message-State: AOJu0Yw/qUpsSnjEb3Gehs40JhNJX40o+sA+Fh0My+O/0R1PxWNkUb28 euuEJ2jUOu/EIO46q3WopDVXzw== X-Google-Smtp-Source: AGHT+IHYw1sEq+TX3dLuh4zd1B+p1vMfwxCGO8Bx9w0chWLeTkhzcORUw1ztdOvFhe38SDcO1QOs+Q== X-Received: by 2002:a17:902:f9ce:b0:1ca:a07b:36d with SMTP id kz14-20020a170902f9ce00b001caa07b036dmr9301419plb.48.1698737101008; Tue, 31 Oct 2023 00:25:01 -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.25.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Oct 2023 00:25:00 -0700 (PDT) From: Charlie Jenkins Date: Tue, 31 Oct 2023 00:24:52 -0700 Subject: [PATCH v7 3/3] riscv: Add tests for riscv module loading MIME-Version: 1.0 Message-Id: <20231031-module_relocations-v7-3-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-Queue-Id: 1408310000A X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: abqf49f7e61r8gnc6h3c1u34y8b37wqn X-HE-Tag: 1698737101-700881 X-HE-Meta: U2FsdGVkX19zk9ha/ztjdKQ349VMM+3ShvmFKr2Z9aZ4hrkIqxno1/3OC3bAUA68sbKCvpA3029D5BjD/9AyzDTYDRUlm7SR8AxHKIffTw4Rxp0VXsE730zG2t0AN96uqUlFGNsjopfzKiS99HrDxV9TKlqWjQdeCgHLaDUqj9JmVAtJ+5P2c5oxtHeFHTr0Hfb3Ij/NbJi+3Ul9vOEnIM9lZhPIokG+gEF3Z5tVZzAQ0mCvoPjPkknGGp03fjLlWtIoULLlZEJAHl4rnRYhcK6hKyLHDzCEA3QG0UIXeqLz52GSULrVp1IaiIoV2XBbT6lTF5PQ6w6PWTsGjcWgEiLE0C99mOqYL0xIR/cdmHJJreoeSGPHQU/Ab6Ht4in5rBYNRVmbRpAZiNEjaDK9fBSlQpQ6Ff4AXkZwtSLdRa79k40bDF3fCYzO8zJ4tYDfRKClHrp2i/dh3NBT4XHcQa6bLVGXmiZdcR1XZWHsKmoIOnSYG5XshpEvQkNmuXPpWh8oF4yYF3JFyaFGxxFYX5IN6wrwlde/jODHT92s76kCgwwPN03tnAHludEIBepqHgcGN6UaRLzixkF4BotGCMBWRyWuwmfnfblQpi2P1Bg6yA5bYrCB8s1of4V/3u67R21j0ra6cBQo0k8atT8SMmWfB1/vZYe1nzVmxXwUu/ce9DXDIF7gCusJerYGnzjFjH1tQTAVYRgtr6NwswD2wkHZKKvAMvrSdF0CCP+InnQ5qsrp7vGDpo0RnywXkKLiod+7crLWNgnNa4nHXrm7r0h8OnhBMs8uYOFnMojE9jPZCcpaB/zjkXMG3+ui2NU6p9k/SlnFgdeuyMjFKLQ+iRXZ7SrjKG02QOYoGJmk2lMkf0gH+9uTjdaFm/hFLbTkASmkJDGdARJ5r65dWs/PZ0nhB7XC6nwngqp5AEVc3ifPFAc8pOy6kfGixNsBHzXwbivWusJYeY+rpAB/JaY wOdSXFAQ di/JYClVyXHvkWvpWE0I4sgPVorkLy1grvnVc/TLiFhWn7NMQ7tMoexTej9Ki8O5SBMzSqNyBiysA0qpip7QStKV7Nwa6eritmVQt2D5AIFq63DhBtQ36LnoihZCdLcaN7liNMXxGAL+f1dgwwqs5MlkVa13vXJ0ELxh5hwSspbG3Xn6R1rUKAmGdUXBnOxXx7V1tThVwQqyvdBOE3Udr0t+I9l9grwmSsPcv2O0wMd0rLu5WqyriONmpW1z05I/QrhFnn/Ig1kwT2Cqpkf/6ETLZ0DZadb/cEwgInKHyl1bPS5G4SVc7IDf8lW74qU2Nyh2HaeRrRexxMeLLZHTNv72QDOHJwgUM4rT3+Jm7TgDt76Hg4Iy5kXGLy9IH/AXu1mAGq1wOOGVu7bMYAQgAygKJMcA9pONtPbMun495asY9fk0nK6hFFgVsPITFkEOurkdAxg3x1sgrWlOqIvyxxfIXVWlc31LQIgvDNxa3yYx7Huswo7439Ee+69IRgv6sc8shrChiEyvIgrU= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000028, 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 test cases for the two main groups of relocations added: SUB and SET, along with uleb128. Signed-off-by: Charlie Jenkins --- arch/riscv/Kconfig.debug | 1 + arch/riscv/kernel/Makefile | 1 + arch/riscv/kernel/tests/Kconfig.debug | 35 +++++++++ arch/riscv/kernel/tests/Makefile | 1 + arch/riscv/kernel/tests/module_test/Makefile | 15 ++++ .../tests/module_test/test_module_linking_main.c | 88 ++++++++++++++++++++++ arch/riscv/kernel/tests/module_test/test_set16.S | 23 ++++++ arch/riscv/kernel/tests/module_test/test_set32.S | 20 +++++ arch/riscv/kernel/tests/module_test/test_set6.S | 23 ++++++ arch/riscv/kernel/tests/module_test/test_set8.S | 23 ++++++ arch/riscv/kernel/tests/module_test/test_sub16.S | 22 ++++++ arch/riscv/kernel/tests/module_test/test_sub32.S | 22 ++++++ arch/riscv/kernel/tests/module_test/test_sub6.S | 22 ++++++ arch/riscv/kernel/tests/module_test/test_sub64.S | 27 +++++++ arch/riscv/kernel/tests/module_test/test_sub8.S | 22 ++++++ arch/riscv/kernel/tests/module_test/test_uleb128.S | 31 ++++++++ 16 files changed, 376 insertions(+) diff --git a/arch/riscv/Kconfig.debug b/arch/riscv/Kconfig.debug index e69de29bb2d1..eafe17ebf710 100644 --- a/arch/riscv/Kconfig.debug +++ b/arch/riscv/Kconfig.debug @@ -0,0 +1 @@ +source "arch/riscv/kernel/tests/Kconfig.debug" diff --git a/arch/riscv/kernel/Makefile b/arch/riscv/kernel/Makefile index 95cf25d48405..bb99657252f4 100644 --- a/arch/riscv/kernel/Makefile +++ b/arch/riscv/kernel/Makefile @@ -57,6 +57,7 @@ obj-y += stacktrace.o obj-y += cacheinfo.o obj-y += patch.o obj-y += probes/ +obj-y += tests/ obj-$(CONFIG_MMU) += vdso.o vdso/ obj-$(CONFIG_RISCV_M_MODE) += traps_misaligned.o diff --git a/arch/riscv/kernel/tests/Kconfig.debug b/arch/riscv/kernel/tests/Kconfig.debug new file mode 100644 index 000000000000..5dba64e8e977 --- /dev/null +++ b/arch/riscv/kernel/tests/Kconfig.debug @@ -0,0 +1,35 @@ +# SPDX-License-Identifier: GPL-2.0-only +menu "arch/riscv/kernel Testing and Coverage" + +config AS_HAS_ULEB128 + def_bool $(as-instr,.reloc label$(comma) R_RISCV_SET_ULEB128$(comma) 127\n.reloc label$(comma) R_RISCV_SUB_ULEB128$(comma) 127\nlabel:\n.word 0) + +menuconfig RUNTIME_KERNEL_TESTING_MENU + bool "arch/riscv/kernel runtime Testing" + def_bool y + help + Enable riscv kernel runtime testing. + +if RUNTIME_KERNEL_TESTING_MENU + +config RISCV_MODULE_LINKING_KUNIT + bool "KUnit test riscv module linking at runtime" if !KUNIT_ALL_TESTS + depends on KUNIT + default KUNIT_ALL_TESTS + help + Enable this option to test riscv module linking at boot. This will + enable a module called "test_module_linking". + + KUnit tests run during boot and output the results to the debug log + in TAP format (http://testanything.org/). Only useful for kernel devs + running the KUnit test harness, and not intended for inclusion into a + production build. + + For more information on KUnit and unit tests in general please refer + to the KUnit documentation in Documentation/dev-tools/kunit/. + + If unsure, say N. + +endif # RUNTIME_TESTING_MENU + +endmenu # "arch/riscv/kernel runtime Testing" diff --git a/arch/riscv/kernel/tests/Makefile b/arch/riscv/kernel/tests/Makefile new file mode 100644 index 000000000000..7d6c76cffe20 --- /dev/null +++ b/arch/riscv/kernel/tests/Makefile @@ -0,0 +1 @@ +obj-$(CONFIG_RISCV_MODULE_LINKING_KUNIT) += module_test/ diff --git a/arch/riscv/kernel/tests/module_test/Makefile b/arch/riscv/kernel/tests/module_test/Makefile new file mode 100644 index 000000000000..d7a6fd8943de --- /dev/null +++ b/arch/riscv/kernel/tests/module_test/Makefile @@ -0,0 +1,15 @@ +obj-m += test_module_linking.o + +test_sub := test_sub6.o test_sub8.o test_sub16.o test_sub32.o test_sub64.o + +test_set := test_set6.o test_set8.o test_set16.o test_set32.o + +test_module_linking-objs += $(test_sub) + +test_module_linking-objs += $(test_set) + +ifeq ($(CONFIG_AS_HAS_ULEB128),y) +test_module_linking-objs += test_uleb128.o +endif + +test_module_linking-objs += test_module_linking_main.o diff --git a/arch/riscv/kernel/tests/module_test/test_module_linking_main.c b/arch/riscv/kernel/tests/module_test/test_module_linking_main.c new file mode 100644 index 000000000000..8df5fa5b834e --- /dev/null +++ b/arch/riscv/kernel/tests/module_test/test_module_linking_main.c @@ -0,0 +1,88 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2023 Rivos Inc. + */ + +#include +#include +#include +#include + +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("Test module linking"); + +extern int test_set32(void); +extern int test_set16(void); +extern int test_set8(void); +extern int test_set6(void); +extern long test_sub64(void); +extern int test_sub32(void); +extern int test_sub16(void); +extern int test_sub8(void); +extern int test_sub6(void); + +#ifdef CONFIG_AS_HAS_ULEB128 +extern int test_uleb_basic(void); +extern int test_uleb_large(void); +#endif + +#define CHECK_EQ(lhs, rhs) KUNIT_ASSERT_EQ(test, lhs, rhs) + +void run_test_set(struct kunit *test); +void run_test_sub(struct kunit *test); +void run_test_uleb(struct kunit *test); + +void run_test_set(struct kunit *test) +{ + int val32 = test_set32(); + int val16 = test_set16(); + int val8 = test_set8(); + int val6 = test_set6(); + + CHECK_EQ(val32, 0); + CHECK_EQ(val16, 0); + CHECK_EQ(val8, 0); + CHECK_EQ(val6, 0); +} + +void run_test_sub(struct kunit *test) +{ + int val64 = test_sub64(); + int val32 = test_sub32(); + int val16 = test_sub16(); + int val8 = test_sub8(); + int val6 = test_sub6(); + + CHECK_EQ(val64, 0); + CHECK_EQ(val32, 0); + CHECK_EQ(val16, 0); + CHECK_EQ(val8, 0); + CHECK_EQ(val6, 0); +} + +#ifdef CONFIG_AS_HAS_ULEB128 +void run_test_uleb(struct kunit *test) +{ + int val_uleb = test_uleb_basic(); + int val_uleb2 = test_uleb_large(); + + CHECK_EQ(val_uleb, 0); + CHECK_EQ(val_uleb2, 0); +} +#endif + +static struct kunit_case __refdata riscv_module_linking_test_cases[] = { + KUNIT_CASE(run_test_set), + KUNIT_CASE(run_test_sub), +#ifdef CONFIG_AS_HAS_ULEB128 + KUNIT_CASE(run_test_uleb), +#endif + {} +}; + +static struct kunit_suite riscv_module_linking_test_suite = { + .name = "riscv_checksum", + .test_cases = riscv_module_linking_test_cases, +}; + +kunit_test_suites(&riscv_module_linking_test_suite); diff --git a/arch/riscv/kernel/tests/module_test/test_set16.S b/arch/riscv/kernel/tests/module_test/test_set16.S new file mode 100644 index 000000000000..2be0e441a12e --- /dev/null +++ b/arch/riscv/kernel/tests/module_test/test_set16.S @@ -0,0 +1,23 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Copyright (C) 2023 Rivos Inc. + */ + +.text +.global test_set16 +test_set16: + lw a0, set16 + la t0, set16 +#ifdef CONFIG_32BIT + slli t0, t0, 16 + srli t0, t0, 16 +#else + slli t0, t0, 48 + srli t0, t0, 48 +#endif + sub a0, a0, t0 + ret +.data +set16: + .reloc set16, R_RISCV_SET16, set16 + .word 0 diff --git a/arch/riscv/kernel/tests/module_test/test_set32.S b/arch/riscv/kernel/tests/module_test/test_set32.S new file mode 100644 index 000000000000..de0444537e67 --- /dev/null +++ b/arch/riscv/kernel/tests/module_test/test_set32.S @@ -0,0 +1,20 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Copyright (C) 2023 Rivos Inc. + */ + +.text +.global test_set32 +test_set32: + lw a0, set32 + la t0, set32 +#ifndef CONFIG_32BIT + slli t0, t0, 32 + srli t0, t0, 32 +#endif + sub a0, a0, t0 + ret +.data +set32: + .reloc set32, R_RISCV_SET32, set32 + .word 0 diff --git a/arch/riscv/kernel/tests/module_test/test_set6.S b/arch/riscv/kernel/tests/module_test/test_set6.S new file mode 100644 index 000000000000..c39ce4c219eb --- /dev/null +++ b/arch/riscv/kernel/tests/module_test/test_set6.S @@ -0,0 +1,23 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Copyright (C) 2023 Rivos Inc. + */ + +.text +.global test_set6 +test_set6: + lw a0, set6 + la t0, set6 +#ifdef CONFIG_32BIT + slli t0, t0, 26 + srli t0, t0, 26 +#else + slli t0, t0, 58 + srli t0, t0, 58 +#endif + sub a0, a0, t0 + ret +.data +set6: + .reloc set6, R_RISCV_SET6, set6 + .word 0 diff --git a/arch/riscv/kernel/tests/module_test/test_set8.S b/arch/riscv/kernel/tests/module_test/test_set8.S new file mode 100644 index 000000000000..a656173f6f99 --- /dev/null +++ b/arch/riscv/kernel/tests/module_test/test_set8.S @@ -0,0 +1,23 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Copyright (C) 2023 Rivos Inc. + */ + +.text +.global test_set8 +test_set8: + lw a0, set8 + la t0, set8 +#ifdef CONFIG_32BIT + slli t0, t0, 24 + srli t0, t0, 24 +#else + slli t0, t0, 56 + srli t0, t0, 56 +#endif + sub a0, a0, t0 + ret +.data +set8: + .reloc set8, R_RISCV_SET8, set8 + .word 0 diff --git a/arch/riscv/kernel/tests/module_test/test_sub16.S b/arch/riscv/kernel/tests/module_test/test_sub16.S new file mode 100644 index 000000000000..c561e155d1db --- /dev/null +++ b/arch/riscv/kernel/tests/module_test/test_sub16.S @@ -0,0 +1,22 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Copyright (C) 2023 Rivos Inc. + */ + +.text +.global test_sub16 +test_sub16: + lh a0, sub16 + addi a0, a0, -32 + ret +first: + .rept 8 + .word 0 + .endr +second: + +.data +sub16: + .reloc sub16, R_RISCV_ADD16, second + .reloc sub16, R_RISCV_SUB16, first + .half 0 diff --git a/arch/riscv/kernel/tests/module_test/test_sub32.S b/arch/riscv/kernel/tests/module_test/test_sub32.S new file mode 100644 index 000000000000..93232c70cae6 --- /dev/null +++ b/arch/riscv/kernel/tests/module_test/test_sub32.S @@ -0,0 +1,22 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Copyright (C) 2023 Rivos Inc. + */ + +.text +.global test_sub32 +test_sub32: + lw a0, sub32 + addi a0, a0, -32 + ret +first: + .rept 8 + .word 0 + .endr +second: + +.data +sub32: + .reloc sub32, R_RISCV_ADD32, second + .reloc sub32, R_RISCV_SUB32, first + .word 0 diff --git a/arch/riscv/kernel/tests/module_test/test_sub6.S b/arch/riscv/kernel/tests/module_test/test_sub6.S new file mode 100644 index 000000000000..d9c9526ceb62 --- /dev/null +++ b/arch/riscv/kernel/tests/module_test/test_sub6.S @@ -0,0 +1,22 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Copyright (C) 2023 Rivos Inc. + */ + +.text +.global test_sub6 +test_sub6: + lb a0, sub6 + addi a0, a0, -32 + ret +first: + .rept 8 + .word 0 + .endr +second: + +.data +sub6: + .reloc sub6, R_RISCV_SET6, second + .reloc sub6, R_RISCV_SUB6, first + .byte 0 diff --git a/arch/riscv/kernel/tests/module_test/test_sub64.S b/arch/riscv/kernel/tests/module_test/test_sub64.S new file mode 100644 index 000000000000..6d260e2a5d98 --- /dev/null +++ b/arch/riscv/kernel/tests/module_test/test_sub64.S @@ -0,0 +1,27 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Copyright (C) 2023 Rivos Inc. + */ + +.text +.global test_sub64 +test_sub64: +#ifdef CONFIG_32BIT + lw a0, sub64 +#else + ld a0, sub64 +#endif + addi a0, a0, -32 + ret +first: + .rept 8 + .word 0 + .endr +second: + +.data +sub64: + .reloc sub64, R_RISCV_ADD64, second + .reloc sub64, R_RISCV_SUB64, first + .word 0 + .word 0 diff --git a/arch/riscv/kernel/tests/module_test/test_sub8.S b/arch/riscv/kernel/tests/module_test/test_sub8.S new file mode 100644 index 000000000000..af7849115d4d --- /dev/null +++ b/arch/riscv/kernel/tests/module_test/test_sub8.S @@ -0,0 +1,22 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Copyright (C) 2023 Rivos Inc. + */ + +.text +.global test_sub8 +test_sub8: + lb a0, sub8 + addi a0, a0, -32 + ret +first: + .rept 8 + .word 0 + .endr +second: + +.data +sub8: + .reloc sub8, R_RISCV_ADD8, second + .reloc sub8, R_RISCV_SUB8, first + .byte 0 diff --git a/arch/riscv/kernel/tests/module_test/test_uleb128.S b/arch/riscv/kernel/tests/module_test/test_uleb128.S new file mode 100644 index 000000000000..51e23808136c --- /dev/null +++ b/arch/riscv/kernel/tests/module_test/test_uleb128.S @@ -0,0 +1,31 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Copyright (C) 2023 Rivos Inc. + */ + +.text +.global test_uleb +test_uleb: + ld a0, second + addi a0, a0, -127 + ret + +.global test_uleb_large +test_uleb_large: + ld a0, fourth + addi a0, a0, 0x07e8 + ret + +.data +first: + .rept 127 + .byte 0 + .endr +second: + .reloc second, R_RISCV_SET_ULEB128, second + .reloc second, R_RISCV_SUB_ULEB128, first + .dword 0 +third: + .space 1000 +fourth: + .uleb128 fourth - third