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.133.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 DB21B3DBD47 for ; Tue, 5 May 2026 19:52:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778010778; cv=none; b=OwrnXQOAwq5Fuo3hyLYuyMEWRsy6+SR2G3B+FP6s4PyVvANs6L7OC3I3Sh3DMHG7OT7sP6OzHFZorsQpm2GmSagIGsDLwAgSpz2vkh5gGJ2Di5VPbQdxicLNy3mu1AaHSKDCiSl3abJNVxfOy0+CRj/+hfLXCjZnW+fPdxfI9lk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778010778; c=relaxed/simple; bh=A+1lOYkdtnvg2SkTvtSOKColo3PwzJPGsi6uKT4HdMQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hzvlnTKpi0Z8wRlMZcVo7QNtpTqpPgy6hB8ETSd7oKDdb2ajqmK4pFaRv9ZXuWNgg7fl27W0d6AymWkeEnNfpAb+dz6TlyMyETRhTptXdKprv7GOrnblGcdA9Uyw1WEG3ngtYkm/hR+mTAGH3G2YL9CHyQKoZ5a2WzTBveZukaI= 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=Quo6P803; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=gLM5EYn1; arc=none smtp.client-ip=170.10.133.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="Quo6P803"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="gLM5EYn1" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1778010773; 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=V476EO8yuC0CrlvdRRJREdNPE2It58vwHqgvy1pOsNo=; b=Quo6P803fYHzZj/Y/yXK+O2hdFF1ZY2PtmmjHhx3UrbPlgAI5tCf0KkKL0uwmdwzen6Ubg NAehNCDNEbUqLS/qKB/xXDHFRBsTcP+OATMZDCvhFjXz/kbdoEbnDoS081BMPzSo2ZbcN0 H485MYgU64yj7i0ONyKufliZsHAb6jw= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-456-UzSjL0oiMJ-10xKyCLxYnQ-1; Tue, 05 May 2026 15:52:51 -0400 X-MC-Unique: UzSjL0oiMJ-10xKyCLxYnQ-1 X-Mimecast-MFC-AGG-ID: UzSjL0oiMJ-10xKyCLxYnQ_1778010771 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-4837bfcfe0dso70675565e9.1 for ; Tue, 05 May 2026 12:52:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1778010770; x=1778615570; 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=V476EO8yuC0CrlvdRRJREdNPE2It58vwHqgvy1pOsNo=; b=gLM5EYn1pwQfiNAPU55JFNYoocpmLz4SjOrjMT5Rex6W4DxuWZmMY6u6/25M1rCTHn wWW2koO/3z4cqZiagO6u8y3p6JtkW2A89zLBVLVRRn16wk9LDMQZ3vdP6vwcSC6cMDkJ B3kLGu6sF3yCRGwLf3CX7VS/qISPMzEX9kTC+2wCJlshUL+e2odSCe9QTwnCba5unSqt rnCVCPmdv+gqexhtNguct28LsTxlDXPo844ogNucIhEmE+K0MqsAAq0mBe3AiMmJYu5x qwCu9lEpbiZgRuMiC5VhtXqDAoEa0DPBV7EO6a8RUK63KaQb4fr2fI3YZMOuWUle+VFs Q7ww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778010770; x=1778615570; 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=V476EO8yuC0CrlvdRRJREdNPE2It58vwHqgvy1pOsNo=; b=UPkHgDFu34RoOp2CvXYArO901od4tHDZgcgXolHXFf3Ev3ci9cp+Gron5TGypNQ38u 8jTsjrUM16a8H/dSapGMX0dPFL5GEW+WGjqpIFz8fgKphSx3XONNyUCRit0oUEO5OiRJ OXctsRE4/J3nEe2Cgh1c8LKbaILtSXm6T591yZqqYs6iqZ1oGmHDkwBLbNNrg/JT5rqK w3gIvjKdKsONfbf980pMm71iTF+VTtfyAF28eerg03+FcqbCWc4YrRfcvPkKVBe0IAPu uR2o5TyM+2Ekg6ewo7Xcj7+oFlkhkwXQ0TRuWJoq4OsTGEB2zaXTDHBBbY5+XVBMcQAq u7zw== X-Gm-Message-State: AOJu0YxBHNfxob6X4ESSgxx+duC8h2SXBwYyj1+rMgK5iTloBXJUigGV x/N3PH5SrHYRCjno7s9jl0ux/BsjGFgcaPnRhG0KJRttWl3IG/VNASTkDXmyJAjivg9IoNBSLfl kfSq2W4C0vfLLf01xnXRRXSIl7ZMEO1gjq0qSGDt0ECZ0oeEu/w0nZKjubmRZVAX23DSzJnxMhm rsPIEJDqQfxc8QrGEQVcDeQumFXnociTLu8PrxYHsRE6hrpvnziA== X-Gm-Gg: AeBDietDbEi741+bOhJXSSyOufPJwZuNKFPfKS8u8UVipH1QJg7oaCXS0O5qwnSrf0Y SiFqDG8t3je01uWtSVWyWluoO+AIQW0XFqvRt9BE/lN/RblcpeJrwsLmArHq8D8RqKBnwl8o8uw B/xpnRWpzRP33ZgAvRik27d906EuXBtNqz6sWjxW9AH+i/jxXcQdtw6nBL4E2IP6pnxnZnkWXJi BIV5bKaKKTVui5o+IUBcw2r3jjL+mjHK/d5yNO0NRVPveKmboQij2/VX21ckWIV1r6zbXg5mONz rQMZuKPxDTlBbnQieMX5wpd/mwXdEEJOHLhe518OX7pxBVgvZ2PDFag5l/hIHliDrt6AIYRvkp+ Xr8G4A0MhMBFWM3SJ5dKAEwpbCtGXXJtlsOy5zSWXGhR+2hWbX9trKOADw+uksfXmBBcIvT1JMZ VDVMqDqAflrgTB9VSXVI6vihZZucMo5qfc+chJSoo= X-Received: by 2002:a05:600c:a10d:b0:48a:563c:c8e0 with SMTP id 5b1f17b1804b1-48e51f21e7bmr8375975e9.1.1778010769787; Tue, 05 May 2026 12:52:49 -0700 (PDT) X-Received: by 2002:a05:600c:a10d:b0:48a:563c:c8e0 with SMTP id 5b1f17b1804b1-48e51f21e7bmr8375705e9.1.1778010769349; Tue, 05 May 2026 12:52:49 -0700 (PDT) Received: from [192.168.10.48] ([176.206.106.181]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48a82301b7bsm496832835e9.11.2026.05.05.12.52.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 May 2026 12:52:47 -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 08/28] KVM: x86/mmu: separate more EPT/non-EPT permission_fault() Date: Tue, 5 May 2026 21:52:06 +0200 Message-ID: <20260505195226.563317-9-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 Move more of EPT handling entirely in the existing "if (!ept)" conditional. Use a new "rf" variable instead of uf for read permissions for clarity. Merge smepf and ff into a single variable because EPT's "SMEP" (actually MBEC) is defined differently and does not need smepf. Tested-by: David Riley Signed-off-by: Paolo Bonzini --- arch/x86/kvm/mmu/mmu.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c index d94a488db79d..fc34536c536b 100644 --- a/arch/x86/kvm/mmu/mmu.c +++ b/arch/x86/kvm/mmu/mmu.c @@ -5584,24 +5584,28 @@ static void update_permission_bitmask(struct kvm_mmu *mmu, bool ept) * that causes a fault with the given PFEC. */ + /* Faults from reads to non-readable pages */ + u8 rf = 0; /* Faults from writes to non-writable pages */ u8 wf = (pfec & PFERR_WRITE_MASK) ? (u8)~w : 0; /* Faults from user mode accesses to supervisor pages */ - u8 uf = (pfec & PFERR_USER_MASK) ? (u8)~u : 0; - /* Faults from fetches of non-executable pages*/ - u8 ff = (pfec & PFERR_FETCH_MASK) ? (u8)~x : 0; - /* Faults from kernel mode fetches of user pages */ - u8 smepf = 0; + u8 uf = 0; + /* Faults from fetches of non-executable pages */ + u8 ff = 0; /* Faults from kernel mode accesses of user pages */ u8 smapf = 0; - if (!ept) { + if (ept) { + rf = (pfec & PFERR_USER_MASK) ? (u8)~u : 0; + ff = (pfec & PFERR_FETCH_MASK) ? (u8)~x : 0; + } else { /* Faults from kernel mode accesses to user pages */ u8 kf = (pfec & PFERR_USER_MASK) ? 0 : u; - /* Not really needed: !nx will cause pte.nx to fault */ - if (!efer_nx) - ff = 0; + uf = (pfec & PFERR_USER_MASK) ? (u8)~u : 0; + + if (efer_nx) + ff = (pfec & PFERR_FETCH_MASK) ? (u8)~x : 0; /* Allow supervisor writes if !cr0.wp */ if (!cr0_wp) @@ -5609,7 +5613,7 @@ static void update_permission_bitmask(struct kvm_mmu *mmu, bool ept) /* Disallow supervisor fetches of user code if cr4.smep */ if (cr4_smep) - smepf = (pfec & PFERR_FETCH_MASK) ? kf : 0; + ff |= (pfec & PFERR_FETCH_MASK) ? kf : 0; /* * SMAP:kernel-mode data accesses from user-mode @@ -5630,7 +5634,7 @@ static void update_permission_bitmask(struct kvm_mmu *mmu, bool ept) smapf = (pfec & (PFERR_RSVD_MASK|PFERR_FETCH_MASK)) ? 0 : kf; } - mmu->permissions[index] = ff | uf | wf | smepf | smapf; + mmu->permissions[index] = ff | uf | wf | rf | smapf; } } -- 2.54.0