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 D2739CDB474 for ; Fri, 20 Oct 2023 16:36:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 667F8280002; Fri, 20 Oct 2023 12:36:33 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5EF888D0003; Fri, 20 Oct 2023 12:36:33 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 490DD280002; Fri, 20 Oct 2023 12:36:33 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 35C638D0003 for ; Fri, 20 Oct 2023 12:36:33 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 07B25B58B5 for ; Fri, 20 Oct 2023 16:36:33 +0000 (UTC) X-FDA: 81366393066.26.FC5BA02 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by imf06.hostedemail.com (Postfix) with ESMTP id DBBF118001A for ; Fri, 20 Oct 2023 16:36:30 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=linux-foundation.org header.s=korg header.b=XtDvD2Wd; dmarc=none; spf=pass (imf06.hostedemail.com: domain of akpm@linux-foundation.org designates 145.40.73.55 as permitted sender) smtp.mailfrom=akpm@linux-foundation.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1697819791; 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=vaCJgKxUVfN5ueSZL4b+841rFuledGLNh2qyAUliyBA=; b=Y1FhhQyGDJcvveGJu5O2J9B0KHAY4orB6szEtjWdjnn5Kamc0ingsxKALZrwfSjChI3sUQ tfY0RmaF6JDQVk+xyNQ4W2C269oPzpdVC5A2CEwFAnvKcP/4lNDSeLxUjZojYi27NtLt0m tPxfPVDs67Wl7YFhW6sk2wKETXpDAX4= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=linux-foundation.org header.s=korg header.b=XtDvD2Wd; dmarc=none; spf=pass (imf06.hostedemail.com: domain of akpm@linux-foundation.org designates 145.40.73.55 as permitted sender) smtp.mailfrom=akpm@linux-foundation.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1697819791; a=rsa-sha256; cv=none; b=xEkulZpplwVdfnz8uQ2BXt4EXnOQVXqur2ZeHDLuvQtT7wdUQMW6T6OpMrylPKY/HZIpGy JwbOS5bS3jFaNCHn9B6t4OtxENZI/Cv0n44MJvjf9iEjC+IwGzi0p1AVX7WtJZRz4QjXwU 4VhjjTh9R6inpDIOZjDbxK9UcPGP4Fs= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 032F0CE3A0E; Fri, 20 Oct 2023 16:36:28 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1A383C433C8; Fri, 20 Oct 2023 16:36:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1697819787; bh=Idv+lXk7jniUX1EPAr8yWfIxOZuMRZr+NxxGrH1RFgg=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=XtDvD2WdqQAnY+YSwsHXrED2stGOvLENWkLWnEjnRkuoFWtPjW9/U608u7PjGh8vv dHjAkf571sOQKd3QvfRimLVSWrKQxw8in3Fe4wGdLbnE3SsSwGGS0AXJ7aXYL1QUJP aePdqcZnV2xRS9b9k7hKJC78DKpJ9kpdHv1GHerk= Date: Fri, 20 Oct 2023 09:36:26 -0700 From: Andrew Morton To: Dan Carpenter Cc: Vishal Moola , linux-mm@kvack.org, kernel-janitors@vger.kernel.org Subject: Re: [PATCH 2/2] mm/khugepaged: Fix a NULL vs IS_ERR() bug in collapse_pte_mapped_thp() Message-Id: <20231020093626.bae70759c0f0fe5ee5159eae@linux-foundation.org> In-Reply-To: <0882a964-770e-418c-9c34-1a64195baafc@moroto.mountain> References: <0882a964-770e-418c-9c34-1a64195baafc@moroto.mountain> X-Mailer: Sylpheed 3.8.0beta1 (GTK+ 2.24.33; x86_64-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: DBBF118001A X-Stat-Signature: egthcjuno4fodsroghqoeufqd7xugzsm X-HE-Tag: 1697819790-196371 X-HE-Meta: U2FsdGVkX1/2LfmZcXXHz8XBbcj3dJ9LnoUMYXudMqH1QsR4S+CJwfVlqRv641NQpc4tGjSiq9Nm4MgMH5VSYTTkzcKilJijr0ZCS4zEuSCwnV7RaM/GS0XGQ8CsKrujXJ5UDgb1EonG7AIVsuuRJa+PfhDpo+fXklYvvtSBVzTxR/i8DzYpAY96/6o6suRBQrsMYPZWG1mhRj3d7YIK54Um7FJpnHspof1qwA8aHkgg6i/64LhqW/bHvHW7knMDXSqLyTYSSiDH5Rg4OCDaWaw0lRUqPSSADYM/vGBtFOh05MMxQuDF5ZFMnbCIRNfE8MntjbaTOis9q4ZC9SzpSF5EG72Gui+NiT0m7l/NKJmXvnAnS51O5jKgbNv9QdgaTByFZNpADYi2B7K/wRRobirGBPtt+rwPjMKHTeBb632TCfEiuKPzoHse3j+KFVcoiMyJB4sw28dxwawitwIlsR8bsPi1sdZ4afAjIBWEera7CTutgviXqvRCi3ve7bma0m0rE7glu53POBeGfcuFh1NFHN/iJOSGUtQrkrSf3W7xJQAMOoUdcHGIe5c+WZxlJyRkvWqY5INXZVmBxub8lNXwzzm7q+RTWq+fPeBCJvXnSsC/GiUEsK+V8SjY2r1gHwH+qYpoSbWg0fJD8cGsQzl+GWWx0ga/pYZ67jSwE2Rc8KcBd4B2oc4vUs/NsLAHPKotgAO0zGHM7beQC1dtlTe9ywLU5TZDx0S0npGi5y6Xr924eoWAc6RyN7HX1vHDG7MMPkzhemJBN+IMq+aoEQoxGZROouc5L2dKowcRO28hmCupCSuL/oOzDGFlIQnlxLGqRvfACwzYnr9w5SVUNa5hySF/RYwaonCOh6kuxJVeCrLGeyfOFapPAgXw2oLdxO4qEetVm1+EYX0Dkap9UStVwzKOgDD2QXjdV/WyybEPLFElOnXHpc0o9d8wF4TcVrNtLJJ30sm58N6VcJk Sw3buDD8 8OK0Q3sVg5KMunohBJfUfmPC2fIN/0p2fyU3L+mXXzc4Zf55L/heZHvjeb1BWKj0zULAynCff42arfY73bKWpdvjga+ggE3OS9/sj0vKJQq9x41STpAIV6gnDFZFmHd6/v98jhGe4KuvIF6U/KNERfZb+ukmZ0OpZ1E3H97RXtZbs08A778Aprac3IGr5+Af3w3yhLr6vsHZxSpfLfdY8QPAzYmfyJrsOdyJlYzmsL5bIenpb5Bex22QpY4KWo8yLwiMLhUOA55Hm8SuCMHQCgkuRgiMDIqlb8szMefichZGYquVct9EERWghE3A3liI82+iu/a/gECsxCrylJbqEI5+eE4F8XWlzMEr8+/fu+hmmbLt9m+k3Knge3fwapEWLw7SnrkF+KEw1VPvfmP87l5yhzeYgdE5lbOCweFAnvKUvvms= 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, 20 Oct 2023 17:14:36 +0300 Dan Carpenter wrote: > This was changed from find_lock_page() which returns NULL to > filemap_lock_folio() which returns error pointers. Update the > error checking to match. > > --- a/mm/khugepaged.c > +++ b/mm/khugepaged.c > @@ -1508,7 +1508,7 @@ int collapse_pte_mapped_thp(struct mm_struct *mm, unsigned long addr, > > folio = filemap_lock_folio(vma->vm_file->f_mapping, > linear_page_index(vma, haddr)); > - if (!folio) > + if (IS_ERR(folio)) > return SCAN_PAGE_NULL; > > if (folio_order(folio) != HPAGE_PMD_ORDER) { Also doesn't appear applicable to current kernels?