From nobody Thu Oct 2 07:46:26 2025 Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B8636322C68 for ; Fri, 19 Sep 2025 22:34:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758321269; cv=none; b=XouhRwy/WFiSt7JN0rQoScbodbT3H1KTDP4K5tzpsWrSRLB9OtE7A+7lKAfKXqkRy5jORz6hvjKA46l1LPVdpC3l+4ZVE5d70pISorVEuJ5vQMHC5mD6ZAe367C9f/0HJ63+AT9+h3k/RGa4TXTmsh/LCjBPVpWQjVrPZwU2ky4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758321269; c=relaxed/simple; bh=7F8fN07uyjWFGboVpo4jm1M7dMFGNTEcptEI2FyoK3A=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=jSvCahDxGYJwnMgWyIRnnN+VWSh8pfwSKYoGneAP9gciZ3y6uxoXCj4urL6FMr6lkd2gw7nxY4UQ2k1hffA/zRn7/V3nc8jHrsNu9ZmrApWLXBUp+/1kNiASUw9jlvT6H+RtiXdaNY1z7BhJ8JBruG2165Edqf8f/rxAj0rFXjU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=HEsY+tG3; arc=none smtp.client-ip=209.85.216.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="HEsY+tG3" Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-32ec2211659so2566683a91.0 for ; Fri, 19 Sep 2025 15:34:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1758321267; x=1758926067; darn=vger.kernel.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=B1JPKZr/jTuAErNJp4ougx6N14MoHm3l7BWFYlNmRME=; b=HEsY+tG325u7pbsrruBzKIQvAU7qdYBysdTWefGktBzN9QjLmbqxgRI9bMN4pJS8l5 18YAkuS1bz1o/YG3c4/5i7aIj46rIZ0Ali527cczNydS5XjEgle9XZa6GCSMmKY8e4Be fi1YAY9NlXwpfG87qJbOwk/4DkGoUAqoZUOmJlzpevDAJ6hUGwFNrYj9MkSG+lRZVGps P6fENV/9qgNPN+TBqKepzAPntQwbubhd5LdKnBUCTTcp64qNoj6GqoP58XI49MdyS2Dh anXY2T7ACAsTimXDjLZ/BPZhQNIZS8ujC3h1/dyW/1hSOsdn3xOZV7xfmBrN3LmUtNye aYTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758321267; x=1758926067; 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=B1JPKZr/jTuAErNJp4ougx6N14MoHm3l7BWFYlNmRME=; b=X4Dey6uF+h+se00hbVFvVqr44rzq0sui9LDaMgxi0O5qSJbOQUI81/fiG2AFW9ZQnV 1Pmw5OSy/SNiHDiI1W0VLfg8vxmP7MSwO/45DWYOrjhcVHbMcNzoTkPn+/xuPT+ZJ1Os qc25tlWb0iWmqzJKzVHgcmrqKsiA/Zp/BODmn3xYje8wjk1oZq83kSoetoPuf09Eh2lZ LF3RUafhg9+uvMeGRkBCBA6nySe9xDFpa5WY5Kyw6y/Eb8scWayQCHej9vKBU+/5NfyI q2BHNGEfMmWBBNQqwR9iIicFNvLSkFE6a8NEaYFeyeoFIP7teZh/WQjggOc5PwOPiMaB OU4Q== X-Forwarded-Encrypted: i=1; AJvYcCWJfRSuW30yxl7kiQRrXOQL+82iVdVtsdwc8ubNHiJhOp6ylKCKzBLJ7iLApUddRzQQwDuku7VDW/lG5Bc=@vger.kernel.org X-Gm-Message-State: AOJu0Yx816P75IiXC9AgRC7ebIK1EOBtU6P/5AOfkcQq64pq6t8olQFR a0mqjd0NcDyKOmRmOGYRokZhJ+lGVSjUo7fojNrQ+aLhs3gqiUeYLCV8A5R8wXggAwrQw+vBziT G8TSJgA== X-Google-Smtp-Source: AGHT+IEovExhDx5hnbXORvzp1QLyu6LtfldPEwLB0DBYtoIAmSkBGzXcV/s/m8mBz72RwM/ijt8PskoZ3Ew= X-Received: from pjbpw13.prod.google.com ([2002:a17:90b:278d:b0:327:50fa:eff9]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90a:e703:b0:32e:7270:94a1 with SMTP id 98e67ed59e1d1-33098356f85mr6790607a91.17.1758321267159; Fri, 19 Sep 2025 15:34:27 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 19 Sep 2025 15:32:53 -0700 In-Reply-To: <20250919223258.1604852-1-seanjc@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250919223258.1604852-1-seanjc@google.com> X-Mailer: git-send-email 2.51.0.470.ga7dc726c21-goog Message-ID: <20250919223258.1604852-47-seanjc@google.com> Subject: [PATCH v16 46/51] KVM: selftests: Add support for MSR_IA32_{S,U}_CET to MSRs test From: Sean Christopherson To: Paolo Bonzini , Sean Christopherson Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Tom Lendacky , Mathias Krause , John Allen , Rick Edgecombe , Chao Gao , Binbin Wu , Xiaoyao Li , Maxim Levitsky , Zhang Yi Z , Xin Li Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Extend the MSRs test to support {S,U}_CET, which are a bit of a pain to handled due to the MSRs existing if IBT *or* SHSTK is supported. To deal with Intel's wonderful decision to bundle IBT and SHSTK under CET, track the second feature, but skip only RDMSR #GP tests to avoid false failures when running on a CPU with only one of IBT or SHSTK (the WRMSR #GP tests are still valid since the enable bits are per-feature). Signed-off-by: Sean Christopherson Reviewed-by: Chao Gao --- tools/testing/selftests/kvm/x86/msrs_test.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/kvm/x86/msrs_test.c b/tools/testing/se= lftests/kvm/x86/msrs_test.c index 9285cf51ef75..952439e0c754 100644 --- a/tools/testing/selftests/kvm/x86/msrs_test.c +++ b/tools/testing/selftests/kvm/x86/msrs_test.c @@ -125,13 +125,26 @@ static void guest_test_unsupported_msr(const struct k= vm_msr *msr) if (ignore_unsupported_msrs) goto skip_wrmsr_gp; =20 - if (this_cpu_has(msr->feature2)) - goto skip_wrmsr_gp; + /* + * {S,U}_CET exist if IBT or SHSTK is supported, but with bits that are + * writable only if their associated feature is supported. Skip the + * RDMSR #GP test if the secondary feature is supported, but perform + * the WRMSR #GP test as the to-be-written value is tied to the primary + * feature. For all other MSRs, simply do nothing. + */ + if (this_cpu_has(msr->feature2)) { + if (msr->index !=3D MSR_IA32_U_CET && + msr->index !=3D MSR_IA32_S_CET) + goto skip_wrmsr_gp; + + goto skip_rdmsr_gp; + } =20 vec =3D rdmsr_safe(msr->index, &val); __GUEST_ASSERT(vec =3D=3D GP_VECTOR, "Wanted #GP on RDMSR(0x%x), got %s", msr->index, ex_str(vec)); =20 +skip_rdmsr_gp: vec =3D wrmsr_safe(msr->index, msr->write_val); __GUEST_ASSERT(vec =3D=3D GP_VECTOR, "Wanted #GP on WRMSR(0x%x, 0x%lx), g= ot %s", msr->index, msr->write_val, ex_str(vec)); @@ -269,6 +282,10 @@ static void test_msrs(void) MSR_TEST_CANONICAL(MSR_CSTAR, LM), MSR_TEST(MSR_SYSCALL_MASK, 0xffffffff, 0, LM), =20 + MSR_TEST2(MSR_IA32_S_CET, CET_SHSTK_EN, CET_RESERVED, SHSTK, IBT), + MSR_TEST2(MSR_IA32_S_CET, CET_ENDBR_EN, CET_RESERVED, IBT, SHSTK), + MSR_TEST2(MSR_IA32_U_CET, CET_SHSTK_EN, CET_RESERVED, SHSTK, IBT), + MSR_TEST2(MSR_IA32_U_CET, CET_ENDBR_EN, CET_RESERVED, IBT, SHSTK), MSR_TEST_CANONICAL(MSR_IA32_PL0_SSP, SHSTK), MSR_TEST(MSR_IA32_PL0_SSP, canonical_val, canonical_val | 1, SHSTK), MSR_TEST_CANONICAL(MSR_IA32_PL1_SSP, SHSTK), --=20 2.51.0.470.ga7dc726c21-goog