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 39324C001E0 for ; Mon, 23 Oct 2023 04:59:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C5EFB6B00A5; Mon, 23 Oct 2023 00:59:19 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BE81E6B00A6; Mon, 23 Oct 2023 00:59:19 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A89406B00A7; Mon, 23 Oct 2023 00:59:19 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 936846B00A5 for ; Mon, 23 Oct 2023 00:59:19 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 5FE2E14067B for ; Mon, 23 Oct 2023 04:59:19 +0000 (UTC) X-FDA: 81375522438.07.5CD48FB Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by imf10.hostedemail.com (Postfix) with ESMTP id 71916C000A for ; Mon, 23 Oct 2023 04:59:17 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=linaro.org header.s=google header.b=DEUTzY92; dmarc=pass (policy=none) header.from=linaro.org; spf=pass (imf10.hostedemail.com: domain of dan.carpenter@linaro.org designates 209.85.221.52 as permitted sender) smtp.mailfrom=dan.carpenter@linaro.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1698037157; 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=MhhWhviPx7niC6LySiMSC2jRYxiUkdoa2unztX8UO6A=; b=Ew1oTzdrsH+nqa+iUGPBoZ0DqOt2tIo0YpbLKJQR+x/WWhUMVa7fyP6PcXk59woQriXo0H PQgJ7JUR9IXUWXwuzdr9DQdnzmLSfoG8SCVDWbkGWu9KDkD2oxwGFjPr/hYpu1MKh11pDL 86/Vo6Rr5CN/YFTpKqoQUpwLMdEX0Rc= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=linaro.org header.s=google header.b=DEUTzY92; dmarc=pass (policy=none) header.from=linaro.org; spf=pass (imf10.hostedemail.com: domain of dan.carpenter@linaro.org designates 209.85.221.52 as permitted sender) smtp.mailfrom=dan.carpenter@linaro.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1698037157; a=rsa-sha256; cv=none; b=1wndqsxefSYe4nffYk7ETssob0czz1dcPRIHw/dcHzEInUmImqd7KeRUo7Fxlk2Sb5qPg+ nDgP9h/7sfvID9E4me1+3ys/BbRqSTg1g5fgTkdbASPEeGQ2/ieuVg0djHNjD0+e+P9dvU LOAoEGWRrD32wKpZyLxmW12l3VMxNOY= Received: by mail-wr1-f52.google.com with SMTP id ffacd0b85a97d-32ded3eb835so1166337f8f.0 for ; Sun, 22 Oct 2023 21:59:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698037156; x=1698641956; darn=kvack.org; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date:from:to :cc:subject:date:message-id:reply-to; bh=MhhWhviPx7niC6LySiMSC2jRYxiUkdoa2unztX8UO6A=; b=DEUTzY92vE23kDfPHQHYhSOrNQ+rs0IZhmJWFvY9doHmp92HjrcE33F6xtUuBw5xS7 PoCl5SLMkpg07MhrbCvk9+PZ2cUjyk8lS3YADzxi0+IXEWOqTF0Cb4ravcWWJPD1fU3g LlRsXkAhKgzuLjvx66vHRzpFdrEHnE/UqKLu3WpSRUOoEbCWWQ9566VOz8/xDb121N+E KEhwj2aZiblP5zr6hFEccL13WblKqaTsCYKHhMnRcFUJeThvy84Vn27oD++eDfil/aQx MX2Z38poKD4sFAcFUeBAs1mBHj5+/dVGz7GX0Ebm67I2X7e/Cf9ldPYjQl1kpqmyQacQ yNEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698037156; x=1698641956; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=MhhWhviPx7niC6LySiMSC2jRYxiUkdoa2unztX8UO6A=; b=QmBcYWlO1oPWN3LU65Qi//keTFfEyH+8BZ+j5Qoan3dQChcAf52cps5I6/Vrsb4LmZ smxr/lypDzrAx3rCIsXLiSf3kuDv+S706YyK/GPYZGWFMQvi8mZUtMkvve1CpSiD3vaJ Vp0p5+NEX79WnU4/7BkPoqgSBV1OWKRP5Td0ADQsayWegwsJcFV/HnGXkuXbvAnEtN6K Obx1Ews2MH7FivWW45LLRklqbtWfIptQh8I3Q1+oswwt0iYZ9MYSkVOcfwm5KYZRhDZE Dy+zsnoZ8pN5fjFUnxGnCKfCpMbYdRLjB38abZsMzv6zQCPE9Zfv9qUDH7gjLYXJpmQW YaQg== X-Gm-Message-State: AOJu0YyiAIKHJWt41Ffdgh8HJmRJlubD6eduT1CqQWt5nBPaK9gpbs5w 9SIArT31Zd81j489xL6XWgOPig== X-Google-Smtp-Source: AGHT+IG11S0kNIyWszNtmWWIkkB0hPJiW3I039K/bNzSxvKwGVaXZlCtOitbNSkvOfTWwdUNHR1ZDQ== X-Received: by 2002:a5d:6b47:0:b0:32d:b411:4667 with SMTP id x7-20020a5d6b47000000b0032db4114667mr5757773wrw.30.1698037156022; Sun, 22 Oct 2023 21:59:16 -0700 (PDT) Received: from localhost ([102.36.222.112]) by smtp.gmail.com with ESMTPSA id o15-20020adfcf0f000000b00327de0173f6sm6859039wrj.115.2023.10.22.21.59.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Oct 2023 21:59:15 -0700 (PDT) Date: Mon, 23 Oct 2023 07:59:12 +0300 From: Dan Carpenter To: Vishal Moola Cc: Andrew Morton , 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: <183a70ee-cf95-4101-b89b-e274c210229f@kadam.mountain> References: <0882a964-770e-418c-9c34-1a64195baafc@moroto.mountain> <20231020093626.bae70759c0f0fe5ee5159eae@linux-foundation.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-Rspamd-Queue-Id: 71916C000A X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: z7xrrszbtur9uuyezxbdicsfo3eangdk X-HE-Tag: 1698037157-867608 X-HE-Meta: U2FsdGVkX1/jeUxPvQwjnF9ZOb5H0dhWtV/OsurUj0/umAlzINkmnQgODoR3O5APfxn6ai9ZbGhKjQFOEzxyfdiwu/3kmbsK82ifexhz3i5jqc+w1Y/HroXdgMhTHb73mjDCOb0FuuTbZW32bsrNO2CcbiwNjfe5fLhCz/xurNpGTjbDUOTyALyp1l0VeJ1hhbrUlCKTbxzAc7qwFrnTOiM/f8hFDZwgVxLp6LliKCQj+qA1XXPt8oNv5J6cc8XtE7baRHL55mO8F7fcTluM01qoOd6VX0RXzbfgmHo2976YgFX5P7wOmLFjtFGpxNV2EUlpsVEyZxNMOL/W0C8VZ2K8u3m+iXZQkRllXxtQXL1DnoE6PJB4c9T2CfVzvRpp+Q7cARo+jt6wXWGJ8tbILYtfM5BzsAVNd7LrGRPv8hnu2v3Xz07kUhKPu7mhOm6ytNOitm96/q+qIFpZyJJkZG+Ft9QwaibgiQOFFZtbShgcseND+BAH9Ji5r6hF0bppYBlRIozZEgBdgCuuQetAzIey6BJXn1LBBz2/hRzRsdbJy8Kfy9H0RM/Sw5UpT2GXTbZ0zxlxsnhnrLV9u/HMTfF3rxGVoOJ0L7W5uqeILY0HQCywIpUpEvxBLDzLQRXFPZdQMkHqAQYiGDvlh/UvsiXhXVdOL4Cn/ye/cK3h3xf0WoQpTjpRrG+IfP+QhqwC8Xit2NGL8NGoNdDq2GcwE+3aX8pDpYzaz5WIhGXsag7Y8sdh7wQtQGKXI4Mlj8S5mjBAsKmglNqNUUrLyRA5M2Rw81wxD88gzapBY53JgDD2H3hqOqjZNAfV87zJUbjo6EKUkWt9Bopj7gnnEL7zV1lDilc5o5ClCBB/994ozpIcnGJKlFl4vVBtkp2+PQPoSZlYw+L158IFnmKVxocoZWOlqV/D80FX9nyMLBJoXOYN4kzYdQQi0wyzpRgwgMteSy7+SnWvg2r9pUzN79o zR/3+kE7 IO/6L/erw1nInYG2YPsJfDkW5bX/anKSipLUUg16xCn5U4eSsjJDg++UFTfYzQV+qqF47hkb7QToGLW5NWwJYO77E/AO2dMG9jIDh7ZEgkGpHIBszz23i641K6XakI4It1gQQU2wJpwH2eb42iIT/lKfPBafoyLd5q7KghfPUFSFJG9PFBDgAw7FLlI9WS6pe2V5IU9hOK8+ajzF4nF29PBAuOwmXE2CdATawFvvgHRO2HqdO5VIKyx3t1R2h5vN+9C7+H1IQt3D1vhfnESsus/zrhyYD/CshqXLzLV6UEjbjgCBY5Wy4Q9HH9GeO6ngZRnCQcAV0lF3xB4y1jilLDCLp2V3rqrbHnledUvdLl5fyYK6sM7QfB7JVoiBihYqEhCnOgWSNuDiUjOKVGrQaN6fapWbEVjyw8rj+d8Qtu8G8ieRek/hwsBwrfj98dtaEfACmGMXMQCTDOLP2kozQNXdiEGSTPa/ET7hHUsbjNqcudORfiXic1AduMbBJblkIJQLI18nLqHoY2QqyNYc6rH6ZVdSpYQc798CIMZAKU5E7msorlAMVxTg5M6/oO8nQ3TKZnkTEzXA3E5PYUOc+pfoZGSjUBwY+EfwxH/EYh/U5Rc8vHaf2ngxAFdu+/u3r69L3XIBk5BZuXgn0mgM9T7t0tXaDEO4JHO/v 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, Oct 20, 2023 at 09:49:15AM -0700, Vishal Moola wrote: > On Fri, Oct 20, 2023 at 9:36 AM 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 = 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? > > 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. Only this one was introduced by your patchset. The other bug is older. I don't know why it only showed up as a new bug now. I had guessed that it was other changes I had made to Smatch which affected this. regards, dan carpenter