From patchwork Fri Nov 6 12:30:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 11887063 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 39D401744 for ; Fri, 6 Nov 2020 12:30:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0E2DB208C7 for ; Fri, 6 Nov 2020 12:30:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="HxehHPhH" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727093AbgKFMar (ORCPT ); Fri, 6 Nov 2020 07:30:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53222 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727008AbgKFMar (ORCPT ); Fri, 6 Nov 2020 07:30:47 -0500 Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:8b0:10b:1236::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D7C77C0613CF for ; Fri, 6 Nov 2020 04:30:46 -0800 (PST) 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 Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org 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; 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]; + }; }; void __pagevec_release(struct pagevec *pvec); @@ -41,6 +47,7 @@ static inline unsigned pagevec_lookup_tag(struct pagevec *pvec, static inline void pagevec_init(struct pagevec *pvec) { + pvec->sz = PAGEVEC_SIZE; pvec->nr = 0; pvec->percpu_pvec_drained = false; } @@ -50,6 +57,11 @@ static inline void pagevec_reinit(struct pagevec *pvec) pvec->nr = 0; } +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 *pvec) static inline unsigned pagevec_space(struct pagevec *pvec) { - return PAGEVEC_SIZE - pvec->nr; + return pvec->sz - pvec->nr; } /* 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) = { .lock = INIT_LOCAL_LOCK(lock), + .pvec.sz = PAGEVEC_SIZE, }; /* @@ -70,6 +71,13 @@ struct lru_pvecs { }; static DEFINE_PER_CPU(struct lru_pvecs, lru_pvecs) = { .lock = INIT_LOCAL_LOCK(lock), + .lru_add.sz = PAGEVEC_SIZE, + .lru_deactivate_file.sz = PAGEVEC_SIZE, + .lru_deactivate.sz = PAGEVEC_SIZE, + .lru_lazyfree.sz = PAGEVEC_SIZE, +#ifdef CONFIG_SMP + .activate_page.sz = PAGEVEC_SIZE, +#endif }; /* From patchwork Fri Nov 6 12:30:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 11887057 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 59C931744 for ; Fri, 6 Nov 2020 12:30:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2A35F20867 for ; Fri, 6 Nov 2020 12:30:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="Rd5xXhJr" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726939AbgKFMao (ORCPT ); Fri, 6 Nov 2020 07:30:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53208 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726317AbgKFMao (ORCPT ); Fri, 6 Nov 2020 07:30:44 -0500 Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:8b0:10b:1236::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E3E8FC0613CF for ; Fri, 6 Nov 2020 04:30:43 -0800 (PST) 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=6tUINAMJjUdq6LPonn3cLBWKxJPktFDlylPf+keuUGY=; b=Rd5xXhJrZyFlBMKU+t+tU6YQBt DpB39P7+K4us9Xtob24m4tOMLG61acjJu8Hv08zmzE+LK1nRqxQ6q4HkjiPMg/SkNfhsWUQfAClH1 /aueSdDKNGP2/6iTeZ9VWx+0NzonkHyVeHbejiDmj1StBj1PjMCFqqhvlvwPwt8SWK7Fvt/ywbNV8 DVB9AQQ+rJepsrXGjz8SWa+PX9SfvZyEjqMDxsNAC2GijrUORkbDYCQ7iWaQvEGa3jkUICESEcVcI s8n/ojnT9sxCZX3clNWHCFZTjMakXfJvZ3jmVxiOi/AKhDSSWYfEc27s9JKAgu1kbMdMST5gqGk4M rM5DoKuA==; Received: from willy by casper.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1kb0t8-0007Qh-8Q; 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 2/4] pagevec: Increase the size of LRU pagevecs Date: Fri, 6 Nov 2020 12:30:38 +0000 Message-Id: <20201106123040.28451-2-willy@infradead.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20201106123040.28451-1-willy@infradead.org> References: <20201106080815.GC31585@lst.de> <20201106123040.28451-1-willy@infradead.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org Tim Chen reports that increasing the size of LRU pagevecs is advantageous with a workload he has: https://lore.kernel.org/linux-mm/d1cc9f12a8ad6c2a52cb600d93b06b064f2bbc57.1593205965.git.tim.c.chen@linux.intel.com/ Signed-off-by: Matthew Wilcox (Oracle) --- include/linux/pagevec.h | 5 +++++ mm/swap.c | 27 +++++++++++++++------------ 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/include/linux/pagevec.h b/include/linux/pagevec.h index ee5d3c4da8da..4dc45392d776 100644 --- a/include/linux/pagevec.h +++ b/include/linux/pagevec.h @@ -29,6 +29,11 @@ struct pagevec { }; }; +#define declare_pagevec(name, size) union { \ + struct pagevec name; \ + void *__p ##name [size + 1]; \ +} + void __pagevec_release(struct pagevec *pvec); void __pagevec_lru_add(struct pagevec *pvec); void pagevec_remove_exceptionals(struct pagevec *pvec); diff --git a/mm/swap.c b/mm/swap.c index d093fb30f038..1e6f50b312ea 100644 --- a/mm/swap.c +++ b/mm/swap.c @@ -45,14 +45,17 @@ /* How many pages do we try to swap or page in/out together? */ int page_cluster; +#define LRU_PAGEVEC_SIZE 63 +#define lru_pagevec(name) declare_pagevec(name, LRU_PAGEVEC_SIZE) + /* Protecting only lru_rotate.pvec which requires disabling interrupts */ struct lru_rotate { local_lock_t lock; - struct pagevec pvec; + lru_pagevec(pvec); }; static DEFINE_PER_CPU(struct lru_rotate, lru_rotate) = { .lock = INIT_LOCAL_LOCK(lock), - .pvec.sz = PAGEVEC_SIZE, + .pvec.sz = LRU_PAGEVEC_SIZE, }; /* @@ -61,22 +64,22 @@ static DEFINE_PER_CPU(struct lru_rotate, lru_rotate) = { */ struct lru_pvecs { local_lock_t lock; - struct pagevec lru_add; - struct pagevec lru_deactivate_file; - struct pagevec lru_deactivate; - struct pagevec lru_lazyfree; + lru_pagevec(lru_add); + lru_pagevec(lru_deactivate_file); + lru_pagevec(lru_deactivate); + lru_pagevec(lru_lazyfree); #ifdef CONFIG_SMP - struct pagevec activate_page; + lru_pagevec(activate_page); #endif }; static DEFINE_PER_CPU(struct lru_pvecs, lru_pvecs) = { .lock = INIT_LOCAL_LOCK(lock), - .lru_add.sz = PAGEVEC_SIZE, - .lru_deactivate_file.sz = PAGEVEC_SIZE, - .lru_deactivate.sz = PAGEVEC_SIZE, - .lru_lazyfree.sz = PAGEVEC_SIZE, + .lru_add.sz = LRU_PAGEVEC_SIZE, + .lru_deactivate_file.sz = LRU_PAGEVEC_SIZE, + .lru_deactivate.sz = LRU_PAGEVEC_SIZE, + .lru_lazyfree.sz = LRU_PAGEVEC_SIZE, #ifdef CONFIG_SMP - .activate_page.sz = PAGEVEC_SIZE, + .activate_page.sz = LRU_PAGEVEC_SIZE, #endif }; From patchwork Fri Nov 6 12:30:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 11887061 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E95E51130 for ; Fri, 6 Nov 2020 12:30:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BDFC120867 for ; Fri, 6 Nov 2020 12:30:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="wDr7t34w" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727023AbgKFMap (ORCPT ); Fri, 6 Nov 2020 07:30:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53210 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727008AbgKFMao (ORCPT ); Fri, 6 Nov 2020 07:30:44 -0500 Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:8b0:10b:1236::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1C3F3C0613D2 for ; Fri, 6 Nov 2020 04:30:44 -0800 (PST) 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=kkDY/A+zQxc2i95QfvhU+XAHKtbfTy4uXu8lLNerbsw=; b=wDr7t34wIJm+GPx9QugRfOlaVv 65UOdzBqP/NbNfJsusEDba3Z6yAvZJD9jiHtHAwu+F9+Kfk8NhxMYlIV3Vongavmd3KbaiLdtlIGM 0CRoZFp9UeM6UQpDaLYqjQFxDWUQCNJdMUxDA4Qu0u+ymSMe8WSaQndx2vKVOxz+RO5Vl7zynUsE3 aiwakoI2jXgS0qYYT9GgFvlFiRMK88Ectkq8+rm/eqNCcSWIfKYS0Q7NQFCyATKHPpR6DueSVPE4D sQnryvoNQe+ag081u66tV7gXmP5JvX+kAmyb3x3nJ/UTo/+zqgTaLWuRmmSNobmUiPVede3UN1pMp kzUFX26w==; Received: from willy by casper.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1kb0t8-0007Ql-Fn; 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 3/4] pagevec: Add dynamically allocated pagevecs Date: Fri, 6 Nov 2020 12:30:39 +0000 Message-Id: <20201106123040.28451-3-willy@infradead.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20201106123040.28451-1-willy@infradead.org> References: <20201106080815.GC31585@lst.de> <20201106123040.28451-1-willy@infradead.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org Add pagevec_alloc() and pagevec_free() to allow for pagevecs up to 255 entries in size. Signed-off-by: Matthew Wilcox (Oracle) --- include/linux/pagevec.h | 7 +++++++ mm/swap.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/include/linux/pagevec.h b/include/linux/pagevec.h index 4dc45392d776..4d5a48d7a372 100644 --- a/include/linux/pagevec.h +++ b/include/linux/pagevec.h @@ -36,6 +36,13 @@ struct pagevec { void __pagevec_release(struct pagevec *pvec); void __pagevec_lru_add(struct pagevec *pvec); +struct pagevec *pagevec_alloc(unsigned long sz, gfp_t gfp); + +static inline void pagevec_free(struct pagevec *pvec) +{ + kfree(pvec); +} + void pagevec_remove_exceptionals(struct pagevec *pvec); unsigned pagevec_lookup_range_tag(struct pagevec *pvec, diff --git a/mm/swap.c b/mm/swap.c index 1e6f50b312ea..3f856a272cb2 100644 --- a/mm/swap.c +++ b/mm/swap.c @@ -988,6 +988,34 @@ void __pagevec_release(struct pagevec *pvec) } EXPORT_SYMBOL(__pagevec_release); +/** + * pagevec_alloc - Allocate a pagevec. + * @sz: Number of pages wanted. + * @gfp: Memory allocation flags. + * + * Allocates a new pagevec. The @sz parameter is advisory; this function + * may allocate a pagevec that can contain fewer pages than requested. If + * the caller cares how many were allocated, it can check pagevec_size(), + * but most callers will simply use as many as were allocated. + * + * Return: A new pagevec, or NULL if memory allocation failed. + */ +struct pagevec *pagevec_alloc(unsigned long sz, gfp_t gfp) +{ + struct pagevec *pvec; + + if (sz > 255) + sz = 255; + pvec = kmalloc_array(sz + 1, sizeof(void *), gfp); + if (!pvec) + return NULL; + pvec->nr = 0; + pvec->sz = sz; + + return pvec; +} +EXPORT_SYMBOL(pagevec_alloc); + #ifdef CONFIG_TRANSPARENT_HUGEPAGE /* used by __split_huge_page_refcount() */ void lru_add_page_tail(struct page *page, struct page *page_tail, From patchwork Fri Nov 6 12:30:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 11887059 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A68A26A2 for ; Fri, 6 Nov 2020 12:30:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7E0C620867 for ; Fri, 6 Nov 2020 12:30:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="QGgesoFq" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727020AbgKFMap (ORCPT ); Fri, 6 Nov 2020 07:30:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53214 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726317AbgKFMao (ORCPT ); Fri, 6 Nov 2020 07:30:44 -0500 Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:8b0:10b:1236::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4E8C7C0613CF for ; Fri, 6 Nov 2020 04:30:44 -0800 (PST) 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=FYfTJc/cRnp3dh2kVQ7v0u0iDrX6gANg53dGJ+BqfQ0=; b=QGgesoFqkX35kbIS61E/vS9DMw nrOfKvHPvDPlMupVmUbr30VyOixlbjuISXTjvoEvLDo9kHtfc3Ry8ZF2v8CAXlZHnDcWrHnA+PMkt ZeuGGhVZaC4/F9vl8iF89cbcXzs1oSYN4N5FUQOdoyIWOPEsyeEtQ19eGzHFQERjW0Y2AgiLoaL13 uF461OmOzcn6MCRt02ce7mHnbZgW8gHhUaLBMgxHE+9HveyzYwOXl0/OPuVwTtJRZIaC+iOJ/aTEP Mgf0UtFim0JjZBJInTLICZK9Yt+FObqAK3ns2T/KM+4C3YykoHjXs66Ggw4gCQbNQyYy0EvkUNz61 lkHyWdsQ==; Received: from willy by casper.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1kb0t8-0007Qr-Oh; 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 4/4] mm/filemap: Use a dynamically allocated pagevec in filemap_read Date: Fri, 6 Nov 2020 12:30:40 +0000 Message-Id: <20201106123040.28451-4-willy@infradead.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20201106123040.28451-1-willy@infradead.org> References: <20201106080815.GC31585@lst.de> <20201106123040.28451-1-willy@infradead.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org Restore Kent's optimisation for I/O sizes between 64kB and 1MB. Signed-off-by: Matthew Wilcox (Oracle) --- mm/filemap.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/mm/filemap.c b/mm/filemap.c index f41de0759e86..2b4d8ed241bd 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -2427,7 +2427,7 @@ ssize_t filemap_read(struct kiocb *iocb, struct iov_iter *iter, struct file_ra_state *ra = &filp->f_ra; struct address_space *mapping = filp->f_mapping; struct inode *inode = mapping->host; - struct pagevec pvec; + struct pagevec pvec_stack, *pvec = NULL; int i, error = 0; bool writably_mapped; loff_t isize, end_offset; @@ -2436,6 +2436,10 @@ ssize_t filemap_read(struct kiocb *iocb, struct iov_iter *iter, return 0; iov_iter_truncate(iter, inode->i_sb->s_maxbytes); + if (iter->count / PAGE_SIZE > PAGEVEC_SIZE) + pvec = pagevec_alloc(iter->count / PAGE_SIZE + 1, GFP_KERNEL); + if (!pvec) + pvec = &pvec_stack; do { cond_resched(); @@ -2447,7 +2451,7 @@ ssize_t filemap_read(struct kiocb *iocb, struct iov_iter *iter, if ((iocb->ki_flags & IOCB_WAITQ) && already_read) iocb->ki_flags |= IOCB_NOWAIT; - error = filemap_get_pages(iocb, iter, &pvec); + error = filemap_get_pages(iocb, iter, pvec); if (error < 0) break; @@ -2476,10 +2480,10 @@ ssize_t filemap_read(struct kiocb *iocb, struct iov_iter *iter, */ if (iocb->ki_pos >> PAGE_SHIFT != ra->prev_pos >> PAGE_SHIFT) - mark_page_accessed(pvec.pages[0]); + mark_page_accessed(pvec->pages[0]); - for (i = 0; i < pagevec_count(&pvec); i++) { - struct page *page = pvec.pages[i]; + for (i = 0; i < pagevec_count(pvec); i++) { + struct page *page = pvec->pages[i]; size_t page_size = thp_size(page); size_t offset = iocb->ki_pos & (page_size - 1); size_t bytes = min_t(loff_t, end_offset - iocb->ki_pos, @@ -2514,7 +2518,7 @@ ssize_t filemap_read(struct kiocb *iocb, struct iov_iter *iter, } } put_pages: - pagevec_release(&pvec); + pagevec_release(pvec); } while (iov_iter_count(iter) && iocb->ki_pos < isize && !error); file_accessed(filp);