Received: by 2002:a05:6a10:7420:0:0:0:0 with SMTP id hk32csp2008841pxb; Fri, 18 Feb 2022 23:03:54 -0800 (PST) X-Google-Smtp-Source: ABdhPJyQSsOd/T5yuu9t57LFUENeHIUUp1Ty5I4H4TxzIYFZCKO+WtXguyWk9FKdV/HtIfYM7OeS X-Received: by 2002:a17:902:aa8a:b0:14f:460d:bf2e with SMTP id d10-20020a170902aa8a00b0014f460dbf2emr10784320plr.144.1645254234025; Fri, 18 Feb 2022 23:03:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645254234; cv=none; d=google.com; s=arc-20160816; b=p+qs1Kmn2trFW6T77HhT9fFMjERGCTz0AlxSyTrEMEwGKLpUTSkD8fDfyTclfWU7n6 TFPnJmgmTGe3A7pdw2KgSDgYyu9jI5rFnvpIQC5pqYyi+GL00GoPqaf5st0n3ErBgpkb MZl29YzSU64nJ5MAt2ApAay0KObQjQ+bzTWcDACX4w/KktebKfqgsA8uCgWIMrhLGQtN t9P6JRLEAkds+Fuef3lEstRRZECRBd6dSLS8xkCN6b7veDVWCMlsI+1S5WBjwJFC/B/y e8ssUj+/qp9NXjkxd2p/GJC040aYt4XDhQmteN1Ltvd2iFhiOXMajDw6ffS5vNbJEV73 7rdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=8QQHiXtKZc6qfiHodKXWQmnnFzlUO+zklxX1NE5LbNM=; b=1J936urEsiGYLCP5KyE/1ubcEgaFZNdPHsWhdFXYqrTYuJ9vhYtFMzhasbRQXKl07O uWGWE2poOhgvgrEhE8mVJ7cDDRfCvdrjXZ4LSrWT8rx5F66vN1UEQ3fKGm93E9pRS/HW 2jbB1hbOof2LxfFoW2+y629Yq9Casgh1R6KJVYElv04CSDtVrxvXtI+HoGVir0WvQnkv Ur/Z5E0J2VtawdxLyCzr7aREm1b2mzvGb2IYGhjE9DZ2KcdksqRaMIce+1lsAxQJ+76f hYxQaQ/FA4O04InV3T1Z8Vkraj5Jr8wyl+KGNU5TDt/VlmEQxAv1lSU5ijs3EA+zswlG wK9A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="P/fvWkai"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a71si12609411pge.360.2022.02.18.23.03.12; Fri, 18 Feb 2022 23:03:53 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="P/fvWkai"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239763AbiBRVZg (ORCPT + 99 others); Fri, 18 Feb 2022 16:25:36 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:50816 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239759AbiBRVZe (ORCPT ); Fri, 18 Feb 2022 16:25:34 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 371AD23F0A3 for ; Fri, 18 Feb 2022 13:25:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645219515; h=from:from: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; bh=8QQHiXtKZc6qfiHodKXWQmnnFzlUO+zklxX1NE5LbNM=; b=P/fvWkaipidFZ1O8+AMhKDhFVnNKr0IbA4u7vPHP7myaOmycUrTPakgJXDGkgbJy4561nD KwHvDHJyk+F2ueK+xu1hXoU09fJcUbhxDUpmeUrGLoZSSV3nUo0Q688dOGuLfKSGt5R0wv 0hutZ7tVOlzpzjiS4hW2BHxJ0rFSk0I= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-457-F1qhBmv8M2yGxKF6ZJs3LA-1; Fri, 18 Feb 2022 16:25:13 -0500 X-MC-Unique: F1qhBmv8M2yGxKF6ZJs3LA-1 Received: by mail-wr1-f69.google.com with SMTP id s5-20020adfbc05000000b001e7af4f2231so4089586wrg.3 for ; Fri, 18 Feb 2022 13:25:13 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=8QQHiXtKZc6qfiHodKXWQmnnFzlUO+zklxX1NE5LbNM=; b=jjOSstuFo4RYMei2WGzifxUuPlFfYSZY0+4qhHEImPtTawfUdGW/74MbkzFntZcUd2 ooNmh85un8FbAhPYoIwrymz3TzR26VMN+nykd1KKnsYZ5vzAgix400aD+qgCuNTcRRsP W1bg227q/jJBKH8FVnMr6uCEIBOaUeSangUhDQ0goIBttfR5l1bD7xmvMK92ntTzLUad tGtIlvRUaS4kVY6Gq26LzQ6Xf3sO8KX53P/QkbeUaTOrRJf8RrxIlkFctFCIqfBCh2Au af1Y7k/+jB4G2ZzTOrdJ/KxNP32MjpUYQrOse42NEp2HZ/8ucEJoBU30gMmsDTIWTURy fYVQ== X-Gm-Message-State: AOAM532ggHPWG+kPyC/sMemj1vCls7Ab0E5j8oU5TtqLR5IhT/ysFqjz rlYlKZOcXLEYLkOqPTkVHFx68DvQNrlcap/xq5nEyZLJpCOfofEst10uNZrqGgLrCab0UxlQ/ok oD/C9wmUQwL3I8Z6t4mbjI2s= X-Received: by 2002:a5d:47ce:0:b0:1e8:88b7:446a with SMTP id o14-20020a5d47ce000000b001e888b7446amr7462754wrc.459.1645219512497; Fri, 18 Feb 2022 13:25:12 -0800 (PST) X-Received: by 2002:a5d:47ce:0:b0:1e8:88b7:446a with SMTP id o14-20020a5d47ce000000b001e888b7446amr7462743wrc.459.1645219512207; Fri, 18 Feb 2022 13:25:12 -0800 (PST) Received: from localhost (cpc111743-lutn13-2-0-cust979.9-3.cable.virginm.net. [82.17.115.212]) by smtp.gmail.com with ESMTPSA id k34sm488228wms.35.2022.02.18.13.25.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Feb 2022 13:25:11 -0800 (PST) From: Aaron Tomlin To: mcgrof@kernel.org Cc: cl@linux.com, pmladek@suse.com, mbenes@suse.cz, akpm@linux-foundation.org, jeyu@kernel.org, linux-kernel@vger.kernel.org, linux-modules@vger.kernel.org, live-patching@vger.kernel.org, atomlin@atomlin.com, ghalat@redhat.com, allen.lkml@gmail.com, joe@perches.com, christophe.leroy@csgroup.eu, msuchanek@suse.de, oleksandr@natalenko.name Subject: [PATCH v6 00/13] module: core code clean up Date: Fri, 18 Feb 2022 21:24:58 +0000 Message-Id: <20220218212511.887059-1-atomlin@redhat.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Luis, As per your suggestion [1], this is an attempt to refactor and split optional code out of core module support code into separate components. This version is based on Linus' commit 7993e65fdd0f ("Merge tag 'mtd/fixes-for-5.17-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux"). Please let me know your thoughts. Changes since v5 [2]: - Updated MAINTAINERS to include the entire kernel/module/ directory (Christophe Leroy) - Reintroduce commit a97ac8cb24a3 ("module: fix signature check failures when using in-kernel decompression") (Michal Suchánek) - Refactored code to address some (i.e. --ignore=MULTIPLE_ASSIGNMENTS,ASSIGN_IN_IF was used) style violations e.g. "Alignment should match open parenthesis", reported by scripts/checkpatch.pl --strict (Christophe Leroy) - Used PAGE_ALIGN() and PAGE_ALIGNED() instead (Christophe Leroy) - Removed sig_enforce from include/linux/module.h as it is only used in kernel/module/signing.c (Christophe Leroy) - Added static keyword for anything not used outside a source file (Christophe Leroy) - Moved mod_sysfs_teardown() to kernel/module/sysfs.c (Christophe Leroy) - Removed kdb_modules from kernel/debug/kdb/kdb_private.h (Christophe Leroy) Changes since v4 [3]: - Moved is_livepatch_module() and set_livepatch_module() to kernel/module/livepatch.c - Addressed minor compiler warning concerning kernel/module/internal.h (0-day) - Resolved style violations reported by scripts/checkpatch.pl - Dropped patch 5 [4] so external patch [5] can be applied at a later date post merge into module-next (Christophe Leroy) Changes since v3 [6]: - Refactored both is_livepatch_module() and set_livepatch_module(), respectively, to use IS_ENABLED(CONFIG_LIVEPATCH) (Joe Perches) - Addressed various compiler warnings e.g., no previous prototype (0-day) Changes since v2 [7]: - Moved module decompress support to a separate file - Made check_modinfo_livepatch() generic (Petr Mladek) - Removed filename from each newly created file (Luis Chamberlain) - Addressed some (i.e. --ignore=ASSIGN_IN_IF,AVOID_BUG was used) minor scripts/checkpatch.pl concerns e.g., use strscpy over strlcpy and missing a blank line after declarations (Allen) Changes since v1 [8]: - Moved module version support code into a new file [1]: https://lore.kernel.org/lkml/YbEZ4HgSYQEPuRmS@bombadil.infradead.org/ [2]: https://lore.kernel.org/lkml/20220209170358.3266629-1-atomlin@redhat.com/ [3]: https://lore.kernel.org/lkml/20220130213214.1042497-1-atomlin@redhat.com/ [4]: https://lore.kernel.org/lkml/20220130213214.1042497-6-atomlin@redhat.com/ [5]: https://lore.kernel.org/lkml/203348805c9ac9851d8939d15cb9802ef047b5e2.1643919758.git.christophe.leroy@csgroup.eu/ [6]: https://lore.kernel.org/lkml/20220128203934.600247-1-atomlin@redhat.com/ [7]: https://lore.kernel.org/lkml/20220106234319.2067842-1-atomlin@redhat.com/ [8]: https://lore.kernel.org/lkml/20211228213041.1356334-1-atomlin@redhat.com/ Aaron Tomlin (13): module: Move all into module/ module: Simple refactor in preparation for split module: Make internal.h and decompress.c more compliant module: Move livepatch support to a separate file module: Move latched RB-tree support to a separate file module: Move strict rwx support to a separate file module: Move extra signature support out of core code module: Move kmemleak support to a separate file module: Move kallsyms support into a separate file module: Move procfs support into a separate file module: Move sysfs support into a separate file module: Move kdb_modules list out of core code module: Move version support into a separate file MAINTAINERS | 2 +- include/linux/module.h | 9 +- kernel/Makefile | 5 +- kernel/debug/kdb/kdb_main.c | 5 + kernel/debug/kdb/kdb_private.h | 4 - kernel/module-internal.h | 50 - kernel/module/Makefile | 19 + kernel/module/debug_kmemleak.c | 30 + .../decompress.c} | 5 +- kernel/module/internal.h | 284 +++ kernel/module/kallsyms.c | 502 +++++ kernel/module/livepatch.c | 74 + kernel/{module.c => module/main.c} | 1856 +---------------- kernel/module/procfs.c | 142 ++ .../signature.c} | 0 kernel/module/signing.c | 122 ++ kernel/module/strict_rwx.c | 84 + kernel/module/sysfs.c | 436 ++++ kernel/module/tree_lookup.c | 109 + kernel/module/version.c | 109 + kernel/module_signing.c | 45 - 21 files changed, 2010 insertions(+), 1882 deletions(-) delete mode 100644 kernel/module-internal.h create mode 100644 kernel/module/Makefile create mode 100644 kernel/module/debug_kmemleak.c rename kernel/{module_decompress.c => module/decompress.c} (99%) create mode 100644 kernel/module/internal.h create mode 100644 kernel/module/kallsyms.c create mode 100644 kernel/module/livepatch.c rename kernel/{module.c => module/main.c} (64%) create mode 100644 kernel/module/procfs.c rename kernel/{module_signature.c => module/signature.c} (100%) create mode 100644 kernel/module/signing.c create mode 100644 kernel/module/strict_rwx.c create mode 100644 kernel/module/sysfs.c create mode 100644 kernel/module/tree_lookup.c create mode 100644 kernel/module/version.c delete mode 100644 kernel/module_signing.c base-commit: 7993e65fdd0fe07beb9f36f998f9bbef2c0ee391 -- 2.34.1