Received: by 2002:a25:ab43:0:0:0:0:0 with SMTP id u61csp2418191ybi; Sun, 9 Jun 2019 11:15:26 -0700 (PDT) X-Google-Smtp-Source: APXvYqyP7uL+4/8pEmFsTLjbrFG4uIZYKeIAZIHkSFKU9BR+A4RG++p6A+6tJRwRdbP6W/OGNBFe X-Received: by 2002:a17:90a:7f02:: with SMTP id k2mr17254935pjl.78.1560104125998; Sun, 09 Jun 2019 11:15:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560104125; cv=none; d=google.com; s=arc-20160816; b=LvjibbOv9LZliYtM5QshSbwmgeCNh131YJDPRgi4i/GfSNsZTO1c1JVMghxzGthZQ7 PGXaT1YQ9giQarDAZG01guXCbYpzhSwXF1Zcro2zIH7hyVoVBW05o+hCz4O1vRHZMoyn exWzTqEwDAUFtzdDBAY2WLH013be6VI+IPoybqMh2KtpOnOxMDwm+ipNKI6AEgM9KP3w 9nsUjdg1ojttXNLwVwhtZXldYz68i2W4k3I4trToeDgVZIUKzr40i2+maLPER8x79X6y BRMh8VLIX5N0cIG/fyb+syllOhvo2NyINrReKqbK0JggJS2vXGgNJLgLUBPdQ70k2QAx AeiA== 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=8aInQFVV+Mj9rqvFtwMdXUG8m4pdU3D+iGBNPYXXvWQ=; b=ApoSwf4+BO7Y4g7K6aD1O+igqaEgWkXAy5ehhZhX7ewUZWj545u0HUdBmLDf7/GmM+ q/RZMujWV9hjOl7DYUxj35ANqBXFd2iZOCEhT3COlHYUBqMT30Icxhpcsp8sevLk1nbS b/3e6eVouW+cy8QitzPeBXeL+QG/AcPs+uCIVOXAAOypr0QRCRrG08Mqrf5w+QbU3vZo Le/NTSC2+HX17GdUIGZX1J+grKTPBR4gpY7BPZtW2EKleIa2YxIQF+ERJTlSJgFmIXcc 5f61CiJ1WuOIo+p2LwSHu3/eN4CfcMvHBUpVpHBAWNNAdZhcdZHcfIodwRbw19QnQtm4 QUJA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=NWoDsypW; 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 j6si7743029pfi.184.2019.06.09.11.15.10; Sun, 09 Jun 2019 11:15:25 -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=NWoDsypW; 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 S1733196AbfFIRAp (ORCPT + 99 others); Sun, 9 Jun 2019 13:00:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:37400 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387911AbfFIRAn (ORCPT ); Sun, 9 Jun 2019 13:00:43 -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 E863920868; Sun, 9 Jun 2019 17:00:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560099642; bh=iQ9cgGFXSrFXhBiNT/DWPtoJeGoh0CSSX69C0dALbLo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NWoDsypW5cWJElimzYLVd1R/IXfmoVa03in3kLJSK94Oam/Sic0qZwGGl0JKcH0J8 NjeTUBEMMAmJfe2ew79f8IHvoukVHOdEQ+LZ+eSV0sSzIiEyMZj5Ro9yxiKLIiVJnh Dbwjc2f5onVUUBhk0VNm6lc7u6pu7qifw+GfTRkA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Nicolai Stange , Jiri Kosina , "Peter Zijlstra (Intel)" , Andy Lutomirski , Borislav Petkov , Dave Hansen , Frederic Weisbecker , Joerg Roedel , Linus Torvalds , Thomas Gleixner , Ingo Molnar , Sasha Levin Subject: [PATCH 4.4 113/241] x86/mm: Remove in_nmi() warning from 64-bit implementation of vmalloc_fault() Date: Sun, 9 Jun 2019 18:40:55 +0200 Message-Id: <20190609164151.056749491@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190609164147.729157653@linuxfoundation.org> References: <20190609164147.729157653@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 [ 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