From nobody Mon Feb 9 13:00:50 2026 Received: from out-182.mta0.migadu.com (out-182.mta0.migadu.com [91.218.175.182]) (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 D4EB9305E1B for ; Mon, 10 Nov 2025 23:27:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762817235; cv=none; b=bLB8+19bDoE8Q6cttPXcS8slAYhU+Uz4WLz49CcAxXXVNWBeAfnuVSxllb922oTyI1GWKs5Az7tlm9opKWzfs51jB5EkjEcN6e54CgmFiYQown+vSd7Tm+r5PaAMzkagD183gdze7QvqpUqJIRLgZ0Z6pLx5fA/ssy09d5Wfr/8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762817235; c=relaxed/simple; bh=W3C5pdfYZHFgFeUhnokR+M97vge8GX96579aJ4+GEf4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=B7OoYz7YCxwTciGZCBXqN4nR+HDYLMl6VpnL+VIIGXPJxkC9Zru6Gd9KKZTszOq7CxpnEFl2Wo7ZFlberuYSbgoXVQavvMEkARt2hT7mlP2JZBx+AJZZ+Fa+GFEXG8M78qxG/VfCzl9u1ovzaNRXVlJORr1+gXAEM2PtWSmOTSM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=cvuAuyIC; arc=none smtp.client-ip=91.218.175.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="cvuAuyIC" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1762817227; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LI9P4e9el9mzpi8j8pU9wIB0bj2YpZyb/opoDXE9K3I=; b=cvuAuyICT18IiC/H6nEpoq6wYr5k6ivn5bImotxalcbKS02aiQA0JxpOchknWf3M6RQo+a +kIXKTk6SwMb9rGtwgqkeExgVr7PuGD5m7u9ck8zwZzlu/ShGPU7ubabOGW2iljpzJ517Z KUsZuWKQpNuFEd90jxKpJP2aKAdquxM= From: Yosry Ahmed To: Sean Christopherson Cc: Paolo Bonzini , Kevin Cheng , kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Yosry Ahmed Subject: [PATCH v3 04/14] x86/svm: Move CR0 selective write intercept test near CR3 intercept Date: Mon, 10 Nov 2025 23:26:32 +0000 Message-ID: <20251110232642.633672-5-yosry.ahmed@linux.dev> In-Reply-To: <20251110232642.633672-1-yosry.ahmed@linux.dev> References: <20251110232642.633672-1-yosry.ahmed@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" It makes more semantic sense for these tests to be in close proximity. Signed-off-by: Yosry Ahmed Reviewed-by: Manali Shukla --- x86/svm_tests.c | 64 ++++++++++++++++++++++++------------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/x86/svm_tests.c b/x86/svm_tests.c index e911659194b3d..feeb27d61435b 100644 --- a/x86/svm_tests.c +++ b/x86/svm_tests.c @@ -112,6 +112,35 @@ static bool finished_rsm_intercept(struct svm_test *te= st) return get_test_stage(test) =3D=3D 2; } =20 +static void prepare_sel_cr0_intercept(struct svm_test *test) +{ + vmcb->save.cr0 &=3D ~X86_CR0_CD; + vmcb->control.intercept |=3D (1ULL << INTERCEPT_SELECTIVE_CR0); +} + +static void test_sel_cr0_write_intercept(struct svm_test *test) +{ + unsigned long cr0; + + /* read cr0, set CD, and write back */ + cr0 =3D read_cr0(); + cr0 |=3D X86_CR0_CD; + write_cr0(cr0); + + /* + * If we are here the test failed, not sure what to do now because we + * are not in guest-mode anymore so we can't trigger an intercept. + * Trigger a tripple-fault for now. + */ + report_fail("sel_cr0 test. Can not recover from this - exiting"); + exit(report_summary()); +} + +static bool check_sel_cr0_intercept(struct svm_test *test) +{ + return vmcb->control.exit_code =3D=3D SVM_EXIT_CR0_SEL_WRITE; +} + static void prepare_cr3_intercept(struct svm_test *test) { default_prepare(test); @@ -793,35 +822,6 @@ static bool check_asid_zero(struct svm_test *test) return vmcb->control.exit_code =3D=3D SVM_EXIT_ERR; } =20 -static void prepare_sel_cr0_intercept(struct svm_test *test) -{ - vmcb->save.cr0 &=3D ~X86_CR0_CD; - vmcb->control.intercept |=3D (1ULL << INTERCEPT_SELECTIVE_CR0); -} - -static void test_sel_cr0_write_intercept(struct svm_test *test) -{ - unsigned long cr0; - - /* read cr0, set CD, and write back */ - cr0 =3D read_cr0(); - cr0 |=3D X86_CR0_CD; - write_cr0(cr0); - - /* - * If we are here the test failed, not sure what to do now because we - * are not in guest-mode anymore so we can't trigger an intercept. - * Trigger a tripple-fault for now. - */ - report_fail("sel_cr0 test. Can not recover from this - exiting"); - exit(report_summary()); -} - -static bool check_sel_cr0_intercept(struct svm_test *test) -{ - return vmcb->control.exit_code =3D=3D SVM_EXIT_CR0_SEL_WRITE; -} - #define TSC_ADJUST_VALUE (1ll << 32) #define TSC_OFFSET_VALUE (~0ull << 48) static bool ok; @@ -3458,6 +3458,9 @@ struct svm_test svm_tests[] =3D { { "rsm", default_supported, prepare_rsm_intercept, default_prepare_gif_clear, test_rsm_intercept, finished_rsm_intercept, check_rsm_intercept }, + { "sel cr0 write intercept", default_supported, + prepare_sel_cr0_intercept, default_prepare_gif_clear, + test_sel_cr0_write_intercept, default_finished, check_sel_cr0_intercept= }, { "cr3 read intercept", default_supported, prepare_cr3_intercept, default_prepare_gif_clear, test_cr3_intercept, default_finished, check_cr3_intercept }, @@ -3482,9 +3485,6 @@ struct svm_test svm_tests[] =3D { { "asid_zero", default_supported, prepare_asid_zero, default_prepare_gif_clear, test_asid_zero, default_finished, check_asid_zero }, - { "sel cr0 write intercept", default_supported, - prepare_sel_cr0_intercept, default_prepare_gif_clear, - test_sel_cr0_write_intercept, default_finished, check_sel_cr0_intercept= }, { "tsc_adjust", tsc_adjust_supported, tsc_adjust_prepare, default_prepare_gif_clear, tsc_adjust_test, default_finished, tsc_adjust_check }, --=20 2.51.2.1041.gc1ab5b90ca-goog