From patchwork Fri Jan 15 17:08:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 12023327 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1BCFDC433DB for ; Fri, 15 Jan 2021 17:09:38 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id BF8C12333E for ; Fri, 15 Jan 2021 17:09:37 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BF8C12333E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id B009A8D01A3; Fri, 15 Jan 2021 12:09:32 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id AB6678D019D; Fri, 15 Jan 2021 12:09:32 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 840CA8D01A3; Fri, 15 Jan 2021 12:09:32 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0007.hostedemail.com [216.40.44.7]) by kanga.kvack.org (Postfix) with ESMTP id 699BC8D019D for ; Fri, 15 Jan 2021 12:09:32 -0500 (EST) Received: from smtpin12.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 111F383F4 for ; Fri, 15 Jan 2021 17:09:32 +0000 (UTC) X-FDA: 77708645784.12.face47_61150cb27531 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin12.hostedemail.com (Postfix) with ESMTP id DF64F181070D7 for ; Fri, 15 Jan 2021 17:09:31 +0000 (UTC) X-HE-Tag: face47_61150cb27531 X-Filterd-Recvd-Size: 6694 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by imf33.hostedemail.com (Postfix) with ESMTP for ; Fri, 15 Jan 2021 17:09:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1610730570; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=a0JYz3HBZ34RwENyJxX7OSGITuFKgQMNHlEyQKe2PSI=; b=B5BzBF7h2ZQC+D6/C9oIeMk98o7SoryHYM9TMRjOZ/qx+70AySuozs/fCVN2XQ/76ra4PX TE8UVlTab5p/99rH7jjxOMEA+sn/KPKcxfby73IWrys4PvJvrMv7kOtUCf56yQ2ZsXQoOh ZTdbK3cF4Qj4BoUvT6OeGw1Z3Z/XyVI= Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-425-euAPppEEMaOgqCp9xkfblQ-1; Fri, 15 Jan 2021 12:09:28 -0500 X-MC-Unique: euAPppEEMaOgqCp9xkfblQ-1 Received: by mail-qk1-f199.google.com with SMTP id f27so8614075qkh.0 for ; Fri, 15 Jan 2021 09:09:28 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=a0JYz3HBZ34RwENyJxX7OSGITuFKgQMNHlEyQKe2PSI=; b=l2MRR5RMn4yoNmkrfBCif/2BFaeBKLRboZ/4Sqjwem0oMRNzdruCDgZl4OtevFDnME xHqV2hTBLCMNSZUQb6NtIEZ9lWSa9B3TWeKiOoOgIKPG6QbX552WMW/ZoD6Q6ztVfCtR mZ9/r0r3tGBkjWWNTWrowUbqBMIy4QSYSekrjaDd2kuKjiuDHEAu9L2cwpxIw31k3R0o NFLDCQGHoW6X8lCxmB9E2s5bLKSB4hOY0rIHse2e8sQ3+cmGcXE4gPYKg9LYZU5/5a5R T/Tf45G2oA7TOufk7JpBbqwRyqfSKdVF1y6rtJY45lawC/PjElmrynXgVw/TlzWBglsV Ro5Q== X-Gm-Message-State: AOAM531zhq1hKsCPTnNSn8ebUPblYOmjeT03QB3TOEFTh/kj4sdi6r1u FVWyoQwTKwDJNo10kFLdbQe6yjilRM+d5L6b37YWRyHX/0rkbz0PCj2kjDN08zTD4m4o5oiftCT 7lvbGVN5kzow= X-Received: by 2002:a05:6214:533:: with SMTP id x19mr13215469qvw.20.1610730567637; Fri, 15 Jan 2021 09:09:27 -0800 (PST) X-Google-Smtp-Source: ABdhPJwjUXdkNSM6Ii2VUn7NnUVKuMeCISUxdtKhPGypjO2PwOsx14vwE6XLqQeJD6if0ENarzbWBQ== X-Received: by 2002:a05:6214:533:: with SMTP id x19mr13215453qvw.20.1610730567461; Fri, 15 Jan 2021 09:09:27 -0800 (PST) Received: from localhost.localdomain ([142.126.83.202]) by smtp.gmail.com with ESMTPSA id d123sm5187840qke.95.2021.01.15.09.09.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Jan 2021 09:09:26 -0800 (PST) From: Peter Xu To: linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: Mike Rapoport , Mike Kravetz , peterx@redhat.com, Jerome Glisse , "Kirill A . Shutemov" , Hugh Dickins , Axel Rasmussen , Matthew Wilcox , Andrew Morton , Andrea Arcangeli , Nadav Amit Subject: [PATCH RFC 09/30] mm: Drop first_index/last_index in zap_details Date: Fri, 15 Jan 2021 12:08:46 -0500 Message-Id: <20210115170907.24498-10-peterx@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210115170907.24498-1-peterx@redhat.com> References: <20210115170907.24498-1-peterx@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=peterx@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: The first_index/last_index parameters in zap_details are actually only used in unmap_mapping_range_tree(). At the meantime, this function is only called by unmap_mapping_pages() once. Instead of passing these two variables through the whole stack of page zapping code, remove them from zap_details and let them simply be parameters of unmap_mapping_range_tree(), which is inlined. Signed-off-by: Peter Xu --- include/linux/mm.h | 2 -- mm/memory.c | 20 ++++++++++---------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index 85d928764b64..faf9538c13b2 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -1635,8 +1635,6 @@ extern void user_shm_unlock(size_t, struct user_struct *); */ struct zap_details { struct address_space *check_mapping; /* Check page->mapping if set */ - pgoff_t first_index; /* Lowest page->index to unmap */ - pgoff_t last_index; /* Highest page->index to unmap */ }; struct page *vm_normal_page(struct vm_area_struct *vma, unsigned long addr, diff --git a/mm/memory.c b/mm/memory.c index 0b687f0be4d0..dd49dea276e3 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -3145,20 +3145,20 @@ static void unmap_mapping_range_vma(struct vm_area_struct *vma, } static inline void unmap_mapping_range_tree(struct rb_root_cached *root, + pgoff_t first_index, + pgoff_t last_index, struct zap_details *details) { struct vm_area_struct *vma; pgoff_t vba, vea, zba, zea; - vma_interval_tree_foreach(vma, root, - details->first_index, details->last_index) { - + vma_interval_tree_foreach(vma, root, first_index, last_index) { vba = vma->vm_pgoff; vea = vba + vma_pages(vma) - 1; - zba = details->first_index; + zba = first_index; if (zba < vba) zba = vba; - zea = details->last_index; + zea = last_index; if (zea > vea) zea = vea; @@ -3184,17 +3184,17 @@ static inline void unmap_mapping_range_tree(struct rb_root_cached *root, void unmap_mapping_pages(struct address_space *mapping, pgoff_t start, pgoff_t nr, bool even_cows) { + pgoff_t first_index = start, last_index = start + nr - 1; struct zap_details details = { }; details.check_mapping = even_cows ? NULL : mapping; - details.first_index = start; - details.last_index = start + nr - 1; - if (details.last_index < details.first_index) - details.last_index = ULONG_MAX; + if (last_index < first_index) + last_index = ULONG_MAX; i_mmap_lock_write(mapping); if (unlikely(!RB_EMPTY_ROOT(&mapping->i_mmap.rb_root))) - unmap_mapping_range_tree(&mapping->i_mmap, &details); + unmap_mapping_range_tree(&mapping->i_mmap, first_index, + last_index, &details); i_mmap_unlock_write(mapping); }