From mboxrd@z Thu Jan 1 00:00:00 1970 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 564793C8729 for ; Tue, 5 May 2026 19:52:45 +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=1778010770; cv=none; b=E/C3aBScD03s1d5EFnq/jOJfLZ8CFSsoV7YSAoXiy882Uhjcvry8tYiv6DBrEaWiJrNqhO7Yu11KaSUf9mES7Unayh19sbRi+TMs0/6DoDSvYgwK1Va61S6Zm65ErpaYGGDoDYuZ1ioAdBJzh+VFPj7Ck/qm69Mv8vRciqlj9EM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778010770; c=relaxed/simple; bh=VT7zfiiVRapsXV419bLXWnYe/GDkcopj88qVydXofgY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cfCZDSrvCYiBF0M6tVxXjC+LuXJ0M5u3yIuW1mpWYw+11tPAF1sUU76L5TXGBa88AHRcmSW36wOaJzmppHrJGQRdfD51N5nAFlFLTIa4FfB6m1RaUB1ffYGVWvyltppIjWUSdokUdPjiYMlSGWFn5qi0FoUeT62lhJtBN5H3xFU= 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=chUTYCF3; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=A/cPSxuO; 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="chUTYCF3"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="A/cPSxuO" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1778010764; 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=KmTlPbplzaPUyaXoZZq4ubiOPxj9lSeMSfGVlOAgc48=; b=chUTYCF3ZQYJctA8Mie/Ss0wXueyS73iefUe1tZfTVNRXcnwna7XUwgsHSm63g7Ixay0BX mtfoOH7euJt9AwbLaUqLwr8dL4RbSydtP2CfoNPhhbn1Tv6H2XiHSGvWIrSI5gwf4xVybP zn1/T8K3jdn8fsqpRSSre1jHcm15cwI= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-543-7CNYsuNSOBuj5mPDRNrc3Q-1; Tue, 05 May 2026 15:52:43 -0400 X-MC-Unique: 7CNYsuNSOBuj5mPDRNrc3Q-1 X-Mimecast-MFC-AGG-ID: 7CNYsuNSOBuj5mPDRNrc3Q_1778010762 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-48d05e7b117so21764375e9.0 for ; Tue, 05 May 2026 12:52:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1778010761; x=1778615561; 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=KmTlPbplzaPUyaXoZZq4ubiOPxj9lSeMSfGVlOAgc48=; b=A/cPSxuOlMM3uVIS6HUMaiOuzAkkpSa0V8Iggonfl4FOgxOCXtdlE13dSzXu+su/OM JHyAFQrRHwgGA/+6utWLpxg0QncEG7zsCRLTlsZiaRCbzhu77T9eqMyyEnj6a/0/JNWb y6LTnVuEq4w4BDRUee6EuCbh78hTkHSaLG/GZ0Sr1D5KNq2/5eHvk4vzqNlV5TDtZ12u m+NSH1/oc8zS0XijnyB3M6hsbMdhLSQOwMhNxkAqU8bTDet7/yxT+bKdDbvh38Md+CTu gADBnCDtVNVn14CgOXVkom16EDuzDrmaFK3k6zEckTWjozDX0I65BAQKJoidpOYrEk12 QZcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778010761; x=1778615561; 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=KmTlPbplzaPUyaXoZZq4ubiOPxj9lSeMSfGVlOAgc48=; b=P7ifGtLEPpgWF8URk8ePKzVLERTzwkJExe50+749zq17YEu/zRoO+ZUaDcfcV7Tw3D x6YlYupU7N25KPu7+yeJ0IVnE44GPbAeo4NIHfHHY9+GWijXGudIKIzcP9dUHjc/6sEV MJXTcntrIFgXdziFrieti8/RJCfETeustbObMYWaDA6LY1nBCdog3BlfPDc1Hu8kGCE9 4BwjA5PBZH5eW40keEy2JxiJbfzZqmKj5XTIZfGeVDDEi1KcNAy450XainFfvRZ/8vVl wz23Zg845bA/mguNePKLKsZpdgE5B4ApbKq02wYg21I3CbCLjzsS3PIXSs8qR/OJVT5O 1hzw== X-Gm-Message-State: AOJu0YxS1h1sMi3pF5kTjnezq+Xg7XmARp0AxbuIV0Dnh+oGRNUaY0GC R5MbJ/lVgPeeV4D6peBpAC/MQRtcIjRtoX0vvXmp9L8Z7O6WbFgbN8c80H/TKTK9WCK2eTxUZB5 0vyGhJ2zddgjLQNjXyxE2w/Y1t13CWJ5C5KBUjA9hEtfTlu3GcDN5UN2FdQ8QLgUgC6xzsNojtw 7vshRhG0IQgGC3jinkLO3Cr2I6Spuv+ArtI28taEPhc6YXyswuiA== X-Gm-Gg: AeBDievTl4Svf0viD3eBl11euASwrVQ5/KqWIL9UbeIdQEkqh6LYwx+VH/TPYgXZLi2 jOjlBsPg7TOydZYAk+2YdNCY4ZQnZXzy+1rEnBZZwaNSqAfeZ9ZNSZjrXceGQ6+/eUmInT7rBF0 m3rsloBLEgAJe9jU2j9X3Let/xcLuoiAHf13tFMw4jJi6UNMMo87OuG2iPtWp5fqa2aH3kgoz1q NCND7TxklMgoNLvMnceHX/V+E0+7cPCgjGiMpmuZ3CdezpZ4Wm3UCENdQgQ0KkOUvGWCJ0NhDqE KQYRJXpi9t/kD4bW22EBny+93G5f+qrH7LAEUZMF585XHl77I2W+C2MnoezL6GGpppEFNbKmt9m ptZ8U5kdiskgq7vpvAcXifEHD+jsVhhGNAMy0urm050+Ul4irpUsMxcxWnyCV9qx8xP+urZ6iHt hhZXjcBsi4wwhaGpNvlFCUHabbVhOBCklin4w+x1M= X-Received: by 2002:a05:600c:811a:b0:483:7903:c3b1 with SMTP id 5b1f17b1804b1-48e51f35d0emr11587445e9.20.1778010761289; Tue, 05 May 2026 12:52:41 -0700 (PDT) X-Received: by 2002:a05:600c:811a:b0:483:7903:c3b1 with SMTP id 5b1f17b1804b1-48e51f35d0emr11586915e9.20.1778010760852; Tue, 05 May 2026 12:52:40 -0700 (PDT) Received: from [192.168.10.48] ([176.206.106.181]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48a8eb6fffcsm398234745e9.4.2026.05.05.12.52.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 May 2026 12:52:40 -0700 (PDT) From: Paolo Bonzini To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: d.riley@proxmox.com, jon@nutanix.com Subject: [PATCH 05/28] KVM: x86/mmu: remove SPTE_EPT_* Date: Tue, 5 May 2026 21:52:03 +0200 Message-ID: <20260505195226.563317-6-pbonzini@redhat.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260505195226.563317-1-pbonzini@redhat.com> References: <20260505195226.563317-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: 8bit spte.h is already including vmx.h, use the constants it defines. Tested-by: David Riley 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 == 0); #define ACC_USER_MASK PT_USER_MASK #define ACC_ALL (ACC_EXEC_MASK | ACC_WRITE_MASK | ACC_USER_MASK) -/* 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_BITS) @@ -73,8 +69,8 @@ static_assert(SPTE_TDP_AD_ENABLED == 0); * restored only when a write is attempted to the page. This mask obviously * 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) -- 2.54.0