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 7985FC4707F for ; Thu, 27 May 2021 20:21:40 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 0A81A61360 for ; Thu, 27 May 2021 20:21:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0A81A61360 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 A06E36B0071; Thu, 27 May 2021 16:21:39 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 991DD8D0001; Thu, 27 May 2021 16:21:39 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 809006B0075; Thu, 27 May 2021 16:21:39 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0170.hostedemail.com [216.40.44.170]) by kanga.kvack.org (Postfix) with ESMTP id 44CC76B0071 for ; Thu, 27 May 2021 16:21:39 -0400 (EDT) Received: from smtpin06.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 31DED6135 for ; Thu, 27 May 2021 20:21:38 +0000 (UTC) X-FDA: 78188131476.06.A13228D Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf04.hostedemail.com (Postfix) with ESMTP id 839BC2BD3 for ; Thu, 27 May 2021 20:21:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1622146897; 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=y2JdT0mH38cplAf1wx/5ANh95qkzxlwLzfafgEJNeGw=; b=DMebqFGEC17S6jPu+2ycn9EfJFyacnZJMniVVdr46yvel+v4NrsxTVzmCAQlNz7G5hVaDe 4jixUR2353/HGRMgEGR+3xuo8aGl8Px1Bb3o7/hAQSIpjLWNJYcZ88TsarZkj0WtoyCq6+ AD6KGIwPr5I0NwQqhayzZk2ApsRN010= 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-134-OLtizAWBPh6szoST-TM1LA-1; Thu, 27 May 2021 16:21:36 -0400 X-MC-Unique: OLtizAWBPh6szoST-TM1LA-1 Received: by mail-qt1-f199.google.com with SMTP id b17-20020ac854110000b02901f279c73d75so886680qtq.2 for ; Thu, 27 May 2021 13:21:36 -0700 (PDT) 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=y2JdT0mH38cplAf1wx/5ANh95qkzxlwLzfafgEJNeGw=; b=ZdO7IQk5uYMlXAxG2i9TUcYwl7N7Ts5qAThDxSQb6l9vWHfAFvcoiLIEKPlAHrw69G QAV+xyG1uzXu2GgPcVoPb/U+K1LaEK65GEzgtk93WIIJLqSLEKiEHFaEYuLMp+D2pkUY H+FFyZ0H3djGLwOxTCz64RS5dJ+lHJ6q91rU0IOhQSGZ8kvifqTT1xBrRdzx26oT61KC Ut/nTgFvOhdcpSNHaFtRmNib94yYOz5lWf3Wtp65A7deGn2PwMf0cx3hmh00VxeZbzqI VR2ozujUtkVkF9Nf31rGY2I+678CVqug386On71hDUBs4fOkwqaD5eFWqJd5vPl90++8 2EIA== X-Gm-Message-State: AOAM530M9uHnkW3952+VbYP8av6yuDG0FwPZURLmpmAU4WnaN3bamKNx gM03OG5x+yryS56Yn9ZxjW+R3BSu89Qt3aa+SJBPYaX9h3mitqQ23D4YOykjnvu9wT/7heNJUZr ZfnkhkZ1BpNaRKzwirB0qGfXgmJWTUOUuUkw/IxHq8lsZUGaOQOdRu6anVVMk X-Received: by 2002:ac8:5e0e:: with SMTP id h14mr331685qtx.117.1622146895047; Thu, 27 May 2021 13:21:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxoIpkNIQzO6Y2dcRvaoAmnmF0fwzYQWpYm5GB3jVmlkja21NwVMuJciLokF/MtY1ToQcNROA== X-Received: by 2002:ac8:5e0e:: with SMTP id h14mr331647qtx.117.1622146894684; Thu, 27 May 2021 13:21:34 -0700 (PDT) Received: from localhost.localdomain (bras-base-toroon474qw-grc-72-184-145-4-219.dsl.bell.ca. [184.145.4.219]) by smtp.gmail.com with ESMTPSA id x9sm2001277qto.33.2021.05.27.13.21.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 May 2021 13:21:34 -0700 (PDT) From: Peter Xu To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Andrea Arcangeli , "Kirill A . Shutemov" , Axel Rasmussen , Nadav Amit , Hugh Dickins , Jerome Glisse , Jason Gunthorpe , peterx@redhat.com, Andrew Morton , Miaohe Lin , Mike Rapoport , Matthew Wilcox , Mike Kravetz Subject: [PATCH v3 08/27] mm: Introduce zap_details.zap_flags Date: Thu, 27 May 2021 16:21:30 -0400 Message-Id: <20210527202130.30840-1-peterx@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210527201927.29586-1-peterx@redhat.com> References: <20210527201927.29586-1-peterx@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="US-ASCII" Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=DMebqFGE; spf=none (imf04.hostedemail.com: domain of peterx@redhat.com has no SPF policy when checking 170.10.133.124) smtp.mailfrom=peterx@redhat.com; dmarc=pass (policy=none) header.from=redhat.com X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 839BC2BD3 X-Stat-Signature: 9ozpxf9d5unfypnar6gt346hrq15jteg X-HE-Tag: 1622146893-804636 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: Instead of trying to introduce one variable for every new zap_details fie= lds, let's introduce a flag so that it can start to encode true/false informat= ions. Let's start to use this flag first to clean up the only check_mapping var= iable. Firstly, the name "check_mapping" implies this is a "boolean", but actual= ly it stores the mapping inside, just in a way that it won't be set if we don't= want to check the mapping. To make things clearer, introduce the 1st zap flag ZAP_FLAG_CHECK_MAPPING= , so that we only check against the mapping if this bit set. At the same time= , we can rename check_mapping into zap_mapping and set it always. Since at it, introduce another helper zap_check_mapping_skip() and use it= in zap_pte_range() properly. Some old comments have been removed in zap_pte_range() because they're duplicated, and since now we're with ZAP_FLAG_CHECK_MAPPING flag, it'll b= e very easy to grep this information by simply grepping the flag. It'll also make life easier when we want to e.g. pass in zap_flags into t= he callers like unmap_mapping_pages() (instead of adding new booleans beside= s the even_cows parameter). Signed-off-by: Peter Xu --- include/linux/mm.h | 19 ++++++++++++++++++- mm/memory.c | 31 ++++++++----------------------- 2 files changed, 26 insertions(+), 24 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index db155be8e66c..52d3ef2ed753 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -1721,13 +1721,30 @@ static inline bool can_do_mlock(void) { return fa= lse; } extern int user_shm_lock(size_t, struct user_struct *); extern void user_shm_unlock(size_t, struct user_struct *); =20 +/* Whether to check page->mapping when zapping */ +#define ZAP_FLAG_CHECK_MAPPING BIT(0) + /* * 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; + unsigned long zap_flags; }; =20 +/* Return true if skip zapping this page, false otherwise */ +static inline bool +zap_check_mapping_skip(struct zap_details *details, struct page *page) +{ + if (!details || !page) + return false; + + if (!(details->zap_flags & ZAP_FLAG_CHECK_MAPPING)) + return false; + + return details->zap_mapping !=3D page_rmapping(page); +} + struct page *vm_normal_page(struct vm_area_struct *vma, unsigned long ad= dr, pte_t pte); struct page *vm_normal_page_pmd(struct vm_area_struct *vma, unsigned lon= g addr, diff --git a/mm/memory.c b/mm/memory.c index 27cf8a6375c6..c9dc4e9e05b5 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -1330,16 +1330,8 @@ static unsigned long zap_pte_range(struct mmu_gath= er *tlb, struct page *page; =20 page =3D 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 !=3D page_rmapping(page)) - continue; - } + if (unlikely(zap_check_mapping_skip(details, page))) + continue; ptent =3D ptep_get_and_clear_full(mm, addr, pte, tlb->fullmm); tlb_remove_tlb_entry(tlb, pte, addr); @@ -1372,17 +1364,8 @@ static unsigned long zap_pte_range(struct mmu_gath= er *tlb, is_device_exclusive_entry(entry)) { struct page *page =3D pfn_swap_entry_to_page(entry); =20 - 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 !=3D - page_rmapping(page)) - continue; - } - + if (unlikely(zap_check_mapping_skip(details, page))) + continue; pte_clear_not_present_full(mm, addr, pte, tlb->fullmm); rss[mm_counter(page)]--; =20 @@ -3345,9 +3328,11 @@ void unmap_mapping_pages(struct address_space *map= ping, 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 { }; + struct zap_details details =3D { .zap_mapping =3D mapping }; + + if (!even_cows) + details.zap_flags |=3D ZAP_FLAG_CHECK_MAPPING; =20 - details.check_mapping =3D even_cows ? NULL : mapping; if (last_index < first_index) last_index =3D ULONG_MAX; =20 --=20 2.31.1