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=-10.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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 D07B9C433ED for ; Thu, 8 Apr 2021 15:57:46 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 63AF96113A for ; Thu, 8 Apr 2021 15:57:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 63AF96113A 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 CB9246B0083; Thu, 8 Apr 2021 11:57:45 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C8FD16B0085; Thu, 8 Apr 2021 11:57:45 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B0A0A6B0087; Thu, 8 Apr 2021 11:57:45 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0059.hostedemail.com [216.40.44.59]) by kanga.kvack.org (Postfix) with ESMTP id 8F9206B0083 for ; Thu, 8 Apr 2021 11:57:45 -0400 (EDT) Received: from smtpin33.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 3725C8E5F for ; Thu, 8 Apr 2021 15:57:45 +0000 (UTC) X-FDA: 78009655290.33.91774CF Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by imf05.hostedemail.com (Postfix) with ESMTP id 25547E000108 for ; Thu, 8 Apr 2021 15:57:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1617897464; 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=NinlbVPhwGdJcoVcBt2udn4w5X18/v4CvahbnKLeeMI=; b=NEdeqkDHiTCWJJwaZxmkSrX/82crujOncZicm/U1g2O2KiPxUtDQwgSRpHdduYvi8paM+w 2KpRuzyOlPja2/pba5L/L3g+U1eLfDts5DYyuRhlmlAnNVVaoBZcFwQl5ymSC1OyyFiyo5 xLkxwnSmSzVKWi6CleVnNHQKHylabfY= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-413-0tkXerksNmuLEQR_9ITDFg-1; Thu, 08 Apr 2021 11:57:42 -0400 X-MC-Unique: 0tkXerksNmuLEQR_9ITDFg-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D1B2A107ACC7; Thu, 8 Apr 2021 15:57:39 +0000 (UTC) Received: from warthog.procyon.org.uk (ovpn-119-35.rdu2.redhat.com [10.10.119.35]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3DE165C1C4; Thu, 8 Apr 2021 15:57:32 +0000 (UTC) Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 3798903 From: David Howells In-Reply-To: <20210408145057.GN2531743@casper.infradead.org> References: <20210408145057.GN2531743@casper.infradead.org> <161789062190.6155.12711584466338493050.stgit@warthog.procyon.org.uk> <161789066013.6155.9816857201817288382.stgit@warthog.procyon.org.uk> To: Matthew Wilcox Cc: dhowells@redhat.com, linux-fsdevel@vger.kernel.org, Linus Torvalds , Alexander Viro , Christoph Hellwig , linux-mm@kvack.org, linux-cachefs@redhat.com, linux-afs@lists.infradead.org, linux-nfs@vger.kernel.org, linux-cifs@vger.kernel.org, ceph-devel@vger.kernel.org, v9fs-developer@lists.sourceforge.net, Trond Myklebust , Anna Schumaker , Steve French , Dominique Martinet , Jeff Layton , David Wysochanski , linux-kernel@vger.kernel.org Subject: Re: [PATCH v6 02/30] mm: Add set/end/wait functions for PG_private_2 MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-ID: <46016.1617897451.1@warthog.procyon.org.uk> Content-Transfer-Encoding: quoted-printable Date: Thu, 08 Apr 2021 16:57:31 +0100 Message-ID: <46017.1617897451@warthog.procyon.org.uk> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 25547E000108 X-Stat-Signature: 3ztnd8y87mrsr8pf1m3ncwefqk3pmydi Received-SPF: none (redhat.com>: No applicable sender policy available) receiver=imf05; identity=mailfrom; envelope-from=""; helo=us-smtp-delivery-124.mimecast.com; client-ip=216.205.24.124 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1617897463-658201 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: Here's a partial change, but we still need to deal with the assumption tha= t page_has_private() makes that its output can be used to count the number o= f refs held for PG_private *and* PG_private_2 - which isn't true for my code here. David --- commit e7c28d83b84b972c3faa0dd86020548aa50eda75 Author: David Howells Date: Thu Apr 8 16:33:20 2021 +0100 netfs: Fix PG_private_2 helper functions to consistently use compound_= head() diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index ef511364cc0c..63ca6430aef5 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -699,6 +699,7 @@ void page_endio(struct page *page, bool is_write, int = err); */ static inline void set_page_private_2(struct page *page) { + page =3D compound_head(page); get_page(page); SetPagePrivate2(page); } diff --git a/mm/filemap.c b/mm/filemap.c index 0ce93c8799ca..46e0321ba87a 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -1461,6 +1461,7 @@ EXPORT_SYMBOL(end_page_private_2); */ void wait_on_page_private_2(struct page *page) { + page =3D compound_head(page); while (PagePrivate2(page)) wait_on_page_bit(page, PG_private_2); } @@ -1481,6 +1482,7 @@ int wait_on_page_private_2_killable(struct page *pag= e) { int ret =3D 0; = + page =3D compound_head(page); while (PagePrivate2(page)) { ret =3D wait_on_page_bit_killable(page, PG_private_2); if (ret < 0)