From nobody Thu Apr 2 20:09:44 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (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 748683A3E8C for ; Thu, 26 Mar 2026 18:17:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774549066; cv=none; b=NqIYUxaqNVj9XamzZuqmTd7PEAHyCQQaX5mtHp6lHITy6Ct1s3HDnAhlBgKFsuwMcoPG7+qsScu38XWAG3sp5LsITQtDSqT3cP7whhAQZwFsPQVzSMdVq6g82ey79r9TsTVhQ77M49GKR+hPhy5kMeU3SEwJ78lsod9DIfT6cbE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774549066; c=relaxed/simple; bh=iJv4u2gP/0w7Xz+XPS2FaVjCIGqX4eOerJ4APtquhpY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=e/edXvEYPfTqsgBP0FYCGV0AwPy3rZ7p3+asd2VhJD34Ub0UPS3Q8n01IcK39oGOh5c1M4KjGlOkrQtH5Y/hP3FiNRY5TXRtHSfCaIpyxBohtb0t7IDNLkuS9JllSNMciRV+rEciwuxdiohqJrYqYIM5f0LBC8Ak6f/D7oE0V+Y= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=I8J0sJ3n; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=ZRqR4RJI; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="I8J0sJ3n"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="ZRqR4RJI" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1774549062; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=U+d/5ZfgFOgdPVxm3QEllNN5baFtrT2ZFLK18Vxtrwg=; b=I8J0sJ3nADDCCEnBF/B1dAmXB+M4N17f/g/AnG2yEAFADfeCU83XJDQGXHP2rG0SE7CfPF 5+ZU4O9HVWFc1AxN6mbFDdFU9z9iN3RkRiDBSeF6GOqla24Ej0REhkPZhEsn+HdaFTM+Mg eS6lXCOKTWU47EWkcrqIETEuJMN1lrU= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-395-HI3u-OIXOkeLlgQwY_YjWQ-1; Thu, 26 Mar 2026 14:17:41 -0400 X-MC-Unique: HI3u-OIXOkeLlgQwY_YjWQ-1 X-Mimecast-MFC-AGG-ID: HI3u-OIXOkeLlgQwY_YjWQ_1774549060 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-43b3a675316so77459f8f.0 for ; Thu, 26 Mar 2026 11:17:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1774549059; x=1775153859; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=U+d/5ZfgFOgdPVxm3QEllNN5baFtrT2ZFLK18Vxtrwg=; b=ZRqR4RJIcOnbJABWw+8/ppMqDqlzg1I86Az4QquVZXgRDugczEiZW3jSrQDidyfB/o ceG+5kd48cElv1DGiKZ4AVW1wAkScyPd+xnGaL5fO+n+fDDWq8EIgP5Abz+D8w6METqZ IuPAIBSteOgoICFSlVdOstyjh5yam8ATW2Ia2v4K474DPSQDyZULOjb0gPDFpyXOu8xo TlQJf+Xy0kUlDUg6EbfkDzts1aABSuWCXdqrxmjXXWucPVLjli9Ldr9zO9lGUbwcVUCi rf3FcMhygwxB8P9FxDtMKigOav9+1TBKPfsAuWNv9wdLrEts5oArYuvaFAwn5wKB6NOQ 4K0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774549059; x=1775153859; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=U+d/5ZfgFOgdPVxm3QEllNN5baFtrT2ZFLK18Vxtrwg=; b=TZyoPGbSBVRxx0ZOQ/5lFTKhZFrSURfzJGk3nAtyXPwL3r655R/U6ZpyOF9x5+bSxb 2oMGrl056Inb4nSN8MdRtzm8pIr4fhUNY2JRjUPiSK4xrZjXcphI/l5JYsMAvHM9QEqb j+pjuU+UrirBmZiFCDeeCaBHW3yLjEl1EowNCOxyGMo4tA0rjZJ7eRQ1n2Z370e1lo6w toX7uubrkUwWkk6gkv/z1UaWGMzkCvRWQ7Rryk540P/DajJKxIXiWaHzUiqi/EsVhoUy FZqIRi+PHBe2JKX0qQwHeRC6mzV0oe4NB20jbRjxsiuMS7douUjUW/UXN+Zv58wjdzDf Gl9w== X-Gm-Message-State: AOJu0YxG8Fv0xVAeSg+Mi+gmd1PlBpf+kXZ2uPMR0gUfyJZYHclEgPLp BaH4dbfBSxt1jRsW0CXzyyZszDPMLglxNQ1r2k4WnPhOFwH+EsjE2ZNJ1GMPoCYwGZrlh+9apMR JVGMZxTzWRjLONIIEFuGSTOP31D+5Lww3GyV7c/Dg0R80mVL9KeAlIqwtmS1TGejWClv/qv65Aq wg2m2ygObCVzY/naYxgz+pj0tt0pWdlwAnN2UuzLFu0cTg8WHPUA== X-Gm-Gg: ATEYQzwbaBY1uIhuDkr2HTGomONBSgDne+p3NwX3LJeU1Ci7EXeMimUhWnEMjALnbia lhgZX3xgqEeVZ1VxhlWN/72HMXYSMUR6bmdhRVQzOIVfS+ISi+V7ABXR0Pi8D3COS77HtEhS9Ho UNY7DN64jO/mRMzXq//7CIplnj1OXClJy/cszAV0/LjRAoj6lTwxiT6JAogrVfb9WDpXfOxB/DN 6u3uO6TcOP++c9jbkq/ZA52nTPQ6ydEflbfOfCI/qvCGbMCv9A3CHVaHHqE7OZbyQsMDfIVMVS9 5Jt5o+yvxWyadHT8ItF9A3rTmTCu6vJQr03Zkumvc3nUip/4SrMl9EUgntWwSVM2gZbZrGikj4s SHTe7pQfGybN3Yn+VTuvliZdgTlVdy53nFBPdv0ce7QEJ151RgUGvNoamZwF12u/yomaN135xdE ABkGuzKwmD4onSG2d6JZAmYOmR X-Received: by 2002:a05:600c:4685:b0:483:6a8d:b2f9 with SMTP id 5b1f17b1804b1-48715fc3994mr129347845e9.5.1774549059140; Thu, 26 Mar 2026 11:17:39 -0700 (PDT) X-Received: by 2002:a05:600c:4685:b0:483:6a8d:b2f9 with SMTP id 5b1f17b1804b1-48715fc3994mr129347175e9.5.1774549058635; Thu, 26 Mar 2026 11:17:38 -0700 (PDT) Received: from [192.168.10.48] ([151.49.85.67]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48722c6b4d0sm45963845e9.3.2026.03.26.11.17.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Mar 2026 11:17:36 -0700 (PDT) From: Paolo Bonzini To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: Jon Kohler , Nikunj A Dadhania , Amit Shah , Sean Christopherson , Marcelo Tosatti Subject: [PATCH 05/24] KVM: x86/mmu: remove SPTE_EPT_* Date: Thu, 26 Mar 2026 19:17:03 +0100 Message-ID: <20260326181723.218115-6-pbonzini@redhat.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260326181723.218115-1-pbonzini@redhat.com> References: <20260326181723.218115-1-pbonzini@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" spte.h is already including vmx.h, use the constants it defines. Signed-off-by: Paolo Bonzini --- arch/x86/kvm/mmu/spte.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/arch/x86/kvm/mmu/spte.h b/arch/x86/kvm/mmu/spte.h index 317b9cd1537c..bc02a2e89a31 100644 --- a/arch/x86/kvm/mmu/spte.h +++ b/arch/x86/kvm/mmu/spte.h @@ -57,10 +57,6 @@ static_assert(SPTE_TDP_AD_ENABLED =3D=3D 0); #define ACC_USER_MASK PT_USER_MASK #define ACC_ALL (ACC_EXEC_MASK | ACC_WRITE_MASK | ACC_USER_MASK) =20 -/* The mask for the R/X bits in EPT PTEs */ -#define SPTE_EPT_READABLE_MASK 0x1ull -#define SPTE_EPT_EXECUTABLE_MASK 0x4ull - #define SPTE_LEVEL_BITS 9 #define SPTE_LEVEL_SHIFT(level) __PT_LEVEL_SHIFT(level, SPTE_LEVEL_BITS) #define SPTE_INDEX(address, level) __PT_INDEX(address, level, SPTE_LEVEL_B= ITS) @@ -73,8 +69,8 @@ static_assert(SPTE_TDP_AD_ENABLED =3D=3D 0); * restored only when a write is attempted to the page. This mask obvious= ly * must not overlap the A/D type mask. */ -#define SHADOW_ACC_TRACK_SAVED_BITS_MASK (SPTE_EPT_READABLE_MASK | \ - SPTE_EPT_EXECUTABLE_MASK) +#define SHADOW_ACC_TRACK_SAVED_BITS_MASK (VMX_EPT_READABLE_MASK | \ + VMX_EPT_EXECUTABLE_MASK) #define SHADOW_ACC_TRACK_SAVED_BITS_SHIFT 52 #define SHADOW_ACC_TRACK_SAVED_MASK (SHADOW_ACC_TRACK_SAVED_BITS_MASK << \ SHADOW_ACC_TRACK_SAVED_BITS_SHIFT) --=20 2.53.0