From patchwork Wed Jun 9 00:44:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pasha Tatashin X-Patchwork-Id: 12308463 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 B7C62C48BCD for ; Wed, 9 Jun 2021 00:44:38 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 69F47613C0 for ; Wed, 9 Jun 2021 00:44:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 69F47613C0 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=soleen.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 1094B6B0075; Tue, 8 Jun 2021 20:44:32 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 096086B0078; Tue, 8 Jun 2021 20:44:32 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DFDCD6B007B; Tue, 8 Jun 2021 20:44:31 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0008.hostedemail.com [216.40.44.8]) by kanga.kvack.org (Postfix) with ESMTP id A8BC26B0075 for ; Tue, 8 Jun 2021 20:44:31 -0400 (EDT) Received: from smtpin24.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 40FCC6D7D for ; Wed, 9 Jun 2021 00:44:31 +0000 (UTC) X-FDA: 78232339542.24.ACEF4B3 Received: from mail-qk1-f173.google.com (mail-qk1-f173.google.com [209.85.222.173]) by imf04.hostedemail.com (Postfix) with ESMTP id 5079637E for ; Wed, 9 Jun 2021 00:44:28 +0000 (UTC) Received: by mail-qk1-f173.google.com with SMTP id k4so22212866qkd.0 for ; Tue, 08 Jun 2021 17:44:30 -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=GQ5BgIaJviFIJ4FCU2ORrVnn57SMRpQ9H71Ow8Vj6m4=; b=Y7E3HUKBWsfN3xCB81SMmwmoPU+UXzi7iX+gQK3HhBmGGLkxpTawLrk0L9WbhmKQcD PH5qlwzeky/C+Se+XOhgLii5iyYIw5w/4Eu+6fTt7CT0z2pngUyDoX/2/zRg9hoYxd4c geMyJmmU7GUUUTJcXBr556Gauh36IKBJ8XpAZeYrRUkn4R6mDaADzFE2koFCW2tbY9LH +1mFKAebl8I/Zh1RiYzMWGa/+8MmuwHqL055hGUjSzSqf3vu7CbQF3qYVbTXJfkgjpr/ V79O61DQjzqNgeE0YVPXFc3CCfVA8dK1PJ93zuKermcSdgc4S4GA+r5dgwtJQLDak4kQ KfLg== 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=GQ5BgIaJviFIJ4FCU2ORrVnn57SMRpQ9H71Ow8Vj6m4=; b=ZzT+NuJDl0DGu/7BZJ7enu7mbWKvDAAM2+HKuvJ0jCFYKwCJeh6xreYudZ6FGNSH0O Iwa4cV+DGVS6mDE0LTK89E1oyAkrQ7v2cwD9tUwrs7+6uPwtTtuwdNmnvKESsXg6XbOM BSTd2TMUOqq3DWe+isLMpsbUlB23olHVekeo212009GeOcc5aZ3zigsPBTfQQgPCFFEz +Oz4V+/hYo9ntF2pcJVG6w2lKo015Nqez/ih9zOqugdTRmYVG4APf2mbmY/r8T5mq0XX WU9uP8a8cw0VhdehC3CIzcbnNk36BK/ILgUyf49RZVumkerZXAfBeGmn3NT/XJB2t1mW w6nQ== X-Gm-Message-State: AOAM530htblsk572YZ0Xyaw4rVXb5q/ihx+QAU3NZ0qLhYkjCkTpBIEz 7nv6jW8BW/GCMsGvVYKR0I1SjQ== X-Google-Smtp-Source: ABdhPJxJHulb7L09eWqLRuz1AoAZSBaTc/m3jSYUkhZOutuErP2+QhJiIPXDPhjGVQPaqZVif1ou/g== X-Received: by 2002:a37:7145:: with SMTP id m66mr24028223qkc.379.1623199470340; Tue, 08 Jun 2021 17:44:30 -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 n194sm12869011qka.66.2021.06.08.17.44.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Jun 2021 17:44:29 -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 v15 06/15] arm64: kexec: Use dcache ops macros instead of open-coding Date: Tue, 8 Jun 2021 20:44:10 -0400 Message-Id: <20210609004419.936873-7-pasha.tatashin@soleen.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210609004419.936873-1-pasha.tatashin@soleen.com> References: <20210609004419.936873-1-pasha.tatashin@soleen.com> MIME-Version: 1.0 Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=soleen.com header.s=google header.b=Y7E3HUKB; dmarc=none; spf=pass (imf04.hostedemail.com: domain of pasha.tatashin@soleen.com designates 209.85.222.173 as permitted sender) smtp.mailfrom=pasha.tatashin@soleen.com X-Rspamd-Server: rspam02 X-Stat-Signature: zb439dfjw1o6urs7sj5735s1mpfnfayp X-Rspamd-Queue-Id: 5079637E X-HE-Tag: 1623199468-576735 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: Pavel Tatashin --- arch/arm64/include/asm/assembler.h | 12 ++++++++---- arch/arm64/kernel/relocate_kernel.S | 13 +++---------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/arch/arm64/include/asm/assembler.h b/arch/arm64/include/asm/assembler.h index 8418c1bd8f04..f1367863d995 100644 --- a/arch/arm64/include/asm/assembler.h +++ b/arch/arm64/include/asm/assembler.h @@ -393,10 +393,9 @@ alternative_else alternative_endif .endm - .macro dcache_by_line_op op, domain, kaddr, size, tmp1, tmp2 - dcache_line_size \tmp1, \tmp2 + .macro dcache_by_myline_op op, domain, kaddr, size, linesz, tmp2 add \size, \kaddr, \size - sub \tmp2, \tmp1, #1 + sub \tmp2, \linesz, #1 bic \kaddr, \kaddr, \tmp2 9998: .ifc \op, cvau @@ -416,12 +415,17 @@ alternative_endif .endif .endif .endif - add \kaddr, \kaddr, \tmp1 + add \kaddr, \kaddr, \linesz cmp \kaddr, \size b.lo 9998b dsb \domain .endm + .macro dcache_by_line_op op, domain, kaddr, size, tmp1, tmp2 + dcache_line_size \tmp1, \tmp2 + dcache_by_myline_op \op, \domain, \kaddr, \size, \tmp1, \tmp2 + .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..718037bef560 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 + mov x1, #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: