From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 74EBF4E50C3; Fri, 9 Oct 2026 14:49:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791557393; cv=none; b=l29ch/EcAI0RYMv/e+Ou2fkY9Z1aT6J/ECHc1iTlvmG7QvJxPnw/UunbxhCnOTPSyswqhJOZMFIDu5EJ3nxkJFqpEtmJmS3Z0+B21jg+R8nBdjLmHGkE7+8UUAqKJafhrHcYFWoUhOdKV6CaxldCLB2rpWgN3zs6Z8DwnCL76gc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791557393; c=relaxed/simple; bh=WxN5DBwH+ixKvNyUcrsenmjBsfCvL0uHe1P7PSd62AM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=k1YoSDWTV1iPME9OhxD8759W28W6xq+ED1L1I8afSv+nc3cpY3cXyqCT8jzjGjNjTHEZFnExW8b7EU8IL1I2ACJ/Sw2cvJMMWeCcNgY45jb3s4iocgbGQx4Y6ZxQC21bUd/FUasIIFQCuVuanHdStuNyxbolrO9ooT7N5Xx5PyU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=17T5TNMt; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="17T5TNMt" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D248F1F000FF; Fri, 9 Oct 2026 14:49:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1791557392; bh=r03VykeT/xnigGEH8mZTVB/AcxWp/ggyWrfzQ3efyJ4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=17T5TNMt1oTmZisoGdKLYRizdwYh1WaQ+HpnedlPfk/OCOvBvIOVe3J84CgK6yY/g m1F9C78OLIjpMulU9d2nKqBTRBGqmvffZQsOfO+Re1FpHNiyaeyLypHGVX4eWLcWal PR5nvU891MGHgQtMHGuETpYbL+XFWpVXyCt1MCyg= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Kai Huang , Paolo Bonzini , Sasha Levin Subject: [PATCH 6.18 393/403] KVM: move TSS constants from kvm_host.h to tss.h Date: Fri, 9 Oct 2026 16:12:34 +0200 Message-ID: <20261009141001.542303973@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261009140952.119038291@linuxfoundation.org> References: <20261009140952.119038291@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Paolo Bonzini [ Upstream commit 35fdfa632e7cf8271189c7ae6f97e7c4b55f7f80 ] Suggested-by: Kai Huang Signed-off-by: Paolo Bonzini Stable-dep-of: 10180a277549 ("KVM: x86: Re-pend GET_NESTED_STATE_PAGES if getting said pages fails") Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- arch/x86/include/asm/kvm_host.h | 7 ------- arch/x86/kvm/tss.h | 7 +++++++ arch/x86/kvm/vmx/vmx.c | 1 + 3 files changed, 8 insertions(+), 7 deletions(-) --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -2350,13 +2350,6 @@ static inline void kvm_inject_gp(struct kvm_queue_exception_e(vcpu, GP_VECTOR, error_code); } -#define TSS_IOPB_BASE_OFFSET 0x66 -#define TSS_BASE_SIZE 0x68 -#define TSS_IOPB_SIZE (65536 / 8) -#define TSS_REDIRECTION_SIZE (256 / 8) -#define RMODE_TSS_SIZE \ - (TSS_BASE_SIZE + TSS_REDIRECTION_SIZE + TSS_IOPB_SIZE + 1) - enum { TASK_SWITCH_CALL = 0, TASK_SWITCH_IRET = 1, --- a/arch/x86/kvm/tss.h +++ b/arch/x86/kvm/tss.h @@ -57,4 +57,11 @@ struct tss_segment_16 { u16 ldt; }; +#define TSS_IOPB_BASE_OFFSET 0x66 +#define TSS_BASE_SIZE 0x68 +#define TSS_IOPB_SIZE (65536 / 8) +#define TSS_REDIRECTION_SIZE (256 / 8) +#define RMODE_TSS_SIZE \ + (TSS_BASE_SIZE + TSS_REDIRECTION_SIZE + TSS_IOPB_SIZE + 1) + #endif --- a/arch/x86/kvm/vmx/vmx.c +++ b/arch/x86/kvm/vmx/vmx.c @@ -71,6 +71,7 @@ #include "x86.h" #include "x86_ops.h" #include "smm.h" +#include "tss.h" #include "vmx_onhyperv.h" #include "posted_intr.h"