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 ACC31C25B75 for ; Mon, 3 Jun 2024 08:59:07 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2D4946B009A; Mon, 3 Jun 2024 04:59:07 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 284976B009B; Mon, 3 Jun 2024 04:59:07 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 174AE6B009C; Mon, 3 Jun 2024 04:59:07 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id F35456B009A for ; Mon, 3 Jun 2024 04:59:06 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 7DAB41408E2 for ; Mon, 3 Jun 2024 08:59:06 +0000 (UTC) X-FDA: 82188977892.23.DAF4329 Received: from out30-133.freemail.mail.aliyun.com (out30-133.freemail.mail.aliyun.com [115.124.30.133]) by imf10.hostedemail.com (Postfix) with ESMTP id 7718AC000B for ; Mon, 3 Jun 2024 08:59:03 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=nCkImw7m; dmarc=pass (policy=none) header.from=linux.alibaba.com; spf=pass (imf10.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.133 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1717405144; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=TzPdstqt9IZKp/sl6m9OBFjYtVVR9pYii9OkkWcJFLc=; b=Ml8DpodRgssw/lOlyMxsl3tCFjyylpgYMNcL6McH3qMOImSN9WgKfrJATKiWIHUuP3pQrC A+a6U6i2k8IhWL+shLyNZdFBctDi9TLXL+OS5kdZSW59Wh+UGbORYrh7OSqmP+SuamZq3x dADmZs9oKXmQec119g2yvHsdj/2NL+w= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=nCkImw7m; dmarc=pass (policy=none) header.from=linux.alibaba.com; spf=pass (imf10.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.133 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1717405144; a=rsa-sha256; cv=none; b=ke6Dc0evdxg04Gnepoh7uYyFQD2rquDZ+IsmoWfvAlG9CqlG9ifx7wxUaYNEzMps8cXxBo vfyK85AaMP+U0aEtSmD9GcNYZRBK1KuaXDVKpxxaTyFlrB+mdyNZGSuhHwF2RDLM/TpzIQ CIcmNOnRHYd8XfM43/IYGPFZthZ6ieQ= DKIM-Signature:v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1717405140; h=Message-ID:Date:MIME-Version:Subject:To:From:Content-Type; bh=TzPdstqt9IZKp/sl6m9OBFjYtVVR9pYii9OkkWcJFLc=; b=nCkImw7mEpRAE+qiSbcFM68Z0cW3cCsPAaCRAAQViiWUdNxgsg9wcUun/LcSydWs2MlQTEsMMiSrRVWmvGsk9FjBfdJOFHe8JA1WSoiS45U7M6ZNUcYM+jHAtiRGdKwx5KKnH2bahSgRlXJv7XBbvyQ3im6NaHwqE9PKt0ioRVI= X-Alimail-AntiSpam:AC=PASS;BC=-1|-1;BR=01201311R751e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=maildocker-contentspam033037067113;MF=baolin.wang@linux.alibaba.com;NM=1;PH=DS;RN=11;SR=0;TI=SMTPD_---0W7lDG5c_1717405138; Received: from 30.97.56.74(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0W7lDG5c_1717405138) by smtp.aliyun-inc.com; Mon, 03 Jun 2024 16:58:59 +0800 Message-ID: Date: Mon, 3 Jun 2024 16:58:58 +0800 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 1/1] mm/mlock: implement folio_mlock_step() using folio_pte_batch() To: Barry Song <21cnbao@gmail.com>, Lance Yang Cc: akpm@linux-foundation.org, ryan.roberts@arm.com, david@redhat.com, ziy@nvidia.com, fengwei.yin@intel.com, ying.huang@intel.com, libang.li@antgroup.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org References: <20240603033118.76457-1-ioworker0@gmail.com> From: Baolin Wang In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 7718AC000B X-Stat-Signature: t4dfrob8p91gbkeyixttk67px1yrfk8q X-Rspam-User: X-Rspamd-Server: rspam04 X-HE-Tag: 1717405143-242587 X-HE-Meta: U2FsdGVkX18GkleUWW43ItrvSNrxdmbyPfygsFVY7YU+jaouWwhgzNWkVT2KlT0DxxFYaC4Z5G/8ad+3dZBjt1Bd0IobkRIW4tjFPtSnXrzgzmr1ct8qg7r7XDN8XimZ7fXGfc08D3RkIDAalRdkIpDpPdsoaH+bXYfgvniYPEg5/slOJq7+zsbeD0/3rvg+dZWi4Zovv/yTyPmKLXieG0hcuETLm2yS1nRIbrVR4SU5T1QUonY126BBoS53eu08WY4c9yqE5pdo7wdI9ox3244P/nOVnWgBE+k82nGJZD0Xo2e7a78Qqt0aQqcF0dP+0K/5+BX52wUCzCqpYH53NaSGjKivgXZMAOTCd0nMgbUbHOwcLnlRfe0jhE3Cc6+CYO+6svKijHujGbTXVtKZyhHf8DzniwqzbSbg7xGzKLO/CX3Otegz6nkVbAtKL1Wa97ke34Nlg3xado+3PwZzbFs3OvWJcGY3v/2hJ1jOFPllgy0HGpaIbQivBQn9LfS3xoaxp+bIUKn6sD2Q7VbPURsXsr7ZRWbkgOT2ty6rFtVKyRSRYVHHtDaz4pe9c334xrbSVgkzJcUlQL7+V1zFRrWrirjaeTaCFWCfCdJk7ickzaHpjWyFWJWA0i1gIjY7kUn0bsi6Sn/GvF/rusgAeTAwYgkSjWTLzvY7phUZ52gxrgsRmMOi4aEtb8DxwZOX8ufo9Gp7g5KcbqK8ljo90486idTjkhg+IlQFdg3ZEJf73dlJcOlSQupCtyhqGObZIc76u3+lgU9BZYixnVP3N2eeXJQp++FYj8OX/+19yU652nmyUFTYoEG14Kr8ZOU7uQLwhyDIh57IRKNoEzFO9R8K8M6iiwbKwQej8hrLvZ9/RaOya73X7DuaSKxJQw5aJyZ482vu70ujVqf2XRUeaQ5BIRDa9IPKg9UmXappEDxsMDLMKIVaffuvAJlIb3JRBdBFUnDZGwdM64sXMtt dx71l4Jd ZiYRbZNPBheaivMgpr7fv5Fqx7Kff7MP2s2+rUBb5UiJIeXljkAEYHqw7qmjhkJ/ELeFSh/+F5p2IA15RZlxHQpuZ5u4xSTU95XC4bYopxRxLcczcEPIy2nRUwE5OuTBf+K43et0upBhybZxEMngt7PzS4rjIFaughe7j+o2nTmCLCO7TEaxvOK9CTGh2GIBG0wDwERGx+/BXXJQyuAYblyyM4beidNpYqHDIVP2mNz56MsP7rOyxL6diNSEvK2Siz1cAl1NNQG7emzssTozcx79VOB2nqm9HHa6IqqYr7Wq6VhZXX6EIAgb0p83W5MGOxatruiUNtTf4PNpFHUCROmzqKjeAZc1MEEr4ZIaKVdopqsqsF8M1JoBokrkDXNtquc7OKTU3+8DpvgcCfrnQtitSqf9n9oIaY0aW 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: List-Subscribe: List-Unsubscribe: On 2024/6/3 12:14, Barry Song wrote: > On Mon, Jun 3, 2024 at 3:31 PM Lance Yang wrote: >> >> Let's make folio_mlock_step() simply a wrapper around folio_pte_batch(), >> which will greatly reduce the cost of ptep_get() when scanning a range of >> contptes. >> >> Signed-off-by: Lance Yang >> --- >> mm/mlock.c | 23 ++++++----------------- >> 1 file changed, 6 insertions(+), 17 deletions(-) >> >> diff --git a/mm/mlock.c b/mm/mlock.c >> index 30b51cdea89d..1ae6232d38cf 100644 >> --- a/mm/mlock.c >> +++ b/mm/mlock.c >> @@ -307,26 +307,15 @@ void munlock_folio(struct folio *folio) >> static inline unsigned int folio_mlock_step(struct folio *folio, >> pte_t *pte, unsigned long addr, unsigned long end) >> { >> - unsigned int count, i, nr = folio_nr_pages(folio); >> - unsigned long pfn = folio_pfn(folio); >> - pte_t ptent = ptep_get(pte); >> - >> - if (!folio_test_large(folio)) >> + if (likely(!folio_test_large(folio))) >> return 1; >> >> - count = pfn + nr - pte_pfn(ptent); >> - count = min_t(unsigned int, count, (end - addr) >> PAGE_SHIFT); >> - >> - for (i = 0; i < count; i++, pte++) { >> - pte_t entry = ptep_get(pte); >> - >> - if (!pte_present(entry)) >> - break; >> - if (pte_pfn(entry) - pfn >= nr) >> - break; >> - } >> + const fpb_t fpb_flags = FPB_IGNORE_DIRTY | FPB_IGNORE_SOFT_DIRTY; >> + int max_nr = (end - addr) / PAGE_SIZE; >> + pte_t ptent = ptep_get(pte); >> >> - return i; >> + return folio_pte_batch(folio, addr, pte, ptent, max_nr, fpb_flags, NULL, >> + NULL, NULL); >> } > > what about a minimum change as below? > index 30b51cdea89d..e8b98f84fbd2 100644 > --- a/mm/mlock.c > +++ b/mm/mlock.c > @@ -307,26 +307,15 @@ void munlock_folio(struct folio *folio) > static inline unsigned int folio_mlock_step(struct folio *folio, > pte_t *pte, unsigned long addr, unsigned long end) > { > - unsigned int count, i, nr = folio_nr_pages(folio); > - unsigned long pfn = folio_pfn(folio); > + unsigned int count = (end - addr) >> PAGE_SHIFT; > pte_t ptent = ptep_get(pte); > + const fpb_t fpb_flags = FPB_IGNORE_DIRTY | FPB_IGNORE_SOFT_DIRTY; > > if (!folio_test_large(folio)) > return 1; > > - count = pfn + nr - pte_pfn(ptent); > - count = min_t(unsigned int, count, (end - addr) >> PAGE_SHIFT); > - > - for (i = 0; i < count; i++, pte++) { > - pte_t entry = ptep_get(pte); > - > - if (!pte_present(entry)) > - break; > - if (pte_pfn(entry) - pfn >= nr) > - break; > - } > - > - return i; > + return folio_pte_batch(folio, addr, pte, ptent, count, fpb_flags, NULL, > + NULL, NULL); > } LGTM. Reviewed-by: Baolin Wang