From nobody Thu Apr 2 20:10:53 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 A5CCF3ACEFE for ; Thu, 26 Mar 2026 18:17:53 +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=1774549078; cv=none; b=Uo47+ebFCNMTMC+YjCwoMtFexP2gI7SBXHELiCPOJGvB8CLlZSkHKxG8BBeWubQ9eBcT4+/bNbIxLIMwAMbpNXSqQWcKIc2D49yYLJzvFHSxRI7Qbe4Y6CdXqiEvC7IHJXWRrX0znJ7wkRcQwCVtpCrOI3vbmwm+rnAjYtOwryI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774549078; c=relaxed/simple; bh=vTy9O5IsDlG6v8B6glBVPqw3VYt2VMRG16l4ZUpy0Nk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Lyl5mur5eVvZnosvpIMe/ipuNXvEPOMjiJWqhjIyJRMkMHyLGlV7AcYayi9JLORFUDllxmFtBibOwH/gkx/YIqy8m7T0fCHSMVjWjueHMkE6Yp3xN9iZbGpRhqCljWpIc1BSzc/pwWYVH/Bp2i843hoAwCIrY1lsbT6XWkyj/+0= 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=bsrwoVuo; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=mG6eZKcy; 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="bsrwoVuo"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="mG6eZKcy" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1774549072; 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=PcMqJJGPCLK+VRPcw/NPeynhXQGvPO9SUzIgJSMzXxQ=; b=bsrwoVuoyn4/ZHOnmOrS05emEVE+RX6X8N0/r5fAvy4K6Fflp4F4PrCQpo+ourKP7wmohL 7wMUBy1TIteRyic4oe81lM0KGPmZXx/7SyrLDG1ecCt4/tWC2ZKw/huQHA9nDEwrviG/hK O74oTBXjMMnxZRiLaVzZhQUhZjxyvLg= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-627-HjZoWjPCMeGBUMIXOZDrLQ-1; Thu, 26 Mar 2026 14:17:51 -0400 X-MC-Unique: HjZoWjPCMeGBUMIXOZDrLQ-1 X-Mimecast-MFC-AGG-ID: HjZoWjPCMeGBUMIXOZDrLQ_1774549070 Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-439a85832c0so81276f8f.2 for ; Thu, 26 Mar 2026 11:17:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1774549070; x=1775153870; 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=PcMqJJGPCLK+VRPcw/NPeynhXQGvPO9SUzIgJSMzXxQ=; b=mG6eZKcyzthQv+cEEXcHKzy48vo2Os9/l16Lj1agQOaD5NUCKQpJu/z+f1RlGKJmQA FAM2j5JDWAcYefN+LQdZ+KXkX6pVZASuLyr3WpT/F5B8MXDnP1i/ed+/CWg1E69MI/9p +vHL+WTTYLVYsnRmIBaV9/qO0zsFRd5tHeDpnRyWyHM1+FZEg0dspm67Fs3UHCi1BjKk nUXy+UQipNsurKc+9kpRMs02L71hOhQNL5H+08YOMds8Ueq/fXmfdXsnpXlHViaHI9d/ dV+U2EKmQ+8gMVx5qOaIoqtQGBGvfGerBO4NGASyjL8Uhcp3mr9M/W+TwB8DTv0LgeDb Elhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774549070; x=1775153870; 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=PcMqJJGPCLK+VRPcw/NPeynhXQGvPO9SUzIgJSMzXxQ=; b=afdLGqD4kCMRB8V4RCgxplSF8dhJuLxdLg8qf9lmDgA6Rax+BC2OnRcO0/5PQPS+qh xjJHsomhyBEapZFb4QH9r2rNKlEYJuegJC1ILX7X5y+UwsH3DKqZQQeAcI7AgExUu4+Z dsZx9Zbp6ivzSTOLqeS1X85Ki7rcIFsOF9K4fXNFRjNKpoSum0OdMu5RckwIbSHWY5+t fsVM+UevNhd8msdvRTrJof0p64whRmg4xDmhKwTvhEib1BhD8+0NYsIuN0OSW6c6WiIK r8sGKnl76/wNehr0IDE4QP8jTtfH0BPwLj4vZBzEhvYfTwz4C9Tz3sbo6Fl/wj7MKP6J JecQ== X-Gm-Message-State: AOJu0YyuN59NAh8tNNWNC4BkMPj3wt6aWsAysAb0Yo8ASJiqJFKznbVI BwyGi8iOb7XLazKLNkt4ABMcOXDnios8mFsL6cO4Of6CYj66Bja5s9ptOlUP3yOhOQ7VdhcYmeT We/fECS6egPPxXhnQgfPER9FhvxDttAq5bv+5Ck5s8yFWRjkSs7KNRJVdtjchZ6qTlu3ODu5ACi BKSxQ7tILfKjgU4IewLTOutd6Yg2J1/q3tZjgbbv9Oc0YvAmepKw== X-Gm-Gg: ATEYQzzi6EyKm1G2PFDxFgpXmZhvwDk/vjixVU4/CK11eK0AjGkQoLvbfmR1e5tr/Ja f5dIzyT+XpR0kkYvqGF4CcOAucBPYhBw0E1JT32banqtEpFj5DNsX5MhgQFkAaQDuowftAWO858 Z2JHUJ/t45r9yL20lvAFRBbOKDZHz1NylLHNvf8SjU+PE/uHI+aabxiZ+lrBTGVhxhQt094rRpv CTERBOZ2bJ82SX081bOccfbNHJ6PNPZZ4BjjhYUIRXnaLoEib8/W5QJ1C8aXlTBFnz0iEFXwAH1 C39TTjTlq7M8yr7K+I50HZYlVchQSWfUdyuofFiRqACy2r4rXcfB1xE7oALHzzMBrTfT6+pMFWZ xEBYILv0Y03zQdOyoULLOQSdxI5iwUNYC5vAfipc6E1hReekmKPgpSvE4eMqzTiQYDWss2U2BGg 9iQjLp+MCrsN86gcEF5z9gQ+np X-Received: by 2002:a05:6000:60f:b0:43b:3c06:c30a with SMTP id ffacd0b85a97d-43b889b2542mr13985149f8f.18.1774549069723; Thu, 26 Mar 2026 11:17:49 -0700 (PDT) X-Received: by 2002:a05:6000:60f:b0:43b:3c06:c30a with SMTP id ffacd0b85a97d-43b889b2542mr13985075f8f.18.1774549069217; Thu, 26 Mar 2026 11:17:49 -0700 (PDT) Received: from [192.168.10.48] ([151.49.85.67]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43b91942f24sm10449273f8f.11.2026.03.26.11.17.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Mar 2026 11:17:46 -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 09/24] KVM: x86/mmu: separate more EPT/non-EPT permission_fault() Date: Thu, 26 Mar 2026 19:17:07 +0100 Message-ID: <20260326181723.218115-10-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" 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 5f578435b5ad..dd5419a1f891 100644 --- a/arch/x86/kvm/mmu/mmu.c +++ b/arch/x86/kvm/mmu/mmu.c @@ -5553,7 +5553,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); @@ -5586,21 +5585,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) @@ -5608,7 +5610,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 @@ -5629,7 +5631,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.53.0