From mboxrd@z Thu Jan 1 00:00:00 1970 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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 85989C32750 for ; Fri, 2 Aug 2019 13:21:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 53B762173E for ; Fri, 2 Aug 2019 13:21:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564752073; bh=iidRGgO938CA7zwhRn7puJdvgC777KdaTKF7uzn9PWM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Jj2/4tN+wbnVu9bDO0iSWUi5BHJY7X3MzSl/owG3mtB7n5L62Rg6NWUCRVg9vBC1p kv63nze3Kn38235KsCwQI5rBeYt+PjJL4v5DK4Cvf/qBuEqee9Yz2H3p0cZYgNMIh7 EbEIkhOs0pOyDpabuyBqpPrVKivgk2T3KCQ45ee8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2393500AbfHBNU5 (ORCPT ); Fri, 2 Aug 2019 09:20:57 -0400 Received: from mail.kernel.org ([198.145.29.99]:59320 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2393471AbfHBNUu (ORCPT ); Fri, 2 Aug 2019 09:20:50 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1A3E121871; Fri, 2 Aug 2019 13:20:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564752049; bh=iidRGgO938CA7zwhRn7puJdvgC777KdaTKF7uzn9PWM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GFchEEqydfU4UkRmDyLX/vzGvYKHdGelQ5u/fEPV558IcqQO1MbEUUYBXHJWMeHDu roSyqhqBLcyJFzgHHDj4iDAQeKz/Iek5zpoVbjjxJeuQd0tw8HuxDHFgF0XWpi7Kw9 +OTLre+Bu4aw0MQmmKVdLXRh7y1ovvKBXe/51xvM= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Joerg Roedel , Thomas Gleixner , Dave Hansen , Sasha Levin Subject: [PATCH AUTOSEL 5.2 34/76] x86/mm: Check for pfn instead of page in vmalloc_sync_one() Date: Fri, 2 Aug 2019 09:19:08 -0400 Message-Id: <20190802131951.11600-34-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190802131951.11600-1-sashal@kernel.org> References: <20190802131951.11600-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Joerg Roedel [ Upstream commit 51b75b5b563a2637f9d8dc5bd02a31b2ff9e5ea0 ] Do not require a struct page for the mapped memory location because it might not exist. This can happen when an ioremapped region is mapped with 2MB pages. Fixes: 5d72b4fba40ef ('x86, mm: support huge I/O mapping capability I/F') Signed-off-by: Joerg Roedel Signed-off-by: Thomas Gleixner Reviewed-by: Dave Hansen Link: https://lkml.kernel.org/r/20190719184652.11391-2-joro@8bytes.org Signed-off-by: Sasha Levin --- arch/x86/mm/fault.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c index 46df4c6aae46a..499331be9bfe8 100644 --- a/arch/x86/mm/fault.c +++ b/arch/x86/mm/fault.c @@ -200,7 +200,7 @@ static inline pmd_t *vmalloc_sync_one(pgd_t *pgd, unsigned long address) if (!pmd_present(*pmd)) set_pmd(pmd, *pmd_k); else - BUG_ON(pmd_page(*pmd) != pmd_page(*pmd_k)); + BUG_ON(pmd_pfn(*pmd) != pmd_pfn(*pmd_k)); return pmd_k; } -- 2.20.1