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.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,T_DKIMWL_WL_HIGH,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 64669C072B1 for ; Thu, 30 May 2019 03:55:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3E25124E7D for ; Thu, 30 May 2019 03:55:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559188549; bh=NmL3+EBASmUWcAlWbQujczKBhKSiMDrZbuESWkOqp/4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=WgumiI9bWhIZ9F18MRTVdLHZ0qhy7RjsM+xN/vL5h1qe3pEoceMJvpYpJ5PO9KUep Tvx3c4V6crAYyaS8YZCEc9ILAnIb+og5eAjqt1FYtMaWIYw9X9QwOj9bJJudow/4C0 OC7Uv8nSl7C4OeIX0OYKGx3/uoCWt+CtVAQZ3zQM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387812AbfE3Dzm (ORCPT ); Wed, 29 May 2019 23:55:42 -0400 Received: from mail.kernel.org ([198.145.29.99]:53854 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730467AbfE3DTH (ORCPT ); Wed, 29 May 2019 23:19:07 -0400 Received: from localhost (ip67-88-213-2.z213-88-67.customer.algx.net [67.88.213.2]) (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 F1BE424837; Thu, 30 May 2019 03:19:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559186347; bh=NmL3+EBASmUWcAlWbQujczKBhKSiMDrZbuESWkOqp/4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QKU1QDr1odGF4fGatDadfdZ7G5hFT54tzzVDOn41TaCRpyAzAFAj7f+P631KAXg87 ecCWpx2KJNCRFCuNvRPsYhlG7WRMYDa5G3FGO/6pkQYPKQjKSpkcN7+Z8c9WO4v+Sb 9PeK6s8vhVxuDXQXKAKJ1UavNr0wRWWb/nEsAeAM= 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.14 081/193] x86/mm: Remove in_nmi() warning from 64-bit implementation of vmalloc_fault() Date: Wed, 29 May 2019 20:05:35 -0700 Message-Id: <20190530030500.105596054@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190530030446.953835040@linuxfoundation.org> References: <20190530030446.953835040@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 794c35c4ca736..b162f92fd55cf 100644 --- a/arch/x86/mm/fault.c +++ b/arch/x86/mm/fault.c @@ -426,8 +426,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