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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 214C8C433EF for ; Fri, 28 Jan 2022 04:54:45 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id ADC866B0093; Thu, 27 Jan 2022 23:54:44 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A64F26B0095; Thu, 27 Jan 2022 23:54:44 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8B7A86B0096; Thu, 27 Jan 2022 23:54:44 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0153.hostedemail.com [216.40.44.153]) by kanga.kvack.org (Postfix) with ESMTP id 7A99B6B0093 for ; Thu, 27 Jan 2022 23:54:44 -0500 (EST) Received: from smtpin22.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 2E5DF8249980 for ; Fri, 28 Jan 2022 04:54:44 +0000 (UTC) X-FDA: 79078480488.22.340333F Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf29.hostedemail.com (Postfix) with ESMTP id B47F2120012 for ; Fri, 28 Jan 2022 04:54:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1643345683; 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=H1DVV/S8YSQjtZLKWoD0HN3kRcNDUylmDF/rAE9teCo=; b=fbtW0ZdNo98b36St0hQUTiMiA+4nGu0r4EgdzUkbg/Au67uaNOG5hjnjjkdu3pNys3OxZ0 K+FmjRdg4bBEcrSM8UMsn1nnRQoxxcTftcfFqf1l7HQjNNixCcHdGOrU2SB7Kk2hmtXLJ3 R/dkOccZb5Z5/GsR/sDwV6pEeMKgusk= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-106-Wquw1MOWMuKEFsJ9IbIHJA-1; Thu, 27 Jan 2022 23:54:42 -0500 X-MC-Unique: Wquw1MOWMuKEFsJ9IbIHJA-1 Received: by mail-wm1-f69.google.com with SMTP id s1-20020a1ca901000000b0034ece94dd8cso5308317wme.5 for ; Thu, 27 Jan 2022 20:54:41 -0800 (PST) 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=H1DVV/S8YSQjtZLKWoD0HN3kRcNDUylmDF/rAE9teCo=; b=C3CBKGwVN5/aF9LJvGEe0OxTz0fVhuOVWwGReY9VzpYS6SFC7EhckhTV7w65lXM0HE XobPzIk18u6K7zGgDBhxDXRxLYbId3o06XgIe5DDeRey7Tvc2SDpldx8DGRE05od2PfQ xS2iNSaaSuSqBERLEDIQLAhXDCwV2CKBjD82gVVV3R01WE355eksVpyv1xSEK2V5yNpY jTgHTQhM/OlMbAoAOCOhJxQlNNdDGH/lU1dJ2uErHtmOMe4bT2oLvBR5XYpJB9J39fgV Im9pbCPvC/SztgY1m5JB4kIudYtFuPyhlmzyQy0D9+OFnMmyQNvPxMhvJIcIkZ+V9qnB DpwQ== X-Gm-Message-State: AOAM531hh+81h0wEdvc+IYcwDHs6oEcEMzUEpCThgUPF9xPIrNXkCv6n cdAdRvgfRrBLp2Lksf9msmLHr86Vp45Sd+V021zbDnO/qHMM2+QX5gi2831KRBoNYq1zAr3jhEk aAJ88ELrIOP8ZuCP+1GuF/wxjuoSX+PwAsA6DVOqgIVYGZQFg7CjynJChaLh5 X-Received: by 2002:a1c:2b06:: with SMTP id r6mr14345447wmr.4.1643345680401; Thu, 27 Jan 2022 20:54:40 -0800 (PST) X-Google-Smtp-Source: ABdhPJxSmguUCLAJc3uPMchWo2O4qWDyEBL0Tp/mOd4YhtXSNiPDsTt43pf61km0GV/X6qLuqocw1g== X-Received: by 2002:a1c:2b06:: with SMTP id r6mr14345423wmr.4.1643345680044; Thu, 27 Jan 2022 20:54:40 -0800 (PST) Received: from localhost.localdomain ([64.64.123.9]) by smtp.gmail.com with ESMTPSA id i13sm814014wrf.3.2022.01.27.20.54.34 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 27 Jan 2022 20:54:39 -0800 (PST) From: Peter Xu To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: peterx@redhat.com, Alistair Popple , Andrew Morton , Andrea Arcangeli , David Hildenbrand , Matthew Wilcox , John Hubbard , Hugh Dickins , Vlastimil Babka , Yang Shi , "Kirill A . Shutemov" Subject: [PATCH v3 3/4] mm: Change zap_details.zap_mapping into even_cows Date: Fri, 28 Jan 2022 12:54:11 +0800 Message-Id: <20220128045412.18695-4-peterx@redhat.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220128045412.18695-1-peterx@redhat.com> References: <20220128045412.18695-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" X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: B47F2120012 X-Stat-Signature: q9ztnypktp4xjij4gupcj8kgpxpxb9ti Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=fbtW0ZdN; dmarc=pass (policy=none) header.from=redhat.com; spf=none (imf29.hostedemail.com: domain of peterx@redhat.com has no SPF policy when checking 170.10.133.124) smtp.mailfrom=peterx@redhat.com X-Rspam-User: nil X-HE-Tag: 1643345683-63483 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: Currently we have a zap_mapping pointer maintained in zap_details, when i= t is specified we only want to zap the pages that has the same mapping with wh= at the caller has specified. But what we want to do is actually simpler: we want to skip zapping private (COW-ed) pages in some cases. We can refer to unmap_mapping_page= s() callers where we could have passed in different even_cows values. The ot= her user is unmap_mapping_folio() where we always want to skip private pages. According to Hugh, we used a mapping pointer for historical reason, as explained here: https://lore.kernel.org/lkml/391aa58d-ce84-9d4-d68d-d98a9c533255@google= .com/ Quotting partly from Hugh: Which raises the question again of why I did not just use a boolean fla= g there originally: aah, I think I've found why. In those days there was= a horrible "optimization", for better performance on some benchmark I gue= ss, which when you read from /dev/zero into a private mapping, would map th= e zero page there (look up read_zero_pagealigned() and zeromap_page_range() if= you dare). So there was another category of page to be skipped along with = the anon COWs, and I didn't want multiple tests in the zap loop, so checkin= g check_mapping against page->mapping did both. I think nowadays you cou= ld do it by checking for PageAnon page (or genuine swap entry) instead. This patch replaced the zap_details.zap_mapping pointer into the even_cow= s boolean, then we check it against PageAnon. Suggested-by: Hugh Dickins Signed-off-by: Peter Xu --- mm/memory.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/mm/memory.c b/mm/memory.c index 14d8428ff4db..ffa8c7dfe9ad 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -1309,8 +1309,8 @@ copy_page_range(struct vm_area_struct *dst_vma, str= uct vm_area_struct *src_vma) * Parameter block passed down to zap_pte_range in exceptional cases. */ struct zap_details { - struct address_space *zap_mapping; /* Check page->mapping if set */ struct folio *single_folio; /* Locked folio to be unmapped */ + bool even_cows; /* Zap COWed private pages too? */ }; =20 /* Whether we should zap all COWed (private) pages too */ @@ -1321,13 +1321,10 @@ static inline bool should_zap_cows(struct zap_det= ails *details) return true; =20 /* Or, we zap COWed pages only if the caller wants to */ - return !details->zap_mapping; + return details->even_cows; } =20 -/* - * We set details->zap_mapping when we want to unmap shared but keep pri= vate - * pages. Return true if we should zap this page, false otherwise. - */ +/* Decides whether we should zap this page with the page pointer specifi= ed */ static inline bool should_zap_page(struct zap_details *details, struct p= age *page) { /* If we can make a decision without *page.. */ @@ -1338,7 +1335,8 @@ static inline bool should_zap_page(struct zap_detai= ls *details, struct page *pag if (!page) return true; =20 - return details->zap_mapping =3D=3D page_rmapping(page); + /* Otherwise we should only zap non-anon pages */ + return !PageAnon(page); } =20 static unsigned long zap_pte_range(struct mmu_gather *tlb, @@ -3403,7 +3401,7 @@ void unmap_mapping_folio(struct folio *folio) first_index =3D folio->index; last_index =3D folio->index + folio_nr_pages(folio) - 1; =20 - details.zap_mapping =3D mapping; + details.even_cows =3D false; details.single_folio =3D folio; =20 i_mmap_lock_write(mapping); @@ -3432,7 +3430,7 @@ void unmap_mapping_pages(struct address_space *mapp= ing, pgoff_t start, pgoff_t first_index =3D start; pgoff_t last_index =3D start + nr - 1; =20 - details.zap_mapping =3D even_cows ? NULL : mapping; + details.even_cows =3D even_cows; if (last_index < first_index) last_index =3D ULONG_MAX; =20 --=20 2.32.0