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 X-Spam-Level: X-Spam-Status: No, score=-17.4 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 06CB9C3F2CD for ; Fri, 28 Feb 2020 17:20:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D011B246A3 for ; Fri, 28 Feb 2020 17:20:28 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="kxPrXrsK" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726891AbgB1RU1 (ORCPT ); Fri, 28 Feb 2020 12:20:27 -0500 Received: from mail-vs1-f74.google.com ([209.85.217.74]:38671 "EHLO mail-vs1-f74.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726822AbgB1RUZ (ORCPT ); Fri, 28 Feb 2020 12:20:25 -0500 Received: by mail-vs1-f74.google.com with SMTP id 184so286074vsm.5 for ; Fri, 28 Feb 2020 09:20:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=SWZnVkGkrd/D0/3m4AMxVFcHu+nrKGAFuNO3Qq/CuG0=; b=kxPrXrsKoz49zxYM/ksRXHC0cbC6kKdrL+xXPqZlm3UZ8otgq+zXlT5YganuFvjh7n f3qbgN6G4J7qBrYVqMHsut2+Ka9erxLbarYe6Lbqr4tSnpMNh5RISu4oi1MtUp/5Aots o2z+gviBUZyStUsei8Vp7vPfko71NJb+xWv6IUxdsb5Blew4Nv80x4M0KqgE/fhPhyey RMCcYq7CUdFDlp0WDyEAG6AlgO4cf9MC1j9zxpkCNSxl+05vtVXpZ3FH0B7I+qZfp4TE MK2NsZsWEB6YK0JtaiYCe3tZ+80Kcr62Zf999KoajzC6w+iLIvJYihFutzJ7WQsVFN2D 4vzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=SWZnVkGkrd/D0/3m4AMxVFcHu+nrKGAFuNO3Qq/CuG0=; b=j5GWfcokB+v8Sv5P/pTcfDc456AdDmdYVb9qt+ZITVe7y45mIPxUkOXWIG9EZkLgxc yKU2BXkxW90Mw4X8ryAm9BbKfJiNQG3oBqkqCtkUgrSmPmBj4pnKLMesPEUwgD7k2MRc Z3ZsBKbJDHPzXBo3NpNOxEiW27a6KIdvsUnvvuJXSzNQvbHhAPwh7DtjsIy3cVNe7pVr VKbqweD/w1ewsBfcJIgjEkzkL7cIzwq5SRlm3hTy8fVvbLQxkmnsQE6E642poNGlvkyq 1xg6VQEIcgYggPSggiieQFeWKmTmEYIC95hLuan58azH6SxVYikshfEPUUhrGdncn2nW vgTA== X-Gm-Message-State: ANhLgQ1tDiem2Nb2bHrf2ZnKcEIhmXSqBu96KX6+nir0qswb7gg5nS2M KtrmqZtg6uRw+tdSjkJn3jlSmiHBBKSj X-Google-Smtp-Source: ADFU+vtr9M5RlW5MuGlLnrqGlXYwL3ZWaR7KKV2UyDwJ+xCSBCO7ALTb+DDczVT7SuJykWhM9nGhVpwv8VCR X-Received: by 2002:ac5:cdcd:: with SMTP id u13mr3253871vkn.0.1582910424004; Fri, 28 Feb 2020 09:20:24 -0800 (PST) Date: Fri, 28 Feb 2020 17:20:14 +0000 In-Reply-To: <20200228172015.44369-1-qperret@google.com> Message-Id: <20200228172015.44369-3-qperret@google.com> Mime-Version: 1.0 References: <20200228172015.44369-1-qperret@google.com> X-Mailer: git-send-email 2.25.1.481.gfbce0eb801-goog Subject: [PATCH v6 2/3] kbuild: split adjust_autoksyms.sh in two parts From: Quentin Perret To: masahiroy@kernel.org, nico@fluxnic.net Cc: linux-kernel@vger.kernel.org, linux-kbuild@vger.kernel.org, maennich@google.com, kernel-team@android.com, jeyu@kernel.org, hch@infradead.org, qperret@google.com Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In order to prepare the ground for a build-time optimization, split adjust_autoksyms.sh into two scripts: one that generates autoksyms.h based on all currently available information (whitelist, and .mod files), and the other to inspect the diff between two versions of autoksyms.h and trigger appropriate rebuilds. Acked-by: Nicolas Pitre Tested-by: Matthias Maennich Reviewed-by: Matthias Maennich Signed-off-by: Quentin Perret --- scripts/adjust_autoksyms.sh | 36 +++----------------------- scripts/gen_autoksyms.sh | 51 +++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 32 deletions(-) create mode 100755 scripts/gen_autoksyms.sh diff --git a/scripts/adjust_autoksyms.sh b/scripts/adjust_autoksyms.sh index 212ba45595d3..2b366d945ccb 100755 --- a/scripts/adjust_autoksyms.sh +++ b/scripts/adjust_autoksyms.sh @@ -1,14 +1,13 @@ #!/bin/sh # SPDX-License-Identifier: GPL-2.0-only -# Script to create/update include/generated/autoksyms.h and dependency files +# Script to update include/generated/autoksyms.h and dependency files # # Copyright: (C) 2016 Linaro Limited # Created by: Nicolas Pitre, January 2016 # -# Create/update the include/generated/autoksyms.h file from the list -# of all module's needed symbols as recorded on the second line of *.mod files. +# Update the include/generated/autoksyms.h file. # # For each symbol being added or removed, the corresponding dependency # file's timestamp is updated to force a rebuild of the affected source @@ -38,35 +37,8 @@ esac # We need access to CONFIG_ symbols . include/config/auto.conf -ksym_wl=/dev/null -if [ -n "$CONFIG_UNUSED_KSYMS_WHITELIST" ]; then - # Use 'eval' to expand the whitelist path and check if it is relative - eval ksym_wl="$CONFIG_UNUSED_KSYMS_WHITELIST" - [ "${ksym_wl}" != "${ksym_wl#/}" ] || ksym_wl="$abs_srctree/$ksym_wl" - if [ ! -f "$ksym_wl" ] || [ ! -r "$ksym_wl" ]; then - echo "ERROR: '$ksym_wl' whitelist file not found" >&2 - exit 1 - fi -fi - -# Generate a new ksym list file with symbols needed by the current -# set of modules. -cat > "$new_ksyms_file" << EOT -/* - * Automatically generated file; DO NOT EDIT. - */ - -EOT -sed 's/ko$/mod/' modules.order | -xargs -n1 sed -n -e '2{s/ /\n/g;/^$/!p;}' -- | -cat - "$ksym_wl" | -sort -u | -sed -e 's/\(.*\)/#define __KSYM_\1 1/' >> "$new_ksyms_file" - -# Special case for modversions (see modpost.c) -if [ -n "$CONFIG_MODVERSIONS" ]; then - echo "#define __KSYM_module_layout 1" >> "$new_ksyms_file" -fi +# Generate a new symbol list file +$CONFIG_SHELL $srctree/scripts/gen_autoksyms.sh "$new_ksyms_file" # Extract changes between old and new list and touch corresponding # dependency files. diff --git a/scripts/gen_autoksyms.sh b/scripts/gen_autoksyms.sh new file mode 100755 index 000000000000..ef46200c366b --- /dev/null +++ b/scripts/gen_autoksyms.sh @@ -0,0 +1,51 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-2.0-only + +# Create an autoksyms.h header file from the list of all module's needed symbols +# as recorded on the second line of *.mod files and the user-provided symbol +# whitelist. + +set -e + +output_file="$1" + +# Use "make V=1" to debug this script. +case "$KBUILD_VERBOSE" in +*1*) + set -x + ;; +esac + +# We need access to CONFIG_ symbols +. include/config/auto.conf + +ksym_wl=/dev/null +if [ -n "$CONFIG_UNUSED_KSYMS_WHITELIST" ]; then + # Use 'eval' to expand the whitelist path and check if it is relative + eval ksym_wl="$CONFIG_UNUSED_KSYMS_WHITELIST" + [ "${ksym_wl}" != "${ksym_wl#/}" ] || ksym_wl="$abs_srctree/$ksym_wl" + if [ ! -f "$ksym_wl" ] || [ ! -r "$ksym_wl" ]; then + echo "ERROR: '$ksym_wl' whitelist file not found" >&2 + exit 1 + fi +fi + +# Generate a new ksym list file with symbols needed by the current +# set of modules. +cat > "$output_file" << EOT +/* + * Automatically generated file; DO NOT EDIT. + */ + +EOT + +sed 's/ko$/mod/' modules.order | +xargs -n1 sed -n -e '2{s/ /\n/g;/^$/!p;}' -- | +cat - "$ksym_wl" | +sort -u | +sed -e 's/\(.*\)/#define __KSYM_\1 1/' >> "$output_file" + +# Special case for modversions (see modpost.c) +if [ -n "$CONFIG_MODVERSIONS" ]; then + echo "#define __KSYM_module_layout 1" >> "$output_file" +fi -- 2.25.1.481.gfbce0eb801-goog