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 X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E559BC433E3 for ; Fri, 10 Jul 2020 20:26:52 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 9FE0120748 for ; Fri, 10 Jul 2020 20:26:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="Q58x8v8d" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9FE0120748 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id A066D6B0005; Fri, 10 Jul 2020 16:26:48 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7A42E6B0006; Fri, 10 Jul 2020 16:26:48 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5F3446B0005; Fri, 10 Jul 2020 16:26:48 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0040.hostedemail.com [216.40.44.40]) by kanga.kvack.org (Postfix) with ESMTP id 3E9696B0006 for ; Fri, 10 Jul 2020 16:26:48 -0400 (EDT) Received: from smtpin17.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 0BC8040D3 for ; Fri, 10 Jul 2020 20:26:48 +0000 (UTC) X-FDA: 77023299696.17.cake56_300b01026ed1 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin17.hostedemail.com (Postfix) with ESMTP id DA915180D018B for ; Fri, 10 Jul 2020 20:26:47 +0000 (UTC) X-HE-Tag: cake56_300b01026ed1 X-Filterd-Recvd-Size: 2989 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf46.hostedemail.com (Postfix) with ESMTP for ; Fri, 10 Jul 2020 20:26:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=zBL1fbE2nO/7ewWrIrneSlTO2tUn56PL3bzDRiQuQMY=; b=Q58x8v8da9GwSLUWwBROFymVZ+ 27VMHSMGwTWxyXIL/5CM25u8oWSIzJyeRS1Hi0OgqAhsVoNA7BPtdBYegT0hICnuAmi8X8oOa6Pn+ lJUHYttWOkugOccpMvboX2jpk0Z18Lu3fGKvdMB3C2h2BuCJlkwpaL+bMv6xmk60qs50gOzuQEA47 sfMCJwakdZgHbKsfWNFOHqzBNZFWoIVmJ3Q+k+8EE2iDf27p+aVYvnb25oPluB9kI+9Vfh84FJP7Q QaJBJNR2elgG+fQsc7sonaSz29DpPltVXbbHzKS0tMrhQykRdCUiTKPxvIwd7aecSI31L2KyZVtBy 66973yyg==; Received: from willy by casper.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1jtzbY-0005gb-SX; Fri, 10 Jul 2020 20:26:45 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" Subject: [PATCH 3/4] mm: Optimise madvise WILLNEED Date: Fri, 10 Jul 2020 21:26:41 +0100 Message-Id: <20200710202642.21794-4-willy@infradead.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200710202642.21794-1-willy@infradead.org> References: <20200710202642.21794-1-willy@infradead.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: DA915180D018B X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam02 Content-Transfer-Encoding: quoted-printable 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: Instead of calling find_get_entry() for every page index, use an XArray iterator to skip over NULL entries, and avoid calling get_page(), because we only want the swap entries. Signed-off-by: Matthew Wilcox (Oracle) --- mm/madvise.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/mm/madvise.c b/mm/madvise.c index dd1d43cf026d..9f46d2fd79d1 100644 --- a/mm/madvise.c +++ b/mm/madvise.c @@ -224,25 +224,25 @@ static void force_shm_swapin_readahead(struct vm_ar= ea_struct *vma, unsigned long start, unsigned long end, struct address_space *mapping) { - pgoff_t index; + XA_STATE(xas, &mapping->i_pages, linear_page_index(vma, start)); + pgoff_t end_index =3D end / PAGE_SIZE; struct page *page; - swp_entry_t swap; =20 - for (; start < end; start +=3D PAGE_SIZE) { - index =3D ((start - vma->vm_start) >> PAGE_SHIFT) + vma->vm_pgoff; - - page =3D find_get_entry(mapping, index); - if (!xa_is_value(page)) { - if (page) - put_page(page); + rcu_read_lock(); + xas_for_each(&xas, page, end_index) { + swp_entry_t swap; + if (!xa_is_value(page)) continue; - } + swap =3D radix_to_swp_entry(page); page =3D read_swap_cache_async(swap, GFP_HIGHUSER_MOVABLE, NULL, 0, false); if (page) put_page(page); + rcu_read_lock(); + xas_reset(&xas); } + rcu_read_unlock(); =20 lru_add_drain(); /* Push any new pages onto the LRU now */ } --=20 2.27.0