From nobody Mon Feb 9 21:18:51 2026 Received: from mail-pj1-f73.google.com (mail-pj1-f73.google.com [209.85.216.73]) (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 0846930F556 for ; Mon, 12 Jan 2026 17:45:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768239947; cv=none; b=e+nhkhV25Dtq1BU+1EwYjyTFZExK5VYozXgaj4ucazWUiO/PO2bcemwfd0ONd1faH9FnaTWEKb64KmQGGiBkBcxfnlBfe1d99+nKlKmdpFGhmvo739J31FXgS7ePdXJUHL1Za5EXSf9Au92c+mkTuBeKJcIMbX1tzQ5AdP8u+xg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768239947; c=relaxed/simple; bh=0Zgeqk6nvVnJdWqLW28/Asgqjv9ht3++oXRwRVKQXu4=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=r/12pR8yJ05RSx7Kg77gqBFRGHkRLA9ciHSNL7uogs1UezKlFZKxGxMTT1FeGw/iA5VbY1Lx/EAHlJyWmRnU6k21a2fBRMaL+JguF8mgNE1WhFNF/5weE70rkQm2wZbpHmppQ5BZPmcjkzC4b+2ngaALdU5LwBfmrz2vejDqkQE= 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=pUtsNEbF; arc=none smtp.client-ip=209.85.216.73 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="pUtsNEbF" Received: by mail-pj1-f73.google.com with SMTP id 98e67ed59e1d1-34c904a1168so7489679a91.1 for ; Mon, 12 Jan 2026 09:45:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1768239940; x=1768844740; 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=b6BFne1S4FgseBSOPk1COHyA5nUIkO8P89zUv5Rb2gM=; b=pUtsNEbFFpX24X7JVxEzUD3T6giafgRqWmHi1yrjtkllEi/Gnw3imJrUc15tFEWvgt zfnj1ItNFAp8nH0GDuZHi9W++ektz9/cRm16QHpYl6WNMwNkxp/Hzv08feRVhnPd8RtF 6NaxOCXrMROh7JSQ79grjTxrqB1rwgRqBowkSuN6l/kIj08UTjXkFH3NA7jHV4Lakd2R yAwh/1epb3NHu779gQmINrHgxBjTYWb0dGz8B1JwXUw9XWF5GfGR1D0FLGdpBH1HJYhI 8baXWMV+hGWaY3VjjJt19hyBL02jC+dCu1wukTCgxhxZ+q14jijfKsu7ODYuIDhWxc+V GfSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768239940; x=1768844740; 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=b6BFne1S4FgseBSOPk1COHyA5nUIkO8P89zUv5Rb2gM=; b=dYW9QmR+5sQimDEajTivMwF9IliJ1BPeJqANaMzk3dz58T4o+uc2OhittOqBxXa12M z+VggU/kEaAQntM3+tOwDKfcTNn9h2KMEYyLD22MzXJzblUSLELZgh+cDZ2LXn1TZ+cK ilUKA5uU9352NV3F97Poju72OIl8MG4wGLKm4MDvi9IYwwg6PIXIYVs0aW+FqvXilVCA JoANSgH565dziABgr8Fo9Ut6iTZ7+mpOMclutmcX8bTCrSEznQMHDUxO9y2/FK2Yyl0u 6K++tg7lE5IuLmm0/LnA262wRJrFSmg9LYKUju56lLv9StVPi1JgxawuV+VzThPbSXdb 2tmw== X-Forwarded-Encrypted: i=1; AJvYcCUp9GdZIFO8q+HdW3RdL1cot2a3pTjiGXG5uAAOUEvAf4DMEZ+uy6XxLkTe4aEa34F0J8oLGLdxQ15n5WU=@vger.kernel.org X-Gm-Message-State: AOJu0YxfrHopppS76XJM6eNOmyJW74+IufK7Z0Tw5KrTxtYKixIXPcYE eRH55ega8MuRu55T+MdIn4ry3j1ARSWxlANsSo/LhM09VIu2qPlKGq5hL8tXfkoFXpcebu980b4 xmrO4cKFXKEK/3w== X-Google-Smtp-Source: AGHT+IEsI2icbYhsaK4X1KyC1zLSu2ju/1AzRiF/TSEOp8nhrtSL0A6azxOTDtPe8zbtUddJYq620VW3jnuqkQ== X-Received: from pjbiq12.prod.google.com ([2002:a17:90a:fb4c:b0:34e:9b4f:a5a6]) (user=chengkev job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:1b08:b0:34c:75d1:6f90 with SMTP id 98e67ed59e1d1-34f68c0018dmr18551214a91.17.1768239940511; Mon, 12 Jan 2026 09:45:40 -0800 (PST) Date: Mon, 12 Jan 2026 17:45:31 +0000 In-Reply-To: <20260112174535.3132800-1-chengkev@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260112174535.3132800-1-chengkev@google.com> X-Mailer: git-send-email 2.52.0.457.g6b5491de43-goog Message-ID: <20260112174535.3132800-2-chengkev@google.com> Subject: [PATCH V2 1/5] KVM: SVM: Move STGI and CLGI intercept handling From: Kevin Cheng To: seanjc@google.com, pbonzini@redhat.com Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, yosry.ahmed@linux.dev, Kevin Cheng Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Similar to VMLOAD/VMSAVE intercept handling, move the STGI/CLGI intercept handling to svm_recalc_instruction_intercepts(). --- arch/x86/kvm/svm/svm.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c index 24d59ccfa40d9..6373a25d85479 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c @@ -1010,6 +1010,11 @@ static void svm_recalc_instruction_intercepts(struct= kvm_vcpu *vcpu) svm_clr_intercept(svm, INTERCEPT_VMSAVE); svm->vmcb->control.virt_ext |=3D VIRTUAL_VMLOAD_VMSAVE_ENABLE_MASK; } + + if (vgif) { + svm_clr_intercept(svm, INTERCEPT_STGI); + svm_clr_intercept(svm, INTERCEPT_CLGI); + } } } =20 @@ -1147,11 +1152,8 @@ static void init_vmcb(struct kvm_vcpu *vcpu, bool in= it_event) if (vnmi) svm->vmcb->control.int_ctl |=3D V_NMI_ENABLE_MASK; =20 - if (vgif) { - svm_clr_intercept(svm, INTERCEPT_STGI); - svm_clr_intercept(svm, INTERCEPT_CLGI); + if (vgif) svm->vmcb->control.int_ctl |=3D V_GIF_ENABLE_MASK; - } =20 if (vcpu->kvm->arch.bus_lock_detection_enabled) svm_set_intercept(svm, INTERCEPT_BUSLOCK); --=20 2.52.0.457.g6b5491de43-goog