From patchwork Sun Feb 27 02:22:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hugh Dickins X-Patchwork-Id: 12761517 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 3043EC433EF for ; Sun, 27 Feb 2022 02:23:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4744D8D0013; Sat, 26 Feb 2022 21:22:59 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 423748D0007; Sat, 26 Feb 2022 21:22:59 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2EA6D8D0013; Sat, 26 Feb 2022 21:22:59 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0036.hostedemail.com [216.40.44.36]) by kanga.kvack.org (Postfix) with ESMTP id 204F38D0007 for ; Sat, 26 Feb 2022 21:22:59 -0500 (EST) Received: from smtpin16.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id B70DC8249980 for ; Sun, 27 Feb 2022 02:22:58 +0000 (UTC) X-FDA: 79186962036.16.6929FA0 Received: from mail-qk1-f177.google.com (mail-qk1-f177.google.com [209.85.222.177]) by imf20.hostedemail.com (Postfix) with ESMTP id 458C71C0003 for ; Sun, 27 Feb 2022 02:22:58 +0000 (UTC) Received: by mail-qk1-f177.google.com with SMTP id 185so7822759qkh.1 for ; Sat, 26 Feb 2022 18:22:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:from:to:cc:subject:message-id:mime-version; bh=1vfHk8IgXV9x509jvY8zplci3eeq7Q2rCPdWsLWLaHw=; b=ITJX+LIycQvk7DRc7SzlB5nlr7w9MDymPNVLBONq1Eqnxgho/XvwLuTjl1fsyU8hc3 qxgWWdoQF6wdw0WNHfNLKJLk0xPd7APFoHx28rXARWrZ5/4VGU//GvlObRAPWGbSZKyd ue7dN8F5uV8XYOVGRKbWLLCJZ2q2QL8rWNURqceRWS8fFyJj8VbyDTLvxR1psjjOLL9r gpYekmdc71U9RdenOd56OPTYbYQO7lQnTwjIAsKxE+1NVHxwCGDYXHNz5jI6Au1SMwhr 18YRLjJADJBJK8XhoICZona/j4zG6vR2je+SqO5jxiu+3majTk1VIc6S+ISD726vcbSe NkUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version; bh=1vfHk8IgXV9x509jvY8zplci3eeq7Q2rCPdWsLWLaHw=; b=jmuQ+v6lVXASafkxZfG6pd9LwkYjqT02Xezz/mGwmt0dC3jRLxcEwP2YMaqwVmqZAy OkyN4HfVKDZnkWD0tjCxbWx0eNjmkEMmjcBsxKDQaa29SIfzNf2RoHS5oFfAB2ydc50Q 19oLf3RnzFI1E/qa0jksQAxYcHdvtA3k1AG/SaN9NSx/+Vpb237a7Znttta0bF1HRmfZ OHqtuERJHDRymkYJAmZrbtg6Y185mVqXFm3RQofRqCHAMHQbNSrQyHbIDtX466fnI2Fp CGGHSGYn/36f+lTqROjA45yaQOdI6K19kloSM94k2EQ1lEVufKBq6i7IgKWDHSek3NO9 jL1g== X-Gm-Message-State: AOAM530hfdm787y/8xvYAq1VxOO2swa+CZI6W4+ZLrTUUslz9O/O+951 GEkK56Zkn5j+DLtsVw10rjfuODgYdil4pA== X-Google-Smtp-Source: ABdhPJyeIm/PJhfj4Nk1Rv28GEm1yghQiGSJlYeDyQRtEgC4yNHFLSURoiA668n2vBiwr0kv06pmGw== X-Received: by 2002:a37:a88f:0:b0:47e:1590:d7e9 with SMTP id r137-20020a37a88f000000b0047e1590d7e9mr8558916qke.733.1645928577318; Sat, 26 Feb 2022 18:22:57 -0800 (PST) Received: from ripple.attlocal.net (172-10-233-147.lightspeed.sntcca.sbcglobal.net. [172.10.233.147]) by smtp.gmail.com with ESMTPSA id f1-20020a37ad01000000b0064919f4b37csm3140532qkm.75.2022.02.26.18.22.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Feb 2022 18:22:56 -0800 (PST) Date: Sat, 26 Feb 2022 18:22:47 -0800 (PST) From: Hugh Dickins X-X-Sender: hugh@ripple.anvils To: Matthew Wilcox cc: Andrew Morton , linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH next] mm/thp: fix collapse_file()'s try_to_unmap(folio,) Message-ID: <3f187b6c-e5e8-e66d-e0c0-7455ca6abb4c@google.com> MIME-Version: 1.0 X-Rspamd-Server: rspam10 X-Rspam-User: X-Stat-Signature: 7iaugumic36gaxssdng3dkgk851soo6p Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=ITJX+LIy; spf=pass (imf20.hostedemail.com: domain of hughd@google.com designates 209.85.222.177 as permitted sender) smtp.mailfrom=hughd@google.com; dmarc=pass (policy=reject) header.from=google.com X-Rspamd-Queue-Id: 458C71C0003 X-HE-Tag: 1645928578-35636 X-Bogosity: Ham, tests=bogofilter, spamicity=0.002435, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: The foliation of THP collapse_file()'s call to try_to_unmap() is currently wrong, crashing on a test in rmap_walk() when xas_next() delivered a value (after which page has been loaded independently). Fixes: c3b522d9a698 ("mm/rmap: Convert try_to_unmap() to take a folio") Signed-off-by: Hugh Dickins --- Please just fold in if you agree. mm/khugepaged.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- mmotm/mm/khugepaged.c +++ linux/mm/khugepaged.c @@ -1824,7 +1824,8 @@ static void collapse_file(struct mm_stru } if (page_mapped(page)) - try_to_unmap(folio, TTU_IGNORE_MLOCK | TTU_BATCH_FLUSH); + try_to_unmap(page_folio(page), + TTU_IGNORE_MLOCK | TTU_BATCH_FLUSH); xas_lock_irq(&xas); xas_set(&xas, index);