From patchwork Thu Sep 16 23:13:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pasha Tatashin X-Patchwork-Id: 12500465 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=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 BF2BAC433EF for ; Thu, 16 Sep 2021 23:13:41 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 73ADD6103C for ; Thu, 16 Sep 2021 23:13:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 73ADD6103C Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=soleen.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id 3081694000C; Thu, 16 Sep 2021 19:13:38 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 29214940007; Thu, 16 Sep 2021 19:13:38 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0987794000C; Thu, 16 Sep 2021 19:13:37 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0202.hostedemail.com [216.40.44.202]) by kanga.kvack.org (Postfix) with ESMTP id E66EE940007 for ; Thu, 16 Sep 2021 19:13:37 -0400 (EDT) Received: from smtpin13.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id A485E3207A for ; Thu, 16 Sep 2021 23:13:37 +0000 (UTC) X-FDA: 78594990474.13.12F3D9D Received: from mail-qk1-f176.google.com (mail-qk1-f176.google.com [209.85.222.176]) by imf29.hostedemail.com (Postfix) with ESMTP id 6DBE6900025B for ; Thu, 16 Sep 2021 23:13:37 +0000 (UTC) Received: by mail-qk1-f176.google.com with SMTP id c10so11610710qko.11 for ; Thu, 16 Sep 2021 16:13: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:in-reply-to:references:mime-version :content-transfer-encoding; bh=exeHdjIsxyGc1OZ7fPc2yLNva0RUnn224iKjfeO/Tps=; b=csh+0NjNjXq4xVbHcgfV0tkZaYVDDxnR+KyTpl/TMfJf1Bcqjh8iGnlSYcecebap8G 6k/safqs9PVQDTztgaPl40nThhrfZi5ed4IK8xePB0T8Sa8MYs+aXBV//x3Fck3k2iV9 6a5XjOPT7Lwu25MAGF1c0z2M3Lw/EqJOfJm5d0CoIPTkZth5NctzNRz9VHjYtnSocyrL j31/z+Tl0HcwZVo7n036pWZYjyzxJP7gLbRfZBIkFGRKsYORdyu9Krb9oPdMxFVUemfr nJA+7UTbw0/PsRDqMlZmUc/nfCSJ196huH92bsDYJpqgAJN94ges86+cyx1CJDz6CLvi fijg== 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=exeHdjIsxyGc1OZ7fPc2yLNva0RUnn224iKjfeO/Tps=; b=HTvk2DdxGBNvD0jzY8Iencr5JIQS+0nKC9yfhhtZcBY3i1b3t7PBOfX+cwnH+a+Wzq hxoBZfCugZDA/JBH+JhHPayru332Vsh/y61XxD6jcn8JcDn3gHcaCJwRwpTRng3VS4w1 O0iXmMwqlf0/e3VH2g/NGl2ePEUqtwLXM+VOQMYqXVkmSXkakntfujpMY6WG01AD1H4S cEtS42GdkIflZrdoMSkb38yn1xxoo5EhjyjFtOfqQuPyzluRYPdWBvARWLqXYeJJ1G9J laAHa/ywxVqWM/FUyTg+SlYTmhRn9c0kQVL2lfA/mu49drJptieOaIxblBi8ziH6Sb2u cWMQ== X-Gm-Message-State: AOAM532d3e6VrujKJS437RwWgOYu20rgC/LNguRJ7A64E28UiTh8kCC9 TDCNyRDW0a+BYMxwHBYnhyEurg== X-Google-Smtp-Source: ABdhPJyjBUpS0VkoacHlSf0TOrxrLfXY2aEqHlMPIXlkIZ7kOCY/abeaLzU3ssMdOIXsPkRjrkDvCQ== X-Received: by 2002:a37:68d0:: with SMTP id d199mr7411119qkc.96.1631834016835; Thu, 16 Sep 2021 16:13:36 -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 az6sm3312891qkb.70.2021.09.16.16.13.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Sep 2021 16:13:36 -0700 (PDT) From: Pasha 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 v17 06/15] arm64: kexec: Use dcache ops macros instead of open-coding Date: Thu, 16 Sep 2021 19:13:16 -0400 Message-Id: <20210916231325.125533-7-pasha.tatashin@soleen.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210916231325.125533-1-pasha.tatashin@soleen.com> References: <20210916231325.125533-1-pasha.tatashin@soleen.com> MIME-Version: 1.0 X-Stat-Signature: sygjten1mabwjfccnwrhdoci48tjxbac Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=soleen.com header.s=google header.b=csh+0NjN; dmarc=none; spf=pass (imf29.hostedemail.com: domain of pasha.tatashin@soleen.com designates 209.85.222.176 as permitted sender) smtp.mailfrom=pasha.tatashin@soleen.com X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 6DBE6900025B X-HE-Tag: 1631834017-691231 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: kexec does dcache maintenance when it re-writes all memory. Our dcache_by_line_op macro depends on reading the sanitized DminLine from memory. Kexec may have overwritten this, so open-codes the sequence. dcache_by_line_op is a whole set of macros, it uses dcache_line_size which uses read_ctr for the sanitsed DminLine. Reading the DminLine is the first thing the dcache_by_line_op does. Rename dcache_by_line_op dcache_by_myline_op and take DminLine as an argument. Kexec can now use the slightly smaller macro. This makes up-coming changes to the dcache maintenance easier on the eye. Code generated by the existing callers is unchanged. Suggested-by: James Morse Signed-off-by: Pasha Tatashin --- arch/arm64/include/asm/assembler.h | 30 ++++++++++++++++++++++------- arch/arm64/kernel/relocate_kernel.S | 13 +++---------- 2 files changed, 26 insertions(+), 17 deletions(-) diff --git a/arch/arm64/include/asm/assembler.h b/arch/arm64/include/asm/assembler.h index 89faca0e740d..71999a325055 100644 --- a/arch/arm64/include/asm/assembler.h +++ b/arch/arm64/include/asm/assembler.h @@ -405,19 +405,19 @@ alternative_endif /* * Macro to perform a data cache maintenance for the interval - * [start, end) + * [start, end) with dcache line size explicitly provided. * * op: operation passed to dc instruction * domain: domain used in dsb instruciton * start: starting virtual address of the region * end: end virtual address of the region + * linesz: dcache line size * fixup: optional label to branch to on user fault - * Corrupts: start, end, tmp1, tmp2 + * Corrupts: start, end, tmp */ - .macro dcache_by_line_op op, domain, start, end, tmp1, tmp2, fixup - dcache_line_size \tmp1, \tmp2 - sub \tmp2, \tmp1, #1 - bic \start, \start, \tmp2 + .macro dcache_by_myline_op op, domain, start, end, linesz, tmp, fixup + sub \tmp, \linesz, #1 + bic \start, \start, \tmp .Ldcache_op\@: .ifc \op, cvau __dcache_op_workaround_clean_cache \op, \start @@ -436,7 +436,7 @@ alternative_endif .endif .endif .endif - add \start, \start, \tmp1 + add \start, \start, \linesz cmp \start, \end b.lo .Ldcache_op\@ dsb \domain @@ -444,6 +444,22 @@ alternative_endif _cond_extable .Ldcache_op\@, \fixup .endm +/* + * Macro to perform a data cache maintenance for the interval + * [start, end) + * + * op: operation passed to dc instruction + * domain: domain used in dsb instruciton + * start: starting virtual address of the region + * end: end virtual address of the region + * fixup: optional label to branch to on user fault + * Corrupts: start, end, tmp1, tmp2 + */ + .macro dcache_by_line_op op, domain, start, end, tmp1, tmp2, fixup + dcache_line_size \tmp1, \tmp2 + dcache_by_myline_op \op, \domain, \start, \end, \tmp1, \tmp2, \fixup + .endm + /* * Macro to perform an instruction cache maintenance for the interval * [start, end) diff --git a/arch/arm64/kernel/relocate_kernel.S b/arch/arm64/kernel/relocate_kernel.S index 8058fabe0a76..8c43779e8cc6 100644 --- a/arch/arm64/kernel/relocate_kernel.S +++ b/arch/arm64/kernel/relocate_kernel.S @@ -41,16 +41,9 @@ SYM_CODE_START(arm64_relocate_new_kernel) tbz x16, IND_SOURCE_BIT, .Ltest_indirection /* Invalidate dest page to PoC. */ - mov x2, x13 - add x20, x2, #PAGE_SIZE - sub x1, x15, #1 - bic x2, x2, x1 -2: dc ivac, x2 - add x2, x2, x15 - cmp x2, x20 - b.lo 2b - dsb sy - + mov x2, x13 + add x1, x2, #PAGE_SIZE + dcache_by_myline_op ivac, sy, x2, x1, x15, x20 copy_page x13, x12, x1, x2, x3, x4, x5, x6, x7, x8 b .Lnext .Ltest_indirection: