From patchwork Tue Jun 13 20:30:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 107544 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp811459vqr; Tue, 13 Jun 2023 13:40:56 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6HvuXowv4qVv/u8bVlAhcz8JS0m6M2E9Wv1BL3ccOCAWVbSEPeROzUyY1opu1zdvgZj+tO X-Received: by 2002:aa7:ca46:0:b0:513:fa61:397a with SMTP id j6-20020aa7ca46000000b00513fa61397amr11398765edt.12.1686688856608; Tue, 13 Jun 2023 13:40:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686688856; cv=none; d=google.com; s=arc-20160816; b=WIxTmBifj71C5IxXBdVpPXLHJGrZfqw5VvJRyGmf7lf2nurX3DhjQ6hUdR78EUYED1 IlR3oD1TmqYs8kqXTMI493UQDhKdZzbbkUSxWlD0FUvbg8zp2Zd2Y8mw/0tBmGLIkOSP t3wp1f0tVNAIN+DxSEaqysJTa43BMl98rsHLsBjh6ZerxJK/52iDa+mOXQiNKlqzdHCB Rk8bHAgEIsEgmHyxB10cXogB8C+KqUXmcqGtCydgk70xzuvCZzOc3bmSr0JBeLNj8TMz EUOnxbeQTJ1WvxNhV0mKVCg41DH1BP5hYJAxqqcx4aQnVkCvJbj0JLn1IJnvJ7wm7B0J PFMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:reply-to:dkim-signature; bh=Zzdys5k5KJj6ZEXXs45R2qHcPA65FOjyHbJm9EXzp+k=; b=U6h1DYZy7qEaxatnEtRMofO0mgBjr1vjLYUmAqexmXl/chdkL9hUFbT4czD7vxWwv+ TWcUWmAl5oKvgHfCZBMo0ypG6qyMxLY1iN3wqErnj3nzhCszoNnEEzkFbK/eCGJ7z6dA jrlYOst6U/iryLta3FkRAS7UWzhxE8+ZNiRv8YDSANmpldo/OP5SpARFldqeAWzeU10p MB1c1Jfxi9mYEY9EkWiHxD9aGDt4CFf46LK5TnydDow5JPCYVOjKALqjEelWeVzshsVB MGmZlEsqmjal4gSQBWbwnCTd9C2IfJZOXcqim/qL1ijiqUVG1JlcKCL3pZjhcVhwSF6u olRg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=PryqDWmk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h1-20020aa7de01000000b00516a196cd21si7476534edv.691.2023.06.13.13.40.31; Tue, 13 Jun 2023 13:40:56 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=PryqDWmk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235289AbjFMUbA (ORCPT + 99 others); Tue, 13 Jun 2023 16:31:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39412 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239117AbjFMUau (ORCPT ); Tue, 13 Jun 2023 16:30:50 -0400 Received: from mail-pf1-x449.google.com (mail-pf1-x449.google.com [IPv6:2607:f8b0:4864:20::449]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0FF3C1BD3 for ; Tue, 13 Jun 2023 13:30:47 -0700 (PDT) Received: by mail-pf1-x449.google.com with SMTP id d2e1a72fcca58-6537ff2c93fso2943425b3a.2 for ; Tue, 13 Jun 2023 13:30:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1686688246; x=1689280246; 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=Zzdys5k5KJj6ZEXXs45R2qHcPA65FOjyHbJm9EXzp+k=; b=PryqDWmks+6mZSV+2BVD4P2SSeys4GtwYV5Nul3IEElaQHaf6MlF5Ebz3mJeJ0W2Kx iZpOIDa0H13TYxDdWa+hri7CXMpD6WGjE+gDbGMhWCfAogHp84BYcAJ+EyMozC+hoN0R DYFnigYazKizwapeNOcfDeRbCjOMJUJsQqGRTrEiOP1avVUcM5aLeLysn0hPIzjk9suz xApuvaIRVjTiIT7vPcr25z61lmYuAgT2FwP6RrAt3IsR0yY76EzVweWV7hQ4YKSi+/Fk WPY8Rr1J/1G8PiHQvM2xaZyurDRHROv2Uv3s88soz4AER3HHFRXtwOjTAUSbgoJAne3G mmRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686688246; x=1689280246; 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=Zzdys5k5KJj6ZEXXs45R2qHcPA65FOjyHbJm9EXzp+k=; b=ZHOSVq/uh4hUGDYtQ5AteSeWWIO5r2rPb+h4cGGNakorUiJlYZsBL+lqSHmqHd8gIQ NxxqbhkFftN+SdeiBNLCOqJmjFBD0+G5gYuAsYA/GsDCIAaoo5GsA5mu70/1zbmqqKaI sHwTKL2vUcC7I4BoVYoY6L79SiMLcWeaKvtAiMyM9IpB96k5IMEsfToyEkOGxM046NHt RLpSEoY+oNkNg0MmoRWgQe51qO3OAVpN1eHcR9nMrbXIW5eYPowRxF2MFFVLb5uqTEdd AL5937HpWVEx7HfxdDFIM07XDaHkNO9lhbWnX7taM/xNwMdlKuWTlsdOdPW0RWGaq/fP aelQ== X-Gm-Message-State: AC+VfDztdqVLW7EZaKJnw6T2vuu9g60r2Pqrmrl/MuY/H+OYNBiSvO/a 0kbh+NZn3UKX5Me1dDcpK+1ZrMAwtwc= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a05:6a00:3a1c:b0:666:43b2:7021 with SMTP id fj28-20020a056a003a1c00b0066643b27021mr18956pfb.3.1686688246476; Tue, 13 Jun 2023 13:30:46 -0700 (PDT) Reply-To: Sean Christopherson Date: Tue, 13 Jun 2023 13:30:37 -0700 In-Reply-To: <20230613203037.1968489-1-seanjc@google.com> Mime-Version: 1.0 References: <20230613203037.1968489-1-seanjc@google.com> X-Mailer: git-send-email 2.41.0.162.gfafddb0af9-goog Message-ID: <20230613203037.1968489-4-seanjc@google.com> Subject: [PATCH 3/3] KVM: selftests: Expand x86's sregs test to cover illegal CR0 values From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, syzbot+5feef0b9ee9c8e9e5689@syzkaller.appspotmail.com, Jim Mattson X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED, USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768621454716063310?= X-GMAIL-MSGID: =?utf-8?q?1768621454716063310?= Add coverage to x86's set_sregs_test to verify KVM rejects vendor-agnostic illegal CR0 values, i.e. CR0 values whose legality doesn't depend on the current VMX mode. KVM historically has neglected to reject bad CR0s from userspace, i.e. would happily accept a completely bogus CR0 via KVM_SET_SREGS{2}. Punt VMX specific subtests to future work, as they would require quite a bit more effort, and KVM gets coverage for CR0 checks in general through other means, e.g. KVM-Unit-Tests. Signed-off-by: Sean Christopherson --- .../selftests/kvm/x86_64/set_sregs_test.c | 70 +++++++++++-------- 1 file changed, 39 insertions(+), 31 deletions(-) diff --git a/tools/testing/selftests/kvm/x86_64/set_sregs_test.c b/tools/testing/selftests/kvm/x86_64/set_sregs_test.c index a284fcef6ed7..3610981d9162 100644 --- a/tools/testing/selftests/kvm/x86_64/set_sregs_test.c +++ b/tools/testing/selftests/kvm/x86_64/set_sregs_test.c @@ -22,26 +22,25 @@ #include "kvm_util.h" #include "processor.h" -static void test_cr4_feature_bit(struct kvm_vcpu *vcpu, struct kvm_sregs *orig, - uint64_t feature_bit) -{ - struct kvm_sregs sregs; - int rc; - - /* Skip the sub-test, the feature is supported. */ - if (orig->cr4 & feature_bit) - return; - - memcpy(&sregs, orig, sizeof(sregs)); - sregs.cr4 |= feature_bit; - - rc = _vcpu_sregs_set(vcpu, &sregs); - TEST_ASSERT(rc, "KVM allowed unsupported CR4 bit (0x%lx)", feature_bit); - - /* Sanity check that KVM didn't change anything. */ - vcpu_sregs_get(vcpu, &sregs); - TEST_ASSERT(!memcmp(&sregs, orig, sizeof(sregs)), "KVM modified sregs"); -} +#define TEST_INVALID_CR_BIT(vcpu, cr, orig, bit) \ +do { \ + struct kvm_sregs new; \ + int rc; \ + \ + /* Skip the sub-test, the feature/bit is supported. */ \ + if (orig.cr & bit) \ + break; \ + \ + memcpy(&new, &orig, sizeof(sregs)); \ + new.cr |= bit; \ + \ + rc = _vcpu_sregs_set(vcpu, &new); \ + TEST_ASSERT(rc, "KVM allowed invalid " #cr " bit (0x%lx)", bit); \ + \ + /* Sanity check that KVM didn't change anything. */ \ + vcpu_sregs_get(vcpu, &new); \ + TEST_ASSERT(!memcmp(&new, &orig, sizeof(new)), "KVM modified sregs"); \ +} while (0) static uint64_t calc_supported_cr4_feature_bits(void) { @@ -80,7 +79,7 @@ int main(int argc, char *argv[]) struct kvm_vcpu *vcpu; struct kvm_vm *vm; uint64_t cr4; - int rc; + int rc, i; /* * Create a dummy VM, specifically to avoid doing KVM_SET_CPUID2, and @@ -92,6 +91,7 @@ int main(int argc, char *argv[]) vcpu_sregs_get(vcpu, &sregs); + sregs.cr0 = 0; sregs.cr4 |= calc_supported_cr4_feature_bits(); cr4 = sregs.cr4; @@ -103,16 +103,24 @@ int main(int argc, char *argv[]) sregs.cr4, cr4); /* Verify all unsupported features are rejected by KVM. */ - test_cr4_feature_bit(vcpu, &sregs, X86_CR4_UMIP); - test_cr4_feature_bit(vcpu, &sregs, X86_CR4_LA57); - test_cr4_feature_bit(vcpu, &sregs, X86_CR4_VMXE); - test_cr4_feature_bit(vcpu, &sregs, X86_CR4_SMXE); - test_cr4_feature_bit(vcpu, &sregs, X86_CR4_FSGSBASE); - test_cr4_feature_bit(vcpu, &sregs, X86_CR4_PCIDE); - test_cr4_feature_bit(vcpu, &sregs, X86_CR4_OSXSAVE); - test_cr4_feature_bit(vcpu, &sregs, X86_CR4_SMEP); - test_cr4_feature_bit(vcpu, &sregs, X86_CR4_SMAP); - test_cr4_feature_bit(vcpu, &sregs, X86_CR4_PKE); + TEST_INVALID_CR_BIT(vcpu, cr4, sregs, X86_CR4_UMIP); + TEST_INVALID_CR_BIT(vcpu, cr4, sregs, X86_CR4_LA57); + TEST_INVALID_CR_BIT(vcpu, cr4, sregs, X86_CR4_VMXE); + TEST_INVALID_CR_BIT(vcpu, cr4, sregs, X86_CR4_SMXE); + TEST_INVALID_CR_BIT(vcpu, cr4, sregs, X86_CR4_FSGSBASE); + TEST_INVALID_CR_BIT(vcpu, cr4, sregs, X86_CR4_PCIDE); + TEST_INVALID_CR_BIT(vcpu, cr4, sregs, X86_CR4_OSXSAVE); + TEST_INVALID_CR_BIT(vcpu, cr4, sregs, X86_CR4_SMEP); + TEST_INVALID_CR_BIT(vcpu, cr4, sregs, X86_CR4_SMAP); + TEST_INVALID_CR_BIT(vcpu, cr4, sregs, X86_CR4_PKE); + + for (i = 32; i < 64; i++) + TEST_INVALID_CR_BIT(vcpu, cr0, sregs, BIT(i)); + + /* NW without CD is illegal, as is PG without PE. */ + TEST_INVALID_CR_BIT(vcpu, cr0, sregs, X86_CR0_NW); + TEST_INVALID_CR_BIT(vcpu, cr0, sregs, X86_CR0_PG); + kvm_vm_free(vm); /* Create a "real" VM and verify APIC_BASE can be set. */