Received: by 2002:a05:6a10:c7c6:0:0:0:0 with SMTP id h6csp1953687pxy; Mon, 2 Aug 2021 14:58:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzS0Q1IJ83OZBX0j6jJQvSWEza+hJzghw25UOs41Ggtlv4g3x3osgyOwF1JpP/44H3DDrkX X-Received: by 2002:a05:6402:13cb:: with SMTP id a11mr11504480edx.333.1627941519582; Mon, 02 Aug 2021 14:58:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627941519; cv=none; d=google.com; s=arc-20160816; b=QHKQ/j3AVlTGfz2fPoVQ0BcOn38q6mLYDBvGKuHoRVpdRMrNQnXAT1FrStg+72+Rcy MjtBhIfrXkmcAGd+Jdivkv17rPAMaVahKrYd70JUZ2Kcl/trjisCvJeYqA9fJ/NdqEKV rTa8K2UcZ12Xm70SQDSWjmpR/ibq8oxwB4Yn5vQmnZITVL6rF2KiZccIWBI0DFjjXr5F adCOnKAh6e6U7/RbU+r5NfDiHAo7M0LBaalpSBv5oLllgfj/FJU1msptdNwjLjthwKp2 RPXtrgFFJBkkWhaplcVyVFjBg9rC3gW5lukZw7fLxlBbSW+oOCdkkdLP7gYqpLKgKSwo DpoA== 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:to:from :dkim-signature; bh=I2QiiBKBeLsI1fdTqHUVs6c3pFiCblpNdzxEe7/cZMQ=; b=ptV/xCoVnNeTV5Q4eV23gQvT2g09bF8phwqDzgHlxvlNwHXP6c1KS4NRq94m9frMUS 5xtxVBkOySllf92ZJK0V97rpcuHB8LMpUY6/ONz/xBI0mlqdnS8EWgToiWqQcxidwieR yjnELzSlifhGhl2R10Uz4iCKOOE9j2lJnqCzoWZlN/fE5iI+553Wmr+XUhM0Y6/s1TOr 2g6HKoZgkn2hynFOuHjmPIbBMrqv8jc6kGrjiEK4lhX4687oYo8KHW/dqmfvV0BwEvaT p79KbFi9z+erN8lkzPskvrwOpOx80+TC0b3Ob9rfOuvtOQ9la/XJzrlX+hjQ9G7F8ghd Lvrw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@soleen.com header.s=google header.b="C5ZCA/IZ"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id h12si11151894ejd.412.2021.08.02.14.58.17; Mon, 02 Aug 2021 14:58:39 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@soleen.com header.s=google header.b="C5ZCA/IZ"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233207AbhHBVyo (ORCPT + 99 others); Mon, 2 Aug 2021 17:54:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47300 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232981AbhHBVyc (ORCPT ); Mon, 2 Aug 2021 17:54:32 -0400 Received: from mail-qk1-x733.google.com (mail-qk1-x733.google.com [IPv6:2607:f8b0:4864:20::733]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8ABC9C06179E for ; Mon, 2 Aug 2021 14:54:21 -0700 (PDT) Received: by mail-qk1-x733.google.com with SMTP id t66so18180566qkb.0 for ; Mon, 02 Aug 2021 14:54:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=soleen.com; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=I2QiiBKBeLsI1fdTqHUVs6c3pFiCblpNdzxEe7/cZMQ=; b=C5ZCA/IZXtCXO/3qfEOXbzGTv9RX4OeD13DHyBOfI9sDrZQZp6vdHaWPVlbKwU1Re8 xipuVWmrEMo9evAXLt1MFogXl5HcbQt53L5FDp+KRxwVC554PuDw2TeM5JdQqK83o73v iGIevs6zJfYWGAaSAIXVMnK8nUygXOm3T/cD0qNnFTwsBTHwGsH+aaDT3dadEB55C6Bw aLxpimreTpXY5tDDsImOXM+B484WwN/gF46Z8FyEtUPnrhwEXsUPLfJaenEAS8i8uFEy D7FPQ3bT229af0quUj3i5LRFb5UMw1x5lUeCvEKChQ7q/j8MpxEtjz674tIrMyL63oOe liYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=I2QiiBKBeLsI1fdTqHUVs6c3pFiCblpNdzxEe7/cZMQ=; b=Uoe9mPHNiIJC4dKdZzhzAYRFkt6xtLufyY0FQX+fkla3NwHmxDIOM6ML50vRhBk5uk 65vipX1KssFrIHwAQOadOuB0Xr7KX0tuyCtfKgI747HwwDvrmWE+cl7rpgBajIoWxP/c Kf5FRye9S45oci6Z22lFtesRHHJri5sOGlseyF121+nAUs0Z5jG5KMfwpCbnhI7w6Hi1 QRV2RXjg9h9gPu2AeD5ZqOYAU8vTp52nXCHiPPQTaQpdZbI4O0OIc8m+efvwZxAE4y1L 3jbv4I44XnDjXf1fJ/h93yySy34JoPY9laE+kJlTBsCD50AvYluW4M5LCkvrBtjrgzZ+ WWzA== X-Gm-Message-State: AOAM5316bVgrf6PIKLof016wxCt78bA77jbxXNkmbh91iUu5/3YUOKOS d4jNLQAJCRNdWoyy1qSvo7ud/g== X-Received: by 2002:a05:620a:893:: with SMTP id b19mr17708637qka.487.1627941260749; Mon, 02 Aug 2021 14:54:20 -0700 (PDT) Received: from localhost.localdomain (c-73-69-118-222.hsd1.nh.comcast.net. [73.69.118.222]) by smtp.gmail.com with ESMTPSA id v11sm5479216qtc.0.2021.08.02.14.54.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Aug 2021 14:54:20 -0700 (PDT) From: Pavel Tatashin To: pasha.tatashin@soleen.com, jmorris@namei.org, sashal@kernel.org, ebiederm@xmission.com, kexec@lists.infradead.org, linux-kernel@vger.kernel.org, corbet@lwn.net, catalin.marinas@arm.com, will@kernel.org, linux-arm-kernel@lists.infradead.org, maz@kernel.org, james.morse@arm.com, vladimir.murzin@arm.com, matthias.bgg@gmail.com, linux-mm@kvack.org, mark.rutland@arm.com, steve.capper@arm.com, rfontana@redhat.com, tglx@linutronix.de, selindag@gmail.com, tyhicks@linux.microsoft.com, kernelfans@gmail.com, akpm@linux-foundation.org, madvenka@linux.microsoft.com Subject: [PATCH v16 07/15] arm64: kexec: pass kimage as the only argument to relocation function Date: Mon, 2 Aug 2021 17:54:00 -0400 Message-Id: <20210802215408.804942-8-pasha.tatashin@soleen.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210802215408.804942-1-pasha.tatashin@soleen.com> References: <20210802215408.804942-1-pasha.tatashin@soleen.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Currently, kexec relocation function (arm64_relocate_new_kernel) accepts the following arguments: head: start of array that contains relocation information. entry: entry point for new kernel or purgatory. dtb_mem: first and only argument to entry. The number of arguments cannot be easily expended, because this function is also called from HVC_SOFT_RESTART, which preserves only three arguments. And, also arm64_relocate_new_kernel is written in assembly but called without stack, thus no place to move extra arguments to free registers. Soon, we will need to pass more arguments: once we enable MMU we will need to pass information about page tables. Pass kimage to arm64_relocate_new_kernel, and teach it to get the required fields from kimage. Signed-off-by: Pavel Tatashin --- arch/arm64/kernel/asm-offsets.c | 7 +++++++ arch/arm64/kernel/machine_kexec.c | 7 +++++-- arch/arm64/kernel/relocate_kernel.S | 10 ++++------ 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/arch/arm64/kernel/asm-offsets.c b/arch/arm64/kernel/asm-offsets.c index c85670692afa..b41409b09d04 100644 --- a/arch/arm64/kernel/asm-offsets.c +++ b/arch/arm64/kernel/asm-offsets.c @@ -9,6 +9,7 @@ #include #include +#include #include #include #include @@ -170,6 +171,12 @@ int main(void) DEFINE(PTRAUTH_KERNEL_KEY_APIA, offsetof(struct ptrauth_keys_kernel, apia)); #endif BLANK(); +#endif +#ifdef CONFIG_KEXEC_CORE + DEFINE(KIMAGE_ARCH_DTB_MEM, offsetof(struct kimage, arch.dtb_mem)); + DEFINE(KIMAGE_HEAD, offsetof(struct kimage, head)); + DEFINE(KIMAGE_START, offsetof(struct kimage, start)); + BLANK(); #endif return 0; } diff --git a/arch/arm64/kernel/machine_kexec.c b/arch/arm64/kernel/machine_kexec.c index 7f1cb5a2a463..e210b19592c6 100644 --- a/arch/arm64/kernel/machine_kexec.c +++ b/arch/arm64/kernel/machine_kexec.c @@ -84,6 +84,9 @@ static void kexec_list_flush(struct kimage *kimage) { kimage_entry_t *entry; + dcache_clean_inval_poc((unsigned long)kimage, + (unsigned long)kimage + sizeof(*kimage)); + for (entry = &kimage->head; ; entry++) { unsigned int flag; unsigned long addr; @@ -206,8 +209,8 @@ void machine_kexec(struct kimage *kimage) restart(is_hyp_nvhe(), kimage->start, kimage->arch.dtb_mem, 0, 0); } else { - cpu_soft_restart(kimage->arch.kern_reloc, kimage->head, - kimage->start, kimage->arch.dtb_mem); + cpu_soft_restart(kimage->arch.kern_reloc, virt_to_phys(kimage), + 0, 0); } BUG(); /* Should never get here. */ diff --git a/arch/arm64/kernel/relocate_kernel.S b/arch/arm64/kernel/relocate_kernel.S index 8c43779e8cc6..63ea19868f63 100644 --- a/arch/arm64/kernel/relocate_kernel.S +++ b/arch/arm64/kernel/relocate_kernel.S @@ -27,9 +27,7 @@ */ SYM_CODE_START(arm64_relocate_new_kernel) /* Setup the list loop variables. */ - mov x18, x2 /* x18 = dtb address */ - mov x17, x1 /* x17 = kimage_start */ - mov x16, x0 /* x16 = kimage_head */ + ldr x16, [x0, #KIMAGE_HEAD] /* x16 = kimage_head */ mov x14, xzr /* x14 = entry ptr */ mov x13, xzr /* x13 = copy dest */ raw_dcache_line_size x15, x1 /* x15 = dcache line size */ @@ -63,12 +61,12 @@ SYM_CODE_START(arm64_relocate_new_kernel) isb /* Start new image. */ - mov x0, x18 + ldr x4, [x0, #KIMAGE_START] /* relocation start */ + ldr x0, [x0, #KIMAGE_ARCH_DTB_MEM] /* dtb address */ mov x1, xzr mov x2, xzr mov x3, xzr - br x17 - + br x4 SYM_CODE_END(arm64_relocate_new_kernel) .align 3 /* To keep the 64-bit values below naturally aligned. */ -- 2.25.1