From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933318AbcFOW2u (ORCPT ); Wed, 15 Jun 2016 18:28:50 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:51020 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932393AbcFOW2f (ORCPT ); Wed, 15 Jun 2016 18:28:35 -0400 X-IBM-Helo: d03dlp01.boulder.ibm.com X-IBM-MailFrom: paulmck@linux.vnet.ibm.com X-IBM-RcptTo: linux-kernel@vger.kernel.org From: "Paul E. McKenney" To: linux-kernel@vger.kernel.org Cc: mingo@kernel.org, jiangshanlai@gmail.com, dipankar@in.ibm.com, akpm@linux-foundation.org, mathieu.desnoyers@efficios.com, josh@joshtriplett.org, tglx@linutronix.de, peterz@infradead.org, rostedt@goodmis.org, dhowells@redhat.com, edumazet@google.com, dvhart@linux.intel.com, fweisbec@gmail.com, oleg@redhat.com, bobby.prani@gmail.com, "Paul E. McKenney" Subject: [PATCH tip/core/rcu 7/8] torture: Make waketorture kill test if no hotpluggable CPUs Date: Wed, 15 Jun 2016 15:28:27 -0700 X-Mailer: git-send-email 2.5.2 In-Reply-To: <20160615222756.GA10695@linux.vnet.ibm.com> References: <20160615222756.GA10695@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16061522-0008-0000-0000-000004D1BC98 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 16061522-0009-0000-0000-0000386D0DF8 Message-Id: <1466029708-11359-7-git-send-email-paulmck@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2016-06-15_13:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=1 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1604210000 definitions=main-1606150236 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This commit shuts down the kernel if a shutdown time was specified and if there were no hotpluggable CPUs. Signed-off-by: Paul E. McKenney --- kernel/rcu/waketorture.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/kernel/rcu/waketorture.c b/kernel/rcu/waketorture.c index 8568688607ac..f9843eb3f7b7 100644 --- a/kernel/rcu/waketorture.c +++ b/kernel/rcu/waketorture.c @@ -248,9 +248,15 @@ static int wake_torture_onoff(void *args) if (cpu_is_hotpluggable(cpu)) onoff_cpu = cpu; } - pr_alert("%s" TORTURE_FLAG " wake_torture_onoff: onoff_cpu: %d\n", torture_type, onoff_cpu); - if (onoff_cpu < 0) + if (onoff_cpu < 0) { VERBOSE_TOROUT_STRING("wake_torture_onoff: no hotpluggable CPUs!"); + if (shutdown_secs > 0) { + VERBOSE_TOROUT_STRING("wake_torture_onoff: Shutting down"); + kernel_power_off(); + VERBOSE_TOROUT_STRING("wake_torture_onoff: Survived kernel_power_off()?"); + } + } + pr_alert("%s" TORTURE_FLAG " wake_torture_onoff: onoff_cpu: %d\n", torture_type, onoff_cpu); while (!torture_must_stop() && onoff_cpu >= 0) { if (!torture_offline(onoff_cpu, &n_offline_attempts, &n_offline_successes, -- 2.5.2