From patchwork Mon Sep 23 20:34:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pasha Tatashin X-Patchwork-Id: 11157593 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5AEEC1668 for ; Mon, 23 Sep 2019 20:35:16 +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 2F7F0207FD for ; Mon, 23 Sep 2019 20:35:16 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="SeI2QW3G"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=soleen.com header.i=@soleen.com header.b="RZqJZ2jM" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2F7F0207FD 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+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; 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=KXV9t6hwDaO3AkgGqbNz+eEkqStgh8YrtBUuL0EOZfM=; b=SeI2QW3GQya1z+ 9jTZhH8jFT6+eZ16IQcpdMt+fTB+Ju8xynHNFD9/GyAhyvW6sLsa8Oo2y1V2Oz0uevtAVz2pJKc/N 4bcGTo9Wk9wJiagRN2P/YAYfPMHnriMygQkzHXf/pOAShYqgtLTgKp0wj93QFFIeXobatjf9lXG2H J11l5Ti1QM09NSGmMJdfNqtQ2/l/WzTnMZxikB1dfK4/mQfBNGV/pdcehzZkyQFLrhTw3waMLIc8E cUdjwFsoh50ycoNLyD4XQPppwS04p+aqwxWpYA2spQzkcGVDNtlXpT8H3KweTNnwTKlkoudHsiNz8 U4HzB0pOtc+QwoCn8csA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.2 #3 (Red Hat Linux)) id 1iCV3C-0003Up-13; Mon, 23 Sep 2019 20:35:14 +0000 Received: from mail-pg1-x541.google.com ([2607:f8b0:4864:20::541]) by bombadil.infradead.org with esmtps (Exim 4.92.2 #3 (Red Hat Linux)) id 1iCV2f-0002CT-SD for linux-arm-kernel@lists.infradead.org; Mon, 23 Sep 2019 20:34:43 +0000 Received: by mail-pg1-x541.google.com with SMTP id y35so2862299pgl.1 for ; Mon, 23 Sep 2019 13:34:37 -0700 (PDT) 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=lqhPf0WylVWrQq3bujKuRCUKeKaYyeeOquS4YZjsMbs=; b=RZqJZ2jMiQ4jrVlplk0gInJ2H9AKuD/9MozDl+VOtFFs+4z68Obn9Bk09TPSSP0cT0 TgSq1ja39iNbYKpWpf2355Susly26z95NREFOtyfSXBVLGy0QcVGFyAqEJPlhtAXuf+5 ZhM4VuRkGoU1gCHP7HrwbPv/kneZVTtd8XT/Dr74pWEsIaeBKVMFUgWTxuDKidTRFGH4 DYIgov3lFIa6nyaSKl6SWF+sKjNRXovwtcRZOJuuefq27ulSTsDsjQqQJWu1yYIHq37p cEiLZJfEBTIsAv4SjPs9UQ7m7C7ejeKkUZb2vg2neglAqqwH1ckgtbxGzZCCp3MX1wht 1NFg== 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=lqhPf0WylVWrQq3bujKuRCUKeKaYyeeOquS4YZjsMbs=; b=rl3xYOA/iMGuKo+4DSk0eJl/PIjhS0f3a2D9sxdgofi+PEOF99PTKcbqf4i4kKynI9 NaVg9x0ksQVjTxffUmpVmoZMV6FqyoCyP1tfhEN5et63DhfsrFjTeVND15bWQXHWe196 U7ytIheyiyZ63/+jNX8V2acpgcOyVRBrq19SiQ1oJ3LTLOm+bv2ew2nXRGnzQD9Fr13+ 7m7H6BtWS9aNvvQPv1/jceceOIVqRksnWJxs1Tv3vFbbX6XajIPCJauT7TiPmKgzswYS lhY6w9Zmjoym4g1SSaz9QKSpLQ7P+f3DTityd7K+tUazW/zrXQEAV929+yQbmJlQVzsC 4i/Q== X-Gm-Message-State: APjAAAUsL5ZqvPtBMK7FewNQHnFlFFdaArt6/k7gZu0/W4yjlS0wyGGA 58Ybw509gCUMx6AA4+S17v9hdQ== X-Google-Smtp-Source: APXvYqyI36p0gwtWDtXSdCopzx1YDRzh+phPa0M6jgW9Gv5XSjc6bvVBD+vSl5ERXkzo6iljFFSZ7Q== X-Received: by 2002:a63:2943:: with SMTP id p64mr1669712pgp.98.1569270876837; Mon, 23 Sep 2019 13:34:36 -0700 (PDT) Received: from xakep.corp.microsoft.com (c-73-69-118-222.hsd1.nh.comcast.net. [73.69.118.222]) by smtp.gmail.com with ESMTPSA id n29sm12798676pgm.4.2019.09.23.13.34.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Sep 2019 13:34:36 -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, marc.zyngier@arm.com, james.morse@arm.com, vladimir.murzin@arm.com, matthias.bgg@gmail.com, bhsharma@redhat.com, linux-mm@kvack.org, mark.rutland@arm.com Subject: [PATCH v5 00/17] arm64: MMU enabled kexec relocation Date: Mon, 23 Sep 2019 16:34:10 -0400 Message-Id: <20190923203427.294286-1-pasha.tatashin@soleen.com> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190923_133441_910389_43B67175 X-CRM114-Status: GOOD ( 14.75 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:541 listed in] [list.dnswl.org] -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Changelog: 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 ----------------------------------- https://lore.kernel.org/lkml/20190909181221.309510-1-pasha.tatashin@soleen.com version 4 of this series https://lore.kernel.org/lkml/20190821183204.23576-1-pasha.tatashin@soleen.com version 3 of this series https://lore.kernel.org/lkml/20190817024629.26611-1-pasha.tatashin@soleen.com version 2 of this series https://lore.kernel.org/lkml/20190801152439.11363-1-pasha.tatashin@soleen.com version 1 of this series https://lore.kernel.org/lkml/20190709182014.16052-1-pasha.tatashin@soleen.com reserve space for kexec to avoid relocation, involves changes to generic code to optimize a problem that exists on arm64 only: https://lore.kernel.org/lkml/20190716165641.6990-1-pasha.tatashin@soleen.com The first attempt to enable MMU, some bugs that prevented performance improvement. The page tables unnecessary configured idmap for the whole physical space. https://lore.kernel.org/lkml/20190731153857.4045-1-pasha.tatashin@soleen.com No linear copy, bug with EL2 reboots. Pavel Tatashin (17): kexec: quiet down kexec reboot arm64: hibernate: pass the allocated pgdp to ttbr0 arm64: hibernate: check pgd table allocation arm64: hibernate: use get_safe_page directly arm64: hibernate: remove gotos as they are not needed arm64: hibernate: rename dst to page in create_safe_exec_page arm64: hibernate: add PUD_SECT_RDONLY arm64: hibernate: add trans_pgd public functions arm64: hibernate: move page handling function to new trans_pgd.c arm64: trans_pgd: make trans_pgd_map_page generic arm64: trans_pgd: pass allocator trans_pgd_create_copy arm64: trans_pgd: pass NULL instead of init_mm to *_populate functions kexec: add machine_kexec_post_load() arm64: kexec: move relocation function setup and clean up arm64: kexec: add expandable argument to relocation function arm64: kexec: configure trans_pgd page table for kexec arm64: kexec: enable MMU during kexec relocation arch/arm64/Kconfig | 4 + arch/arm64/include/asm/kexec.h | 51 ++++- arch/arm64/include/asm/pgtable-hwdef.h | 1 + arch/arm64/include/asm/trans_pgd.h | 34 ++++ arch/arm64/kernel/asm-offsets.c | 14 ++ arch/arm64/kernel/cpu-reset.S | 4 +- arch/arm64/kernel/cpu-reset.h | 8 +- arch/arm64/kernel/hibernate.c | 245 +++++-------------------- arch/arm64/kernel/machine_kexec.c | 196 ++++++++++++++++---- arch/arm64/kernel/relocate_kernel.S | 196 ++++++++++---------- arch/arm64/mm/Makefile | 1 + arch/arm64/mm/trans_pgd.c | 244 ++++++++++++++++++++++++ kernel/kexec.c | 4 + kernel/kexec_core.c | 8 +- kernel/kexec_file.c | 4 + kernel/kexec_internal.h | 2 + 16 files changed, 674 insertions(+), 342 deletions(-) create mode 100644 arch/arm64/include/asm/trans_pgd.h create mode 100644 arch/arm64/mm/trans_pgd.c