Message ID | 20220223041844.3984439-18-oupton@google.com |
---|---|
State | Not Applicable |
Headers | show
Return-Path: <kvm-riscv-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=zq0N7Pvi; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20210112 header.b=AnT6yz+j; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=kvm-riscv-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=<UNKNOWN>) Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (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) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4K3N9q3CW9z9sG2 for <incoming@patchwork.ozlabs.org>; Wed, 23 Feb 2022 15:20:15 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:From:Subject:References: Mime-Version:Message-Id:In-Reply-To:Date:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=MuI8ZlaQo+woC8phSQxvh0psprdsmugIxsYSa6p4H24=; b=zq0N7Pvi/4tHyZO1PDb6ByXKiV fR2LkoHStkyN51GYUzijCX7Q3J4v2i9/14c99lP4pX3Nvmr05sO2w+iwu1IbkUGFjCFOQ81CIYUMG dyYZKPr4cjuT/7MvlN9nlRv0sjRVpVV5AK1XZ34sHiJn09kepTL3oTuj2zfR8aC3uPNtESAyl7MHX U/ulcdwlxhCpV1Q5UIVDqnqaAUc41BRQItFBk5xyozUsHnXk96iatZFwF5P+BXIVNYlxHCEQokIS3 Isf889ByCteab+qVS+4jVDMTg0m+MxuJ6R5z0K4gM94+IDo8bQUySzvtekJz9gmEYAzLxT76yhA8I +OWFpr3Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nMj8P-00CmeK-6M; Wed, 23 Feb 2022 04:20:13 +0000 Received: from mail-il1-x149.google.com ([2607:f8b0:4864:20::149]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nMj8B-00CmYT-4Z for kvm-riscv@lists.infradead.org; Wed, 23 Feb 2022 04:20:11 +0000 Received: by mail-il1-x149.google.com with SMTP id y9-20020a927d09000000b002c24b428ff4so4575676ilc.18 for <kvm-riscv@lists.infradead.org>; Tue, 22 Feb 2022 20:19:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=mNL+HTBUZ2MsABidwZFWaxMTNZTxqHsDRZZiQtVvY9U=; b=AnT6yz+jzBN+vZRmnnU3kjwLqiu3bJDpwtLDuddpuszcgrqzqhSXZ5D1upnUqYuCgs cXEK3U2pvCizUZ0UOIi8jHCh1VfC1GrM2HmD4ZnPWkMB9rZYWd1Enk2vqA2A5xy9wsxO E+mzny0LNc3xOzqkH6jLQ6R6qWfKPKw5X6meGW7xSAAj4zTNi3xO+sqccqedCgV8qCga fRhznPV4YXuu1WR1IUaOU8J9Rn4uHJd5964/doZzZDIhtH9+RsKPPYkg27TRddFJFG4Z n0CAbnRU8DaEdayNrTP6vjkeXhqvahh7ZEHhS4VszZ1JckMmkqsx3O8STOTwXgaHOQ6A 4s2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=mNL+HTBUZ2MsABidwZFWaxMTNZTxqHsDRZZiQtVvY9U=; b=XBoUWE//4KsG2spacmwHg+cn9vHMSPaejRW9GeK8PaXg2RA+2RKrbCQODmLCESeHrn xAgxGxy/x/z2EzOexQkyJ66BCoIW22ARXLUf4SqIh+B8wNUuLsSnTNRm9z/5taOO3CSL SYOspqMX4YyLABNDv6P0sdQ1wWCkBdpY/9Oe/opr0pTnknS/yWQwaYsvDbyHUF5iLTyv XylmLHQTHO5qpBBMfSLWOteR+0eQU9RMvfkBALRyYaJMfLzvHkx4Qe1KVP37wiEZFCIY 936hqjNXpsFcwNmdrIHAWck0cEp0UUxWoFC7uwjNxyhvwqPQspRKFJidyjIvltRQWsEr +UYw== X-Gm-Message-State: AOAM530n6bJoLkp8GyYQ1ZjL9qp4+0jkmlak9nfaOGCTwww2tmTu5BAM hIzRYmngtTGfSOEX01phOYkDrB8/iNw= X-Google-Smtp-Source: ABdhPJw0kP0Dlf52lvVcBVnZ85OYD33u0JUbWlmw8FKgmBU6fU3nlvm/brYHvzUYLCy9kdMtFX8SXw/pFCk= X-Received: from oupton.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:404]) (user=oupton job=sendgmr) by 2002:a02:b048:0:b0:311:85be:a797 with SMTP id q8-20020a02b048000000b0031185bea797mr21012184jah.284.1645589997820; Tue, 22 Feb 2022 20:19:57 -0800 (PST) Date: Wed, 23 Feb 2022 04:18:42 +0000 In-Reply-To: <20220223041844.3984439-1-oupton@google.com> Message-Id: <20220223041844.3984439-18-oupton@google.com> Mime-Version: 1.0 References: <20220223041844.3984439-1-oupton@google.com> X-Mailer: git-send-email 2.35.1.473.g83b2b277ed-goog Subject: [PATCH v3 17/19] selftests: KVM: Use KVM_SET_MP_STATE to power off vCPU in psci_test From: Oliver Upton <oupton@google.com> To: kvmarm@lists.cs.columbia.edu Cc: Paolo Bonzini <pbonzini@redhat.com>, Marc Zyngier <maz@kernel.org>, James Morse <james.morse@arm.com>, Alexandru Elisei <alexandru.elisei@arm.com>, Suzuki K Poulose <suzuki.poulose@arm.com>, Anup Patel <anup@brainfault.org>, Atish Patra <atishp@atishpatra.org>, Sean Christopherson <seanjc@google.com>, Vitaly Kuznetsov <vkuznets@redhat.com>, Wanpeng Li <wanpengli@tencent.com>, Jim Mattson <jmattson@google.com>, Joerg Roedel <joro@8bytes.org>, kvm@vger.kernel.org, kvm-riscv@lists.infradead.org, Peter Shier <pshier@google.com>, Reiji Watanabe <reijiw@google.com>, Ricardo Koller <ricarkol@google.com>, Raghavendra Rao Ananta <rananta@google.com>, Jing Zhang <jingzhangos@google.com>, Oliver Upton <oupton@google.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220222_201959_214013_84E38229 X-CRM114-Status: GOOD ( 11.19 ) X-Spam-Score: -7.7 (-------) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Setting a vCPU's MP state to KVM_MP_STATE_STOPPED has the effect of powering off the vCPU. Rather than using the vCPU init feature flag, use the KVM_SET_MP_STATE ioctl to power off the target vCPU. Signed-off-by: Oliver Upton <oupton@google.com> --- tools/testing/selftests/kvm/aarch64/psci_test.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) Content analysis details: (-7.7 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:149 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -7.5 USER_IN_DEF_DKIM_WL From: address is in the default DKIM white-list -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.0 DKIMWL_WL_MED DKIMwl.org - Medium trust sender X-BeenThere: kvm-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: <kvm-riscv.lists.infradead.org> List-Unsubscribe: <http://lists.infradead.org/mailman/options/kvm-riscv>, <mailto:kvm-riscv-request@lists.infradead.org?subject=unsubscribe> List-Archive: <http://lists.infradead.org/pipermail/kvm-riscv/> List-Post: <mailto:kvm-riscv@lists.infradead.org> List-Help: <mailto:kvm-riscv-request@lists.infradead.org?subject=help> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/kvm-riscv>, <mailto:kvm-riscv-request@lists.infradead.org?subject=subscribe> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "kvm-riscv" <kvm-riscv-bounces@lists.infradead.org> Errors-To: kvm-riscv-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org |
Series |
KVM: arm64: Implement PSCI SYSTEM_SUSPEND
|
expand
|
diff --git a/tools/testing/selftests/kvm/aarch64/psci_test.c b/tools/testing/selftests/kvm/aarch64/psci_test.c index 8c998f0b802c..fe1d5d343a2f 100644 --- a/tools/testing/selftests/kvm/aarch64/psci_test.c +++ b/tools/testing/selftests/kvm/aarch64/psci_test.c @@ -60,6 +60,15 @@ static void guest_main(uint64_t target_cpu) GUEST_DONE(); } +static void vcpu_power_off(struct kvm_vm *vm, uint32_t vcpuid) +{ + struct kvm_mp_state mp_state = { + .mp_state = KVM_MP_STATE_STOPPED, + }; + + vcpu_set_mp_state(vm, vcpuid, &mp_state); +} + int main(void) { uint64_t target_mpidr, obs_pc, obs_x0; @@ -75,12 +84,12 @@ int main(void) init.features[0] |= (1 << KVM_ARM_VCPU_PSCI_0_2); aarch64_vcpu_add_default(vm, VCPU_ID_SOURCE, &init, guest_main); + aarch64_vcpu_add_default(vm, VCPU_ID_TARGET, &init, guest_main); /* * make sure the target is already off when executing the test. */ - init.features[0] |= (1 << KVM_ARM_VCPU_POWER_OFF); - aarch64_vcpu_add_default(vm, VCPU_ID_TARGET, &init, guest_main); + vcpu_power_off(vm, VCPU_ID_TARGET); get_reg(vm, VCPU_ID_TARGET, KVM_ARM64_SYS_REG(SYS_MPIDR_EL1), &target_mpidr); vcpu_args_set(vm, VCPU_ID_SOURCE, 1, target_mpidr & MPIDR_HWID_BITMASK);
Setting a vCPU's MP state to KVM_MP_STATE_STOPPED has the effect of powering off the vCPU. Rather than using the vCPU init feature flag, use the KVM_SET_MP_STATE ioctl to power off the target vCPU. Signed-off-by: Oliver Upton <oupton@google.com> --- tools/testing/selftests/kvm/aarch64/psci_test.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)