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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B86E5C433EF for ; Tue, 26 Apr 2022 20:32:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1354971AbiDZUfz (ORCPT ); Tue, 26 Apr 2022 16:35:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41368 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1354513AbiDZUfu (ORCPT ); Tue, 26 Apr 2022 16:35:50 -0400 Received: from mail-yw1-x114a.google.com (mail-yw1-x114a.google.com [IPv6:2607:f8b0:4864:20::114a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3C4431A61E9 for ; Tue, 26 Apr 2022 13:32:42 -0700 (PDT) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-2f4dee8688cso126518237b3.16 for ; Tue, 26 Apr 2022 13:32:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:message-id:mime-version:subject:from:to:cc; bh=ZsCBuiiFgRZP4jhvDChuQicSvWa0udH/sRJiHNclKT4=; b=YHzUgr9QNc7oDN5KkGpaITjDoktFxpsf4LNMdcVtpPFSiZ1kR5IoBtXE/XY92k9t9T 95VYIubjXmyZblFdrJAhW2MMy37VNzmyvZnc9wmsakyZJmXqDi8rB6XhcUSIwzfjchJC l9sy1K1FGT2luTvexMHuPDkejArUVYZW84GEE6MZGUYEXUPCXZ7+2fW+fYlTq9uOIUkz +lhMH3UOyj5f6NiVyT3UzgorhLTiTZLfygmSlAVB0bAg8preJ3FW9MSlqCjd1v0wKbzp HMcZXuhMkofdhk3JARWAupJW2lbSJfUbparW4zu76JIS1BFdxSyQCURJF5IHCb5NORG6 Vl/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=ZsCBuiiFgRZP4jhvDChuQicSvWa0udH/sRJiHNclKT4=; b=x5aohChK+qcKqCBbD3Oiw/x+OTqt6aW1e2Wl/52pM9/mrNE3BA2M2dUHOHmYa5V6zM azgnUYpYBWBcQafwZxz1OM/QSgv+kqGpQQgygtEltqIOggHWNcBfYirToSRteNpfoXK2 ZEvdDYwCR1u5hb0VahIcwJDV812xe21kHQuHtRW+DVl7XlrjRhnm9Gghntwg42Wh08X4 1tEKm06AHBHHa9PHR2ZXcZhMPKuOVAMPfENE3Psqn3bj4IQr2zCYsp8D/oThbqTUqvCQ 9AuUSHJlX6N85R/G6XazKyoXs/ceQOUhAlU98FMnFuXqDd8xvM4miyXdkvQjyaGQYx5M CElQ== X-Gm-Message-State: AOAM530Ykq9CU87lyHCoH3QFGy/iN+1tAUKf9xMXcyRGFjIERyLyrUWj 2aT/r+XkU1z5/Bq4WYT9qzFRX0w= X-Google-Smtp-Source: ABdhPJzh1YP7CmiwmN8+/yV7PpIBnE6Eb3WcbLq40RItiIfk+iQBhhV7y3oqof4jQQkJj88sSYXnl/Q= X-Received: from pcc-desktop.svl.corp.google.com ([2620:15c:2ce:200:709f:5eff:336a:4109]) (user=pcc job=sendgmr) by 2002:a05:6902:52:b0:645:bd1:970e with SMTP id m18-20020a056902005200b006450bd1970emr22523227ybh.413.1651005161361; Tue, 26 Apr 2022 13:32:41 -0700 (PDT) Date: Tue, 26 Apr 2022 13:32:30 -0700 Message-Id: <20220426203231.2107365-1-pcc@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.36.0.rc2.479.g8af0fa9b8e-goog Subject: [PATCH v4 1/2] printk: stop including cache.h from printk.h From: Peter Collingbourne To: Andrey Konovalov , Hyeonggon Yoo <42.hyeyoo@gmail.com>, Andrew Morton , Catalin Marinas Cc: Peter Collingbourne , Linux ARM , Linux Memory Management List , Linux Kernel Mailing List , vbabka@suse.cz, penberg@kernel.org, roman.gushchin@linux.dev, iamjoonsoo.kim@lge.com, rientjes@google.com, Herbert Xu , Andrey Ryabinin , Alexander Potapenko , Dmitry Vyukov , kasan-dev , Eric Biederman , Kees Cook Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org An inclusion of cache.h in printk.h was added in 2014 in commit c28aa1f0a847 ("printk/cache: mark printk_once test variable __read_mostly") in order to bring in the definition of __read_mostly. The usage of __read_mostly was later removed in commit 3ec25826ae33 ("printk: Tie printk_once / printk_deferred_once into .data.once for reset") which made the inclusion of cache.h unnecessary, so remove it. We have a small amount of code that depended on the inclusion of cache.h from printk.h; fix that code to include the appropriate header. This fixes a circular inclusion on arm64 (linux/printk.h -> linux/cache.h -> asm/cache.h -> linux/kasan-enabled.h -> linux/static_key.h -> linux/jump_label.h -> linux/bug.h -> asm/bug.h -> linux/printk.h) that would otherwise be introduced by the next patch. Build tested using {allyesconfig,defconfig} x {arm64,x86_64}. Link: https://linux-review.googlesource.com/id/I8fd51f72c9ef1f2d6afd3b2cbc875aa4792c1fba Signed-off-by: Peter Collingbourne --- arch/arm64/include/asm/mte-kasan.h | 1 + arch/arm64/include/asm/percpu.h | 1 + drivers/firmware/smccc/kvm_guest.c | 1 + include/linux/printk.h | 1 - 4 files changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/arm64/include/asm/mte-kasan.h b/arch/arm64/include/asm/mte-kasan.h index a857bcacf0fe..9f79425fc65a 100644 --- a/arch/arm64/include/asm/mte-kasan.h +++ b/arch/arm64/include/asm/mte-kasan.h @@ -6,6 +6,7 @@ #define __ASM_MTE_KASAN_H #include +#include #include #ifndef __ASSEMBLY__ diff --git a/arch/arm64/include/asm/percpu.h b/arch/arm64/include/asm/percpu.h index 8f1661603b78..b9ba19dbdb69 100644 --- a/arch/arm64/include/asm/percpu.h +++ b/arch/arm64/include/asm/percpu.h @@ -10,6 +10,7 @@ #include #include #include +#include static inline void set_my_cpu_offset(unsigned long off) { diff --git a/drivers/firmware/smccc/kvm_guest.c b/drivers/firmware/smccc/kvm_guest.c index 2d3e866decaa..89a68e7eeaa6 100644 --- a/drivers/firmware/smccc/kvm_guest.c +++ b/drivers/firmware/smccc/kvm_guest.c @@ -4,6 +4,7 @@ #include #include +#include #include #include diff --git a/include/linux/printk.h b/include/linux/printk.h index 1522df223c0f..8e8d74edf121 100644 --- a/include/linux/printk.h +++ b/include/linux/printk.h @@ -6,7 +6,6 @@ #include #include #include -#include #include #include -- 2.36.0.rc2.479.g8af0fa9b8e-goog 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 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 60039C433EF for ; Tue, 26 Apr 2022 20:34:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:From:Subject:Mime-Version: Message-Id:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=wEh9/GdKD2WcFrSMwIt+1I8jT5yJjqyKLjg8NCwTPjU=; b=Tqy mLefsIWydEYfsTffcvBzUwOskuVsO43MFyB5BvXilrKLqzJMwhlSTpQVUcu3KyieZJLsCNCOFhRDj fAMKH2HMw3sin2M67eSs2Te2n+j414dJmsU+yqB0N6fZJ6FMtNvGIT9clwCOToF7sbYWIrr2y1Hw6 pLCMV5z1B3oAYXB+5dGyglk61vAhKxAKe29SjNSF+AtFUaT/XuOj8Ij/9xLe5sjHSZZtauJnAffhO NmekxIJuv3DaCEFyTG67hI/LsYh76rvXi85Y5ePvHqHCuXnvaVvTR2paqHQlX4lbbyTugkRuat8p9 4CBg9AMf7LiVr0+aC8WboFawZHwwv9A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1njRrc-00GBLm-KP; Tue, 26 Apr 2022 20:32:48 +0000 Received: from mail-yb1-xb4a.google.com ([2607:f8b0:4864:20::b4a]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1njRrZ-00GBJv-HS for linux-arm-kernel@lists.infradead.org; Tue, 26 Apr 2022 20:32:47 +0000 Received: by mail-yb1-xb4a.google.com with SMTP id z14-20020a5b0b0e000000b0064848b628cfso7443339ybp.0 for ; Tue, 26 Apr 2022 13:32:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:message-id:mime-version:subject:from:to:cc; bh=ZsCBuiiFgRZP4jhvDChuQicSvWa0udH/sRJiHNclKT4=; b=YHzUgr9QNc7oDN5KkGpaITjDoktFxpsf4LNMdcVtpPFSiZ1kR5IoBtXE/XY92k9t9T 95VYIubjXmyZblFdrJAhW2MMy37VNzmyvZnc9wmsakyZJmXqDi8rB6XhcUSIwzfjchJC l9sy1K1FGT2luTvexMHuPDkejArUVYZW84GEE6MZGUYEXUPCXZ7+2fW+fYlTq9uOIUkz +lhMH3UOyj5f6NiVyT3UzgorhLTiTZLfygmSlAVB0bAg8preJ3FW9MSlqCjd1v0wKbzp HMcZXuhMkofdhk3JARWAupJW2lbSJfUbparW4zu76JIS1BFdxSyQCURJF5IHCb5NORG6 Vl/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=ZsCBuiiFgRZP4jhvDChuQicSvWa0udH/sRJiHNclKT4=; b=Pbp50ST/8JR3xJS5bSyhqjrBRWUG6OMYE47d4kRewAZ+Z1zVZFYR3StYWIjoWRlTk1 Jnhu1CSS54N3+NGsOrsx9F1l/DTyYTNTkSJB3FQM507YciPJ9qSiPDqR/iNt4+wNk52h EE5813mXYw83yQR9LVYP2ASSE3cJXbHDe55h8WDgPxXv+MpRFuCPYqGjZF067WhH7N+e n6vbtFcf+Tv1IROfhWreI3qgkRbmWL0o0A6iKcWbRjw26yEN3l+volQiBT5ibpw+b0sp 2shLeLMpyCm1xhAh/yhzbSk8D5rlte8yZ/z1pRmChjR70BaP6MstrSMsidUcfD7QzESw MukQ== X-Gm-Message-State: AOAM532NvZ6XGDwEK3C6nEQXSu+AE1FnPuxRzfC4IMPjRi4jZYOMxEXi OEOB4iJai80UJL3Pp0tG5oFw8AU= X-Google-Smtp-Source: ABdhPJzh1YP7CmiwmN8+/yV7PpIBnE6Eb3WcbLq40RItiIfk+iQBhhV7y3oqof4jQQkJj88sSYXnl/Q= X-Received: from pcc-desktop.svl.corp.google.com ([2620:15c:2ce:200:709f:5eff:336a:4109]) (user=pcc job=sendgmr) by 2002:a05:6902:52:b0:645:bd1:970e with SMTP id m18-20020a056902005200b006450bd1970emr22523227ybh.413.1651005161361; Tue, 26 Apr 2022 13:32:41 -0700 (PDT) Date: Tue, 26 Apr 2022 13:32:30 -0700 Message-Id: <20220426203231.2107365-1-pcc@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.36.0.rc2.479.g8af0fa9b8e-goog Subject: [PATCH v4 1/2] printk: stop including cache.h from printk.h From: Peter Collingbourne To: Andrey Konovalov , Hyeonggon Yoo <42.hyeyoo@gmail.com>, Andrew Morton , Catalin Marinas Cc: Peter Collingbourne , Linux ARM , Linux Memory Management List , Linux Kernel Mailing List , vbabka@suse.cz, penberg@kernel.org, roman.gushchin@linux.dev, iamjoonsoo.kim@lge.com, rientjes@google.com, Herbert Xu , Andrey Ryabinin , Alexander Potapenko , Dmitry Vyukov , kasan-dev , Eric Biederman , Kees Cook X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220426_133245_605861_D03C4962 X-CRM114-Status: GOOD ( 14.99 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org An inclusion of cache.h in printk.h was added in 2014 in commit c28aa1f0a847 ("printk/cache: mark printk_once test variable __read_mostly") in order to bring in the definition of __read_mostly. The usage of __read_mostly was later removed in commit 3ec25826ae33 ("printk: Tie printk_once / printk_deferred_once into .data.once for reset") which made the inclusion of cache.h unnecessary, so remove it. We have a small amount of code that depended on the inclusion of cache.h from printk.h; fix that code to include the appropriate header. This fixes a circular inclusion on arm64 (linux/printk.h -> linux/cache.h -> asm/cache.h -> linux/kasan-enabled.h -> linux/static_key.h -> linux/jump_label.h -> linux/bug.h -> asm/bug.h -> linux/printk.h) that would otherwise be introduced by the next patch. Build tested using {allyesconfig,defconfig} x {arm64,x86_64}. Link: https://linux-review.googlesource.com/id/I8fd51f72c9ef1f2d6afd3b2cbc875aa4792c1fba Signed-off-by: Peter Collingbourne --- arch/arm64/include/asm/mte-kasan.h | 1 + arch/arm64/include/asm/percpu.h | 1 + drivers/firmware/smccc/kvm_guest.c | 1 + include/linux/printk.h | 1 - 4 files changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/arm64/include/asm/mte-kasan.h b/arch/arm64/include/asm/mte-kasan.h index a857bcacf0fe..9f79425fc65a 100644 --- a/arch/arm64/include/asm/mte-kasan.h +++ b/arch/arm64/include/asm/mte-kasan.h @@ -6,6 +6,7 @@ #define __ASM_MTE_KASAN_H #include +#include #include #ifndef __ASSEMBLY__ diff --git a/arch/arm64/include/asm/percpu.h b/arch/arm64/include/asm/percpu.h index 8f1661603b78..b9ba19dbdb69 100644 --- a/arch/arm64/include/asm/percpu.h +++ b/arch/arm64/include/asm/percpu.h @@ -10,6 +10,7 @@ #include #include #include +#include static inline void set_my_cpu_offset(unsigned long off) { diff --git a/drivers/firmware/smccc/kvm_guest.c b/drivers/firmware/smccc/kvm_guest.c index 2d3e866decaa..89a68e7eeaa6 100644 --- a/drivers/firmware/smccc/kvm_guest.c +++ b/drivers/firmware/smccc/kvm_guest.c @@ -4,6 +4,7 @@ #include #include +#include #include #include diff --git a/include/linux/printk.h b/include/linux/printk.h index 1522df223c0f..8e8d74edf121 100644 --- a/include/linux/printk.h +++ b/include/linux/printk.h @@ -6,7 +6,6 @@ #include #include #include -#include #include #include -- 2.36.0.rc2.479.g8af0fa9b8e-goog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel