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 X-Spam-Level: X-Spam-Status: No, score=-8.4 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DC14FC35242 for ; Fri, 24 Jan 2020 09:03:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A89D620709 for ; Fri, 24 Jan 2020 09:03:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="WHmfotK0" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729863AbgAXJDP (ORCPT ); Fri, 24 Jan 2020 04:03:15 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:60576 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727520AbgAXJDP (ORCPT ); Fri, 24 Jan 2020 04:03:15 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579856594; 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=DWQzuLSC9rbGUSX9W5MY+bqvNOnhUYtM5PXQwvcZHL4=; b=WHmfotK0kiiomcmU80jN5enTqFTsYCRzU1yU3fP4deNHqheQXU3zP9pNncRFT9eEZ0Yu8R DNct8o2O24dkNILrobH79VWNGTRXq/JliAs9PQIxdwXJoVZAZ7xB4sl88lCSjglaotPOlS 9SHcs1/9qUoKpxNSgbSgvSwmejfz7sc= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-60-sYcZ0eeYODiJTmB10CPGIw-1; Fri, 24 Jan 2020 04:03:12 -0500 X-MC-Unique: sYcZ0eeYODiJTmB10CPGIw-1 Received: by mail-wm1-f72.google.com with SMTP id f25so413786wmb.1 for ; Fri, 24 Jan 2020 01:03:12 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=DWQzuLSC9rbGUSX9W5MY+bqvNOnhUYtM5PXQwvcZHL4=; b=NL95rJaOiuUdxafpKqFxhyvFp25D+vtxKYXHOv/MSreUg9e4GWcTrUzqcPr0f2hFd2 Abq2SIxC+Nl/sdGuO5ixVGTfBo9uUKjIQj1dK7La37PO68kcg4CLgE1dnfgsC3pX101H 5hr2DO5aYFjLMDW05mUYqT/ai19Z2lXdgYNqC8UaPx1fpqeOBCjv/f3wLVxeYQJZYlFo 6KGDjJo8PCPADxt40hhuSZpmWxYon+qZN0uz7xLIJcndWoV+qKzzx8pdb62b4F9o6pYt gJnz3LZDRhUw04Sfy9/ki6JHa/GFdzVYfL5PIeFGSLmUImxLd5+DhMEuLTsJblZnhCZy LVpw== X-Gm-Message-State: APjAAAUaFAo8ACAKsccR91zmcva64e3JSst+JosraxYqfX5cYq6KU4lP JNdTMjsCODn5QnFBjDuKIehoki+rvKLQvGwmB3awidh/rwwSrRo6v6uHuvAYPjGwbOAys1CPTow U8noiWtVWY/shISfVoY9ykOFU X-Received: by 2002:a05:6000:367:: with SMTP id f7mr3012941wrf.174.1579856590909; Fri, 24 Jan 2020 01:03:10 -0800 (PST) X-Google-Smtp-Source: APXvYqyaGN3UdvCYTbeY28CNwrJyBQf51wQAGG6tGLv/4g4kU1JLQtjF80zQAsYzfL+f+qFWL+9rYA== X-Received: by 2002:a05:6000:367:: with SMTP id f7mr3012903wrf.174.1579856590638; Fri, 24 Jan 2020 01:03:10 -0800 (PST) Received: from ?IPv6:2001:b07:6468:f312:b8fe:679e:87eb:c059? ([2001:b07:6468:f312:b8fe:679e:87eb:c059]) by smtp.gmail.com with ESMTPSA id b17sm6672643wrx.15.2020.01.24.01.03.09 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 24 Jan 2020 01:03:10 -0800 (PST) Subject: Re: [PATCH v4 06/10] KVM: selftests: Add support for vcpu_args_set to aarch64 and s390x To: Ben Gardon , linux-kernel@vger.kernel.org, kvm@vger.kernel.org, linux-kselftest@vger.kernel.org Cc: Cannon Matthews , Peter Xu , Andrew Jones , Peter Shier , Oliver Upton , Marc Zyngier , Cornelia Huck , Christian Borntraeger References: <20200123180436.99487-1-bgardon@google.com> <20200123180436.99487-7-bgardon@google.com> From: Paolo Bonzini Message-ID: <4dbb6d1b-3162-d9b3-4ebb-5e4061776bb6@redhat.com> Date: Fri, 24 Jan 2020 10:03:08 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.1.1 MIME-Version: 1.0 In-Reply-To: <20200123180436.99487-7-bgardon@google.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org CCing Marc, Conny and Christian (plus Thomas and Drew who were already in the list) for review. Thanks, Paolo On 23/01/20 19:04, Ben Gardon wrote: > Currently vcpu_args_set is only implemented for x86. This makes writing > tests with multiple vCPUs difficult as each guest vCPU must either a.) > do the same thing or b.) derive some kind of unique token from it's > registers or the architecture. To simplify the process of writing tests > with multiple vCPUs for s390 and aarch64, add set args functions for > those architectures. > > Signed-off-by: Ben Gardon > --- > .../selftests/kvm/lib/aarch64/processor.c | 33 +++++++++++++++++ > .../selftests/kvm/lib/s390x/processor.c | 35 +++++++++++++++++++ > 2 files changed, 68 insertions(+) > > diff --git a/tools/testing/selftests/kvm/lib/aarch64/processor.c b/tools/testing/selftests/kvm/lib/aarch64/processor.c > index 86036a59a668e..a2ff90a75f326 100644 > --- a/tools/testing/selftests/kvm/lib/aarch64/processor.c > +++ b/tools/testing/selftests/kvm/lib/aarch64/processor.c > @@ -333,3 +333,36 @@ void vm_vcpu_add_default(struct kvm_vm *vm, uint32_t vcpuid, void *guest_code) > { > aarch64_vcpu_add_default(vm, vcpuid, NULL, guest_code); > } > + > +/* VM VCPU Args Set > + * > + * Input Args: > + * vm - Virtual Machine > + * vcpuid - VCPU ID > + * num - number of arguments > + * ... - arguments, each of type uint64_t > + * > + * Output Args: None > + * > + * Return: None > + * > + * Sets the first num function input arguments to the values > + * given as variable args. Each of the variable args is expected to > + * be of type uint64_t. The registers set by this function are r0-r7. > + */ > +void vcpu_args_set(struct kvm_vm *vm, uint32_t vcpuid, unsigned int num, ...) > +{ > + va_list ap; > + > + TEST_ASSERT(num >= 1 && num <= 8, "Unsupported number of args,\n" > + " num: %u\n", > + num); > + > + va_start(ap, num); > + > + for (i = 0; i < num; i++) > + set_reg(vm, vcpuid, ARM64_CORE_REG(regs.regs[num]), > + va_arg(ap, uint64_t)); > + > + va_end(ap); > +} > diff --git a/tools/testing/selftests/kvm/lib/s390x/processor.c b/tools/testing/selftests/kvm/lib/s390x/processor.c > index 32a02360b1eb0..680f37be9dbc9 100644 > --- a/tools/testing/selftests/kvm/lib/s390x/processor.c > +++ b/tools/testing/selftests/kvm/lib/s390x/processor.c > @@ -269,6 +269,41 @@ void vm_vcpu_add_default(struct kvm_vm *vm, uint32_t vcpuid, void *guest_code) > run->psw_addr = (uintptr_t)guest_code; > } > > +/* VM VCPU Args Set > + * > + * Input Args: > + * vm - Virtual Machine > + * vcpuid - VCPU ID > + * num - number of arguments > + * ... - arguments, each of type uint64_t > + * > + * Output Args: None > + * > + * Return: None > + * > + * Sets the first num function input arguments to the values > + * given as variable args. Each of the variable args is expected to > + * be of type uint64_t. The registers set by this function are r2-r6. > + */ > +void vcpu_args_set(struct kvm_vm *vm, uint32_t vcpuid, unsigned int num, ...) > +{ > + va_list ap; > + struct kvm_regs regs; > + > + TEST_ASSERT(num >= 1 && num <= 5, "Unsupported number of args,\n" > + " num: %u\n", > + num); > + > + va_start(ap, num); > + vcpu_regs_get(vm, vcpuid, ®s); > + > + for (i = 0; i < num; i++) > + regs.gprs[i + 2] = va_arg(ap, uint64_t); > + > + vcpu_regs_set(vm, vcpuid, ®s); > + va_end(ap); > +} > + > void vcpu_dump(FILE *stream, struct kvm_vm *vm, uint32_t vcpuid, uint8_t indent) > { > struct vcpu *vcpu = vm->vcpu_head; >