From nobody Tue Feb 10 04:12:48 2026 Received: from mail-pg1-f202.google.com (mail-pg1-f202.google.com [209.85.215.202]) (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 BCFE620F09C for ; Fri, 9 Jan 2026 04:15:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767932131; cv=none; b=fOi3DWZASBXJ5LwZYPxdkot3dncpiel86gcfe+oNbGuqb+1dUOgNB6zd3fhRBedviRe7EKKnG7D5do7rP4gXkjtFxY4KCl7Ft9EGmVtO3IZlt4ZP9ijJBilCiyGeSdMly7l8DXpuAN09S2WHfPmBepNSsa0fvVzaOlZGBpu4jFY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767932131; c=relaxed/simple; bh=kutvPVpGW1qMm04do3HzbiiZ2IvYSjCH0GrT8VkCSqM=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=EaUgJ3NC/3K8advEe9hjj7h9SHPGLLOc9vUtmDEK5nFelG0KH876cgiLoStTsIojhYsY7jE/Wn0kazNF4TCCJD57yoXdzPwLUdNOLDwmLgGkschXiQeuJax1rdaY7ZX+ls5SEafFqM/apyn0RdwDB2nrQyhCnm72MW/YxS15Qpg= 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=VL9nLZoY; arc=none smtp.client-ip=209.85.215.202 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="VL9nLZoY" Received: by mail-pg1-f202.google.com with SMTP id 41be03b00d2f7-b630753cc38so6195669a12.1 for ; Thu, 08 Jan 2026 20:15:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1767932129; x=1768536929; 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=YPXOVSPbX1KMczdihtegDFRKVfMczfCw6F1GzpMT+wo=; b=VL9nLZoYee9PN0/ZHs6d3UZmHBK4QOrInGtmiGYW6KqEkdjYd/DHDA8s7SsG+3BPXv fbThJt3cVIn4TRBsuSFDCGjxteutNxLDHI7WOJd5aCHo5KYEGIDx/xjgWLOV0HghPjXW 0IJi19O/3aEru69jXCYfiA+tG8OHXdmkYDQ0gsCKCaTFBNxQFrHT6yUI7rv7BBoAqqR+ 6OOYYfYJLAYJ1+f6liqAnw5bGJGQgj4Fo3OgoYfKb/cvsNqagS739lAclNYBPE0k5fUb TPLsUqcPN0AEDnU9WXMJoamIXvim2FQAzxEw2nnf+bb/oAC8RhBt9t+9LNKF1+WCFCTG +Pkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767932129; x=1768536929; 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=YPXOVSPbX1KMczdihtegDFRKVfMczfCw6F1GzpMT+wo=; b=HAxkKthSEvyItF8QnlcRi2MSyCDIbEMnJIcOuYZaSOMvG0+pV7CUv5dQX+KvyZeN1d vTUzFPkRgrnooLmOylsVgkTQQgxwvZ+nGPUfdYQIWxcn31XQRlWfLqC9jJhjX2bjkNXa dCSH4OqOXaAjSX17xicGJXuBu6giWIiWhcCvRCKg/OIqnye5+H477rjMv8/rgh34pFf3 qQ/WfA2o6Fs/+mQCY6LTPiKIdvYoxYlQBQjfS38kYiKb4mbW4G+Va7mAYo3Ryk43n/+a Bs1CuMPIM+WgYC7Jy7Oeh+RyXqb64svnpX0dYZRkF4UJPIn3M9XIJWCyeNhmKFSas5OR sJOw== X-Forwarded-Encrypted: i=1; AJvYcCWdS6/R9t/ZFyEEbSg6Iyp0iCHBaQle/tReLCQX9meEdgQjzdVlrMy6D/TusJxdX0icXFncEj3q2thZo3g=@vger.kernel.org X-Gm-Message-State: AOJu0Yyy3WfMF8l+SMpWLeAgud2VsOONDYGxUcWKWkiQxJgaRYvAFbZr khNRTxZoqoXDCbCbelMbG8x4RoNYAt1y1+RUf76cKb+fjvOV49ovo+/LRXY47XDF00Jk/3fw/X7 BGBti6Q== X-Google-Smtp-Source: AGHT+IHnin/GN2aGtA/W6NbZpdY5OGBSyLo+1lHdwYvWWp/+UX/8sVL48S7ML4NamcEADhn3bWaWGCYtAnk= X-Received: from pjsf4.prod.google.com ([2002:a17:90a:6544:b0:34c:e69b:d74f]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:9184:b0:371:d67d:e56a with SMTP id adf61e73a8af0-3898f9bde10mr8453753637.57.1767932129105; Thu, 08 Jan 2026 20:15:29 -0800 (PST) Reply-To: Sean Christopherson Date: Thu, 8 Jan 2026 20:15:21 -0800 In-Reply-To: <20260109041523.1027323-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: <20260109041523.1027323-1-seanjc@google.com> X-Mailer: git-send-email 2.52.0.457.g6b5491de43-goog Message-ID: <20260109041523.1027323-3-seanjc@google.com> Subject: [PATCH v3 2/4] KVM: VMX: Add a wrapper around ROL16() to get a vmcs12 from a field encoding From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Xiaoyao Li , Chao Gao , Xin Li , Yosry Ahmed Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add a wrapper macro, ENC_TO_VMCS12_IDX(), to get a vmcs12 index given a field encoding in anticipation of add a macro to get from a vmcs12 index back to the field encoding. And because open coding ROL16(n, 6) everywhere is gross. No functional change intended. Suggested-by: Xiaoyao Li Signed-off-by: Sean Christopherson Reviewed-by: Xiaoyao Li --- arch/x86/kvm/vmx/hyperv_evmcs.c | 2 +- arch/x86/kvm/vmx/hyperv_evmcs.h | 2 +- arch/x86/kvm/vmx/vmcs.h | 1 + arch/x86/kvm/vmx/vmcs12.c | 4 ++-- arch/x86/kvm/vmx/vmcs12.h | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/arch/x86/kvm/vmx/hyperv_evmcs.c b/arch/x86/kvm/vmx/hyperv_evmc= s.c index 904bfcd1519b..cc728c9a3de5 100644 --- a/arch/x86/kvm/vmx/hyperv_evmcs.c +++ b/arch/x86/kvm/vmx/hyperv_evmcs.c @@ -7,7 +7,7 @@ #include "hyperv_evmcs.h" =20 #define EVMCS1_OFFSET(x) offsetof(struct hv_enlightened_vmcs, x) -#define EVMCS1_FIELD(number, name, clean_field)[ROL16(number, 6)] =3D \ +#define EVMCS1_FIELD(number, name, clean_field)[ENC_TO_VMCS12_IDX(number)]= =3D \ {EVMCS1_OFFSET(name), clean_field} =20 const struct evmcs_field vmcs_field_to_evmcs_1[] =3D { diff --git a/arch/x86/kvm/vmx/hyperv_evmcs.h b/arch/x86/kvm/vmx/hyperv_evmc= s.h index 6536290f4274..fc7c4e7bd1bf 100644 --- a/arch/x86/kvm/vmx/hyperv_evmcs.h +++ b/arch/x86/kvm/vmx/hyperv_evmcs.h @@ -130,7 +130,7 @@ static __always_inline int evmcs_field_offset(unsigned = long field, u16 *clean_field) { const struct evmcs_field *evmcs_field; - unsigned int index =3D ROL16(field, 6); + unsigned int index =3D ENC_TO_VMCS12_IDX(field); =20 if (unlikely(index >=3D nr_evmcs_1_fields)) return -ENOENT; diff --git a/arch/x86/kvm/vmx/vmcs.h b/arch/x86/kvm/vmx/vmcs.h index b25625314658..9aa204c87661 100644 --- a/arch/x86/kvm/vmx/vmcs.h +++ b/arch/x86/kvm/vmx/vmcs.h @@ -12,6 +12,7 @@ #include "capabilities.h" =20 #define ROL16(val, n) ((u16)(((u16)(val) << (n)) | ((u16)(val) >> (16 - (n= ))))) +#define ENC_TO_VMCS12_IDX(enc) ROL16(enc, 6) =20 struct vmcs_hdr { u32 revision_id:31; diff --git a/arch/x86/kvm/vmx/vmcs12.c b/arch/x86/kvm/vmx/vmcs12.c index 4233b5ca9461..c2ac9e1a50b3 100644 --- a/arch/x86/kvm/vmx/vmcs12.c +++ b/arch/x86/kvm/vmx/vmcs12.c @@ -4,10 +4,10 @@ #include "vmcs12.h" =20 #define VMCS12_OFFSET(x) offsetof(struct vmcs12, x) -#define FIELD(number, name) [ROL16(number, 6)] =3D VMCS12_OFFSET(name) +#define FIELD(number, name) [ENC_TO_VMCS12_IDX(number)] =3D VMCS12_OFFSET(= name) #define FIELD64(number, name) \ FIELD(number, name), \ - [ROL16(number##_HIGH, 6)] =3D VMCS12_OFFSET(name) + sizeof(u32) + [ENC_TO_VMCS12_IDX(number##_HIGH)] =3D VMCS12_OFFSET(name) + sizeof(u32) =20 const unsigned short vmcs12_field_offsets[] =3D { FIELD(VIRTUAL_PROCESSOR_ID, virtual_processor_id), diff --git a/arch/x86/kvm/vmx/vmcs12.h b/arch/x86/kvm/vmx/vmcs12.h index 4ad6b16525b9..7a5fdd9b27ba 100644 --- a/arch/x86/kvm/vmx/vmcs12.h +++ b/arch/x86/kvm/vmx/vmcs12.h @@ -385,7 +385,7 @@ static inline short get_vmcs12_field_offset(unsigned lo= ng field) if (field >> 15) return -ENOENT; =20 - index =3D ROL16(field, 6); + index =3D ENC_TO_VMCS12_IDX(field); if (index >=3D nr_vmcs12_fields) return -ENOENT; =20 --=20 2.52.0.457.g6b5491de43-goog