From patchwork Thu Jun 15 14:49:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikolay Borisov X-Patchwork-Id: 108578 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp702946vqr; Thu, 15 Jun 2023 08:04:47 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6ze0TDEqq0bzFa/S+wyy+M20T5LztMr3gz3MudCD1o0vinbWhFgmOLZfCjO6pt8viRg1Zw X-Received: by 2002:a17:907:26c1:b0:978:930e:2279 with SMTP id bp1-20020a17090726c100b00978930e2279mr17878422ejc.52.1686841487134; Thu, 15 Jun 2023 08:04:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686841487; cv=none; d=google.com; s=arc-20160816; b=FM6ElnF45IC+DXBCQ9ZdP0kn1etmP9BKjylWGKMgOFSYbkLBreUJ1LqgSq6JJcEPZP aKWLGC5msHz9DeYHHjZwZoTpLg6E5yI6QTL0NPHQNnbdO2CWj5YzCDmeB/IqSSZ+rNJZ BABQK+rSnqRi1XCTJW9lUSJFetTYWA9ghqC3S/KHveZd6nLprVFQCRze1VjB83y6KMeO eBLQROS8PNOhd0Ea4eU41uYu4qPbI2VhxOnL+ZpALm9dwiqiWrD31E7es2nyqp+Tg/n+ PY06ZxVlGS7oF+0w7TUdrmlUx6RZB6Ht4A3XOziES03KGzy7bS0UFJnGom5tgW38mF2n i4sA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=tWP3X6y1slpOFyHr1sWNQEgiKAMy/X1Ov85nf7gL3Es=; b=cio2T7a4hMBejaCwvipOmsvDp3akelYIxMTKMO7taDGP1PQ6pzFEVSuv0j2HNtv+aS ncxWmoo7Yuic1caKBLpeudPT9fjw+Gs9oiWKAmR8BBmb8A/WOkc/0Lme0RkLuR8rnuqI tOt17vfGmIt4FhyEPc6+6uLRTB1t2HBDNXHH/sqZ5lzQKSZ0bQ+xqslKa3fuhPV3mKb6 iZlmKvU5HmtjY0tSNdLt2Ls6QtkPnUI/vzA6dE4yIyENBIP9MEF76knHcSFYAuh+pFj+ 38RN90Y4IOK83y+g5PeT6Jp+ybNC/tkrKLt5qJot2qFXaqo5Wsrt3pGCMhIqvyKow+v8 4XJA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.com header.s=susede1 header.b=VovsHV+u; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id os26-20020a170906af7a00b0096f6647be3bsi108040ejb.402.2023.06.15.08.04.10; Thu, 15 Jun 2023 08:04:47 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=susede1 header.b=VovsHV+u; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345101AbjFOOtt (ORCPT + 99 others); Thu, 15 Jun 2023 10:49:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34456 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240102AbjFOOts (ORCPT ); Thu, 15 Jun 2023 10:49:48 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2001:67c:2178:6::1d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EA2FE273C for ; Thu, 15 Jun 2023 07:49:46 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id A1CA51FDC5; Thu, 15 Jun 2023 14:49:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1686840585; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=tWP3X6y1slpOFyHr1sWNQEgiKAMy/X1Ov85nf7gL3Es=; b=VovsHV+u6yMps6Jc8eTq/SihTWxDPyG6vyvN159MCR6KcjJMMU2AqSouxcoQ8GVtuzVGjV z6z5yhvpn/ET/0B8+8GkreLj4Y0O5B8KLeEVQ0Gs1VB34FMEH48FmPKUzme+DbS8NYtnqx m6pi8nYrLF3WZLrBh37kQekKT4WtqIA= Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 683FB13A32; Thu, 15 Jun 2023 14:49:45 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id RdHiFgkli2RDAgAAMHmgww (envelope-from ); Thu, 15 Jun 2023 14:49:45 +0000 From: Nikolay Borisov To: x86@kernel.org Cc: linux-kernel@vger.kernel.org, Nikolay Borisov Subject: [PATCH] x86/mce: Use lockdep to assert preemption is off in mcheck_cpu_init Date: Thu, 15 Jun 2023 17:49:42 +0300 Message-Id: <20230615144942.1020961-1-nik.borisov@suse.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768781498993107731?= X-GMAIL-MSGID: =?utf-8?q?1768781498993107731?= Instead of relying on a comment, use lockdep_assert_preemption_disabled() as it issue a warning if preemption is on. mcheck_cpu_init is called from: start_kernel check_bugs identify_boot_cpu identify_cpu mcheck_cpu_init Which happens after lockdep_init() call in start_kernel(). Signed-off-by: Nikolay Borisov --- arch/x86/kernel/cpu/mce/core.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/x86/kernel/cpu/mce/core.c b/arch/x86/kernel/cpu/mce/core.c index 2eec60f50057..5d945a1690d5 100644 --- a/arch/x86/kernel/cpu/mce/core.c +++ b/arch/x86/kernel/cpu/mce/core.c @@ -2126,12 +2126,12 @@ DEFINE_IDTENTRY_RAW(exc_machine_check) } #endif -/* - * Called for each booted CPU to set up machine checks. - * Must be called with preempt off: - */ +/* Called for each booted CPU to set up machine checks. */ void mcheck_cpu_init(struct cpuinfo_x86 *c) { + + lockdep_assert_preemption_disabled(); + if (mca_cfg.disabled) return;