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=-9.8 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_GIT 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 9D52FC3A59B for ; Sat, 17 Aug 2019 04:22:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 739C22075E for ; Sat, 17 Aug 2019 04:22:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=joelfernandes.org header.i=@joelfernandes.org header.b="o5xNnlpG" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725965AbfHQEWd (ORCPT ); Sat, 17 Aug 2019 00:22:33 -0400 Received: from mail-pf1-f194.google.com ([209.85.210.194]:43102 "EHLO mail-pf1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725562AbfHQEWd (ORCPT ); Sat, 17 Aug 2019 00:22:33 -0400 Received: by mail-pf1-f194.google.com with SMTP id v12so4116013pfn.10 for ; Fri, 16 Aug 2019 21:22:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=joelfernandes.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=XNiU5F55TizZiRI5gbYafvWHVAa62ZcoOzkHgapO5wE=; b=o5xNnlpGQL+fDemNR6wSt63dQkXzhIH9xEnjXJagP7txkSr+kU3GcfjJYfzcdiovfN CG/r6GiGseH/NQ0Os3LIj1MzMcW+0I/TJCfgmCjjCjCxf0RPB1fqhgZrpD1dL4bB5IoZ 4AWUjLlS0b8pXsA8i5HDF9hAVsRSvvkOwGpgE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=XNiU5F55TizZiRI5gbYafvWHVAa62ZcoOzkHgapO5wE=; b=qYmzWTqS413a2JvyWHylE+xyFbu6AciTml3MzHVekXpSZ+0PoJhgo0aKDS/h+N/+K0 b1Z1GmhykOGjjs7TEs3W8yT4XY2FFKLzF/PkRDMEvqPD9w50dEKLvtM3k6j9p8CrLqkh 1PlM38nH45j1DjW/jPuLupoFVxYjO4Vul3s0FMQeDxwwExE3RQSdtoE5DmJfhPO/L38i eSDK1WB1Yb/Pl5axP5vxVBbkcFsBtPukZDDacffT8McXKDXq+mMHttZg/EcwQY6enE4V BSqPAhT7BIEoMUKFsqAYL5Owx/rIu0+cGFGE4REgg6X2rYGGc2FktqqPUTOcQUSP+3Dk 9lnQ== X-Gm-Message-State: APjAAAU+AwzWQG3wn5mPg3hseO3Vh8/k3dETGjpoviREg4rpUGYgIbX0 tlT2fi4omcOE/+0JkOAhC2e9JadYV84= X-Google-Smtp-Source: APXvYqz0oiVjr7zsDWR7MC9l/HOfgMLZAZFrJn7ljUMoToAu8YgHmP4NeF5JmOSLAVN8ZWqh52AXWQ== X-Received: by 2002:aa7:925a:: with SMTP id 26mr14128895pfp.198.1566015752452; Fri, 16 Aug 2019 21:22:32 -0700 (PDT) Received: from joelaf.cam.corp.google.com ([172.19.216.18]) by smtp.gmail.com with ESMTPSA id 131sm6485365pge.37.2019.08.16.21.22.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Aug 2019 21:22:31 -0700 (PDT) From: "Joel Fernandes (Google)" To: linux-kernel@vger.kernel.org Cc: "Joel Fernandes (Google)" , Palmer Dabbelt , "Paul E. McKenney" , Paul Walmsley , rcu@vger.kernel.org Subject: [PATCH -rcu/dev] Please squash: fixup! rcu/tree: Add basic support for kfree_rcu() batching Date: Sat, 17 Aug 2019 00:22:11 -0400 Message-Id: <20190817042211.137149-1-joel@joelfernandes.org> X-Mailer: git-send-email 2.23.0.rc1.153.gdeed80330f-goog MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org xchg() on a bool is causing issues on riscv and arm32. Please squash this into the -rcu dev branch to resolve the issue. Please squash this fix. Fixes: -rcu dev commit 3cbd3aa7d9c7bdf ("rcu/tree: Add basic support for kfree_rcu() batching") Signed-off-by: Joel Fernandes (Google) --- kernel/rcu/tree.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c index 4f7c3096d786..33192a58b39a 100644 --- a/kernel/rcu/tree.c +++ b/kernel/rcu/tree.c @@ -2717,7 +2717,7 @@ struct kfree_rcu_cpu { * is busy, ->head just continues to grow and we retry flushing later. */ struct delayed_work monitor_work; - bool monitor_todo; /* Is a delayed work pending execution? */ + int monitor_todo; /* Is a delayed work pending execution? */ }; static DEFINE_PER_CPU(struct kfree_rcu_cpu, krc); @@ -2790,7 +2790,7 @@ static inline void kfree_rcu_drain_unlock(struct kfree_rcu_cpu *krcp, /* Previous batch that was queued to RCU did not get free yet, let us * try again soon. */ - if (!xchg(&krcp->monitor_todo, true)) + if (!xchg(&krcp->monitor_todo, 1)) schedule_delayed_work(&krcp->monitor_work, KFREE_DRAIN_JIFFIES); spin_unlock_irqrestore(&krcp->lock, flags); } @@ -2806,7 +2806,7 @@ static void kfree_rcu_monitor(struct work_struct *work) monitor_work.work); spin_lock_irqsave(&krcp->lock, flags); - if (xchg(&krcp->monitor_todo, false)) + if (xchg(&krcp->monitor_todo, 0)) kfree_rcu_drain_unlock(krcp, flags); else spin_unlock_irqrestore(&krcp->lock, flags); @@ -2858,7 +2858,7 @@ void kfree_call_rcu(struct rcu_head *head, rcu_callback_t func) krcp->head = head; /* Schedule monitor for timely drain after KFREE_DRAIN_JIFFIES. */ - if (!xchg(&krcp->monitor_todo, true)) + if (!xchg(&krcp->monitor_todo, 1)) schedule_delayed_work(&krcp->monitor_work, KFREE_DRAIN_JIFFIES); spin_unlock(&krcp->lock); -- 2.23.0.rc1.153.gdeed80330f-goog