Received: by 2002:a19:771d:0:0:0:0:0 with SMTP id s29csp1265666lfc; Wed, 1 Jun 2022 13:33:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx7LCJ6AdjqjSG6vzwajIoy5D+i7od3pkf3odIVFq+OIAPWqXJ++kRfOix1LooFckxh+f/n X-Received: by 2002:a17:90a:ab8d:b0:1e0:a082:b2c7 with SMTP id n13-20020a17090aab8d00b001e0a082b2c7mr1195059pjq.17.1654115637125; Wed, 01 Jun 2022 13:33:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654115637; cv=none; d=google.com; s=arc-20160816; b=kMs5b7kaXRUH+Sc3aaTH9uhQirdKyAfD6StOt8D9tWX1dCl+qQltB6dtKGUTPuMDJv gO+NOW4n5DuwYEcoXjx0KugbWkP5SeoWgCPVeZCog+hLY1G4ruRuD2xFGB9rEm2ay7a/ 7qOyKtHZRfNkuUJp5lR5lxmLbkW1/D/QCRnbS8JmRZaDq5DICSOMmV+dxLYSI4sXNr2X z2Li/UY2i/B7u9hLxlEUEDQ5qySFCDXEeDGTWfo0MfzXE6+0jC3SM6ck5KQxF3U54s2R zv/+AmOpi6GajzKlqxWgZA9Wt/Yeur63U4aorF87orPqJeq5QwzT34mBCk3L95F6eSsL jdxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=ER0G70Vk6MSxrCw6Q2vx2/PtAgU/EHIeDkdZtqawsiY=; b=Lt9gdFmpxGSvgvD/tGjSKFxyDIB4R5ISlheSwbfZlTTF/A+oRFulhqeHbszf2V7Tlp i8TiDMU83waGN2qW0FuyX++wWPBv/yIaOdwIk3tN7gwBaXE7OxhssCUsZ9wLB2MXKENF aQ4JKzIaCyGEPSCkCpPWbeedtCFOsUyaU/FHhHOwVXnKTfDkhDllEZVcm6SwgNWHNRXK +z+2aLyHncplxUcsdJP8vY4scAzPkz5nycVBizEf+L1JRQgoLDBJgV85gqGfupMMO69E gmp5O0hNsj4pDWz7jdxfp0qapFeI0C2gl7ice8HZ7Ssy/ThIloCgcQvEKge0Iaa+1QHk UQOQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=ILwP9MKX; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [23.128.96.19]) by mx.google.com with ESMTPS id j62-20020a638041000000b003fa9aeadc1esi3477834pgd.182.2022.06.01.13.33.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jun 2022 13:33:57 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=ILwP9MKX; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 4387F1D059A; Wed, 1 Jun 2022 12:43:37 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245635AbiEaKQZ (ORCPT + 99 others); Tue, 31 May 2022 06:16:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50520 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245625AbiEaKQS (ORCPT ); Tue, 31 May 2022 06:16:18 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id CA6988DDEF for ; Tue, 31 May 2022 03:16:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1653992172; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ER0G70Vk6MSxrCw6Q2vx2/PtAgU/EHIeDkdZtqawsiY=; b=ILwP9MKX9xffEBp8kLa/OZ7gOa8wgh0SgV51aghZawwjpT8mDcBb6tY7YSNs2d9txmhSiv 1IijzmGkZL855oCnkgNZPufgYvDlqVn6x+VMTjvJyOX91hsk6H4EDZjlKGUBpLBMexSeOD nWzOrKn4GzZwTz7Lu70RbuBOGMTVOgU= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-637-l8s_VTNkOHyOPwvQYzTJ2Q-1; Tue, 31 May 2022 06:16:08 -0400 X-MC-Unique: l8s_VTNkOHyOPwvQYzTJ2Q-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id BF2D71C08976; Tue, 31 May 2022 10:16:07 +0000 (UTC) Received: from thuth.com (unknown [10.39.194.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id 79931492C3B; Tue, 31 May 2022 10:16:05 +0000 (UTC) From: Thomas Huth To: kvm@vger.kernel.org, Christian Borntraeger , Janosch Frank , Claudio Imbrenda Cc: linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, David Hildenbrand , Paolo Bonzini , Shuah Khan , Janis Schoetterl-Glausch , linux-s390@vger.kernel.org Subject: [PATCH v4 3/4] KVM: s390: selftests: Use TAP interface in the tprot test Date: Tue, 31 May 2022 12:15:53 +0200 Message-Id: <20220531101554.36844-4-thuth@redhat.com> In-Reply-To: <20220531101554.36844-1-thuth@redhat.com> References: <20220531101554.36844-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.85 on 10.11.54.9 X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The tprot test currently does not have any output (unless one of the TEST_ASSERT statement fails), so it's hard to say for a user whether a certain new sub-test has been included in the binary or not. Let's make this a little bit more user-friendly and include some TAP output via the kselftests.h interface. Reviewed-by: Janosch Frank Reviewed-by: Janis Schoetterl-Glausch Signed-off-by: Thomas Huth --- tools/testing/selftests/kvm/s390x/tprot.c | 29 +++++++++++++++++++---- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/tools/testing/selftests/kvm/s390x/tprot.c b/tools/testing/selftests/kvm/s390x/tprot.c index c097b9db495e..14d74a9e7b3d 100644 --- a/tools/testing/selftests/kvm/s390x/tprot.c +++ b/tools/testing/selftests/kvm/s390x/tprot.c @@ -8,6 +8,7 @@ #include #include "test_util.h" #include "kvm_util.h" +#include "kselftest.h" #define PAGE_SHIFT 12 #define PAGE_SIZE (1 << PAGE_SHIFT) @@ -63,12 +64,12 @@ static enum permission test_protection(void *addr, uint8_t key) } enum stage { - STAGE_END, STAGE_INIT_SIMPLE, TEST_SIMPLE, STAGE_INIT_FETCH_PROT_OVERRIDE, TEST_FETCH_PROT_OVERRIDE, TEST_STORAGE_PROT_OVERRIDE, + STAGE_END /* must be the last entry (it's the amount of tests) */ }; struct test { @@ -182,7 +183,7 @@ static void guest_code(void) GUEST_SYNC(perform_next_stage(&i, mapped_0)); } -#define HOST_SYNC(vmp, stage) \ +#define HOST_SYNC_NO_TAP(vmp, stage) \ ({ \ struct kvm_vm *__vm = (vmp); \ struct ucall uc; \ @@ -198,12 +199,21 @@ static void guest_code(void) ASSERT_EQ(uc.args[1], __stage); \ }) +#define HOST_SYNC(vmp, stage) \ +({ \ + HOST_SYNC_NO_TAP(vmp, stage); \ + ksft_test_result_pass("" #stage "\n"); \ +}) + int main(int argc, char *argv[]) { struct kvm_vm *vm; struct kvm_run *run; vm_vaddr_t guest_0_page; + ksft_print_header(); + ksft_set_plan(STAGE_END); + vm = vm_create_default(VCPU_ID, 0, guest_code); run = vcpu_state(vm, VCPU_ID); @@ -212,9 +222,14 @@ int main(int argc, char *argv[]) HOST_SYNC(vm, TEST_SIMPLE); guest_0_page = vm_vaddr_alloc(vm, PAGE_SIZE, 0); - if (guest_0_page != 0) - print_skip("Did not allocate page at 0 for fetch protection override tests"); - HOST_SYNC(vm, STAGE_INIT_FETCH_PROT_OVERRIDE); + if (guest_0_page != 0) { + /* Use NO_TAP so we don't get a PASS print */ + HOST_SYNC_NO_TAP(vm, STAGE_INIT_FETCH_PROT_OVERRIDE); + ksft_test_result_skip("STAGE_INIT_FETCH_PROT_OVERRIDE - " + "Did not allocate page at 0\n"); + } else { + HOST_SYNC(vm, STAGE_INIT_FETCH_PROT_OVERRIDE); + } if (guest_0_page == 0) mprotect(addr_gva2hva(vm, (vm_vaddr_t)0), PAGE_SIZE, PROT_READ); run->s.regs.crs[0] |= CR0_FETCH_PROTECTION_OVERRIDE; @@ -224,4 +239,8 @@ int main(int argc, char *argv[]) run->s.regs.crs[0] |= CR0_STORAGE_PROTECTION_OVERRIDE; run->kvm_dirty_regs = KVM_SYNC_CRS; HOST_SYNC(vm, TEST_STORAGE_PROT_OVERRIDE); + + kvm_vm_free(vm); + + ksft_finished(); /* Print results and exit() accordingly */ } -- 2.31.1