From patchwork Tue Nov 28 05:52:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 170548 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp3703895vqx; Mon, 27 Nov 2023 21:53:24 -0800 (PST) X-Google-Smtp-Source: AGHT+IFEORUbyOmIWn9ExSKIlh9IDykV46rWF9N/IkS31JBSgKfIAHOt2Smt/H8XFBorNIZkJ2RM X-Received: by 2002:a0d:dec2:0:b0:59b:d3cd:ffb6 with SMTP id h185-20020a0ddec2000000b0059bd3cdffb6mr14107731ywe.33.1701150804614; Mon, 27 Nov 2023 21:53:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701150804; cv=none; d=google.com; s=arc-20160816; b=njmaDYEDWENVXOQI9I5DfMgx8PpoWG4W7dL+wylO78ONcFhgyNZ0SN59Y1fkC9WZoQ 7n+4fwkXQ8kVTo6YwhCdPnjnGP9lOAyce5ZmQ4ExCBoXnFUOYILU56wXPZmD6eSMXilz LzuzUupWLR7VBH1cZjaCRMuPVSp/01J/2EAD3nuB3tqnruEK5NBm/ZuA7qROfu2wUuu8 K5m6X4NiEZtAWT8bhK4S9v6E0FvsTNANMzU1Hnp/hXw2z9O+M51Y191eyxVzyNnDxTZw //VDVYBhc4IcZ2wn2SHOGj35aKnqanLqIhv5DoP4sWPrEykAvGpQJj5gWO0UtcgWLjzN 7ZAw== 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=gMr7SNIGWG+LCt67HL84oAYmHREAbz0FAtMx7hLa0hk=; fh=JCKKZe0oDvXq2RiY9C+Srf0pf0LO6Ct2pzWo8CZ74+I=; b=dMUdklTnxGU04+zzZnqg3qsegkbLGzCt6QJ3WBnQSh0T/CRbaSclcQHmjkN+LSIiCw L7RGgGwoaCVMwsbkwKapMl6y0vkMChV8OhisWf/t9KGkaHmzAWELAePsNMY/PJBBiVPq q+mMdDDLS5aeXLCGlBv8ANrsVBOU3bwR7bO12UPVXQzRAV8OdFhzCk4hJHVhqfeps27F un1OdkoT83b0T1hTvCs7ThHTpeNqKkUc9uMkNwti8TkWuMlduslve+qPIhe4S1jfG1Kf GqwWCLRzviYtuu3knSmiuXqqrH1HvM58OApfTDTamUShUeFoVXOXireW6bT0ZT3LKkby yQ1A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=fczUNevm; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id a38-20020a056a001d2600b006cbf1bb0b34si10088714pfx.323.2023.11.27.21.53.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 21:53:24 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=fczUNevm; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 0143D8059372; Mon, 27 Nov 2023 21:53:20 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343611AbjK1FxD (ORCPT + 99 others); Tue, 28 Nov 2023 00:53:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57230 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343576AbjK1Fwx (ORCPT ); Tue, 28 Nov 2023 00:52:53 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DF4A3E6 for ; Mon, 27 Nov 2023 21:52:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1701150779; 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=gMr7SNIGWG+LCt67HL84oAYmHREAbz0FAtMx7hLa0hk=; b=fczUNevm9+5D8wo6vXI2sBt/Ihcs5Y22w8K4SO9qU8Ob9yDe44CSEJ4Rmj4xDwZzfM7FCx FHpWKqxv2pIYR7sBNEOCekPOonuYyEMgbAKh5UQ17kfkAzMjvmKBbRmKImRKmkGm+pE8EF vLkuiwvx1ENZAFz3sn/16xH2At94RpQ= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-664-QrJwYi1qPxyK5xc4SEBPyQ-1; Tue, 28 Nov 2023 00:52:55 -0500 X-MC-Unique: QrJwYi1qPxyK5xc4SEBPyQ-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C6CCE85A5BD; Tue, 28 Nov 2023 05:52:54 +0000 (UTC) Received: from MiWiFi-R3L-srv.redhat.com (unknown [10.72.112.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id A2E725028; Tue, 28 Nov 2023 05:52:51 +0000 (UTC) From: Baoquan He To: linux-kernel@vger.kernel.org Cc: kexec@lists.infradead.org, x86@kernel.org, akpm@linux-foundation.org, eric_devolder@yahoo.com, ignat@cloudflare.com, agordeev@linux.ibm.com, Baoquan He Subject: [PATCH v2] drivers/base/cpu: crash data showing should depends on KEXEC_CORE Date: Tue, 28 Nov 2023 13:52:48 +0800 Message-ID: <20231128055248.659808-1-bhe@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.5 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 agentk.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 (agentk.vger.email [0.0.0.0]); Mon, 27 Nov 2023 21:53:20 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783785906453057253 X-GMAIL-MSGID: 1783785906453057253 After commit 88a6f8994421 ("crash: memory and CPU hotplug sysfs attributes"), on x86_64, if only below kernel configs related to kdump are set, compiling error are triggered. ---- CONFIG_CRASH_CORE=y CONFIG_KEXEC_CORE=y CONFIG_CRASH_DUMP=y CONFIG_CRASH_HOTPLUG=y ------ ------------------------------------------------------ drivers/base/cpu.c: In function ‘crash_hotplug_show’: drivers/base/cpu.c:309:40: error: implicit declaration of function ‘crash_hotplug_cpu_support’; did you mean ‘crash_hotplug_show’? [-Werror=implicit-function-declaration] 309 | return sysfs_emit(buf, "%d\n", crash_hotplug_cpu_support()); | ^~~~~~~~~~~~~~~~~~~~~~~~~ | crash_hotplug_show cc1: some warnings being treated as errors ------------------------------------------------------ CONFIG_KEXEC is used to enable kexec_load interface, the crash_notes/crash_notes_size/crash_hotplug showing depends on CONFIG_KEXEC is incorrect. It should depend on KEXEC_CORE instead. Fix it now. Fixes: commit 88a6f8994421 ("crash: memory and CPU hotplug sysfs attributes") Signed-off-by: Baoquan He Tested-by: Ignat Korchagin # compile-time only Tested-by: Alexander Gordeev --- drivers/base/cpu.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/base/cpu.c b/drivers/base/cpu.c index 9ea22e165acd..548491de818e 100644 --- a/drivers/base/cpu.c +++ b/drivers/base/cpu.c @@ -144,7 +144,7 @@ static DEVICE_ATTR(release, S_IWUSR, NULL, cpu_release_store); #endif /* CONFIG_ARCH_CPU_PROBE_RELEASE */ #endif /* CONFIG_HOTPLUG_CPU */ -#ifdef CONFIG_KEXEC +#ifdef CONFIG_KEXEC_CORE #include static ssize_t crash_notes_show(struct device *dev, @@ -189,14 +189,14 @@ static const struct attribute_group crash_note_cpu_attr_group = { #endif static const struct attribute_group *common_cpu_attr_groups[] = { -#ifdef CONFIG_KEXEC +#ifdef CONFIG_KEXEC_CORE &crash_note_cpu_attr_group, #endif NULL }; static const struct attribute_group *hotplugable_cpu_attr_groups[] = { -#ifdef CONFIG_KEXEC +#ifdef CONFIG_KEXEC_CORE &crash_note_cpu_attr_group, #endif NULL