From patchwork Wed Mar 3 00:22:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pasha Tatashin X-Patchwork-Id: 12113741 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-21.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 39A80C433DB for ; Wed, 3 Mar 2021 15:58:16 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (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 EDFB364EE4 for ; Wed, 3 Mar 2021 15:58:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EDFB364EE4 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=soleen.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version: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:In-Reply-To:References: List-Owner; bh=9+WMUy4MccB4mxh7ztkphzEno5pV+F6x99lx0B+WRNE=; b=mR4a8n9tz0P2a5 V5mXCiFcBtJ1odRYqKEFiQ6Nic7CkXMVYI5ZnZJvUCjJlVcEB/oPIoc8RFsLnCp3EecO59f/dVkqL cOPc3Ub5yTPIFHkdg8lQTkJ3n2bjUlXzhtk8ZYb3w4b8AcFV5xSXl38+j/k/GEy2N9DnM4mM49aYC AtDO02s/pZBqZsBbY+ZyK2UuwEzPuNmaQEfmUeM8ofR1TH8o3orbp+Bwt6OBi3hmDKlJVzwBqtgq6 ucdSVWPamUigb9sHLNlF5a3hrMTFbzq4IVsqX+IFznsJMcdDmhTzMsn29WsLdK+KwKqBXooTMkbTU A6dFU5VMJKaRgPwiK1xw==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lHTrA-005UNX-L7; Wed, 03 Mar 2021 15:56:13 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lHSnm-005COC-Fh for linux-arm-kernel@desiato.infradead.org; Wed, 03 Mar 2021 14:48:38 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type:Content-ID: Content-Description:In-Reply-To:References; bh=efakAXhKZOAUHSnbP86G3aAJQXHi2Yfrvfv0WcsUUNo=; b=XXRMzJXwyP0O6M3csgFjOZcPPQ Y6ji5L/Fcpqr40xS6Uti/1yYncq+ZpMrxjgpO/jZG3C74k+MxLK7TqctNojCo3axoISqrYNuBsmFm ZXi6uqqFznFZh1oYXU8UfCQYI8BZRtvEYtdjiHLeR4U32uvrAe4JhumEOxc7e91vKw7r8Ii1w2jFw zrkw8tcjko78vKCRNnF0FYpAe4JAH8TDLwI62GXqP/noUg/qOQ+q2yG5eMBXmke98iLVYAfteiO4s W8E+AsFzeAO44qnLA33fx0+yxuycoC3bdSFpb3YDcgdLArfCZJMk6UB6rjDKXqTQ0ViVohE+Xtryt nvSbyTNA==; Received: from mail-qk1-x72f.google.com ([2607:f8b0:4864:20::72f]) by casper.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lHFIq-000jbz-2U for linux-arm-kernel@lists.infradead.org; Wed, 03 Mar 2021 00:23:49 +0000 Received: by mail-qk1-x72f.google.com with SMTP id l132so21137979qke.7 for ; Tue, 02 Mar 2021 16:23:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=soleen.com; s=google; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=efakAXhKZOAUHSnbP86G3aAJQXHi2Yfrvfv0WcsUUNo=; b=J71jb3ILqIgJmOHwDtyqGiXEBoljE56D7GVBTUxlZFgU6Uwdpgv/0c0cc43Saj6XX6 BuetAD0XAGNhjjaUQoBoShKZ/hGnVuswprah1wKqKpSHxmuDzzmCNbYavietJcOM5FCY cVynFuqRIJwfFhExTj4hbDv/TxqIf/pUv8zqLpEtIlGuH4NkkukV0dIdiiDiGLfWnI5H 3zm1f305heXGWsSWyv2/H6vWLszvWShLjox1X/j6almswNSETnyHIi2L6kGV/CrSM/Yz N6ouFH16WZtfj4S77zu8HDsDqO2Xdq9Uoy1MtZZYpLI9UfYGmpGfiYhUMxpAHyaAWogz ZbKA== 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:mime-version :content-transfer-encoding; bh=efakAXhKZOAUHSnbP86G3aAJQXHi2Yfrvfv0WcsUUNo=; b=hyKSb/qvFbS0hP6UUO7oaKPSZznpvuzlDNSb+kgXerodvo+BtedJtueFl3ehBO8zKd IcRmgsGXxoDu9dZcDhZ42o1GstZh1PdGg+aY0ur37HU4PRLbRYDoAusV9kpuCJoKI0fe 2GR0gEa3CvOKVyJH4OA2QawFEJM6udS4yxw5nrEFHt55VczSvuKL7W5Fb1WWhe8W0LBB oioWHKy5Cw3HQKEBEll7c3idT3PNb8La9sY5Q6dX6ykvSHJbAwrT21tkONCG0gCf4Vyr nZwjkql2lAZbwQ2Cp0e0XiU1ZaZKBZV0bXdS8sXLy9hAxDusuczCOWFNkeQE4/oOYfZ9 ru2w== X-Gm-Message-State: AOAM53063EO3rpk4xdaPPOAyE5dZtZe8Koq+9hxGFHfJ6cV5pUazXpTU 9Pk8Lu1iszJCy6kEHnueQ4Er1w== X-Google-Smtp-Source: ABdhPJyXxQr7XiD0RHWzaZiMKtXDN/sYtc5KLxNPd5SXn9l1gip9qBLA/7vE6ctFQ7WxEhQnCmWgDg== X-Received: by 2002:ae9:e50c:: with SMTP id w12mr16229374qkf.13.1614730953100; Tue, 02 Mar 2021 16:22:33 -0800 (PST) Received: from localhost.localdomain (c-73-69-118-222.hsd1.nh.comcast.net. [73.69.118.222]) by smtp.gmail.com with ESMTPSA id r3sm16690512qkm.129.2021.03.02.16.22.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Mar 2021 16:22:32 -0800 (PST) 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 Subject: [PATCH v12 00/17] arm64: MMU enabled kexec relocation Date: Tue, 2 Mar 2021 19:22:13 -0500 Message-Id: <20210303002230.1083176-1-pasha.tatashin@soleen.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210303_002349_860370_5EB6495F X-CRM114-Status: GOOD ( 21.44 ) 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 Changelog: v12: - A major change compared to previous version. Instead of using contiguous VA range a copy of linear map is now used to perform copying of segments during relocation as it was agreed in the discussion of version 11 of this project. - In addition to using linear map, I also took several ideas from James Morse to better organize the kexec relocation: 1. skip relocation function entirely if that is not needed 2. remove the PoC flushing function since it is not needed anymore with MMU enabled. v11: - Fixed missing KEXEC_CORE dependency for trans_pgd.c - Removed useless "if(rc) return rc" statement (thank you Tyler Hicks) - Another 12 patches were accepted into maintainer's get. Re-based patches against: https://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git Branch: for-next/kexec v10: - Addressed a lot of comments form James Morse and from Marc Zyngier - Added review-by's - Synchronized with mainline v9: - 9 patches from previous series landed in upstream, so now series is smaller - Added two patches from James Morse to address idmap issues for machines with high physical addresses. - Addressed comments from Selin Dag about compiling issues. He also tested my series and got similar performance results: ~60 ms instead of ~580 ms with an initramfs size of ~120MB. v8: - Synced with mainline to keep series up-to-date v7: -- Addressed comments from James Morse - arm64: hibernate: pass the allocated pgdp to ttbr0 Removed "Fixes" tag, and added Added Reviewed-by: James Morse - arm64: hibernate: check pgd table allocation Sent out as a standalone patch so it can be sent to stable Series applies on mainline + this patch - arm64: hibernate: add trans_pgd public functions Remove second allocation of tmp_pg_dir in swsusp_arch_resume Added Reviewed-by: James Morse - arm64: kexec: move relocation function setup and clean up Fixed typo in commit log Changed kern_reloc to phys_addr_t types. Added explanation why kern_reloc is needed. Split into four patches: arm64: kexec: make dtb_mem always enabled arm64: kexec: remove unnecessary debug prints arm64: kexec: call kexec_image_info only once arm64: kexec: move relocation function setup - arm64: kexec: add expandable argument to relocation function Changed types of new arguments from unsigned long to phys_addr_t. Changed offset prefix to KEXEC_* Split into four patches: arm64: kexec: cpu_soft_restart change argument types arm64: kexec: arm64_relocate_new_kernel clean-ups arm64: kexec: arm64_relocate_new_kernel don't use x0 as temp arm64: kexec: add expandable argument to relocation function - arm64: kexec: configure trans_pgd page table for kexec Added invalid entries into EL2 vector table Removed KEXEC_EL2_VECTOR_TABLE_SIZE and KEXEC_EL2_VECTOR_TABLE_OFFSET Copy relocation functions and table into separate pages Changed types in kern_reloc_arg. Split into three patches: arm64: kexec: offset for relocation function arm64: kexec: kexec EL2 vectors arm64: kexec: configure trans_pgd page table for kexec - arm64: kexec: enable MMU during kexec relocation Split into two patches: arm64: kexec: enable MMU during kexec relocation arm64: kexec: remove head from relocation argument v6: - Sync with mainline tip - Added Acked's from Dave Young v5: - Addressed comments from Matthias Brugger: added review-by's, improved comments, and made cleanups to swsusp_arch_resume() in addition to create_safe_exec_page(). - Synced with mainline tip. v4: - Addressed comments from James Morse. - Split "check pgd table allocation" into two patches, and moved to the beginning of series for simpler backport of the fixes. Added "Fixes:" tags to commit logs. - Changed "arm64, hibernate:" to "arm64: hibernate:" - Added Reviewed-by's - Moved "add PUD_SECT_RDONLY" earlier in series to be with other clean-ups - Added "Derived from:" to arch/arm64/mm/trans_pgd.c - Removed "flags" from trans_info - Changed .trans_alloc_page assumption to return zeroed page. - Simplify changes to trans_pgd_map_page(), by keeping the old code. - Simplify changes to trans_pgd_create_copy, by keeping the old code. - Removed: "add trans_pgd_create_empty" - replace init_mm with NULL, and keep using non "__" version of populate functions. v3: - Split changes to create_safe_exec_page() into several patches for easier review as request by Mark Rutland. This is why this series has 3 more patches. - Renamed trans_table to tans_pgd as agreed with Mark. The header comment in trans_pgd.c explains that trans stands for transitional page tables. Meaning they are used in transition between two kernels. v2: - Fixed hibernate bug reported by James Morse - Addressed comments from James Morse: * More incremental changes to trans_table * Removed TRANS_FORCEMAP * Added kexec reboot data for image with 380M in size. Enable MMU during kexec relocation in order to improve reboot performance. If kexec functionality is used for a fast system update, with a minimal downtime, the relocation of kernel + initramfs takes a significant portion of reboot. The reason for slow relocation is because it is done without MMU, and thus not benefiting from D-Cache. Performance data ---------------- For this experiment, the size of kernel plus initramfs is small, only 25M. If initramfs was larger, than the improvements would be greater, as time spent in relocation is proportional to the size of relocation. Previously: kernel shutdown 0.022131328s relocation 0.440510736s kernel startup 0.294706768s Relocation was taking: 58.2% of reboot time Now: kernel shutdown 0.032066576s relocation 0.022158152s kernel startup 0.296055880s Now: Relocation takes 6.3% of reboot time Total reboot is x2.16 times faster. With bigger userland (fitImage 380M), the reboot time is improved by 3.57s, and is reduced from 3.9s down to 0.33s Previous approaches and discussions ----------------------------------- v11: https://lore.kernel.org/lkml/20210127172706.617195-1-pasha.tatashin@soleen.com v10: https://lore.kernel.org/linux-arm-kernel/20210125191923.1060122-1-pasha.tatashin@soleen.com v9: https://lore.kernel.org/lkml/20200326032420.27220-1-pasha.tatashin@soleen.com v8: https://lore.kernel.org/lkml/20191204155938.2279686-1-pasha.tatashin@soleen.com v7: https://lore.kernel.org/lkml/20191016200034.1342308-1-pasha.tatashin@soleen.com v6: https://lore.kernel.org/lkml/20191004185234.31471-1-pasha.tatashin@soleen.com v5: https://lore.kernel.org/lkml/20190923203427.294286-1-pasha.tatashin@soleen.com v4: https://lore.kernel.org/lkml/20190909181221.309510-1-pasha.tatashin@soleen.com v3: https://lore.kernel.org/lkml/20190821183204.23576-1-pasha.tatashin@soleen.com v2: https://lore.kernel.org/lkml/20190817024629.26611-1-pasha.tatashin@soleen.com v1: https://lore.kernel.org/lkml/20190801152439.11363-1-pasha.tatashin@soleen.com James Morse (4): arm64: hyp-stub: Check the size of the HYP stub's vectors arm64: hyp-stub: Move invalid vector entries into the vectors arm64: hyp-stub: Move el1_sync into the vectors arm64: kexec: Use dcache ops macros instead of open-coding Pavel Tatashin (13): arm64: kernel: add helper for booted at EL2 and not VHE arm64: trans_pgd: hibernate: Add trans_pgd_copy_el2_vectors arm64: hibernate: abstract ttrb0 setup function arm64: kexec: flush image and lists during kexec load time arm64: kexec: skip relocation code for inplace kexec arm64: kexec: pass kimage as the only argument to relocation function arm64: kexec: kexec may require EL2 vectors arm64: kexec: relocate in EL1 mode arm64: kexec: use ld script for relocation function arm64: kexec: install a copy of the linear-map arm64: kexec: keep MMU enabled during kexec relocation arm64: kexec: remove the pre-kexec PoC maintenance arm64: kexec: Remove cpu-reset.h arch/arm64/Kconfig | 2 +- arch/arm64/include/asm/assembler.h | 31 ++++- arch/arm64/include/asm/kexec.h | 12 ++ arch/arm64/include/asm/mmu_context.h | 24 ++++ arch/arm64/include/asm/sections.h | 1 + arch/arm64/include/asm/trans_pgd.h | 3 + arch/arm64/include/asm/virt.h | 8 ++ arch/arm64/kernel/asm-offsets.c | 11 ++ arch/arm64/kernel/cpu-reset.S | 7 +- arch/arm64/kernel/cpu-reset.h | 32 ----- arch/arm64/kernel/hibernate-asm.S | 20 ---- arch/arm64/kernel/hibernate.c | 56 +++------ arch/arm64/kernel/hyp-stub.S | 95 +++++++-------- arch/arm64/kernel/machine_kexec.c | 168 +++++++++++++++------------ arch/arm64/kernel/relocate_kernel.S | 72 ++++++------ arch/arm64/kernel/sdei.c | 2 +- arch/arm64/kernel/vmlinux.lds.S | 19 +++ arch/arm64/mm/trans_pgd.c | 20 ++++ 18 files changed, 314 insertions(+), 269 deletions(-) delete mode 100644 arch/arm64/kernel/cpu-reset.h