From nobody Sat Apr 4 04:35:11 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 485E91E22E9 for ; Sat, 21 Mar 2026 00:10:02 +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=1774051809; cv=none; b=qBsmJtVHAGTl43AaoPMKbbeMdON6CcmFxc+iTu1KA7RU6QhYSROah2XDtwpaW+vbycXDeV+9S7i2NkMPm51bvfT5fcgERlr8PgXUIWpccYBg/4ON8FBy98TAcSuPKzdVyk4j7eAXPkDrijzHtOvaZiW5xg0xA9FZZRHxBFpFpbc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774051809; c=relaxed/simple; bh=C26AKlcqhxES8P78PlFAFfTqVSHkV2KhanGxvACIoSQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Z1xknUJ/FLh6x3Vf0Jy6XINsrkuog+W/498oc1MvJUJoQdV+BSLoo328nim4etOsk0shE/4s30KEhHaRlxpYw+86ZRQiy5gMPBnb/GBgYVp+rpcnnsYrBp/qVlBD1b4a8cRZp7x67K60gu77lJx2xO30tTRXy6Or+qkJw4rYuns= 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=VSFTgdUs; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=eGWOjP5N; 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="VSFTgdUs"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="eGWOjP5N" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1774051799; 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=4RAFXUH565cQlW4EoICJT88q50/yfKIJoFVq4Wl4i3Y=; b=VSFTgdUsnyupsjdIWsQebFkdOBvrLdmNDnFACZxx/ym+0yPKqrb1luoyUg1D2S6RdNNn7D e39GcmU5UEaFb4LYfRi8JallEtEwKNfLCFfXS+3xoYhPA35LosPRnlWuj4NLlT6mLa3S3+ 4GWItw8NzJNrb82onOB8Hd3ByKcBoyQ= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-59-cUesB7ucMTeZ8fAUKg6zHw-1; Fri, 20 Mar 2026 20:09:57 -0400 X-MC-Unique: cUesB7ucMTeZ8fAUKg6zHw-1 X-Mimecast-MFC-AGG-ID: cUesB7ucMTeZ8fAUKg6zHw_1774051796 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-4839fc4cef6so34756045e9.0 for ; Fri, 20 Mar 2026 17:09:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1774051795; x=1774656595; 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=4RAFXUH565cQlW4EoICJT88q50/yfKIJoFVq4Wl4i3Y=; b=eGWOjP5NZeKgxoidf6ArcSzevU+dVDAJPbUxjqrkGxsQ258g5jEfIMNRYF5ga3z2y7 lNPWKsFS7w+hNR4t2kNjJhSnIeZLOyhmiT4soahb2DswXNmjWitedjw2Emej/j7EJhW6 Zkq2z6vvbySQmofm5XWFZ9HHwxvr3TgwQhSKMCVUJjm3RK/ARNgn6fb7HtwRfk0nacxH EcKVsRhEufg/xa3CrC9U1VGYw0QnzjtOwtVt4DI8h3eMfhY6PjTZxga1RtSq6d1XB4uE 3OE+2BfeHEwxy3Q23Lapu73mKt3rSoE6mOP9OY2sgrPQFsWOrSeYyCENpDt1H+e3RKSp zN3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774051795; x=1774656595; 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=4RAFXUH565cQlW4EoICJT88q50/yfKIJoFVq4Wl4i3Y=; b=N9eG6zUrjdWlEcFlfmZlqU9B9TC8B3NZQYyITX12b7tssBDh8r6PETOICn/dwOxFPz SciX3iIk/qmoaamUdibNyfLJTijEpoe+zR5Y4rU5XO3jGicgXmE9/2N3brGE57n473Cv sD/IE5jp9ByWq6Q721vcKLyEgODZEbAF+69UxxCDNGTV63Rt+tz4/EKjff+D04LXGRQe cjn7LryDfvptYw1z3tpBGxlBEoHjJAizzUCoXoKORvSYceYLuJN+y8VttDct+gRU8/s5 d2lhkfle05tlN+/XjOSMiDyzVqR1V1SWLhPalIt6eOjdDow5RKvc3jTiY0ucajexyNDH o72Q== X-Gm-Message-State: AOJu0YzwZgvpu9xDTMcl4+yVubJ8E7UiAnjqojM/CLRNNjlve0gXo9iY GHUoaXCavtcNGL9DmtqQA2EeYhdDZOQ8Sj8MZOVRtPyZkSie1nzGFTliXt7ZoGJllw4zuwwBLwr vF+AZwmlS5vKUdqMoV186MpOspgGbC/hmojjGju8LEO7HZ8+84DUoQQcEXvu9lO9T72KfvLZoTa UBRE2LmP3mkOsvvm2cDi6rt4zWZyH5nJQODcKJLV3XPfuegBhraA== X-Gm-Gg: ATEYQzwfvkFPhsVWuETskf/UGoeOZxhe06C6o8bvWGl7LBDKYbX56j+POsyxxX3gIfj Epk1+kAszEVjwLLjZ4bOgXDPmM8fSkC5VcIeZ7thuMTnfpeLAzUFLuzX/qv8lPRtzYVkUObqDIs TGdD/swaqVEn2faYU1si9shJECi7o1CB0/Gog/lONIuWi6pwmiHgv/4B62cJSQslUcshDKVWeCu xF1+e86IogyW2nzi8YdNMG/U3OAlsl1WwWLpUiApM8dX8RvPVTPEs+Mpx2sc4ITpchJc5nXUeWJ CRoHode8I9Yr8SMadHVeFPvI/1I0/4R0EJA1WdaHyxNQwM8HRQjHEA8BJsly99VdImaj32PdZ7g Fne57dUhW7ilEcr+7x1RFVCBvRdLpwzSPBVsxpEtE5pyqxCi/tR7tojV542euPKUJJDWP/RC/z3 EzrkznK0U+hsGzXzHo1XqEZaza X-Received: by 2002:a05:600c:8215:b0:46e:59bd:f7e2 with SMTP id 5b1f17b1804b1-486fe8e4038mr73838555e9.11.1774051795193; Fri, 20 Mar 2026 17:09:55 -0700 (PDT) X-Received: by 2002:a05:600c:8215:b0:46e:59bd:f7e2 with SMTP id 5b1f17b1804b1-486fe8e4038mr73838295e9.11.1774051794749; Fri, 20 Mar 2026 17:09:54 -0700 (PDT) Received: from [192.168.10.48] ([151.49.85.67]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-486ff1e6029sm49600975e9.9.2026.03.20.17.09.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Mar 2026 17:09:54 -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 09/22] KVM: x86/mmu: separate more EPT/non-EPT permission_fault() Date: Sat, 21 Mar 2026 01:09:18 +0100 Message-ID: <20260321000931.1947084-10-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" Now that EPT is not abusing anymore ACC_USER_MASK, move its handling entirely in the !ept branch. Merge smepf and ff into a single variable because EPT's "SMEP" (actually MBEC) is defined differently. Signed-off-by: Paolo Bonzini --- arch/x86/kvm/mmu/mmu.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c index b87dbf9e42b9..b7366e416baa 100644 --- a/arch/x86/kvm/mmu/mmu.c +++ b/arch/x86/kvm/mmu/mmu.c @@ -5452,7 +5452,6 @@ static void update_permission_bitmask(struct kvm_mmu = *mmu, bool ept) =20 const u16 x =3D ACC_BITS_MASK(ACC_EXEC_MASK); const u16 w =3D ACC_BITS_MASK(ACC_WRITE_MASK); - const u16 u =3D ACC_BITS_MASK(ACC_USER_MASK); const u16 r =3D ACC_BITS_MASK(ACC_READ_MASK); =20 bool cr4_smep =3D is_cr4_smep(mmu); @@ -5485,21 +5484,24 @@ static void update_permission_bitmask(struct kvm_mm= u *mmu, bool ept) /* Faults from writes to non-writable pages */ u16 wf =3D (pfec & PFERR_WRITE_MASK) ? (u16)~w : 0; /* Faults from user mode accesses to supervisor pages */ - u16 uf =3D (pfec & PFERR_USER_MASK) ? (u16)~u : 0; - /* Faults from fetches of non-executable pages*/ - u16 ff =3D (pfec & PFERR_FETCH_MASK) ? (u16)~x : 0; - /* Faults from kernel mode fetches of user pages */ - u16 smepf =3D 0; + u16 uf =3D 0; + /* Faults from fetches of non-executable pages */ + u16 ff =3D 0; /* Faults from kernel mode accesses of user pages */ u16 smapf =3D 0; =20 - if (!ept) { + if (ept) { + ff =3D (pfec & PFERR_FETCH_MASK) ? (u16)~x : 0; + } else { + const u16 u =3D ACC_BITS_MASK(ACC_USER_MASK); + /* Faults from kernel mode accesses to user pages */ u16 kf =3D (pfec & PFERR_USER_MASK) ? 0 : u; =20 - /* Not really needed: !nx will cause pte.nx to fault */ - if (!efer_nx) - ff =3D 0; + uf =3D (pfec & PFERR_USER_MASK) ? (u16)~u : 0; + + if (efer_nx) + ff =3D (pfec & PFERR_FETCH_MASK) ? (u16)~x : 0; =20 /* Allow supervisor writes if !cr0.wp */ if (!cr0_wp) @@ -5507,7 +5509,7 @@ static void update_permission_bitmask(struct kvm_mmu = *mmu, bool ept) =20 /* Disallow supervisor fetches of user code if cr4.smep */ if (cr4_smep) - smepf =3D (pfec & PFERR_FETCH_MASK) ? kf : 0; + ff |=3D (pfec & PFERR_FETCH_MASK) ? kf : 0; =20 /* * SMAP:kernel-mode data accesses from user-mode @@ -5528,7 +5530,7 @@ static void update_permission_bitmask(struct kvm_mmu = *mmu, bool ept) smapf =3D (pfec & (PFERR_RSVD_MASK|PFERR_FETCH_MASK)) ? 0 : kf; } =20 - mmu->permissions[byte] =3D ff | uf | wf | rf | smepf | smapf; + mmu->permissions[byte] =3D ff | uf | wf | rf | smapf; } } =20 --=20 2.52.0