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 D3247C04A68 for ; Sat, 30 Jul 2022 04:25:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E67446B0071; Sat, 30 Jul 2022 00:25:27 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DEF7A8E0001; Sat, 30 Jul 2022 00:25:27 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C8FFF6B0073; Sat, 30 Jul 2022 00:25:27 -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 B6B956B0071 for ; Sat, 30 Jul 2022 00:25:27 -0400 (EDT) Received: from smtpin31.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 865A7C024F for ; Sat, 30 Jul 2022 04:25:27 +0000 (UTC) X-FDA: 79742477094.31.641294B Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf30.hostedemail.com (Postfix) with ESMTP id 8E2158003B for ; Sat, 30 Jul 2022 04:25:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:In-Reply-To:References; bh=9lqr4PZyWhD9hoFrN8Igs1ekeXOVn9WRDM3RAtHu+m4=; b=GO350Yww1jvAcuN5cW7i9E+80D IevaHjyT3LMi+gQp86ckipKcHO9hrd3zQL5ATa40FEpHyiiKJq5rqRZsRk1u6573QzTQ9qnuDafBj 6DpjRjx7AdzExR0+5nZiJqe090RVn8Pxot71K2Jr7FokOdT2NJdXaiVt/RB3jBhhQIu51oDzbMiAY p1kW9NMe1VmRjk0iGqg4uLlHxZ5FNhJ2Cc/qDVHxXp69cmNSjcNlF4C//E6RfMYX8kfOHEAE/CK8H tn1a3sN8dCpAI+25JpKWNP31HFrwBfAJfckWIuc3wly7v5avp209TYbckU4NlyKQmlomazF66hshi 5WSZv4kA==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1oHe2T-005J2C-HY; Sat, 30 Jul 2022 04:25:21 +0000 From: "Matthew Wilcox (Oracle)" To: Hugh Dickins , Andrew Morton Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH] shmem: Update folio if shmem_replace_page() updates the page Date: Sat, 30 Jul 2022 05:25:18 +0100 Message-Id: <20220730042518.1264767-1-willy@infradead.org> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1659155127; a=rsa-sha256; cv=none; b=F4kDV/yIb/Oubj0S3aedlqqQfEeCa1q6kDhTfv+HVHgpd4MgCn3V6TG/JxCjEzFIYjyfh3 4mvbVEAGzJFRPV2X22Ak2XnV5yaLTCN0MDhQbwWmDpaDrq+4ib2ny8jpo3b98aLNfgXD+v G4PsuHgegT+4RY+zFBm9k+pZ7c+u8m8= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=GO350Yww; spf=none (imf30.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=1659155127; 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-transfer-encoding:content-transfer-encoding: in-reply-to:references:dkim-signature; bh=9lqr4PZyWhD9hoFrN8Igs1ekeXOVn9WRDM3RAtHu+m4=; b=u787SpoUzkKy+4XqjOZotRaPs9rZzzFAOpAzmDVuM7iIUgSPJJq16BeuUHb2NtiDpCz2Mg Q1ennYbmR9+dDviozFjEv7IaQ0/lmHFmi4R/41fxTkXnfuxXr8swPWWTZJ6Hb0FjXxz5rF 5YPR4snaeBTnuhgfM1SNuAwxzu2n2uQ= Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=GO350Yww; spf=none (imf30.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-Rspam-User: X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 8E2158003B X-Stat-Signature: 8xb1o8tj9p6hnbanwmibguyg9pfrfoaq X-HE-Tag: 1659155125-200679 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: If we allocate a new page, we need to make sure that our folio matches that new page. This will be solved by changing shmem_replace_page() to shmem_replace_folio(), but this is the minimal fix. Fixes: da08e9b79323 ("mm/shmem: convert shmem_swapin_page() to shmem_swapin_folio()") Signed-off-by: Matthew Wilcox (Oracle) --- mm/shmem.c | 1 + 1 file changed, 1 insertion(+) diff --git a/mm/shmem.c b/mm/shmem.c index a6f565308133..bcc0a3c7b5bf 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -1771,6 +1771,7 @@ static int shmem_swapin_folio(struct inode *inode, pgoff_t index, if (shmem_should_replace_folio(folio, gfp)) { error = shmem_replace_page(&page, gfp, info, index); + folio = page_folio(page); if (error) goto failed; } -- 2.35.1