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 3DCD1CDB474 for ; Fri, 20 Oct 2023 16:49:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A8E9D800B8; Fri, 20 Oct 2023 12:49:29 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A177D8D0003; Fri, 20 Oct 2023 12:49:29 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 890D2800B8; Fri, 20 Oct 2023 12:49:29 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 711AD8D0003 for ; Fri, 20 Oct 2023 12:49:29 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 3BD62140402 for ; Fri, 20 Oct 2023 16:49:29 +0000 (UTC) X-FDA: 81366425658.20.49CBC15 Received: from mail-oa1-f52.google.com (mail-oa1-f52.google.com [209.85.160.52]) by imf25.hostedemail.com (Postfix) with ESMTP id 70152A0010 for ; Fri, 20 Oct 2023 16:49:27 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=HRT6JJbs; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf25.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.160.52 as permitted sender) smtp.mailfrom=vishal.moola@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1697820567; 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=+yT1FhZ3b/ibL0Fh6OvbZfjd8B9u/pcLk4nz41h94Ws=; b=iEll59FyLVxdo+gUpmcjz1DCjKmCPiqY/ovW2XFn8S6wdcaYZQG+JDzE688htLIBi4wvZZ FQ8q75MkGSqnqLqem5cdcuwLKRBd3aSIu/ZZIIx4wjKMNpsAEfEZZEKRGQxdcbLDX9nQ3+ ytPGW1Yun/baz1cTNMuMe8DFj8FJXF0= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=HRT6JJbs; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf25.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.160.52 as permitted sender) smtp.mailfrom=vishal.moola@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1697820567; a=rsa-sha256; cv=none; b=bW0qdn+k25BxnPj9IhRtEiAhsGK+lQIERIy5mlc9zsY2NIZsvulez5T8B8rjhEga+Z6oqi K7oudX45yXe3VuHBFPXegJAqgGeSxenJYE1s6iG5bDS7x+FrrZ6gN4xr0NDe4Sxtn+5FNa oM4SyDx1QdSX1P49JkVLSIWnlxW6ufQ= Received: by mail-oa1-f52.google.com with SMTP id 586e51a60fabf-1e10ba12fd3so804748fac.1 for ; Fri, 20 Oct 2023 09:49:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697820566; x=1698425366; darn=kvack.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=+yT1FhZ3b/ibL0Fh6OvbZfjd8B9u/pcLk4nz41h94Ws=; b=HRT6JJbszVExxIy+3mKYGA7AAuGWcIlsrC9inof+E4dJmkCjm71ib0IMgAJH6xua1u OxpaJSjd1WEa7KCKCE4tqfX+Xzol5MRw+vduJfbilS81Ij8/MmiDusKzgHv1CmotaStL T32oJ7wYwgPhpK+T1usvkqeRK3XHXwx6WMaKpLYqY6u8VGzIwNcjn//vEAXbIVXG6mMg B9nVbf5552qG6LXOKR7qY3U7HbrTSwjxCzyvMhNxjr8bDAQz100jm3iB++JjVZrk9NCJ fxQT7y+jxi4AMIqoseu2EVOXW0DwO+X3rWYGDZvGQmEb20olgPzLTlHeOuvWzYlvc5F7 XzgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697820566; x=1698425366; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+yT1FhZ3b/ibL0Fh6OvbZfjd8B9u/pcLk4nz41h94Ws=; b=S9/SGK1euF9FibKDhManFIwgZkFTJc40WLj2KG/umzcFQSd99pdy2eGsLLCNJmvrSW kGSjjhEc1q82kbAIjGMeNEc6lEMkrm9WpShEk6Ef8chIf5bmymuQ6JxvMh7PGyfu+aLI 0YdezrhnyzmcLunvQSoQjZNWGO834LPeTeg12UPlvf4NNVBb0S+ncBjtRiLi8UcYO9J5 EOC0QxxeK/U9BjIgMS25C18ZYh4eMqibaRgLVRMmXCNo9NPSAeFjyYMGZpFOPUfHPSl/ 5PlUNUFVK8Uca7gSkM7mJRwxYNBMjU0xWwfAxnm0/OgKQIaQOsPT9Vt9jQ8OQMvv2JGU cw0g== X-Gm-Message-State: AOJu0Yz8KDBkwYPaM2pF0FwMAFlcQXIpCobPqnXcylFpU2K1S/gWdmI1 a3lUcWRksjG1dj8afIUheO4BDBxXFrRaZ43wXss= X-Google-Smtp-Source: AGHT+IFe2AqbZem12Ct2F0B+zqQDX0QDjsDeIc2tnLVO7E8floLQHExpjbvePO8+PcbOomECrxwTzTDZ6GiaAD/y3q0= X-Received: by 2002:a05:6870:1382:b0:1e9:e5b2:759b with SMTP id 2-20020a056870138200b001e9e5b2759bmr2068365oas.40.1697820566310; Fri, 20 Oct 2023 09:49:26 -0700 (PDT) MIME-Version: 1.0 References: <0882a964-770e-418c-9c34-1a64195baafc@moroto.mountain> <20231020093626.bae70759c0f0fe5ee5159eae@linux-foundation.org> In-Reply-To: <20231020093626.bae70759c0f0fe5ee5159eae@linux-foundation.org> From: Vishal Moola Date: Fri, 20 Oct 2023 09:49:15 -0700 Message-ID: Subject: Re: [PATCH 2/2] mm/khugepaged: Fix a NULL vs IS_ERR() bug in collapse_pte_mapped_thp() To: Andrew Morton Cc: Dan Carpenter , linux-mm@kvack.org, kernel-janitors@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 70152A0010 X-Stat-Signature: pwujkearx43hcrokohwcfdztt3jnczr8 X-Rspam-User: X-HE-Tag: 1697820567-374172 X-HE-Meta: U2FsdGVkX1+K0zdkX8kysDKxDQKlEPRSTgPSZJ0eJNTf808xPTbGQT09gwAIsH5Ah5ZlLwEhfFL/5/UCanee/OmiC2vJM/6Ip8wmPOy8tikal5jZd438XJGt55WQgNTb6TTOHS5oGLq7otIrx052aX5v6E0w/raHrpicv59aZXMx9KoV43VYHEaIXbEFMUJyebmLtPkZxnYjGuPgd4lQKCZOM6ij7iOIXmtwj6LchbSkig42BWFPiJxn1K6tY/Uw5a0HS8iyb9OhjZjvJbyy/ccnYyMEewXfjpNs1PYn8Kqj757Xrlz+mG6oQp+MT+J1FC0X0Sa2F00McP3fsCHQL6+MWTEqZcYEPkoVS1i4IVNCqWHt1OWuYgZHMhCqKbzVH/MmxLW0fzNKwig0U7x5Ut2M85Yp3lvgn71XBhlvi+wb/Kj9QZ4tK9E5M41LAdOqHargTchBSX8KFOPZ4OOTGBIcbxd9dMM6tUBpq0qLb79ERhG0xIYYetBwtrMfQFw+rit4+u4xVFQ18F62TboPZnkzvUfCmY0NuPtA63wZh8ufbRg5Ggoo4RiSDqV2SpaQCDYWhw2yLjUgzjxMSRzLyUo8BwSugFzv9GGbndGioruj1dRq1l7P7tZHUUWhGUqF1okl4hpSAS8oGHqRBaOtyEhPw9g33dFrk8pziP3BswJ4uECC3CAlv8W97ropN3imSii+rs5Fa8A1JoJ44mKWwg0cf5gmb+FdwbP0U1QM1qgtS+LihoLGpbmxXKyxa3ZVdqUaZnZjDzZwyNvH3v2lY5U2SdFkDmifD6E++o6qyx8hwsXgbY4bkAVb2RGm5OmihG4EmCpu9pfJDBpbd+gMBJWtw/qKYiuujfonQ1QuxCXOqFQCtsAIXc6ApTct+VtvAa56EKiWkyDeaeMNVwVsRHheEdUO5u0injCV5LQcusOFhfJAxxDa0pXACGRd0j+FSdyyQSQaJSuqFn6PBpC NIaCaco9 h15kzqrVnglXr1tT+bJXabR6785ji/y0aFukGyqfw/edg986dwwVhBp0jK5zolTz2Llyy8oYb22NKHQtelAOFcuR/2CrE/JGwlQV4+41MStkMnQYbRW+yS4aHGHiIAeBSH3CR091tWYeLf+X1BTiJ08f/oyk1Ug90aANCWBMl0QG/8LXqQ2EKkXN5zjjWu604JAIjLnn0ZgY7rA21LRjabKJKSOxt4Ymos6cFCrAMOiwqjkfJcaVK1ons+AWSLWtNq7dhPP75lPWduq9BjXsbU6se6MbiiGR4VNozEh87jVC81G476ciii5UthKHnf3oxntfXol4dX00wefGkCoDfILb4wITKBZHXZVYeAD1Pea/b2Htnv5CxxBTTy+VZuHoKDB7OUYkZ6zDRFESM7PQIXxe3WDfQKnLV257JOq9s1uf74mUz4eHk2Bzui/wqAetsLTnpdgrdo8shrUGFU7Li8RTTdG8MeDjDKg2bSJy5ycI478PoobfkOy61JbPtV6qxvgD/Z2awHjgJkxX3QJ3LZX7Z+ZcR3VUoWlm5srAmzVkBefyrgJJMPg+Yg+n0LytmyzK/vdC0y6IqLfAJjJqQ2mYeR/PBSXws54GPQge1JaaNreRIh9DeA6n2Srz7zk+SJugXF7KluyEHFrI= 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, Oct 20, 2023 at 9:36=E2=80=AFAM Andrew Morton wrote: > > 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 =3D 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) !=3D HPAGE_PMD_ORDER) { > > Also doesn't appear applicable to current kernels? Thanks for these. Both these fix patches address issues introduced by my khugepaged folio conversion patchset: https://lore.kernel.org/linux-mm/20231018203213.50224-1-vishal.moola@gmail.= com/T/#t Andrew already dropped the patchset from current kernels so I can fix a couple issues, v3 will include all these fixes.