From patchwork Wed Nov 29 22:04:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ignat Korchagin X-Patchwork-Id: 171611 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:6359:296:b0:164:83eb:24d7 with SMTP id ek22csp8004rwb; Wed, 29 Nov 2023 14:04:51 -0800 (PST) X-Google-Smtp-Source: AGHT+IHBquHANNoQvXmg2VEvYstmkaUMzfWqZzki6aZZEV7wuARmAgv926CcdOOGgwo/pMJfP7g/ X-Received: by 2002:a17:902:e80c:b0:1cf:eacb:a122 with SMTP id u12-20020a170902e80c00b001cfeacba122mr9318215plg.45.1701295491489; Wed, 29 Nov 2023 14:04:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701295491; cv=none; d=google.com; s=arc-20160816; b=wA9xZ14tY7dQxNoyl6utLiN3yE08mKvk0JITrUsBec17B/xP0eMA8zwzgpTS8QIWMD QxkeVOKW3cHjnvx7NvX686GPRDJC3zCe9mBCumC0LfdNndO//55p319jCSxji66uNbDF mnsipeyxrHg2uQlJiuhQXaXn+apTzCqTRYpSEEVX41lDQxqQVOC5A9TjiRtkMBxBD7az Xct1xaBFw71xbKj3zPyHeILccQK8/e4cYOcel38771bz/KENmq9cOODUG0N6+oqAaDn6 nAD0TlVN48ElA9Gi1mYjuPw8UofjUC/g02R0onbVrk8RD34XlIzazT2e5+Hsqp5kkqxO RiBQ== 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=oKHPDx2HvAschhAT4t+Helg6cS13lBVJniqEfNCvja0=; fh=Je7dHzPBrwKhbX6Zk8UjnEhUIkj12B47tMnWHMyrDG0=; b=RyHD+CmPpJ7bivemQYhNpO3P5ufq5N90S4RrQG6jASeVxpAirkyZiNuYVF9yOYOdrm hiGKZbbUuq75PTYP/PQ9xL+AJbkwqJO1M/8qXYZhmlSoAyfXb44trXkLOCTa00Gj9FgP 2hIVhU8h+QIf9Qu/YGiTof1Gcx0o8+X8m2KyEaYbkh8nduUAbcMkoRUK+lO3HNFh/yAe Hw+hRIouCnSOCaQyK6YGsFUhqvfiy18iZz+TdsY9ttCbM6UcBvJnkp4jQ1r4BaAjZrvB Agv1tHAwH0VEmLno0YOe3S38wK1ydRi8W6fRuFH1comcOsItrhVH5en8qYSfThm9LCNA on0Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@cloudflare.com header.s=google09082023 header.b=J49zT4Qf; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=cloudflare.com Received: from morse.vger.email (morse.vger.email. [23.128.96.31]) by mx.google.com with ESMTPS id jf4-20020a170903268400b001d01ace7634si1474757plb.609.2023.11.29.14.04.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Nov 2023 14:04:51 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31; Authentication-Results: mx.google.com; dkim=pass header.i=@cloudflare.com header.s=google09082023 header.b=J49zT4Qf; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=cloudflare.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id 8CBD38079B0F; Wed, 29 Nov 2023 14:04:35 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234257AbjK2WE1 (ORCPT + 99 others); Wed, 29 Nov 2023 17:04:27 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33822 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229668AbjK2WEY (ORCPT ); Wed, 29 Nov 2023 17:04:24 -0500 Received: from mail-lj1-x22f.google.com (mail-lj1-x22f.google.com [IPv6:2a00:1450:4864:20::22f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8E53F10E0 for ; Wed, 29 Nov 2023 14:04:19 -0800 (PST) Received: by mail-lj1-x22f.google.com with SMTP id 38308e7fff4ca-2c9c1e39defso3966761fa.1 for ; Wed, 29 Nov 2023 14:04:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloudflare.com; s=google09082023; t=1701295457; x=1701900257; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=oKHPDx2HvAschhAT4t+Helg6cS13lBVJniqEfNCvja0=; b=J49zT4QfpA+GZZxgYEj0wxaANxKQu4XBM0NvdSLFZls940IuXttzisQw+YKfJ2BS97 l0yoF51Ada6waSujjTyDklAvlZngpN9Xqkr1x3qA9M8l81yBLn/plviWd4ICm+QFusDa dU/czxwQFfqDb7iGOaR7de4WDuoSNbkRUWNzA6UnpcHbe1pL0d9TeDJsXbFeng6P6G5C yCmqJum5fS0x7Z8GZxA/3EH+4qJpBfZ8+a9AlNC1D/jiahIUdD80RNNU+2vI8Va7g4Ae NarladwVmH3+KEsbIOD0AUPghRmVWZECaYyOee1Q/gLQm6L1WFNT2ZFtD4F1+GqOSpEi b8bA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701295457; x=1701900257; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=oKHPDx2HvAschhAT4t+Helg6cS13lBVJniqEfNCvja0=; b=FiPQDxWf2OwDnBsVt88Pii/kULCRKzvbu+TGFOZ6IH0ud142J98o8+2jIqp0aotM/u bpVrKkGSz2kD6W+S6TcHxeiftW0DKkbzUzDSbv/dimj820p95fr4GQrzjkI1fXOClYWO oUyEoCFvcqfzcqnFINI6typHKpHbeWIT+veFdoxhgH+JmmScvzxCe5Ou+0FtxyjvFcm1 P2DqZAj7yUjI8w0RNvO8gx+WKCYOkKVRcSZt8DFiXoYO33S/cQerrjlWjvHaKQ9xMKSr 7ggetKYvrghEL4SS48f/Wam/CYwXH/TCjj2n6txImZeJedcjaa2z3UvEtsFqmyGxFTIa mq3Q== X-Gm-Message-State: AOJu0YyToDc1yX+3u5sUFBkOB+i3OzzlRt7leOpbUytphFbBKZbtcU0+ Nn6qzwofF6XcImlutwCir18K06D9KGGXqmssRMA= X-Received: by 2002:a2e:b815:0:b0:2c9:95f3:d71f with SMTP id u21-20020a2eb815000000b002c995f3d71fmr8576365ljo.16.1701295457093; Wed, 29 Nov 2023 14:04:17 -0800 (PST) Received: from localhost.localdomain ([87.74.204.186]) by smtp.gmail.com with ESMTPSA id hg11-20020a05600c538b00b0040b48690c49sm3531673wmb.6.2023.11.29.14.04.16 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 29 Nov 2023 14:04:16 -0800 (PST) From: Ignat Korchagin To: linux-kernel@vger.kernel.org Cc: Ignat Korchagin , kexec@lists.infradead.org, linux-arm-kernel@lists.infradead.org, akpm@linux-foundation.org, eric_devolder@yahoo.com, agordeev@linux.ibm.com, bhe@redhat.com, kernel-team@cloudflare.com, stable@vger.kernel.org Subject: [PATCH] kexec: drop dependency on ARCH_SUPPORTS_KEXEC from CRASH_DUMP Date: Wed, 29 Nov 2023 22:04:09 +0000 Message-Id: <20231129220409.55006-1-ignat@cloudflare.com> X-Mailer: git-send-email 2.39.3 (Apple Git-145) MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_MED,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=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.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 (morse.vger.email [0.0.0.0]); Wed, 29 Nov 2023 14:04:35 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783937621148280793 X-GMAIL-MSGID: 1783937621148280793 In commit f8ff23429c62 ("kernel/Kconfig.kexec: drop select of KEXEC for CRASH_DUMP") we tried to fix a config regression, where CONFIG_CRASH_DUMP required CONFIG_KEXEC. However, it was not enough at least for arm64 platforms. While further testing the patch with our arm64 config I noticed that CONFIG_CRASH_DUMP is unavailable in menuconfig. This is because CONFIG_CRASH_DUMP still depends on the new CONFIG_ARCH_SUPPORTS_KEXEC introduced in commit 91506f7e5d21 ("arm64/kexec: refactor for kernel/Kconfig.kexec") and on arm64 CONFIG_ARCH_SUPPORTS_KEXEC requires CONFIG_PM_SLEEP_SMP=y, which in turn requires either CONFIG_SUSPEND=y or CONFIG_HIBERNATION=y neither of which are set in our config. Given that we already established that CONFIG_KEXEC (which is a switch for kexec system call itself) is not required for CONFIG_CRASH_DUMP drop CONFIG_ARCH_SUPPORTS_KEXEC dependency as well. The arm64 kernel builds just fine with CONFIG_CRASH_DUMP=y and with both CONFIG_KEXEC=n and CONFIG_KEXEC_FILE=n after f8ff23429c62 ("kernel/Kconfig.kexec: drop select of KEXEC for CRASH_DUMP") and this patch are applied given that the necessary shared bits are included via CONFIG_KEXEC_CORE dependency. Fixes: 91506f7e5d21 ("arm64/kexec: refactor for kernel/Kconfig.kexec") Cc: stable@vger.kernel.org # 6.6+: f8ff234: kernel/Kconfig.kexec: drop select of KEXEC for CRASH_DUMP Cc: stable@vger.kernel.org # 6.6+ Signed-off-by: Ignat Korchagin Acked-by: Baoquan He --- kernel/Kconfig.kexec | 1 - 1 file changed, 1 deletion(-) diff --git a/kernel/Kconfig.kexec b/kernel/Kconfig.kexec index fc38f1ae3a30..946dffa048b7 100644 --- a/kernel/Kconfig.kexec +++ b/kernel/Kconfig.kexec @@ -96,7 +96,6 @@ config KEXEC_JUMP config CRASH_DUMP bool "kernel crash dumps" depends on ARCH_SUPPORTS_CRASH_DUMP - depends on ARCH_SUPPORTS_KEXEC select CRASH_CORE select KEXEC_CORE help