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 41F801B0F04 for ; Sun, 12 Jan 2025 09:55:46 +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=1736675748; cv=none; b=V9W7hAzW+MJUtEamJZSA2ZuD1z0XytrQjtMYkXaap/nwpaeVqpcLFHExKANIBhSOaOgX2Hbpqrk1xUjtVDcuXDVx7lPqiQIiTkfKL5tSIeDQ6+r0OtFjp5c72HIoZVtL2xkbHdr8OEXyk1+elD7IHpIOmbRNN3PUJ3PYkEkBZuE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736675748; c=relaxed/simple; bh=2SDn49FT0scN9brUsaT1uzAqhvETvcU7A9zYxcIRZEU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lvfOJF86ZTh7GWE7JxXlYmyFJon7KBs+FcEj6b45v/2x3E1vbKRZ+Da9gT+1HujlugwOwaYpalE+tlhCyq5OHiDHw3z+1alxq3BtDD+ejx2kEfDdXp1uyvs9lIUYLWY20pkEressK5nMbzWdA45xnmh2kB6ZpbqpEYmUc6OYA2k= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none 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=OBoMJWZk; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none 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="OBoMJWZk" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1736675746; 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=53tOW+li8LibaZME0FEdug9t3b3VYRiHfAOklFpMuVY=; b=OBoMJWZkdwyDhNJsV0PZYmWQsASDwhRFLPZSSePk2zxoXwJYjyCyhcB7gq7HIuDqgSNiC5 yC0KxiiwRatQkFDxcAIHoUu3yiXveetcDiUBz3a4aRu0IAnLLa3ZaSs/7DIFTzl0+DKPgi fDjF4tO0Y/hjZo/Sk0EUbK9gSPa2bhs= Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-528-3t3gc32eO7Oe7ng13PhumA-1; Sun, 12 Jan 2025 04:55:44 -0500 X-MC-Unique: 3t3gc32eO7Oe7ng13PhumA-1 X-Mimecast-MFC-AGG-ID: 3t3gc32eO7Oe7ng13PhumA Received: by mail-ej1-f69.google.com with SMTP id a640c23a62f3a-aa68203d288so355138066b.1 for ; Sun, 12 Jan 2025 01:55:44 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736675743; x=1737280543; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=53tOW+li8LibaZME0FEdug9t3b3VYRiHfAOklFpMuVY=; b=uR7VCvyzVSL/23IFQzxE0+Azoc220bpvA2Oj2Ay5x14lH3v+6hbo4YQrSZ8dRp1cqQ BUqlMRoV8p+KArz8l+9VgSJP28vKSC1fCtYdvpHT32lM/vLE5vVeXgsxq9q87jJLlXQB XhqezUea5bCYFHdIVUKYr5+1nviFTbXhMsNOq5p4wfpVOsUhi5d0jF7nQzWPKA5SObzU Wx5W02YvZEE4Hpu8QzIdt4IYVGAyHc8zl2EX4//mrWuoKxUTYFctXP/RoPESzkygxDFD h85sz3RhlhXqlGSSswusEO8ev4DRt+63SfT6oqf8wMC2kcVTcVFGx7cyKAyVwg6Q75yz qFiw== X-Gm-Message-State: AOJu0Yz0L549Q6IFs1c+PSnWHv+b2Oaki+T4ZfiRP6Izln/r2KCvQGRf UK+IUIocVJvF0nG4ta7SQpuZx0O890tRjMDnXMbS3Wcl+sWHViR8iSN5D+ANfPUu18/3FaHTP7Q 0NSjougd2sO/MBhqPYism8KuiHF0aOfS/5M2vkDdtwLQXrz1J10SJRegp9LtjP9J+Fnk7mL1uh5 Z8jmN8tZJivvP7rReNpmbmyyT/IN9dnLldVjcsAMtZV2ySsNmH X-Gm-Gg: ASbGncvQ8jmx3NvLlxXTL5oIjN0bBbxINsCWyS4EA4xjnF3mODai6Mr07aOMdolNsMt hkFFIaFiRS3RIUwP+H2tAmYu39PKeTYjuk+Cxz/aaZbCBJ+p6eG9VmXzDzqc93tTS++Q1mM6vGQ b5cXmL1mYU2dMCu3iF1DTSz2glLlWUNTu680My+0XKlSlSv5Mc9w0yC5RKkpQLOngU3Iew6N0YZ bq9jBkGB5eGnsLkHZx7+ZzpDT3BOuirf+5qeT+cSoe6IkzCUkMNuW6vess= X-Received: by 2002:a17:907:7f1e:b0:aab:c78c:a7ed with SMTP id a640c23a62f3a-ab2abde30a8mr1561037866b.49.1736675742937; Sun, 12 Jan 2025 01:55:42 -0800 (PST) X-Google-Smtp-Source: AGHT+IFGJlu2i7msf3zvSzymzm23VI3HB+hujDx3jJa79Xm9BhmbLM60jNLT6BqjxStf0JBpA+edAQ== X-Received: by 2002:a17:907:7f1e:b0:aab:c78c:a7ed with SMTP id a640c23a62f3a-ab2abde30a8mr1561036366b.49.1736675742572; Sun, 12 Jan 2025 01:55:42 -0800 (PST) Received: from [192.168.10.3] ([151.62.105.73]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ab2c905e2ebsm363088866b.10.2025.01.12.01.55.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Jan 2025 01:55:40 -0800 (PST) From: Paolo Bonzini To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: seanjc@google.com, linuxppc-dev@lists.ozlabs.org, regressions@lists.linux.dev, Christian Zigotzky Subject: [PATCH 4/5] KVM: e500: map readonly host pages for read Date: Sun, 12 Jan 2025 10:55:26 +0100 Message-ID: <20250112095527.434998-5-pbonzini@redhat.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250112095527.434998-1-pbonzini@redhat.com> References: <20250112095527.434998-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 The new __kvm_faultin_pfn() function is upset by the fact that e500 KVM ignores host page permissions - __kvm_faultin requires a "writable" outgoing argument, but e500 KVM is nonchalantly passing NULL. If the host page permissions do not include writability, the shadow TLB entry is forcibly mapped read-only. Signed-off-by: Paolo Bonzini --- arch/powerpc/kvm/e500_mmu_host.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/kvm/e500_mmu_host.c b/arch/powerpc/kvm/e500_mmu_host.c index b1be39639d4a..b38679e5821b 100644 --- a/arch/powerpc/kvm/e500_mmu_host.c +++ b/arch/powerpc/kvm/e500_mmu_host.c @@ -374,6 +374,7 @@ static inline int kvmppc_e500_shadow_map(struct kvmppc_vcpu_e500 *vcpu_e500, unsigned long slot_start, slot_end; pfnmap = 1; + writable = vma->vm_flags & VM_WRITE; start = vma->vm_pgoff; end = start + @@ -449,7 +450,7 @@ static inline int kvmppc_e500_shadow_map(struct kvmppc_vcpu_e500 *vcpu_e500, if (likely(!pfnmap)) { tsize_pages = 1UL << (tsize + 10 - PAGE_SHIFT); - pfn = __kvm_faultin_pfn(slot, gfn, FOLL_WRITE, NULL, &page); + pfn = __kvm_faultin_pfn(slot, gfn, FOLL_WRITE, &writable, &page); if (is_error_noslot_pfn(pfn)) { if (printk_ratelimit()) pr_err("%s: real page not found for gfn %lx\n", @@ -494,7 +495,7 @@ static inline int kvmppc_e500_shadow_map(struct kvmppc_vcpu_e500 *vcpu_e500, } local_irq_restore(flags); - kvmppc_e500_ref_setup(ref, gtlbe, pfn, wimg, true); + kvmppc_e500_ref_setup(ref, gtlbe, pfn, wimg, writable); kvmppc_e500_setup_stlbe(&vcpu_e500->vcpu, gtlbe, tsize, ref, gvaddr, stlbe); writable = tlbe_is_writable(stlbe); -- 2.47.1