Received: by 2002:a25:8b12:0:0:0:0:0 with SMTP id i18csp1066799ybl; Wed, 14 Aug 2019 10:10:06 -0700 (PDT) X-Google-Smtp-Source: APXvYqy0Hq96kM/BZZWBo9lmGlbtSMWP30zl2OwQEjAUhNscIrQMfW/sKf+DKCTg7J5oJ0r+H+tH X-Received: by 2002:a17:902:e389:: with SMTP id ch9mr409947plb.23.1565802606090; Wed, 14 Aug 2019 10:10:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565802606; cv=none; d=google.com; s=arc-20160816; b=QbvZZNJTahUm84MUT5P0XnmXzTavMX1tjaLyGE4eVmOLVdEQeC7AmOlEZ8h3QEIO5z LHmktciJCqPqSF1JBTtH8foXxo7cVhtGePWi4V+ZRYsJxzB7X8djoVmxrch2nKtreFek ZM3ls3dsPEoprRIvrso++uK/5fwHQHrQXho0eW9WdiQUQdIrqVUs/RtCwMqWAbENquIs 6lsQcY0vCxWuo45zL31R6bffaBIx+YIvrQIm1mvMiV7nQLC3IFM3g2UhRzSxREiuG4ui kgmaMBEz7HnPD4urTASf4UWqVr6/0oL323iA96s57kicNSVZmdzAFsrbr8V6iMsirIvF Z0BQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=o2LX+5LePs6SQlPV3+b/asPkkJ83ZDArDafgyDTb1i4=; b=WRXRkYXDzR3X+EIs67IzzHf0tcccMiUMiXXgbJk/q3vw23wM9oLCCseWBscWfihgkL vG8nzM5iU4Wve4/r6JCgF5b0uT04MArsNQ0UJtwAcKAiTpsYfJkbMdkQu4TT17TiIbGq GzN0rDwDO0BnHSqMfS2T4LgGeuwJEOyt6GuxjVkyffwS963WUPmomm3pbJ6ZenIyavog F4PYDG9qAzSnq7NtnwP582GG0iNZSjY/DcShS8DgjQRFLUKCx22lEoLur+Co/8aSdtVQ ht5nPeM6WthgaDSVZF1VU+qhCj4v6zVQQE/+yhZTFoxWVfnKJTHgz26qqV6Xok24oi6/ lveQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=KMUXfWqa; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h186si158662pge.110.2019.08.14.10.09.50; Wed, 14 Aug 2019 10:10:06 -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; dkim=pass header.i=@kernel.org header.s=default header.b=KMUXfWqa; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730225AbfHNRIv (ORCPT + 99 others); Wed, 14 Aug 2019 13:08:51 -0400 Received: from mail.kernel.org ([198.145.29.99]:58998 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729734AbfHNRIt (ORCPT ); Wed, 14 Aug 2019 13:08:49 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4E64B2084D; Wed, 14 Aug 2019 17:08:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565802528; bh=XvknwjnuBMf1hFCWUy/MZO+WHgmN+0h1YxygMJT2GyQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KMUXfWqa2lLKvpXr40/qRp6NN2q+hO/VlJeB6uwFiRGXayc9fwiqDtPm74fh7efWZ vt6U6pbWldqa/zOnNalMowlDfQYNA+ORMP0gVENHxqJghlJvMYJ82gN6Bm3Wd+LsCo MC/53EGKU4vHMFS9YdAHFY91PDCpfhRqceuiPuxU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Joerg Roedel , Thomas Gleixner , Dave Hansen Subject: [PATCH 4.19 17/91] x86/mm: Check for pfn instead of page in vmalloc_sync_one() Date: Wed, 14 Aug 2019 19:00:40 +0200 Message-Id: <20190814165750.477975048@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190814165748.991235624@linuxfoundation.org> References: <20190814165748.991235624@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Joerg Roedel commit 51b75b5b563a2637f9d8dc5bd02a31b2ff9e5ea0 upstream. 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: Greg Kroah-Hartman --- arch/x86/mm/fault.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/arch/x86/mm/fault.c +++ b/arch/x86/mm/fault.c @@ -267,7 +267,7 @@ static inline pmd_t *vmalloc_sync_one(pg 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; }