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=-14.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham 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 19E43C433E7 for ; Fri, 9 Oct 2020 06:35:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C446422251 for ; Fri, 9 Oct 2020 06:35:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="C1x9sG+z"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="LncLS7Wh" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731871AbgJIGfS (ORCPT ); Fri, 9 Oct 2020 02:35:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36374 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725923AbgJIGfP (ORCPT ); Fri, 9 Oct 2020 02:35:15 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 25564C0613D5; Thu, 8 Oct 2020 23:35:15 -0700 (PDT) Date: Fri, 09 Oct 2020 06:35:12 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1602225313; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kEI3jt05TyTejgS45crLuDdk8MooQ6XTwAZBUjl/xWg=; b=C1x9sG+zetDn9pYslq1hZeahaurNxTqkzpOtAEvBJO3FDZcjSP3VMpggLeb7Bm36h/PRm9 k2Qe50IVo2iyiZ06QIs9GvL5+2xJbBj/gCLiff8IZG6Jiv0cKW86pybIy+yIs7NIS64gQi eSBY2vpDMPbvkzvvplOUMx9Iii8p+pK/hjioC3bNWB4PIm7ugUEMy90jpztl+lu1G9LspT 52pB4B0O99omNadO7b3b5a5cGuMVqATLAgKD587KqrVTvtmJy27XDC/CpETMkzUzo/rNaq /t716DEmisqw1GSiJAS78h5hgaxc4FZsDfvduAWvUmeZYaqgG4rc3pwuLkWqOw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1602225313; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kEI3jt05TyTejgS45crLuDdk8MooQ6XTwAZBUjl/xWg=; b=LncLS7Wh50RzsMht0xEEMxRF95Z/RnqX+coYEG47t8cNDh0Awb/sK/Bbz+30AbvhFseZwv /q7l2OWFCp6VxFAg== From: "tip-bot2 for Paul E. McKenney" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: core/rcu] rcutorture: Properly set rcu_fwds for OOM handling Cc: kernel test robot , "Paul E. McKenney" , x86 , LKML MIME-Version: 1.0 Message-ID: <160222531297.7002.4130611121050528796.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the core/rcu branch of tip: Commit-ID: c8fa63714763b7795a3f5fb7ed6d000763e6dccc Gitweb: https://git.kernel.org/tip/c8fa63714763b7795a3f5fb7ed6d000763e6dccc Author: Paul E. McKenney AuthorDate: Sun, 19 Jul 2020 14:40:31 -07:00 Committer: Paul E. McKenney CommitterDate: Mon, 24 Aug 2020 18:45:34 -07:00 rcutorture: Properly set rcu_fwds for OOM handling The conversion of rcu_fwds to dynamic allocation failed to actually allocate the required structure. This commit therefore allocates it, frees it, and updates rcu_fwds accordingly. While in the area, it abstracts the cleanup actions into rcu_torture_fwd_prog_cleanup(). Fixes: 5155be9994e5 ("rcutorture: Dynamically allocate rcu_fwds structure") Reported-by: kernel test robot Signed-off-by: Paul E. McKenney --- kernel/rcu/rcutorture.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/kernel/rcu/rcutorture.c b/kernel/rcu/rcutorture.c index c8206ff..7942be4 100644 --- a/kernel/rcu/rcutorture.c +++ b/kernel/rcu/rcutorture.c @@ -2148,9 +2148,20 @@ static int __init rcu_torture_fwd_prog_init(void) return -ENOMEM; spin_lock_init(&rfp->rcu_fwd_lock); rfp->rcu_fwd_cb_tail = &rfp->rcu_fwd_cb_head; + rcu_fwds = rfp; return torture_create_kthread(rcu_torture_fwd_prog, rfp, fwd_prog_task); } +static void rcu_torture_fwd_prog_cleanup(void) +{ + struct rcu_fwd *rfp; + + torture_stop_kthread(rcu_torture_fwd_prog, fwd_prog_task); + rfp = rcu_fwds; + rcu_fwds = NULL; + kfree(rfp); +} + /* Callback function for RCU barrier testing. */ static void rcu_torture_barrier_cbf(struct rcu_head *rcu) { @@ -2448,7 +2459,7 @@ rcu_torture_cleanup(void) show_rcu_gp_kthreads(); rcu_torture_read_exit_cleanup(); rcu_torture_barrier_cleanup(); - torture_stop_kthread(rcu_torture_fwd_prog, fwd_prog_task); + rcu_torture_fwd_prog_cleanup(); torture_stop_kthread(rcu_torture_stall, stall_task); torture_stop_kthread(rcu_torture_writer, writer_task);