From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f74.google.com (mail-wr1-f74.google.com [209.85.221.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6894C3E7BCE for ; Fri, 17 Jul 2026 13:09:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.74 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784293749; cv=none; b=XXjtllncmkHcwRWKTKS8mUto1Gd48twALcMYaqMD1m67alxbxupFmYeGtr8ZdZzvh+jhu6fGmiIkUvqFho2ZzPq5Xk4p/ERBH6Zfz+iod2ZEMH/TUooXl4EY7rvd93VuH7bPa4gM1xmMrzF6+KAo8B4ljAce5cVBo6A8RD2fbho= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784293749; c=relaxed/simple; bh=8bWbCVTmqjsdXLL+5FJBNFKc14o//Ho5EEc1NgDWZ00=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Dfkasv1EEGQ29hQFzOAPoEKrfSBsNI1HWFILe3b1fYrwtARbWrdLvMukQKXbCuEp1VA15nXySbz00k9HoHig30x4fVJyPo3ST8RZMwu2L8bze5gxQQboq6zSSjeRdZp8dbCIf+qXboqlNVju8MCLJ2rZLcL5+iZE8LI42aFNQ/o= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--smostafa.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=MDb4IhYo; arc=none smtp.client-ip=209.85.221.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--smostafa.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="MDb4IhYo" Received: by mail-wr1-f74.google.com with SMTP id ffacd0b85a97d-475e540a0ffso4574252f8f.3 for ; Fri, 17 Jul 2026 06:09:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1784293747; x=1784898547; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=VImkqaBVxIups1vL1ulSnRZBEUIJVUK8xJrNhCCDu1A=; b=MDb4IhYoVhzpvm740ORwIPsZ2RySDgar+4qRnNe0JbEiepAYUDLByn0pCOgjLCTC3z kJn4x7vPcDpU1GDbCG362mvx1UI7ZG0sQkGDJLzrxUEXxsf3SBFKNPZGjYa/DZjydyI8 MKgveHL3Ezdz9SApLExt9ffKk+4QnrTu4177DZNJ0KpbKYhnIrdh0FGaZMFP379I0+H8 3qB9qQ4BZ6dxw1I9fdLstepgh5Kz2V6IvdPFNGJIrY16AdoALovrMtHFXwLbvZnHO3eH P1ya0/eeLmsEHKqw/zNcZozlrPYzMWaCJD9KKKNk7u64C+tLFPgTuflzb8ddZFIkUVk8 tCAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784293747; x=1784898547; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=VImkqaBVxIups1vL1ulSnRZBEUIJVUK8xJrNhCCDu1A=; b=apbMgF1thgoCO0EzicGnwBZkpDLawkLvVINcCN6nyGA01SshpMj3iSee92moSur19W uPX07xL3IifCg/qhIs1Bny2UTvjxxK5vmM1SQ3jvMYj2ghWEwAtbL/ZtkT2tfjaySRgL If453bImXOnBK3JNxJqkIGIbuF+9ExOt4lH/oOYQzVfDBqjxEWPnCHporkofabpmh9Bd Z/3c415eoJeEyL0JYzFpO737D+gItciiINe84h0oBBMJK/Nu0BBOEn0L8TF3qVmvLqE+ G6Uzb/g2uQanRygTP1n9WTcSKm41OttLEj27G9L7i2kA2icTnvT2EOftDJ8mx7PqAXN5 Pa/g== X-Gm-Message-State: AOJu0YzZJaS1cvpmQtVJnf9sNgAXLIQ0vEree78dWOhtiggFAe8lh54B W/W2afat0qzSqVf6UiJVtFkJgzy1qVUCnbiW6mbtCJ+Z+ksI7wkAmiAH/Ckk7tHsVhyXaVsV8Eu eTYtlSmjkFCxnOn+LvcqoIPJ8Jtbgvd1uSk/6d1X8QW918hXYIEiVsv4V4NG6ciLEo1Fv7p02Bq Ao+7JnCpFiK9ejH9ftysp0nkqQstYrAG038HPPJ5Pzbyp2WKoVmsT9v7s= X-Received: from wrpk9.prod.google.com ([2002:adf:f5c9:0:b0:460:d09:f6ad]) (user=smostafa job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6000:25f0:b0:476:dd2b:611 with SMTP id ffacd0b85a97d-47f623049e7mr3779169f8f.3.1784293746031; Fri, 17 Jul 2026 06:09:06 -0700 (PDT) Date: Fri, 17 Jul 2026 13:08:59 +0000 In-Reply-To: <20260717130901.2239134-1-smostafa@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260717130901.2239134-1-smostafa@google.com> X-Mailer: git-send-email 2.55.0.229.g6434b31f56-goog Message-ID: <20260717130901.2239134-2-smostafa@google.com> Subject: [RFC PATCH 1/2] KVM: arm64: Add stage2_clean_old_pte() From: Mostafa Saleh To: linux-kernel@vger.kernel.org, kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org Cc: maz@kernel.org, oupton@kernel.org, seiden@linux.ibm.com, joey.gouly@arm.com, suzuki.poulose@arm.com, yuzenghui@huawei.com, catalin.marinas@arm.com, will@kernel.org, vdonnefort@google.com, tabba@google.com, Mostafa Saleh Content-Type: text/plain; charset="UTF-8" At the moment, the pgtable code rely on BBM in SW which looks like: Break: stage2_try_break_pte() 1) Break PTE and lock it 2) TLBI 3) Put the ref on the old PTE Make: stage2_make_pte() 1) Get a ref on the new PTE 2) Install the live PTE With BBML3, the sequence will look as 1) Get ref on the new PTE 2) Install new PTE 3) TLBI 4) Put the ref on the old PTE Which requires moving step #2 #3 from the break function to the make function, although it is possible to do that for SW BBM also, that means the stage2_try_break_pte() did not fully break the PTE as it is referenced in TLBs, although that works it seems fragile. Instead, move this logic to a new function stage2_clean_old_pte() that can be called from BBML3. Signed-off-by: Mostafa Saleh --- arch/arm64/kvm/hyp/pgtable.c | 67 ++++++++++++++++++++---------------- 1 file changed, 37 insertions(+), 30 deletions(-) diff --git a/arch/arm64/kvm/hyp/pgtable.c b/arch/arm64/kvm/hyp/pgtable.c index 91a7dfad6686..127b7f9541b1 100644 --- a/arch/arm64/kvm/hyp/pgtable.c +++ b/arch/arm64/kvm/hyp/pgtable.c @@ -810,39 +810,10 @@ static bool stage2_try_set_pte(const struct kvm_pgtable_visit_ctx *ctx, kvm_pte_ return cmpxchg(ctx->ptep, ctx->old, new) == ctx->old; } -/** - * stage2_try_break_pte() - Invalidates a pte according to the - * 'break-before-make' requirements of the - * architecture. - * - * @ctx: context of the visited pte. - * @mmu: stage-2 mmu - * - * Returns: true if the pte was successfully broken. - * - * If the removed pte was valid, performs the necessary serialization and TLB - * invalidation for the old value. For counted ptes, drops the reference count - * on the containing table page. - */ -static bool stage2_try_break_pte(const struct kvm_pgtable_visit_ctx *ctx, +static void stage2_clean_old_pte(const struct kvm_pgtable_visit_ctx *ctx, struct kvm_s2_mmu *mmu) { struct kvm_pgtable_mm_ops *mm_ops = ctx->mm_ops; - kvm_pte_t locked_pte; - - if (stage2_pte_is_locked(ctx->old)) { - /* - * Should never occur if this walker has exclusive access to the - * page tables. - */ - WARN_ON(!kvm_pgtable_walk_shared(ctx)); - return false; - } - - locked_pte = FIELD_PREP(KVM_INVALID_PTE_TYPE_MASK, - KVM_INVALID_PTE_TYPE_LOCKED); - if (!stage2_try_set_pte(ctx, locked_pte)) - return false; if (!kvm_pgtable_walk_skip_bbm_tlbi(ctx)) { /* @@ -862,6 +833,42 @@ static bool stage2_try_break_pte(const struct kvm_pgtable_visit_ctx *ctx, if (stage2_pte_is_counted(ctx->old)) mm_ops->put_page(ctx->ptep); +} + +/** + * stage2_try_break_pte() - Invalidates a pte according to the + * 'break-before-make' requirements of the + * architecture. + * + * @ctx: context of the visited pte. + * @mmu: stage-2 mmu + * + * Returns: true if the pte was successfully broken. + * + * If the removed pte was valid, performs the necessary serialization and TLB + * invalidation for the old value. For counted ptes, drops the reference count + * on the containing table page. + */ +static bool stage2_try_break_pte(const struct kvm_pgtable_visit_ctx *ctx, + struct kvm_s2_mmu *mmu) +{ + kvm_pte_t locked_pte; + + if (stage2_pte_is_locked(ctx->old)) { + /* + * Should never occur if this walker has exclusive access to the + * page tables. + */ + WARN_ON(!kvm_pgtable_walk_shared(ctx)); + return false; + } + + locked_pte = FIELD_PREP(KVM_INVALID_PTE_TYPE_MASK, + KVM_INVALID_PTE_TYPE_LOCKED); + if (!stage2_try_set_pte(ctx, locked_pte)) + return false; + + stage2_clean_old_pte(ctx, mmu); return true; } -- 2.55.0.229.g6434b31f56-goog