Message ID | 20210125191923.1060122-3-pasha.tatashin@soleen.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <SRS0=yymi=G4=kvack.org=owner-linux-mm@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=-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,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 C664EC433E0 for <linux-mm@archiver.kernel.org>; Mon, 25 Jan 2021 19:19:31 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 69B4F2255F for <linux-mm@archiver.kernel.org>; Mon, 25 Jan 2021 19:19:31 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 69B4F2255F 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 678538D001D; Mon, 25 Jan 2021 14:19:30 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 62B1C8D0001; Mon, 25 Jan 2021 14:19:30 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4CD028D001D; Mon, 25 Jan 2021 14:19:30 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0002.hostedemail.com [216.40.44.2]) by kanga.kvack.org (Postfix) with ESMTP id 368EB8D0001 for <linux-mm@kvack.org>; Mon, 25 Jan 2021 14:19:30 -0500 (EST) Received: from smtpin08.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id E4AE13622 for <linux-mm@kvack.org>; Mon, 25 Jan 2021 19:19:29 +0000 (UTC) X-FDA: 77745261258.08.tin00_1b06c0f27588 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin08.hostedemail.com (Postfix) with ESMTP id C09A01819E769 for <linux-mm@kvack.org>; Mon, 25 Jan 2021 19:19:29 +0000 (UTC) X-HE-Tag: tin00_1b06c0f27588 X-Filterd-Recvd-Size: 4391 Received: from mail-qv1-f51.google.com (mail-qv1-f51.google.com [209.85.219.51]) by imf17.hostedemail.com (Postfix) with ESMTP for <linux-mm@kvack.org>; Mon, 25 Jan 2021 19:19:29 +0000 (UTC) Received: by mail-qv1-f51.google.com with SMTP id u16so4300982qvo.9 for <linux-mm@kvack.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=SJjpfg5mCAS0TafwckqKfCiG48CLdw8TV5DV2jK21p7ZM38RQhCpVO244dvtlJbDPK qdpi81UmbEK2ReUkTTQNF4sw/6qcqjf+YAvm+zkQpycP2RIw39E6e1L3XEtc3kJ/uQDb Dc195P/VmweBqH2b3bXMNHpoMXB8rk1T4HMJy5BMNPftnsSK3OdQhxCJ+o7myWlladgx KBXaOMGAWGRF3vEQb7AlN7z4vPEhueuyT/yleWqbWjs2YmENEiRjG8TUrcg64oRNBzzm Sg1CnSl0yeYy9YjhTeYNXoJlcZQgUtXmDwkLM/ldNKkjSDJxKdmhHTXqKZnqLFUbyL9e Jpiw== X-Gm-Message-State: AOAM532FgVPD7Girr1wMKI6V179vAOxvepAtUUyO6SntT0v1rZPdZCsJ mVg5eUXoYc0C43GrCVQ39EUjVg== 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 Content-Transfer-Encoding: quoted-printable 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: <linux-mm.kvack.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(-)