From nobody Fri Jun 12 20:19:56 2026 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 9B0753AF646 for ; Tue, 12 May 2026 20:35:51 +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=1778618153; cv=none; b=WK1gjrz+hhHzRt9IcgIrw4ApHcaxb2KYTYQb6J1bhDXsZsAFcH9UtnelbtjJXA0lzm3qKlsGfjvjQy1alZl/fVitF9/0i6Fnz97biv1u+xV9tdaioBknwdwllyobn/rczZgf7CmSZetPhyfHfcE4oMDHf6EXHXc58iB1zrZkp0k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778618153; c=relaxed/simple; bh=+8qmKSsyhkP8Jf/LfnIW3AabMKgsYWSoMF/pmOjlCX4=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=o5eLlYyIbmDoPpfHprAFKqUrH+KbI2AiwPXeIAb+f00SwsOxNoaagcwfIS3gLbGM0nf+gV9gXlQ4AO7qM/OGnb/nma6iiVmbJRdCSHZbscDphz/SJ+Eyeb6nTYeqB6z9ePD/szTNjGwdZWRH6fWrKCSl2H00joFH6iZbt1zs1TM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine 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=MVJI2Hc8; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=iKARRKii; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine 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="MVJI2Hc8"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="iKARRKii" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1778618150; 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; bh=ztOyQwPRhqqvpgfjevxzRoq+AUcMk4Pm33VrGDd3SiY=; b=MVJI2Hc8niy7pGGRidwGJeHc5QhuXazi9jUsV4WlffiMFYNTUzJ0Ey2cOkaEitz7jUqwiL fNcTBQavifhPdDQVtZBDjM+tyQBrkK7T8I7b+hXgTGt7aKQWnza+R9jEe6wynIE6DFozFr 9ECLZjpN+IKlgC8wVh0Ug6M2gWDomno= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-554-3tqptif4MXmALR5Y6oSvzA-1; Tue, 12 May 2026 16:35:49 -0400 X-MC-Unique: 3tqptif4MXmALR5Y6oSvzA-1 X-Mimecast-MFC-AGG-ID: 3tqptif4MXmALR5Y6oSvzA_1778618148 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-44d79da8cf7so5547081f8f.2 for ; Tue, 12 May 2026 13:35:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1778618147; x=1779222947; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=ztOyQwPRhqqvpgfjevxzRoq+AUcMk4Pm33VrGDd3SiY=; b=iKARRKiiNbJTlTdjfWqu03brJkSXMfcSDLyFTfFZaiAXLQ0vK5nMe1i+4r4GKmuOg6 zXSUzXB6oJUWNIdsb5FYkPtzwTW6hm2SUZd1JXRlRJFZ+BwsalcuCpRNl3IbYvXxXebQ t+7XQEV9DB9R1iTK3uzS8DkcENWqE0Dq17RKBb02RhXVTEcFzPg93G/JYrK7yZTJ5x8w Qlk6pOk/o+2w63bONKTLJ+Ng84ftHSBoREO+wjgK/FtubeQ5A3rnptneD6kquBYX71Io 37n86ynEWRN7PCysZB7K7LxL9mw9695jeDlTwjzwVUWRsttBs40tSzQ1CjlTvS60s4SN K/1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778618147; x=1779222947; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=ztOyQwPRhqqvpgfjevxzRoq+AUcMk4Pm33VrGDd3SiY=; b=Pz98do/0w31EHmy9cj97EXITFKmqjYup8KHYyg9/a4+fdF4puM9OKMhdj5Vwel6D/f 6bxNkkursKLrjrptPkqrVu5+iNw3cYL8PE+odV0t7+wLKFHXCwcSXn1BOdjhZZ6hSbAW 2nJ2F4+mP1/lWE/EjaQnxMY2gHygKbbITkI2DEfU66DwmxDNs7h9GQaV9Pzy4O2m0P3m 3gU75TKAHhleEx5WijChf+v+CYVHwVk/93sGo7yYNeY3i3P8WiCNtLDSdBSyLYmaHn66 r5SS0ebRqsXMBpSKBa0+6Q4vlFYUVl26bOfrzvU76UeRV97l29NzNSgWsSV+P2goWPIQ Zwfw== X-Gm-Message-State: AOJu0YxjQUFJfvTg3/ynLNKOZPCMb0qsKJPsk61noDM3pZcFYgTJ4JIj MQkp9Cn6bFYrAiipzYmiFQOCmNZL0EdBJC6lJlyPwmukNoRTB8VpuWHfyP9AKPyCgPhK4SGuXap 9NXgjFtUJUBb53KXpPWZJgBT54/Dcebb//xarabQBT07GGp1fvoTgf2BbFnd2lu9lrHy30NqGsI lxfFaGyYGsnsuL1hjO2KxBVs4buO+PWUbSiV/Bvp4cGFbrzkIDgg== X-Gm-Gg: Acq92OFBXOF5AglwaVKQnt9BVO4bJGbSx1QDO4AR9J+MWOSc5AxUo16B9g+PHj7a0n4 linsEzl5JPVoF5NlCJRTLBjQ9GICcfYP7GMN+u7zxuPCzeCjmG3CQThnZ1fzjiMvjhFgfVSXNOt pL1VKCfrqHPN3jwRGu4eKZrHG0jm+APLi4+uUJuTZXac7knjlqRIG9R9N0x9rGjRjUiFQ1v35Td 2KBsKddPC5XlFEBJta8UeN6casJlLTVzTtVGHBPeIZ2brcJ1x7Wm1cMiRVOwPYJGkIDPvqxvm7f gxbO1DDgSL6jSGELltHrv9mFgUJseo7VCrdzaNW0Oujs4KSEuYylk1F6akhv46G4FSgH8MrKOat IPteK1K6g2TfQJO3VNetVu/LoUBEES1FHP0wsLNQ2B/pUngaAaOGVjuoGwyFnbY/XHeIS+glKlY gE1ysZPAkMqAo7uWAx5N8RWFf97neF X-Received: by 2002:a5d:5f51:0:b0:453:f951:4e5b with SMTP id ffacd0b85a97d-45c584a86acmr429445f8f.13.1778618147224; Tue, 12 May 2026 13:35:47 -0700 (PDT) X-Received: by 2002:a5d:5f51:0:b0:453:f951:4e5b with SMTP id ffacd0b85a97d-45c584a86acmr429411f8f.13.1778618146799; Tue, 12 May 2026 13:35:46 -0700 (PDT) Received: from [192.168.10.48] ([176.206.106.181]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45ba2aaec3asm5293703f8f.15.2026.05.12.13.35.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 May 2026 13:35:46 -0700 (PDT) From: Paolo Bonzini To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: seanjc@google.com Subject: [PATCH v2] KVM: x86: use again the flush argument of __link_shadow_page() Date: Tue, 12 May 2026 22:35:45 +0200 Message-ID: <20260512203545.3031339-1-pbonzini@redhat.com> X-Mailer: git-send-email 2.54.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Except in the case of parentless nested-TDP pages, mmu_page_zap_pte() clears the SPTE but leaves the invalid_list empty. In this case, using kvm_flush_remote_tlbs() as kvm_mmu_remote_flush_or_zap() does is overkill. Avoid flushing the entirety of the remote TLBs unless the invalid_list was populated: instead, use a more efficient gfn-targeting flush (if available) and skip it altogether if the caller guarantees that a TLB flush is not necessary. Signed-off-by: Paolo Bonzini Reviewed-by: Sean Christopherson --- arch/x86/kvm/mmu/mmu.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c index 892246204435..f0144ae8d891 100644 --- a/arch/x86/kvm/mmu/mmu.c +++ b/arch/x86/kvm/mmu/mmu.c @@ -2526,6 +2526,23 @@ static void shadow_walk_next(struct kvm_shadow_walk_= iterator *iterator) __shadow_walk_next(iterator, *iterator->sptep); } =20 +/* + * Note: while normally KVM uses a "bool flush" return value to let + * the caller batch flushes, __link_shadow_page() flushes immediately + * before populating the parent PTE with the new shadow page. The + * typical callers, direct_map() and FNAME(fetch)(), are not going + * to zap more than one huge SPTE anyway. + * + * The only exception, where @flush can be false, is when a huge SPTE + * is replaced with a shadow page SPTE with a fully populated page table, + * which can happen from shadow_mmu_split_huge_page(). In this case, + * no memory is unmapped across the change to the page tables and no + * immediate flush is needed for correctness. + * + * Even in that case, calls to kvm_mmu_commit_zap_page() are not + * batched. Doing so would require adding an invalid_list argument + * all the way down to __walk_slot_rmaps(). + */ static void __link_shadow_page(struct kvm *kvm, struct kvm_mmu_memory_cache *cache, u64 *sptep, struct kvm_mmu_page *sp, bool flush) @@ -2541,8 +2558,10 @@ static void __link_shadow_page(struct kvm *kvm, parent_sp =3D sptep_to_sp(sptep); WARN_ON_ONCE(parent_sp->role.level =3D=3D PG_LEVEL_4K); =20 - mmu_page_zap_pte(kvm, parent_sp, sptep, &invalid_list); - kvm_mmu_remote_flush_or_zap(kvm, &invalid_list, true); + if (mmu_page_zap_pte(kvm, parent_sp, sptep, &invalid_list)) + kvm_mmu_commit_zap_page(kvm, &invalid_list); + else if (flush) + kvm_flush_remote_tlbs_sptep(kvm, sptep); } =20 spte =3D make_nonleaf_spte(sp->spt, sp_ad_disabled(sp)); --=20 2.54.0