From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 948F9C433EF for ; Thu, 14 Apr 2022 12:02:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235641AbiDNME4 (ORCPT ); Thu, 14 Apr 2022 08:04:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41620 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238797AbiDNMEy (ORCPT ); Thu, 14 Apr 2022 08:04:54 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 83827BE38 for ; Thu, 14 Apr 2022 05:02:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1649937748; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=z3FMxX8GyVoS8mf6ZxYvPq6BenaD/e/QdsrS7P4PzMs=; b=VghNnlGJ5Y+6ARhdv2X5z3j4n7GK1u+uKUVbWMAcGrRoYKc8zIYO+0JJtBMuzEchkNV33p UF+D8Su/u9EZ3xWd3rY3FHUNs4kL/gNwS1ywUwx5YXtLoolCVtcHbb0l/0i7eJPBoKFCE7 N6R0suo+CG7rc33p24/eVm/EFVBTz8w= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-534-c0RMrK6zPlGclMPSuRZRlQ-1; Thu, 14 Apr 2022 08:02:27 -0400 X-MC-Unique: c0RMrK6zPlGclMPSuRZRlQ-1 Received: by mail-wr1-f71.google.com with SMTP id p18-20020adf9592000000b00207bc12decbso513883wrp.21 for ; Thu, 14 Apr 2022 05:02:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:cc:references:from:in-reply-to :content-transfer-encoding; bh=z3FMxX8GyVoS8mf6ZxYvPq6BenaD/e/QdsrS7P4PzMs=; b=R/MChfKvdU9WMSbSZKCUF7gYIb/0T2LeRchk2AR8tGhap09HvNaKTzxrbL2/k7tEEo Zj7y3lClOf8irES3AXvUwHwXjMF5B0UNLYVAEurEuU7hntzz5f93ySW1TwJWyAYSxoAW 0L4gVIBlKwoH60Ba81IrasUkk3+M136jNR9EkCOtMPH+/kqnzOa1jcdnNcSOsxybVQMX kP8tRkxJ1mN8Dl+99mFm0alSIbJDgKmxXRYZ/cGAQY39FWq0PjUIQTbjiNw8UqmqNUEk AhM0QDvYNRycY/oNTAkt7GmBBuwA5sX2O0bFvhHfg28VWXo6OM9JExsDJiqEmc2+wJj7 LcrQ== X-Gm-Message-State: AOAM532Bk8k3TUA9ypd4JkVNb2bZm3BewLhQr3Bg0tpr5zAXcoA17bjE sUmR1n1L1+t5WT/J1Jp5CFKSl57h0Rdf7UBUyKVhBtA8S2VRqHZpDTYducj2NZqWqenEnnohSRp o6gdmK4EBFDB/E27wCj3STMof X-Received: by 2002:a5d:434e:0:b0:207:a48e:a99a with SMTP id u14-20020a5d434e000000b00207a48ea99amr1881974wrr.250.1649937746189; Thu, 14 Apr 2022 05:02:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwnemt8GV6C+iUV4Xujnf7yfMt3Y2E26lDSV3mnOBMJsHfd0I9Yp1JsK0iCHFs148mOqJpc6A== X-Received: by 2002:a5d:434e:0:b0:207:a48e:a99a with SMTP id u14-20020a5d434e000000b00207a48ea99amr1881947wrr.250.1649937745864; Thu, 14 Apr 2022 05:02:25 -0700 (PDT) Received: from [10.33.192.232] (nat-pool-str-t.redhat.com. [149.14.88.106]) by smtp.gmail.com with ESMTPSA id n32-20020a05600c3ba000b0038ed068052fsm1920811wms.19.2022.04.14.05.02.24 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 14 Apr 2022 05:02:25 -0700 (PDT) Message-ID: <20d27b46-fe1f-4a80-0dba-e0ce5df934c9@redhat.com> Date: Thu, 14 Apr 2022 14:02:24 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.7.0 Subject: Re: [PATCH 2/4] KVM: s390: selftests: Use TAP interface in the sync_regs test Content-Language: en-US To: Claudio Imbrenda Cc: kvm@vger.kernel.org, Christian Borntraeger , Janosch Frank , linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, David Hildenbrand , Paolo Bonzini , Shuah Khan , Janis Schoetterl-Glausch References: <20220414105322.577439-1-thuth@redhat.com> <20220414105322.577439-3-thuth@redhat.com> <20220414133950.20a84eef@p-imbrenda> From: Thomas Huth In-Reply-To: <20220414133950.20a84eef@p-imbrenda> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 14/04/2022 13.39, Claudio Imbrenda wrote: > On Thu, 14 Apr 2022 12:53:20 +0200 > Thomas Huth wrote: > >> The sync_regs 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. >> To be able to distinguish the different sub-tests more easily, we >> also break up the huge main() function here in more fine grained >> parts. >> >> Signed-off-by: Thomas Huth >> --- >> .../selftests/kvm/s390x/sync_regs_test.c | 86 ++++++++++++++----- >> 1 file changed, 65 insertions(+), 21 deletions(-) >> >> diff --git a/tools/testing/selftests/kvm/s390x/sync_regs_test.c b/tools/testing/selftests/kvm/s390x/sync_regs_test.c >> index caf7b8859a94..d5ddcbb82d12 100644 >> --- a/tools/testing/selftests/kvm/s390x/sync_regs_test.c >> +++ b/tools/testing/selftests/kvm/s390x/sync_regs_test.c >> @@ -21,6 +21,7 @@ >> #include "test_util.h" >> #include "kvm_util.h" >> #include "diag318_test_handler.h" >> +#include "kselftest.h" >> >> #define VCPU_ID 5 >> >> @@ -74,27 +75,9 @@ static void compare_sregs(struct kvm_sregs *left, struct kvm_sync_regs *right) >> #define TEST_SYNC_FIELDS (KVM_SYNC_GPRS|KVM_SYNC_ACRS|KVM_SYNC_CRS|KVM_SYNC_DIAG318) >> #define INVALID_SYNC_FIELD 0x80000000 >> >> -int main(int argc, char *argv[]) >> +void test_read_invalid(struct kvm_vm *vm, struct kvm_run *run) >> { >> - struct kvm_vm *vm; >> - struct kvm_run *run; >> - struct kvm_regs regs; >> - struct kvm_sregs sregs; >> - int rv, cap; >> - >> - /* Tell stdout not to buffer its content */ >> - setbuf(stdout, NULL); >> - >> - cap = kvm_check_cap(KVM_CAP_SYNC_REGS); >> - if (!cap) { >> - print_skip("CAP_SYNC_REGS not supported"); >> - exit(KSFT_SKIP); >> - } >> - >> - /* Create VM */ >> - vm = vm_create_default(VCPU_ID, 0, guest_code); >> - >> - run = vcpu_state(vm, VCPU_ID); >> + int rv; >> >> /* Request reading invalid register set from VCPU. */ >> run->kvm_valid_regs = INVALID_SYNC_FIELD; >> @@ -110,6 +93,11 @@ int main(int argc, char *argv[]) >> "Invalid kvm_valid_regs did not cause expected KVM_RUN error: %d\n", >> rv); >> vcpu_state(vm, VCPU_ID)->kvm_valid_regs = 0; >> +} >> + >> +void test_set_invalid(struct kvm_vm *vm, struct kvm_run *run) >> +{ >> + int rv; >> >> /* Request setting invalid register set into VCPU. */ >> run->kvm_dirty_regs = INVALID_SYNC_FIELD; >> @@ -125,6 +113,13 @@ int main(int argc, char *argv[]) >> "Invalid kvm_dirty_regs did not cause expected KVM_RUN error: %d\n", >> rv); >> vcpu_state(vm, VCPU_ID)->kvm_dirty_regs = 0; >> +} >> + >> +void test_req_and_verify_all_valid_regs(struct kvm_vm *vm, struct kvm_run *run) >> +{ >> + struct kvm_sregs sregs; >> + struct kvm_regs regs; >> + int rv; >> >> /* Request and verify all valid register sets. */ >> run->kvm_valid_regs = TEST_SYNC_FIELDS; >> @@ -146,6 +141,13 @@ int main(int argc, char *argv[]) >> >> vcpu_sregs_get(vm, VCPU_ID, &sregs); >> compare_sregs(&sregs, &run->s.regs); >> +} >> + >> +void test_set_and_verify_various_reg_values(struct kvm_vm *vm, struct kvm_run *run) >> +{ >> + struct kvm_sregs sregs; >> + struct kvm_regs regs; >> + int rv; >> >> /* Set and verify various register values */ >> run->s.regs.gprs[11] = 0xBAD1DEA; >> @@ -180,6 +182,11 @@ int main(int argc, char *argv[]) >> >> vcpu_sregs_get(vm, VCPU_ID, &sregs); >> compare_sregs(&sregs, &run->s.regs); >> +} >> + >> +void test_clear_kvm_dirty_regs_bits(struct kvm_vm *vm, struct kvm_run *run) >> +{ >> + int rv; >> >> /* Clear kvm_dirty_regs bits, verify new s.regs values are >> * overwritten with existing guest values. >> @@ -200,8 +207,45 @@ int main(int argc, char *argv[]) >> TEST_ASSERT(run->s.regs.diag318 != 0x4B1D, >> "diag318 sync regs value incorrect 0x%llx.", >> run->s.regs.diag318); >> +} >> + >> +struct testdef { >> + const char *name; >> + void (*test)(struct kvm_vm *vm, struct kvm_run *run); >> +} testlist[] = { >> + { "read invalid", test_read_invalid }, >> + { "set invalid", test_set_invalid }, >> + { "request+verify all valid regs", test_req_and_verify_all_valid_regs }, >> + { "set+verify various regs", test_set_and_verify_various_reg_values }, >> + { "clear kvm_dirty_regs bits", test_clear_kvm_dirty_regs_bits }, >> +}; >> + >> +int main(int argc, char *argv[]) >> +{ >> + static struct kvm_run *run; >> + static struct kvm_vm *vm; >> + int idx; >> + >> + /* Tell stdout not to buffer its content */ >> + setbuf(stdout, NULL); >> + >> + if (!kvm_check_cap(KVM_CAP_SYNC_REGS)) >> + ksft_exit_skip("CAP_SYNC_REGS not supported"); > > I'm not an expert on the TAP format, but wouldn't it be more meaningful > to print the header first? (like you do in the previous patch) It shouldn't matter much, without the header, TAP version 12 will be used: https://testanything.org/tap-specification.html With header, it switches to version 13: https://testanything.org/tap-version-13-specification.html But the "1..0" lines (which signal a complete skip) are part of both versions, so we should be fine here. (but I can also move it in case I have to respin anyway) Thomas