From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CE1AD1C1AAA; Tue, 12 Aug 2025 19:05:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755025527; cv=none; b=gOiu3ofFbcb0vkShIztvolFIp3yyBOQS/5/jlnJNkq3l+8+SNzaoi3GyvPS4CEdQGxx0rYhaTYlBoiIbsVl838c1rpqVRRUxA2eRDvDkSYGSiN4F2H64PWpQcLhZSISFFsO7LPO8VloUpxpXabuXmxt+4gyl/sZoCbD1bgo4oXQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755025527; c=relaxed/simple; bh=2XsImryQLH2ThiJelWoaq25ZVkACA3YWqkeWUlRSddo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=kdLIupwE7VtolaJN+OJGg7tpCR+K5S57Uor8m26HqTIhcr5CoLOygejugzWsYEuicS0C7dsJnakzBQlL0MrhM/rKCsACLyHVplc46nc5ULpnBCLwiVmd81ypfbjlccoEf6eEPsV7ScESg+Uspv6DqN9UVTp76u6zw2BGrQfBYqg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=VOhm7FFo; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="VOhm7FFo" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 00511C4CEF0; Tue, 12 Aug 2025 19:05:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1755025527; bh=2XsImryQLH2ThiJelWoaq25ZVkACA3YWqkeWUlRSddo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VOhm7FFoJvsSrTOHP9kGlhp4YpLKBnVb74d2ZI4+Zo0dSt9dOZ78xYMUW+Lpc9Qoy yex9KtpJsWs2t7Hx1RySpQWurGij0aGdEJd+JgqsHnck5I02BZx15GQ/8wLi+1unRm E3VIJCzw20b6xrrB8ISUUqy4Pc1ySBbuZUlDni74= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= , Thomas Gleixner , Muhammad Usama Anjum , Sasha Levin Subject: [PATCH 6.15 067/480] selftests: vDSO: chacha: Correctly skip test if necessary Date: Tue, 12 Aug 2025 19:44:35 +0200 Message-ID: <20250812174400.179874519@linuxfoundation.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250812174357.281828096@linuxfoundation.org> References: <20250812174357.281828096@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Thomas Weißschuh [ Upstream commit 2c0a4428f5d6005ff0db12057cc35273593fc040 ] According to kselftest.h ksft_exit_skip() is not meant to be called when a plan has already been printed. Use the recommended function ksft_test_result_skip(). This fixes a bug, where the TAP output would be invalid when skipping: TAP version 13 1..1 ok 2 # SKIP Not implemented on architecture The SKIP line should start with "ok 1" as the plan only contains one test. Fixes: 3b5992eaf730 ("selftests: vDSO: unconditionally build chacha test") Signed-off-by: Thomas Weißschuh Signed-off-by: Thomas Gleixner Reviewed-by: Muhammad Usama Anjum Link: https://lore.kernel.org/all/20250611-selftests-vdso-fixes-v3-1-e62e37a6bcf5@linutronix.de Signed-off-by: Sasha Levin --- tools/testing/selftests/vDSO/vdso_test_chacha.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/vDSO/vdso_test_chacha.c b/tools/testing/selftests/vDSO/vdso_test_chacha.c index 8757f738b0b1..0aad682b12c8 100644 --- a/tools/testing/selftests/vDSO/vdso_test_chacha.c +++ b/tools/testing/selftests/vDSO/vdso_test_chacha.c @@ -76,7 +76,8 @@ static void reference_chacha20_blocks(uint8_t *dst_bytes, const uint32_t *key, u void __weak __arch_chacha20_blocks_nostack(uint8_t *dst_bytes, const uint32_t *key, uint32_t *counter, size_t nblocks) { - ksft_exit_skip("Not implemented on architecture\n"); + ksft_test_result_skip("Not implemented on architecture\n"); + ksft_finished(); } int main(int argc, char *argv[]) -- 2.39.5