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 049741AF0CA for ; Sun, 12 Jan 2025 09:55:44 +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=1736675746; cv=none; b=SD1smz86/z2XhEJ3aI9sDZlxm6j7Swus7zLoLGl3pkHokASquWO8W1IyL+n3sA0IQIzmwu3GdMy07bHD2RBCQaGchoyxfVGt7+XQ63Gmf4tbzk6A+m7eSYXrI0Now3dXL7jTcPCKJdcT3wIkYn+WqyMHt4tPDfYXE5pstxm2lQs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736675746; c=relaxed/simple; bh=PYlVa2Y/YXHDakzTrdegPPAivF2UKPgqtms42a4RRMM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=f2qskWzaJgdbOld0xrsTCLc3YDiPzvxo4wfsjQEdGBbrLKh8nodXCNjwUUFRFFCWNGLReFU+2Qk20eqZ5j2qy+9DlsCKJ5OADtRpEF/jLmct1Eqy6ctAVe2VuqwKeBCRHKEl9+bgV7koc4wne96maoHNWlnh53SEoguhLuIR8Gg= 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=LoYm9RtV; 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="LoYm9RtV" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1736675744; 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=TZOi2vhUk9IqOWLL4VjvE3yvErD9voRzbqxDd4bb0e4=; b=LoYm9RtV4RrN6cw32qPGbNKo2ZZzdt6rvZFUEeHp1la1kcD3ObWCN9SeFNXNIVqNHNqXWb aR6F+IbY15OKEMFsNmcu+8AAWBHNTLtIvtec0d/G7YdyrC3z1f9BlkVu8apstA8pYGGJAH GErHwimyuVIt6eEvGcDKLeB/HXpG+uw= 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-61-DWYmZ12KNuaF0N4dOQDrxg-1; Sun, 12 Jan 2025 04:55:42 -0500 X-MC-Unique: DWYmZ12KNuaF0N4dOQDrxg-1 X-Mimecast-MFC-AGG-ID: DWYmZ12KNuaF0N4dOQDrxg Received: by mail-ej1-f69.google.com with SMTP id a640c23a62f3a-aaf8f016bb1so318041766b.2 for ; Sun, 12 Jan 2025 01:55:42 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736675740; x=1737280540; 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=TZOi2vhUk9IqOWLL4VjvE3yvErD9voRzbqxDd4bb0e4=; b=wbR2QknGVDrjy/3UCq7fN+lLzRKe4Eq5utEVnifyrhQGrGL6ZljhLDlaqgfki4vwZy yUbZYh0OJ9kWbDsu0HJ6Nh7xE2rD9jYNFmupdPIjz7Rd8ft8Z8LnMdgRAVh28kQFEGGz w9CEFSaP4xYss+/fV7qV3gGPRWxjaGv9Sj1CHCwXuxmyyxcMfJwzJDZRSL+1hAfi6AlW njMm9g0PH+/a4CphgY8PGl9WQNDXVjYxOyyAx9xdkIbB/WOdpLDengT5K61HAWnnaQbV 9+IncBVwFF4jeGWcMSzGHJB7qwaS1ZXc+cLFYoApX+jVj97hEmK2cntUXJy+q+LayPKT /Orw== X-Gm-Message-State: AOJu0YwEcDzH7NwBPD4Myo1Eu2HvIiqMIBXYUyUCDwCcA7NDOpLpdp88 vhktWXUF/SYqITdqrGmi5NwCzEeQ1a2dpZ8Eu7c2paIIX68WKG18JiywAoDt5AHEDdJwwYfFJqg 4nGamsLETuy2/Y1uq1og1ij6MPcM16np4yLKzeqxk6oIe4iCETemDyuqzj561MBrNg1aZL9n84x MR+aI8DNNRQAngAdBdxyNAj9XIWiqEDTyCIfPRXbcg2l0snEyG X-Gm-Gg: ASbGncvqLO1/MZe/bG05tRWq7R0XW+boo78QifV0XCCivM+Ynj3dfNsOLmcj38r+d92 Cu+/1mYvPEQts81XKMY4qtQreC0B289XN7g48FZPzPaaflDMvJwdIUnMp8JwTk7XCyhopcnN0Lg +ycSgnnjS2dk8cez0iZ+6ctJVnCx/wDKDQHgeeAKmghn9dC16NlSuYESzA9JRzm982cpVTMfq4O n93N+fu5C9tFQrJxvU5zGMpuiZv8LSSbHDFgSw5Z/suKxzGxPTU7QTqpZg= X-Received: by 2002:a17:906:f58d:b0:aab:f014:fc9a with SMTP id a640c23a62f3a-ab2ab703f01mr1331418766b.22.1736675739837; Sun, 12 Jan 2025 01:55:39 -0800 (PST) X-Google-Smtp-Source: AGHT+IGYiuGhI+4msFAOUKvZ179BJ3utaua0uWFviKs7CY/tGCvPWvPtqZvorhRWNQWYuMTsu6u8Aw== X-Received: by 2002:a17:906:f58d:b0:aab:f014:fc9a with SMTP id a640c23a62f3a-ab2ab703f01mr1331416766b.22.1736675739453; Sun, 12 Jan 2025 01:55:39 -0800 (PST) Received: from [192.168.10.3] ([151.62.105.73]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ab2e8c753fdsm226853266b.184.2025.01.12.01.55.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Jan 2025 01:55:37 -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 3/5] KVM: e500: track host-writability of pages Date: Sun, 12 Jan 2025 10:55:25 +0100 Message-ID: <20250112095527.434998-4-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 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 c266c02f120f..b1be39639d4a 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, @@ -487,7 +494,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); + 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