From patchwork Thu Sep 16 23:13:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pasha Tatashin X-Patchwork-Id: 12500511 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=-17.1 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,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 EAF3EC433EF for ; Thu, 16 Sep 2021 23:25: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 B2902611EE for ; Thu, 16 Sep 2021 23:25:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org B2902611EE 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=0ygblUODVOJH8FcqACjyq+38rImzmF+MjRbNCSoTtdg=; b=z4KGyT41z075ru GDK2Bt3NRT+yz9yBCj9KrPkkKJlJz0nxgyrtZ8suygGSTVPLZT1cwwzZ0FGrMJ+kQBPJ/H3fALePJ ixpIPW7IsviQ78+UMk8FNVjhCwebM1oZat2bp4Z5JiKRZqL/75WOk4DWxr9KdcUKCx0A9zJY96MLV fdXtmeaJSIEATU1owJVPXfRunxJAewUtGuvl5e1ZENLAoSpCI3/C+zZDdMDi7MMXMEbmQmGyrS202 Nzjj+m/qZxV8yRUB4VbHM9M6JYfArNEqxbvTJJNj45PHcBL8Gkp+tjZnd2jXPazrYQueyWmePb0fH fpjfpX0GXpfy8FEX6fTA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mR0ho-00Ce4L-2Y; Thu, 16 Sep 2021 23:22:13 +0000 Received: from mail-qt1-x82d.google.com ([2607:f8b0:4864:20::82d]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mR0Zg-00CaG7-EW for linux-arm-kernel@lists.infradead.org; Thu, 16 Sep 2021 23:13:50 +0000 Received: by mail-qt1-x82d.google.com with SMTP id w17so7138303qta.9 for ; Thu, 16 Sep 2021 16:13:47 -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=GN2IcTbnQy/l+AFlkLqiV8UzoxXsj+8ZLQih7s8aKx8=; b=M5CTfZo1Z3z8nnNhnSFnT5bZBoCyHcCSNQY5IAC70LR1ZVyh+O5AiCH+3JYzT54AO6 cogP5W8eYZVIR2HOkx271Tj9VX8PBKz8/eNdidBdVg6QXW33cttuUdaqwjaZ70DOvRyQ urh5mgNU8A9pRPwtSyQnngaEuDTYYjvPzcqsyq7+Zt33I/s9aPLeGoYRv0xCRcZPFjAg rw5EHVkik9ia9CQVkBGQ0DyL76YQByOc8x2ktd7fEnxBHGxeswnzAPZNf/nDH85hlAML 5haphvkFDZ3lgxc1HuLEOZ4EcyLLdUqdW35viL7w2GR0UsaCv1Z1s8rbSdWn4NYvDQh6 vtig== 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=GN2IcTbnQy/l+AFlkLqiV8UzoxXsj+8ZLQih7s8aKx8=; b=XBF1oTjZuVowcBLrzTOXrxGK7M+2BmV4VUSyL92tqXxpE4nOaMYq8uh1NW3Fdpr8B2 dFjDDPhLz9gg9WRYNxNGkauAfTDc9M8peGXBvKLAJ5C+jh2gebQeqbOMCu1aK+5+FcaB BhKc1NCi729UtmbQhg1ALc4AcqHP2JS2Ltut3VIPRVYG0qR902YTjZweR7oZ2vEZlJ8f cXP83l/DXrPbt446TpUUO5ZGjBl+kLYCmr0P4gc/v+UwJoHL9UqDllDk4CTSp4wlyYOg 4gGe9LmC9SCHILEHnQv5SFS7gcgjGfiMPQyIHfbZAxVMNZ6dOvfsEMZmOoQGBGEzb7AI RDbw== X-Gm-Message-State: AOAM531BAq8mU5d16aB2t30vbSTs2H0/A8/JaD3z5qG+S1KiUdcTqvam PHPQ/Jj+W7MbjgTDcmNhDwaVWg== X-Google-Smtp-Source: ABdhPJwIqEQH++TUi7ZgjSc7lOCNqi10ZjOdZ+AKQdZt+gJhzCLC515q41J5bOiRYru4kSW7phljFQ== X-Received: by 2002:ac8:4149:: with SMTP id e9mr7629536qtm.249.1631834026997; Thu, 16 Sep 2021 16:13:46 -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.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Sep 2021 16:13:46 -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 13/15] arm64: kexec: remove the pre-kexec PoC maintenance Date: Thu, 16 Sep 2021 19:13:23 -0400 Message-Id: <20210916231325.125533-14-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-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210916_161348_530567_D06D4B4E X-CRM114-Status: GOOD ( 11.45 ) 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 Now that kexec does its relocations with the MMU enabled, we no longer need to clean the relocation data to the PoC. Suggested-by: James Morse Signed-off-by: Pasha Tatashin --- arch/arm64/kernel/machine_kexec.c | 43 ------------------------------- 1 file changed, 43 deletions(-) diff --git a/arch/arm64/kernel/machine_kexec.c b/arch/arm64/kernel/machine_kexec.c index b43195a7fcb6..b1856f34cc51 100644 --- a/arch/arm64/kernel/machine_kexec.c +++ b/arch/arm64/kernel/machine_kexec.c @@ -77,48 +77,6 @@ int machine_kexec_prepare(struct kimage *kimage) return 0; } -/** - * kexec_list_flush - Helper to flush the kimage list and source pages to PoC. - */ -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; - - /* flush the list entries. */ - dcache_clean_inval_poc((unsigned long)entry, - (unsigned long)entry + - sizeof(kimage_entry_t)); - - flag = *entry & IND_FLAGS; - if (flag == IND_DONE) - break; - - addr = (unsigned long)phys_to_virt(*entry & PAGE_MASK); - - switch (flag) { - case IND_INDIRECTION: - /* Set entry point just before the new list page. */ - entry = (kimage_entry_t *)addr - 1; - break; - case IND_SOURCE: - /* flush the source pages. */ - dcache_clean_inval_poc(addr, addr + PAGE_SIZE); - break; - case IND_DESTINATION: - break; - default: - BUG(); - } - } -} - /** * kexec_segment_flush - Helper to flush the kimage segments to PoC. */ @@ -207,7 +165,6 @@ int machine_kexec_post_load(struct kimage *kimage) (unsigned long)reloc_code + reloc_size); icache_inval_pou((uintptr_t)reloc_code, (uintptr_t)reloc_code + reloc_size); - kexec_list_flush(kimage); kexec_image_info(kimage); return 0;