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 DBA9E2206B6 for ; Thu, 9 Jan 2025 13:38:29 +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=1736429911; cv=none; b=dxuU2nRM6tU8lJ8OvzmOBWDjxptixYAwvuvydIBpnUJy9O+ksdzzqSa1lYnKiPaVXRur+NTaxLz/SgwYy5rtBZVzInUQRdstoerklSte/fdVa90ocvBe7V4RE5FkT6ahhpU1JK1+sIEiTHpwg6EZ8o0Qjx9m+/O1N9i5c3XyEBs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736429911; c=relaxed/simple; bh=CLPtAWyQrS2entG2WH31BYmUD0uC+KITDZ/IYJGu0jo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HsDvAKEEqb5wWJYtZZdG845jfgjQH+WKIvFxFgR4u6OrVHX438QWapsXtxp/PDeqsdMZQXY6l/rGJVdOXzsH9f5Gy1NOrHy7dN2mTRP7rkX8vUNvyYWXYsiMQvyAQ78HA5E/pZw7qAu5RYf/qk59cb0MPdU3PV6dmIT4Rdk+lBc= 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=ah4vB9zC; 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="ah4vB9zC" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1736429909; 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=d/K9YNVS7ltWEgnQj5oYbH5hWmhcl5BqPq+/x8nLjmU=; b=ah4vB9zCMIN4sXm6v4oTotwD6aMbjDVFel+pdyp9co2bAtXdVF/mg09JJaD09g9VBvPfyE bscx3bXdDFWerlrNCoK3PTUvMhzasFf/CwRX6r0DOYeZfsTD9gfFj5S/Mb4/o9cgveVmCa Ya7TttXdOf9VsvPtbn3fE+cVfQt4GXw= 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-341-CX8rbxCGNd6N30jiiN9w0g-1; Thu, 09 Jan 2025 08:38:28 -0500 X-MC-Unique: CX8rbxCGNd6N30jiiN9w0g-1 X-Mimecast-MFC-AGG-ID: CX8rbxCGNd6N30jiiN9w0g Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-aa6a831f93cso104848366b.1 for ; Thu, 09 Jan 2025 05:38:27 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736429906; x=1737034706; 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=d/K9YNVS7ltWEgnQj5oYbH5hWmhcl5BqPq+/x8nLjmU=; b=UD14Qp/grO9ZlvcFHkTVK135ciud25zC8C5sWAjLxsapga7YdjbYNl4m5/wf+AoXIK ep/vI6UumpxvXcW6qrtUSwS1b9uQlw7QtE1e5zcrPGZJnqoui6Djz3UZW/b5ttmARk4W AdFnvFaL93vzBTwdpV5WG7m+MMfAOyvFQvctHP1yDzNWcQETvni79EvNKB8Rk3jrSLJx +VKGZBTNSyqMPPYpKId2MNpcq6aFeOv3HA0lB/wjaQOFMYPbCW4w3efMy6Xow+K+r7VQ IU2xVthuoIWFmxH9C7ehN3hrZ14xxF2oTgSl9A8p5CIiytBfCh6namkFmkIwnszuX/Ly kyzA== X-Gm-Message-State: AOJu0YxPBR7SEpEPBknIG7Vpd04pD/G+ilqZFpm1748dQFOXhfkuvUji FIqZzG8eYUa6bmGuCX3rlqSkZFix5Ua2VBDRAj0oVboD7aeQYfElCZ444adVr2N4s7XPfxkIbs+ l0xdqKZcsZMWRrsyyqLCV6o1o+9pz6FVNZ/98xsaMdLzkgxjLNjyT2Vh9gHSPP64Sk6ZUCBi9oP isIUmbalDUFJPRsX+X5/03BXrUAEoFwpd5XHqu/OfQDvqHJfYo X-Gm-Gg: ASbGncuggCNI2KwHeGjH72xyxlqRFB+4UgzXdNaFZPDOk/JITaTNwOJ4J9HMpLy5VU7 UOAfrKd3Pub4JaG7gooqD6/2rtTqu/uvCpYKZ+u/wRtw+ihKJke7fy6wZKghWMhxcHJGuxa/8aA nz7i2rTFaBhxbXU0lWx62s3T0WaCA/6IUzhHtr8D/SqjOJpWOjlH0Drj9WLrRz09K94jSPzndCz ZSzuzpciUAPewdR/UKqwhCcxOj2Lr8d0Ojo7/ng9XxpgkvI7LvAowee1B1l X-Received: by 2002:a17:907:94cc:b0:aa6:7cae:dba7 with SMTP id a640c23a62f3a-ab2ab6a851amr624678266b.4.1736429906084; Thu, 09 Jan 2025 05:38:26 -0800 (PST) X-Google-Smtp-Source: AGHT+IGTbBeYDIBQ3z954w6dfAEk3XY9Iu9HEUTdIMdZmv3AtPH2uw4HEV5T8fdkL1pcscV4BnFyug== X-Received: by 2002:a17:907:94cc:b0:aa6:7cae:dba7 with SMTP id a640c23a62f3a-ab2ab6a851amr624675766b.4.1736429905640; Thu, 09 Jan 2025 05:38:25 -0800 (PST) Received: from [192.168.10.47] ([151.62.105.73]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ab2c95648e7sm72802566b.95.2025.01.09.05.38.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jan 2025 05:38:23 -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 2/5] KVM: e500: use shadow TLB entry as witness for writability Date: Thu, 9 Jan 2025 14:38:14 +0100 Message-ID: <20250109133817.314401-3-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 kvmppc_e500_ref_setup is returning whether the guest TLB entry is writable, which is than passed to kvm_release_faultin_page. This makes little sense for two reasons: first, because the function sets up the private data for the page and the return value feels like it has been bolted on the side; second, because what really matters is whether the _shadow_ TLB entry is writable. If it is not writable, the page can be released as non-dirty. Shift from using tlbe_is_writable(gtlbe) to doing the same check on the shadow TLB entry. Signed-off-by: Paolo Bonzini --- arch/powerpc/kvm/e500_mmu_host.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/arch/powerpc/kvm/e500_mmu_host.c b/arch/powerpc/kvm/e500_mmu_host.c index 732335444d68..06e23c625be0 100644 --- a/arch/powerpc/kvm/e500_mmu_host.c +++ b/arch/powerpc/kvm/e500_mmu_host.c @@ -242,7 +242,7 @@ static inline int tlbe_is_writable(struct kvm_book3e_206_tlb_entry *tlbe) return tlbe->mas7_3 & (MAS3_SW|MAS3_UW); } -static inline bool kvmppc_e500_ref_setup(struct tlbe_ref *ref, +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) { @@ -251,8 +251,6 @@ static inline bool kvmppc_e500_ref_setup(struct tlbe_ref *ref, /* Use guest supplied MAS2_G and MAS2_E */ ref->flags |= (gtlbe->mas2 & MAS2_ATTRIB_MASK) | wimg; - - return tlbe_is_writable(gtlbe); } static inline void kvmppc_e500_ref_release(struct tlbe_ref *ref) @@ -493,10 +491,11 @@ static inline int kvmppc_e500_shadow_map(struct kvmppc_vcpu_e500 *vcpu_e500, goto out; } } - writable = kvmppc_e500_ref_setup(ref, gtlbe, pfn, wimg); + kvmppc_e500_ref_setup(ref, gtlbe, pfn, wimg); kvmppc_e500_setup_stlbe(&vcpu_e500->vcpu, gtlbe, tsize, ref, gvaddr, stlbe); + writable = tlbe_is_writable(stlbe); /* Clear i-cache for new pages */ kvmppc_mmu_flush_icache(pfn); -- 2.47.1