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 E5B45633 for ; Sat, 18 Feb 2023 03:23:33 +0000 (UTC) Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-53659386dc8so23880157b3.6 for ; Fri, 17 Feb 2023 19:23:33 -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=/GR/sjDUZPfmGPpftS1VEvzIDAWFei9nVb6vABCcmnI=; b=Uima7vSx6WcxB5PWVawuvbz+4MoRtGvtZQP4OQDuV9tgWsk6GRiRwjIl/itkeG0Eec emdJVgV5GwiQnHcOZECCtS5iAuy2/3zhdhpSbd88fLDdY7mdI+2r0NU/+rdxQtFuBy/v aZPxmd66dsIslltCZIqnXV6WqBeb+BPr1x5f2vg7RDw1yMVx33NwqVVjxuzJr1Dg1qWJ H6ET2PUkRWQXljpkrYL4k2S0BFbUiNdav8tfRLpu589RNmb1qZsQLbvPFrv6PLJZFYfW OKMxl7KEJip8+d37UEQt/j4sVs7tQXhGW8gMIvlknR9eFj9srW+0Fa94INKT0D58sEOg xYYw== 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=/GR/sjDUZPfmGPpftS1VEvzIDAWFei9nVb6vABCcmnI=; b=WeOJyUpflfSM7m3TJgiqcyWfJjaXOzU8LMnVEpiqsi6vMQRFRo7dvS4dYLj2vjarmX RmQe7NqQLGT8P/e9/evl721DqmWKrAKpSbg4olUgDMf4xOvB9Tc3bwcHXYCne57svBNn hdMXHLWJ3wMlfSvYUXmrVp1A9tKtQ1zhA0urT4BTzu+brQpjvHrOUIFuZQSpaF1l4zr3 8pnpCOuihEKVeYqlc2PSBQcUOZFIHIEPdGL2Ej6itn0rVvmkt0UobFZzF9hdO/oFnghP GKmqlpGVP43EBDTOa3PRDz2SPwAGNuue3L/VbYnx/74pB4JzlzsfnTEiNLe6srfk2v1y cG2Q== X-Gm-Message-State: AO0yUKUSi5BGxiOUkzrXKNqFfR/ZKgFL/o76i2wmSwwa8V00JOCCiRl8 1DAvuGxuF+wIF6D37Tvybq9dl0KtYqXY4w== X-Google-Smtp-Source: AK7set/t1+3Hbkl9+VqIteNsWUqU8jbePr3G530RDyJGa8FC/0DW+/y3mO0WfD0yJ+Ly2FqDWjfl9LWu2tBLpg== X-Received: from ricarkol4.c.googlers.com ([fda3:e722:ac3:cc00:20:ed76:c0a8:1248]) (user=ricarkol job=sendgmr) by 2002:a81:bf47:0:b0:52f:3088:8aaa with SMTP id s7-20020a81bf47000000b0052f30888aaamr1560161ywk.345.1676690613052; Fri, 17 Feb 2023 19:23:33 -0800 (PST) Date: Sat, 18 Feb 2023 03:23:12 +0000 In-Reply-To: <20230218032314.635829-1-ricarkol@google.com> Precedence: bulk X-Mailing-List: kvmarm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20230218032314.635829-1-ricarkol@google.com> X-Mailer: git-send-email 2.39.2.637.g21b0678d19-goog Message-ID: <20230218032314.635829-11-ricarkol@google.com> Subject: [PATCH v4 10/12] KVM: arm64: Open-code kvm_mmu_write_protect_pt_masked() 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" Move the functionality of kvm_mmu_write_protect_pt_masked() into its caller, kvm_arch_mmu_enable_log_dirty_pt_masked(). This will be used in a subsequent commit in order to share some of the code in kvm_arch_mmu_enable_log_dirty_pt_masked(). No functional change intended. Signed-off-by: Ricardo Koller --- arch/arm64/kvm/mmu.c | 42 +++++++++++++++--------------------------- 1 file changed, 15 insertions(+), 27 deletions(-) diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c index 20458251c85e..8e9d612dda00 100644 --- a/arch/arm64/kvm/mmu.c +++ b/arch/arm64/kvm/mmu.c @@ -1056,28 +1056,6 @@ static void kvm_mmu_wp_memory_region(struct kvm *kvm, int slot) kvm_flush_remote_tlbs(kvm); } -/** - * kvm_mmu_write_protect_pt_masked() - write protect dirty pages - * @kvm: The KVM pointer - * @slot: The memory slot associated with mask - * @gfn_offset: The gfn offset in memory slot - * @mask: The mask of dirty pages at offset 'gfn_offset' in this memory - * slot to be write protected - * - * Walks bits set in mask write protects the associated pte's. Caller must - * acquire kvm_mmu_lock. - */ -static void kvm_mmu_write_protect_pt_masked(struct kvm *kvm, - struct kvm_memory_slot *slot, - gfn_t gfn_offset, unsigned long mask) -{ - phys_addr_t base_gfn = slot->base_gfn + gfn_offset; - phys_addr_t start = (base_gfn + __ffs(mask)) << PAGE_SHIFT; - phys_addr_t end = (base_gfn + __fls(mask) + 1) << PAGE_SHIFT; - - stage2_wp_range(&kvm->arch.mmu, start, end); -} - /** * kvm_mmu_split_memory_region() - split the stage 2 blocks into PAGE_SIZE * pages for memory slot @@ -1104,17 +1082,27 @@ static void kvm_mmu_split_memory_region(struct kvm *kvm, int slot) } /* - * kvm_arch_mmu_enable_log_dirty_pt_masked - enable dirty logging for selected - * dirty pages. + * kvm_arch_mmu_enable_log_dirty_pt_masked() - enable dirty logging for selected pages. + * @kvm: The KVM pointer + * @slot: The memory slot associated with mask + * @gfn_offset: The gfn offset in memory slot + * @mask: The mask of pages at offset 'gfn_offset' in this memory + * slot to enable dirty logging on * - * It calls kvm_mmu_write_protect_pt_masked to write protect selected pages to - * enable dirty logging for them. + * Writes protect selected pages to enable dirty logging for them. Caller must + * acquire kvm->mmu_lock. */ void kvm_arch_mmu_enable_log_dirty_pt_masked(struct kvm *kvm, struct kvm_memory_slot *slot, gfn_t gfn_offset, unsigned long mask) { - kvm_mmu_write_protect_pt_masked(kvm, slot, gfn_offset, mask); + phys_addr_t base_gfn = slot->base_gfn + gfn_offset; + phys_addr_t start = (base_gfn + __ffs(mask)) << PAGE_SHIFT; + phys_addr_t end = (base_gfn + __fls(mask) + 1) << PAGE_SHIFT; + + lockdep_assert_held_write(&kvm->mmu_lock); + + stage2_wp_range(&kvm->arch.mmu, start, end); } static void kvm_send_hwpoison_signal(unsigned long address, short lsb) -- 2.39.2.637.g21b0678d19-goog