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 81B30C4332F for ; Tue, 12 Dec 2023 13:20:24 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 04ED66B02D0; Tue, 12 Dec 2023 08:20:24 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id F419C6B02D1; Tue, 12 Dec 2023 08:20:23 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DE1956B02D2; Tue, 12 Dec 2023 08:20:23 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id CDEF46B02D0 for ; Tue, 12 Dec 2023 08:20:23 -0500 (EST) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 9E62916099E for ; Tue, 12 Dec 2023 13:20:23 +0000 (UTC) X-FDA: 81558225126.28.0E830D7 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf24.hostedemail.com (Postfix) with ESMTP id 6928A180026 for ; Tue, 12 Dec 2023 13:20:20 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=KU3OVDST; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf24.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1702387220; h=from:from:sender: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:dkim-signature; bh=uKbwcVtGQfOTUzJGie+LPzWYJ7P08JR+2TJzFeKTeFg=; b=PRxphWx2TAXYDrj8ETrupoCEk4w0sd/k+xu8B8eqW+pUbx3Dui/H8uMiRvibOLYPJaC53w WQ/TPE2VAProcnIclzKrSPPNm6GjNiWbrx4ErYvFrnxfmOTxZu9gsvSHI14Fd+N/RdWLeo lR5eWmMdQ9t/n76/PZoh16DmrbC7ITY= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=KU3OVDST; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf24.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1702387220; a=rsa-sha256; cv=none; b=m6oe3CBtAYPgo+tz1N2rxs28lx35b891HSaVHf+ylSLpsebDukih36h+/FJmSFXFRLBuJL OisduHf/AvXt7zXMjlEGL7hYflXaA39ygVuxVbp+kx9Rl15w6PxZLK8gEIQxTqs+1jZq0q fAKI/c9z3hKETM6M+ABqGljzpQBM1F8= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1702387219; 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:autocrypt:autocrypt; bh=uKbwcVtGQfOTUzJGie+LPzWYJ7P08JR+2TJzFeKTeFg=; b=KU3OVDSTBDYvM9WAWOZgn1y7r2j3+NvmWacBzm4xaWoXDdhfRMeDVM/BSwImZgJH1LeRYS TEkxuYKoJ6d5RySGUA+5qtUZt51+6jplPFOdBT7zRhCnsNCkk0pF97bS9fFspSqI1i4VXE mY79mS6wVHjDDq7WmAQ1j2c4MxFQ1KA= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-497-uwk71P5ENvKL2b0s3ZMDog-1; Tue, 12 Dec 2023 08:20:18 -0500 X-MC-Unique: uwk71P5ENvKL2b0s3ZMDog-1 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-33343bb5dc2so4556371f8f.0 for ; Tue, 12 Dec 2023 05:20:17 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702387217; x=1702992017; h=content-transfer-encoding:in-reply-to:organization:autocrypt:from :references:cc:to:content-language:subject:user-agent:mime-version :date:message-id:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=uKbwcVtGQfOTUzJGie+LPzWYJ7P08JR+2TJzFeKTeFg=; b=wp75Fcdg/D8bWjrOwqobfF5YFzTvgUOpVLA1dHORc2YNnfV5XFgy1lblhBmpl9LLEy E57/y0b7Qs8w6VIkjsjhpcwqwaZMp86vWT4mP9gGv03oECxGMxdDRMfH6l9X/JwOV/I2 X3D1AHwxf8Dupm0ass8pJk/sb9JvpVAe9q3CoiabgnVC3+ronWDJ0GyY2vqML8yIEyng OXwnOoYqjeEyAwGgz0yAgHz9k2z9e2gCzhpd8RpoXvR0OD3Yov8jJc/+Cf1bwmHpeYtd x4q4zGVJgwMXgnikeGssaSvKDLlR+e41O+zoQ+kn00PNBAsjjNCxi7Zbkh4ZRkLNTXQP N6Zg== X-Gm-Message-State: AOJu0Yy3cwXkQkUkoVOomCG5Z0QxqeA8weZCU7F0NUwCkGbOuWAHo0Et EmrHczFDSKpPEiCSf7Og3Q1OsVk9NgUeRj2/7hwnosPap21/fIRnXyHi5CK+/mT4FTous60kL5e jZsgD4E3JngM= X-Received: by 2002:a7b:c4cb:0:b0:40c:349e:176c with SMTP id g11-20020a7bc4cb000000b0040c349e176cmr3287611wmk.46.1702387217078; Tue, 12 Dec 2023 05:20:17 -0800 (PST) X-Google-Smtp-Source: AGHT+IH+CX8gSn29VUJLsCPs38mpsbAIoXQk67d4yemdsbsOpGZZpFf+4FsPWTqd6f9XCDxXYjRtTA== X-Received: by 2002:a7b:c4cb:0:b0:40c:349e:176c with SMTP id g11-20020a7bc4cb000000b0040c349e176cmr3287602wmk.46.1702387216604; Tue, 12 Dec 2023 05:20:16 -0800 (PST) Received: from ?IPV6:2003:cb:c74b:ca00:4ca2:ff2c:9092:f070? (p200300cbc74bca004ca2ff2c9092f070.dip0.t-ipconnect.de. [2003:cb:c74b:ca00:4ca2:ff2c:9092:f070]) by smtp.gmail.com with ESMTPSA id v14-20020a5d4a4e000000b003333541a5bdsm10845248wrs.80.2023.12.12.05.20.15 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 12 Dec 2023 05:20:16 -0800 (PST) Message-ID: <0481e512-8a1a-4b47-a4d9-94a06745b683@redhat.com> Date: Tue, 12 Dec 2023 14:20:15 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 4/9] mm: Remove some calls to page_add_new_anon_rmap() To: "Matthew Wilcox (Oracle)" , Andrew Morton Cc: linux-mm@kvack.org References: <20231211162214.2146080-1-willy@infradead.org> <20231211162214.2146080-5-willy@infradead.org> From: David Hildenbrand Autocrypt: addr=david@redhat.com; keydata= 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 WNyWQQ== Organization: Red Hat In-Reply-To: <20231211162214.2146080-5-willy@infradead.org> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 6928A180026 X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: y8kdzut5kxuzgco4cpcdmuij3n3k6a89 X-HE-Tag: 1702387220-320944 X-HE-Meta: U2FsdGVkX1+XU933l3neO62UFGXLx3TwbM0PZMrCPHS9jDlq4a0PHVcNFABlsLGhtparyXLYYJT3uRcqLrTrAirvZSzCaUiqMHiGg9WhKj8wDEa4NgnxsVbTTuabVRIbD1BHWga0pDDzBXLZjx22/PSYgTTgs70saNhE1BatUGSFy19CZJCPKdbPMP77Y2BdEjATyt6ToMeMDO2oj9GzvfIEEIiWp6NAmqpyifh5V5+3YnIZGIAkSGUT+F/pBaImO5WioFSiAX3k+xbQ287X5PRt1SQkjJawxMg42H+/2ggxd0RDcgLu3/xaVNm3muxWiF8wpf6paWqeBtzX13OlnmdxNLb+OE8yOqvHc1jq1kIXZO7CgAo+/5wCsqsWRWMzC6ov4Prm8x52icHSBVIMbhLkiH94L1Z+3C4CV2k7UjpquTMHcOgNRcJhEITH5e/ceITMn4XPchWv1xNUHFLGUliZN1fOo3kQZFUZbJh1ZpQUmPtmVaN96dtAvxmFSkpRrxK9E4xrqUbmPBF78tDpuSZhdli2crTvolSiWwDRcrMTLR0Rz+CvaUWa3SFwjk0l+e/8eOnbzGwW9Wopr68P0SKlNOg30I07GdwfuAhB25k4gLtKSm9wU/abDU5CK8xYDvq7krq1OGn6+RdETbYZydpyxKC/4Que+RBN7uaf0TVj8anft4ZURKp5EqRiZONHUIhtO+VPSsXEXTe6ziKhIbwyu4RNvZrJEDI+TugWIrsTr7RcRXWNwQmh6FXDaqmDDJ0gn+lIGNXuL+cbutCDXKu4cxOM/JSp/DPTryBr3L1AASrRKMgYVVnLD1pSsg45QCMW3MdDMigy/qmxc0TaRxVeQ0HHto1Vtzg8SqrQP1DLCj1K3uq6Oq2jxAEczGMa5WyV2u2cSY3IYkJEub/YSuADD3Zgt8G9+LINlFYfWHU4GsASdJH2UPe89c8xCM28jKAaHA0rfDa8G2UA4r5 4jH0Me0S 9U4oXzdDhuPcr+vdwi02bN62gFtZEHySEzgqy2Rfw4qca7X07LA7NjlOP4D/0DIwsdt3olaoH0BXB5mr7Y3PQ+AJC0QQZV/9kYDGUdLYkWj5QXwOuSN+yn1ccuqcdypLFkAnCFj0WErxQXm8Sd0UFbSNp78YEDfQnuAkEzagtTT6obS9rGGp2YQ2L0p8hdAF7V3usg2eewjWoD3tydi/UdkJ7yTTS18nRDG7M/uH36h7j3X9O+i0HsJOFjh2JB7MKNI4E3zU1UXzcgJK8XLYm5aH2QcCft64umNNdywx2BZPUxTykF3U3uz2ZgJCH9lppqIKmLbUTZW7Br/z4f47AYoVOqDZMPQNp6gkKT54ci5jgYwJIJkG7uTd1KOWLsj1EjifFNpwGBNsQLdiJGRGUI1ywo/fnHPI3cujz4bT4c7V9lK9N44YiyQXnHgJggIHGmXLvsa2RnnUOBBPqD/PvZjWiXoiNb5uk1o+wngY1VjUGgeDZ9GMSA/L+nc9xiiyxDhoKwMqnR6Uh4UJ7UvY9O1uK3tQk67xT3opOo4SNW45dT1U= 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: List-Subscribe: List-Unsubscribe: On 11.12.23 17:22, Matthew Wilcox (Oracle) wrote: > We already have the folio in these functions, we just need to use it. > folio_add_new_anon_rmap() didn't exist at the time they were converted > to folios. > > Signed-off-by: Matthew Wilcox (Oracle) > --- > kernel/events/uprobes.c | 2 +- > mm/memory.c | 2 +- > mm/userfaultfd.c | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c > index 435aac1d8c27..8b115fc43f04 100644 > --- a/kernel/events/uprobes.c > +++ b/kernel/events/uprobes.c > @@ -181,7 +181,7 @@ static int __replace_page(struct vm_area_struct *vma, unsigned long addr, > > if (new_page) { > folio_get(new_folio); > - page_add_new_anon_rmap(new_page, vma, addr); > + folio_add_new_anon_rmap(new_folio, vma, addr); > folio_add_lru_vma(new_folio, vma); > } else > /* no new page, just dec_mm_counter for old_page */ > diff --git a/mm/memory.c b/mm/memory.c > index 318f923134e4..c03a7729d5b4 100644 > --- a/mm/memory.c > +++ b/mm/memory.c > @@ -4068,7 +4068,7 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) > > /* ksm created a completely new copy */ > if (unlikely(folio != swapcache && swapcache)) { > - page_add_new_anon_rmap(page, vma, vmf->address); > + folio_add_new_anon_rmap(folio, vma, vmf->address); > folio_add_lru_vma(folio, vma); > } else { > page_add_anon_rmap(page, vma, vmf->address, rmap_flags); > diff --git a/mm/userfaultfd.c b/mm/userfaultfd.c > index 71d0281f1162..2d8b03a009b4 100644 > --- a/mm/userfaultfd.c > +++ b/mm/userfaultfd.c > @@ -116,7 +116,7 @@ int mfill_atomic_install_pte(pmd_t *dst_pmd, > folio_add_lru(folio); > page_add_file_rmap(page, dst_vma, false); > } else { > - page_add_new_anon_rmap(page, dst_vma, dst_addr); > + folio_add_new_anon_rmap(folio, dst_vma, dst_addr); > folio_add_lru_vma(folio, dst_vma); > } > Reviewed-by: David Hildenbrand -- Cheers, David / dhildenb