From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.4 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 50A3AC3A589 for ; Thu, 15 Aug 2019 14:19:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2431B2084D for ; Thu, 15 Aug 2019 14:19:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=joelfernandes.org header.i=@joelfernandes.org header.b="n+vpNnhl" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732880AbfHOOTC (ORCPT ); Thu, 15 Aug 2019 10:19:02 -0400 Received: from mail-pf1-f195.google.com ([209.85.210.195]:45210 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732567AbfHOOTB (ORCPT ); Thu, 15 Aug 2019 10:19:01 -0400 Received: by mail-pf1-f195.google.com with SMTP id w26so1381311pfq.12 for ; Thu, 15 Aug 2019 07:19:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=joelfernandes.org; s=google; h=date:from:to:cc:subject:message-id:mime-version:content-disposition :user-agent; bh=xHwKm8HU3q3V9jOcCOxz3QIpICO4VC7m+Bg5pvHvR/8=; b=n+vpNnhllYsoCBxgI8bpa+HnIzEk7ROuZfCtOCHEn9nJva0VnoGx9Gtfg5mdOvej3H P3kqrj4y0VHVe1Ym3LDwmtBQAoxCWpMqaucc+4GUkB1xi2ZoFDwtli84tRlUzIO5snpE JnElfwTl8XI85HGkouh22H8Ec+SzjUEvNpx7M= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition:user-agent; bh=xHwKm8HU3q3V9jOcCOxz3QIpICO4VC7m+Bg5pvHvR/8=; b=EsjyHrzEEwTtL9YWLQ1qgYpvGVioIs0VVaGuM6uUrfczCLX8QKvw7H9xV1qLEnpE0O 1uiCJVnZwR2z8s3loTQx2m3mKjuEuiE7VaGgpMym+KWL5mnYa2QY1OoUMCRsRg/Qk/XT Z1MaGOGHBumGk6BNr+u9oDDPsRn9vxDXgT2Kn93sL01Q0PD2z7ZFSe8HJtkxwRY+nWEA 7IXzrc7EBDaJUoRZMOfnAlJKGOrD+rbTGNz251RmWcE2x8OSajk05HZvIxbGDA595TCc Ju7fPMHXZfpWfq74c8sYqFRGrjKKqOm/Qgs13MRluKFUwn6a9tKUd55ChRIRitQ3pnR7 HC8A== X-Gm-Message-State: APjAAAXUMrkSttXP8pupktkdUyCR5QDmtBz3nTYy+IGvhSB6yfdt+svy Vu+NlAcE/gI3R38RWqisvV2F2Iu09XE= X-Google-Smtp-Source: APXvYqyvueiXtP/1RWkJ8cKdfFAsmWmUTpLvlaIhQojpDz/MLXh4GvQ4dy4bBUgvRWSloBq2vKdMLw== X-Received: by 2002:a65:6114:: with SMTP id z20mr3717267pgu.141.1565878740431; Thu, 15 Aug 2019 07:19:00 -0700 (PDT) Received: from localhost ([172.19.216.18]) by smtp.gmail.com with ESMTPSA id e9sm3164834pfh.155.2019.08.15.07.18.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Aug 2019 07:18:59 -0700 (PDT) Date: Thu, 15 Aug 2019 10:18:42 -0400 From: "Joel Fernandes (Google)" To: linux-kernel@vger.kernel.org Cc: "Joel Fernandes (Google)" , Greg Kroah-Hartman , Jonathan Corbet , Josh Triplett , Lai Jiangshan , linux-doc@vger.kernel.org, Mathieu Desnoyers , "Paul E. McKenney" , "Rafael J. Wysocki" , rcu@vger.kernel.org, Steven Rostedt , Tejun Heo Subject: [PATCH v3 -rcu] workqueue: Convert for_each_wq to use built-in list check Message-ID: <20190815141842.GB20599@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org list_for_each_entry_rcu now has support to check for RCU reader sections as well as lock. Just use the support in it, instead of explicitly checking in the caller. Acked-by: Tejun Heo Signed-off-by: Joel Fernandes (Google) --- v1->v3: Changed lock_is_held() to lockdep_is_held() kernel/workqueue.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/kernel/workqueue.c b/kernel/workqueue.c index 601d61150b65..e882477ebf6e 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -364,11 +364,6 @@ static void workqueue_sysfs_unregister(struct workqueue_struct *wq); !lockdep_is_held(&wq_pool_mutex), \ "RCU or wq_pool_mutex should be held") -#define assert_rcu_or_wq_mutex(wq) \ - RCU_LOCKDEP_WARN(!rcu_read_lock_held() && \ - !lockdep_is_held(&wq->mutex), \ - "RCU or wq->mutex should be held") - #define assert_rcu_or_wq_mutex_or_pool_mutex(wq) \ RCU_LOCKDEP_WARN(!rcu_read_lock_held() && \ !lockdep_is_held(&wq->mutex) && \ @@ -425,9 +420,8 @@ static void workqueue_sysfs_unregister(struct workqueue_struct *wq); * ignored. */ #define for_each_pwq(pwq, wq) \ - list_for_each_entry_rcu((pwq), &(wq)->pwqs, pwqs_node) \ - if (({ assert_rcu_or_wq_mutex(wq); false; })) { } \ - else + list_for_each_entry_rcu((pwq), &(wq)->pwqs, pwqs_node, \ + lockdep_is_held(&(wq->mutex))) #ifdef CONFIG_DEBUG_OBJECTS_WORK -- 2.23.0.rc1.153.gdeed80330f-goog