From patchwork Thu Sep 30 14:31:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pasha Tatashin X-Patchwork-Id: 12528549 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7F269C433F5 for ; Thu, 30 Sep 2021 14:38:01 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4DB9D61A07 for ; Thu, 30 Sep 2021 14:38:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 4DB9D61A07 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=soleen.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Cc:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=zcROrQW9PHOD7hTfffP+7NZcTZuZPVZ7Rckqmvi26Qo=; b=VoZ+XFD9ejS/SV hbLGvnvBc4PWxtidhK+yjKRxetrIu09lEtBotWlxLATvms1YMr1BOhpkNfK6qtDqRNGBembE1dTOf vdwEQ22/zNJkVi1Ygk2/whm9HTVLlmmoMH6Oid0iC2YHg+eAhs8EE7Q5+XX0uzXdjpCYT1w4OgeG2 PHA8d27Ozsc7FcuuSq2R95pZsiEv+XqKcD2qUPiHa0wmrDMtwLl4lZiaNQpHFEZ/WieJfSde+rXeb ZzI8zt3oKWyCi4ZwQu9EhPg2kaFPYQ/YjAq4EOpzv9G5XEIzYlpzcceVGgalKyuy/ByWWF7REFu7Y ucKNdoq+7f/sr+SdDivQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mVx9G-00Ej8U-Pw; Thu, 30 Sep 2021 14:35:00 +0000 Received: from mail-qt1-x831.google.com ([2607:f8b0:4864:20::831]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mVx5o-00EhRa-Dj for linux-arm-kernel@lists.infradead.org; Thu, 30 Sep 2021 14:31:28 +0000 Received: by mail-qt1-x831.google.com with SMTP id e16so5846866qts.4 for ; Thu, 30 Sep 2021 07:31:23 -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=5tAiOQNbsPwYQy1X9AyljFW/jKh8PdcAlWcG2o1mwWI=; b=XCzx76XQyqYzRm1ibea0WoCNtcgtXq1gejadijr7/Tsm8GnPNst3oyZj3R9I9AnbJG lrBnaIGN9DLqClY6Iu3a0cPk49EhlCdK/rDuxQQYANtGNfP8HFek80IgFaJdn1NGVLDJ 27ChNmLpSzUczm8ERB32kFy54GWlk57lRkLWF4zD1P65qWvy/Iad8ko3u57FmlRhAxP9 hho1onk8yY5gm6Iw+NSNJ1q5UqXxrZlGyOQYSWjs498DAm/VFk2pIkmf5qWtWOKGMdgF ygnW+Ww/+cSezwh8z/XfxMhB2qr8HyapKNi3SW/qFQ+y1Vy8tWorf86vcsOyv9ttqucp +12Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5tAiOQNbsPwYQy1X9AyljFW/jKh8PdcAlWcG2o1mwWI=; b=o77nTaO1wV+0uhFVDIQ28j8ojGrEIzXpoE0GxQrYfWXoitfyZNJE/LKpcMkg4h2sV+ M1o4CCWORGyf0f4OeuLFU7JTVgg7aBh+QYlblM62hw2x4DqepDwnQOk4fGNyE2aD9SGt QvyHrALPcdmYefbqww8nS5v4ahb32RzxAlrO7uxF3zj+u8yneqFEPJx9XxIjmD7C/S5s OKTbWvikIHEUOMtT6JS02kmXSlyg0h6XsPLamsUi+ikZ3Y5PLlXmxpCB8W7dsMQgOwON 74yGSb4LTG4SSAEJIsHzgcpulJum5dYnN+ogYVJzQxICmXZwBwwTmIC5VNGcNr+7R7yv lYcw== X-Gm-Message-State: AOAM533v1SG9R8+HvLQ9W01ooTmMA90DNYUv0V/cCxrcEZ2hcJgZij1F VBvhIWWr35rCPDEN711M4NeEvw== X-Google-Smtp-Source: ABdhPJy8KG5Co2knAgWKxrqUz+zTSFnivorQOkpsDEWq0y8x/CqeHR1bJLHAsbozgKtfArAnLhmX4Q== X-Received: by 2002:ac8:4e8f:: with SMTP id 15mr6748304qtp.189.1633012282856; Thu, 30 Sep 2021 07:31:22 -0700 (PDT) Received: from soleen.c.googlers.com.com (189.216.85.34.bc.googleusercontent.com. [34.85.216.189]) by smtp.gmail.com with ESMTPSA id l195sm1528731qke.98.2021.09.30.07.31.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Sep 2021 07:31:22 -0700 (PDT) From: Pasha Tatashin To: pasha.tatashin@soleen.com, 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, kernelfans@gmail.com, akpm@linux-foundation.org Subject: [PATCH v18 07/15] arm64: kexec: pass kimage as the only argument to relocation function Date: Thu, 30 Sep 2021 14:31:05 +0000 Message-Id: <20210930143113.1502553-8-pasha.tatashin@soleen.com> X-Mailer: git-send-email 2.33.0.800.g4c38ced690-goog In-Reply-To: <20210930143113.1502553-1-pasha.tatashin@soleen.com> References: <20210930143113.1502553-1-pasha.tatashin@soleen.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210930_073124_544330_7EC4CFBA X-CRM114-Status: GOOD ( 16.12 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.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: Pasha Tatashin Acked-by: Catalin Marinas --- 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 551427ae8cc5..1d3319c7518e 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. */