From patchwork Fri Jul 22 12:19:37 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kara X-Patchwork-Id: 9243429 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5ECD0602F0 for ; Fri, 22 Jul 2016 12:19:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 502D927FA4 for ; Fri, 22 Jul 2016 12:19:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 44944266F3; Fri, 22 Jul 2016 12:19:57 +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=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI 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 D5278266F3 for ; Fri, 22 Jul 2016 12:19:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753528AbcGVMTz (ORCPT ); Fri, 22 Jul 2016 08:19:55 -0400 Received: from mx2.suse.de ([195.135.220.15]:49605 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753340AbcGVMTx (ORCPT ); Fri, 22 Jul 2016 08:19:53 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 100E2AD3F; Fri, 22 Jul 2016 12:19:51 +0000 (UTC) Received: by quack2.suse.cz (Postfix, from userid 1000) id B04621E0F2E; Fri, 22 Jul 2016 14:19:47 +0200 (CEST) From: Jan Kara To: linux-mm@kvack.org Cc: linux-fsdevel@vger.kernel.org, linux-nvdimm@lists.01.org, Dan Williams , Ross Zwisler , Jan Kara Subject: [PATCH 11/15] mm: Move part of wp_page_reuse() into the single call site Date: Fri, 22 Jul 2016 14:19:37 +0200 Message-Id: <1469189981-19000-12-git-send-email-jack@suse.cz> X-Mailer: git-send-email 2.6.6 In-Reply-To: <1469189981-19000-1-git-send-email-jack@suse.cz> References: <1469189981-19000-1-git-send-email-jack@suse.cz> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP wp_page_reuse() handles write shared faults which is needed only in wp_page_shared(). Move the handling only into that location to make wp_page_reuse() simpler. Signed-off-by: Jan Kara --- mm/memory.c | 38 ++++++++++++++++---------------------- 1 file changed, 16 insertions(+), 22 deletions(-) diff --git a/mm/memory.c b/mm/memory.c index 56b5fe8421a9..c3f639c33232 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -2101,11 +2101,10 @@ static void fault_dirty_shared_page(struct vm_area_struct *vma, * case, all we need to do here is to mark the page as writable and update * any related book-keeping. */ -static inline int wp_page_reuse(struct mm_struct *mm, +static inline void wp_page_reuse(struct mm_struct *mm, struct vm_area_struct *vma, unsigned long address, pte_t *page_table, spinlock_t *ptl, pte_t orig_pte, - struct page *page, int page_mkwrite, - int dirty_shared) + struct page *page) __releases(ptl) { pte_t entry; @@ -2123,16 +2122,6 @@ static inline int wp_page_reuse(struct mm_struct *mm, if (ptep_set_access_flags(vma, address, page_table, entry, 1)) update_mmu_cache(vma, address, page_table); pte_unmap_unlock(page_table, ptl); - - if (dirty_shared) { - if (!page_mkwrite) - lock_page(page); - - fault_dirty_shared_page(vma, page); - put_page(page); - } - - return VM_FAULT_WRITE; } /* @@ -2308,8 +2297,8 @@ static int wp_pfn_shared(struct mm_struct *mm, return 0; } } - return wp_page_reuse(mm, vma, address, page_table, ptl, orig_pte, - NULL, 0, 0); + wp_page_reuse(mm, vma, address, page_table, ptl, orig_pte, NULL); + return VM_FAULT_WRITE; } static int wp_page_shared(struct mm_struct *mm, struct vm_area_struct *vma, @@ -2318,8 +2307,6 @@ static int wp_page_shared(struct mm_struct *mm, struct vm_area_struct *vma, struct page *old_page) __releases(ptl) { - int page_mkwrite = 0; - get_page(old_page); if (vma->vm_ops->page_mkwrite) { @@ -2346,11 +2333,17 @@ static int wp_page_shared(struct mm_struct *mm, struct vm_area_struct *vma, put_page(old_page); return 0; } - page_mkwrite = 1; + wp_page_reuse(mm, vma, address, page_table, ptl, orig_pte, + old_page); + } else { + wp_page_reuse(mm, vma, address, page_table, ptl, orig_pte, + old_page); + lock_page(old_page); } - return wp_page_reuse(mm, vma, address, page_table, ptl, - orig_pte, old_page, page_mkwrite, 1); + fault_dirty_shared_page(vma, old_page); + put_page(old_page); + return VM_FAULT_WRITE; } /* @@ -2429,8 +2422,9 @@ static int do_wp_page(struct mm_struct *mm, struct vm_area_struct *vma, page_move_anon_rmap(old_page, vma); } unlock_page(old_page); - return wp_page_reuse(mm, vma, address, page_table, ptl, - orig_pte, old_page, 0, 0); + wp_page_reuse(mm, vma, address, page_table, ptl, + orig_pte, old_page); + return VM_FAULT_WRITE; } unlock_page(old_page); } else if (unlikely((vma->vm_flags & (VM_WRITE|VM_SHARED)) ==