From patchwork Wed Aug 23 11:50:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 136752 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a7d1:0:b0:3f2:4152:657d with SMTP id p17csp869000vqm; Wed, 23 Aug 2023 20:51:12 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH/6JGveriGS56w5XbEb9o8UI2MpQ0tsOL0s9RJKawSX/AqVt/nCfgyp3in1mq1aSxq92cX X-Received: by 2002:a05:620a:4488:b0:76d:a9a0:5a20 with SMTP id x8-20020a05620a448800b0076da9a05a20mr11767986qkp.28.1692849071949; Wed, 23 Aug 2023 20:51:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692849071; cv=none; d=google.com; s=arc-20160816; b=oz30ww+b8MTcxgqBp8ggbVhBdgCBIJ9s0kqWmjAfYf8zjKSgkDGR/4C9mn4HRH0ROJ pXeJAwLmXPCD/ttzJ4T/QcivrHy7liBDnWLC3IOD0/1ny6YNrBzPt+aNgg6giqaJMu6O 03OG8v6w+m6C1dx36eXlNARCRl3ZJLCVNIONJXiy8pu3f1UBHWSkKs/6e5JIGgyLalzD O7UvDzu92ZPAeCAZ0dA4EFD6m50BrvkQp5znq/DJk6X7MihpEMY5fsK7e9xEedjfdv5b cV9Av125/TAtEaYoLQ9A0bl5xsyeeG4v4jdIXWirmMC8vcnLX+Q8PZh0ZpRLmtN/MwfY Id0A== 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=vBtMNhsITnC39NMfIXtBXR1YZdvignhOmYdZbCtp74Q=; fh=rliOZr6Fz5JmnSfKOt6v3ZHxXv/lQ1TnqU77+ZCO3og=; b=mBYHZlpbF5N99w1SSUW+xBF4hl3WhGy8rc85d7D0tSGKWdbnfJa1+lMCO6KDFuAzpZ HDwvGr3Oq7naucsnqwnNcBDl8qrevZmzAtRXnxD/eDzJJsKbbAZO+T4chqi9g05Ra1+s A+bnpZB3oyTlYbMfWhYhV8xBHGkdgUt9AgOwIAdI15DtMk2prxmpxJLHApF2Ca7Sm2L3 39iS0zR3+qAmLJvXkjPwZQ18Om8m1uYJToZqLTrOQIacK/LqH6/QGdY7TdoDofCw27+m wvT532eBs1u8/zJXOE2p7YOvLKewpYttzcdmE5Y24zU/GeP0/qDATLDqc+Trdpl1yQCb 3GkA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="qBZtdO/9"; 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=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j72-20020a638b4b000000b00565e02cbb50si12199411pge.854.2023.08.23.20.51.04; Wed, 23 Aug 2023 20:51:11 -0700 (PDT) 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=@kernel.org header.s=k20201202 header.b="qBZtdO/9"; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234529AbjHWLu7 (ORCPT + 50 others); Wed, 23 Aug 2023 07:50:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47010 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230458AbjHWLu6 (ORCPT ); Wed, 23 Aug 2023 07:50:58 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ED900CF; Wed, 23 Aug 2023 04:50:56 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 7A60561501; Wed, 23 Aug 2023 11:50:56 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 28566C433C8; Wed, 23 Aug 2023 11:50:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1692791455; bh=8LLUhYnER6NHg4If5ClhYQ11jKYl73hLNR9IjMOFoGU=; h=From:To:Cc:Subject:Date:From; b=qBZtdO/9vyUhHsODPx8d0VyXNahln2jOHjZBqsyvfmIBlegnLviDp5op9bIQbFm8Z ghNk4o7dv7nKSJL9Atatsill3CYoACxItpAbvSq9scosyA86wzjqQF6Dx3FTYQQ4hA g08jr2areF1du2duz7doSZyCxH34lxaxH98lnqvjfY5dPpspFBJIoqHAvVxFt4DSLi oAJ4V3cf9Yhxe+HfXFqCz3rAtxPXiqI3UYbEtJa2GlkFNnIk8puPSdHPNTVCyUa/M+ eWe77kLeYjh47RsGDHc0mLaVDlxiqkykMHR6tPABa2o/0zU5uxFUr4CNNxMbXZQUor MfZBuS/+nFo0g== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Masahiro Yamada , Nathan Chancellor , Nick Desaulniers , Nicolas Schier Subject: [PATCH 1/8] kbuild: do not run depmod for 'make modules_sign' Date: Wed, 23 Aug 2023 20:50:41 +0900 Message-Id: <20230823115048.823011-1-masahiroy@kernel.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS 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 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1775080908197902180 X-GMAIL-MSGID: 1775080908197902180 Commit 961ab4a3cd66 ("kbuild: merge scripts/Makefile.modsign to scripts/Makefile.modinst") started to run depmod at the end of 'make modules_sign'. Move the depmod rule to scripts/Makefile.modinst and run it only when $(modules_sign_only) is empty. Fixes: 961ab4a3cd66 ("kbuild: merge scripts/Makefile.modsign to scripts/Makefile.modinst") Signed-off-by: Masahiro Yamada --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index e0d52539a0f1..7d54a0700c6e 100644 --- a/Makefile +++ b/Makefile @@ -1877,7 +1877,9 @@ quiet_cmd_depmod = DEPMOD $(MODLIB) modules_install: $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modinst +ifndef modules_sign_only $(call cmd,depmod) +endif else # CONFIG_MODULES From patchwork Wed Aug 23 11:50:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 136658 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a7d1:0:b0:3f2:4152:657d with SMTP id p17csp432228vqm; Wed, 23 Aug 2023 05:43:39 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGCNGeUzz7+uM3n8waIyivM6a0n6l1/t9zAWIEb/HAOLPVvFsJOJAwrus8Nipke8amfvdFL X-Received: by 2002:a17:907:7758:b0:9a1:f10d:9751 with SMTP id kx24-20020a170907775800b009a1f10d9751mr591678ejc.23.1692794619514; Wed, 23 Aug 2023 05:43:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692794619; cv=none; d=google.com; s=arc-20160816; b=TlYqrP+eDtNso5Hzxs3dSyfrMDahAOkhg+POJ3Y2W/4or2dgTt4LrQQby6UiJHdd4E IfWTAvy2025qLQ5xctRc2+yd7ZC+QunoCcMHart4+l3Ih+XYvZzdxSiywlAUfIrasQF7 67X7sBEO5h884lSZgPXbaqsipShok6M7rxylu07ivLB1ASFnlUPSMKvgzlFNUfQ5Jer8 zZ2SnIbCHzjIGAX2XTHZhr2VL8BcbqpMICUa7YhClD148msDAA0S4jtsPDSSgIkfe8W4 3qlHchdsVmHyoivlhNwplvyTFOnGCQaIDUZ1f46FrNXZ8FoPRKkXwDJON/owbFuRhw/S BaWw== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=rsOaAcun6e5T+hvY4PsxkoIXxKwS074QIV0bTa9TnXY=; fh=rliOZr6Fz5JmnSfKOt6v3ZHxXv/lQ1TnqU77+ZCO3og=; b=sI9d9WPVYByQJw0ra6IiG8qoSEQg07BOiiyaj9gJgoo9K2BdVUKvmgSsWryXHekcMM oj0gACQZbsgvc0FymmHXZlQkUfMbsFrMz+YQLDSF3xgTak8J9hvPSVxedX3tq6V8moB+ FULBLfVAS8GYnYwwQLknFuSqyFc/nw9IIvScoeaAQVb7nrOoedGNIfFDrRNF4jbrcaI4 b4HfhdiIHeTux9OUbaPs2AuQ1rsDBJwBYQj8jgfX/c89txGmaLE2eiEzAdVwX1pIFWXF hCV0i/Nbm+JV6HDyNO0LFawUzKTQDIOGcuEC/cCBnK9zekurhsbCkzyqNcCd38GBbZp0 kogg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=QJK7LN11; 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=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id uz7-20020a170907118700b00993afed2932si8688821ejb.324.2023.08.23.05.43.15; Wed, 23 Aug 2023 05:43:39 -0700 (PDT) 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=@kernel.org header.s=k20201202 header.b=QJK7LN11; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233543AbjHWLvB (ORCPT + 99 others); Wed, 23 Aug 2023 07:51:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47016 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230458AbjHWLvA (ORCPT ); Wed, 23 Aug 2023 07:51:00 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CC32CCF; Wed, 23 Aug 2023 04:50:58 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 5C44561B0B; Wed, 23 Aug 2023 11:50:58 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2E939C433CB; Wed, 23 Aug 2023 11:50:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1692791457; bh=KumweqIbBGlQu/QW8/T6YUQUSRrF4UR/0XH8qL+VBn4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QJK7LN11MkN21EN+wnv0xeHHquHZoCJ5HNP9a77L2swSRzM+PsNSB5zTSAP2Tr9RE 3YCqblj4Ko78zSmsMU67ZLl08u3SJmPIbcaEwG/sPQicTyQOvFr+HTs5RnyOSyf3Vx QPtGYRoJtjv3gfMreOa5AkKd7D9WR55Go2HPI1DvzFiG5gA7+kO9d291nTt2vGDJk7 zmO0/K0iF1OewUVu4NXOK25skKPuwo8yeZ7czpNStx9kF7IgU7KvOJa7U7cEuvCRen c1UcHuB7OBBgi8xCT4jHrMy54Yrqac4m16U7kHnzfqJHH2Di9itS5YeLLu//0L83Ww oRKjY8U7U17zA== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Masahiro Yamada , Nathan Chancellor , Nick Desaulniers , Nicolas Schier Subject: [PATCH 2/8] kbuild: add modules_sign to no-{compiler,sync-config}-targets Date: Wed, 23 Aug 2023 20:50:42 +0900 Message-Id: <20230823115048.823011-2-masahiroy@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230823115048.823011-1-masahiroy@kernel.org> References: <20230823115048.823011-1-masahiroy@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS 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 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1775023811088851186 X-GMAIL-MSGID: 1775023811088851186 Like modules_install, modules_sign should avoid the syncconfig. Signed-off-by: Masahiro Yamada --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 7d54a0700c6e..e2dfa3b994f7 100644 --- a/Makefile +++ b/Makefile @@ -280,8 +280,8 @@ no-dot-config-targets := $(clean-targets) \ # Installation targets should not require compiler. Unfortunately, vdso_install # is an exception where build artifacts may be updated. This must be fixed. no-compiler-targets := $(no-dot-config-targets) install dtbs_install \ - headers_install modules_install kernelrelease image_name -no-sync-config-targets := $(no-dot-config-targets) %install kernelrelease \ + headers_install modules_install modules_sign kernelrelease image_name +no-sync-config-targets := $(no-dot-config-targets) %install modules_sign kernelrelease \ image_name single-targets := %.a %.i %.ko %.lds %.ll %.lst %.mod %.o %.rsi %.s %.symtypes %/ From patchwork Wed Aug 23 11:50:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 136677 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a7d1:0:b0:3f2:4152:657d with SMTP id p17csp502128vqm; Wed, 23 Aug 2023 07:34:20 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGaHY6hdw7SleKRD+inAm6UJoXGLApps/d3zHfxtb86+oBVTnbZ+TfEYtlSJJRdtYQYOUJw X-Received: by 2002:a05:6402:34b:b0:523:493e:929c with SMTP id r11-20020a056402034b00b00523493e929cmr9359192edw.10.1692801259976; Wed, 23 Aug 2023 07:34:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692801259; cv=none; d=google.com; s=arc-20160816; b=bD4tyFi+6dbJg2GJGPqFjG9s83PtOa1D3xmr/nXJXusFH0HnZO9F1az3mxbGpfXSby DTLjIQ4PlcJTGtG8TqDwcVVFPwpFnm3UdwvneDGEOYdpweWYcUNjGEBZLI7JlfZ6IH1X qXe/DFjV0jTdl9uydCbpDM/Jx8wv94oDp+BgDbM4ZanZGkkgHeWc2nRG8R+Lvl6IB40Q auOrYrdhariSJRMSvU40jT36coLSXrTnZjvi2Mg8GHK+koEID/waeBQXUslQxcmOACQn DCRoX+Uhp/0jqwJd+aiuphq6flDHe8EBVGal/dlwBbEfUISwNTOgDDf3BcD7Sh9fWTwE XEjA== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=P5HqnkzgusAxnu/f8Lf371+SnHDems2lTdqrAadjJyY=; fh=rliOZr6Fz5JmnSfKOt6v3ZHxXv/lQ1TnqU77+ZCO3og=; b=KQrAmS436A8lKFcXxSnaSllffUIMftBjFv2VCGjjBby4jeowzWzAEjCC85N0cPWDWy kxsO371HsyDod6tKStYVDkqDxFLiU5OVTWRZtuQggU7tpPr0oSELdnseh0tMZq9lhgo5 rAkN/n1NrutxHU1wWPAgpo7xfrU7gyNzZ65iJuHTLoSvauosTx2zZ5Rturiy6hWSaRen hIqOXS/VFnVQgsrP/gp8GUWyoIuSu5L05lLYYiAPvHiA05BnnrSHj24eiuKhzzK2IXtc Ka0lDXTdgdykyE8ce1DtISVMEq256H6xD0t7creUKqPEVqZ3SIZM0M7oDs/ZhLK6nBhy zgfA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=m+dzP8W5; 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=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h18-20020a50ed92000000b00523c5ff72a6si9307822edr.70.2023.08.23.07.33.56; Wed, 23 Aug 2023 07:34:19 -0700 (PDT) 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=@kernel.org header.s=k20201202 header.b=m+dzP8W5; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234543AbjHWLvD (ORCPT + 99 others); Wed, 23 Aug 2023 07:51:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60196 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234538AbjHWLvC (ORCPT ); Wed, 23 Aug 2023 07:51:02 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9A8FFDB; Wed, 23 Aug 2023 04:51:00 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 3542B64A6D; Wed, 23 Aug 2023 11:51:00 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 081F0C433C7; Wed, 23 Aug 2023 11:50:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1692791459; bh=at6MwZstCK4YYvJ/JENZT9OnY5U7qwdQvQ8iXxtDGtY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=m+dzP8W5sVJegKiGHku5Bp2hI0RCOwciogN11sjhg9SBjngWylSnHg2IPA4SE93wP sQN7AutlFsQwCVEB5jLiUdwtXrymkAX7f9OHl8Jb6rQbiW8YEFSrEq1VhFKdJLoE/d lORgMFqHAmFe9z3w/6D5vX79QA8iBjVLl4vnmBYLtMkLYDLafhjvuhI8QQIXwNActw GNFD/UZ5LbWHlIbsHHetdLrU1I7TC8aH+gqVH56g+Ajn54BtFxTdJ5zN8DEQ5mHyIH HvQ7TP8SacJOB2Om8IJVKLCm6IiEm/3JNFWPTo969bk349/mwDHiIC2Yv0IVBPRqMU XKZkGal/chvJg== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Masahiro Yamada , Nathan Chancellor , Nick Desaulniers , Nicolas Schier Subject: [PATCH 3/8] kbuild: move depmod rule to scripts/Makefile.modinst Date: Wed, 23 Aug 2023 20:50:43 +0900 Message-Id: <20230823115048.823011-3-masahiroy@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230823115048.823011-1-masahiroy@kernel.org> References: <20230823115048.823011-1-masahiroy@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1775030773972343940 X-GMAIL-MSGID: 1775030773972343940 depmod is a part of the module installation. scripts/Makefile.modinst is a better place to run it. Signed-off-by: Masahiro Yamada --- Makefile | 8 -------- scripts/Makefile.modinst | 9 +++++++++ scripts/depmod.sh | 10 ++++++---- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index e2dfa3b994f7..c9c8019e4720 100644 --- a/Makefile +++ b/Makefile @@ -509,7 +509,6 @@ LEX = flex YACC = bison AWK = awk INSTALLKERNEL := installkernel -DEPMOD = depmod PERL = perl PYTHON3 = python3 CHECK = sparse @@ -1871,15 +1870,8 @@ PHONY += modules_check modules_check: $(MODORDER) $(Q)$(CONFIG_SHELL) $(srctree)/scripts/modules-check.sh $< -quiet_cmd_depmod = DEPMOD $(MODLIB) - cmd_depmod = $(CONFIG_SHELL) $(srctree)/scripts/depmod.sh $(DEPMOD) \ - $(KERNELRELEASE) - modules_install: $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modinst -ifndef modules_sign_only - $(call cmd,depmod) -endif else # CONFIG_MODULES diff --git a/scripts/Makefile.modinst b/scripts/Makefile.modinst index ab0c5bd1a60f..7a64ece9b826 100644 --- a/scripts/Makefile.modinst +++ b/scripts/Makefile.modinst @@ -86,6 +86,15 @@ $(dst)/%.ko: $(extmod_prefix)%.ko FORCE $(call cmd,strip) $(call cmd,sign) +__modinst: depmod + +PHONY += depmod +depmod: $(modules) + $(call cmd,depmod) + +quiet_cmd_depmod = DEPMOD $(MODLIB) + cmd_depmod = $(srctree)/scripts/depmod.sh $(KERNELRELEASE) + else $(dst)/%.ko: FORCE diff --git a/scripts/depmod.sh b/scripts/depmod.sh index fca689ba4f21..ee771ccb1f9c 100755 --- a/scripts/depmod.sh +++ b/scripts/depmod.sh @@ -3,12 +3,14 @@ # # A depmod wrapper used by the toplevel Makefile -if test $# -ne 2; then - echo "Usage: $0 /sbin/depmod " >&2 +if test $# -ne 1; then + echo "Usage: $0 " >&2 exit 1 fi -DEPMOD=$1 -KERNELRELEASE=$2 + +KERNELRELEASE=$1 + +: ${DEPMOD:=depmod} if ! test -r System.map ; then echo "Warning: modules_install: missing 'System.map' file. Skipping depmod." >&2 From patchwork Wed Aug 23 11:50:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 136665 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a7d1:0:b0:3f2:4152:657d with SMTP id p17csp465424vqm; Wed, 23 Aug 2023 06:37:34 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGABSn7euKHpEKDAzqz3YEwf5Y2NxqEJMS4vXwiIT/Bd5Cr+2hBSnVJfw9tqw7TAERbISnP X-Received: by 2002:a05:6808:8a:b0:3a7:458e:3df4 with SMTP id s10-20020a056808008a00b003a7458e3df4mr12706607oic.56.1692797854462; Wed, 23 Aug 2023 06:37:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692797854; cv=none; d=google.com; s=arc-20160816; b=irXzZsI/Yh9aBn6wgl+NLjYxZtkUKbOnFrMM/5w6S6VhtQjArKrQRYcUlMDA0ZWz+P C9FXPi2bbgHZcY2uwsow4wXQIVrpQQrQcAGlX+BmiVfI2hG9nqosYdm/p2+lFMo1ZCkb z/BnmBkb1h/luffxpsjXlJhyBGT2zElIXMJPvob4kGIHsGXyvHnxKuARSVa9mTlsQhTI g03bkp9onSSe4a7HwiKkTB/aBc8ELueiPwB/XiLZ/uJbJ6FABdKNgpPg6SCch3k0mfra OsA8KFyH+7MLKjTFywiaZERjJY2U3SIDnhGNRAcRavNsU0EhhSNXai5B/pV/HWqzl88d W93w== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=E5n69GIZZp+9DMU5aIKvfPHx3HlDNk4Ho6jL5Y5JkfA=; fh=rliOZr6Fz5JmnSfKOt6v3ZHxXv/lQ1TnqU77+ZCO3og=; b=B3gEeWuJPm9OJnDTFS0yY3n9W4scEMnVjBHpS8ksLtXaCWMLSVjEsPcpylBUrXgR4+ W1WlOHYKua9dWfx7GT7V/VPwUrqstlh9gUHA8ToA9YxmGmogvpMJy/umFK+WFvhP3Pj4 CRJYg4sTap0RErYLbzPqkKM71CE5NgfR4+ukdjkopdcYL1FSWpw324Un4wpbxe7defL4 5MMtvfnrUb6IRzrn0d20W98H3cso6pejNzUssQb//597xG9KXVLX942J0GhafxY5giv1 FeHu3B7yoaBwmxtK1p98sXiOB7V6ECU7EDalWyzmI8ps9DDAl243v+GwjWmhjiazAGke AFHQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=eUxX4xhs; 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=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id x185-20020a6386c2000000b005697ebac19esi8152179pgd.776.2023.08.23.06.37.19; Wed, 23 Aug 2023 06:37:34 -0700 (PDT) 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=@kernel.org header.s=k20201202 header.b=eUxX4xhs; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234336AbjHWLvF (ORCPT + 99 others); Wed, 23 Aug 2023 07:51:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60228 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234545AbjHWLvE (ORCPT ); Wed, 23 Aug 2023 07:51:04 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AE285DB; Wed, 23 Aug 2023 04:51:02 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 3B73964B5F; Wed, 23 Aug 2023 11:51:02 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id EFE55C433BB; Wed, 23 Aug 2023 11:50:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1692791461; bh=17ZI9OuOHnRLfA+Aw4o40RdR2fIS9vJw5OhR2qQpZiI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eUxX4xhsUQgev7TX7KnUzypflQUoGPIqH8x29uyoEn26LluX/etqEJ1udaR/94PEz GRJiMpf1EMIA9nJAp64bvT3EdAn+HalMD8WVX6ed7DwYReKntOvr0zF5c+VeB45iYp yqqux7rPhmld+o67J4rmILzy8FflfnQ4JRWe/CPYcsxDS9+LFlKN6p6dEQ13GzQDrx SCqzA7gT/mo0ujZGj3kVfM0/VTUj8K+3uzVkZGHSDCmq3uLor8uV1N8xfV5IyeRjFX Wd+PweV490O6s4pKn5yZ3XDD5DFXE5E3lqHNm4gzgg9sGAQD+SD+SC3oPknXYVovAV m2/bbSFidLEgQ== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Masahiro Yamada , Nathan Chancellor , Nick Desaulniers , Nicolas Schier Subject: [PATCH 4/8] kbuild: remove $(MODLIB)/source symlink Date: Wed, 23 Aug 2023 20:50:44 +0900 Message-Id: <20230823115048.823011-4-masahiroy@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230823115048.823011-1-masahiroy@kernel.org> References: <20230823115048.823011-1-masahiroy@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS 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 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1775027202801169691 X-GMAIL-MSGID: 1775027202801169691 This reverts the old commit "kbuild: Introduce source symlink in /lib/modules/.../". [1] The current Kbuild does not require $(MODLIB)/source. If the kernel was built in a separate output directory, $(MODLIB)/build/Makefile wraps the Makefile in the source tree. It is enough for building external modules. [1] https://git.kernel.org/pub/scm/linux/kernel/git/history/history.git/commit/?id=e09e58867154b8aae0a3ac26a9b1c05962f5a355 Signed-off-by: Masahiro Yamada --- Makefile | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index c9c8019e4720..7d9cab3d2186 100644 --- a/Makefile +++ b/Makefile @@ -1486,14 +1486,10 @@ modules_install: $(modinst_pre) PHONY += __modinst_pre __modinst_pre: @rm -rf $(MODLIB)/kernel - @rm -f $(MODLIB)/source + @rm -f $(MODLIB)/build @mkdir -p $(MODLIB) ifdef CONFIG_MODULES - @ln -s $(abspath $(srctree)) $(MODLIB)/source - @if [ ! $(objtree) -ef $(MODLIB)/build ]; then \ - rm -f $(MODLIB)/build ; \ - ln -s $(CURDIR) $(MODLIB)/build ; \ - fi + @ln -s $(CURDIR) $(MODLIB)/build @sed 's:^\(.*\)\.o$$:kernel/\1.ko:' modules.order > $(MODLIB)/modules.order endif @cp -f modules.builtin $(MODLIB)/ From patchwork Wed Aug 23 11:50:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 136726 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a7d1:0:b0:3f2:4152:657d with SMTP id p17csp730047vqm; Wed, 23 Aug 2023 14:26:31 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGNy1j8nuERxBIdJ8gSUv/GA0NTNTaWG/E5v2265lrtOZa46jclH3ZzRtNfOQSgWKXedJYg X-Received: by 2002:a05:6a00:2482:b0:68b:eb3d:8030 with SMTP id c2-20020a056a00248200b0068beb3d8030mr1083065pfv.1.1692825991464; Wed, 23 Aug 2023 14:26:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692825991; cv=none; d=google.com; s=arc-20160816; b=LwNofZSHVVyRiOn7affsfU+LAYlrRcMVTaZooenhbSVkzr23tbhJ2k6d4dk88lKzlB iLuonKI6FbX4dw389pVJQywrHhjOs+E7mvXhEgJtbve7+Ch3ulRtHfEjdqEolojpqUlh AC04ZRNmi/K7nNXR5TiwQR8RkZKgv/JV9o8xC9EQkx8gt/eOmk1K8uYN7VHYRLGLIIAa xpVG17X3WGXh8It5vx/0SNU+T4a37ukHvWqRZWTV0e7P21pwdvgKDbKpyi32jmZDgtbU 22/GShtelO1b8OYiwt/MWws4boz4e5gxfs3VCZYb666ksRnvX3QGgQsBtfbJ6+rh0q7U cw5w== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=FGLAsqAHL4RwGkwXQMoJD3PyPRr+mf7s6W9RoLLYkOo=; fh=rliOZr6Fz5JmnSfKOt6v3ZHxXv/lQ1TnqU77+ZCO3og=; b=BwN35vEidw7tMn3Cud4MJxY8AXQrUSWgi5o9AODP4JI5csBPkoPIBiPmA0ZXKorUJk oYx+cSlP2q04nOLvcKFWeC64Y+KwiN9ycdFhTxR18J/NuMRjODANk4gEL40ngekNYBYJ 3b6YZpAmvwRQ/lmxQgM83CUIZktH0DwCDs8s7VWoDSSnzCDDzK83gZGJm1pvnceRB6Zl 4JeBeX52UvU3MxPxh6iRUCzdvQn2oDCX0LkB/g7htdFmhUvz39Xr3OBcSsvrcXCGgYQn gh5cDs2mPGL10esQFgrhqdk2r+80i2wfVrtqnteMuEXUOxukFNIvR7GU2SaJnN4P5Kbw aBiA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=gASx3gsE; 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=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n2-20020a056a00212200b0068a3ff442c2si7544218pfj.2.2023.08.23.14.26.18; Wed, 23 Aug 2023 14:26:31 -0700 (PDT) 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=@kernel.org header.s=k20201202 header.b=gASx3gsE; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234557AbjHWLvO (ORCPT + 99 others); Wed, 23 Aug 2023 07:51:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60346 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234556AbjHWLvG (ORCPT ); Wed, 23 Aug 2023 07:51:06 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BAF31E5E; Wed, 23 Aug 2023 04:51:04 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 4BBF1657A1; Wed, 23 Aug 2023 11:51:04 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 06A59C433C8; Wed, 23 Aug 2023 11:51:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1692791463; bh=37LRz30ny/2YtsWajTxwFgePE/bkcRu4z9qqVGYU0fw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gASx3gsERnDseTFtIvf6L+RZKnriMxcsLx4fT++ZCeuPubUkRzOAQMbuHwJnjd/yF 59iFq70WIRzWHW7tTzI8upycG1vSzXDw6ajx+/lTWBSFbyj8bp4Tk9HuZG09Ylh8xT azmqOIzbn6ke44rNtBbyXoItg7iv3ipp/ltods8cXsP9itCBzHTkvUSzaawfacVgRD nJQVP6B/s/0J02nSZO8RKMvF8k6DgRKDd9fBqOnvfiG3+6yrs2W0x0Cqdy3TtyV7Ig 6BRiugtjqUXfGqtyVmckGysdW71jFtBwdV9ea/efGqd1BBdgrQANG+fmRVqTCAEelc S7RfKfg8PsUzA== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Masahiro Yamada , Nathan Chancellor , Nick Desaulniers , Nicolas Schier Subject: [PATCH 5/8] kbuild: reduce the number of mkdir calls during modules_install Date: Wed, 23 Aug 2023 20:50:45 +0900 Message-Id: <20230823115048.823011-5-masahiroy@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230823115048.823011-1-masahiroy@kernel.org> References: <20230823115048.823011-1-masahiroy@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1775056706714680379 X-GMAIL-MSGID: 1775056706714680379 Calling 'mkdir' for every module results in redundant syscalls. Use $(sort ...) to drop the duplicated directories. Signed-off-by: Masahiro Yamada --- scripts/Makefile.modinst | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/scripts/Makefile.modinst b/scripts/Makefile.modinst index 7a64ece9b826..5d687a453d90 100644 --- a/scripts/Makefile.modinst +++ b/scripts/Makefile.modinst @@ -9,6 +9,13 @@ __modinst: include include/config/auto.conf include $(srctree)/scripts/Kbuild.include +install-y := + +PHONY += prepare + +prepare: + $(Q)mkdir -p $(sort $(dir $(install-y))) + modules := $(call read-file, $(MODORDER)) ifeq ($(KBUILD_EXTMOD),) @@ -27,6 +34,7 @@ suffix-$(CONFIG_MODULE_COMPRESS_XZ) := .xz suffix-$(CONFIG_MODULE_COMPRESS_ZSTD) := .zst modules := $(patsubst $(extmod_prefix)%.o, $(dst)/%.ko$(suffix-y), $(modules)) +install-y += $(modules) __modinst: $(modules) @: @@ -35,7 +43,7 @@ __modinst: $(modules) # Installation # quiet_cmd_install = INSTALL $@ - cmd_install = mkdir -p $(dir $@); cp $< $@ + cmd_install = cp $< $@ # Strip # @@ -95,6 +103,8 @@ depmod: $(modules) quiet_cmd_depmod = DEPMOD $(MODLIB) cmd_depmod = $(srctree)/scripts/depmod.sh $(KERNELRELEASE) +$(install-y): prepare + else $(dst)/%.ko: FORCE From patchwork Wed Aug 23 11:50:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 136755 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a7d1:0:b0:3f2:4152:657d with SMTP id p17csp870497vqm; Wed, 23 Aug 2023 20:56:39 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEVJwU7S16p/5xBER306X983yfsiUWPoskZO3aQBpty5yEHKDRNBWkHYfXsA7TZwFZcC4nk X-Received: by 2002:a2e:854c:0:b0:2b5:9d2a:ab51 with SMTP id u12-20020a2e854c000000b002b59d2aab51mr10611963ljj.5.1692849399759; Wed, 23 Aug 2023 20:56:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692849399; cv=none; d=google.com; s=arc-20160816; b=Vunn8EzuYz0bCPOvkYoCSV6fdpLgHisAXsxMHx9aIE411BGN18O/LBdL0VZz36isMf vhX9JRjPbRYISSH44oS36JR7TzUIJexnfP9UkTbZVp4mi4spG/KjhuJEEUuRIIJ1ckBo N3cv2Ly7kZ8xoXHQNMjIn0xlxypUEK5EM0Ensvc6U/maKES1Lym7kPnmC79BizTwMX/J vvwp4ecLQRMQRiYsWR8V3/PjzNmnD+u48d9BwXezXJz7pPYmWLso203tupchnKSJfHqw keDgwZcblx5bb5bAmeNHozgbm7oce74LBe7RR7ZitM7oUU7695+svmz5AqqemIjGE01H 0Okw== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=5fpOPCinbFIGC2v2q+ScBKig0M1Fvd7t32L4f+eLcLU=; fh=rliOZr6Fz5JmnSfKOt6v3ZHxXv/lQ1TnqU77+ZCO3og=; b=uzF56LolIt5beRB6S9ipkBggP3tjt855M95QYOa2e+wg+AcEGXXKBJjlFh17UE5UKY 2b7ccyt+REpIqTenGL/t1KrGWmF8pZBCcEyJ86SKZfLWH6h8CQh8CUvdyoE3uYnVTQge uDhAcDFTNS8bvqmWbrUQLiUhbsuNrJ//LjVH+2XydPAaIJVhe9WPuVmrUsSH6v2/x/ZY bS+a4eOQQKER8iPKUfQOG5dwiWw1gBkpil8o/PT6BD670YDrb70RCP2wbAl4LGVQJb/x zmJOer82vcu+MPZ3Y55W/yij26Iom+C18iL0KEa1M4qD2MfEzelJ8be1hB+SAgH7AfvT 5qLA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=u55izHtN; 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=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ss4-20020a170907038400b0099b9df9a864si9657583ejb.738.2023.08.23.20.56.27; Wed, 23 Aug 2023 20:56:39 -0700 (PDT) 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=@kernel.org header.s=k20201202 header.b=u55izHtN; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234583AbjHWLvX (ORCPT + 49 others); Wed, 23 Aug 2023 07:51:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40982 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234573AbjHWLvV (ORCPT ); Wed, 23 Aug 2023 07:51:21 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8E00110D8; Wed, 23 Aug 2023 04:51:08 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id CC9F165EE5; Wed, 23 Aug 2023 11:51:07 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AE280C433BC; Wed, 23 Aug 2023 11:51:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1692791467; bh=ppMUv0qLwsFmCUlGZJ1h69t/Ezpj7sAWUVh2xcrRGhE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=u55izHtNM83xo+KNviVMW6hJuLR0ipOxmL++Qw726xia7DnlmR+IhknA1t8iHR7lp AS2P762LWUcvgSqANgDl3aUFiD2vrTMQfQ+cgN7dtr8Pnmti10l7IpYsHH+JnX+fAy 0Q7xhCfyaW6Jwxj4HCYLOkci6MepfljpcUVPDWvianMj0ISgPG8alH9TZeeF16R0Ee I9H3/QjGxEXfpf4v5THgyvp8e0wrhGR4a9rWgg6KN0qr4W047kVUm9Iqi5ZOsW6IHi PCoUE3vrH/WDgrsNwGgH57lENYZBT32rcW+JPBosHMjXSgyO8rsXKJsfnapylA6dLC PVzdu1wvZ28kQ== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Masahiro Yamada , Nathan Chancellor , Nick Desaulniers , Nicolas Schier Subject: [PATCH 7/8] kbuild: support 'make modules_sign' with CONFIG_MODULE_SIG_ALL=n Date: Wed, 23 Aug 2023 20:50:47 +0900 Message-Id: <20230823115048.823011-7-masahiroy@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230823115048.823011-1-masahiroy@kernel.org> References: <20230823115048.823011-1-masahiroy@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS 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 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1775081251843340395 X-GMAIL-MSGID: 1775081251843340395 Commit d890f510c8e4 ("MODSIGN: Add modules_sign make target") introduced 'make modules_sign' to manually sign modules. Some time later, commit d9d8d7ed498e ("MODSIGN: Add option to not sign modules during modules_install") introduced CONFIG_MODULE_SIG_ALL. If it was disabled, mod_sign_cmd was set to no-op ('true' command). It affected not only 'make modules_install' but also 'make modules_sign'. With CONFIG_MODULE_SIG_ALL=n, 'make modules_install' did not sign modules and 'make modules_sign' could not sign modules either. Kbuild has kept that behavior, and nobody has complained about it, but I think it is weird. CONFIG_MODULE_SIG_ALL=n should turn off signing only for modules_install. If users want to sign modules manually, they should be allowed to use 'make modules_sign'. Signed-off-by: Masahiro Yamada --- scripts/Makefile.modinst | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/Makefile.modinst b/scripts/Makefile.modinst index dc7c54669082..33d424a3f265 100644 --- a/scripts/Makefile.modinst +++ b/scripts/Makefile.modinst @@ -106,7 +106,6 @@ endif # Signing # Don't stop modules_install even if we can't sign external modules. # -ifeq ($(CONFIG_MODULE_SIG_ALL),y) ifeq ($(filter pkcs11:%, $(CONFIG_MODULE_SIG_KEY)),) sig-key := $(if $(wildcard $(CONFIG_MODULE_SIG_KEY)),,$(srctree)/)$(CONFIG_MODULE_SIG_KEY) else @@ -115,13 +114,15 @@ endif quiet_cmd_sign = SIGN $@ cmd_sign = scripts/sign-file $(CONFIG_MODULE_SIG_HASH) "$(sig-key)" certs/signing_key.x509 $@ \ $(if $(KBUILD_EXTMOD),|| true) -else + +ifeq ($(modules_sign_only),) + +# During modules_install, modules are signed only when CONFIG_MODULE_SIG_ALL=y. +ifndef CONFIG_MODULE_SIG_ALL quiet_cmd_sign := cmd_sign := : endif -ifeq ($(modules_sign_only),) - $(dst)/%.ko: $(extmod_prefix)%.ko FORCE $(call cmd,install) $(call cmd,strip) From patchwork Wed Aug 23 11:50:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 136679 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a7d1:0:b0:3f2:4152:657d with SMTP id p17csp502822vqm; Wed, 23 Aug 2023 07:35:24 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEVWWebSOE1WVyXzPjeGTiTl5CFkyr0atSFWeDIb1/SqT1/4PT3a/qVJb2G3kwEP0ol109K X-Received: by 2002:a17:907:77c8:b0:99e:5d8:a6f9 with SMTP id kz8-20020a17090777c800b0099e05d8a6f9mr9952107ejc.66.1692801324020; Wed, 23 Aug 2023 07:35:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692801323; cv=none; d=google.com; s=arc-20160816; b=VF62IBxFstZq4spH0cElfi4nsH9nkqkv6WpjFpLZsIjhnjuTZdwEIV5I89bkWh1uFw OP5SBzNQD4wB7a/0wSyWQFHOlycwSvhEPaj3mdqsB3wlzCWS2MviIaYp9WN1bekGZ7Ez iF+Mz/znRRfd1Q/SPRbOMTWBrF0I3LCw2VE31NT7nptAFBZfEDJY43qoi1IHCO3sekb+ G99z6I/J4tj+5Py9h8xFFkkibTeT3dvxG/AkYlhpjFxiTvW9/y/sa5TvddWYFg/dVdAS KNJ96CPw8/l92GaZK0wZxtLYE+n12+bUsUFuNbm2agC+KZLYLB3m/5igmrsrW5ckLRwG s99Q== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Sl5HiMJSWAxyZb/Gf8cudzkOjwBeR0VGB9VTVDEE9BQ=; fh=rliOZr6Fz5JmnSfKOt6v3ZHxXv/lQ1TnqU77+ZCO3og=; b=oO5+ds2c3ZaUWtwaER9ix7BLpWED/Jc49PNdZyPIBmX+x6OSNyIo1n4FtoRbdhRZTW x5V1KFZGtNLxmIr9mineo5cBAwX0R6ieCR+ltSFBK0iumpVHBNRl+yEl195rGWkWO5BB Apje5t+sckIp4iDl4ozXiZcHBLFktfLwbDmhpOtjNMhZ92bFElL5nlOB91masWo/AHg/ CiUenStYeI4HBp+aDA86IuNpri5ZaaZTVT7jpoXZ36VMtCXS67aStNwGeeCctqAwyXRm V0YVBSxgH7BsQKSGP6Vy/jfTguwGuP+BQTbb7QQjIZy483/29d+lMAhfB9A6V/FCvMWW /h5g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=tx0ESURF; 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=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id kq4-20020a170906abc400b00992bcbf775asi8593460ejb.940.2023.08.23.07.34.59; Wed, 23 Aug 2023 07:35:23 -0700 (PDT) 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=@kernel.org header.s=k20201202 header.b=tx0ESURF; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234590AbjHWLv0 (ORCPT + 99 others); Wed, 23 Aug 2023 07:51:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41070 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234596AbjHWLvW (ORCPT ); Wed, 23 Aug 2023 07:51:22 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5129410F4; Wed, 23 Aug 2023 04:51:10 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id CB8B2660A4; Wed, 23 Aug 2023 11:51:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 879EEC433C8; Wed, 23 Aug 2023 11:51:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1692791469; bh=Qxv/8a7cbDHGce4PkpsCd77nqaf021G/M1emjTuC+4E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tx0ESURFqrHydXrybxmIpYZTIhJEuAsKNs3bhXCl9l7/vaNAslvhvZNWOwaVAommV HEGWCH2RqW2QflFgnOx4jqY9i4KAmar4UE2HvNfOn4KYG0ZctUdntPF1MfbrOH5Z4g GrtgVDXhYrOHkHJQmiKxcVwGxDoodpqmSaRzD+BYliYjoJIMROmJ2iNoRoO1JDNOqq nDs6ziyZtaxn4iwXwqAdtkj7Ps4J3G4y1fE6qksLkN9UcwTs3HmsT9sQAgC2Wv53cf dLxUJgXUMRHQZrgJ0WvmbGwuHi3pvPSjLbcXDicYD1EGTu0yKz5dyiXL/z5qR51XrO s/OjwihEqusig== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Masahiro Yamada , Nathan Chancellor , Nick Desaulniers , Nicolas Schier Subject: [PATCH 8/8] kbuild: support modules_sign for external modules as well Date: Wed, 23 Aug 2023 20:50:48 +0900 Message-Id: <20230823115048.823011-8-masahiroy@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230823115048.823011-1-masahiroy@kernel.org> References: <20230823115048.823011-1-masahiroy@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1775030841073892109 X-GMAIL-MSGID: 1775030841073892109 The modules_sign target is currently only available for in-tree modules, but it actually works for external modules as well. Move the modules_sign rule to the common part. Signed-off-by: Masahiro Yamada --- Makefile | 32 ++++++++++++++++---------------- scripts/Makefile.modinst | 4 ++-- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Makefile b/Makefile index 82d22debf6c9..87a9eef3fb4b 100644 --- a/Makefile +++ b/Makefile @@ -1461,20 +1461,6 @@ modules: modules_prepare modules_prepare: prepare $(Q)$(MAKE) $(build)=scripts scripts/module.lds -export modules_sign_only := - -ifeq ($(CONFIG_MODULE_SIG),y) -PHONY += modules_sign -modules_sign: modules_install - @: - -# modules_sign is a subset of modules_install. -# 'make modules_install modules_sign' is equivalent to 'make modules_install'. -ifeq ($(filter modules_install,$(MAKECMDGOALS)),) -modules_sign_only := y -endif -endif - endif # CONFIG_MODULES ### @@ -1833,10 +1819,24 @@ endif # KBUILD_EXTMOD # --------------------------------------------------------------------------- # Modules -PHONY += modules modules_install modules_prepare +PHONY += modules modules_install modules_sign modules_prepare modules_install: - $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modinst + $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modinst \ + sign-only=$(if $(filter modules_install,$(MAKECMDGOALS)),,y) + +ifeq ($(CONFIG_MODULE_SIG),y) +# modules_sign is a subset of modules_install. +# 'make modules_install modules_sign' is equivalent to 'make modules_install'. +modules_sign: modules_install + @: +else +modules_sign: + @echo >&2 '***' + @echo >&2 '*** CONFIG_MODULE_SIG is disabled. You cannot sign modules.' + @echo >&2 '***' + @false +endif ifdef CONFIG_MODULES diff --git a/scripts/Makefile.modinst b/scripts/Makefile.modinst index 33d424a3f265..459cb1fed223 100644 --- a/scripts/Makefile.modinst +++ b/scripts/Makefile.modinst @@ -13,7 +13,7 @@ install-y := PHONY += prepare -ifeq ($(KBUILD_EXTMOD)$(modules_sign_only),) +ifeq ($(KBUILD_EXTMOD)$(sign-only),) # Install more files for in-tree modules_install @@ -115,7 +115,7 @@ quiet_cmd_sign = SIGN $@ cmd_sign = scripts/sign-file $(CONFIG_MODULE_SIG_HASH) "$(sig-key)" certs/signing_key.x509 $@ \ $(if $(KBUILD_EXTMOD),|| true) -ifeq ($(modules_sign_only),) +ifeq ($(sign-only),) # During modules_install, modules are signed only when CONFIG_MODULE_SIG_ALL=y. ifndef CONFIG_MODULE_SIG_ALL