From nobody Mon Apr 6 09:15:18 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 1FD8724E4C6 for ; Sat, 21 Mar 2026 00:09:49 +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=1774051793; cv=none; b=kWzYi/CQFYtc2K3PDOIBM6fWe8E37k9PEkABHruWf5rfrIUgmCPpuYUu2rRGChikfiqI8VdnJ+HdwURroDKK++U2sETD0j5pCQ6QRQ82an3pli1TvAbkWViGVFuTkc3pp/emjiwqGnb10yZhBnyHGInsqC3jM1lGc/lEhe92zwM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774051793; c=relaxed/simple; bh=OJBsyJfTqth9OfgUA01Qnwq1JO04burdCzePl3InDIo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=FX7T4dCkoFHrE0NkIX7sz4Ji1C2kdHvI3FYsn+6OJDQPIvxs+UebLnt59BhjKgY/rmT57CSZbswX9/fMYm+5gdEMp1OhFnDUAnNJpM+dAbPLdDbRXR0aTQWgpjVKjur03YQqwMDUM9RN24YimJlIGHLtT2WlPaAbPtvZys7FCD4= 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=G+j84spt; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=So4scJkA; 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="G+j84spt"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="So4scJkA" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1774051789; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qXO9T9Z8K77B5X3+NmDVkDSP2SW3BrCQveRA3iJEcWI=; b=G+j84sptyKIL6VITNA/4FwdK+abj5hrUOnc4ND9UzkzkLWiHMtgnz6hWcVAxB2nTXb2CY4 A/wPEjJ/jGA9F/isxklq4cfcvBZnfGtdtz2N9ZB9jLPNFJGEnivrilDFnPjvNtR58WXfEo 6/XNjTJoV2Tc0SBBfQ1+oI8AyqBUIcQ= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-333-MCH-PLsePriTFBNRQPgsuQ-1; Fri, 20 Mar 2026 20:09:48 -0400 X-MC-Unique: MCH-PLsePriTFBNRQPgsuQ-1 X-Mimecast-MFC-AGG-ID: MCH-PLsePriTFBNRQPgsuQ_1774051787 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-486fa35b005so24224635e9.2 for ; Fri, 20 Mar 2026 17:09:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1774051786; x=1774656586; 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=qXO9T9Z8K77B5X3+NmDVkDSP2SW3BrCQveRA3iJEcWI=; b=So4scJkAxN3XmcQRDIymFGd6QDRyc/WkYENICafZL+Z59m/hxsqMfY+8As8kC70tIE dfg8MaW5HRNIca6X5GQI+NF2qoWOUkbT8MWdc2VYTkWG4Zwvai+oGaDh4k7EEFUkBBGm sWYapbEYmVLgiqyF8rvwCnKnNIAnZEIifAujSDI+8UCOdbVnUJmPTJKP5Bps912DtL3I c4xgZRsMnOpOvC1JZt3x8Ranhb56EqXpYp0T/wrDhfWTD0Sl3A0v83s4bnb/f8iAqx0B LNH9wvwB3LadPyceMjz2cQGw0o3J0tqUCVNk7ykYQlrtjHgkNy/7/AyK2yjkyzVYaCtC SQ+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774051786; x=1774656586; 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=qXO9T9Z8K77B5X3+NmDVkDSP2SW3BrCQveRA3iJEcWI=; b=ldXIeMmyTrRgBPHXchPn8NEj1EC2TxBOraXUOFvjjSg6nAnUf88lVtqhXqXDBITvE8 V67EFZsUw1kPMpAjxZTGhHpn/ZqS6bKE/aGeycvhtwdpVjrNVTURD5qOb79QxQXBODwM Nk+S7LU/nSYwX1UpJWmBl6W68r+XTSiYYPkJY85E0TFS6HlsZZ0rH2n1o0Z/ofwabd2+ p4Aa8XCVG1rw4Q2+pobU7tEDtu4Whs4zS2jqQpoGet3S7jFDr1WiE0mH7jdL75Jx4zVs 4WnSxfePBqE0GL3/9EQJkojO4yikAGQXFKMkdadOL4DvnAhZpBlurOLtCm2eKr0O1f08 5czQ== X-Gm-Message-State: AOJu0YwWKkQfnzMwSsmEbnMuXMfHudtv5uxkzydjUFcLgzpctOHJilTC Qid7oB+SF0bRtEuCjPr6CMq5ffVNpGDoY84CvOumfJ8beZHcay+Zjt7k8ZgQ2hZJQQPmpmOxlUq Ggq7aMA+zcfy6hL+rrXQKb2Yb1tBBhroLuoHRsigmMATrr9rHqicrqse58wV2CfVgiVD5la15Mt uYEi3nFvpjFd8n9YF5unGeVR+fSTzEs1KkecKKsj60gJb445ItNg== X-Gm-Gg: ATEYQzwN06z6aNO38GYTqSl8J/iVSsY6tRPkGsVDNPmcnzHB1S2dIBHzYhIBkQRGVxn rqWyUVeaIH5qjGL4O8rZGhz69sWelN/yHRNhBoqKZqxA2ym41+BksXjoES7BAxUGBmQBtJMUeZZ nYESP43hbh2V79zigHPliF09aw/UuB1KN90fl4PG/o46yKaSATa9tyoypwS2c716g3S3j34dh+E MtoAd9KoI/OedWWP5NNJTvGVAQ2/OEypBL2vdpwfcTcQaE2jUd1miuX6zdTwtUnODr3mEhRn0G1 i6NAfzvuFZg4EmazxPl72cNFkdABugUTgMcAFFUlWJqKCsuRT1SQEsxfD1w0zryHE8ReKyVwhnk x1f0JtfQqoUJJHzLMicAUexRQbv+TEKjYMBAupTGIMxkR7pSI2kREHdKMtkOgAS3eRshzzTz9nF xfIOWpYJgvZG+JJGgOaivFhrQD X-Received: by 2002:a05:600c:3e8d:b0:486:fe45:483 with SMTP id 5b1f17b1804b1-486fee25f82mr63400825e9.22.1774051785865; Fri, 20 Mar 2026 17:09:45 -0700 (PDT) X-Received: by 2002:a05:600c:3e8d:b0:486:fe45:483 with SMTP id 5b1f17b1804b1-486fee25f82mr63400545e9.22.1774051785417; Fri, 20 Mar 2026 17:09:45 -0700 (PDT) Received: from [192.168.10.48] ([151.49.85.67]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-486ff1cb178sm26349555e9.29.2026.03.20.17.09.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Mar 2026 17:09:44 -0700 (PDT) From: Paolo Bonzini To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: Jon Kohler , Marcelo Tosatti , Nikunj A Dadhania , Amit Shah , Sean Christopherson Subject: [PATCH 05/22] KVM: x86/mmu: remove SPTE_EPT_* Date: Sat, 21 Mar 2026 01:09:14 +0100 Message-ID: <20260321000931.1947084-6-pbonzini@redhat.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260321000931.1947084-1-pbonzini@redhat.com> References: <20260321000931.1947084-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 Reviewed-by: Kai Huang --- 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 7223a61b1260..3d77755b6b10 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.52.0