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 0A49AC48BC3 for ; Mon, 19 Feb 2024 09:59:40 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 902B96B0085; Mon, 19 Feb 2024 04:59:39 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 8B2716B0088; Mon, 19 Feb 2024 04:59:39 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 72C068D0001; Mon, 19 Feb 2024 04:59:39 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 5DC866B0085 for ; Mon, 19 Feb 2024 04:59:39 -0500 (EST) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 2E8EAC02C4 for ; Mon, 19 Feb 2024 09:59:39 +0000 (UTC) X-FDA: 81808106478.18.E7594E1 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf04.hostedemail.com (Postfix) with ESMTP id 15FBF40015 for ; Mon, 19 Feb 2024 09:59:36 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=HcKSa3OA; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf04.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=1708336777; 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=iYvXgNdLaHw3ujE/n2XKOuevGadOq+EBwYGAh+snpR4=; b=i3kxRBVxKEvvW70C3+dXSSV09C2IFvoNFbFTWUQB98dMp3XZR0mUJjEesY23luSL2QhnoF P76g0T7uWANzRdVRx3ZqIBvQB4zYI18TMoW80bDoYuGZCQhRMLMQC9q6QTIYTLkRlD9VQ1 snckXq9rTBJm/PiUEAnGDeSO8LKuwJw= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=HcKSa3OA; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf04.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=1708336777; a=rsa-sha256; cv=none; b=4FUT4inVIqxqQ8e9w4Gi410ed7KqgdeMMs3yZJ6faY9slaL9oAciM0Ka4dZEqNFCsk4fa9 Hv7jV99OMcaYyq7Qs7PnFWCmEujL0PEGz7ne90ij8CxFVgX1TbuuEsbNA3OTUu1Gnptl8a ny5zs2FqM6s3pb3AZOFsQMsBPmrmbDE= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1708336776; 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=iYvXgNdLaHw3ujE/n2XKOuevGadOq+EBwYGAh+snpR4=; b=HcKSa3OAm6FmtO6CW5VcrtPAaSx2Fsvs0NCiCwMHJsJ2OPwNq9jCUS2GPZBba8cOWAn4aL q+LNlEvSEATyrJrysnuqP0r1qgCK5IyKzFwGpnrAVeoCBWoSXAumWIo4u+Fj7/+ztgXZgQ LiBnOe6HqQ17LVW//uc9p3BGOH+MkDg= 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-373-p3Z5ZF9-PFKcASgvPHRZlQ-1; Mon, 19 Feb 2024 04:59:35 -0500 X-MC-Unique: p3Z5ZF9-PFKcASgvPHRZlQ-1 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-33d29de76abso775535f8f.3 for ; Mon, 19 Feb 2024 01:59:34 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708336774; x=1708941574; 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=iYvXgNdLaHw3ujE/n2XKOuevGadOq+EBwYGAh+snpR4=; b=wLMa0C+bXtIGYP7CwZIHSpfubfxBRgXRQqXPGphaeGuZj72Ahr2ea49xqcqiV+fpsY mzCSi4FACmYOsCnOK/Y16lQJJ411ySn0vGwzBHvV2WlYFWK+fqZhNVvjdAplkdsX37Gf hqumYLG29BE8B5PmBa9DDF3G2UyKoTq9ZOF3KL6WNtu5d1ehq4Gzq3HIOWML9oK47/os WOxCj66ywbngs59huazqYQUiTAh4bPoBSJshco+xBsWJtEQxV/lo3PNs7o3QNvAVwRtK gykQlWz9nWgFeGFL/CcT6ES22lh0OtOVRz9vJiKbpwSUebU1dmlDoKwPjUINWabHbmSz gnMQ== X-Gm-Message-State: AOJu0Yza9cKdgpiVbOOETNyOWSGxsgYMYXVpfgPWUK5zV0ErRKwsQ/A6 rUKObfEbC4QXIyf03Fenjvb8NKnHyS8Lm29Oey9Bnm850KgSgabPjMPRPlZNNBhQsU8uTG5b7L7 QLvs4Qncb4XxosHFc4YIGsMSPT1zxwKRzEHR54s3yEYVzMqMiuiAvuSd/ X-Received: by 2002:a05:6000:1d2:b0:33d:1321:e9ad with SMTP id t18-20020a05600001d200b0033d1321e9admr6540790wrx.42.1708336773906; Mon, 19 Feb 2024 01:59:33 -0800 (PST) X-Google-Smtp-Source: AGHT+IGvKXExpzmHVLSe7C2KtW+WI++O5PyoA3RdfvyWN7ztbyqQ1+MnDxqBYDSpNNR7FJeBO56hzA== X-Received: by 2002:a05:6000:1d2:b0:33d:1321:e9ad with SMTP id t18-20020a05600001d200b0033d1321e9admr6540779wrx.42.1708336773501; Mon, 19 Feb 2024 01:59:33 -0800 (PST) Received: from ?IPV6:2a09:80c0:192:0:5dac:bf3d:c41:c3e7? ([2a09:80c0:192:0:5dac:bf3d:c41:c3e7]) by smtp.gmail.com with ESMTPSA id d2-20020adfef82000000b0033b75b39aebsm9900734wro.11.2024.02.19.01.59.32 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 19 Feb 2024 01:59:33 -0800 (PST) Message-ID: <936b78a8-0309-4171-afb5-bcbdd358ea0c@redhat.com> Date: Mon, 19 Feb 2024 10:59:32 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2 18/18] mm: Convert free_swap_cache() to take a folio To: "Matthew Wilcox (Oracle)" , Andrew Morton Cc: linux-mm@kvack.org, Ryan Roberts References: <20240217022546.1496101-1-willy@infradead.org> <20240217022546.1496101-19-willy@infradead.org> From: David Hildenbrand Autocrypt: addr=david@redhat.com; keydata= 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 WNyWQQ== Organization: Red Hat In-Reply-To: <20240217022546.1496101-19-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-Rspam-User: X-Stat-Signature: y4f4ckmbwhyfc63tuzadcn1a7xmhd5gs X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 15FBF40015 X-HE-Tag: 1708336776-434499 X-HE-Meta: U2FsdGVkX18XsxTEt+g5zHrdywL1Jti3bmzGjwqaKGzjdZpOO6j72HczllwHO/4PVslMSjmeJIlkug9uE+wNH51I3PFAGhT24SlcQwdJxENsex2KXkB4+pilYLf0HIV1uN9uxrRc1LQJGAwIXB3dH8TQP4OzgIT8abNRnh+OE8aqdsO3t2o9XckSXSR3fxS6I6NuJ5Ln2dWLRDGdITVkcIw4j/N75b9/9zRxP4ralfq7TObQSHLlkC6hM5RyjQjuRWnm3PqBtTde4+o1YdNm7PrDbf08OzkDG3nM8E0L3y8XhIXAvUUwhct2Oelgu05K8zCkNvITQy84MTkjDCGdZXvMKEFrNC07DVFaAKI2CjWKUbDWttLJp+vx/D5tTDi751jvKSnLUm0TrsFt6HqPSzxqkoYLKctI+ReGAwEXqUld/HNMma2afjcpwAR/sljJnyylS/e2hz35FYEQGcoiyAPaMhGHFM5+u7dAoGms3MsrYX2Z11tRzvuCWGtfGIcxDgiW4Jfl3gUoAvyBfoJkmDI1p7UXhVAO0omVXEh5r0jTEVfr0/uhDdt/Y+ZTafv495uxQnl6F5cSK5TOxhD0cFzzPYeFYJvbpy/n+R4ev3PErGruEbORLcJmxGsoPuiNvv5ac+W2yjbdYiDGkSRAnpuuP/qYOdbccnwh59q1d+PfkDr+6cOnm2bUMI9lLnkO5CTg18WLmD/eoNFKM7R1XbFfWLXGbx80F03PiNr2M5B2UbDyDxH2yX1U9j+5gVOevNA6FFyX10CO9TNCw3WoZlBboKJbjTivpPHWhDsTu6Lk4IZS8Cxb7h6QO3uB0y33xBsWO+z2x1bvm0BPcLFywwXrM0LyyeY9J5pzCIgrh//Ak3iMtmuepY/L/3iyIEbp8Rt+uj13CuZAULYWYSBiLZzQvCUP3f8qmDZKcgGME/ihO84Rz6QextLFir0b1pxi2v1SK4QnUmexwfEQacA 4Av8n5i6 v/tK5JO3FwzPjOGhjOPwBfC6r/OEvxAxUmE0OXR+fJ9C6Yx5OmbzAmtP61VXddrARVl5cuOICF1yaNXNWsXwCP4ZbHm+p5MXqVmni3YZEq0x9panmWK4OH/gXOVoBEq+CnTuiKLSqcZHFNhh/3pASMle+t0Hi97khgrCCKHNYibvjvlxZdifItRNrpm/dMB+Os7OFojNgZQhrYZ57WuG44qAp1A== 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 17.02.24 03:25, Matthew Wilcox (Oracle) wrote: > All but one caller already has a folio, so convert > free_page_and_swap_cache() to have a folio and remove the call to > page_folio(). > > Signed-off-by: Matthew Wilcox (Oracle) > Reviewed-by: Ryan Roberts > --- > include/linux/swap.h | 8 ++++---- > mm/khugepaged.c | 2 +- > mm/memory.c | 2 +- > mm/swap_state.c | 12 ++++++------ > 4 files changed, 12 insertions(+), 12 deletions(-) > > diff --git a/include/linux/swap.h b/include/linux/swap.h > index 3e2b038852bb..a211a0383425 100644 > --- a/include/linux/swap.h > +++ b/include/linux/swap.h > @@ -440,9 +440,9 @@ static inline unsigned long total_swapcache_pages(void) > return global_node_page_state(NR_SWAPCACHE); > } > > -extern void free_swap_cache(struct page *page); > -extern void free_page_and_swap_cache(struct page *); > -extern void free_pages_and_swap_cache(struct encoded_page **, int); > +void free_swap_cache(struct folio *folio); > +void free_page_and_swap_cache(struct page *); > +void free_pages_and_swap_cache(struct encoded_page **, int); > /* linux/mm/swapfile.c */ > extern atomic_long_t nr_swap_pages; > extern long total_swap_pages; > @@ -524,7 +524,7 @@ static inline void put_swap_device(struct swap_info_struct *si) > /* used to sanity check ptes in zap_pte_range when CONFIG_SWAP=0 */ > #define free_swap_and_cache(e) is_pfn_swap_entry(e) > > -static inline void free_swap_cache(struct page *page) > +static inline void free_swap_cache(struct folio *folio) > { > } > > diff --git a/mm/khugepaged.c b/mm/khugepaged.c > index 5cc39c3f3847..d19fba3355a7 100644 > --- a/mm/khugepaged.c > +++ b/mm/khugepaged.c > @@ -731,7 +731,7 @@ static void __collapse_huge_page_copy_succeeded(pte_t *pte, > node_stat_sub_folio(src, NR_ISOLATED_ANON + > folio_is_file_lru(src)); > folio_unlock(src); > - free_swap_cache(&src->page); > + free_swap_cache(src); > folio_putback_lru(src); > } > } > diff --git a/mm/memory.c b/mm/memory.c > index e3e32c5b4be1..815312b2dc48 100644 > --- a/mm/memory.c > +++ b/mm/memory.c > @@ -3376,7 +3376,7 @@ static vm_fault_t wp_page_copy(struct vm_fault *vmf) > folio_put(new_folio); > if (old_folio) { > if (page_copied) > - free_swap_cache(&old_folio->page); > + free_swap_cache(old_folio); > folio_put(old_folio); > } > > diff --git a/mm/swap_state.c b/mm/swap_state.c > index f2e07022d763..3f58d6fd5b44 100644 > --- a/mm/swap_state.c > +++ b/mm/swap_state.c > @@ -283,10 +283,8 @@ void clear_shadow_from_swap_cache(int type, unsigned long begin, > * folio_free_swap() _with_ the lock. > * - Marcelo > */ > -void free_swap_cache(struct page *page) > +void free_swap_cache(struct folio *folio) > { I wanted to do the same, great to see that you already have a patch for it. I was wondering whether we should call that something like "folio_try_free_swap_cache" instead. Anyhow Reviewed-by: David Hildenbrand -- Cheers, David / dhildenb