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 5FC31C433EF for ; Mon, 28 Feb 2022 22:18:55 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8019D8D0002; Mon, 28 Feb 2022 17:18:54 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 796B98D0001; Mon, 28 Feb 2022 17:18:54 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 62B7C8D0002; Mon, 28 Feb 2022 17:18:54 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0045.hostedemail.com [216.40.44.45]) by kanga.kvack.org (Postfix) with ESMTP id 504888D0001 for ; Mon, 28 Feb 2022 17:18:54 -0500 (EST) Received: from smtpin26.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 0A0DA180CB064 for ; Mon, 28 Feb 2022 22:18:54 +0000 (UTC) X-FDA: 79193604588.26.ECC9250 Received: from mail-qv1-f51.google.com (mail-qv1-f51.google.com [209.85.219.51]) by imf31.hostedemail.com (Postfix) with ESMTP id 9C4C92000A for ; Mon, 28 Feb 2022 22:18:53 +0000 (UTC) Received: by mail-qv1-f51.google.com with SMTP id ba20so15114867qvb.1 for ; Mon, 28 Feb 2022 14:18:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:from:to:cc:subject:in-reply-to:message-id:references :mime-version; bh=vHUXjjTOJUnOVh1KjSSIc8DhEaoa5c6bb68ulmkm40Y=; b=P7zhWVDCSnLZdcQ2e6MPj5NNLpPZLLEt8iJEHFp7I8u6/+H0vsWzzFJvFKyiiID++v krE9xYrleurtAkMLLo2huDhAb9UD0oVHwbIDY59bfh41YdKrZt/1teH8vej2w1uO/O+h XcQkww3P2wAE16mk5ej3juPjdW+k9gExxVaqhaBuxTf8EhboWRBhCWZbzpU0DrjOc8yN XdMPcXIaYlbDJs7+SNkVGe1B520xdgE1Viic+deWLHBlMBSds2Jd/wQSJ3h/Cl94IOKX UQgk5S7KKncvnYEBY1OcH1OysRKzBTRgB+DCDrbfCVlGZ0fQh5qVbNjgWysZM1rYG8YO 8dJA== 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:in-reply-to:message-id :references:mime-version; bh=vHUXjjTOJUnOVh1KjSSIc8DhEaoa5c6bb68ulmkm40Y=; b=WBbjrcqtouQDlh98m9F2EsRBFvV1MmocdeAJ/5Q+1mWN7R6K22XS3BiDuZuKovOSH6 y1Sdpspub3Rj0FO3ZgOjjeLw+YY5pfKPdHY822Mq6TG7ZWIQSAblKfnMCeK+fADNwExt gEM4HvPgAkxskaOLws8h1we+W/6D7asojDS/+kSGWfqNel5Ymz7KGnPXyxAYZZ7eBxQ5 zIH82+8HY9sL3NugCo5a2y7efR342FIfmnhkRQhC2l1H6tAb0rOL8rPAXr0z2sg3vJCd TPCTqbrNSZ6zsCrlMQP3X8Wud3MsEdNYngaQf7uiyZ2S+OwK1ObPt8n7Lf8ZfaL2lEGK k9lw== X-Gm-Message-State: AOAM532x1vMgrIaRIfdmW1jqVjmbbM+2dP02EXIRzZ0UFFoEwTEjZG0J fjZCFHRRK/jbooMe3fZokQc/aQ== X-Google-Smtp-Source: ABdhPJyoVikr3UJTRFDWLmqDfQ88YTQLK4od5iytOTtG7b0JdZ15w6l9iemdwtmiLXnPEfiu6J3o8Q== X-Received: by 2002:a0c:be89:0:b0:42c:38b2:9d17 with SMTP id n9-20020a0cbe89000000b0042c38b29d17mr15427630qvi.50.1646086732747; Mon, 28 Feb 2022 14:18:52 -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 h17-20020ac87d51000000b002de919e3187sm7965329qtb.28.2022.02.28.14.18.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Feb 2022 14:18:52 -0800 (PST) Date: Mon, 28 Feb 2022 14:18:39 -0800 (PST) From: Hugh Dickins X-X-Sender: hugh@ripple.anvils To: Matthew Wilcox cc: Hugh Dickins , Andrew Morton , linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: Re: [PATCH next] mm/migrate: fix remove_migration_pte() of hugetlb entry In-Reply-To: Message-ID: <561c5d85-93fa-3926-2d3d-30f83e99ab5c@google.com> References: MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 9C4C92000A X-Stat-Signature: 4thh5zugmff63nd8qsdsqf43gctioxft Authentication-Results: imf31.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=P7zhWVDC; spf=pass (imf31.hostedemail.com: domain of hughd@google.com designates 209.85.219.51 as permitted sender) smtp.mailfrom=hughd@google.com; dmarc=pass (policy=reject) header.from=google.com X-Rspam-User: X-HE-Tag: 1646086733-458077 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 Mon, 28 Feb 2022, Matthew Wilcox wrote: > 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; > That looks nicer to me too. I'll assume that's what you will add or squash in your tree, and no need for me to resend - thanks. Hugh