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 32D8DC433F5 for ; Mon, 28 Feb 2022 20:49:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 929518D0002; Mon, 28 Feb 2022 15:49:37 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 8D9F18D0001; Mon, 28 Feb 2022 15:49:37 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7EEAF8D0002; Mon, 28 Feb 2022 15:49:37 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0104.hostedemail.com [216.40.44.104]) by kanga.kvack.org (Postfix) with ESMTP id 732B38D0001 for ; Mon, 28 Feb 2022 15:49:37 -0500 (EST) Received: from smtpin20.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 2D7E39879B for ; Mon, 28 Feb 2022 20:49:37 +0000 (UTC) X-FDA: 79193379594.20.1DEE296 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf14.hostedemail.com (Postfix) with ESMTP id 476AC100010 for ; Mon, 28 Feb 2022 20:49:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=In-Reply-To:Content-Type:MIME-Version: References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=qpQ/kpbf1GOpHDn6LLoilwm/c0J2gkjnAf3qAZ1Z3Yw=; b=uvVQGeVCP5RVFIraAvp5Jlap8q Yd9nzeyRvG3UP22VgcqwfVGiw99QIWnnELJ6igO1X3GuyTdHM+M3qxuhyiMCCMqol/igSkyvcd+gC wpc9LQ4wgQnvUR+n34ov0s8icMHKYzjE6aNKiaasueXfjbPKKhsTHsUZnmC11IOXyLW/hTEDD8Bas VoOoq/JiFRNPOJ2SaIq0OM95JqhoAKf0Gef+KPzIbTMtAXkwGVeOPQVK4LpdlEGDXR5WheFYZMezh nv8/jQk+hI77nLYM7mbCYyJmXGuvvUt5b3qdjnlNvJU8RBJF1ILqDpz71G/VQ9RQpkryzyDCyOmdg 1u13vNdg==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1nOmxU-008u4L-3v; Mon, 28 Feb 2022 20:49:28 +0000 Date: Mon, 28 Feb 2022 20:49:28 +0000 From: Matthew Wilcox To: Hugh Dickins Cc: Andrew Morton , linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: Re: [PATCH next] mm/migrate: fix remove_migration_pte() of hugetlb entry Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 476AC100010 X-Stat-Signature: 8a663syhwf4zxsby41nmexne9s6f1aos Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=uvVQGeVC; dmarc=none; spf=none (imf14.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org X-HE-Tag: 1646081375-831979 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 Sat, Feb 26, 2022 at 06:25:15PM -0800, Hugh Dickins wrote: > - if (!folio_test_ksm(folio)) > + /* Skip call in common case, plus .pgoff is invalid for KSM */ > + if (pvmw.nr_pages != 1 && !folio_test_hugetlb(folio)) > idx = linear_page_index(vma, pvmw.address) - pvmw.pgoff; How do you feel about this instead? - if (!folio_test_ksm(folio)) + /* pgoff is invalid for ksm pages, but they are never large */ + if (folio_test_large(folio) && !folio_test_hugetlb(folio)) idx = linear_page_index(vma, pvmw.address) - pvmw.pgoff;