From nobody Mon Feb 9 11:04:53 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 37D003C00B3 for ; Thu, 15 Jan 2026 17:34:34 +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=1768498475; cv=none; b=qcP4S22IfMQfYYC+UtDOf+Wj9MyLrI636vTkvSFTS6OA6o5nTsia4wM2p47r9iq7EwVcHtLlSwoqnNmI/tsfd4Q2zhPadj4V0UKgC6rSDG5O55ifx+KpulBEhtQlj7HDcHPQ5HFxPbSOLRCLrHlK/Y19Uv3SvMWsODrKBFumH24= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768498475; c=relaxed/simple; bh=Uj7+GtEca/81U0p64u8SxgUsO2V8tN4E5VdNnTgF0A4=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=GZby5ZWnP0WjVwA+vqVvEikRxYqBjUgEtLE0W6tgdEvRmpQ0rHyh7R8onP0Xx1sBf6IvCYTaMOa3x2uXXyFRfgDNQdO3fMEWVmrz4RnAwk17tJKy9iJB7OpZ/DzdrDCLb0dd6Wr2jYxDFw8YC8MAovgd1+LGJ4fyGG51e32QURw= 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=jRksQjjq; 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="jRksQjjq" Received: by mail-pg1-f202.google.com with SMTP id 41be03b00d2f7-c503d6be76fso1660091a12.0 for ; Thu, 15 Jan 2026 09:34:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1768498473; x=1769103273; 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=wKAO8ODuqhBXZiFnU/FSWUMu1T9OYdfYIUbas+YiKfU=; b=jRksQjjqhTpHrGSItSI92119HBb2j+RKbSRAEcSc7gyGBNHQmXnBRoOPmRQhwnAzmf 8+zg70Q7Y5OojGo/0JzsEuH5SPI7VQXXVQ09e8FdmnKxquf7sQghK7g2jWl0qNw7qDFM 1JyCz2/UNL2UJlzoHU8Hw3Cb7KAexNwAe6w2IhZ6jcAvl4hVTlgQetSpYTE2HLp9G0z5 SAi0F0eGQAvxsbl2GATNpeDUU1WABPDtN22CkUorvGygyLxpH6PjW3hT80cBWy8acVy8 kqsI+3L9rDcjbGSpTeq5QLoygct99e18KYbIZfScnxNjRJ3XU62c2xZJ7por3kydnsf1 TIGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768498473; x=1769103273; 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=wKAO8ODuqhBXZiFnU/FSWUMu1T9OYdfYIUbas+YiKfU=; b=cbZuLxETdbDs832BZoDLuO2p5+iwoJ15E8g0qIUZ24c1ttnqGm/EBw2yoC8MBYX25b OTVXqCIf39WsUPNsFPg10Eaq95ZZhz4pmFjd9Eypf5AudGP1jpju2n0Stfc3gnUVT5C+ cKqAEmltgtw2brZsRsl+ySKFkdvE3wi5wpvjKkRguCm6B+0QQ2dFVWRqCEx9tQEEPrlb jThE4MyICF7xNlUmM1DfC9+77Vdzs1uy6w0fifH7Nr/0xqoH0srCrPqHiA2nYhDQjK8T M7bU3syhzj9LCIl57bjj/w7TlamhSmLRdRcTf7NwLUcRIV9w7rqm/PtGzF8Qv7PGDBvk gvEQ== X-Forwarded-Encrypted: i=1; AJvYcCVX1ISzXcAA7LDAyVlCH9N+vL6vp/PoVr7NV575OAp8BQjvCg2b8CZIOc4yv+CTgxiuqGLOJskDzFxLIng=@vger.kernel.org X-Gm-Message-State: AOJu0YzWTn0mLVy7SEsDhMvIV+hIBOO9Tq0YKVLhHcYJ0Gh1bWP147M2 nsKbevsEvQFFKowZ+Tbhv6s3NsezLks5eH9ALv0meYCZUgQjL8bp9994Ew5X/hXZngtVkF+jrz+ B+QVSJg== X-Received: from pgjz17.prod.google.com ([2002:a63:e551:0:b0:b6b:90a5:d43]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a21:1796:b0:38d:f661:992c with SMTP id adf61e73a8af0-38dfe63cd19mr488958637.35.1768498473537; Thu, 15 Jan 2026 09:34:33 -0800 (PST) Reply-To: Sean Christopherson Date: Thu, 15 Jan 2026 09:34:25 -0800 In-Reply-To: <20260115173427.716021-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: <20260115173427.716021-1-seanjc@google.com> X-Mailer: git-send-email 2.52.0.457.g6b5491de43-goog Message-ID: <20260115173427.716021-3-seanjc@google.com> Subject: [PATCH v4 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 adding 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 Reviewed-by: Xiaoyao Li Signed-off-by: Sean Christopherson --- 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