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 CF9CFC433EF for ; Wed, 20 Jul 2022 17:30:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 376CB6B0071; Wed, 20 Jul 2022 13:30:15 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 325506B0073; Wed, 20 Jul 2022 13:30:15 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 216386B0074; Wed, 20 Jul 2022 13:30:15 -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 11B326B0071 for ; Wed, 20 Jul 2022 13:30:15 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id DA1ED160254 for ; Wed, 20 Jul 2022 17:30:14 +0000 (UTC) X-FDA: 79708166748.25.9B8B0D9 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by imf08.hostedemail.com (Postfix) with ESMTP id 6D2DB160007 for ; Wed, 20 Jul 2022 17:30:14 +0000 (UTC) Received: by mail-pl1-f170.google.com with SMTP id y24so2342511plh.7 for ; Wed, 20 Jul 2022 10:30:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=Rx8rt8DSIUeHX6RAsMm/L9RMy0w3saa8ciGlU/4Uq+I=; b=IOoXTZvRjEgC4J2p+3VlrjgtzZmL2SGd0qRlIMwru/ghLvt3kuSPdEFMfF+a6YoKZD k05nZBpq3jBkRRVHlW1RDuh0nepf7s5Mo58XxGNNzGG2jSI05njC9fNc1KykPlvV7R8M 0kEXBpgkL8IaJ4BlmMUDM+RW5fyPXKQdLC38F9iHUNQq0oFqjFfGhKzYGuGaytPadYzL 8NY6k0vnbQUB+AESBxyDWBlG/YxDkMYPfPLT/NiUb2hgY6CYmTEgypnF6ZarSOZ99UZC FyWQM5AWAUQjn/dWJutAqIoZ6oaIdHc2A58/uHPF3YxUppey7JwqfpWyTShe9V4/VfLS U4/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=Rx8rt8DSIUeHX6RAsMm/L9RMy0w3saa8ciGlU/4Uq+I=; b=MPJVRaIBHl89GVv6qH83DAFi7OURdxzcsZAyvFcTy9dkXjQ8o2h3oMu7siVOSDyulC r9FwU67faWotk/IKpm1DNPMcwp7ySYc1iCUs3Ghuz2ojUlbLk/h9o66R7b/gx/hAcAtQ lyq6b+E/wiRCQWwGbbYBTYMDjHaf/Std2S4bmpMECq3V48HGZO+o8IR9+zBaHz3XQm48 xMC7ubIWhQQ5vdhmuxzEcHGDo/PiQmn9mWBsQ0vpIliI+lHp/OnqQxsCRgry147P2ZFi ty6dccB+66LwfVyh4bhzZ7Hy6tvE2HHUrXWUH7wjUFW4WsFgCEhDK2iZ4n4VlHU7q1uR yHQg== X-Gm-Message-State: AJIora8uHs6h9AJc13cG8L376nno+YEFxzLqOtI9rfekPSWWTrLV6M5Z mZLo16oqflNZaiZm4iRLesUZsG854zk3hPoTEFE= X-Google-Smtp-Source: AGRyM1tqlWKBuXvyjJpUPHNmvbLRVHeixxxQgVmjTUteBi+i8nRt8oF3kyq/QnFfYWemXQ9frohrPuvTOgR5oS1tw9s= X-Received: by 2002:a17:90b:2384:b0:1ef:8506:374e with SMTP id mr4-20020a17090b238400b001ef8506374emr6610902pjb.99.1658338213560; Wed, 20 Jul 2022 10:30:13 -0700 (PDT) MIME-Version: 1.0 References: <20220720140603.1958773-1-zokeefe@google.com> <20220720140603.1958773-4-zokeefe@google.com> In-Reply-To: <20220720140603.1958773-4-zokeefe@google.com> From: Yang Shi Date: Wed, 20 Jul 2022 10:30:01 -0700 Message-ID: Subject: Re: [PATCH mm-unstable 3/4] mm/khugepaged: delay computation of hpage boundaries until use To: "Zach O'Keefe" Cc: Andrew Morton , Linux MM , Hugh Dickins , Miaohe Lin Content-Type: text/plain; charset="UTF-8" ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1658338214; a=rsa-sha256; cv=none; b=7d7gM04d+PvXhK9TMwI2RbqsL6I159bGuplAKa0P/0YnyW8C6slG+7wq5K3k9VpMyRh8i0 6WpUIRq8iSnocKuBo/bniE6QG9edNCRzzYPuQ/LwzntaCqIxgo1wiOMSk/qZMWz2mhi4/U 42aeTmBvGkemk3DugNsYcQrRr3hJrCs= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=IOoXTZvR; spf=pass (imf08.hostedemail.com: domain of shy828301@gmail.com designates 209.85.214.170 as permitted sender) smtp.mailfrom=shy828301@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1658338214; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=Rx8rt8DSIUeHX6RAsMm/L9RMy0w3saa8ciGlU/4Uq+I=; b=sMDOxrZv25lvaMhc/Imt9YN4GdiARZgYoMfE3+kEt5fBDyfEaSNzPZro15uCO1/8toxF3T AfuEcSwsusdPrCIl/G20FTDBYgoRJdOrVqXBpPh1hmuhs5uKZrWxwT692pi7BvXW6NnmzX BoirlT3ysOIRt0quuS7pAYyPhejm4vA= X-Stat-Signature: 6t6z5xrfwtgirwuo8zx4t8busj8hkpjf X-Rspamd-Queue-Id: 6D2DB160007 Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=IOoXTZvR; spf=pass (imf08.hostedemail.com: domain of shy828301@gmail.com designates 209.85.214.170 as permitted sender) smtp.mailfrom=shy828301@gmail.com; dmarc=pass (policy=none) header.from=gmail.com X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1658338214-775606 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 Wed, Jul 20, 2022 at 7:06 AM Zach O'Keefe wrote: > > Only compute hstart/hend once we've passed all checks that would > cause early return in madvise_collapse(). > > Fixes: c9d968ffd9ba ("mm/madvise: introduce MADV_COLLAPSE sync hugepage collapse") > Signed-off-by: Zach O'Keefe Reviewed-by: Yang Shi > --- > mm/khugepaged.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/mm/khugepaged.c b/mm/khugepaged.c > index 290422577172..70e9d9950415 100644 > --- a/mm/khugepaged.c > +++ b/mm/khugepaged.c > @@ -2417,9 +2417,6 @@ int madvise_collapse(struct vm_area_struct *vma, struct vm_area_struct **prev, > if (!vma->anon_vma || !vma_is_anonymous(vma)) > return -EINVAL; > > - hstart = (start + ~HPAGE_PMD_MASK) & HPAGE_PMD_MASK; > - hend = end & HPAGE_PMD_MASK; > - > if (!hugepage_vma_check(vma, vma->vm_flags, false, false, false)) > return -EINVAL; > > @@ -2432,6 +2429,9 @@ int madvise_collapse(struct vm_area_struct *vma, struct vm_area_struct **prev, > mmgrab(mm); > lru_add_drain_all(); > > + hstart = (start + ~HPAGE_PMD_MASK) & HPAGE_PMD_MASK; > + hend = end & HPAGE_PMD_MASK; > + > for (addr = hstart; addr < hend; addr += HPAGE_PMD_SIZE) { > int result = SCAN_FAIL; > > -- > 2.37.0.170.g444d1eabd0-goog >