From patchwork Sat Oct 28 13:43:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ingo Molnar X-Patchwork-Id: 159271 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:d641:0:b0:403:3b70:6f57 with SMTP id cy1csp1225573vqb; Sat, 28 Oct 2023 06:44:08 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHLNlDiMih1xNMIpRpA/osQArRHjudp58b+L6XMBsBwL/9bDtfU3smHaSI25OEBtJENylk7 X-Received: by 2002:a05:6a00:134c:b0:6ba:2ba7:b9cb with SMTP id k12-20020a056a00134c00b006ba2ba7b9cbmr6600345pfu.12.1698500647916; Sat, 28 Oct 2023 06:44:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698500647; cv=none; d=google.com; s=arc-20160816; b=cIpPcuLHUqrx/0ixShWjVcrOxWuR1d7yRrQznStlHPHAhlP5l0ZT2cWOxi/Yt6Ikb9 8foe7MJtF/cxJdQmh5+N6py1v2BBfeLvqkQd9ijluytDnWOCzEGU/6nXYxbpkLYU0a8e HwxoS30JqrJc569x3aCnCx8EbAjXLbXtYuRCJ/SjydnvC/QLC62dp2EvnJ8239svssse rRAe/Dlo4rgGoFKY6gRlVORSX6ezDFhwu3AC0ik5zc1fcKi4938ZfdaBxAji2O0uzzc6 BE6t3kEXRzwlKFJiVZ7g5bNXo4FKjg0aUq7K31gDpIJ0Xh6qfSI8P1uHdRIRj4bWpz6q QWSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-disposition:mime-version:message-id :subject:cc:to:from:date:sender:dkim-signature; bh=FeSH/1L4tOlbWkskU7CQ0rV9kqxc5jadtema2B1aPjE=; fh=9myCC+6GOQO5XgkniR+mXPEsTi/QFZOo17hhsESmiSc=; b=pxGGwoWacAO88WMGT/NIAWYl60x0LJz1dG22EembDagNZmyJRcSG7tBpsEs6BR+Xu4 J+gUI6J99WTxSKntmwTn+WgBfjfOyTR5XknXjODvzfBHpRmHFxvs5xRMzgvitcklnz4X jO4zgYFEaiUT30EZe1egLHQ6d9GYezl6s+U7iKa/WdSuNYNOTSOq4HXISv4JiIPStjYb V+wSRER6iri3WzbBteSDvqmdscUpc2kx8wHYXhCfyE3VHSDZ6/aC/OVMn4vQZhzQ/VqY 9WXbHfcrbpTBNu8ybrss/40DcDNMmArEx+Ui89jx4Wn4abHAGcFt4MPPXFIYYxl+T4IP IFdQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=gLwr8vSV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id t185-20020a6381c2000000b005b967ddd984si640756pgd.781.2023.10.28.06.44.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Oct 2023 06:44:07 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=gLwr8vSV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id AD159802AFFC; Sat, 28 Oct 2023 06:44:05 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230140AbjJ1Nns (ORCPT + 28 others); Sat, 28 Oct 2023 09:43:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57912 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229745AbjJ1Nnr (ORCPT ); Sat, 28 Oct 2023 09:43:47 -0400 Received: from mail-ed1-x532.google.com (mail-ed1-x532.google.com [IPv6:2a00:1450:4864:20::532]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 44EBF11B for ; Sat, 28 Oct 2023 06:43:44 -0700 (PDT) Received: by mail-ed1-x532.google.com with SMTP id 4fb4d7f45d1cf-54041e33845so4541408a12.3 for ; Sat, 28 Oct 2023 06:43:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698500622; x=1699105422; darn=vger.kernel.org; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :sender:from:to:cc:subject:date:message-id:reply-to; bh=FeSH/1L4tOlbWkskU7CQ0rV9kqxc5jadtema2B1aPjE=; b=gLwr8vSVI6Fu/zMAs0HfnJFV/IW7gVgo7ndVwFxY4xaiwIQg5yIH/tC5ju0pfnO7gM bwWK5wIYO6E7x794xhJZwO2vvGE1cTGz8S2r9O/nbbVeifU25UhaNOJuyMGsq7vwe/8k Vl9hlib6PkCSxhUZE++Yth25gnTp7xD/fx/fFaaF8LlQ+9UoTFv/cUipG+LRfNdQRwr/ GzQEhPUd1O8Dq3RfnMcIXpagXO6W5spd+RU+qXjKWxy7sA7QArT7Kmf9gNf8GbKDLeWh eUEBulVuk4tFB/+YE3N9V9Ex9Z+dXsGIl4SfzNWtxRrKJIMFeY14nPPWfMCjQGJFEYOr fh1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698500622; x=1699105422; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :sender:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=FeSH/1L4tOlbWkskU7CQ0rV9kqxc5jadtema2B1aPjE=; b=ueKF0KdsRIubm2SUgfoGW30rfzUAyYW1AWw8uIGPt6/mKXatlvKdEdlnCYxVWwYMFz 9B0zko+PDOq8OY7M64esk2qUM6p0tv7aqobxUILFSSOadcuiayRU9E8O4lyn6n09fXgC Lk1BmVzN1axNsFKP5iVKnjxzvEYsK0iGIUUAtrFtoHcSOH9oDV8hP9srmRk95ykStb2n hsGSr+dkePeUY9F9yz4/ZbZpXOqOc3oUymdhQhHGx2RXxdmF+/M8ZgPwtIBFHYsJ8zOW s31ABceePVs1qJPVEYsn5bJ3RBovrWWi+06CcHaYw1FjHep8aTA2drgugno0FiIt/gAS gVnA== X-Gm-Message-State: AOJu0Yx7AmEaATs1GsLnIinfzbkbo2ybE85gIZETg6vM8t5FwlFzXarG AAAmXBuA+Q+1xiS8MJzRfmWLrJrK/z0= X-Received: by 2002:aa7:c6c9:0:b0:523:100b:462b with SMTP id b9-20020aa7c6c9000000b00523100b462bmr4910601eds.5.1698500622540; Sat, 28 Oct 2023 06:43:42 -0700 (PDT) Received: from gmail.com (1F2EF1E7.nat.pool.telekom.hu. [31.46.241.231]) by smtp.gmail.com with ESMTPSA id p5-20020a056402074500b0053e67bcb3e7sm2839754edy.82.2023.10.28.06.43.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Oct 2023 06:43:41 -0700 (PDT) Sender: Ingo Molnar Date: Sat, 28 Oct 2023 15:43:39 +0200 From: Ingo Molnar To: Linus Torvalds Cc: linux-kernel@vger.kernel.org, Thomas Gleixner , Borislav Petkov , Peter Zijlstra , Andrew Morton , "H. Peter Anvin" , "Paul E. McKenney" Subject: [GIT PULL] x86/irq change for v6.7 Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=-1.0 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Sat, 28 Oct 2023 06:44:05 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781007015099139164 X-GMAIL-MSGID: 1781007015099139164 Linus, Please pull the latest x86/irq git tree from: git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-irq-2023-10-28 # HEAD: f44075ecafb726830e63d33fbca29413149eeeb8 x86/nmi: Fix out-of-order NMI nesting checks & false positive warning Fix out-of-order NMI nesting checks resulting in false positive warnings. Thanks, Ingo ------------------> Paul E. McKenney (1): x86/nmi: Fix out-of-order NMI nesting checks & false positive warning arch/x86/kernel/nmi.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c index a0c551846b35..4766b6bed443 100644 --- a/arch/x86/kernel/nmi.c +++ b/arch/x86/kernel/nmi.c @@ -507,12 +507,13 @@ DEFINE_IDTENTRY_RAW(exc_nmi) } this_cpu_write(nmi_state, NMI_EXECUTING); this_cpu_write(nmi_cr2, read_cr2()); + +nmi_restart: if (IS_ENABLED(CONFIG_NMI_CHECK_CPU)) { WRITE_ONCE(nsp->idt_seq, nsp->idt_seq + 1); WARN_ON_ONCE(!(nsp->idt_seq & 0x1)); WRITE_ONCE(nsp->recv_jiffies, jiffies); } -nmi_restart: /* * Needs to happen before DR7 is accessed, because the hypervisor can @@ -548,16 +549,16 @@ DEFINE_IDTENTRY_RAW(exc_nmi) if (unlikely(this_cpu_read(nmi_cr2) != read_cr2())) write_cr2(this_cpu_read(nmi_cr2)); - if (this_cpu_dec_return(nmi_state)) - goto nmi_restart; - - if (user_mode(regs)) - mds_user_clear_cpu_buffers(); if (IS_ENABLED(CONFIG_NMI_CHECK_CPU)) { WRITE_ONCE(nsp->idt_seq, nsp->idt_seq + 1); WARN_ON_ONCE(nsp->idt_seq & 0x1); WRITE_ONCE(nsp->recv_jiffies, jiffies); } + if (this_cpu_dec_return(nmi_state)) + goto nmi_restart; + + if (user_mode(regs)) + mds_user_clear_cpu_buffers(); } #if IS_ENABLED(CONFIG_KVM_INTEL)