From patchwork Thu Oct 19 23:35:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frederic Weisbecker X-Patchwork-Id: 155741 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2010:b0:403:3b70:6f57 with SMTP id fe16csp716783vqb; Thu, 19 Oct 2023 16:36:11 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHbd6kDjdyK9aZdyhTae4eLD9iI7Qrv3D2I4VWjUTUtxfOTbCRf34uhr/lWWU8vHzrdGeWg X-Received: by 2002:a05:6a20:8421:b0:17b:cfed:52ac with SMTP id c33-20020a056a20842100b0017bcfed52acmr304934pzd.49.1697758571575; Thu, 19 Oct 2023 16:36:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697758571; cv=none; d=google.com; s=arc-20160816; b=ZRkWKkxnJgd5C5sr20GXqGKcY0QReiXEerm4hX1qd8RWHwmeUv+3PpazbrnzyX5PvK vFvVUKYh5fga8UXSFtUDawXwlykRZKL2ypvUpdr5VXILLz2Bi1LE7uLCSCf4kHIJz9OB hoNYMFLrjozzP2yFPxgfBkQNG0UeiHxbWSdp5OqJ+vSDK7NEiszMrhQzMH9N9zwSssxf To6yjJJcvwbEE+mVxANBPFRNTKFmAqc5aHcT8MMLVqhiloioy15nQLBKCXLx38otvrxa lsXPLZZSGxLGyfVLYEh3aApS+bYFjsiC97Yor3jt6PvP4cfgpSmVKZbFNzymPuk1dMJl YpWg== 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=UljkFkLsKwJQJZ/57OEZ01+NC+s1J+uCq4ARQV4StPk=; fh=Xtw5ULhofgKZ29v5WdXlT+QfFq0h1vKmlRJPSOHLxgo=; b=xfAXM/DATp3A70Lnzc0BJnsCT4Me41NmF0HcSlR0DngZJ/8OtOi4R0rSgER8bUWnIH G13cCWs/SbWQLajC7EOH1MaVt5FARJyZUMXUWBH5b04PXFHCWjOQ1VJpDwezB5KDPxKT GWOxhPFyrvYrajDT0Z3pHiZ6VewIotwLYrcjl6NMwsIavxX+Anm+f1ZVdLoNKr6QoQhm j2Foon/cQ7pBut4XJsMb40JYCrF2o/KGbByqoKxJAlX3G/tLJRbwaiYMTf3wY+eBVQ6Q C9zflNDXDVROnHb+DbtIYVwjLLNft/4Y1JrjtPW/vR8IiyMZyNY65b7uMambF/k3WMlU 0b8Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="azl/B57W"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 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 lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id l2-20020a170902d34200b001c6182d7d43si515220plk.21.2023.10.19.16.36.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Oct 2023 16:36:11 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="azl/B57W"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 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 lipwig.vger.email (Postfix) with ESMTP id 7A71D834E593; Thu, 19 Oct 2023 16:36:08 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346735AbjJSXgC (ORCPT + 26 others); Thu, 19 Oct 2023 19:36:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48766 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346719AbjJSXf5 (ORCPT ); Thu, 19 Oct 2023 19:35:57 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AABF4116; Thu, 19 Oct 2023 16:35:55 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id ED987C433C8; Thu, 19 Oct 2023 23:35:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1697758555; bh=R8Atha9x2t4vsEfcPTQzyYDg3f35Pt4dzxjw+9RuuTU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=azl/B57WvaINso+zwnxXnpDWX0/KZd66y8FLgQUWYslMcmU/gDUg6quWS5gzUkzF1 8jpVePGUxs33EeZfn/Zqz2Tc6LaptodpzRZDkLfQHKFghF7c5SDSDLQ9TPDZwG4woT Rqo5umQPJjabpDf1E9qGrsVITEI2FppPm6Pdm5ln956GPsBUf8OfcDWC7mpoHt6V5I DoqR2dG9Mo2SIUGvPJ3SJmqmn9nWzMk447z0bzQhW8IBaxDsLnW5617/t0IixJg4Md ThI3J3pK6QvsGeA3v99ErEoqbeZiN9aZZhaiof26ZSbNuGcTO8violaIBOXYgvjROU zjrObKodXex7g== From: Frederic Weisbecker To: LKML Cc: Frederic Weisbecker , Boqun Feng , Joel Fernandes , Josh Triplett , Mathieu Desnoyers , Neeraj Upadhyay , "Paul E . McKenney" , Steven Rostedt , Uladzislau Rezki , rcu , Zqiang , Lai Jiangshan , "Liam R . Howlett" , Peter Zijlstra , Sebastian Siewior , Thomas Gleixner Subject: [PATCH 1/4] softirq: Rename __raise_softirq_irqoff() to raise_softirq_no_wake() Date: Fri, 20 Oct 2023 01:35:40 +0200 Message-Id: <20231019233543.1243121-2-frederic@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231019233543.1243121-1-frederic@kernel.org> References: <20231019233543.1243121-1-frederic@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,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 lipwig.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 (lipwig.vger.email [0.0.0.0]); Thu, 19 Oct 2023 16:36:08 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780228892352701511 X-GMAIL-MSGID: 1780228892352701511 This makes the purpose of this function clearer. Fixes: cff9b2332ab7 ("kernel/sched: Modify initial boot task idle setup") Cc: Liam R. Howlett Cc: Peter Zijlstra (Intel) Cc: Sebastian Siewior Cc: Thomas Gleixner Signed-off-by: Frederic Weisbecker --- block/blk-mq.c | 2 +- include/linux/interrupt.h | 2 +- kernel/softirq.c | 6 +++--- lib/irq_poll.c | 4 ++-- net/core/dev.c | 8 ++++---- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/block/blk-mq.c b/block/blk-mq.c index 1fafd54dce3c..1bda40a2aa29 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -1144,7 +1144,7 @@ static int blk_softirq_cpu_dead(unsigned int cpu) static void __blk_mq_complete_request_remote(void *data) { - __raise_softirq_irqoff(BLOCK_SOFTIRQ); + raise_softirq_no_wake(BLOCK_SOFTIRQ); } static inline bool blk_mq_complete_need_ipi(struct request *rq) diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h index 76121c2bb4f8..558a1a329da9 100644 --- a/include/linux/interrupt.h +++ b/include/linux/interrupt.h @@ -604,7 +604,7 @@ static inline void do_softirq_post_smp_call_flush(unsigned int unused) extern void open_softirq(int nr, void (*action)(struct softirq_action *)); extern void softirq_init(void); -extern void __raise_softirq_irqoff(unsigned int nr); +extern void raise_softirq_no_wake(unsigned int nr); extern void raise_softirq_irqoff(unsigned int nr); extern void raise_softirq(unsigned int nr); diff --git a/kernel/softirq.c b/kernel/softirq.c index 210cf5f8d92c..acfed6f3701d 100644 --- a/kernel/softirq.c +++ b/kernel/softirq.c @@ -664,7 +664,7 @@ void irq_exit(void) */ inline void raise_softirq_irqoff(unsigned int nr) { - __raise_softirq_irqoff(nr); + raise_softirq_no_wake(nr); /* * If we're in an interrupt or softirq, we're done @@ -688,7 +688,7 @@ void raise_softirq(unsigned int nr) local_irq_restore(flags); } -void __raise_softirq_irqoff(unsigned int nr) +void raise_softirq_no_wake(unsigned int nr) { lockdep_assert_irqs_disabled(); trace_softirq_raise(nr); @@ -795,7 +795,7 @@ static void tasklet_action_common(struct softirq_action *a, t->next = NULL; *tl_head->tail = t; tl_head->tail = &t->next; - __raise_softirq_irqoff(softirq_nr); + raise_softirq_no_wake(softirq_nr); local_irq_enable(); } } diff --git a/lib/irq_poll.c b/lib/irq_poll.c index 2d5329a42105..193cd847fd8f 100644 --- a/lib/irq_poll.c +++ b/lib/irq_poll.c @@ -130,7 +130,7 @@ static void __latent_entropy irq_poll_softirq(struct softirq_action *h) } if (rearm) - __raise_softirq_irqoff(IRQ_POLL_SOFTIRQ); + raise_softirq_no_wake(IRQ_POLL_SOFTIRQ); local_irq_enable(); } @@ -197,7 +197,7 @@ static int irq_poll_cpu_dead(unsigned int cpu) local_irq_disable(); list_splice_init(&per_cpu(blk_cpu_iopoll, cpu), this_cpu_ptr(&blk_cpu_iopoll)); - __raise_softirq_irqoff(IRQ_POLL_SOFTIRQ); + raise_softirq_no_wake(IRQ_POLL_SOFTIRQ); local_irq_enable(); local_bh_enable(); diff --git a/net/core/dev.c b/net/core/dev.c index 85df22f05c38..6f4622cc8939 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -4459,7 +4459,7 @@ static inline void ____napi_schedule(struct softnet_data *sd, * we have to raise NET_RX_SOFTIRQ. */ if (!sd->in_net_rx_action) - __raise_softirq_irqoff(NET_RX_SOFTIRQ); + raise_softirq_no_wake(NET_RX_SOFTIRQ); } #ifdef CONFIG_RPS @@ -4678,7 +4678,7 @@ static void trigger_rx_softirq(void *data) { struct softnet_data *sd = data; - __raise_softirq_irqoff(NET_RX_SOFTIRQ); + raise_softirq_no_wake(NET_RX_SOFTIRQ); smp_store_release(&sd->defer_ipi_scheduled, 0); } @@ -4705,7 +4705,7 @@ static void napi_schedule_rps(struct softnet_data *sd) * we have to raise NET_RX_SOFTIRQ. */ if (!mysd->in_net_rx_action && !mysd->in_napi_threaded_poll) - __raise_softirq_irqoff(NET_RX_SOFTIRQ); + raise_softirq_no_wake(NET_RX_SOFTIRQ); return; } #endif /* CONFIG_RPS */ @@ -6743,7 +6743,7 @@ static __latent_entropy void net_rx_action(struct softirq_action *h) list_splice_tail(&repoll, &list); list_splice(&list, &sd->poll_list); if (!list_empty(&sd->poll_list)) - __raise_softirq_irqoff(NET_RX_SOFTIRQ); + raise_softirq_no_wake(NET_RX_SOFTIRQ); else sd->in_net_rx_action = false;