From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f202.google.com (mail-pg1-f202.google.com [209.85.215.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5EBFA27EC71 for ; Fri, 11 Apr 2025 05:38:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.202 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744349914; cv=none; b=mTK6a/JWp63Mf5UWnrImYKC5w+HAzSFR4TMf3uvjVPwfldR3PRcHA23RKa1mMTnRuqK8lhJiQJhDT77dy7M47QhAt5aeGaeS+kynXjuWa2luDYQMCNGpkJoYwZvFHYyy4d1Vz8iF51y9hzoZXTZENG6gJy5bMvkxcGwe/vczNzw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744349914; c=relaxed/simple; bh=YiiAb9NH0JSzf8jBgboPiLLQFP4+06VXLullrxZgNhI=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=fCmhmX5pxQUUyV3brCbNB0h62C2mOPjy8yNeC9bj4oRUI0ixsZILMjIXn4ZAa89CvoS0LXGBd0b1wiOZDgiKdLW8hwrNa3hqTmjT4mWFQqOTCjW6xzfZ6LPHJ+E+dytHYDCu6t0Ht6fJmPoO+qEmT+tPOe7x506/VAAW1DzVlws= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--changyuanl.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=3kN5CsCG; arc=none smtp.client-ip=209.85.215.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--changyuanl.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="3kN5CsCG" Received: by mail-pg1-f202.google.com with SMTP id 41be03b00d2f7-af423fb4f0eso1095492a12.0 for ; Thu, 10 Apr 2025 22:38:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1744349911; x=1744954711; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=NQ4ycF7gsLT06FnekoMeMnv8oicyD3TdT/CesWgek8A=; b=3kN5CsCG/PUdwWr4xNB8QLp7RunrGDLcK33+ThHIGdaeOW/5xUTWA+K70v8MJ7CQGT cr6Ify33EBMxNh6c6RR2WifHxlV/uO869vc/AHPjfgZmdbm1jYkw1KHZCsAKlhs+z0st eaFJuJf6+dqw9a8GoVOIQ044qDWKMnINBT9mmKHGLlYzAVdWjnzxbQqw7TD+V0FQ+qnp 5WBvlngDwHjBMfnW5/HxpMeJMuNcWmOD68E5mFZEMl90t6hVzC17oWafTcRfOn1tVt4t pqBHUkQ0GhYqlKM8Ax9wCBITex5KiuNYSCduXdITbdgnbuFUThGqXVNrQP6AUyTNJKQR v/nA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744349911; x=1744954711; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=NQ4ycF7gsLT06FnekoMeMnv8oicyD3TdT/CesWgek8A=; b=rUtCfR4/TLACuolgWXJ40fZyjlFz7S+twBRGphHlMuGlEH6cVMApF9VNNlisvyfaAj huEUJtd7TBRzHVI83TQFKabdniKGAAkFP3DTil5Mi3qMherOXNCBtrJ6ljiz9k8R/M2S kxMCpCTy6fCA8yZsXvuH/tWYeXqh+7tmtn6pi7IQg273TNp/efFl1okwlphFawzLo6My 7XnwJlwmbC5pSIXg/2KXJByMRV6hdB/WQX3GzJ0kvGu1ZPHMXOq0VXpk3MQwW5Z2kdep CYP/CwugigMzt0+yFT2G88BSIab5Gyx3gHN9OBNoyl0uJWTdZzV9dtxhtuMs1CSX0+Xf euRA== X-Gm-Message-State: AOJu0YztinByTaFEzsjJbbbiSwGqEdlmDmUPMNhfdCxjpr60HttYpmip bq8in2RjNeOBMaxg+nnISFeiAz8jPeGc61TYh2bUh+lfpaDNVA4WPlBFqY36tG0PO/uwEqHN21W aw/eCFPokwTnAPVCbdfN28txy003R9sNecYJi0i67/uTvP8225UutezRyOqXmv4SK2vChzezqI7 fhOGOCjJErTbD+bPpmtX8dxAeKVlUg5bq7mEb7x7UutKbia4CtnvYg0eZW6BPbZg== X-Google-Smtp-Source: AGHT+IFmHMamHSCxGJ9jONFAPmV1A91iPoS28bApZs3vQoT8HryanIff8vx754Cryl7fBwGV08e16HC+nkdncy1g X-Received: from plcc1.prod.google.com ([2002:a17:902:c1c1:b0:220:da6b:5d08]) (user=changyuanl job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:f705:b0:220:e9ac:e746 with SMTP id d9443c01a7336-22bea4fdc7amr25793305ad.53.1744349911576; Thu, 10 Apr 2025 22:38:31 -0700 (PDT) Date: Thu, 10 Apr 2025 22:37:38 -0700 In-Reply-To: <20250411053745.1817356-1-changyuanl@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250411053745.1817356-1-changyuanl@google.com> X-Mailer: git-send-email 2.49.0.604.gff1f9ca942-goog Message-ID: <20250411053745.1817356-8-changyuanl@google.com> Subject: [PATCH v6 07/14] kexec: add KHO support to kexec file loads From: Changyuan Lyu To: linux-kernel@vger.kernel.org Cc: akpm@linux-foundation.org, anthony.yznaga@oracle.com, arnd@arndb.de, ashish.kalra@amd.com, benh@kernel.crashing.org, bp@alien8.de, catalin.marinas@arm.com, corbet@lwn.net, dave.hansen@linux.intel.com, devicetree@vger.kernel.org, dwmw2@infradead.org, ebiederm@xmission.com, graf@amazon.com, hpa@zytor.com, jgowans@amazon.com, kexec@lists.infradead.org, krzk@kernel.org, linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org, linux-mm@kvack.org, luto@kernel.org, mark.rutland@arm.com, mingo@redhat.com, pasha.tatashin@soleen.com, pbonzini@redhat.com, peterz@infradead.org, ptyadav@amazon.de, robh@kernel.org, rostedt@goodmis.org, rppt@kernel.org, saravanak@google.com, skinsburskii@linux.microsoft.com, tglx@linutronix.de, thomas.lendacky@amd.com, will@kernel.org, x86@kernel.org, Changyuan Lyu Content-Type: text/plain; charset="UTF-8" From: Alexander Graf Kexec has 2 modes: A user space driven mode and a kernel driven mode. For the kernel driven mode, kernel code determines the physical addresses of all target buffers that the payload gets copied into. With KHO, we can only safely copy payloads into the "scratch area". Teach the kexec file loader about it, so it only allocates for that area. In addition, enlighten it with support to ask the KHO subsystem for its respective payloads to copy into target memory. Also teach the KHO subsystem how to fill the images for file loads. Signed-off-by: Alexander Graf Co-developed-by: Mike Rapoport (Microsoft) Signed-off-by: Mike Rapoport (Microsoft) Co-developed-by: Changyuan Lyu Signed-off-by: Changyuan Lyu --- include/linux/kexec.h | 7 +++++ kernel/kexec_file.c | 13 ++++++++ kernel/kexec_handover.c | 67 +++++++++++++++++++++++++++++++++++++++++ kernel/kexec_internal.h | 16 ++++++++++ 4 files changed, 103 insertions(+) diff --git a/include/linux/kexec.h b/include/linux/kexec.h index c8971861521a5..d3cad108b8076 100644 --- a/include/linux/kexec.h +++ b/include/linux/kexec.h @@ -371,6 +371,13 @@ struct kimage { size_t ima_buffer_size; #endif +#ifdef CONFIG_KEXEC_HANDOVER + struct { + struct kexec_segment *scratch; + phys_addr_t fdt; + } kho; +#endif + /* Core ELF header buffer */ void *elf_headers; unsigned long elf_headers_sz; diff --git a/kernel/kexec_file.c b/kernel/kexec_file.c index fba686487e3b5..77758c5331229 100644 --- a/kernel/kexec_file.c +++ b/kernel/kexec_file.c @@ -253,6 +253,11 @@ 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); + /* If KHO is active, add its images to the list */ + ret = kho_fill_kimage(image); + if (ret) + goto out; + /* Call image load handler */ ldata = kexec_image_load_default(image); @@ -648,6 +653,14 @@ int kexec_locate_mem_hole(struct kexec_buf *kbuf) if (kbuf->mem != KEXEC_BUF_MEM_UNKNOWN) return 0; + /* + * If KHO is active, only use KHO scratch memory. All other memory + * could potentially be handed over. + */ + ret = kho_locate_mem_hole(kbuf, locate_mem_hole_callback); + if (ret <= 0) + return ret; + if (!IS_ENABLED(CONFIG_ARCH_KEEP_MEMBLOCK)) ret = kexec_walk_resources(kbuf, locate_mem_hole_callback); else diff --git a/kernel/kexec_handover.c b/kernel/kexec_handover.c index a594da2a22912..4bbc6f5ef7230 100644 --- a/kernel/kexec_handover.c +++ b/kernel/kexec_handover.c @@ -23,6 +23,7 @@ * internal APIs. */ #include "../mm/internal.h" +#include "kexec_internal.h" #define KHO_FDT_COMPATIBLE "kho-v1" #define PROP_PRESERVED_MEMORY_MAP "preserved-memory-map" @@ -1184,3 +1185,69 @@ void __init kho_populate(phys_addr_t fdt_phys, u64 fdt_len, if (err) pr_warn("disabling KHO revival: %d\n", err); } + +/* Helper functions for kexec_file_load */ + +int kho_fill_kimage(struct kimage *image) +{ + ssize_t scratch_size; + int err = 0; + struct kexec_buf scratch; + + if (!kho_enable) + return 0; + + image->kho.fdt = page_to_phys(kho_out.ser.fdt); + + scratch_size = sizeof(*kho_scratch) * kho_scratch_cnt; + scratch = (struct kexec_buf){ + .image = image, + .buffer = kho_scratch, + .bufsz = scratch_size, + .mem = KEXEC_BUF_MEM_UNKNOWN, + .memsz = scratch_size, + .buf_align = SZ_64K, /* Makes it easier to map */ + .buf_max = ULONG_MAX, + .top_down = true, + }; + err = kexec_add_buffer(&scratch); + if (err) + return err; + image->kho.scratch = &image->segment[image->nr_segments - 1]; + + return 0; +} + +static int kho_walk_scratch(struct kexec_buf *kbuf, + int (*func)(struct resource *, void *)) +{ + int ret = 0; + int i; + + for (i = 0; i < kho_scratch_cnt; i++) { + struct resource res = { + .start = kho_scratch[i].addr, + .end = kho_scratch[i].addr + kho_scratch[i].size - 1, + }; + + /* Try to fit the kimage into our KHO scratch region */ + ret = func(&res, kbuf); + if (ret) + break; + } + + return ret; +} + +int kho_locate_mem_hole(struct kexec_buf *kbuf, + int (*func)(struct resource *, void *)) +{ + int ret; + + if (!kho_enable || kbuf->image->type == KEXEC_TYPE_CRASH) + return 1; + + ret = kho_walk_scratch(kbuf, func); + + return ret == 1 ? 0 : -EADDRNOTAVAIL; +} diff --git a/kernel/kexec_internal.h b/kernel/kexec_internal.h index d35d9792402d1..30a733a55a67b 100644 --- a/kernel/kexec_internal.h +++ b/kernel/kexec_internal.h @@ -39,4 +39,20 @@ extern size_t kexec_purgatory_size; #else /* CONFIG_KEXEC_FILE */ static inline void kimage_file_post_load_cleanup(struct kimage *image) { } #endif /* CONFIG_KEXEC_FILE */ + +struct kexec_buf; + +#ifdef CONFIG_KEXEC_HANDOVER +int kho_locate_mem_hole(struct kexec_buf *kbuf, + int (*func)(struct resource *, void *)); +int kho_fill_kimage(struct kimage *image); +#else +static inline int kho_locate_mem_hole(struct kexec_buf *kbuf, + int (*func)(struct resource *, void *)) +{ + return 1; +} + +static inline int kho_fill_kimage(struct kimage *image) { return 0; } +#endif /* CONFIG_KEXEC_HANDOVER */ #endif /* LINUX_KEXEC_INTERNAL_H */ -- 2.49.0.604.gff1f9ca942-goog