From patchwork Thu Mar 14 23:26:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 1912302 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.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=W4D6BaC/; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=infradead.org header.i=@infradead.org header.a=rsa-sha256 header.s=desiato.20200630 header.b=fMbvKtvX; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20230601 header.b=IpSUgOvz; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=kvm-riscv-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=patchwork.ozlabs.org) Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Twk931tkLz1yWn for ; Fri, 15 Mar 2024 10:28:55 +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:Reply-To:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:From:Subject:Message-ID :References:Mime-Version:In-Reply-To:Date:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=OV0btinhHFQQ4jH3AHICqgoJp6ICQrR5oxGxgQdl4+Y=; b=W4D6BaC/QGeT5B XhtsQaZkYkdU00cqTOxSVrG2UerkoGOsH/uUrDvBPp2rwQJkZrX+KzjIcNbIHkuQRgsJH4qnkm8Yc 8XqfJy94oOH0gFb8FEafO/ren2Lj20zm49KKQ5342SCBKnT65s8OIt7F6V6LtE7uin6nwSyc9sog8 S3BWJErbyN/N3naYwSQLvz1oN793NJ34GSA8yoYQer5qi7s6I+r7/7560d3DT179RvfbTJFtkAGiY tJRjFJRsSL75d/RDYU8t7q3rd4sEmERTLOM5s3u1h1MVYaKwAxCzo/gGbMtajN+b0ABqTvs2nYV4w XFoEbv27QZOh5O/dIUdQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rkuVJ-0000000G1Nd-0eop; Thu, 14 Mar 2024 23:28:53 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rkuTQ-0000000G032-1CKA for kvm-riscv@bombadil.infradead.org; Thu, 14 Mar 2024 23:26:57 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Type:Cc:To:From:Subject: Message-ID:References:Mime-Version:In-Reply-To:Date:Reply-To:Sender: Content-Transfer-Encoding:Content-ID:Content-Description; bh=k1ceQ+0+7x0dggVxu3pfjgACx/CpWN/VJ25BN1jj24Q=; b=fMbvKtvXHQa25gx5SCMT09szHP TMvmOO7UvKOqik8uxhBQsCSjm/z3TpENigfhvqFCh5wy2GaBj531ar8hLg2cZB6vDydhk/peCxAJF TDhsfYfdttqi4X1E7HsgcvIlquvtt6XqsUBoF1mjRHBwuSxbtkVDOhYrNjj9bP5Jit7DTfGkr2Pmt lhcP0jEq/Ycz3SxWE+dVnfRlkftSN2XEr8byWvogBEp8UJwVn96CdcvrIGe6bWqO0kPjwNIQ+ToVC oBe8dUSMH3GyEOuiwPhxMOd/YI9JRJXr7iDe0KCB8Irbcm6pR7fqdx8LggQULc1mLDU1gsUhd6XRS dqjivUbg==; Received: from mail-pf1-x449.google.com ([2607:f8b0:4864:20::449]) by desiato.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rkuTL-0000000Aiqq-23V3 for kvm-riscv@lists.infradead.org; Thu, 14 Mar 2024 23:26:54 +0000 Received: by mail-pf1-x449.google.com with SMTP id d2e1a72fcca58-6e6b63a34baso1501264b3a.0 for ; Thu, 14 Mar 2024 16:26:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1710458809; x=1711063609; darn=lists.infradead.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=k1ceQ+0+7x0dggVxu3pfjgACx/CpWN/VJ25BN1jj24Q=; b=IpSUgOvzJWye6SQ9pFtYNjOkuiejuc7kprSGnpJAp/6o7RP45KXQJlLhQanLnVktlf oX8gIGzccHodZ6Q7SiJbXv4i44/izEZ17MLPt4xglZgNZMXEY5YKKMZzGoSYdHTMfW45 Qui686llwee8xnhNshkvT2jGGMhjxU/ERDai02eCpsskC+k6aSvlXXrIyJrGLnHuEnmp GAWaWmloOEVl+wrzwZYIk21hAZIqHzhtJueRq//uNpwr47kqzKQ10NRYG7kxiuYSB1qh 344JUjQmAyvsiFShQJo04Nt4Iz1Ik9B9FAiCrB+RMBeEI11uy5xIShdocKvy/MEbRU8A Tiiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710458809; x=1711063609; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=k1ceQ+0+7x0dggVxu3pfjgACx/CpWN/VJ25BN1jj24Q=; b=XnbF2VAJT6tLgUQzKzcC4Q7AGXHL5UZaZZrwysl5wWphWh1fahEUpMKP77Fcg2KzZa JFSVVMKD8e86qm0hhaWaYDtpdNeuzvPw8TAsCaC+ExhzapNLvHD1uqp3kC3lVYLLxAlb HB/uvaVk4Tob3KmI50dLTDezfLUYIUrP+jy3nMHlaKjU0F0xFVWGx+bkFVEeEwS8QJ1V MBCeFPq6SlntFfJnqL6mYF0KPP2/UpLzFmoLaKq7shG7U7DdDX6lfUpc07WacPXCY/dh nsa6S7js7AhgYuRp6ubkNkugRvSemQvWseLiyWJXtnUaYb00JTgmPA//dvhxZdU5vslk uxXw== X-Forwarded-Encrypted: i=1; AJvYcCVvCBQsBAGViUpORB8WhmL29E8nQg7cFzBYmg37EYthdZnSsMY/ncLfGUscHhDHMgdqpIWYzDc3wnFTK7QjXaosh20US0o8tMBjr+/y2A== X-Gm-Message-State: AOJu0YxvA7zIFyPHlAUy2OkJfidJEyv57Zc5Qj0KHGdbGSlCiY7WufIu 4pSYXeKt6vokBfzkwl9pzwaDuq28TaCCvZpPEYbXKLfZ7SB6wO1kagrMmff/m8RquZU4zZGtQFn S2w== X-Google-Smtp-Source: AGHT+IFa6Xo5alB77JWBKkmfaT2866W5+uuYd+R94MhsO58PTc0FssqvQ3Br5ekzS9Hb9uDd/sllma8cTz8= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a05:6a00:23c6:b0:6e6:c374:f104 with SMTP id g6-20020a056a0023c600b006e6c374f104mr152102pfc.0.1710458808854; Thu, 14 Mar 2024 16:26:48 -0700 (PDT) Date: Thu, 14 Mar 2024 16:26:24 -0700 In-Reply-To: <20240314232637.2538648-1-seanjc@google.com> Mime-Version: 1.0 References: <20240314232637.2538648-1-seanjc@google.com> X-Mailer: git-send-email 2.44.0.291.gc1ea87d7ee-goog Message-ID: <20240314232637.2538648-6-seanjc@google.com> Subject: [PATCH 05/18] KVM: selftests: Move platform_info_test's main assert into guest code From: Sean Christopherson To: Marc Zyngier , Oliver Upton , Paolo Bonzini , Christian Borntraeger , Janosch Frank , Claudio Imbrenda , Sean Christopherson , Anup Patel , Paul Walmsley , Palmer Dabbelt , Albert Ou Cc: linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, kvm@vger.kernel.org, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Ackerley Tng X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240314_232651_818280_0BCB7B6C X-CRM114-Status: UNSURE ( 8.88 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -7.6 (-------) X-Spam-Report: Spam detection software, running on the system "desiato.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: As a first step toward gracefully handling the expected #GP on RDMSR in platform_info_test, move the test's assert on the non-faulting RDMSR result into the guest itself. This will allow using a unifi [...] Content analysis details: (-7.6 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:449 listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -7.5 USER_IN_DEF_DKIM_WL From: address is in the default DKIM welcome-list -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.0 T_SCC_BODY_TEXT_LINE No description available. -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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Sean Christopherson Sender: "kvm-riscv" Errors-To: kvm-riscv-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org As a first step toward gracefully handling the expected #GP on RDMSR in platform_info_test, move the test's assert on the non-faulting RDMSR result into the guest itself. This will allow using a unified flow for the host userspace side of things. Signed-off-by: Sean Christopherson --- .../selftests/kvm/x86_64/platform_info_test.c | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/tools/testing/selftests/kvm/x86_64/platform_info_test.c b/tools/testing/selftests/kvm/x86_64/platform_info_test.c index 87011965dc41..cdad7e2124c8 100644 --- a/tools/testing/selftests/kvm/x86_64/platform_info_test.c +++ b/tools/testing/selftests/kvm/x86_64/platform_info_test.c @@ -29,7 +29,9 @@ static void guest_code(void) for (;;) { msr_platform_info = rdmsr(MSR_PLATFORM_INFO); - GUEST_SYNC(msr_platform_info); + GUEST_ASSERT_EQ(msr_platform_info & MSR_PLATFORM_INFO_MAX_TURBO_RATIO, + MSR_PLATFORM_INFO_MAX_TURBO_RATIO); + GUEST_SYNC(0); asm volatile ("inc %r11"); } } @@ -42,13 +44,15 @@ static void test_msr_platform_info_enabled(struct kvm_vcpu *vcpu) vcpu_run(vcpu); TEST_ASSERT_KVM_EXIT_REASON(vcpu, KVM_EXIT_IO); - get_ucall(vcpu, &uc); - TEST_ASSERT(uc.cmd == UCALL_SYNC, - "Received ucall other than UCALL_SYNC: %lu", uc.cmd); - TEST_ASSERT((uc.args[1] & MSR_PLATFORM_INFO_MAX_TURBO_RATIO) == - MSR_PLATFORM_INFO_MAX_TURBO_RATIO, - "Expected MSR_PLATFORM_INFO to have max turbo ratio mask: %i.", - MSR_PLATFORM_INFO_MAX_TURBO_RATIO); + switch (get_ucall(vcpu, &uc)) { + case UCALL_SYNC: + break; + case UCALL_ABORT: + REPORT_GUEST_ASSERT(uc); + default: + TEST_FAIL("Unexpected ucall %lu", uc.cmd); + break; + } } static void test_msr_platform_info_disabled(struct kvm_vcpu *vcpu)