Received: by 2002:a25:b323:0:0:0:0:0 with SMTP id l35csp3071002ybj; Mon, 23 Sep 2019 14:17:37 -0700 (PDT) X-Google-Smtp-Source: APXvYqz6ud1k3t7VxAUjPv6gte5Y/lqIPXWc2uyQtfr6GKtXih8R+rxPhXAq73XTGi7SE5m/e9z4 X-Received: by 2002:a50:99d5:: with SMTP id n21mr2303268edb.50.1569273457851; Mon, 23 Sep 2019 14:17:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569273457; cv=none; d=google.com; s=arc-20160816; b=ked4oQp3BJPaYLMSjpe8aBQNJDt+qyuWOMK73cBvjGXHULCOtpGu+Rko3poaDQpSXH 3nmP6jT6S84eIibmYvlzQUboI+CL7FDtnh0d1F82pHewv3Gavefeeu4L+yXV8MB36g+O fLARUPlXWmzfiP6hT8M9MGze7CmfOgmVEyALUULEocI1R/7js3C4aXU+46nR/Bd40+h2 AMnsO4WcUtYfzquN394PYMU7aprjOX+leHOXIIWPa1IRaXcozVJVixfXmxChzPJgBrsZ LIP6y0Nja89CqX90jRzrpl756RPjcWuGWP7pPKg8GdzKtSfjz7keVTG6nuPFhZKDcGHm dOiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=b44AvkuQgRfNyjgPchkj+a+WrUnVSgru+wTCtY4rx1o=; b=1GSbbNlVwVrvSRXhQ84V/eVYsbmXrvd5nbk5ukidhcTz09iXfbzpYKsq9m5QOqvY0a Yedgbvt+RGwQjt+8meg635twVXk+LlZN4zjuXUUTg+oIlOsoAzgCM25vdAFJeBlYIvlZ LZOWHXzrkC9XlERVhlzElpQYq76ArJfW9z01l5fPC52yj7X2k7rx9RhrFTEuqjOcAA1a oOoheLrHJdwSxEYUdmleiSdB0lseoB87N1xiO36UwXzWvI9huHBrWQRMad+saBzEbWV2 Wi7ebjjUmBAH1bwtc73Z6ZW0h3XAvC76uY9Ft4Z1EYM/27Eg7B3pqxssaIczs4t8qdpn wgLA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=PCyIMHiC; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c10si5512949ejk.326.2019.09.23.14.17.00; Mon, 23 Sep 2019 14:17:37 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=PCyIMHiC; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 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 S2389208AbfIVSpY (ORCPT + 99 others); Sun, 22 Sep 2019 14:45:24 -0400 Received: from mail.kernel.org ([198.145.29.99]:41048 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389181AbfIVSpY (ORCPT ); Sun, 22 Sep 2019 14:45:24 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 97C182186A; Sun, 22 Sep 2019 18:45:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569177923; bh=Khkr7SUx3By7seMEzLt/dW27p0v3MIpa+M+qZfVLF/E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PCyIMHiCljLKLtzhm81UA8D081Sx576IOEyWLmcdTBKDOWhFjAYaHG1cEt4BiMWs/ TIBox6JWQZzEeJ3Cq6IE+Y9qEEU+xOyBb4PGoJXxXQQA4CXx4cjOHsAmr7L4xSyV4S 4ea5kdvx58t5LOWAEF6ZryerMA2Lk6RBmBG0T9Rw= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: "Paul E. McKenney" , Andrea Arcangeli , Sasha Levin Subject: [PATCH AUTOSEL 5.3 035/203] rcu: Add destroy_work_on_stack() to match INIT_WORK_ONSTACK() Date: Sun, 22 Sep 2019 14:41:01 -0400 Message-Id: <20190922184350.30563-35-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190922184350.30563-1-sashal@kernel.org> References: <20190922184350.30563-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: "Paul E. McKenney" [ Upstream commit fbad01af8c3bb9618848abde8054ab7e0c2330fe ] The synchronize_rcu_expedited() function has an INIT_WORK_ONSTACK(), but lacks the corresponding destroy_work_on_stack(). This commit therefore adds destroy_work_on_stack(). Reported-by: Andrea Arcangeli Signed-off-by: Paul E. McKenney Acked-by: Andrea Arcangeli Signed-off-by: Sasha Levin --- kernel/rcu/tree_exp.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/kernel/rcu/tree_exp.h b/kernel/rcu/tree_exp.h index af7e7b9c86afa..513b403b683b7 100644 --- a/kernel/rcu/tree_exp.h +++ b/kernel/rcu/tree_exp.h @@ -792,6 +792,7 @@ static int rcu_print_task_exp_stall(struct rcu_node *rnp) */ void synchronize_rcu_expedited(void) { + bool boottime = (rcu_scheduler_active == RCU_SCHEDULER_INIT); struct rcu_exp_work rew; struct rcu_node *rnp; unsigned long s; @@ -817,7 +818,7 @@ void synchronize_rcu_expedited(void) return; /* Someone else did our work for us. */ /* Ensure that load happens before action based on it. */ - if (unlikely(rcu_scheduler_active == RCU_SCHEDULER_INIT)) { + if (unlikely(boottime)) { /* Direct call during scheduler init and early_initcalls(). */ rcu_exp_sel_wait_wake(s); } else { @@ -835,5 +836,8 @@ void synchronize_rcu_expedited(void) /* Let the next expedited grace period start. */ mutex_unlock(&rcu_state.exp_mutex); + + if (likely(!boottime)) + destroy_work_on_stack(&rew.rew_work); } EXPORT_SYMBOL_GPL(synchronize_rcu_expedited); -- 2.20.1