Received: by 2002:a05:6358:d09b:b0:dc:cd0c:909e with SMTP id jc27csp1009589rwb; Tue, 29 Nov 2022 07:57:42 -0800 (PST) X-Google-Smtp-Source: AA0mqf4BQGGHBM1Uuh85I6Hn6dzW3bs/XGQ51ycEJDyBKXXGx9Sy8LmarNpq7rJoVju5DRazqDTd X-Received: by 2002:a17:902:d0d4:b0:189:9b43:a085 with SMTP id n20-20020a170902d0d400b001899b43a085mr4158100pln.169.1669737462307; Tue, 29 Nov 2022 07:57:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669737462; cv=none; d=google.com; s=arc-20160816; b=MsHbOXnAYR/R6assEraA0gIw9tgj6EQZu9uFOsnlTtOl04Jf4JubjR8PXltA9YQYiM Vcs20+y5iVsHIGCLE/ShF9MUSn7O5mJ9hfjYc7y4APgWyKVZXbHyu4gld35eZQEX2e2L qE3BQFVYsIGTKuEDtB3Ku0AvBWmFscQ34EneKKMWNXMhzWErJ9gGH5V5rQmWP8VIfHfU aP9jk3nTv6UcO5KFuX3N8VgMy7K8p3lY/lcr5aJwTuxApzqIsafWBLXLovbXIt5NnjUk pjZwsTfrI7/cwTAE/0zameNTVOnbmOLj+nJ0NyBi6YR69bH5qFcQ1dS5rW4+1lK57cP6 JyAA== 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 :organization:references:in-reply-to:message-id:subject:cc:to:from :date:dkim-signature; bh=G+0yRb77ltoQSc2X37cXpOsUdhALm0i+PbnCV2ZbJ+8=; b=IfEljomZjV5lZOA5O6P43AypOJIPqRl1vrXUyBew3AjnGj1gMM++mP0T8gZSdjKfkr 2JcMbDoFVFDYaDidFbsdaTWZdXLkzOSbU0dHKHXEOhDssFa3vWBCrEl2xhLL5AeggWAk ec8I3fEM+qhjLmCc/V5392xMVfUl9+P9c6/q7PGvyAG8SvmaA2vmZw6GOYCJQxCa6cfk MZu2rFf5/ruurv9kCzEKNro7+5bu5r/uPuJcKFhLY80t4iQsNUvjNykXLhX+SP8GCFCn GBk9c98WP8fBK87UU0AZdk8tuD3w20Pvlc/JRzxR0VjX5ERMPdz/BFjAcviyrV5/EmhX 3AUQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=akg+put8; 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=redhat.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j30-20020a63595e000000b0046f59be9bebsi14923427pgm.102.2022.11.29.07.57.30; Tue, 29 Nov 2022 07:57:42 -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=@redhat.com header.s=mimecast20190719 header.b=akg+put8; 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=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234739AbiK2PN7 (ORCPT + 84 others); Tue, 29 Nov 2022 10:13:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42184 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229693AbiK2PN4 (ORCPT ); Tue, 29 Nov 2022 10:13:56 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C2113B05 for ; Tue, 29 Nov 2022 07:12:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669734776; 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: in-reply-to:in-reply-to:references:references; bh=G+0yRb77ltoQSc2X37cXpOsUdhALm0i+PbnCV2ZbJ+8=; b=akg+put82K++M839WNi3ClhGy1Ni/4B6xVmrvb+OMFlX1SwfJcdnc6GxOpVB0L871lbIQv CcajgPKglyc+Y1xPYhoFLHt/BW+h6RCAqYCfByH6qK1czZz7h0YRKEhD7dtplFcduG+duf nUFo1ESxjRo1AAC2XYq3pJn6DAIYw2g= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-357-rQxRq_AMN3S0SPWQ2cOZTQ-1; Tue, 29 Nov 2022 10:12:51 -0500 X-MC-Unique: rQxRq_AMN3S0SPWQ2cOZTQ-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C27638339C6; Tue, 29 Nov 2022 15:12:50 +0000 (UTC) Received: from rotkaeppchen (unknown [10.39.192.193]) by smtp.corp.redhat.com (Postfix) with ESMTP id 86063492B07; Tue, 29 Nov 2022 15:12:48 +0000 (UTC) Date: Tue, 29 Nov 2022 16:12:44 +0100 From: Philipp Rudo To: Ricardo Ribalda Cc: Eric Biederman , Baoquan He , Sergey Senozhatsky , Ross Zwisler , kexec@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] kexec: Enable runtime allocation of crash_image Message-ID: <20221129161244.7ecf59e5@rotkaeppchen> In-Reply-To: References: <20221124-kexec-noalloc-v1-0-d78361e99aec@chromium.org> <20221128180003.49747650@rotkaeppchen> Organization: Red Hat inc. MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE 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 Ricardo, On Mon, 28 Nov 2022 18:07:06 +0100 Ricardo Ribalda wrote: > Hi Philipp > > > Thanks for your review. > > > On Mon, 28 Nov 2022 at 18:00, Philipp Rudo wrote: > > > > Hi Ricardo, > > > > On Thu, 24 Nov 2022 23:23:36 +0100 > > Ricardo Ribalda wrote: > > > > > Usually crash_image is defined statically via the crashkernel parameter > > > or DT. > > > > > > But if the crash kernel is not used, or is smaller than then > > > area pre-allocated that memory is wasted. > > > > > > Also, if the crash kernel was not defined at bootime, there is no way to > > > use the crash kernel. > > > > > > Enable runtime allocation of the crash_image if the crash_image is not > > > defined statically. Following the same memory allocation/validation path > > > that for the reboot kexec kernel. > > > > > > Signed-off-by: Ricardo Ribalda > > > > I don't think this patch will work as intended. For one you omit > > setting the image->type to KEXEC_TYPE_CRASH. But when you grep for that > > type you will find that there is a lot of special handling done for it. > > I don't believe that this can simply be skipped without causing > > problems. > > > > Furthermore I think you have missed one important detail. The memory > > reserved for the crash kernel is not just a buffer for the image but > > the memory it runs in! For that it has to be a continuous piece of > > physical memory with usually some additional arch specific limitations. > > When allocated dynamically all those limitations need to be considered. > > But a standard kexec doesn't care about those limitations as it doesn't > > care about the os running before itself. It can simply overwrite the > > memory when booting. But if the crash kernel does the same it will > > corrupt the dump it is supposed to generate. > > Right now, I do not intend to use it to fetch a kdump, I am using it > as the image that will run when the system crashes. the crash_image is currently all about creating a dump. If you want to change that you need to discuss the new behavior in the commit message! Please update the commit message. Thanks Philipp > > It seems to work fine on the two devices that I am using for tests. > > > > > Thanks > > Philipp > > > > > --- > > > kexec: Enable runtime allocation of crash_image > > > > > > To: Eric Biederman > > > Cc: kexec@lists.infradead.org > > > Cc: linux-kernel@vger.kernel.org > > > Cc: Sergey Senozhatsky > > > Cc: linux-kernel@vger.kernel.org > > > Cc: Ross Zwisler > > > Cc: Philipp Rudo > > > Cc: Baoquan He > > > --- > > > include/linux/kexec.h | 1 + > > > kernel/kexec.c | 9 +++++---- > > > kernel/kexec_core.c | 5 +++++ > > > kernel/kexec_file.c | 7 ++++--- > > > 4 files changed, 15 insertions(+), 7 deletions(-) > > > > > > diff --git a/include/linux/kexec.h b/include/linux/kexec.h > > > index 41a686996aaa..98ca9a32bc8e 100644 > > > --- a/include/linux/kexec.h > > > +++ b/include/linux/kexec.h > > > @@ -427,6 +427,7 @@ extern int kexec_load_disabled; > > > extern bool kexec_in_progress; > > > > > > int crash_shrink_memory(unsigned long new_size); > > > +bool __crash_memory_valid(void); > > > ssize_t crash_get_memory_size(void); > > > > > > #ifndef arch_kexec_protect_crashkres > > > diff --git a/kernel/kexec.c b/kernel/kexec.c > > > index cb8e6e6f983c..b5c17db25e88 100644 > > > --- a/kernel/kexec.c > > > +++ b/kernel/kexec.c > > > @@ -28,7 +28,7 @@ static int kimage_alloc_init(struct kimage **rimage, unsigned long entry, > > > struct kimage *image; > > > bool kexec_on_panic = flags & KEXEC_ON_CRASH; > > > > > > - if (kexec_on_panic) { > > > + if (kexec_on_panic && __crash_memory_valid()) { > > > /* Verify we have a valid entry point */ > > > if ((entry < phys_to_boot_phys(crashk_res.start)) || > > > (entry > phys_to_boot_phys(crashk_res.end))) > > > @@ -44,7 +44,7 @@ static int kimage_alloc_init(struct kimage **rimage, unsigned long entry, > > > image->nr_segments = nr_segments; > > > memcpy(image->segment, segments, nr_segments * sizeof(*segments)); > > > > > > - if (kexec_on_panic) { > > > + if (kexec_on_panic && __crash_memory_valid()) { > > > /* Enable special crash kernel control page alloc policy. */ > > > image->control_page = crashk_res.start; > > > image->type = KEXEC_TYPE_CRASH; > > > @@ -101,7 +101,7 @@ static int do_kexec_load(unsigned long entry, unsigned long nr_segments, > > > > > > if (flags & KEXEC_ON_CRASH) { > > > dest_image = &kexec_crash_image; > > > - if (kexec_crash_image) > > > + if (kexec_crash_image && __crash_memory_valid()) > > > arch_kexec_unprotect_crashkres(); > > > } else { > > > dest_image = &kexec_image; > > > @@ -157,7 +157,8 @@ static int do_kexec_load(unsigned long entry, unsigned long nr_segments, > > > image = xchg(dest_image, image); > > > > > > out: > > > - if ((flags & KEXEC_ON_CRASH) && kexec_crash_image) > > > + if ((flags & KEXEC_ON_CRASH) && kexec_crash_image && > > > + __crash_memory_valid()) > > > arch_kexec_protect_crashkres(); > > > > > > kimage_free(image); > > > diff --git a/kernel/kexec_core.c b/kernel/kexec_core.c > > > index ca2743f9c634..77083c9760fb 100644 > > > --- a/kernel/kexec_core.c > > > +++ b/kernel/kexec_core.c > > > @@ -1004,6 +1004,11 @@ void crash_kexec(struct pt_regs *regs) > > > } > > > } > > > > > > +bool __crash_memory_valid(void) > > > +{ > > > + return crashk_res.end != crashk_res.start; > > > +} > > > + > > > ssize_t crash_get_memory_size(void) > > > { > > > ssize_t size = 0; > > > diff --git a/kernel/kexec_file.c b/kernel/kexec_file.c > > > index 45637511e0de..0671f4f370ff 100644 > > > --- a/kernel/kexec_file.c > > > +++ b/kernel/kexec_file.c > > > @@ -280,7 +280,7 @@ kimage_file_alloc_init(struct kimage **rimage, int kernel_fd, > > > > > > image->file_mode = 1; > > > > > > - if (kexec_on_panic) { > > > + if (kexec_on_panic && __crash_memory_valid()) { > > > /* Enable special crash kernel control page alloc policy. */ > > > image->control_page = crashk_res.start; > > > image->type = KEXEC_TYPE_CRASH; > > > @@ -345,7 +345,7 @@ SYSCALL_DEFINE5(kexec_file_load, int, kernel_fd, int, initrd_fd, > > > dest_image = &kexec_image; > > > if (flags & KEXEC_FILE_ON_CRASH) { > > > dest_image = &kexec_crash_image; > > > - if (kexec_crash_image) > > > + if (kexec_crash_image && __crash_memory_valid()) > > > arch_kexec_unprotect_crashkres(); > > > } > > > > > > @@ -408,7 +408,8 @@ SYSCALL_DEFINE5(kexec_file_load, int, kernel_fd, int, initrd_fd, > > > exchange: > > > image = xchg(dest_image, image); > > > out: > > > - if ((flags & KEXEC_FILE_ON_CRASH) && kexec_crash_image) > > > + if ((flags & KEXEC_FILE_ON_CRASH) && kexec_crash_image && > > > + __crash_memory_valid()) > > > arch_kexec_protect_crashkres(); > > > > > > kexec_unlock(); > > > > > > --- > > > base-commit: 4312098baf37ee17a8350725e6e0d0e8590252d4 > > > change-id: 20221124-kexec-noalloc-3cab3cbe000f > > > > > > Best regards, > > > >