From patchwork Fri Feb 9 18:37:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 199059 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:50ea:b0:106:860b:bbdd with SMTP id r10csp1054964dyd; Fri, 9 Feb 2024 10:42:28 -0800 (PST) X-Google-Smtp-Source: AGHT+IH/8jrr2sYMRy9KkDX6UtgR+kQRg8TWe20ImcUdHnm/26cloqnGxGeLvs+91ZZUd4DhL1MA X-Received: by 2002:a05:622a:d5:b0:42c:2f84:2a16 with SMTP id p21-20020a05622a00d500b0042c2f842a16mr73243qtw.49.1707504147951; Fri, 09 Feb 2024 10:42:27 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707504147; cv=pass; d=google.com; s=arc-20160816; b=urbXqzjSVmtCOCjdl+yCRYO4hfSh23iOY9O0qGxPz2UOnDN+jLTE26OP3FSwxCSryv 455NAi21kIn09qJFuR9jTC0osRlaN874Kftzs9Js0pambStWVr0bPh58LldifY4F7T+o 8f0g66OLJsPXip/83s+Y877XAdiX4EuN4Cv9zmNuzKbn+hgGTGxiz1q9BnLjGhWzBau4 lQhux8V3IZxo9R81J4jwtbARnlI3Y6c8w6ZAMR/WAnNpGWATrTFPu/XIe5bX7TiCvKYr 2i9YL0JywIXI95B7lsLzYpy0e7nu6Q+CL5u5sqZdjTrvBDChvhbAVKuRywkCy+brMVVq VpCw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=WKAk4/TG7DQbNymtLCqGi+ahWWWkN+eb/YBYVWviCeg=; fh=AWeP7DiPuePL1PUQKdWiawV6MCtO0pFJCupXEO+s0gw=; b=OLx0zmySz9P9iVHyCzDlYb8FEXKzmL9y+Okim5gj715Zo0iHIBUimg8zlruI6lzVH9 KgOCXylfkU2anp35YdoK+cB1JeGFYB1DXgMpx3fPJ+oppjicaNH9+jBmCQhUTke8MBmO OHmYvRTPIHHPUGgmOJMZnzCEpRolM5xZx+tQogYDWe5xmKSAIvgkzHlDosQzT9A+pK5x MNZLuKaQLAAQ2lwvpDdBnapieKfxjbjTaHidv39r1XIx5PQ2jwa0XgqYdJyXcmmRqmkB FB6yLnY1wemGWn96h2UMWT+pCCwjzLr7fEF3fgQXslZQe/hFau2YJtElmsvbcy71m9gR 3acw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Ib2rzC6z; arc=pass (i=1 spf=pass spfdomain=redhat.com dkim=pass dkdomain=redhat.com dmarc=pass fromdomain=redhat.com); spf=pass (google.com: domain of linux-kernel+bounces-59818-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-59818-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com X-Forwarded-Encrypted: i=2; AJvYcCXHj2bduzWDvvHEoQNcydJknkPABN9LDfvR9AH36p7oO60a695zTKg95IBtY3TZP/Zwe41C73oBWZHVEuaCQ03/hpNOjA== Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id h17-20020ac87d51000000b0042c36a20bfcsi2498709qtb.317.2024.02.09.10.42.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Feb 2024 10:42:27 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-59818-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Ib2rzC6z; arc=pass (i=1 spf=pass spfdomain=redhat.com dkim=pass dkdomain=redhat.com dmarc=pass fromdomain=redhat.com); spf=pass (google.com: domain of linux-kernel+bounces-59818-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-59818-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id A8BE61C2239D for ; Fri, 9 Feb 2024 18:42:27 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 483D012BEB1; Fri, 9 Feb 2024 18:37:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Ib2rzC6z" Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (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 EB9DB83CAA for ; Fri, 9 Feb 2024 18:37:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707503874; cv=none; b=VP2pUQDU/EQ/K6NO3voYVUI7o2A2Zqr/mclyH59JV1MwO4xRrWwzC/GvD7IdOWNkOvEWH8w7zff+/nN60sNJCrXCHZ2/iiAiKyedyITFUPJecuS69jvDYIIrM7+zzFOql8VJ6WgQcSOWwPtcJWo0g6whBSQnYgtMNxZ3glW25hs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707503874; c=relaxed/simple; bh=uQGym0uY8E+sVE8krP9c0q2ErXtRcLOKpg09TRNB1ds=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=pwCaD8Nms3ukh20Zo88SB5/aCfPJSn0Gjo1GdN0rPFWFvLOxQBeXogiEED/5X+tB1x1nD2NRQWCt58YGOnTiBSnmv0PzqLofchOdUP2qDWsHvw2ALCCJ9a3HMOHGutSsBRQtb5gggSLTLa6/uV51BF42T8TPJcSR43lknymcE7M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=Ib2rzC6z; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1707503870; 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=WKAk4/TG7DQbNymtLCqGi+ahWWWkN+eb/YBYVWviCeg=; b=Ib2rzC6zQa4kavX47pXX8Q9MGi/HvVvb66Op8g8iO+K4kGuLrBe4J/Y2CImG81x5cM0K9v 2tmdi2fpraOd5G8rxaFJstSmUWEP3BeG/04+XZzq0Y6wZP+NazEGjsD2mrmPLOkiZfcMVW fyc/aeigrEH7+PZsMHVeyOdsOs/W0f4= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-622-SQsfi3rrPhWvZ2SsnRDvbA-1; Fri, 09 Feb 2024 13:37:47 -0500 X-MC-Unique: SQsfi3rrPhWvZ2SsnRDvbA-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7041B1C068ED; Fri, 9 Feb 2024 18:37:46 +0000 (UTC) Received: from virtlab511.virt.lab.eng.bos.redhat.com (virtlab511.virt.lab.eng.bos.redhat.com [10.19.152.198]) by smtp.corp.redhat.com (Postfix) with ESMTP id 41B8B2166B33; Fri, 9 Feb 2024 18:37:46 +0000 (UTC) From: Paolo Bonzini To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: seanjc@google.com, michael.roth@amd.com, aik@amd.com, isaku.yamahata@intel.com Subject: [PATCH 11/10] selftests: kvm: switch sev_migrate_tests to KVM_SEV_INIT2 Date: Fri, 9 Feb 2024 13:37:43 -0500 Message-Id: <20240209183743.22030-12-pbonzini@redhat.com> In-Reply-To: <20240209183743.22030-1-pbonzini@redhat.com> References: <20240209183743.22030-1-pbonzini@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.6 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790447869440479684 X-GMAIL-MSGID: 1790447869440479684 Signed-off-by: Paolo Bonzini --- .../selftests/kvm/x86_64/sev_migrate_tests.c | 45 ++++++++++--------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/tools/testing/selftests/kvm/x86_64/sev_migrate_tests.c b/tools/testing/selftests/kvm/x86_64/sev_migrate_tests.c index c7ef97561038..301f7083cad0 100644 --- a/tools/testing/selftests/kvm/x86_64/sev_migrate_tests.c +++ b/tools/testing/selftests/kvm/x86_64/sev_migrate_tests.c @@ -50,11 +50,12 @@ static void sev_ioctl(int vm_fd, int cmd_id, void *data) static struct kvm_vm *sev_vm_create(bool es) { struct kvm_vm *vm; + struct kvm_sev_init init = { 0 }; struct kvm_sev_launch_start start = { 0 }; int i; - vm = vm_create_barebones(); - sev_ioctl(vm->fd, es ? KVM_SEV_ES_INIT : KVM_SEV_INIT, NULL); + vm = vm_create_barebones_type(es ? KVM_X86_SEV_ES_VM : KVM_X86_SEV_VM); + sev_ioctl(vm->fd, KVM_SEV_INIT2, &init); for (i = 0; i < NR_MIGRATE_TEST_VCPUS; ++i) __vm_vcpu_add(vm, i); if (es) @@ -65,12 +66,12 @@ static struct kvm_vm *sev_vm_create(bool es) return vm; } -static struct kvm_vm *aux_vm_create(bool with_vcpus) +static struct kvm_vm *aux_vm_create(bool es, bool with_vcpus) { struct kvm_vm *vm; int i; - vm = vm_create_barebones(); + vm = vm_create_barebones_type(es ? KVM_X86_SEV_ES_VM : KVM_X86_SEV_VM); if (!with_vcpus) return vm; @@ -102,7 +103,7 @@ static void test_sev_migrate_from(bool es) src_vm = sev_vm_create(es); for (i = 0; i < NR_MIGRATE_TEST_VMS; ++i) - dst_vms[i] = aux_vm_create(true); + dst_vms[i] = aux_vm_create(es, true); /* Initial migration from the src to the first dst. */ sev_migrate_from(dst_vms[0], src_vm); @@ -164,16 +165,17 @@ static void test_sev_migrate_locking(void) static void test_sev_migrate_parameters(void) { - struct kvm_vm *sev_vm, *sev_es_vm, *vm_no_vcpu, *vm_no_sev, + struct kvm_vm *sev_vm, *sev_es_vm, *vm_no_vcpu, *sev_es_vm_no_vmsa; int ret; vm_no_vcpu = vm_create_barebones(); - vm_no_sev = aux_vm_create(true); - ret = __sev_migrate_from(vm_no_vcpu, vm_no_sev); + sev_vm = aux_vm_create(false, true); + ret = __sev_migrate_from(vm_no_vcpu, sev_vm); TEST_ASSERT(ret == -1 && errno == EINVAL, "Migrations require SEV enabled. ret %d, errno: %d\n", ret, errno); + kvm_vm_free(sev_vm); if (!have_sev_es) goto out; @@ -213,7 +215,6 @@ static void test_sev_migrate_parameters(void) kvm_vm_free(sev_es_vm_no_vmsa); out: kvm_vm_free(vm_no_vcpu); - kvm_vm_free(vm_no_sev); } static int __sev_mirror_create(struct kvm_vm *dst, struct kvm_vm *src) @@ -272,7 +273,7 @@ static void test_sev_mirror(bool es) int i; src_vm = sev_vm_create(es); - dst_vm = aux_vm_create(false); + dst_vm = aux_vm_create(es, false); sev_mirror_create(dst_vm, src_vm); @@ -295,8 +296,8 @@ static void test_sev_mirror_parameters(void) int ret; sev_vm = sev_vm_create(/* es= */ false); - vm_with_vcpu = aux_vm_create(true); - vm_no_vcpu = aux_vm_create(false); + vm_with_vcpu = aux_vm_create(false, true); + vm_no_vcpu = aux_vm_create(false, false); ret = __sev_mirror_create(sev_vm, sev_vm); TEST_ASSERT( @@ -345,13 +346,13 @@ static void test_sev_move_copy(void) *dst_mirror_vm, *dst2_mirror_vm, *dst3_mirror_vm; sev_vm = sev_vm_create(/* es= */ false); - dst_vm = aux_vm_create(true); - dst2_vm = aux_vm_create(true); - dst3_vm = aux_vm_create(true); - mirror_vm = aux_vm_create(false); - dst_mirror_vm = aux_vm_create(false); - dst2_mirror_vm = aux_vm_create(false); - dst3_mirror_vm = aux_vm_create(false); + dst_vm = aux_vm_create(false, true); + dst2_vm = aux_vm_create(false, true); + dst3_vm = aux_vm_create(false, true); + mirror_vm = aux_vm_create(false, false); + dst_mirror_vm = aux_vm_create(false, false); + dst2_mirror_vm = aux_vm_create(false, false); + dst3_mirror_vm = aux_vm_create(false, false); sev_mirror_create(mirror_vm, sev_vm); @@ -378,9 +379,9 @@ static void test_sev_move_copy(void) * destruction is done safely. */ sev_vm = sev_vm_create(/* es= */ false); - dst_vm = aux_vm_create(true); - mirror_vm = aux_vm_create(false); - dst_mirror_vm = aux_vm_create(false); + dst_vm = aux_vm_create(false, true); + mirror_vm = aux_vm_create(false, false); + dst_mirror_vm = aux_vm_create(false, false); sev_mirror_create(mirror_vm, sev_vm);