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.5 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,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 05F53C55178 for ; Fri, 6 Nov 2020 12:30:50 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 6E5152071A for ; Fri, 6 Nov 2020 12:30:49 +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="HxehHPhH" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6E5152071A 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 14B396B0068; Fri, 6 Nov 2020 07:30:48 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 0A9A86B006C; Fri, 6 Nov 2020 07:30:48 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DA2D86B006E; Fri, 6 Nov 2020 07:30:47 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0046.hostedemail.com [216.40.44.46]) by kanga.kvack.org (Postfix) with ESMTP id AD0716B0068 for ; Fri, 6 Nov 2020 07:30:47 -0500 (EST) Received: from smtpin30.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 4A9F73628 for ; Fri, 6 Nov 2020 12:30:47 +0000 (UTC) X-FDA: 77453927334.30.store82_300311d272d2 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin30.hostedemail.com (Postfix) with ESMTP id 218B1180B3AA7 for ; Fri, 6 Nov 2020 12:30:47 +0000 (UTC) X-HE-Tag: store82_300311d272d2 X-Filterd-Recvd-Size: 3898 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf34.hostedemail.com (Postfix) with ESMTP for ; Fri, 6 Nov 2020 12:30:46 +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=gsFgv0Jl3de0Za5CmEKC4EBbImhC0dOH10o2Itd6Aww=; b=HxehHPhHIHgDisPrPQVHGR9MDh QfBCP5dd9cFAPqMH7DW0DISdB1wbDhIPt9vKrjfM0Y2ncdPxkMNEIR95+DVEz1eXMrUdBkojrvqK6 nL5JIGu4OJDQQ7gV5fBbK2kOLZZu3DmuFhyT6TvvCQ/3a7pA700k11XLFVPnIteswTXpfQBaPZl35 vCyxa4JjrD/MLlENUCe0XTrL5e8sq+klrZsC7KsXrAZJRANhexckf/RnxioTr+uXIRaob6UOUuZMU nnfGIIFXuUq910SEcQlyyxmjl+xf4TiDTkSpnwazY4Pur67y/86cvo1DdnEYhTUHcmR4mTeStbQbS 7yzwOcew==; Received: from willy by casper.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1kb0t8-0007Qe-0t; Fri, 06 Nov 2020 12:30:42 +0000 From: "Matthew Wilcox (Oracle)" To: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, hch@lst.de, kent.overstreet@gmail.com Cc: "Matthew Wilcox (Oracle)" Subject: [PATCH 1/4] pagevec: Allow pagevecs to be different sizes Date: Fri, 6 Nov 2020 12:30:37 +0000 Message-Id: <20201106123040.28451-1-willy@infradead.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20201106080815.GC31585@lst.de> References: <20201106080815.GC31585@lst.de> MIME-Version: 1.0 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: Declaring a pagevec continues to create a pagevec which is the same size, but functions which manipulate pagevecs no longer rely on this. Signed-off-by: Matthew Wilcox (Oracle) --- include/linux/pagevec.h | 20 ++++++++++++++++---- mm/swap.c | 8 ++++++++ 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/include/linux/pagevec.h b/include/linux/pagevec.h index 875a3f0d9dd2..ee5d3c4da8da 100644 --- a/include/linux/pagevec.h +++ b/include/linux/pagevec.h @@ -18,9 +18,15 @@ struct page; struct address_space; =20 struct pagevec { - unsigned char nr; - bool percpu_pvec_drained; - struct page *pages[PAGEVEC_SIZE]; + union { + struct { + unsigned char sz; + unsigned char nr; + bool percpu_pvec_drained; + struct page *pages[PAGEVEC_SIZE]; + }; + void *__p[PAGEVEC_SIZE + 1]; + }; }; =20 void __pagevec_release(struct pagevec *pvec); @@ -41,6 +47,7 @@ static inline unsigned pagevec_lookup_tag(struct pageve= c *pvec, =20 static inline void pagevec_init(struct pagevec *pvec) { + pvec->sz =3D PAGEVEC_SIZE; pvec->nr =3D 0; pvec->percpu_pvec_drained =3D false; } @@ -50,6 +57,11 @@ static inline void pagevec_reinit(struct pagevec *pvec= ) pvec->nr =3D 0; } =20 +static inline unsigned pagevec_size(struct pagevec *pvec) +{ + return pvec->sz; +} + static inline unsigned pagevec_count(struct pagevec *pvec) { return pvec->nr; @@ -57,7 +69,7 @@ static inline unsigned pagevec_count(struct pagevec *pv= ec) =20 static inline unsigned pagevec_space(struct pagevec *pvec) { - return PAGEVEC_SIZE - pvec->nr; + return pvec->sz - pvec->nr; } =20 /* diff --git a/mm/swap.c b/mm/swap.c index 2ee3522a7170..d093fb30f038 100644 --- a/mm/swap.c +++ b/mm/swap.c @@ -52,6 +52,7 @@ struct lru_rotate { }; static DEFINE_PER_CPU(struct lru_rotate, lru_rotate) =3D { .lock =3D INIT_LOCAL_LOCK(lock), + .pvec.sz =3D PAGEVEC_SIZE, }; =20 /* @@ -70,6 +71,13 @@ struct lru_pvecs { }; static DEFINE_PER_CPU(struct lru_pvecs, lru_pvecs) =3D { .lock =3D INIT_LOCAL_LOCK(lock), + .lru_add.sz =3D PAGEVEC_SIZE, + .lru_deactivate_file.sz =3D PAGEVEC_SIZE, + .lru_deactivate.sz =3D PAGEVEC_SIZE, + .lru_lazyfree.sz =3D PAGEVEC_SIZE, +#ifdef CONFIG_SMP + .activate_page.sz =3D PAGEVEC_SIZE, +#endif }; =20 /* --=20 2.28.0