From patchwork Tue Mar 7 22:44:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 65916 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp4352wrd; Tue, 7 Mar 2023 14:49:16 -0800 (PST) X-Google-Smtp-Source: AK7set9tTkngq7Ad3inaQ69XQDf88jwLjr9CTHfovAWAw2FNA1cOfFwZFPAH/4eu+G7xhF0H7rbN X-Received: by 2002:a62:1991:0:b0:5e2:434d:116b with SMTP id 139-20020a621991000000b005e2434d116bmr12157763pfz.23.1678229355905; Tue, 07 Mar 2023 14:49:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678229355; cv=none; d=google.com; s=arc-20160816; b=z8nnKmc7uZ7Y91AzJTV8qErRtj+Co3/YN+KQKDikF1rBHci+WhQIeybsKTf3z647n5 TKS2pbPkc1ncHWkaV1A2QCXI0bHnOB4ojYaxQ0xaXALzmQqRUd0r/xzJkFM+IWIyKAS8 vvgPZ70v1ocIbq1XZKhOQJnwFmrg4awgEWs6xatnUiFZ9WTIgr+nuu8CQMmu8SjgyjPq Se8L6W9f2O9STvUGkDVyMYg4sdmd8nJEXrrRKJjCR/LG/fCGgOWAm/oJMX1Gs1G3BAYx 4Njy58fzphsIk/rTGFQp0qWOqqhDzKhJqGv+1FskTRqWag3M14uUVD6tTSkU6cRJZsfy IaOA== 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=aLsNIhZ38DTLOlIV3J1xAPIEhxcmS2odJFY0FoE9Wbk=; b=tiqoy+SeGqkLRj7+ZSbcLKq5aZNwTv7d4pa5sf44PTTB//1cuotfW87cvoa05gBV6N j9PABhbsTwRANnUqgbOZsdbTjxPfIHLJOyPT3a57rfsmF0liezpvwOHufNJq15D7NQC2 RX5VAih7ZhhzYDHkY544wUnCdy1OEPst8TfVMfd7n0iQMhQ0jVcMFONp980dBHHBGDYb ivNOwcFeN+k1DbZ/Iff0tAg/DFq0j4/cVOWwuF6am+GqGZUdzyN99G5RxjaS//Cx8V6s kLVKyReLW4vlB23s5IbEVbDJUF84WRl30SzBkK+7kIyqi0iqtvMXckdafWZaA0YCV5Tv J2jQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=jsoHgkhI; 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 s1-20020a63dc01000000b0050301265ffcsi13117548pgg.471.2023.03.07.14.49.02; Tue, 07 Mar 2023 14:49:15 -0800 (PST) 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=jsoHgkhI; 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 S231678AbjCGWpi (ORCPT + 99 others); Tue, 7 Mar 2023 17:45:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59044 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230163AbjCGWpG (ORCPT ); Tue, 7 Mar 2023 17:45:06 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 21A08136DA for ; Tue, 7 Mar 2023 14:44:48 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id D3E6EB81AB2 for ; Tue, 7 Mar 2023 22:44:46 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6A71CC433D2; Tue, 7 Mar 2023 22:44:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1678229085; bh=HcbEYAk5/hvYxwMQ1XV4yIwIyUKWjpgb4DPd91dMy6o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jsoHgkhIk35zpsQCjEMr3lWiaWSGqUQPSughiqH4A1oDxHRLHX6b/eue0ppdvRdLE 8h/FNndbDlr48QOyHaeBgGtwHBCoHGbGhxyPMfCpISNlJhUKiMvp5JHZTIB9vcO+H3 BjdinWjuHagF8Jhf8vGKEolrJuLm45jWf1H/ApZXFRd6MjRCKkzOWollyWRNB91d0s R9HtgqT5QZE68tbl/OT7Cl5dcGPVTj2rAKOh7xoF+JrJybpqU7S3d4aWToD4ff7OLz YmIiI2eLb/mx6LmD3n8NgxuSdrjn8cQrbOxr6KucT/QomSDWARcsxNU1/raNbdZSFj bR94GM5IVdbcA== From: Bjorn Helgaas To: Eric Biederman , Dave Hansen Cc: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H . Peter Anvin" , Baoquan He , x86@kernel.org, kexec@lists.infradead.org, linux-kernel@vger.kernel.org, Bjorn Helgaas Subject: [PATCH v2 2/2] kexec: Remove unnecessary arch_kexec_kernel_image_load() Date: Tue, 7 Mar 2023 16:44:16 -0600 Message-Id: <20230307224416.907040-3-helgaas@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230307224416.907040-1-helgaas@kernel.org> References: <20230307224416.907040-1-helgaas@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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759751024880767705?= X-GMAIL-MSGID: =?utf-8?q?1759751024880767705?= From: Bjorn Helgaas arch_kexec_kernel_image_load() only calls kexec_image_load_default(), and there are no arch-specific implementations. Remove the unnecessary arch_kexec_kernel_image_load() and make kexec_image_load_default() static. No functional change intended. Signed-off-by: Bjorn Helgaas Reviewed-by: Simon Horman --- include/linux/kexec.h | 6 ------ kernel/kexec_file.c | 6 +++--- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/include/linux/kexec.h b/include/linux/kexec.h index 4746bc9d39c9..22b5cd24f581 100644 --- a/include/linux/kexec.h +++ b/include/linux/kexec.h @@ -190,7 +190,6 @@ int kexec_purgatory_get_set_symbol(struct kimage *image, const char *name, void *buf, unsigned int size, bool get_value); void *kexec_purgatory_get_symbol_addr(struct kimage *image, const char *name); -void *kexec_image_load_default(struct kimage *image); #ifndef arch_kexec_kernel_image_probe static inline int @@ -207,11 +206,6 @@ static inline int arch_kimage_file_post_load_cleanup(struct kimage *image) } #endif -static inline void *arch_kexec_kernel_image_load(struct kimage *image) -{ - return kexec_image_load_default(image); -} - #ifdef CONFIG_KEXEC_SIG #ifdef CONFIG_SIGNED_PE_FILE_VERIFICATION int kexec_kernel_verify_pe_sig(const char *kernel, unsigned long kernel_len); diff --git a/kernel/kexec_file.c b/kernel/kexec_file.c index f1a0e4e3fb5c..f989f5f1933b 100644 --- a/kernel/kexec_file.c +++ b/kernel/kexec_file.c @@ -65,7 +65,7 @@ int kexec_image_probe_default(struct kimage *image, void *buf, return ret; } -void *kexec_image_load_default(struct kimage *image) +static void *kexec_image_load_default(struct kimage *image) { if (!image->fops || !image->fops->load) return ERR_PTR(-ENOEXEC); @@ -249,8 +249,8 @@ kimage_file_prepare_segments(struct kimage *image, int kernel_fd, int initrd_fd, /* IMA needs to pass the measurement list to the next kernel. */ ima_add_kexec_buffer(image); - /* Call arch image load handlers */ - ldata = arch_kexec_kernel_image_load(image); + /* Call image load handler */ + ldata = kexec_image_load_default(image); if (IS_ERR(ldata)) { ret = PTR_ERR(ldata);