From patchwork Wed Jul 17 07:14:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joerg Roedel X-Patchwork-Id: 11047363 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 1EA80138D for ; Wed, 17 Jul 2019 07:14:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F3BAE205A8 for ; Wed, 17 Jul 2019 07:14:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E4F862859F; Wed, 17 Jul 2019 07:14:55 +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 4428A205A8 for ; Wed, 17 Jul 2019 07:14:55 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2413C8E0003; Wed, 17 Jul 2019 03:14:54 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 1FF976B000A; Wed, 17 Jul 2019 03:14:54 -0400 (EDT) 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 091EE8E0001; Wed, 17 Jul 2019 03:14:54 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by kanga.kvack.org (Postfix) with ESMTP id C4E806B0005 for ; Wed, 17 Jul 2019 03:14:53 -0400 (EDT) Received: by mail-ed1-f69.google.com with SMTP id i44so17447268eda.3 for ; Wed, 17 Jul 2019 00:14:53 -0700 (PDT) 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=q5k3+gcYubZ7T/g6o53+F1W99oG/lraAHoxlon+CyWg=; b=AMsY3axQsl5zoc5BSUbl2XTj2UiA06t14QSi/G88/txHGRBbuvpvsRh9VkqekfYR5U 2NfCnQfRjJ+AcvqTAJ1494aLJDXd8JaLUT4bdsQvplG6tJkh9d62gsTqdTbX1Z1zp3L6 MkNxik/aKxHypJ22iEJAB1qkHAQZjhuCMAi3WtGQnHm7iEe+ZQbNvdxHJjw/71Zum+aF f0OPK85X1GXqrLrRElh7vp+1Vpgd2MaNMA0HWoc2ONvBs9khwCwYDy1TLIdzRiCznsr3 OWQY8cQFfSwZU5b1ijRo7DsZhoqCy4j70m40OygXbzx3xWPDyZz5ZMC9icGEhvsYy8o1 20eA== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of joro@8bytes.org designates 81.169.241.247 as permitted sender) smtp.mailfrom=joro@8bytes.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=8bytes.org X-Gm-Message-State: APjAAAXzl9Ep5y8I9ZcwB3k3qFwGQQ4kc0NVMdgLS21LnSmkqGFMqFG2 K/txSEEJGFr1J0BvLPO8t/eKe2lno+6qdqiZPz5V0HUYuimft4sOdT0FsYY1ARBI+QZj84dLfqS dYd58AaeRPJhZ4r57jgTr+wRDUGAP8xj0QdLx/DiLhbjUzAOdwAdYlVwVvW+WUP9M2Q== X-Received: by 2002:a17:906:4e92:: with SMTP id v18mr30445108eju.57.1563347693392; Wed, 17 Jul 2019 00:14:53 -0700 (PDT) X-Google-Smtp-Source: APXvYqwVSf3653kEOUktTLwEVo68YDGnMuFDwFNAnRQWXvN8R2/y0K7rCdsX2Te08bSsIeDsHAcK X-Received: by 2002:a17:906:4e92:: with SMTP id v18mr30445061eju.57.1563347692573; Wed, 17 Jul 2019 00:14:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563347692; cv=none; d=google.com; s=arc-20160816; b=ZniRpl8EC1SKtT2piC69+VIg7Wkm7puNjmOaFJvPcEg1tHwq+99em5fuSAcNs8WB+3 na+YUyG7KBTThJ/IG0uv1AiQPNkp6L1ERUV/1pTCr5KOQcZXFZZUdKYajXQOWhrAfDYu X9KlX9X21Dg3HsRDcN9VuAeErsV93xf+mV1qp6Ow1YitQnGOmafYjJjYg9VzJ4b3Rw4Q U389eySvzWNB0Osu4SR+fkSTw5XRCi0ZF8Ll3BQlUCUJQOnHVqDgzcteDnX8YY/6VSyc 811XPLAUhWqu80YO27CzDc5FtDQBsDh2g6k3vBQkI0q5TlnqsukRHYGQNUsK7KSdOK8f /kiw== 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=q5k3+gcYubZ7T/g6o53+F1W99oG/lraAHoxlon+CyWg=; b=BDSw3N0mZlk7EQCKLleqmH73+ZA9dJSUXHZrbfchC6TiDW1BLl7WnBRTas6GCebnZR nAcSo6CHd6eBYQuPXg8DfmJEyZwjxptPfZUFu387WuUED2KCETykG9bxU8ZPhmEwJacU 7Kw7NY8o41xhkvhk/mgxN350d68w+YUv8BdFJ4kSe/AJaqzS7+9StZ9iSe5sE4AZ8LyX yocADAibM2gzJwczVlWrpsW8KUuv3iXjO2/rYbUkSKZuZbQCOqVJOJzm9MIV8mfUxPPO 28LfWiaVzAAg/PT8u9mN0DJ5fLCObmfiJPA99lDGmItkkzO+5VT/mKJ1S/8zWpmVRbAD Hg4A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of joro@8bytes.org designates 81.169.241.247 as permitted sender) smtp.mailfrom=joro@8bytes.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=8bytes.org Received: from theia.8bytes.org (8bytes.org. [81.169.241.247]) by mx.google.com with ESMTPS id s18si14384582edd.291.2019.07.17.00.14.52 for (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 17 Jul 2019 00:14:52 -0700 (PDT) Received-SPF: pass (google.com: domain of joro@8bytes.org designates 81.169.241.247 as permitted sender) client-ip=81.169.241.247; Authentication-Results: mx.google.com; spf=pass (google.com: domain of joro@8bytes.org designates 81.169.241.247 as permitted sender) smtp.mailfrom=joro@8bytes.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=8bytes.org 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> 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 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; }