Received: from mail-yw1-f202.google.com (mail-yw1-f202.google.com [209.85.128.202]) (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 72F757B for ; Wed, 15 Feb 2023 17:40:59 +0000 (UTC) Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-5005ef73cf3so224888037b3.2 for ; Wed, 15 Feb 2023 09:40:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=M+kDNgoMDtvFvURb+a81Y7HPZ850UMfDMsGSfIPtSEw=; b=hJ9vl3m71GYNnf3TgzGMxykAT00VnMYT5gHKuaJsMZ8KbemR75oOEt0WuweEox0XJp /aJ7TjIvNwG30kMr6RFAkVMCb22BBtNlhiURvCwfQcgyJrtqiX1FCOzDnboyu6XQnph6 mgIhCyOWuWDj9+GP7S29WXup+oyRW1Msf6nxH+plJxuqMn5xSTqAhN26TGWUJIqDCna+ MHBlMhYMLcmS41tdUEOzpEME9EuPXSZadpttlRV0/2wt3WYEej+vhlDjRFph7ZDTgGUO v3UNs4Npavu675RBlyPO46U16Fq+Ic7Kda2TL/OBNyufLZjx7N4VrYNttbbE3zE6yaGJ aOKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=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; bh=M+kDNgoMDtvFvURb+a81Y7HPZ850UMfDMsGSfIPtSEw=; b=M4bCP8+e6eRVmnM23eHgFOv0M/6CtbLUDTaYFVI1cxV/TgnKCKU00MKeMlLNNn53at lCqq/YvWpCleg55rxk8j3kjIboNgLq22+/GflUYGmO0XkFsskh+7jNaAczzWVZEBNJzv UR5Q17d3HKGV2w99SAbNQlZxbQdau0Sr8UXd4EQb/ObsRIxjxu4i3yY6sJwVyTuWZu5D wzHyJ5+xduQioR4hwc0Q71m3HTuLxHTo87K4YhoknVtfvAs6VNZ7sA19bQ8KcFM3sBYf 61RgxVc40UeSXoKC7A/KCAbyc/suw1K3fIB5PSXkGZr1eV/0/Jkr8ifgKyl1ZqqqUnUO USFA== X-Gm-Message-State: AO0yUKWrBqU0zQNebpnlv/7vatrUN/BDjJlbSu1y+OFoZJhTT6gCTUdx wiM0vjKgc2+cW/dsQusbsu6WJTPTfLM9Lw== X-Google-Smtp-Source: AK7set8UK9Lwh5Z8Md4clrULGO4vd49cXttUTNvL3kcNkt7nFP4UQCaVRVWZIq+TySiyPYPI+8vfBLFgSpLT/w== X-Received: from ricarkol4.c.googlers.com ([fda3:e722:ac3:cc00:20:ed76:c0a8:1248]) (user=ricarkol job=sendgmr) by 2002:a5b:8c:0:b0:80b:a1c7:e81a with SMTP id b12-20020a5b008c000000b0080ba1c7e81amr347590ybp.253.1676482858484; Wed, 15 Feb 2023 09:40:58 -0800 (PST) Date: Wed, 15 Feb 2023 17:40:39 +0000 In-Reply-To: <20230215174046.2201432-1-ricarkol@google.com> Precedence: bulk X-Mailing-List: kvmarm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20230215174046.2201432-1-ricarkol@google.com> X-Mailer: git-send-email 2.39.1.637.g21b0678d19-goog Message-ID: <20230215174046.2201432-6-ricarkol@google.com> Subject: [PATCH v3 05/12] KVM: arm64: Refactor kvm_arch_commit_memory_region() From: Ricardo Koller To: pbonzini@redhat.com, maz@kernel.org, oupton@google.com, yuzenghui@huawei.com, dmatlack@google.com Cc: kvm@vger.kernel.org, kvmarm@lists.linux.dev, qperret@google.com, catalin.marinas@arm.com, andrew.jones@linux.dev, seanjc@google.com, alexandru.elisei@arm.com, suzuki.poulose@arm.com, eric.auger@redhat.com, gshan@redhat.com, reijiw@google.com, rananta@google.com, bgardon@google.com, ricarkol@gmail.com, Ricardo Koller Content-Type: text/plain; charset="UTF-8" Refactor kvm_arch_commit_memory_region() as a preparation for a future commit to look cleaner and more understandable. Also, it looks more like its x86 counterpart (in kvm_mmu_slot_apply_flags()). No functional change intended. Signed-off-by: Ricardo Koller --- arch/arm64/kvm/mmu.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c index 9bd3c2cfb476..d2c5e6992459 100644 --- a/arch/arm64/kvm/mmu.c +++ b/arch/arm64/kvm/mmu.c @@ -1761,20 +1761,27 @@ void kvm_arch_commit_memory_region(struct kvm *kvm, const struct kvm_memory_slot *new, enum kvm_mr_change change) { + bool log_dirty_pages = new && new->flags & KVM_MEM_LOG_DIRTY_PAGES; + /* * At this point memslot has been committed and there is an * allocated dirty_bitmap[], dirty pages will be tracked while the * memory slot is write protected. */ - if (change != KVM_MR_DELETE && new->flags & KVM_MEM_LOG_DIRTY_PAGES) { + if (log_dirty_pages) { + + if (change == KVM_MR_DELETE) + return; + /* * If we're with initial-all-set, we don't need to write * protect any pages because they're all reported as dirty. * Huge pages and normal pages will be write protect gradually. */ - if (!kvm_dirty_log_manual_protect_and_init_set(kvm)) { - kvm_mmu_wp_memory_region(kvm, new->id); - } + if (kvm_dirty_log_manual_protect_and_init_set(kvm)) + return; + + kvm_mmu_wp_memory_region(kvm, new->id); } } -- 2.39.1.637.g21b0678d19-goog