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=ham 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 6483DC32750 for ; Fri, 2 Aug 2019 13:29:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3D26B217D4 for ; Fri, 2 Aug 2019 13:29:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564752586; bh=UICCrWcWaYqSDn+1mUBzxkoemCypfH+4cUefkJzJVyM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=pwEZB/8r4ENRxyM4eqAA8yQC7Gurjnpflec5zRAExrS0W55Gqcjw3HD4PjuLK2eC9 QOoXnM2tCqdectOojm0V2+vb6DNS8v8wgICuB7KRc6KXT0I3yewcifsNp3/1rUsACY 8BKx7HeY+DUB5IB3S3ZRzTiI9d/loev6KbGiLMCQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2394254AbfHBNYs (ORCPT ); Fri, 2 Aug 2019 09:24:48 -0400 Received: from mail.kernel.org ([198.145.29.99]:35502 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2394232AbfHBNYp (ORCPT ); Fri, 2 Aug 2019 09:24:45 -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 653BF20880; Fri, 2 Aug 2019 13:24:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564752285; bh=UICCrWcWaYqSDn+1mUBzxkoemCypfH+4cUefkJzJVyM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oL4uUu7x4Fop61Jfyx8vg44xl4Nw1Qb7Z5ChJ/o3Pgq5ZnymNL65gLCtC+/QS7brS Q7Fn04VKuRD0pXzMjgWbzlU4iloY5i7c9B/659jhSGiW0b1bfHkWSbLz0KEjYq1f3a ASHdixcDC3Rfnk2R602uVC/MvUM0ttkfra0EzDEM= 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 4.14 10/30] x86/mm: Sync also unmappings in vmalloc_sync_all() Date: Fri, 2 Aug 2019 09:24:02 -0400 Message-Id: <20190802132422.13963-10-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190802132422.13963-1-sashal@kernel.org> References: <20190802132422.13963-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore 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 [ Upstream commit 8e998fc24de47c55b47a887f6c95ab91acd4a720 ] With huge-page ioremap areas the unmappings also need to be synced between all page-tables. Otherwise it can cause data corruption when a region is unmapped and later re-used. Make the vmalloc_sync_one() function ready to sync unmappings and make sure vmalloc_sync_all() iterates over all page-tables even when an unmapped PMD is found. 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-3-joro@8bytes.org Signed-off-by: Sasha Levin --- arch/x86/mm/fault.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c index 407522db3d9ea..27cab342a0b25 100644 --- a/arch/x86/mm/fault.c +++ b/arch/x86/mm/fault.c @@ -260,11 +260,12 @@ static inline pmd_t *vmalloc_sync_one(pgd_t *pgd, unsigned long address) pmd = pmd_offset(pud, address); pmd_k = pmd_offset(pud_k, address); - if (!pmd_present(*pmd_k)) - return NULL; - if (!pmd_present(*pmd)) + if (pmd_present(*pmd) != pmd_present(*pmd_k)) set_pmd(pmd, *pmd_k); + + if (!pmd_present(*pmd_k)) + return NULL; else BUG_ON(pmd_pfn(*pmd) != pmd_pfn(*pmd_k)); @@ -286,17 +287,13 @@ void vmalloc_sync_all(void) spin_lock(&pgd_lock); list_for_each_entry(page, &pgd_list, lru) { spinlock_t *pgt_lock; - pmd_t *ret; /* the pgt_lock only for Xen */ pgt_lock = &pgd_page_get_mm(page)->page_table_lock; spin_lock(pgt_lock); - ret = vmalloc_sync_one(page_address(page), address); + vmalloc_sync_one(page_address(page), address); spin_unlock(pgt_lock); - - if (!ret) - break; } spin_unlock(&pgd_lock); } -- 2.20.1