From patchwork Tue Aug 1 13:24:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frederic Weisbecker X-Patchwork-Id: 129300 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp2673637vqg; Tue, 1 Aug 2023 06:35:45 -0700 (PDT) X-Google-Smtp-Source: APBJJlEvuIVI3J9lcC5wN/i4r1zmdqKF9yE/+9CAMXlwvQWXBTx9rVtdwaaRd+C6/66k+XIg8fuf X-Received: by 2002:a05:6512:2388:b0:4fe:676:8c0b with SMTP id c8-20020a056512238800b004fe06768c0bmr3029441lfv.11.1690896944651; Tue, 01 Aug 2023 06:35:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690896944; cv=none; d=google.com; s=arc-20160816; b=ZQjNfiDvPSi6cXaKyWAp2c+yGYJg9SJU77Mpj5j7hpdaYF9N/D7G4MxLK4Pqawt0bF vIcNt9kDum8pZnLj/9ELhO+lDQk8XN1K2vEVArYoYZatiENk9rmcnPcAarrC73a9S+K4 mxqD8ZbeAYE0ITgVQCpQqM8AHK8BuztpJR2yMQAoy+k/tuGCsFGrf8lwMcQat7g7xW2j QsumyBe2GUFf9ZEfUKiLxTzUOkU9JzoVfUmhmCVl3PN0+FpOsqOoxrpzViwlOm8UO5gs MMryujadUGIfOneYhrHHFmtlq6URjQztTU6+48K+qoz+8OZhTeft7Ch88Wc+WH0apJU3 EwgA== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=+QIYYVXUz47R2jxU+L2GU2guhnsqHmrarUFNOO0FiSI=; fh=JC0FP1KBPXa+8NkvIvZoCUIIa+zGdCFP1xCgvJrJBSE=; b=zGjTissa5v+xXoilRFlHIMuBZjyPxsIrxEH0opI4dowd7G3U0/9dP48pCbQqjHnyDq KOmcevrT76e3BLTcVi16CEo7fSjBf7I1bi7jVgSPiTb3T7ClXWbLgH8i3vxsH702tZiU KG1g3rLe8tFpuxdqwCT0bkm1H4oJI9xPhO8iWbqQQKIaIzvSaIAa4Uj1finyM5HtGDfG LzMexRhq2w7Iz0OE3frQplHTDd9dLuRYJHOQX7uoIe+VyERTX5X4URihoUt+qZve2JNF BTOcB/N5unhtf++7+hPGZPMHjE2zxRpOj+SmIhbDRAVJ9IDcwYyuEGPsKErQWZvDVj8o wEyQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=WQ8ryfpI; 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=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q22-20020a17090622d600b00992d262fb29si8980253eja.992.2023.08.01.06.35.20; Tue, 01 Aug 2023 06:35:44 -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=@kernel.org header.s=k20201202 header.b=WQ8ryfpI; 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=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234199AbjHANZJ (ORCPT + 99 others); Tue, 1 Aug 2023 09:25:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37012 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234108AbjHANZD (ORCPT ); Tue, 1 Aug 2023 09:25:03 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B379C2116 for ; Tue, 1 Aug 2023 06:24:58 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 0E5E8615A3 for ; Tue, 1 Aug 2023 13:24:58 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7FF58C433C7; Tue, 1 Aug 2023 13:24:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1690896297; bh=kRD+z973ymfN8CUInsVsbutA6ADoO6ucBF0+2kGIUy4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WQ8ryfpIqxjOXfYyBJzKG4qNR6jyMndhOItuP0gL6Zbgx8+366OyCfJMkg5+BZMFU auaat53rdg3hW7VpAIdGX1pYYWZ4yNc/ppnGpvrqLn4F4ZP4fD1FYymoXgwah8cSMT uYWt+A+CW+hwn1wiSqnpb5qBSDAv+Ibjqz2u5kSPq5VV/H2Gl6jL7YPMeV/6AkfGuA 9XuN+ZIvzLOaoddC29YcQln5X8lCsIrY3xThY7Dd6O09l0/a3Ley0FzhflcQBXdx47 eWINZFRzrKs6nKk3kKDM9viCOE2mroMnZiqreHOWvNJwXxhQX4BTbr6y6LOTwocsVN oUDSA7fzB3cWw== From: Frederic Weisbecker To: LKML Cc: Frederic Weisbecker , Sebastian Andrzej Siewior , Peter Zijlstra , Thomas Gleixner , "Paul E . McKenney" , Linus Torvalds , Anna-Maria Behnsen , Eric Dumazet Subject: [RFC PATCH 4/6] x86/softirq: Support softirq disabled mask Date: Tue, 1 Aug 2023 15:24:39 +0200 Message-Id: <20230801132441.559222-5-frederic@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230801132441.559222-1-frederic@kernel.org> References: <20230801132441.559222-1-frederic@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, 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: INBOX X-GMAIL-THRID: 1773033954428291368 X-GMAIL-MSGID: 1773033954428291368 Support the new softirq disabled vectors mask and put in the per-cpu hot structure along with the pending vectors mask as both are used closely together. Signed-off-by: Frederic Weisbecker --- arch/x86/Kconfig | 1 + arch/x86/include/asm/current.h | 1 + arch/x86/include/asm/hardirq.h | 1 + 3 files changed, 3 insertions(+) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index a2a410d13e39..f1cd68b672dc 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -93,6 +93,7 @@ config X86 select ARCH_HAS_COPY_MC if X86_64 select ARCH_HAS_SET_MEMORY select ARCH_HAS_SET_DIRECT_MAP + select ARCH_HAS_SOFTIRQ_DISABLED_MASK select ARCH_HAS_STRICT_KERNEL_RWX select ARCH_HAS_STRICT_MODULE_RWX select ARCH_HAS_SYNC_CORE_BEFORE_USERMODE diff --git a/arch/x86/include/asm/current.h b/arch/x86/include/asm/current.h index a1168e7b69e5..b86ca9c0ddc2 100644 --- a/arch/x86/include/asm/current.h +++ b/arch/x86/include/asm/current.h @@ -23,6 +23,7 @@ struct pcpu_hot { unsigned long top_of_stack; void *hardirq_stack_ptr; u16 softirq_pending; + u16 softirq_disabled; #ifdef CONFIG_X86_64 bool hardirq_stack_inuse; #else diff --git a/arch/x86/include/asm/hardirq.h b/arch/x86/include/asm/hardirq.h index 66837b8c67f1..933cf05e5738 100644 --- a/arch/x86/include/asm/hardirq.h +++ b/arch/x86/include/asm/hardirq.h @@ -61,6 +61,7 @@ extern u64 arch_irq_stat(void); #define arch_irq_stat arch_irq_stat #define local_softirq_pending_ref pcpu_hot.softirq_pending +#define local_softirq_disabled_ref pcpu_hot.softirq_disabled #if IS_ENABLED(CONFIG_KVM_INTEL) static inline void kvm_set_cpu_l1tf_flush_l1d(void)