Received: by 2002:a25:ad19:0:0:0:0:0 with SMTP id y25csp499702ybi; Wed, 17 Jul 2019 00:16:44 -0700 (PDT) X-Google-Smtp-Source: APXvYqxbU8Y/RmtwDqc7tMvnhu31Hj4VWbOnusEJT1T3Itq+RYSvmnHsKTxhiJIb4tdLk34S1Q/7 X-Received: by 2002:a17:902:a5c7:: with SMTP id t7mr41897807plq.288.1563347804390; Wed, 17 Jul 2019 00:16:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563347804; cv=none; d=google.com; s=arc-20160816; b=sOSGDjlltERW6BsggJrD7qVKjgbQB9N4WLFQEzrSBIX7hIzlH35MrMUbV5xwUzwk4U d1i/tU8rekvtKXGuZfqoxYC6tYbXyWYiJ0yDGFwfD3UvcECPwDP6oUVwMvvMjCPTmJmD 7v6k/+zGJNQMo0NUho3mGUW625GnOU93CmXvrgoWB9zKm8IV3tFqb7QbVeaAOLKoSWUC r6Nd4Ko9r8kSh7rNRv7Q2j4vTR8NDksw4YgmgVy2DL8nT/oj86L4urPWekO0qob0uWzR JL2cBaSMQDSva68fr8tS2ziRU/WfPSnJaVBJFUB0qGDi+LeZb+l9rGsLQzUUsJt4HZBc 8PhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from; bh=q5k3+gcYubZ7T/g6o53+F1W99oG/lraAHoxlon+CyWg=; b=LuXRRoWAr43zpka6sfoKzlz0WAXFidki9h7GAIhuSil7DO5JXoC4f6I0l29m/t+6X1 akmfvL4aHffx3fgdhmrI+XKkaQMuVaMwCH/wnWFKofBFDId0JJSxhIjUrlxpEuPxzM4F IYNedogmHtQZ9L2Y4djMwFrCmxymGyO8lMDBC/1pfDJbkDgV9eqnqOvhKeuR8sn384I+ pNdDqRUJnaM5EcIHJJzXVeISX/N0+duRU5UZAY08mJn/jWwptBK4fUbmpvB1XpyRLNgz u7sr31mnjPfe2yXQjLKcYvWh4tgTLnOXqDIpew3IitLQLpAT9TlsKPmCO3TzJC8mgNKb W4zQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=8bytes.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 18si22870448pgf.457.2019.07.17.00.16.27; Wed, 17 Jul 2019 00:16:44 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=8bytes.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726028AbfGQHOy (ORCPT + 99 others); Wed, 17 Jul 2019 03:14:54 -0400 Received: from 8bytes.org ([81.169.241.247]:35618 "EHLO theia.8bytes.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725890AbfGQHOx (ORCPT ); Wed, 17 Jul 2019 03:14:53 -0400 Received: by theia.8bytes.org (Postfix, from userid 1000) id D0A89260; Wed, 17 Jul 2019 09:14:51 +0200 (CEST) From: Joerg Roedel To: Dave Hansen , Andy Lutomirski , Peter Zijlstra , Thomas Gleixner , Ingo Molnar , Borislav Petkov Cc: Andrew Morton , linux-kernel@vger.kernel.org, linux-mm@kvack.org, Joerg Roedel Subject: [PATCH 1/3] x86/mm: Check for pfn instead of page in vmalloc_sync_one() Date: Wed, 17 Jul 2019 09:14:37 +0200 Message-Id: <20190717071439.14261-2-joro@8bytes.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190717071439.14261-1-joro@8bytes.org> References: <20190717071439.14261-1-joro@8bytes.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Joerg Roedel 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 --- 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 794f364cb882..4a4049f6d458 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.17.1