From nobody Thu Apr 9 16:15:02 2026 Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9748537D12B for ; Sat, 7 Mar 2026 22:08:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772921306; cv=none; b=aihKD82IIWLKbew6CwBBmHYVhy79xnTTY/QcvCeEUl7Uyala0rrYreDoMUEFF0JuLyvMToiGOUJItMTs2tlPx+y0+37J1+8gxsJ1UADpT8Kun2mnbEYCdE6ZHag9K3P1KIcpJSxIrgTrFqzep0zdFx7lzqBwR7VJJV9R3Y5ZUS0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772921306; c=relaxed/simple; bh=KO2CH3fGcpg/tZ9LTCuqxh0HYar7/ISsFmixmMH2/SA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=lAeLIgUpbMoyWEm8qpkj/InBFCj04Og2UF2809lyoZj5UFtuAc7hsE4c+92C7n2sicfPCJTyGgdiH8PAoTZVG2hk6hHyXXtOekL2Asp7feskjLnD/vkNdcTSVAMtPfbnmYZ3L7h4yNMEMnqrPYKZt0nGcx/tRzfBtbPIAMeTo7U= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b=AzfRO/YH; arc=none smtp.client-ip=209.85.128.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="AzfRO/YH" Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-4852afd42ceso12408405e9.2 for ; Sat, 07 Mar 2026 14:08:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1772921304; x=1773526104; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=b4IswhZ42zv1+/Rz8ZoVR1ZNRwrcr1SrfkwONSDD8Qs=; b=AzfRO/YHOEgV7HC3D6quZijxfLdhTK8bnfdddrU50ok08l3NVer1vxyh6J7sagPpMa oVTeTio1Ld9zmHwHmDO08ilyTHFQ9iL9ItBWXR4f0M7mARM21Lkg3I6sJ6g7ounVhGSF sDP5mFs9L5N/NZZeY5N973ytewxdDk4oVdXOiSu5l5/OAMl2KmqnKmW8c0OM6wQywpcP uxa5DBFKXNVwkW4JBCBArJ7wNk5NQaaNZzXpwdLZoSPPw6ze56PXk4KDw8C6GIIOLEJO +lxYcES/1rKKYKQf22KtGl4pMk13Gz+9sx7ilyuzQwj1QG8WwihayVhn/24kGiYn1IdV gpTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772921304; x=1773526104; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=b4IswhZ42zv1+/Rz8ZoVR1ZNRwrcr1SrfkwONSDD8Qs=; b=f77M+SF+UMdkuyN6K/cZAKBYF/Iz2vksUsDq4s9sfVTWdl21p+eWnPIukni2SLdWqm WDdhQ4E2SjTCi0/n3dhKAQF0hT6AMlnK8A26+pjqji9ExlUir7mvSsBxUbtptZsX8Ukg kTvNrvMivPfFq8TRvWIuDY2WZriHn3C9a8y9iSSZ/u+Lcm6bInaF7cLU6tIrfQYnDQTf 3XnC/VuGLklV8yyFyof6WjBozMF7o0/9PxFrUX+RwdYQAOcP7C6ED7dYCDLA4t4IjSUP ARloASnpmsOB0fPrlImWL2z9Hc5Z8L9RiByBlwprDcGP8LyJMZR5EiZ97qZjXEDVwKG9 vBoQ== X-Forwarded-Encrypted: i=1; AJvYcCUz0zmtGH0uSOLABqvCrZHvWrtuOyPXqNRo5vfC3YL6mGfRxI5//JoABOsaKO5gN/3MQlde931gCvpxGwk=@vger.kernel.org X-Gm-Message-State: AOJu0YyVG5zhIGYod5ez6+e6H1il8GD01Or5LeUn71TjyXgvJqddP6pR 0wwYH0VyRiXv+wwYmQDqZA37gBSUNsaSzvjW7j8ikbehPev+nMXC5ToL7xiXJzhJxqshXvmCYFR uY40r X-Gm-Gg: ATEYQzwsMu3mjo0ZBECKX1LBugnS9vhL91GFn2dMxKYCIZAAkIqCCmMKy488WysnLi6 +v0h39pMkXKWgDZ623plm0+gA93RnQAtZPlrUliOw0K9cz6isSmiUIbCd5zClBAMPaBb7ykA0/S YHvXEdmBakIMKAFH6BTQZWk2KhP/xhbi3nY95wHv7xqPDCz4oRlrA/NsRmLe39YnMJRH1+s6MiQ zyHBrJcvtkBnBjCsLozg5ca62BETzIg7OMSs6L0J7ofKdLgXeNRkjb2lu9cU4y+hI7p+DpDhLeR Z4eaPnpkOvy2DPCrCjWpcHoGxtLbqyojvVdOam5syOl0m4K9HDKwjtlkU9L4wcTShbGEtvqpBZy 8s2YJqHbsPLRWsLI6kwrtU9legyvBFyPf9+yFf6OtooE8Z61OxHpvk8cW708H8NntEj8GgD3XDP Fc2FS+r+zoqg== X-Received: by 2002:a05:600c:1e24:b0:483:887:59b0 with SMTP id 5b1f17b1804b1-48526978dccmr113450985e9.35.1772921304088; Sat, 07 Mar 2026 14:08:24 -0800 (PST) Received: from localhost ([189.99.238.164]) by smtp.gmail.com with ESMTPSA id a1e0cc1a2514c-94e7b57ec19sm5374828241.14.2026.03.07.14.08.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 07 Mar 2026 14:08:23 -0800 (PST) From: =?utf-8?q?Ricardo_B=2E_Marli=C3=A8re?= Date: Sat, 07 Mar 2026 19:08:01 -0300 Subject: [PATCH 6/9] ktest: Stop dropping console output during power-cycle reboot Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260307-ktest-fixes-v1-6-565d412f4925@suse.com> References: <20260307-ktest-fixes-v1-0-565d412f4925@suse.com> In-Reply-To: <20260307-ktest-fixes-v1-0-565d412f4925@suse.com> To: Steven Rostedt , John Hawley Cc: Andrea Righi , Marcos Paulo de Souza , Matthieu Baerts , Fernando Fernandez Mancera , Pedro Falcato , linux-kernel@vger.kernel.org, Steven Rostedt , =?utf-8?q?Ricardo_B=2E_Marli=C3=A8re?= X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openssh-sha256; t=1772921280; l=1568; i=rbm@suse.com; h=from:subject:message-id; bh=KO2CH3fGcpg/tZ9LTCuqxh0HYar7/ISsFmixmMH2/SA=; b=U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgguRCc5X8/UX9M40lkMnr//aFGOhce x5ezt8MFNUFlqYAAAAGcGF0YXR0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5AAAA QFQ+GVOHksGnjqy27RtY6Yh2Y6w5StnzaKbbLs7hHORFURMXfOtgk6Ckyfn2EVImGUXuxxaS9c5 scSlrLNMNJAM= X-Developer-Key: i=rbm@suse.com; a=openssh; fpr=SHA256:pzhe0fJpYLz+3cZ33FFPhIfaUElk9CXPFFXmalIH+1g The POWER_CYCLE fallback added to reboot() flushes monitor output at the wrong time. In the untimed reboot path, flushing immediately after start_monitor() can consume the first output from the new boot before monitor() begins reading it. In the timed path, flushing after POWER_CYCLE can eat the "Linux version" banner or REBOOT_SUCCESS_LINE from the new kernel. That makes ktest miss the boot it is waiting for and can trigger an unnecessary second power cycle. Start the monitor before POWER_CYCLE so the reference counting stays balanced, but only flush when reboot() was asked to wait for a timed reboot. Perform that flush before issuing POWER_CYCLE so it drains stale output from the old kernel instead of consuming the next boot. Signed-off-by: Ricardo B. Marli=C3=A8re --- tools/testing/ktest/ktest.pl | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl index 9d6f50045dbd..bd2e2311884c 100755 --- a/tools/testing/ktest/ktest.pl +++ b/tools/testing/ktest/ktest.pl @@ -1499,12 +1499,13 @@ sub reboot { } =20 if ($powercycle) { - run_command "$power_cycle"; - start_monitor; - # flush out current monitor - # May contain the reboot success line - wait_for_monitor 1; + if (defined($time)) { + # Flush stale console output from the old kernel before power-cycling. + wait_for_monitor 1; + } + + run_command "$power_cycle"; =20 } else { # Make sure everything has been written to disk --=20 2.53.0