From patchwork Sat Oct 20 03:15:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Junaid Shahid X-Patchwork-Id: 10650259 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4CF5813B0 for ; Sat, 20 Oct 2018 03:16:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3D7F3201F5 for ; Sat, 20 Oct 2018 03:16:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 30A2C205A8; Sat, 20 Oct 2018 03:16:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, USER_IN_DEF_DKIM_WL autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C41BE201F5 for ; Sat, 20 Oct 2018 03:16:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726903AbeJTLZO (ORCPT ); Sat, 20 Oct 2018 07:25:14 -0400 Received: from mail-pf1-f202.google.com ([209.85.210.202]:34996 "EHLO mail-pf1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726815AbeJTLZO (ORCPT ); Sat, 20 Oct 2018 07:25:14 -0400 Received: by mail-pf1-f202.google.com with SMTP id w64-v6so5322860pfk.2 for ; Fri, 19 Oct 2018 20:16:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=MXJxesMYTiaYI5MKlVe6Vts3DyxD+UbrQJf+m7Wj0V4=; b=O1rWAtdoXhKRhXKf8RsZ6uOCBnj4wT9GEfwIATrVVZfwSAwKOh1TA5feCxFF8x7srp mgr8BL6Pc+YtDXePgymQJPpq3YcnndRWtA/Gyw1A+luMoWvsDW7SJgeAiv7x9lLC5zYq Ws+C0wY/L+Fj3pRbuVWdVgV6HNL4Rl2cn34es7mZd3rT18PRYUxKbOWByoseJr/zJ5ac 5SYzu3D4FmM0jKI0mHg4u9z4noTAvSWgQSoPO1/RIV45q4FFapDyrKwhrowi++nCiTOP 0fsq4R7tMCMX+zmsV3A4jVMcwgh1piJ29p2t/XwqMn1VvFi0KMk4uwBMZUK2Iwg9vhmI Q5wA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=MXJxesMYTiaYI5MKlVe6Vts3DyxD+UbrQJf+m7Wj0V4=; b=EUyH7PXArOlvRaMNEARxOt9oFVTBQ/arMAaei5dsEAu5KJlJvOdyLWKxZgw81S9yc1 IP3GXazXMoP+MouzJVhYPdfMowzbwfoRTfMsJPunq24tNMwf0r03lQRK1WsJ02tOtadK jd8zG712JERvq0Nuyy2XBHQC9KjZ106IOKSO6twG5eUXArQx60xTKsmYTSmm9g4Ms0QI d+52kC0nK+8tT2t9m+t/1CsnDB7Yhn+9Nf/nBHOwCABivHSl670EPO/iLJTwFD6VR1bu VgvHF3jJSAkMdDTej53D30BpUvwd0+KBPJ4lrZiQSRcHL7hx0SZOlfeeqU5cmKCS47p+ d92g== X-Gm-Message-State: ABuFfogcnZqEZ/SSBDv+YdQDNtr/Okv9szarhqbogz/SBl33gBXsxrzx JENtqUCSA1hqwhCnEi+B7wIrmdlBCZGF X-Google-Smtp-Source: ACcGV60EVLRSq/wv02ACHbUsREdCcgdNQpJGg4kpdenLHZeojSLxrx1eXwjhLPOSmkCNr81l50EUlX84bWx3 X-Received: by 2002:a63:36c1:: with SMTP id d184-v6mr18002307pga.73.1540005381547; Fri, 19 Oct 2018 20:16:21 -0700 (PDT) Date: Fri, 19 Oct 2018 20:15:41 -0700 In-Reply-To: <20181020031543.124399-1-junaids@google.com> Message-Id: <20181020031543.124399-9-junaids@google.com> Mime-Version: 1.0 References: <20181020031543.124399-1-junaids@google.com> X-Mailer: git-send-email 2.19.1.568.g152ad8e336-goog Subject: [PATCH 08/10] kvm: x86: mmu: Refactor kvm_mmu_slot_*_remove_write_access From: Junaid Shahid To: pbonzini@redhat.com Cc: kvm@vger.kernel.org, pfeiner@google.com Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Create a common helper function to implement both the _remote_write_access and _largepage_remove_write_access variants and also introduce a new variant _leaf_remove_write_access. Signed-off-by: Junaid Shahid --- arch/x86/kvm/mmu.c | 43 ++++++++++++++++++++++++++++--------------- 1 file changed, 28 insertions(+), 15 deletions(-) diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c index 2714dbea2d88..0839b8cfdf66 100644 --- a/arch/x86/kvm/mmu.c +++ b/arch/x86/kvm/mmu.c @@ -5732,14 +5732,15 @@ static bool slot_rmap_write_protect(struct kvm *kvm, return __rmap_write_protect(kvm, rmap_head, false); } -void kvm_mmu_slot_remove_write_access(struct kvm *kvm, - struct kvm_memory_slot *memslot) +static bool kvm_mmu_slot_remove_write_access_at_levels(struct kvm *kvm, + struct kvm_memory_slot *memslot, + int start_level, int end_level) { bool flush; spin_lock(&kvm->mmu_lock); - flush = slot_handle_all_level(kvm, memslot, slot_rmap_write_protect, - false); + flush = slot_handle_level(kvm, memslot, slot_rmap_write_protect, + start_level, end_level, false); spin_unlock(&kvm->mmu_lock); /* @@ -5749,6 +5750,18 @@ void kvm_mmu_slot_remove_write_access(struct kvm *kvm, */ lockdep_assert_held(&kvm->slots_lock); + return flush; +} + +void kvm_mmu_slot_remove_write_access(struct kvm *kvm, + struct kvm_memory_slot *memslot) +{ + bool flush; + + flush = kvm_mmu_slot_remove_write_access_at_levels(kvm, memslot, + PT_PAGE_TABLE_LEVEL, + PT_MAX_HUGEPAGE_LEVEL); + /* * We can flush all the TLBs out of the mmu lock without TLB * corruption since we just change the spte from writable to @@ -5833,20 +5846,20 @@ EXPORT_SYMBOL_GPL(kvm_mmu_slot_leaf_clear_dirty); bool kvm_mmu_slot_largepage_remove_write_access(struct kvm *kvm, struct kvm_memory_slot *memslot) { - bool flush; - - spin_lock(&kvm->mmu_lock); - flush = slot_handle_large_level(kvm, memslot, slot_rmap_write_protect, - false); - spin_unlock(&kvm->mmu_lock); - - /* see kvm_mmu_slot_remove_write_access */ - lockdep_assert_held(&kvm->slots_lock); - - return flush; + return kvm_mmu_slot_remove_write_access_at_levels(kvm, memslot, + PT_PAGE_TABLE_LEVEL + 1, + PT_MAX_HUGEPAGE_LEVEL); } EXPORT_SYMBOL_GPL(kvm_mmu_slot_largepage_remove_write_access); +static bool kvm_mmu_slot_leaf_remove_write_access(struct kvm *kvm, + struct kvm_memory_slot *memslot) +{ + return kvm_mmu_slot_remove_write_access_at_levels(kvm, memslot, + PT_PAGE_TABLE_LEVEL, + PT_PAGE_TABLE_LEVEL); +} + void kvm_mmu_slot_wrprot_lpage_and_clear_dirty(struct kvm *kvm, struct kvm_memory_slot *memslot) {