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 74EB8221DB6 for ; Thu, 9 Jan 2025 13:38:34 +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=1736429916; cv=none; b=Qa0PQHGUoy3fpqUCorLIo5MOnafUmLI6wJWOVntbl52kyaUCzNBbqaGVDrTvh3rMJ73eoZGdX4CdKMnfYeVyUoffz9AKszubWbBkH9J+BXJgCsqUih4dr7Z3cFEed6quWgzP8Ar5Lduvxs1zjw9dNWEZC3n6LZvRhi4bTCRVgrM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736429916; c=relaxed/simple; bh=sE3kc+9sHBVpfMHODBVRzxlEUWaM8pbPMewDEM8p2rI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XdqsSXI5kRVf73R71xGUZleITcU3+kBoLNbjDx2rrBZGF69F8lhGUmilvgkL06AooHJEsaYoJYLT05EoG52Y+GEls71f0Yi5wpyy+J7wnUFHIUN0FGHDNbDBadEaGDfLT+DSe7EcEmrc1ncJFqGXBKXFHg8objrP1v/L/sUxKac= 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=QKE1Ay+V; arc=none smtp.client-ip=170.10.129.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="QKE1Ay+V" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1736429913; 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=zguszej+6js0jv121He/RU1+H3xrJy3UeZApbWTSTbc=; b=QKE1Ay+VecMgpGXcDNjm0dlE2iC7LKG8tP4BPgqYnhTGP2gfTsyw363tiyv6c2ySNBHOCi dGoFnzCUGdH1LVhiL7wfPdE/yeB73vHtMWY58/Wo2M5KuvJv21UHrva4u9o9kZ1GKd+MqU xQQJvWpF1WCOVLcTMb2qb+gCXMXiZ74= Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-7-H_zu18MpPZq4l3EaIjUlFg-1; Thu, 09 Jan 2025 08:38:30 -0500 X-MC-Unique: H_zu18MpPZq4l3EaIjUlFg-1 X-Mimecast-MFC-AGG-ID: H_zu18MpPZq4l3EaIjUlFg Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-aafc90962ffso95563066b.0 for ; Thu, 09 Jan 2025 05:38:30 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736429909; x=1737034709; 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=zguszej+6js0jv121He/RU1+H3xrJy3UeZApbWTSTbc=; b=fpdyPk6fvjjcRKNF6UuHCmYGgNqYApkjhBNnPQ3QGzf2zr5tM2Z/HsvfxRkrBcjr1v CzCAzKEdzYyEKz9NPr6y+x8+cF9OWdl18oa2OoBl46MNsEy/hFBGPwFlYD3RPLgYq7me tSTxQnu+Q43r20nuMS0s5ZHXVcGZeS5NAIH+qSE3PfxY5dwzAYz0QvLIkP2Qlr29nSui RPRDYq5l8wbX8/DZMyYup04b51iph5leKgPq3V+IrBBk6w8ip4Omlh/5hwZ7UrxLLOvV iqututDoTidfhp8bsjb6wJWeSuZ/+B1FiE4jJFf6oMTfFNcTZxqAXZI/qXTHbIFmc5IH iBlw== X-Gm-Message-State: AOJu0YwL3xuwSAJy6cuy6PMdso3FYGs8cl8wvX6eN5lkNucddFp9BWuc /RRojlBRpFfljM4Pq0uVXCMUzONMkAXpkFkDfut/pXge6bezL9vBR2Izfrrh1x2MLo2yIss905g i2W8+lSjVFxshosJ5EkTe4avcprVS1HUhoQekDyfvj0v+7HGfsLO4EnSp7DcFUyy6eXkHMpgh2z D6Obsmv2ocBnR9eMcP6SEDitHUFs3Liw7mVBF/O7mpKAARXt1t X-Gm-Gg: ASbGncvuDb01TnlXSXNx9GXHUQ1dz6uC1Tl/C+mUUeL+8Xvx1maWZebsoZ10kJEAFrU /ubIP/vmZ3f46DBH6l2qLEcR5T8HfL77VlVqKFVyN3L9FOY103hEUlQewALs8rBRRGNFv1Q3iWP 9zq0ObEKGNOe9asZvUHwdvRMFQetTVL/etvT0y1Cuo1JLrKMENts2AsNg3z72RM3Reb1CjQXEm1 ohXCCApZzz2C2JvTI+elQCvKaV8xp0LjgtJ48o7i43w80BxnhRj64owyuct X-Received: by 2002:a17:907:724b:b0:aa6:abb2:be12 with SMTP id a640c23a62f3a-ab2abc91b53mr573668466b.37.1736429908713; Thu, 09 Jan 2025 05:38:28 -0800 (PST) X-Google-Smtp-Source: AGHT+IGo9tyQhMRCjTpqjQKY5ONk4yRTr2KDDRMNsirKe/0lHnxJJpvXbaOhKUZHyIFh2cUX8sdNHg== X-Received: by 2002:a17:907:724b:b0:aa6:abb2:be12 with SMTP id a640c23a62f3a-ab2abc91b53mr573664766b.37.1736429908325; Thu, 09 Jan 2025 05:38:28 -0800 (PST) Received: from [192.168.10.47] ([151.62.105.73]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ab2c95af187sm73137566b.142.2025.01.09.05.38.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jan 2025 05:38:27 -0800 (PST) From: Paolo Bonzini To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: oliver.upton@linux.dev, Will Deacon , Anup Patel , Andrew Jones , seanjc@google.com, linuxppc-dev@lists.ozlabs.org, regressions@lists.linux.dev Subject: [PATCH 3/5] KVM: e500: track host-writability of pages Date: Thu, 9 Jan 2025 14:38:15 +0100 Message-ID: <20250109133817.314401-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250109133817.314401-1-pbonzini@redhat.com> References: <20250109133817.314401-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 Add the possibility of marking a page so that the UW and SW bits are force-cleared. This is stored in the private info so that it persists across multiple calls to kvmppc_e500_setup_stlbe. Signed-off-by: Paolo Bonzini --- arch/powerpc/kvm/e500.h | 2 ++ arch/powerpc/kvm/e500_mmu_host.c | 15 +++++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/arch/powerpc/kvm/e500.h b/arch/powerpc/kvm/e500.h index 6d0d329cbb35..f9acf866c709 100644 --- a/arch/powerpc/kvm/e500.h +++ b/arch/powerpc/kvm/e500.h @@ -34,6 +34,8 @@ enum vcpu_ftr { #define E500_TLB_BITMAP (1 << 30) /* TLB1 entry is mapped by host TLB0 */ #define E500_TLB_TLB0 (1 << 29) +/* entry is writable on the host */ +#define E500_TLB_WRITABLE (1 << 28) /* bits [6-5] MAS2_X1 and MAS2_X0 and [4-0] bits for WIMGE */ #define E500_TLB_MAS2_ATTR (0x7f) diff --git a/arch/powerpc/kvm/e500_mmu_host.c b/arch/powerpc/kvm/e500_mmu_host.c index 06e23c625be0..e332a10fff00 100644 --- a/arch/powerpc/kvm/e500_mmu_host.c +++ b/arch/powerpc/kvm/e500_mmu_host.c @@ -45,11 +45,14 @@ static inline unsigned int tlb1_max_shadow_size(void) return host_tlb_params[1].entries - tlbcam_index - 1; } -static inline u32 e500_shadow_mas3_attrib(u32 mas3, int usermode) +static inline u32 e500_shadow_mas3_attrib(u32 mas3, bool writable, int usermode) { /* Mask off reserved bits. */ mas3 &= MAS3_ATTRIB_MASK; + if (!writable) + mas3 &= ~(MAS3_UW|MAS3_SW); + #ifndef CONFIG_KVM_BOOKE_HV if (!usermode) { /* Guest is in supervisor mode, @@ -244,10 +247,13 @@ static inline int tlbe_is_writable(struct kvm_book3e_206_tlb_entry *tlbe) static inline void kvmppc_e500_ref_setup(struct tlbe_ref *ref, struct kvm_book3e_206_tlb_entry *gtlbe, - kvm_pfn_t pfn, unsigned int wimg) + kvm_pfn_t pfn, unsigned int wimg, + bool writable) { ref->pfn = pfn; ref->flags = E500_TLB_VALID; + if (writable) + ref->flags |= E500_TLB_WRITABLE; /* Use guest supplied MAS2_G and MAS2_E */ ref->flags |= (gtlbe->mas2 & MAS2_ATTRIB_MASK) | wimg; @@ -303,6 +309,7 @@ static void kvmppc_e500_setup_stlbe( { kvm_pfn_t pfn = ref->pfn; u32 pr = vcpu->arch.shared->msr & MSR_PR; + bool writable = !!(ref->flags & E500_TLB_WRITABLE); BUG_ON(!(ref->flags & E500_TLB_VALID)); @@ -310,7 +317,7 @@ static void kvmppc_e500_setup_stlbe( stlbe->mas1 = MAS1_TSIZE(tsize) | get_tlb_sts(gtlbe) | MAS1_VALID; stlbe->mas2 = (gvaddr & MAS2_EPN) | (ref->flags & E500_TLB_MAS2_ATTR); stlbe->mas7_3 = ((u64)pfn << PAGE_SHIFT) | - e500_shadow_mas3_attrib(gtlbe->mas7_3, pr); + e500_shadow_mas3_attrib(gtlbe->mas7_3, writable, pr); } static inline int kvmppc_e500_shadow_map(struct kvmppc_vcpu_e500 *vcpu_e500, @@ -492,7 +499,7 @@ static inline int kvmppc_e500_shadow_map(struct kvmppc_vcpu_e500 *vcpu_e500, } } - kvmppc_e500_ref_setup(ref, gtlbe, pfn, wimg); + kvmppc_e500_ref_setup(ref, gtlbe, pfn, wimg, true); kvmppc_e500_setup_stlbe(&vcpu_e500->vcpu, gtlbe, tsize, ref, gvaddr, stlbe); writable = tlbe_is_writable(stlbe); -- 2.47.1