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 7AC0CC3A59D for ; Sun, 7 Apr 2024 03:43:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C2E876B0082; Sat, 6 Apr 2024 23:43:33 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BDE596B0083; Sat, 6 Apr 2024 23:43:33 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id ACCBF6B0085; Sat, 6 Apr 2024 23:43:33 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 8F3E46B0082 for ; Sat, 6 Apr 2024 23:43:33 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 01EE41407B4 for ; Sun, 7 Apr 2024 03:43:32 +0000 (UTC) X-FDA: 81981341106.06.402BE04 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf23.hostedemail.com (Postfix) with ESMTP id 14C5B140004 for ; Sun, 7 Apr 2024 03:43:29 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=AonR+Ltt; dmarc=none; spf=none (imf23.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1712461411; 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=lSX+Sh6C6Cxk9tF1Wa1FDPt+TC5nT94+hqsj0TdK0sA=; b=lo5I3N/imAcGoYkA44VzF+oPwpNOaA3HyFbb0GBrpnZbVcQWpRAcsYqm4Rwgv6mc9JBjaE zReuD2VZWQWugwBgne7TfSEyeebj81oL/AcDEZ++Q89FsPpoGmiTcSd1Q9E8riK7UhaAJy ilBf1L0AGyLG3uVC3qqaDa6HsB1Vo0k= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=AonR+Ltt; dmarc=none; spf=none (imf23.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1712461411; a=rsa-sha256; cv=none; b=kaSGkq/WTV+X/A/8c75AZAEmb/ez2qdg3Hv8Kev3vSfhd23Sw2zAgWhSVmfh+lhV6Yoizc J/VRKw39IMusBUeRcyR/VOUw0QPNI/zPyx/UnEACbSg1b3JMgkEje1Yjl7ejB0qSHgghX8 yRnIRfdQMHxvfV7a+Rdn0PAsD2wJBzg= 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=lSX+Sh6C6Cxk9tF1Wa1FDPt+TC5nT94+hqsj0TdK0sA=; b=AonR+LttiLWl6cyNnXisAHMYW5 CX8Hj+N1TPX72UuYA40of/5utSV7L2AVyI/WqRlBKP97zJk1FVUwLiLxKBYybeg/HIU0hbv9OAwEE lpnlv9TIyKwpqT9PGwPT6CYEdATw1dQLM3EOyrCkyJlt5gLfdMW+b2J4tK4N7ot1wcW2XPMAK7nBs RcteNUoL4NSeSiUzg+m4ntqolOgoR8nNsFQeKoStaQJjsyphBN5kqIUFJUXSoikkZ5HTM53tX3hwH fzzoAbTeVJXZ6d+hWfjzhoSdvkCCbMtwMxMFDqdDm4tF4oTcHmthPe9UtUWieH51GNHWKtKnBTMpt kvcI0HcQ==; Received: from willy by casper.infradead.org with local (Exim 4.97.1 #2 (Red Hat Linux)) id 1rtJRH-0000000EGpf-3fCE; Sun, 07 Apr 2024 03:43:27 +0000 Date: Sun, 7 Apr 2024 04:43:27 +0100 From: Matthew Wilcox To: Vishal Moola Cc: Andrew Morton , linux-mm@kvack.org Subject: Re: [PATCH 6/7] khugepaged: Use a folio throughout collapse_file() Message-ID: References: <20240403171838.1445826-1-willy@infradead.org> <20240403171838.1445826-7-willy@infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Rspam-User: X-Stat-Signature: xj9guw84iq6p8sgdn47aef53toyugbw7 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 14C5B140004 X-HE-Tag: 1712461409-497848 X-HE-Meta: U2FsdGVkX1/Ft5J3snEL03yA0VBzGWIq4GHvv3ixZr/vLSjsvd3249gd9T8wLxCfs+3fd/qlMa4147TgqML734TgD9JvoAVx00dnuESyl69Cfl3laIB+4woPvj9E/K/YJcD2t/Uu2saq+fM9hVmpUu2KeSM40457GGKSL50vIpqz3TSqxYzx3NYdyP+7CHUtk8uToLgf2+M00k0St2K8eHfM7xt+Dcuo34PYS2pLhLnwZHfv82QS7zalFygO6WRYytwPhChwpE41EKiEqqxoKTm/IX2+013LD/bDi9CJSkgASuio4mRq751yx/HM/Y2vr828fYGAlm9gmlE6ugvRgqkQqWhvswedZn0LFyG5bC4bpz/kH3wo8PGfqxOYtvkEnSuRFGgftABgedyqEWJExYXsP+s0ndWZ+lYvxpET4lt/BSi66vrl0mZpCMDx93XVaRfWCAJoAiFdCv7gvmpNJ4Ac7o+pwc/vEeH1cOJoZOSPA4rG8LAx6mwo18yovdKaZwXeKXuAAgd55wLzEcdcCcoNspqSwD+yDJQovWn9L7WWuNTzYTrJLcs/BYAs96DUbg19Ok5oy2NsNNkCIvOL41U95MoxhzcOStL6KzlyCjK2DxA4hBzZfktEj2dqNoUwmVRTfOxgS9jOqP9WNZGvm1z7ymcoDUuy0wwHS2ww1/CPIhCZAhleuswlfmM2cfGzTdUmrrP+51mLhC/u+Z97ED5SHH9go0qKwe/JQtfKWVNIJSiMAfsNi+9gFukO0OQSL3BOdi0CJtu3022Gzq2QPqNmN0ceCldL/9TAP7cZJcNZJXXJPVwTHIiyb3xO62zYe6DbRleNYhpt5DuFj99KZL5bTafNtIKgkRamuZJlDPZhEv2voeu/ueLEzV5xJEhCD9Rv7lBl30FzRBx6cURUVUg9T+vLx+gc 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 Fri, Apr 05, 2024 at 02:20:28PM -0700, Vishal Moola wrote: > On Wed, Apr 03, 2024 at 06:18:35PM +0100, Matthew Wilcox (Oracle) wrote: > > - page = find_lock_page(mapping, index); > > - if (unlikely(page == NULL)) { > > + folio = filemap_lock_folio(mapping, index); > > + if (unlikely(folio == NULL)) { > > filemap_lock_folio() can return an ERR_PTR(), find_lock_page() handles > it internally. Argh. I keep forgetting that when doing conversions. Thanks. Andrew, if you could attach this fix ... (the unlikely() is embedded in IS_ERR() so no need to keep it here) diff --git a/mm/khugepaged.c b/mm/khugepaged.c index 6a96a85de56b..89e2624fb3ff 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -1865,7 +1865,7 @@ static int collapse_file(struct mm_struct *mm, unsigned long addr, /* drain lru cache to help isolate_lru_page() */ lru_add_drain(); folio = filemap_lock_folio(mapping, index); - if (unlikely(folio == NULL)) { + if (IS_ERR(folio)) { result = SCAN_FAIL; goto xa_unlocked; }