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,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 54E8DC282CE for ; Wed, 22 May 2019 19:52:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 25E632089E for ; Wed, 22 May 2019 19:52:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558554725; bh=XM7RHdNJauAwOMwfwdqnMa9dz1dZlVcDBp8bKz6G+t4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=R53lLi873lw+tZby7X5pbPkodk7rRJm5ElF5qcUFMDq0/fMdbKmDOp14HHe6ut0dP ErMQUZ9ujIK8noZzghQDcOyDpvQX4PbtwSaIq91ukqsRC5MgmtzEXv73nbCbkAcQrd onMwx1ccVtknGC1iuO5Ib+hMm5gdzmr8zBKweOu4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731921AbfEVT0Q (ORCPT ); Wed, 22 May 2019 15:26:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:47720 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731913AbfEVT0Q (ORCPT ); Wed, 22 May 2019 15:26:16 -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 5BE2E21841; Wed, 22 May 2019 19:26:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558553175; bh=XM7RHdNJauAwOMwfwdqnMa9dz1dZlVcDBp8bKz6G+t4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VCPwxUzynt1nnBFOd+lr40amgSBuwSg3J5X9wbYQtLbWIpKUKJl9Y+gHILRXIbLqL dMqCh55ag3EHeeLGyY2L2qEpx/GXBLCDqNEFNbPsCITnIcq8gFsSv3KOUrtLy2gJvu 3XBTyDNRostzzaqasMkZNXxzxIXS8oBdftSV15yU= 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 5.0 094/317] x86/mm: Remove in_nmi() warning from 64-bit implementation of vmalloc_fault() Date: Wed, 22 May 2019 15:19:55 -0400 Message-Id: <20190522192338.23715-94-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190522192338.23715-1-sashal@kernel.org> References: <20190522192338.23715-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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 9d5c75f022956..55233dec5ff4a 100644 --- a/arch/x86/mm/fault.c +++ b/arch/x86/mm/fault.c @@ -359,8 +359,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