Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Thu, 22 Apr 2021 02:06:30 +0100
From:   Matthew Wilcox <willy@infradead.org>
To:     Hugh Dickins <hughd@google.com>
Cc:     Andrew Morton <akpm@linux-foundation.org>,
        William Kucharski <william.kucharski@oracle.com>,
        Christoph Hellwig <hch@lst.de>, Jan Kara <jack@suse.cz>,
        Dave Chinner <dchinner@redhat.com>,
        Johannes Weiner <hannes@cmpxchg.org>,
        "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>,
        Yang Shi <yang.shi@linux.alibaba.com>,
        linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org,
        linux-mm@kvack.org
Subject: Re: [PATCH 1/2] mm/filemap: fix find_lock_entries hang on 32-bit THP
Message-ID: <20210422010630.GK3596236@casper.infradead.org>
References: <alpine.LSU.2.11.2104211723580.3299@eggly.anvils>
 <alpine.LSU.2.11.2104211735430.3299@eggly.anvils>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <alpine.LSU.2.11.2104211735430.3299@eggly.anvils>
Precedence: bulk

On Wed, Apr 21, 2021 at 05:37:33PM -0700, Hugh Dickins wrote:
> -		if (!xa_is_value(page) && PageTransHuge(page))
> -			xas_set(&xas, page->index + thp_nr_pages(page));
> +		if (!xa_is_value(page) && PageTransHuge(page)) {
> +			unsigned int nr_pages = thp_nr_pages(page);
> +
> +			/* Final THP may cross MAX_LFS_FILESIZE on 32-bit */
> +			xas_set(&xas, page->index + nr_pages);
> +			if (xas.xa_index < nr_pages)
> +				break;
> +		}

Aargh.  We really need to get the multi-index support in; this works
perfectly when the xas_set() hack isn't needed any more.