From patchwork Tue Oct 31 22:25:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charlie Jenkins X-Patchwork-Id: 16119 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:abcd:0:b0:403:3b70:6f57 with SMTP id f13csp58043vqx; Tue, 31 Oct 2023 15:26:07 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGnhzU3p4dV0gynckD60YrLmhno/5luIkYIn0+I1wQIB3T3NxvxnZrGZgrRbh0tmjiiMv0O X-Received: by 2002:a17:90a:d994:b0:27d:669e:5a10 with SMTP id d20-20020a17090ad99400b0027d669e5a10mr10776069pjv.13.1698791166751; Tue, 31 Oct 2023 15:26:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698791166; cv=none; d=google.com; s=arc-20160816; b=eMq7MakkcSIGJcYETTAYy1H5U2yONhxNMeNmQIw4+6LyxCuEPHK+cfGQq1zHvPvsGl 7Xfv3BMZEclSJAXl/atbS7AUn4Sx6LOuKr2MNtUnl/Jq0Ze5+Xm9oRzFYkMsdcUJJwC7 qLaxC3YSGn4ZBECJv2OghZVudim8TfqnLcVbmY4wo4uunhOTMGdlH1oty/dq/3MZbEJz QpolKV/Qd5rvs1raDlBGIfk8NldQrSOqLcrMj/7C6e4fPQUGzbLoHkpQ9iY1noX2Lwzr DwrpQsMdH1PlbGE/6OOtcylmt7Cp+RoFYqeE2LWv8tRBX48jSTjWHewfBwbjDgJHRdJR dOCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:content-transfer-encoding:mime-version :message-id:date:subject:from:dkim-signature; bh=K8Ul6j8QrEIyS00FFqomsmEEIf38jX8XQ6bvZNd2Kps=; fh=3JJYoT2qrR3RU+rWlb6yoFBgRHYOWCMcUv6lOGhOtBk=; b=D5o/klRCB18Fe/H6n6NL9VY9PAI2azy08vhROFnetYwGNq6ILrw+wgYBssBnCiAkq/ RE/xqxFRoTx/4grTCedHauQTb3eDYKPGqpDzrOiBNmeWHWKlT3qxG91B9AGWCUHcKKms DZIKs/c2Dgm+3bH7fJccMN370A3lZPXA6X+CTcZb9h/vxn/SsCmMGfboiJ4R+rVtpyOz nlTN77GtxObv0He7EwewP2TI+gIGmAl0Y1RZgGU0VYn4DQGccusv7fOvZtUnKkhDC6rb 47JoiPhlvSOpasGWaqWGSoa+10LOd4lRhO6M5CwMSG2+LgltRBIqSBD33cJN6zgpySi7 vh8w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=c7OhI2cB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from fry.vger.email (fry.vger.email. [23.128.96.38]) by mx.google.com with ESMTPS id v9-20020a17090ac90900b0027ce5205f94si1584336pjt.150.2023.10.31.15.26.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Oct 2023 15:26:06 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38; Authentication-Results: mx.google.com; dkim=pass header.i=@rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=c7OhI2cB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id 79BB88073281; Tue, 31 Oct 2023 15:25:45 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346636AbjJaWZ0 (ORCPT + 33 others); Tue, 31 Oct 2023 18:25:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56578 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344898AbjJaWZY (ORCPT ); Tue, 31 Oct 2023 18:25:24 -0400 Received: from mail-oi1-x22f.google.com (mail-oi1-x22f.google.com [IPv6:2607:f8b0:4864:20::22f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 817AFF3 for ; Tue, 31 Oct 2023 15:25:21 -0700 (PDT) Received: by mail-oi1-x22f.google.com with SMTP id 5614622812f47-3b3e13fc1f7so3969886b6e.0 for ; Tue, 31 Oct 2023 15:25:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1698791120; x=1699395920; darn=vger.kernel.org; h=cc:to:content-transfer-encoding:mime-version:message-id:date :subject:from:from:to:cc:subject:date:message-id:reply-to; bh=K8Ul6j8QrEIyS00FFqomsmEEIf38jX8XQ6bvZNd2Kps=; b=c7OhI2cBQNp5O9PWQuvPxpg/E1tRxrxsXpGxQQJEPGDsASWUGRENWWsXrAKCjhWNb3 H+bSATMxNbOIYgBectuyH6w1+xwVA59ni7ywUr65dfN8JawhdyWSVU5G5YV3p4ywOQEe 3KzIiciVS34ccYQzMRhvF6p/5oQn0Bjstr9EQyvmbnd08O9zdbQRHc9E7EkIunwMZ0vD aVqOqQHIlGjZH6wiatB6M1fTRzrqzEAUwB0RT+cNFj1hm7D/LTUTr3mjvYWZrJmMuIzz ohHGxE5c6f3fH9c9psSJe4tzCgmfcjs8ZGPpwRDzkVNz5aea6DOfYl7UwOdPF4K7ON22 0ITA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698791120; x=1699395920; h=cc:to:content-transfer-encoding:mime-version:message-id:date :subject:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=K8Ul6j8QrEIyS00FFqomsmEEIf38jX8XQ6bvZNd2Kps=; b=C9N7UsAg0yyovROPkR2EttXoNu6KwdI7b494IzIKV3w7XYxEnZ0qGTME4BXOTcm7a3 pDzrjWgtCv7MkXEM4Khcq4BfPEnB8Xn+FGfz1H2Xb9f/aYEDp8QNWwaGFlwAPOlnEAnd v1Oo6aBOczmkFHQ1rZ6MpQc+Q/Ng3v6ETgfttgG33PnV0OSUJ1nC4tTmef6+MryN6tML luUCK/ccPK0RlpWIhwoFHSBzigqbrUk0PNa4bcYbU0F4zTZ1a5ajb/XTriG4B2MDPOYx 31wiXJty6uLP+XFopVQKPdVYWAIpiJ203ZFn1A2tDjyxy+3GkhF0nhu4vi1GuoGZk8Xt euhg== X-Gm-Message-State: AOJu0YwVjcnlHY7ENoZleDK71wVjQMlxoztu+QWzv/LAPDjKBa/DVzuD 8uSVFksu+AP5WOxyR6hIv0O/4lWV/HedDzHOtxY= X-Received: by 2002:a54:4691:0:b0:3a7:2456:6af6 with SMTP id k17-20020a544691000000b003a724566af6mr12828146oic.31.1698791120624; Tue, 31 Oct 2023 15:25:20 -0700 (PDT) Received: from charlie.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id k16-20020a544410000000b003b2e7231faasm42975oiw.28.2023.10.31.15.25.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Oct 2023 15:25:19 -0700 (PDT) From: Charlie Jenkins Subject: [PATCH v8 0/3] riscv: Add remaining module relocations and tests Date: Tue, 31 Oct 2023 15:25:12 -0700 Message-Id: <20231031-module_relocations-v8-0-09b5b720c1fe@rivosinc.com> MIME-Version: 1.0 X-B4-Tracking: v=1; b=H4sIAMh+QWUC/23QwWrDMAwG4FcpPi/Dthyp3mnvMcZIbHk1tPGwO 7NR8u5zyhhh+PgL6ZPQTRTOkYt4OtxE5hpLTEsLx4eDcKdpeech+paFlhqklcfhkvznmd8yn5O brq27DAHBscdRzZ5EG/zIHOLXHX15bfkUyzXl7/uOqrbqL6egx1U1yGGewR8NEpOF5xxrKnFxj y5dxCZW/acoKbGr6KYYGhHNCIG96yiwU1RfgaZMiBQ8SlJsO4rZK9RVTFMsUBg5gMIgO8q4V7p vrmNTfGAG7Y0PrvcX3Cu2q+B2iyGNjMaAVh2FdgqorkJNwWBI2RnNHOifsq7rD2L0G9dbAgAA 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-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Tue, 31 Oct 2023 15:25:45 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781311646195118256 X-GMAIL-MSGID: 1781311646195118256 A handful of module relocations were missing, this patch includes the remaining ones. I also wrote some test cases to ensure that module loading works properly. Some relocations cannot be supported in the kernel, these include the ones that rely on thread local storage and dynamic linking. This patch also overhauls the implementation of ADD/SUB/SET/ULEB128 relocations to handle overflow. "Overflow" is different for ULEB128 since it is a variable-length encoding that the compiler can be expected to generate enough space for. Instead of overflowing, ULEB128 will expand into the next 8-bit segment of the location. A psABI proposal [1] was merged that mandates that SET_ULEB128 and SUB_ULEB128 are paired, however the discussion following the merging of the pull request revealed that while the pull request was valid, it would be better for linkers to properly handle this overflow. This patch proactively implements this methodology for future compatibility. This can be tested by enabling KUNIT, RUNTIME_KERNEL_TESTING_MENU, and RISCV_MODULE_LINKING_KUNIT. [1] https://github.com/riscv-non-isa/riscv-elf-psabi-doc/pull/403 Signed-off-by: Charlie Jenkins --- Changes in v8: - Fix up riscv_insn_rmw to work with big-endian systems (Andreas/Emil) - Improve readability of bitops throughout module.c (Emil) - Consolidate all relocation handler functions into a single struct so array doesn't need to be duplicated 3 times - Use .space assember op instead of .rept - Fix up name of uleb128 testcase - Define prototypes of some new functions to conform to -Wmissing-prototypes - Remove unused variable "first" - Link to v7: https://lore.kernel.org/r/20231031-module_relocations-v7-0-6f4719b64bf7@rivosinc.com Changes in v7: - Overhaul ADD/SUB/SET/ULEB128 relocations - Fix ULEB128 so it produces correct values when more than 1 byte is needed - Link to v6: https://lore.kernel.org/r/20231019-module_relocations-v6-0-94726e644321@rivosinc.com Changes in v6: - Use (void *) instead of (u32 *) for handler type - Constrain ULEB128 to be consecutive relocations - Link to v5: https://lore.kernel.org/r/20231018-module_relocations-v5-0-dfee32d4dfc3@rivosinc.com Changes in v5: - Brought in patch by Emil and fixed it up to force little endian - Fixed up issues with apply_r_riscv_32_pcrel_rela and apply_r_riscv_plt32_rela (Samuel) - Added u8 cast in apply_r_riscv_sub6_rela (Andreas) - Link to v4: https://lore.kernel.org/r/20231017-module_relocations-v4-0-937f5ef316f0@rivosinc.com Changes in v4: - Complete removal of R_RISCV_RVC_LUI - Fix bug in R_RISCV_SUB6 linking - Only build ULEB128 tests if supported by toolchain - Link to v3: https://lore.kernel.org/r/20231016-module_relocations-v3-0-a667fd6071e9@rivosinc.com Changes in v3: - Add prototypes to test_module_linking_main as recommended by intel zero day bot - Improve efficiency of ULEB128 pair matching - Link to v2: https://lore.kernel.org/r/20231006-module_relocations-v2-0-47566453fedc@rivosinc.com Changes in v2: - Added ULEB128 relocations - Link to v1: https://lore.kernel.org/r/20230913-module_relocations-v1-0-bb3d8467e793@rivosinc.com --- Charlie Jenkins (2): riscv: Add remaining module relocations riscv: Add tests for riscv module loading Emil Renner Berthing (1): riscv: Avoid unaligned access when relocating modules arch/riscv/Kconfig.debug | 1 + arch/riscv/include/uapi/asm/elf.h | 5 +- arch/riscv/kernel/Makefile | 1 + arch/riscv/kernel/module.c | 650 +++++++++++++++++---- 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 | 20 + arch/riscv/kernel/tests/module_test/test_sub32.S | 20 + arch/riscv/kernel/tests/module_test/test_sub6.S | 20 + arch/riscv/kernel/tests/module_test/test_sub64.S | 25 + arch/riscv/kernel/tests/module_test/test_sub8.S | 20 + arch/riscv/kernel/tests/module_test/test_uleb128.S | 31 + 18 files changed, 916 insertions(+), 105 deletions(-) --- base-commit: 3bcce01fcbcd868b8cf3a5632fde283e122d7213 change-id: 20230908-module_relocations-f63ced651bd7