From patchwork Wed Sep 8 16:36:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 12481529 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 DF068C433F5 for ; Wed, 8 Sep 2021 16:36:31 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 8CB7060F45 for ; Wed, 8 Sep 2021 16:36:31 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 8CB7060F45 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id 334816B0071; Wed, 8 Sep 2021 12:36:31 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2BD1C6B0073; Wed, 8 Sep 2021 12:36:31 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0E9A16B0074; Wed, 8 Sep 2021 12:36:31 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id F21376B0071 for ; Wed, 8 Sep 2021 12:36:30 -0400 (EDT) Received: from smtpin23.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id B4509181E5161 for ; Wed, 8 Sep 2021 16:36:30 +0000 (UTC) X-FDA: 78564959340.23.F98BFAB Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf09.hostedemail.com (Postfix) with ESMTP id 643B03000103 for ; Wed, 8 Sep 2021 16:36:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1631118989; 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=56oQXq3TKm+twCnaNWrYfutLR31xlw31ilsGJKLLAyo=; b=g8DGYI6/fASSfY6bMNvvSvHRoXLTf2RYI1FWxGftSW7JgtrDeE033sVCzjIi7p0wv37BSx RXUqmhBLXkR2d5Jrs2qpjwLK8u9oib9ds1m2k8qzUxXyKsoMcQr/ri0SxvCHyj7gyy5P+v FC7vDjvf8UgZtThucgVCK1vW0la2m3Q= Received: from mail-io1-f69.google.com (mail-io1-f69.google.com [209.85.166.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-204-u2ynIVkhO-iWG1mm0uc7SQ-1; Wed, 08 Sep 2021 12:36:29 -0400 X-MC-Unique: u2ynIVkhO-iWG1mm0uc7SQ-1 Received: by mail-io1-f69.google.com with SMTP id e18-20020a6b7312000000b005be766a70dbso2192171ioh.19 for ; Wed, 08 Sep 2021 09:36:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=56oQXq3TKm+twCnaNWrYfutLR31xlw31ilsGJKLLAyo=; b=x9tZJ+jGi3TTyFOcfJkN4MIuZsBMG3U/KcRny4TewrdGRe1QOuA1kWRacM0TlsDLwn ozN3/bbbXHwTMJCL4TQcLipCu1XOeoSuvsLJkz4oLNKxNLLGeabi1M9gXABl0KEaAzHm ildH7Hp0/hjjo2Jt7zQj3O/ezAkQXmhj0WdtN7Ub/AL8iVfU//Y+KCDjS5BHuJfNN7AQ 853GvmFufmoVftGp0uySSa7+FsP8Ux6ZS5k8xTwX9CnS9MHpSxFc28oNb3kIgc+7sVJV 5ZL/qIydcloz+Ss9c0mOY3LIep4IuOwaCoSI2YBpGm1KxAebTBkfy5hO0qKYdKCw7PIO 0P/g== X-Gm-Message-State: AOAM530jWjSrOicaDkd1afiyGWTpz/5e9YXibEf5QBZXBxR1yt5VuzQm bXU14+mPpBdBTqlrVSrKbeoQ/SvqVDB/6Tz3ZQz9e67PpgGLhIbyTAEKxXyuM7VfVqkP8ZKluZE duB8XzsoVmlo= X-Received: by 2002:a02:ca0b:: with SMTP id i11mr4618043jak.84.1631118987968; Wed, 08 Sep 2021 09:36:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzrX//krJNo8s8HBTqOX6r+b8T4NK3eiRYEGoQxukDEVUburkR0mXbCkaE95ZsNYN1utMzy5A== X-Received: by 2002:a02:ca0b:: with SMTP id i11mr4618027jak.84.1631118987784; Wed, 08 Sep 2021 09:36:27 -0700 (PDT) Received: from t490s.phub.net.cable.rogers.com ([2607:fea8:56a3:500::ad7f]) by smtp.gmail.com with ESMTPSA id m10sm1399415ilg.20.2021.09.08.09.36.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Sep 2021 09:36:27 -0700 (PDT) From: Peter Xu To: linux-kernel@vger.kernel.org, Andrew Morton , Hugh Dickins , linux-mm@kvack.org Cc: Miaohe Lin , David Hildenbrand , Andrea Arcangeli , Yang Shi , Alistair Popple , Matthew Wilcox , "Kirill A . Shutemov" , Jerome Glisse , peterx@redhat.com, Liam Howlett , Mike Rapoport Subject: [PATCH v3 4/5] mm: Add zap_skip_check_mapping() helper Date: Wed, 8 Sep 2021 12:36:25 -0400 Message-Id: <20210908163625.215001-1-peterx@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210908163516.214441-1-peterx@redhat.com> References: <20210908163516.214441-1-peterx@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Stat-Signature: g1qtqsrfpxcw7x7rtt4x6ztmmuwb5nmu Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="g8DGYI6/"; dmarc=pass (policy=none) header.from=redhat.com; spf=none (imf09.hostedemail.com: domain of peterx@redhat.com has no SPF policy when checking 170.10.133.124) smtp.mailfrom=peterx@redhat.com X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 643B03000103 X-HE-Tag: 1631118990-570257 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: Use the helper for the checks. Rename "check_mapping" into "zap_mapping" because "check_mapping" looks like a bool but in fact it stores the mapping itself. When it's set, we check the mapping (it must be non-NULL). When it's cleared we skip the check, which works like the old way. Move the duplicated comments to the helper too. Signed-off-by: Peter Xu Reviewed-by: Alistair Popple --- include/linux/mm.h | 16 +++++++++++++++- mm/memory.c | 29 ++++++----------------------- 2 files changed, 21 insertions(+), 24 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index d1126f731221..ed44f31615d9 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -1721,10 +1721,24 @@ extern void user_shm_unlock(size_t, struct ucounts *); * Parameter block passed down to zap_pte_range in exceptional cases. */ struct zap_details { - struct address_space *check_mapping; /* Check page->mapping if set */ + struct address_space *zap_mapping; /* Check page->mapping if set */ struct page *single_page; /* Locked page to be unmapped */ }; +/* + * We set details->zap_mappings when we want to unmap shared but keep private + * pages. Return true if skip zapping this page, false otherwise. + */ +static inline bool +zap_skip_check_mapping(struct zap_details *details, struct page *page) +{ + if (!details || !page) + return false; + + return details->zap_mapping && + (details->zap_mapping != page_rmapping(page)); +} + struct page *vm_normal_page(struct vm_area_struct *vma, unsigned long addr, pte_t pte); struct page *vm_normal_page_pmd(struct vm_area_struct *vma, unsigned long addr, diff --git a/mm/memory.c b/mm/memory.c index 6bba3b9fef7c..e5ee8399d270 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -1333,16 +1333,8 @@ static unsigned long zap_pte_range(struct mmu_gather *tlb, struct page *page; page = vm_normal_page(vma, addr, ptent); - if (unlikely(details) && page) { - /* - * unmap_shared_mapping_pages() wants to - * invalidate cache without truncating: - * unmap shared but keep private pages. - */ - if (details->check_mapping && - details->check_mapping != page_rmapping(page)) - continue; - } + if (unlikely(zap_skip_check_mapping(details, page))) + continue; ptent = ptep_get_and_clear_full(mm, addr, pte, tlb->fullmm); tlb_remove_tlb_entry(tlb, pte, addr); @@ -1375,17 +1367,8 @@ static unsigned long zap_pte_range(struct mmu_gather *tlb, is_device_exclusive_entry(entry)) { struct page *page = pfn_swap_entry_to_page(entry); - if (unlikely(details && details->check_mapping)) { - /* - * unmap_shared_mapping_pages() wants to - * invalidate cache without truncating: - * unmap shared but keep private pages. - */ - if (details->check_mapping != - page_rmapping(page)) - continue; - } - + if (unlikely(zap_skip_check_mapping(details, page))) + continue; pte_clear_not_present_full(mm, addr, pte, tlb->fullmm); rss[mm_counter(page)]--; @@ -3368,7 +3351,7 @@ void unmap_mapping_page(struct page *page) first_index = page->index; last_index = page->index + thp_nr_pages(page) - 1; - details.check_mapping = mapping; + details.zap_mapping = mapping; details.single_page = page; i_mmap_lock_write(mapping); @@ -3396,7 +3379,7 @@ void unmap_mapping_pages(struct address_space *mapping, pgoff_t start, pgoff_t first_index = start, last_index = start + nr - 1; struct zap_details details = { }; - details.check_mapping = even_cows ? NULL : mapping; + details.zap_mapping = even_cows ? NULL : mapping; if (last_index < first_index) last_index = ULONG_MAX;