From patchwork Mon Nov 19 10:16:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 10688389 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 652D914D6 for ; Mon, 19 Nov 2018 10:17:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5574329B89 for ; Mon, 19 Nov 2018 10:17:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4990B29C25; Mon, 19 Nov 2018 10:17:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0414129B89 for ; Mon, 19 Nov 2018 10:17:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E7BFF6B1A3E; Mon, 19 Nov 2018 05:17:16 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id E2BBD6B1A3F; Mon, 19 Nov 2018 05:17:16 -0500 (EST) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CF45E6B1A40; Mon, 19 Nov 2018 05:17:16 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by kanga.kvack.org (Postfix) with ESMTP id 9915D6B1A3E for ; Mon, 19 Nov 2018 05:17:16 -0500 (EST) Received: by mail-qk1-f200.google.com with SMTP id k203so68580361qke.2 for ; Mon, 19 Nov 2018 02:17:16 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:message-id:in-reply-to:references; bh=atUER95Er8vxVyyJe2WQJsrmwnJCko1YRxZJ2dnB2Zs=; b=H9aD0CpzqcvdYHoO08+2pL1+JmDmC9cf1Qq+IEDTlu3GTNN3kEVXn5VQe8dKjm98PX wjGzMDMjFPHTid19zoQUVtlfd0odTEoIG7XnkO/siYINxMkBYFJ0m1hqw1IZpeqegovG 2cFN9i2PxHA4Q0O3vEKW8Lg2JUSPJthmqLkkKjISAAkURej/yyZKAswzopttm3/AojVw 9Q4cQbjb9m3G+ag1WbCyHaUcsl5g2jxjpFXXtb9452RLMDax3oPoA5XcnklM/ejQm7Ax HYSSEHLRMXNOERv2mjuu/Q8YHeCPRWnLnLkCERsNhbRSbM/es0tvQE7fEmfbnSdwLJbS HkRw== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of david@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com X-Gm-Message-State: AGRZ1gL89LKKuDtPnsmDWoofvyS8dED323F+50ZbyGsDgDzCQJ+s+jyD slFjLuxBSPGAa+9kfoZT8z7/UhHFQL9WlnUuYQoAWBl3kK9hA9Ee+L+AO9xNN5xY9mYQSfkpOsc 9AVVyW+geG5nBqUdIdkbnCWNwK3qnTF8qZupPyQ4OFrLNs7/764NeD6vU/29CEPyeNA== X-Received: by 2002:ac8:1e84:: with SMTP id c4mr20499010qtm.181.1542622636393; Mon, 19 Nov 2018 02:17:16 -0800 (PST) X-Google-Smtp-Source: AJdET5cuUCyxSDa3gWbiC+05vYdwh0VTJJerr2vfIIWvoU+AihJFrguPYesmXHta666UX5DPDxim X-Received: by 2002:ac8:1e84:: with SMTP id c4mr20498973qtm.181.1542622635680; Mon, 19 Nov 2018 02:17:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542622635; cv=none; d=google.com; s=arc-20160816; b=WtAkyPza79lijivVywQV1BKBf+RPcKyc0Y7J5AEC+lU5c+zW+gSvJS15tu0+atkDLa X1ze6sYzgba7RgLKm66Enm56+0F5AdCjBylCcW0Cv3lXh2yx60LtTw1DjjQcV/pPzOS0 PmLpCtS8unGOmXps/xm4443VDwEwLb8s4DB5ueM1+udpdX/Eyy04DbYAuu9/CMBeevVy +dGBBCIGHxdTNMVT8f0+0GN7E9gFOxUbMWGyPRzTC3SNR9ERVitSGvHjRA6A5FUt2NQh CBB9qURIURwsviMFl6mAs/mHI2cIrGxiadBJUBw843YbsFBx37VV/YLzGQqOxH4pVxRC dZYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from; bh=atUER95Er8vxVyyJe2WQJsrmwnJCko1YRxZJ2dnB2Zs=; b=bu0HN2RFn9ishWIo6JKXHeB0AYGm5Y/fxFREVlbMAd/qTjnSBMq8SyQ7iguUZg0VjC dOJi78ViIz6ze30VVVM33tcJlRkdETR/0+wBYKYKwPhkfW34jht8/5TP/21xp9KhKy9e +C1p2hJpXi3b/oLEsKl1XDWMrvkfmxzxVmL7WGCxSWS01T28graYzgcM2nz3Ls56DP0i 3j+0Wf9Snj5GtFW0tpeLO+8p3ZcCB1DnaCZj0ViGZPzz7u9nyB97wXEiVIB4Q8vYe/IW GKIsT8JDwIsirhaNyfqFxk6Sf2Q5sWCJjAwuXuA/awiscdapywQnAYW2KEv5LxgrDM1r 1erw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of david@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from mx1.redhat.com (mx1.redhat.com. [209.132.183.28]) by mx.google.com with ESMTPS id f9si2302847qtq.274.2018.11.19.02.17.15 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 Nov 2018 02:17:15 -0800 (PST) Received-SPF: pass (google.com: domain of david@redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; Authentication-Results: mx.google.com; spf=pass (google.com: domain of david@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C2AE6C049581; Mon, 19 Nov 2018 10:17:14 +0000 (UTC) Received: from t460s.redhat.com (ovpn-117-77.ams2.redhat.com [10.36.117.77]) by smtp.corp.redhat.com (Postfix) with ESMTP id 968D2105706D; Mon, 19 Nov 2018 10:17:08 +0000 (UTC) From: David Hildenbrand To: linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, devel@linuxdriverproject.org, linux-fsdevel@vger.kernel.org, linux-pm@vger.kernel.org, xen-devel@lists.xenproject.org, kexec-ml , pv-drivers@vmware.com, David Hildenbrand , "Rafael J. Wysocki" , Pavel Machek , Len Brown , Andrew Morton , Matthew Wilcox , Michal Hocko , "Michael S. Tsirkin" Subject: [PATCH v1 7/8] PM / Hibernate: use pfn_to_online_page() Date: Mon, 19 Nov 2018 11:16:15 +0100 Message-Id: <20181119101616.8901-8-david@redhat.com> In-Reply-To: <20181119101616.8901-1-david@redhat.com> References: <20181119101616.8901-1-david@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Mon, 19 Nov 2018 10:17:15 +0000 (UTC) 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: X-Virus-Scanned: ClamAV using ClamSMTP Let's use pfn_to_online_page() instead of pfn_to_page() when checking for saveable pages to not save/restore offline memory sections. Cc: "Rafael J. Wysocki" Cc: Pavel Machek Cc: Len Brown Cc: Andrew Morton Cc: Matthew Wilcox Cc: Michal Hocko Cc: "Michael S. Tsirkin" Suggested-by: Michal Hocko Signed-off-by: David Hildenbrand Acked-by: Michal Hocko Acked-by: Rafael J. Wysocki --- kernel/power/snapshot.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c index 640b2034edd6..87e6dd57819f 100644 --- a/kernel/power/snapshot.c +++ b/kernel/power/snapshot.c @@ -1215,8 +1215,8 @@ static struct page *saveable_highmem_page(struct zone *zone, unsigned long pfn) if (!pfn_valid(pfn)) return NULL; - page = pfn_to_page(pfn); - if (page_zone(page) != zone) + page = pfn_to_online_page(pfn); + if (!page || page_zone(page) != zone) return NULL; BUG_ON(!PageHighMem(page)); @@ -1277,8 +1277,8 @@ static struct page *saveable_page(struct zone *zone, unsigned long pfn) if (!pfn_valid(pfn)) return NULL; - page = pfn_to_page(pfn); - if (page_zone(page) != zone) + page = pfn_to_online_page(pfn); + if (!page || page_zone(page) != zone) return NULL; BUG_ON(PageHighMem(page));