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 4E839C43334 for ; Fri, 10 Jun 2022 21:17:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C09738D00E4; Fri, 10 Jun 2022 17:17:50 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BBA238D00E2; Fri, 10 Jun 2022 17:17:50 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A80BC8D00E4; Fri, 10 Jun 2022 17:17:50 -0400 (EDT) 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 954088D00E2 for ; Fri, 10 Jun 2022 17:17:50 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay11.hostedemail.com (Postfix) with ESMTP id 5D0AC803E4 for ; Fri, 10 Jun 2022 21:17:50 +0000 (UTC) X-FDA: 79563588300.08.4429DEC Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf12.hostedemail.com (Postfix) with ESMTP id 7538C40081 for ; Fri, 10 Jun 2022 21:17:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=In-Reply-To:Content-Type:MIME-Version: References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=dPCOWM5CyDEIdIuBSxjePp4f8SSu/SKCJnmsXTUdDp0=; b=H/uguj+Wl5DQo9Vix4WTb9P9Qz L3+C24pFO0kvbIu1KKcP4oVLAW0MPkjH36cSK+5oKXA61lH8Ik4WuTBYal6HxocDDl+IvIKG4CCwL qMYlFEtD8mXy6yOt5Sgb3+UVlhpMqyWoPpvjDn3H3qAjkbV7cG6coeM3c8vmcNboFD8Xoap0GQfCH 198oRccDnDnojUeQZLgFD8CTZuFsqMSEqnlQmY48fZ9D/l9Bs8bop7G9eLDZqxL2TbtpRPL1eiwtg Fc6e9lthrSLvnei2DS7h37o1aENF/y3X0CXCwJvu6vkLxR7ewRCMntvOhjp1rS4ybHxIfs6En+aMm PTXk3bZQ==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1nzm0e-00El5e-Cd; Fri, 10 Jun 2022 21:17:36 +0000 Date: Fri, 10 Jun 2022 22:17:36 +0100 From: Matthew Wilcox To: Sumanth Korikkar Cc: linux-ext4@vger.kernel.org, gerald.schaefer@linux.ibm.com, gor@linux.ibm.com, agordeev@linux.ibm.com, linux-f2fs-devel@lists.sourceforge.net, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-nilfs@vger.kernel.org Subject: Re: [PATCH 06/10] hugetlbfs: Convert remove_inode_hugepages() to use filemap_get_folios() Message-ID: References: <20220605193854.2371230-7-willy@infradead.org> <20220610155205.3111213-1-sumanthk@linux.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220610155205.3111213-1-sumanthk@linux.ibm.com> ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1654895870; a=rsa-sha256; cv=none; b=VUACVQH2ImQG/NFHLK3RdPuZ6qzTDBwLDwPby4c/bR++xkry8i/D5nPJXOsZSRuGG+mjU/ dJIpCPUgYJaGcva3q/lzR0esy82006fbkDR9sh7KEvjjw2V5FefNcwFkWcNWpVE1npitWz 0uCLUUs061+qftqfrfhguX+MbTn/2XU= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b="H/uguj+W"; spf=none (imf12.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1654895870; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=dPCOWM5CyDEIdIuBSxjePp4f8SSu/SKCJnmsXTUdDp0=; b=fopX5NF8PJN+6dmTddbSLZ3+WOP4SNyeEYWBU25onyMnsQpxjXFIwLi1kw12sWeqKh0d83 +H/lytbuBdLM9qooRSDHaW5inT2rP552bvUqPBhGX4cVba/gFQ7cUuYJyl4N4KAv42Ys84 cOs+rMPRkQRI5RSQGtClkG1T0HkqtSM= X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 7538C40081 X-Stat-Signature: 1scufhmftmkroazjkce95dqjkgnzygip X-Rspam-User: Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b="H/uguj+W"; spf=none (imf12.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none X-HE-Tag: 1654895869-712413 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: On Fri, Jun 10, 2022 at 05:52:05PM +0200, Sumanth Korikkar wrote: > To reproduce: > * clone libhugetlbfs: > * Execute, PATH=$PATH:"obj64/" LD_LIBRARY_PATH=../obj64/ alloc-instantiate-race shared ... it's a lot harder to set up hugetlb than that ... anyway, i figured it out without being able to run the reproducer. Can you try this? diff --git a/mm/filemap.c b/mm/filemap.c index a30587f2e598..8ef861297ffb 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -2160,7 +2160,11 @@ unsigned filemap_get_folios(struct address_space *mapping, pgoff_t *start, if (xa_is_value(folio)) continue; if (!folio_batch_add(fbatch, folio)) { - *start = folio->index + folio_nr_pages(folio); + unsigned long nr = folio_nr_pages(folio); + + if (folio_test_hugetlb(folio)) + nr = 1; + *start = folio->index + nr; goto out; } }