From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.201]) (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 644C62BEFFB for ; Fri, 5 Dec 2025 08:14:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764922510; cv=none; b=djOwvuj6Yv7DDE4Ok8Ctd4P5XXCtxYDeh0v0YPuKj3rhRCyo02hJ8qMK4oyTphHU30+HXyTu1da9EfjUA0/uI0px0xIE93dcmNezgxrBCJYSquQxhhPGz9eEqdgX3+I8afy8vstZVpS5R6ecTxgkbTsp3B5VCSHx1j3F9UjEXpw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764922510; c=relaxed/simple; bh=bxsSbO9CejoAq5ITGojN6dsguFM7NyPkmnWZkCb8YLY=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=qJqzds/8HzMffl/yBLJ1H3rgr/m4ANURstjXcPmGbEM3LP3TjUsT9QHfSxv+YuP0k+79oG582bdykDz7hllnKpfLYMUp9+MeKkfHMYnOiMR7cdLCKxVVcfmmPfz6c+LU6waVibsiJBDvvKmGuw/XWxgqVI6brdBgeoZ65RoxQow= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--chengkev.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=pTiZ6x5+; arc=none smtp.client-ip=209.85.214.201 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--chengkev.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="pTiZ6x5+" Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-298535ef0ccso24515055ad.3 for ; Fri, 05 Dec 2025 00:14:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1764922495; x=1765527295; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=VfBC4L0W4+2xgM5lrvsI6u556ehImIGcx3NQ/mn6oQQ=; b=pTiZ6x5+BjNhKW60g0W0p0Cz9mXxdqXC6iEIrR54QQawq8w2lN6hEK0UHnLaDP85v5 DE8mCBjMVlLAP2XqZZ++wCDvcNV/oZoJcSqjcj4+CrsDQI2MmKMcR0AleOYfGGoSoTF3 6dh4Po5CySCBfhUJbDXAO4Fz/FQq4s5chuZK+cEy7yK2TGWCuRs4oU8flk/HnBQlL2CL rgiCXL/edHAUT+XdID+O9O/V+Gq/H891hHT9c9kzPQJKMzphctGPr4Od2M8x4r7c6nuO kmInuo8CHID3viYmq4hdF9bqsv/zsjD/OCdncwAwttghDO5UTuuZFbFvaJxHeJUQ4SXu +plQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764922495; x=1765527295; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=VfBC4L0W4+2xgM5lrvsI6u556ehImIGcx3NQ/mn6oQQ=; b=CH49DPLr3tLBZqY06S93HoIQ+11RsAAFG9/f/BTPHXXA+8mzahhfmLTIzGDPrF1Qe8 3paTta2e6yvY/jBmXPySeqUYYsnyJqMP28+lvw1MRQpbwwaT4i/3GZf+MFTImiwD5ZlK StKYRQqeGaGzTLzw5N+dcNfFHnOMseWHBZAOlHZPsoS/ah9hS2PJhvBuBUp76klfZVZL S4zYALYMsA841aXK3HyNSC264psTnO4OYnN7XmHa5TkVFvGhMr0fj9cmD+cf5gyptB9O cp1kcJTiRmPRmhs3gAWcIjCPL65zBZATCyLVH/BihDvayvxrXMMc79yrcKGtpiY4PqfZ 7g0A== X-Gm-Message-State: AOJu0YwX1YvZR4URFii+xJ3lEWgIOoq0jpYTw/ctEVp26hT5RUTYtm+t PSGrJtnQt6L8yqUWx6VwTtbkUifiRGbD4T5KJhF90JwSMIwNeRp+Dv3mgdK/a8XYv18oGr6llTL Amo3/e6Zb3rgDbROX2aogqyngOq4MNHFDGLaQue06M+GE/ykM3s0KBC1C9KrWqQAFTIfDK52iHC ZgxhDeRsfQFtFkk6L+uKBGAmmyq7lwd6zRR5qtvSYTMOk= X-Google-Smtp-Source: AGHT+IHXrIs0Irim3/IjdiMp0zpT/Vx6bPvklnrD6fWXxggh9McJ+ANSuauSKLwkcynEnEK+ub8+QIBtdC39KA== X-Received: from plbv11.prod.google.com ([2002:a17:903:44cb:b0:297:eb04:dff7]) (user=chengkev job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:228c:b0:295:24ab:fb06 with SMTP id d9443c01a7336-29d9fb7005dmr59631915ad.22.1764922494869; Fri, 05 Dec 2025 00:14:54 -0800 (PST) Date: Fri, 5 Dec 2025 08:14:48 +0000 In-Reply-To: <20251205081448.4062096-1-chengkev@google.com> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20251205081448.4062096-1-chengkev@google.com> X-Mailer: git-send-email 2.52.0.223.gf5cc29aaa4-goog Message-ID: <20251205081448.4062096-3-chengkev@google.com> Subject: [kvm-unit-tests PATCH 2/2] x86/svm: Add unsupported instruction intercept test From: Kevin Cheng To: kvm@vger.kernel.org Cc: yosryahmed@google.com, andrew.jones@linux.dev, thuth@redhat.com, pbonzini@redhat.com, seanjc@google.com, Kevin Cheng Content-Type: text/plain; charset="UTF-8" Add tests that expect a nested vm exit, due to an unsupported instruction, to be handled by L0 even if L1 intercepts are set for that instruction. The new test exercises bug fixed by: https://lore.kernel.org/all/20251205070630.4013452-1-chengkev@google.com/ Signed-off-by: Kevin Cheng --- x86/svm.h | 5 +++- x86/svm_tests.c | 75 +++++++++++++++++++++++++++++++++++++++++++++++ x86/unittests.cfg | 9 +++++- 3 files changed, 87 insertions(+), 2 deletions(-) diff --git a/x86/svm.h b/x86/svm.h index 93ef6f772c6ee..86d58c3100275 100644 --- a/x86/svm.h +++ b/x86/svm.h @@ -406,7 +406,10 @@ struct __attribute__ ((__packed__)) vmcb { #define SVM_EXIT_MONITOR 0x08a #define SVM_EXIT_MWAIT 0x08b #define SVM_EXIT_MWAIT_COND 0x08c -#define SVM_EXIT_NPF 0x400 +#define SVM_EXIT_XSETBV 0x08d +#define SVM_EXIT_RDPRU 0x08e +#define SVM_EXIT_INVPCID 0x0a2 +#define SVM_EXIT_NPF 0x400 #define SVM_EXIT_ERR -1 diff --git a/x86/svm_tests.c b/x86/svm_tests.c index ccc89d45d4db9..cea8865787545 100644 --- a/x86/svm_tests.c +++ b/x86/svm_tests.c @@ -3572,6 +3572,80 @@ static void svm_shutdown_intercept_test(void) report(vmcb->control.exit_code == SVM_EXIT_SHUTDOWN, "shutdown test passed"); } +struct InvpcidDesc { + uint64_t pcid : 12; + uint64_t reserved : 52; + uint64_t addr; +}; + +static void insn_invpcid(struct svm_test *test) +{ + struct InvpcidDesc desc = {0}; + unsigned long type = 0; + + __asm__ volatile ( + "invpcid %1, %0" + : + : "r" (type), "m" (desc) + : "memory" + ); +} + +asm( + "insn_rdtscp: rdtscp;ret\n\t" + "insn_skinit: skinit;ret\n\t" + "insn_xsetbv: xor %eax, %eax; xor %edx, %edx; xor %ecx, %ecx; xsetbv;ret\n\t" + "insn_rdpru: xor %ecx, %ecx; rdpru;ret\n\t" +); + +extern void insn_rdtscp(struct svm_test *test); +extern void insn_skinit(struct svm_test *test); +extern void insn_xsetbv(struct svm_test *test); +extern void insn_rdpru(struct svm_test *test); + +struct insn_table { + const char *name; + u64 intercept; + void (*insn_func)(struct svm_test *test); + u32 reason; +}; + +static struct insn_table insn_table[] = { + { "RDTSCP", INTERCEPT_RDTSCP, insn_rdtscp, SVM_EXIT_RDTSCP}, + { "SKINIT", INTERCEPT_SKINIT, insn_skinit, SVM_EXIT_SKINIT}, + { "XSETBV", INTERCEPT_XSETBV, insn_xsetbv, SVM_EXIT_XSETBV}, + { "RDPRU", INTERCEPT_RDPRU, insn_rdpru, SVM_EXIT_RDPRU}, + { "INVPCID", INTERCEPT_INVPCID, insn_invpcid, SVM_EXIT_INVPCID}, + { NULL }, +}; + +/* + * Test that L1 does not intercept instructions that are not advertised in + * guest CPUID. + */ +static void svm_unsupported_instruction_intercept_test(void) +{ + u32 cur_insn; + u32 exit_code; + + vmcb_set_intercept(INTERCEPT_EXCEPTION_OFFSET + UD_VECTOR); + + for (cur_insn = 0; insn_table[cur_insn].name != NULL; ++cur_insn) { + test_set_guest(insn_table[cur_insn].insn_func); + vmcb_set_intercept(insn_table[cur_insn].intercept); + svm_vmrun(); + exit_code = vmcb->control.exit_code; + + if (exit_code == SVM_EXIT_EXCP_BASE + UD_VECTOR) + report_pass("UD Exception injected"); + else if (exit_code == insn_table[cur_insn].reason) + report_fail("L1 should not intercept %s when instruction is not advertised in guest CPUID", + insn_table[cur_insn].name); + else + report_fail("Unknown exit reason, 0x%x", exit_code); + } +} + struct svm_test svm_tests[] = { { "null", default_supported, default_prepare, default_prepare_gif_clear, null_test, @@ -3713,6 +3787,7 @@ struct svm_test svm_tests[] = { TEST(svm_tsc_scale_test), TEST(pause_filter_test), TEST(svm_shutdown_intercept_test), + TEST(svm_unsupported_instruction_intercept_test), { NULL, NULL, NULL, NULL, NULL, NULL, NULL } }; diff --git a/x86/unittests.cfg b/x86/unittests.cfg index 522318d32bf68..ec456d779b35c 100644 --- a/x86/unittests.cfg +++ b/x86/unittests.cfg @@ -253,11 +253,18 @@ arch = x86_64 [svm] file = svm.flat smp = 2 -test_args = "-pause_filter_test" +test_args = "-pause_filter_test -svm_unsupported_instruction_intercept_test" qemu_params = -cpu max,+svm -m 4g arch = x86_64 groups = svm +[svm_unsupported_instruction_intercept_test] +file = svm.flat +test_args = "svm_unsupported_instruction_intercept_test" +qemu_params = -cpu max,+svm,-rdtscp,-xsave,-invpcid +arch = x86_64 +groups = svm + [svm_pause_filter] file = svm.flat test_args = pause_filter_test -- 2.52.0.223.gf5cc29aaa4-goog