From nobody Mon Feb 9 02:14:31 2026 Received: from madrid.collaboradmins.com (madrid.collaboradmins.com [46.235.227.194]) (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 AADBA41A84; Sun, 14 Apr 2024 13:17:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=46.235.227.194 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713100670; cv=none; b=Y00gmP6f/BONqSzwRLo6wGhoG58V5LmP8Xu4mIGzraWCr7kwZcu5fVUUgGjUQuBHMhgAORHr78mJlANgZXPWbLSd/MW8TeF1gjwoFW67+GtuuBZ5BJa3PnBFxiFzc8hDD868um01BReOll99H21e5NYJzJYhfDKPdlM0/Bkfsy8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713100670; c=relaxed/simple; bh=487rgzFDsEyfYYJUJzmpGlea8SYGkTaVFpU/m4GnPhM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=LeQXu1KNCuYHTERreJ7WkcBRMZ+qJzL9epYv7oAFxhAYV2OSgJ+8MmCaYKBOxoinIXZ2SaRdzunW/7EIPY98Kjlr5cRk+Zo++3n8didSYnu2d4L2B0zKSl3bC15vZirIdGeIyD9mz2bmV1qe8neoULYTZuVgUeyi8F3PI32+RMI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=YDj1VvWI; arc=none smtp.client-ip=46.235.227.194 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="YDj1VvWI" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1713100667; bh=487rgzFDsEyfYYJUJzmpGlea8SYGkTaVFpU/m4GnPhM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YDj1VvWI+Zd1nN1q5mxkwKT3RVs5cKsdV5UO6pDAYM9GXOSYkT3gXhtSqZCCoR+vi N16Bjb32lz7RXm3a4lIIRoL7XtCTx0Dn9ZO/FBRcMakJjXrdsWue0XPOFzbqKT8Aqf U3i25EZclyvuvs26Pb+/1mFAxoLB4nYA4MqMzSdoyX5/0/T6/ByvKGb0gh/A+kCFVL px0LG+d5L7k7YGj927GcMiRhQov2dsvTexrJIwvRPMoA3Vfc3BZ+UswxhMUa63XpXJ 9h8E/CrueT38oYe5H2gScecZ15C0/BoOR6mKYVDGuHYsTarqw85euNpEknJpjcE+lR JJhigHZ/W/mkw== Received: from localhost.localdomain (ec2-34-240-57-77.eu-west-1.compute.amazonaws.com [34.240.57.77]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: usama.anjum) by madrid.collaboradmins.com (Postfix) with ESMTPSA id 8F0C637811CE; Sun, 14 Apr 2024 13:17:44 +0000 (UTC) From: Muhammad Usama Anjum To: Shuah Khan , Muhammad Usama Anjum , linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Cc: kernel@collabora.com Subject: [PATCH 1/4] selftests: x86: check_initial_reg_state: conform test to TAP format output Date: Sun, 14 Apr 2024 18:18:04 +0500 Message-Id: <20240414131807.2253344-2-usama.anjum@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240414131807.2253344-1-usama.anjum@collabora.com> References: <20240414131807.2253344-1-usama.anjum@collabora.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Conform the layout, informational and status messages to TAP. No functional change is intended other than the layout of output messages. Signed-off-by: Muhammad Usama Anjum --- .../selftests/x86/check_initial_reg_state.c | 24 +++++++++---------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/tools/testing/selftests/x86/check_initial_reg_state.c b/tools/= testing/selftests/x86/check_initial_reg_state.c index 3bc95f3ed5859..c3d42b193222a 100644 --- a/tools/testing/selftests/x86/check_initial_reg_state.c +++ b/tools/testing/selftests/x86/check_initial_reg_state.c @@ -7,6 +7,7 @@ #define _GNU_SOURCE =20 #include +#include "../kselftest.h" =20 unsigned long ax, bx, cx, dx, si, di, bp, sp, flags; unsigned long r8, r9, r10, r11, r12, r13, r14, r15; @@ -53,20 +54,19 @@ asm ( =20 int main() { - int nerrs =3D 0; + ksft_print_header(); + ksft_set_plan(2); =20 - if (sp =3D=3D 0) { - printf("[FAIL]\tTest was built incorrectly\n"); - return 1; - } + if (sp =3D=3D 0) + ksft_exit_fail_msg("Test was built incorrectly\n"); =20 if (ax || bx || cx || dx || si || di || bp #ifdef __x86_64__ || r8 || r9 || r10 || r11 || r12 || r13 || r14 || r15 #endif ) { - printf("[FAIL]\tAll GPRs except SP should be 0\n"); -#define SHOW(x) printf("\t" #x " =3D 0x%lx\n", x); + ksft_test_result_fail("All GPRs except SP should be 0\n"); +#define SHOW(x) ksft_print_msg("\t" #x " =3D 0x%lx\n", x); SHOW(ax); SHOW(bx); SHOW(cx); @@ -85,17 +85,15 @@ int main() SHOW(r14); SHOW(r15); #endif - nerrs++; } else { - printf("[OK]\tAll GPRs except SP are 0\n"); + ksft_test_result_pass("All GPRs except SP are 0\n"); } =20 if (flags !=3D 0x202) { - printf("[FAIL]\tFLAGS is 0x%lx, but it should be 0x202\n", flags); - nerrs++; + ksft_test_result_fail("FLAGS is 0x%lx, but it should be 0x202\n", flags); } else { - printf("[OK]\tFLAGS is 0x202\n"); + ksft_test_result_pass("FLAGS is 0x202\n"); } =20 - return nerrs ? 1 : 0; + ksft_finished(); } --=20 2.39.2 From nobody Mon Feb 9 02:14:31 2026 Received: from madrid.collaboradmins.com (madrid.collaboradmins.com [46.235.227.194]) (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 B3B9F45BFA; Sun, 14 Apr 2024 13:17:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=46.235.227.194 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713100673; cv=none; b=SLnYJ9vlp43QYwUpodbumtt+nhkGbeI53xE+l0VOyE5KHIa9qM2eDVBc8wrm5qr9uixhveevP+wIHUcdRNzqB8nEsvSdzBlX3ABEmjdvabZX35UZeHVdL0ezQVhw2fLmSywp5/VMlpvkaFLRKymbVLRZR0maUOxLuoLyGyiK/1k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713100673; c=relaxed/simple; bh=LgG/w5qdFetHcwqOkNqngUxFET9OESjfCC+ZDPdjLeA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ME58qtXa0GiMnYSzEcC1M7bOqSeKYx0f1nwTasNSjlRf15MqfWZiNgTEM6UVyUcWfoW5CYntd3do7M5WsmX+gstXRvtpuiDlQTdswg4Ajjx0MJXYrArbW3LjW4OtsRiqTH//UUkQtbo0KZa9lk4txdWR0+Qqw7r7t6h0ikY9P9o= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=WE6XktZc; arc=none smtp.client-ip=46.235.227.194 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="WE6XktZc" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1713100670; bh=LgG/w5qdFetHcwqOkNqngUxFET9OESjfCC+ZDPdjLeA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WE6XktZci+fvrtTY8njC/bMd24bbIXySAl5RjmCtus+qvsW+hgreB/e2pskSc3Ptk 7UEoHxF9TuhTXLyn8djP9XBAUDbci0jA8TXQRLeU8raxZ6oeam3+WOkkWWs5sI+oX0 J96bC6PmbyP0lbmBPP9dY/JPDTAeANy4dLcOz0EeNm8Sd/Nqfkm9ay+P5zpCIBmYB7 ZignZFLLQ/Vn+rG6/e0lO2RTxRUQWK1AtUWFZhKvF0Y0d6zuVcS01/C55ozoYHZal5 tO10eBgRrgkj43NTt2HahVtd2hlxcC93tpyaOLb0m1NTFdmhCHXwlV/dIUJTJ/QPhe Ib3UKnBlbbusw== Received: from localhost.localdomain (ec2-34-240-57-77.eu-west-1.compute.amazonaws.com [34.240.57.77]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: usama.anjum) by madrid.collaboradmins.com (Postfix) with ESMTPSA id B8AE03781104; Sun, 14 Apr 2024 13:17:47 +0000 (UTC) From: Muhammad Usama Anjum To: Shuah Khan , Muhammad Usama Anjum , linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Cc: kernel@collabora.com Subject: [PATCH 2/4] selftests: x86: corrupt_xstate_header: conform test to TAP format output Date: Sun, 14 Apr 2024 18:18:05 +0500 Message-Id: <20240414131807.2253344-3-usama.anjum@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240414131807.2253344-1-usama.anjum@collabora.com> References: <20240414131807.2253344-1-usama.anjum@collabora.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Conform the layout, informational and status messages to TAP. No functional change is intended other than the layout of output messages. Signed-off-by: Muhammad Usama Anjum --- .../selftests/x86/corrupt_xstate_header.c | 30 +++++++++++-------- 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/tools/testing/selftests/x86/corrupt_xstate_header.c b/tools/te= sting/selftests/x86/corrupt_xstate_header.c index cf9ce8fbb656c..119ff74763c6d 100644 --- a/tools/testing/selftests/x86/corrupt_xstate_header.c +++ b/tools/testing/selftests/x86/corrupt_xstate_header.c @@ -39,7 +39,7 @@ static void sethandler(int sig, void (*handler)(int, sigi= nfo_t *, void *), sa.sa_flags =3D SA_SIGINFO | flags; sigemptyset(&sa.sa_mask); if (sigaction(sig, &sa, 0)) - err(1, "sigaction"); + ksft_exit_fail_perror("sigaction"); } =20 static void sigusr1(int sig, siginfo_t *info, void *uc_void) @@ -48,26 +48,29 @@ static void sigusr1(int sig, siginfo_t *info, void *uc_= void) uint8_t *fpstate =3D (uint8_t *)uc->uc_mcontext.fpregs; uint64_t *xfeatures =3D (uint64_t *)(fpstate + 512); =20 - printf("\tWreck XSTATE header\n"); + ksft_print_msg("Wreck XSTATE header\n"); /* Wreck the first reserved bytes in the header */ *(xfeatures + 2) =3D 0xfffffff; } =20 static void sigsegv(int sig, siginfo_t *info, void *uc_void) { - printf("\tGot SIGSEGV\n"); + ksft_print_msg("Got SIGSEGV\n"); } =20 int main(void) { cpu_set_t set; =20 + ksft_print_header(); + ksft_set_plan(2); + sethandler(SIGUSR1, sigusr1, 0); sethandler(SIGSEGV, sigsegv, 0); =20 if (!xsave_enabled()) { - printf("[SKIP] CR4.OSXSAVE disabled.\n"); - return 0; + ksft_print_msg("CR4.OSXSAVE disabled.\n"); + return KSFT_SKIP; } =20 CPU_ZERO(&set); @@ -79,18 +82,21 @@ int main(void) */ sched_setaffinity(getpid(), sizeof(set), &set); =20 - printf("[RUN]\tSend ourselves a signal\n"); + ksft_print_msg("Send ourselves a signal\n"); raise(SIGUSR1); =20 - printf("[OK]\tBack from the signal. Now schedule.\n"); + ksft_test_result_pass("Back from the signal. Now schedule.\n"); + pid_t child =3D fork(); - if (child < 0) - err(1, "fork"); if (child =3D=3D 0) return 0; - if (child) + + if (child < 0) { + ksft_test_result_fail("fork: %s\n", strerror(errno)); + } else if (child) { waitpid(child, NULL, 0); - printf("[OK]\tBack in the main thread.\n"); + ksft_test_result_pass("Back in the main thread.\n"); + } =20 /* * We could try to confirm that extended state is still preserved @@ -98,5 +104,5 @@ int main(void) * a warning in the kernel logs. */ =20 - return 0; + ksft_finished(); } --=20 2.39.2 From nobody Mon Feb 9 02:14:31 2026 Received: from madrid.collaboradmins.com (madrid.collaboradmins.com [46.235.227.194]) (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 261724CB3D; Sun, 14 Apr 2024 13:17:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=46.235.227.194 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713100676; cv=none; b=OZfxH9oi71VH0YjgZvqR/LVGobEbPdueaAXjbyjl0ERqlS7EKlOqUR1CcTk3MlSN/xsGn3NfrouRMPADafQt0Pw7G1Z3vVmL0bK6A7ze2bimrjCqFnx93zup192b881AxpzkIfKaAUQW3aBG4VMforBMsxKUtVg+NH67ElyJH/E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713100676; c=relaxed/simple; bh=3JC88Zejlt6mBk8q/isEPV+6ylxeGUKKA4ZKsL+rtqM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=IAXiMPiHlk97NkWdvyoczwzDWC3vfJQ1LObTypWgd0JfzeNvTO3glmqCKWWv17i6MESqk9sF/lJp6WLLgbxJANawtBh3aqzpmyEuNxX1urXjZq3ZbLwU2aQ0/NSfW49rtJrgZYD6U5PAc40rbM6d6OLDO5dt/D1/7DF1dLZoiw8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=GdNcO6Wv; arc=none smtp.client-ip=46.235.227.194 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="GdNcO6Wv" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1713100673; bh=3JC88Zejlt6mBk8q/isEPV+6ylxeGUKKA4ZKsL+rtqM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GdNcO6WvbLnTIMK/loHKZRMZMNJT7xXRhFVdm8qh45QhPQllev2gHVrf1AlMHgQVk sVr5G9eCRBVzpHAUp7Pi8ZRFv7Nk6lqYuusQ2srnuXxv4TIrJ7X4Jcfgio/intcBcR mHT7UOVodoGdXSVneH9gjBms1foik+9Ek69+hNygTZ1PMaJ8LIuGdfo6FTo5DbYv4J 4kZ8Wxxshfc+FqhuBq0UP5L2mOdkyGkUZVUwZLv6Q7PA5d843Nceu96FaQI2Vvvmuw IgzVal6dUgOkBpGyoN5LD+Z8oBqBcRi1xBLs3i//Tk0pJwMyxoe2q9/PKU8F01+hJC heVOqp104Ct2Q== Received: from localhost.localdomain (ec2-34-240-57-77.eu-west-1.compute.amazonaws.com [34.240.57.77]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: usama.anjum) by madrid.collaboradmins.com (Postfix) with ESMTPSA id 5310637811CE; Sun, 14 Apr 2024 13:17:51 +0000 (UTC) From: Muhammad Usama Anjum To: Shuah Khan , Muhammad Usama Anjum , linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Cc: kernel@collabora.com Subject: [PATCH 3/4] selftests: fsgsbase_restore: conform test to TAP format output Date: Sun, 14 Apr 2024 18:18:06 +0500 Message-Id: <20240414131807.2253344-4-usama.anjum@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240414131807.2253344-1-usama.anjum@collabora.com> References: <20240414131807.2253344-1-usama.anjum@collabora.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Conform the layout, informational and status messages to TAP. No functional change is intended other than the layout of output messages. Signed-off-by: Muhammad Usama Anjum --- .../testing/selftests/x86/fsgsbase_restore.c | 117 +++++++++--------- 1 file changed, 57 insertions(+), 60 deletions(-) diff --git a/tools/testing/selftests/x86/fsgsbase_restore.c b/tools/testing= /selftests/x86/fsgsbase_restore.c index 6fffadc515791..32e5b1b4be16f 100644 --- a/tools/testing/selftests/x86/fsgsbase_restore.c +++ b/tools/testing/selftests/x86/fsgsbase_restore.c @@ -30,6 +30,7 @@ #include #include #include +#include "../kselftest.h" =20 #define EXPECTED_VALUE 0x1337f00d =20 @@ -46,18 +47,18 @@ static unsigned int dereference_seg_base(void) return ret; } =20 -static void init_seg(void) +static int init_seg(void) { unsigned int *target =3D mmap( NULL, sizeof(unsigned int), PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_32BIT, -1, 0); if (target =3D=3D MAP_FAILED) - err(1, "mmap"); + ksft_exit_fail_perror("mmap"); =20 *target =3D EXPECTED_VALUE; =20 - printf("\tsegment base address =3D 0x%lx\n", (unsigned long)target); + ksft_print_msg("segment base address =3D 0x%lx\n", (unsigned long)target); =20 struct user_desc desc =3D { .entry_number =3D 0, @@ -71,7 +72,7 @@ static void init_seg(void) .useable =3D 0 }; if (syscall(SYS_modify_ldt, 1, &desc, sizeof(desc)) =3D=3D 0) { - printf("\tusing LDT slot 0\n"); + ksft_print_msg("using LDT slot 0\n"); asm volatile ("mov %0, %" SEG :: "rm" ((unsigned short)0x7)); } else { /* No modify_ldt for us (configured out, perhaps) */ @@ -97,14 +98,16 @@ static void init_seg(void) munmap(low_desc, sizeof(desc)); =20 if (ret !=3D 0) { - printf("[NOTE]\tcould not create a segment -- can't test anything\n"); - exit(0); + ksft_print_msg("could not create a segment -- can't test anything\n"); + return KSFT_SKIP; } - printf("\tusing GDT slot %d\n", desc.entry_number); + ksft_print_msg("using GDT slot %d\n", desc.entry_number); =20 unsigned short sel =3D (unsigned short)((desc.entry_number << 3) | 0x3); asm volatile ("mov %0, %" SEG :: "rm" (sel)); } + + return 0; } =20 static void tracee_zap_segment(void) @@ -115,7 +118,7 @@ static void tracee_zap_segment(void) * we modify a segment register in order to make sure that ptrace * can correctly restore segment registers. */ - printf("\tTracee: in tracee_zap_segment()\n"); + ksft_print_msg("Tracee: in tracee_zap_segment()\n"); =20 /* * Write a nonzero selector with base zero to the segment register. @@ -130,70 +133,72 @@ static void tracee_zap_segment(void) =20 pid_t pid =3D getpid(), tid =3D syscall(SYS_gettid); =20 - printf("\tTracee is going back to sleep\n"); + ksft_print_msg("Tracee is going back to sleep\n"); syscall(SYS_tgkill, pid, tid, SIGSTOP); =20 /* Should not get here. */ - while (true) { - printf("[FAIL]\tTracee hit unreachable code\n"); - pause(); - } + ksft_exit_fail_msg("Tracee hit unreachable code\n"); } =20 int main() { - printf("\tSetting up a segment\n"); - init_seg(); + int ret; + + ksft_print_header(); + ksft_set_plan(2); + + ksft_print_msg("Setting up a segment\n"); + + ret =3D init_seg(); + if (ret) + return ret; =20 unsigned int val =3D dereference_seg_base(); - if (val !=3D EXPECTED_VALUE) { - printf("[FAIL]\tseg[0] =3D=3D %x; should be %x\n", val, EXPECTED_VALUE); - return 1; - } - printf("[OK]\tThe segment points to the right place.\n"); + ksft_test_result(val =3D=3D EXPECTED_VALUE, "The segment points to the ri= ght place.\n"); =20 pid_t chld =3D fork(); if (chld < 0) - err(1, "fork"); + ksft_exit_fail_perror("fork"); =20 if (chld =3D=3D 0) { prctl(PR_SET_PDEATHSIG, SIGKILL, 0, 0, 0, 0); =20 if (ptrace(PTRACE_TRACEME, 0, 0, 0) !=3D 0) - err(1, "PTRACE_TRACEME"); + ksft_exit_fail_perror("PTRACE_TRACEME"); =20 pid_t pid =3D getpid(), tid =3D syscall(SYS_gettid); =20 - printf("\tTracee will take a nap until signaled\n"); + ksft_print_msg("Tracee will take a nap until signaled\n"); syscall(SYS_tgkill, pid, tid, SIGSTOP); =20 - printf("\tTracee was resumed. Will re-check segment.\n"); + ksft_print_msg("Tracee was resumed. Will re-check segment.\n"); =20 val =3D dereference_seg_base(); - if (val !=3D EXPECTED_VALUE) { - printf("[FAIL]\tseg[0] =3D=3D %x; should be %x\n", val, EXPECTED_VALUE); - exit(1); + + if (val =3D=3D EXPECTED_VALUE) { + ksft_print_msg("The segment points to the right place.\n"); + return EXIT_SUCCESS; } =20 - printf("[OK]\tThe segment points to the right place.\n"); - exit(0); + ksft_print_msg("seg[0] =3D=3D %x; should be %x\n", val, EXPECTED_VALUE); + return EXIT_FAILURE; } =20 int status; =20 /* Wait for SIGSTOP. */ if (waitpid(chld, &status, 0) !=3D chld || !WIFSTOPPED(status)) - err(1, "waitpid"); + ksft_exit_fail_perror("waitpid"); =20 struct user_regs_struct regs; =20 if (ptrace(PTRACE_GETREGS, chld, NULL, ®s) !=3D 0) - err(1, "PTRACE_GETREGS"); + ksft_exit_fail_perror("PTRACE_GETREGS"); =20 #ifdef __x86_64__ - printf("\tChild GS=3D0x%lx, GSBASE=3D0x%lx\n", (unsigned long)regs.gs, (u= nsigned long)regs.gs_base); + ksft_print_msg("Child GS=3D0x%lx, GSBASE=3D0x%lx\n", (unsigned long)regs.= gs, (unsigned long)regs.gs_base); #else - printf("\tChild FS=3D0x%lx\n", (unsigned long)regs.xfs); + ksft_print_msg("Child FS=3D0x%lx\n", (unsigned long)regs.xfs); #endif =20 struct user_regs_struct regs2 =3D regs; @@ -204,42 +209,34 @@ int main() regs2.eip =3D (unsigned long)tracee_zap_segment; #endif =20 - printf("\tTracer: redirecting tracee to tracee_zap_segment()\n"); + ksft_print_msg("Tracer: redirecting tracee to tracee_zap_segment()\n"); if (ptrace(PTRACE_SETREGS, chld, NULL, ®s2) !=3D 0) - err(1, "PTRACE_GETREGS"); + ksft_exit_fail_perror("PTRACE_GETREGS"); if (ptrace(PTRACE_CONT, chld, NULL, NULL) !=3D 0) - err(1, "PTRACE_GETREGS"); + ksft_exit_fail_perror("PTRACE_GETREGS"); =20 /* Wait for SIGSTOP. */ if (waitpid(chld, &status, 0) !=3D chld || !WIFSTOPPED(status)) - err(1, "waitpid"); + ksft_exit_fail_perror("waitpid"); =20 - printf("\tTracer: restoring tracee state\n"); + ksft_print_msg("Tracer: restoring tracee state\n"); if (ptrace(PTRACE_SETREGS, chld, NULL, ®s) !=3D 0) - err(1, "PTRACE_GETREGS"); + ksft_exit_fail_perror("PTRACE_GETREGS"); if (ptrace(PTRACE_DETACH, chld, NULL, NULL) !=3D 0) - err(1, "PTRACE_GETREGS"); + ksft_exit_fail_perror("PTRACE_GETREGS"); =20 /* Wait for SIGSTOP. */ if (waitpid(chld, &status, 0) !=3D chld) - err(1, "waitpid"); - - if (WIFSIGNALED(status)) { - printf("[FAIL]\tTracee crashed\n"); - return 1; - } - - if (!WIFEXITED(status)) { - printf("[FAIL]\tTracee stopped for an unexpected reason: %d\n", status); - return 1; - } - - int exitcode =3D WEXITSTATUS(status); - if (exitcode !=3D 0) { - printf("[FAIL]\tTracee reported failure\n"); - return 1; - } - - printf("[OK]\tAll is well.\n"); - return 0; + ksft_exit_fail_perror("waitpid"); + + if (WIFSIGNALED(status)) + ksft_test_result_fail("Tracee crashed\n"); + else if (!WIFEXITED(status)) + ksft_test_result_fail("Tracee stopped for an unexpected reason: %d\n", s= tatus); + else if (WEXITSTATUS(status) !=3D 0) + ksft_test_result_fail("Tracee reported failure\n"); + else + ksft_test_result_pass("Tracee exited correctly\n"); + + ksft_finished(); } --=20 2.39.2 From nobody Mon Feb 9 02:14:31 2026 Received: from madrid.collaboradmins.com (madrid.collaboradmins.com [46.235.227.194]) (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 28F304F8BC; Sun, 14 Apr 2024 13:17:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=46.235.227.194 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713100679; cv=none; b=SOEBAdtBIOV5Urdmbq5hMjpQ2HcqT0yrm8jeYHl6OPXfL8AR26W26+er5PQHdLkNXTVP4JoxO+rlCWGXOU9OYfaHVWhSD6XsGeKh0a5gjIBMWYQQtwItt+nvBXMUdTO12NYtj4Ss2gvTJYFhbAnl1qaSRgLHl0fMkre72KadLNQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713100679; c=relaxed/simple; bh=Qu2UHNtcHhUUEJhqna7Iwsyq/Ry6n1UFBiLy0zlBRIk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=DBDJ1Hd2iyur72IU1YixQEp2CfMKyysbyasogX/ZcHaTbOC8Uu+zf6xzwPvMQsMyaM1H2vAwM06i+2Z0bxgDe75/QfYeZHlqivvOR/0mxDDEokKr6AvnAvtqqIe/hBBAki9jq+2whcoEfT4xBYCDc/bGvkVvKVqRb6Jyk29PUeI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=xANgkuPp; arc=none smtp.client-ip=46.235.227.194 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="xANgkuPp" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1713100676; bh=Qu2UHNtcHhUUEJhqna7Iwsyq/Ry6n1UFBiLy0zlBRIk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xANgkuPpR+cFcuPisB6cwLlAetiYGpNijmhFNUjThqhRRs0lcAeEC6TqOT/hiBsii 9kAr0xH+aGfZ7f+uoWbgYhbOTKbZXblrX37RunyYFOYuToQxxE+EPINriMPVhTa8Qt hEvpgW+buHN9vIJiPV+hkER40fG7IMcSv5uLqRPLaQJqQjS+25c9euYQGobvO+v0az 09S38DSx0xUXL6fpUVHod4D6BlEdqkve2kh+QQg4gqErKA7GJe6MMy2OdQnAdJzv1U qoIaK/2ymCGX3zHLew13x5zT2UrKx2705+Y8+qcMknqYkT0Sug3XMSKDLkLGW8akb6 JWIonl3g57Org== Received: from localhost.localdomain (ec2-34-240-57-77.eu-west-1.compute.amazonaws.com [34.240.57.77]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: usama.anjum) by madrid.collaboradmins.com (Postfix) with ESMTPSA id 33B103781104; Sun, 14 Apr 2024 13:17:53 +0000 (UTC) From: Muhammad Usama Anjum To: Shuah Khan , Muhammad Usama Anjum , linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Cc: kernel@collabora.com Subject: [PATCH 4/4] selftests: entry_from_vm86: conform test to TAP format output Date: Sun, 14 Apr 2024 18:18:07 +0500 Message-Id: <20240414131807.2253344-5-usama.anjum@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240414131807.2253344-1-usama.anjum@collabora.com> References: <20240414131807.2253344-1-usama.anjum@collabora.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Conform the layout, informational and status messages to TAP. No functional change is intended other than the layout of output messages. Signed-off-by: Muhammad Usama Anjum --- tools/testing/selftests/x86/entry_from_vm86.c | 109 +++++++++--------- 1 file changed, 53 insertions(+), 56 deletions(-) diff --git a/tools/testing/selftests/x86/entry_from_vm86.c b/tools/testing/= selftests/x86/entry_from_vm86.c index d1e919b0c1dc8..a4efa4588e6f8 100644 --- a/tools/testing/selftests/x86/entry_from_vm86.c +++ b/tools/testing/selftests/x86/entry_from_vm86.c @@ -23,9 +23,9 @@ #include #include #include +#include "../kselftest.h" =20 static unsigned long load_addr =3D 0x10000; -static int nerrs =3D 0; =20 static void sethandler(int sig, void (*handler)(int, siginfo_t *, void *), int flags) @@ -36,7 +36,7 @@ static void sethandler(int sig, void (*handler)(int, sigi= nfo_t *, void *), sa.sa_flags =3D SA_SIGINFO | flags; sigemptyset(&sa.sa_mask); if (sigaction(sig, &sa, 0)) - err(1, "sigaction"); + ksft_exit_fail_perror("sigaction"); } =20 static void clearhandler(int sig) @@ -46,7 +46,7 @@ static void clearhandler(int sig) sa.sa_handler =3D SIG_DFL; sigemptyset(&sa.sa_mask); if (sigaction(sig, &sa, 0)) - err(1, "sigaction"); + ksft_exit_fail_perror("sigaction"); } =20 static sig_atomic_t got_signal; @@ -56,10 +56,8 @@ static void sighandler(int sig, siginfo_t *info, void *c= tx_void) ucontext_t *ctx =3D (ucontext_t*)ctx_void; =20 if (ctx->uc_mcontext.gregs[REG_EFL] & X86_EFLAGS_VM || - (ctx->uc_mcontext.gregs[REG_CS] & 3) !=3D 3) { - printf("[FAIL]\tSignal frame should not reflect vm86 mode\n"); - nerrs++; - } + (ctx->uc_mcontext.gregs[REG_CS] & 3) !=3D 3) + ksft_test_result_fail("Signal frame should not reflect vm86 mode\n"); =20 const char *signame; if (sig =3D=3D SIGSEGV) @@ -69,9 +67,9 @@ static void sighandler(int sig, siginfo_t *info, void *ct= x_void) else signame =3D "unexpected signal"; =20 - printf("[INFO]\t%s: FLAGS =3D 0x%lx, CS =3D 0x%hx\n", signame, - (unsigned long)ctx->uc_mcontext.gregs[REG_EFL], - (unsigned short)ctx->uc_mcontext.gregs[REG_CS]); + ksft_test_result_pass("%s: FLAGS =3D 0x%lx, CS =3D 0x%hx\n", signame, + (unsigned long)ctx->uc_mcontext.gregs[REG_EFL], + (unsigned short)ctx->uc_mcontext.gregs[REG_CS]); =20 got_signal =3D 1; } @@ -137,13 +135,13 @@ static bool do_test(struct vm86plus_struct *v86, unsi= gned long eip, { long ret; =20 - printf("[RUN]\t%s from vm86 mode\n", text); + ksft_print_msg("%s from vm86 mode\n", text); v86->regs.eip =3D eip; ret =3D vm86(VM86_ENTER, v86); =20 if (ret =3D=3D -1 && (errno =3D=3D ENOSYS || errno =3D=3D EPERM)) { - printf("[SKIP]\tvm86 %s\n", - errno =3D=3D ENOSYS ? "not supported" : "not allowed"); + ksft_test_result_skip("vm86 %s\n", + errno =3D=3D ENOSYS ? "not supported" : "not allowed"); return false; } =20 @@ -159,29 +157,27 @@ static bool do_test(struct vm86plus_struct *v86, unsi= gned long eip, else sprintf(trapname, "%d", trapno); =20 - printf("[INFO]\tExited vm86 mode due to #%s\n", trapname); + ksft_print_msg("Exited vm86 mode due to #%s\n", trapname); } else if (VM86_TYPE(ret) =3D=3D VM86_UNKNOWN) { - printf("[INFO]\tExited vm86 mode due to unhandled GP fault\n"); + ksft_print_msg("Exited vm86 mode due to unhandled GP fault\n"); } else if (VM86_TYPE(ret) =3D=3D VM86_TRAP) { - printf("[INFO]\tExited vm86 mode due to a trap (arg=3D%ld)\n", - VM86_ARG(ret)); + ksft_print_msg("Exited vm86 mode due to a trap (arg=3D%ld)\n", + VM86_ARG(ret)); } else if (VM86_TYPE(ret) =3D=3D VM86_SIGNAL) { - printf("[INFO]\tExited vm86 mode due to a signal\n"); + ksft_print_msg("Exited vm86 mode due to a signal\n"); } else if (VM86_TYPE(ret) =3D=3D VM86_STI) { - printf("[INFO]\tExited vm86 mode due to STI\n"); + ksft_print_msg("Exited vm86 mode due to STI\n"); } else { - printf("[INFO]\tExited vm86 mode due to type %ld, arg %ld\n", - VM86_TYPE(ret), VM86_ARG(ret)); + ksft_print_msg("Exited vm86 mode due to type %ld, arg %ld\n", + VM86_TYPE(ret), VM86_ARG(ret)); } =20 if (rettype =3D=3D -1 || - (VM86_TYPE(ret) =3D=3D rettype && VM86_ARG(ret) =3D=3D retarg)) { - printf("[OK]\tReturned correctly\n"); - } else { - printf("[FAIL]\tIncorrect return reason (started at eip =3D 0x%lx, ended= at eip =3D 0x%lx)\n", eip, v86->regs.eip); - nerrs++; - } - + (VM86_TYPE(ret) =3D=3D rettype && VM86_ARG(ret) =3D=3D retarg)) + ksft_test_result_pass("Returned correctly\n"); + else + ksft_test_result_fail("Incorrect return reason (started at eip =3D 0x%lx= , ended at eip =3D 0x%lx)\n", + eip, v86->regs.eip); return true; } =20 @@ -215,26 +211,20 @@ void do_umip_tests(struct vm86plus_struct *vm86, unsi= gned char *test_mem) /* Results when using register operands */ msw3 =3D *(unsigned short *)(test_mem + 2080); =20 - printf("[INFO]\tResult from SMSW:[0x%04x]\n", msw1); - printf("[INFO]\tResult from SIDT: limit[0x%04x]base[0x%08lx]\n", - idt1.limit, idt1.base); - printf("[INFO]\tResult from SGDT: limit[0x%04x]base[0x%08lx]\n", - gdt1.limit, gdt1.base); + ksft_print_msg("Result from SMSW:[0x%04x]\n", msw1); + ksft_print_msg("Result from SIDT: limit[0x%04x]base[0x%08lx]\n", + idt1.limit, idt1.base); + ksft_print_msg("Result from SGDT: limit[0x%04x]base[0x%08lx]\n", + gdt1.limit, gdt1.base); =20 - if (msw1 !=3D msw2 || msw1 !=3D msw3) - printf("[FAIL]\tAll the results of SMSW should be the same.\n"); - else - printf("[PASS]\tAll the results from SMSW are identical.\n"); + ksft_test_result((msw1 =3D=3D msw2 && msw1 =3D=3D msw3), + "All the results from SMSW are identical.\n"); =20 - if (memcmp(&gdt1, &gdt2, sizeof(gdt1))) - printf("[FAIL]\tAll the results of SGDT should be the same.\n"); - else - printf("[PASS]\tAll the results from SGDT are identical.\n"); + ksft_test_result(!memcmp(&gdt1, &gdt2, sizeof(gdt1)), + "All the results from SGDT are identical.\n"); =20 - if (memcmp(&idt1, &idt2, sizeof(idt1))) - printf("[FAIL]\tAll the results of SIDT should be the same.\n"); - else - printf("[PASS]\tAll the results from SIDT are identical.\n"); + ksft_test_result(!memcmp(&idt1, &idt2, sizeof(idt1)), + "All the results from SIDT are identical.\n"); =20 sethandler(SIGILL, sighandler, 0); do_test(vm86, vmcode_umip_str - vmcode, VM86_SIGNAL, 0, @@ -250,11 +240,15 @@ void do_umip_tests(struct vm86plus_struct *vm86, unsi= gned char *test_mem) int main(void) { struct vm86plus_struct v86; - unsigned char *addr =3D mmap((void *)load_addr, 4096, - PROT_READ | PROT_WRITE | PROT_EXEC, - MAP_ANONYMOUS | MAP_PRIVATE, -1,0); + unsigned char *addr; + + ksft_print_header(); + ksft_set_plan(18); + + addr =3D mmap((void *)load_addr, 4096, PROT_READ | PROT_WRITE | PROT_EXEC, + MAP_ANONYMOUS | MAP_PRIVATE, -1, 0); if (addr !=3D (unsigned char *)load_addr) - err(1, "mmap"); + ksft_exit_fail_perror("mmap"); =20 memcpy(addr, vmcode, end_vmcode - vmcode); addr[2048] =3D 2; @@ -270,7 +264,8 @@ int main(void) /* Use the end of the page as our stack. */ v86.regs.esp =3D 4096; =20 - assert((v86.regs.cs & 3) =3D=3D 0); /* Looks like RPL =3D 0 */ + if (v86.regs.cs & 3) + ksft_exit_fail_msg("Looks like RPL =3D 0\n"); =20 /* #BR -- should deliver SIG??? */ do_test(&v86, vmcode_bound - vmcode, VM86_INTx, 5, "#BR"); @@ -333,16 +328,18 @@ int main(void) v86.regs.ss =3D 0; sethandler(SIGSEGV, sighandler, 0); got_signal =3D 0; - if (do_test(&v86, 0, VM86_SIGNAL, 0, "Execute null pointer") && - !got_signal) { - printf("[FAIL]\tDid not receive SIGSEGV\n"); - nerrs++; - } + if (do_test(&v86, 0, VM86_SIGNAL, 0, "Execute null pointer")) + ksft_test_result(got_signal, "Received SIGSEGV\n"); + else + ksft_test_result_skip("Received SIGSEGV\n"); + clearhandler(SIGSEGV); =20 /* Make sure nothing explodes if we fork. */ if (fork() =3D=3D 0) return 0; =20 - return (nerrs =3D=3D 0 ? 0 : 1); + ksft_test_result_pass("fork succeeded\n"); + + ksft_finished(); } --=20 2.39.2