Message ID | 20210125191923.1060122-3-pasha.tatashin@soleen.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <SRS0=q8Yd=G4=lists.infradead.org=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@kernel.org> 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.0 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,URIBL_BLOCKED, 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 B1ECDC433E0 for <linux-arm-kernel@archiver.kernel.org>; Mon, 25 Jan 2021 19:21:32 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 4190421744 for <linux-arm-kernel@archiver.kernel.org>; Mon, 25 Jan 2021 19:21:32 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4190421744 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=merlin.20170209; 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=p0AAK75IWYYSRYkDuY22SVbXiFuufudhf8fmT/3Aphc=; b=oHiE4cT8MVFTK89s5k2ZKMbfVi KdtvaS9/OvGPkLa7mFN2Sp3iKyvOuhlYGFs+KiWMHYJEXo3VLb9lsaomFJToeSk0+qj1u+iK1i3Gr 29gRXdLCpq8M9xjX644oRKP9uLSl0ucLmfXQAzSrM+s/meRx8511/rV61ZQIxqDUXpcQeQzr+XZyc 2UonXhh8DPnw09RrUDa/A1R+JmxrycNrSxMWYhazarMt7YfuvCvMqOea/YLfymy/eNnOmsW6rQdqw 6SU61oDIGSSDrM29Ni97ki2krFs6LTSlpMPR+SGEwQBTc3XwVNN+1Q4sKvj5spfmpBglFUzPOgSLp 9FtEhbPg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l47P0-0007EH-RV; Mon, 25 Jan 2021 19:19:54 +0000 Received: from mail-qv1-xf2c.google.com ([2607:f8b0:4864:20::f2c]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l47Oc-00074C-Md for linux-arm-kernel@lists.infradead.org; Mon, 25 Jan 2021 19:19:37 +0000 Received: by mail-qv1-xf2c.google.com with SMTP id p5so6711897qvs.7 for <linux-arm-kernel@lists.infradead.org>; Mon, 25 Jan 2021 11:19:29 -0800 (PST) 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=rWpWL/DRiZPfCy8fAJD8ErDuDMoAsKZLcMwbx3gozjY=; b=NZ5XxFttV3baXG5fjW/ZpaC7LBvDpicX5uySrcQVbyy1c18h0xyqlMmWuyCRowKzIL 3e33S4LCQP2unKI4CIWKN0KSN5UOTN71ef3uB9naUZwGHi6huRuILd95UDOOciWb/aN8 ULr8BmGlF99/Ts9F6CX+/Hl3EWpBrY4QuAZIvNHgadEQ7LrCErmysGI0hmBvGVKLOvww uaYh2RRy2tdHXfkNRSNPuja7VlZtWq13bIgkwLZe/uCR9EKKqC52TRzHPnJeGklcyVz4 aNd3+2sBb1fkTBenfwdJob3WSuHRrYk21+XJDoA0CWQJZBnq2vPRu1wy+jEOG6/FSzt0 YQNg== 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=rWpWL/DRiZPfCy8fAJD8ErDuDMoAsKZLcMwbx3gozjY=; b=GBw9lNt9GK/0qTDrbQtLTObulnLys002b9QhimKOLE3sW/L2HP9tCUCZXJWkDZnJql 35sKgdm9rZ1wKZGseOGnciW/r+yDBzBecix4eaKS7cpJ8FGgouKi2nnbj6bBR817fIXy Z8YBm0f70rkNzuQAtHcrfbLww2jD5x3GCN/HJPIGzt0SMyCxnWEzxB8OoenyplKer+ad NsgNiyhkJ52ICwSgSpADUR7lUoVLkREvCUdndDDQsYJg8MyNwqRXwjdga6hnlwBTIDJG 4choHtKpG44xDA/XLTpLeeB1s8T/POYjGlABGSc650ZZUZJpMHT+U3B9DYrlN55ylopw hfPA== X-Gm-Message-State: AOAM530CXbbB1nhI4JDCJcOVOd1UnzwPszJwgDLm7dCPlcl0HxWkxM3P KYpSD9SPL+Jl1FsUenCofzdQag== X-Google-Smtp-Source: ABdhPJwtUDo/AEU+wN44OEcc7AdxoOnqTZ02B3zhpDKqDqRd5gONz17nKuvw43h6SxCW1YGZ7BgVUQ== X-Received: by 2002:ad4:4e86:: with SMTP id dy6mr2312415qvb.4.1611602368593; Mon, 25 Jan 2021 11:19:28 -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 s6sm9047638qtx.63.2021.01.25.11.19.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Jan 2021 11:19:28 -0800 (PST) From: Pavel Tatashin <pasha.tatashin@soleen.com> 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 v10 02/18] arm64: hibernate: variable pudp is used instead of pd4dp Date: Mon, 25 Jan 2021 14:19:07 -0500 Message-Id: <20210125191923.1060122-3-pasha.tatashin@soleen.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210125191923.1060122-1-pasha.tatashin@soleen.com> References: <20210125191923.1060122-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-20210125_141930_872289_6D93FAAD X-CRM114-Status: GOOD ( 13.08 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: <linux-arm-kernel.lists.infradead.org> List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe> List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/> List-Post: <mailto:linux-arm-kernel@lists.infradead.org> List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org> Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org |
Series |
arm64: MMU enabled kexec relocation
|
expand
|
diff --git a/arch/arm64/kernel/hibernate.c b/arch/arm64/kernel/hibernate.c index 9c9f47e9f7f4..0a54d81c90f9 100644 --- a/arch/arm64/kernel/hibernate.c +++ b/arch/arm64/kernel/hibernate.c @@ -190,10 +190,10 @@ static int trans_pgd_map_page(pgd_t *trans_pgd, void *page, pgdp = pgd_offset_pgd(trans_pgd, dst_addr); if (pgd_none(READ_ONCE(*pgdp))) { - pudp = (void *)get_safe_page(GFP_ATOMIC); - if (!pudp) + p4dp = (void *)get_safe_page(GFP_ATOMIC); + if (!pgdp) return -ENOMEM; - pgd_populate(&init_mm, pgdp, pudp); + pgd_populate(&init_mm, pgdp, p4dp); } p4dp = p4d_offset(pgdp, dst_addr);
There should be p4dp used when p4d page is allocated. This is not a functional issue, but for the logical correctness this should be fixed. Fixes: e9f6376858b9 ("arm64: add support for folded p4d page tables") Signed-off-by: Pavel Tatashin <pasha.tatashin@soleen.com> --- arch/arm64/kernel/hibernate.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)