From mboxrd@z Thu Jan 1 00:00:00 1970 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 E4D69C4361B for ; Tue, 8 Dec 2020 02:50:30 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 6D92823609 for ; Tue, 8 Dec 2020 02:50:30 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6D92823609 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 E3BAD8D000F; Mon, 7 Dec 2020 21:50:29 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id DC7418D0001; Mon, 7 Dec 2020 21:50:29 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C6BE78D000F; Mon, 7 Dec 2020 21:50:29 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0156.hostedemail.com [216.40.44.156]) by kanga.kvack.org (Postfix) with ESMTP id AA64C8D0001 for ; Mon, 7 Dec 2020 21:50:29 -0500 (EST) Received: from smtpin19.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 75E11181AEF1D for ; Tue, 8 Dec 2020 02:50:29 +0000 (UTC) X-FDA: 77568586578.19.tank40_19130c7273e3 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin19.hostedemail.com (Postfix) with ESMTP id 56D8B1AD1B9 for ; Tue, 8 Dec 2020 02:50:29 +0000 (UTC) X-HE-Tag: tank40_19130c7273e3 X-Filterd-Recvd-Size: 6404 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by imf13.hostedemail.com (Postfix) with ESMTP for ; Tue, 8 Dec 2020 02:50:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607395828; 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=kzE0WQTA1Dwd5PkGUcDTN27r/6OT+CPdQW7/EJE5vos=; b=N26xIZ7M5QoeGUJtvFeHXCqZukJC+5EV8EqAUR6GCtlgplD760TQxHHCmFwLRA9f2+ZTYx g8Yy/DuF/krGotmREjWqcq+vdpxIscTGFR82VDaUph/f1t5R4/X7q01g6tGDvYWFGKBLpf nPkFGTo5mcB7CLXr5ff1LaWB6U9sWRo= Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-85-_Jk2mow6NCSElRiLLQxq2g-1; Mon, 07 Dec 2020 21:50:26 -0500 X-MC-Unique: _Jk2mow6NCSElRiLLQxq2g-1 Received: by mail-qt1-f199.google.com with SMTP id o12so12846440qtw.14 for ; Mon, 07 Dec 2020 18:50:26 -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=kzE0WQTA1Dwd5PkGUcDTN27r/6OT+CPdQW7/EJE5vos=; b=JF6CE0FL8+j1WeOnv74X/DPNp21M7i20EGoRTx7Nttd8VJa/pdx5/pDLP2jqeN8V/H +M5nvQesUlVPJ/kFgZoTROue9gqKz5lyjzOU4sKwxvSUHfb/ycDkCB4JjWE37zEiwYwS Nce3rrCWVRtAsKTK1hMvPNyzCsTTi1jw5vWZNxKAwvu9c4Emtj4F50AIvkoTsBlW2BB9 6bmW7kzmzvD613/d5TTb8LqTKuMug5YbdNflm4hy7Tid3j8Ru7UAzhgvZK5UqNXL8Shn zIm0JDpIpvDDEdx2RpluA/sLJhB0CxqCMxCBolLnV3kEpzkR39PZ+jTLelLWaa9xJEud xyxQ== X-Gm-Message-State: AOAM530kb1zKNNwUa7nmJF61l2w5/IBYFgVnZAMgP/YQp1nX/oxtwpG4 HiF76VcfOUeYonoj6xvgy5D+YSC/bKOhCfTlMH4TwhfrkLiqtiIrM4HOeM2sDd6XnhCgC6varTo K11PzGwGQmjI= X-Received: by 2002:a05:620a:a9a:: with SMTP id v26mr27449734qkg.56.1607395826012; Mon, 07 Dec 2020 18:50:26 -0800 (PST) X-Google-Smtp-Source: ABdhPJz/BqcivJZFIop18PT06X3Iy/glDGRBOA2o1sTDQkDzVRUfyfyhCPefW8cuvWaFM1lo8SkbhA== X-Received: by 2002:a05:620a:a9a:: with SMTP id v26mr27449718qkg.56.1607395825822; Mon, 07 Dec 2020 18:50:25 -0800 (PST) Received: from localhost.localdomain ([142.126.83.202]) by smtp.gmail.com with ESMTPSA id a28sm2632766qtm.80.2020.12.07.18.50.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Dec 2020 18:50:25 -0800 (PST) From: Peter Xu To: linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: Andrea Arcangeli , peterx@redhat.com, "Kirill A . Shutemov" , Andrew Morton Subject: [PATCH 1/3] mm: Drop first_index/last_index in zap_details Date: Mon, 7 Dec 2020 21:50:20 -0500 Message-Id: <20201208025022.8234-2-peterx@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201208025022.8234-1-peterx@redhat.com> References: <20201208025022.8234-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 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: quoted-printable 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 us= ed in unmap_mapping_range_tree(). At the meantime, this function is only calle= d by unmap_mapping_pages() once. Instead of passing these two variables throu= gh the whole stack of page zapping code, remove them from zap_details and let th= em 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 16b799a0522c..5d977e484095 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -1625,8 +1625,6 @@ extern void user_shm_unlock(size_t, struct user_str= uct *); */ 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 */ }; =20 struct page *vm_normal_page(struct vm_area_struct *vma, unsigned long ad= dr, diff --git a/mm/memory.c b/mm/memory.c index eeae590e526a..70d57c39380d 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -3136,20 +3136,20 @@ static void unmap_mapping_range_vma(struct vm_are= a_struct *vma, } =20 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; =20 - vma_interval_tree_foreach(vma, root, - details->first_index, details->last_index) { - + vma_interval_tree_foreach(vma, root, first_index, last_index) { vba =3D vma->vm_pgoff; vea =3D vba + vma_pages(vma) - 1; - zba =3D details->first_index; + zba =3D first_index; if (zba < vba) zba =3D vba; - zea =3D details->last_index; + zea =3D last_index; if (zea > vea) zea =3D vea; =20 @@ -3175,17 +3175,17 @@ static inline void unmap_mapping_range_tree(struc= t 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 =3D start, last_index =3D start + nr - 1; struct zap_details details =3D { }; =20 details.check_mapping =3D even_cows ? NULL : mapping; - details.first_index =3D start; - details.last_index =3D start + nr - 1; - if (details.last_index < details.first_index) - details.last_index =3D ULONG_MAX; + if (last_index < first_index) + last_index =3D ULONG_MAX; =20 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); } =20 --=20 2.26.2