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=-9.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,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 D30C8C282CE for ; Wed, 22 May 2019 19:32:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A70A52089E for ; Wed, 22 May 2019 19:32:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558553537; bh=cxE51xDuQ99B+iO3+SW+CxV1y6ZoG6k/FmVMMKosy6E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=16ZczYMb04oq+skn7L6jtKmLEnpuZPUFyJAmxRwVfXGFt1rnFF+svK3klTVc2FdKe OKLZD37IMjg0N6weywl+KRW9LA3XESAPYuk+k7Ei/5RhcT7cb3tgACvnUA7tRFaNjY /+GHQJ1/pgxQANuhuV1Q4UWc/xxc/qOAfniehdSs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387794AbfEVTcQ (ORCPT ); Wed, 22 May 2019 15:32:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:55868 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387762AbfEVTcH (ORCPT ); Wed, 22 May 2019 15:32:07 -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 B8E382089E; Wed, 22 May 2019 19:32:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558553527; bh=cxE51xDuQ99B+iO3+SW+CxV1y6ZoG6k/FmVMMKosy6E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=n8W+mZ6pYth4s8bvSWlxauNjNR36JhY5yuUlCvv2qM6I+uVWhFkllMSrF1zC43eQR OV1+Mn2dZRwcfcWzmnvZ1RO3ATH+WM/vDmZQ7eF+0H5+sb+pZTCSIObH9cK7FFVyvW nT3hEy0TJjKHroxD0DfX62GLvNQNem3UZfwkllAk= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jiri Kosina , Nicolai Stange , Peter Zijlstra , Andy Lutomirski , Borislav Petkov , Dave Hansen , Frederic Weisbecker , Joerg Roedel , Linus Torvalds , Thomas Gleixner , Ingo Molnar , Sasha Levin Subject: [PATCH AUTOSEL 4.4 25/92] x86/mm: Remove in_nmi() warning from 64-bit implementation of vmalloc_fault() Date: Wed, 22 May 2019 15:30:20 -0400 Message-Id: <20190522193127.27079-25-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190522193127.27079-1-sashal@kernel.org> References: <20190522193127.27079-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: Jiri Kosina [ Upstream commit a65c88e16f32aa9ef2e8caa68ea5c29bd5eb0ff0 ] In-NMI warnings have been added to vmalloc_fault() via: ebc8827f75 ("x86: Barf when vmalloc and kmemcheck faults happen in NMI") back in the time when our NMI entry code could not cope with nested NMIs. These days, it's perfectly fine to take a fault in NMI context and we don't have to care about the fact that IRET from the fault handler might cause NMI nesting. This warning has already been removed from 32-bit implementation of vmalloc_fault() in: 6863ea0cda8 ("x86/mm: Remove in_nmi() warning from vmalloc_fault()") but the 64-bit version was omitted. Remove the bogus warning also from 64-bit implementation of vmalloc_fault(). Reported-by: Nicolai Stange Signed-off-by: Jiri Kosina Acked-by: Peter Zijlstra (Intel) Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Dave Hansen Cc: Frederic Weisbecker Cc: Joerg Roedel Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Fixes: 6863ea0cda8 ("x86/mm: Remove in_nmi() warning from vmalloc_fault()") Link: http://lkml.kernel.org/r/nycvar.YFH.7.76.1904240902280.9803@cbobk.fhfr.pm Signed-off-by: Ingo Molnar Signed-off-by: Sasha Levin --- arch/x86/mm/fault.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c index c4dffae5d9390..462c5c30b9a21 100644 --- a/arch/x86/mm/fault.c +++ b/arch/x86/mm/fault.c @@ -373,8 +373,6 @@ static noinline int vmalloc_fault(unsigned long address) if (!(address >= VMALLOC_START && address < VMALLOC_END)) return -1; - WARN_ON_ONCE(in_nmi()); - /* * Copy kernel mappings over when needed. This can also * happen within a race in page table update. In the later -- 2.20.1