From patchwork Mon Oct 24 10:44:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Wagner X-Patchwork-Id: 8325 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp375884wru; Mon, 24 Oct 2022 03:56:46 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5qpnbONLC7ZqSnxP29kz1ag+dgO2JkP++rRhUz2PcH1UbxPFUxz+xyL1BvwQCNGdBsIWyV X-Received: by 2002:a17:906:6a27:b0:7a6:c537:ba4 with SMTP id qw39-20020a1709066a2700b007a6c5370ba4mr4687637ejc.517.1666609005819; Mon, 24 Oct 2022 03:56:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666609005; cv=none; d=google.com; s=arc-20160816; b=AbIHK36crZqPB0OVtqwWW0LWOzMP3gO5udqQUE5mgtB9BvgVA+Ocfgh0jhf7LJK74X QYE6HQLjyGiOvgBet/dHHUCLBcdMxYLuFR/0dKWTfKHreqnXj5oSY46QnGWZs1GUqjR0 D6ticfX5yMLwWKh9TVyOOcEFySR3jEEwTOQ8NkiWCRLcgTT33OnB4dT+18tUCyreCOOe yf5zOER1CKYENDq71BGX6y9/nJfJIVw4GH42eSBq+SMoI9zCRgNx+bF389WnI+1wC7I3 0Xe3p9y1REX+RkU8L2C5Mc/PkRFq24LnoVhxgzcAunmRRgFuL0NcHopk8jxmuenXinjf o/sA== 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=s6+zpCqS6FPxz8ZLKaj1J443b3jYNWuEs6pNuizXfBs=; b=Ms57uD+C0tVhDZ59Ltncu0zJ2xyYlxm1Qm1SPPEKZZyQZJhvBZKdCY7St1NxfPtJ7X JsGgsdbMiR5J2Az5145Yk6MlNRU1RpptQspQRgMvZ2ckl8FD0q0SREvr3UjhzwmIej7r A30bur5uDvAzbfG3qahcZZANzlKBICpU0z9N6FDM432AEEfu4ZIO2Vx0SiIf3HQ/I5g5 2s669E2N1Gdb+5VyCtopilwZNArCMjNTFohpzWUOqqBAiUlTeg7KHCvvEmhFXA/0R9k2 ve7KjtAmCn9w+IYsKc5ZMO7ZTgB98Vnt+fZR7ZHP5I3lw3DPG/aoSzRC10kFhDHEbsdC jmPA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@monom.org header.s=dkim header.b=cLi1hzzF; 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=REJECT sp=REJECT dis=NONE) header.from=monom.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w13-20020a05640234cd00b00459f9c3d02bsi32755059edc.22.2022.10.24.03.56.21; Mon, 24 Oct 2022 03:56:45 -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=@monom.org header.s=dkim header.b=cLi1hzzF; 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=REJECT sp=REJECT dis=NONE) header.from=monom.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229949AbiJXKzD (ORCPT + 99 others); Mon, 24 Oct 2022 06:55:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59456 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229871AbiJXKyk (ORCPT ); Mon, 24 Oct 2022 06:54:40 -0400 Received: from mail.nearlyone.de (mail.nearlyone.de [46.163.114.145]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DCB40CE0E; Mon, 24 Oct 2022 03:54:31 -0700 (PDT) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id F0CAF61D7A; Mon, 24 Oct 2022 12:44:31 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monom.org; s=dkim; t=1666608272; h=from:subject:date:message-id:to:cc:mime-version: content-transfer-encoding:in-reply-to:references; bh=s6+zpCqS6FPxz8ZLKaj1J443b3jYNWuEs6pNuizXfBs=; b=cLi1hzzFHj8dNkBW0yrnn+LRsRdGoWuCmaLSI+VBf2/mX7lC78Gmie4gPpJH1URSSet0TW Un8fW2WYnNd2MfYt8nPZwl56cNZSBWJfaXaIXLC0dsHQaXefyftS5cTmUf+95gdot1Et6p 4u1TipPziBcE6dw4QlQ2YPSekpcidzfFDtNF2n7ggsPHF7gpgZjvBq/wlRpvdFaY9DfrUw gVW37QGelHsXHePuKfGb6OIEq/pWRP4XJ3WeMBcUO7IyFblXtW4fCNSZdWxupzVduwLZpu E3P3Md1gbUfo+moCh7DDDnaxhZUQllbRiRZ3BL2WWzS0g78pE5ScnNROjc0uAg== From: Daniel Wagner To: LKML , linux-rt-users , Steven Rostedt , Thomas Gleixner , Carsten Emde , John Kacur , Sebastian Andrzej Siewior , Tom Zanussi , Clark Williams , Pavel Machek Cc: Daniel Wagner Subject: [PATCH RT 4/9] Revert "workqueue: Use local irq lock instead of irq disable regions" Date: Mon, 24 Oct 2022 12:44:20 +0200 Message-Id: <20221024104425.16423-5-wagi@monom.org> In-Reply-To: <20221024104425.16423-1-wagi@monom.org> References: <20221024104425.16423-1-wagi@monom.org> MIME-Version: 1.0 X-Last-TLS-Session-Version: TLSv1.3 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS 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?1747566205118195216?= X-GMAIL-MSGID: =?utf-8?q?1747566205118195216?= From: Sebastian Andrzej Siewior v4.19.255-rt114-rc1 stable review patch. If anyone has any objections, please let me know. ----------- This reverts the PREEMPT_RT related changes to workqueue. It reverts the usage of local_locks() and cpu_chill(). This is a preparation to pull in the PREEMPT_RT related changes which were merged upstream. Signed-off-by: Sebastian Andrzej Siewior [wagi: 827b6f6962da ("workqueue: rework") already reverted most of the changes, except the missing update in put_pwq_unlocked.] Signed-off-by: Daniel Wagner --- kernel/workqueue.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/kernel/workqueue.c b/kernel/workqueue.c index 4ed22776b2ee..d97c2ad8dc08 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -1496,11 +1496,9 @@ EXPORT_SYMBOL(queue_work_on); void delayed_work_timer_fn(struct timer_list *t) { struct delayed_work *dwork = from_timer(dwork, t, timer); - unsigned long flags; - local_irq_save(flags); + /* should have been called from irqsafe timer with irq already off */ __queue_work(dwork->cpu, dwork->wq, &dwork->work); - local_irq_restore(flags); } EXPORT_SYMBOL(delayed_work_timer_fn);