From nobody Tue Apr 28 10:33:55 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 93DFAC433EF for ; Wed, 1 Jun 2022 10:39:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1352159AbiFAKjx (ORCPT ); Wed, 1 Jun 2022 06:39:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44468 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1352141AbiFAKjo (ORCPT ); Wed, 1 Jun 2022 06:39:44 -0400 Received: from mail-vk1-xa2b.google.com (mail-vk1-xa2b.google.com [IPv6:2607:f8b0:4864:20::a2b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5AB417CDCC for ; Wed, 1 Jun 2022 03:39:42 -0700 (PDT) Received: by mail-vk1-xa2b.google.com with SMTP id n20so657748vkl.9 for ; Wed, 01 Jun 2022 03:39:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wfh9GMNAtQ8X7OUdTqnBOAOW/iUKoStIjgn9vMh3x8A=; b=J4DFyJFooJ1/aFuihbbPDsZUg/rHDSDYYB/zizL1l+XlzXtXYJdHboF7hjsiktBIub UpUo4fe91c62KQ2wCh8Q+E45OrEt+KX8PYpsHsOkh2E9Aoh7GxZ5QNGR2Z1BR7K4Ed3k +5Tfy0rfFvGXQkPL4dqf8dbHmppQCXzaLme0Y= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=wfh9GMNAtQ8X7OUdTqnBOAOW/iUKoStIjgn9vMh3x8A=; b=RzMZ+wL27A1gQhwiymGpRSWfGksuqL8PBZbDGmrs8EDGNxhLGXFjBpekOGuV+XsihL KcUvriSlOCmtgGY0XXoHx7ZEgfwmyL+hKujkmZT/Z6P6UMOZEVsxd0CxjyKW0+rLfMG7 PpITQylNP9Yi55bG4jGV4w6AdPdnvLK91U52sWJ2t6X/fmUOglZDSKee8UV4XJDQlf5m Vjn3rDRXTfecEU0Htu3I75FeLTf9RCLzt1P6+bV/H/jiF9OFD1+7eD3jUIykHLN3r0et zd3JROuRUtGfh5SC/UVq+gPqXx6TjmLVNZxky+tFo2EHMGQbdEji5PNVLUXRz4HIaqwj gDOA== X-Gm-Message-State: AOAM530/gb92XwjUdrnUzRXNHskC1GO+UTpBYEQ+OF/uX+dxInbqb5Cr jXjQS19IDY9XOhly19qSRMjvoq+8s8PW3g== X-Google-Smtp-Source: ABdhPJzGikxQY4QeEMbejEgnYu1+SViSz+uEqFU1v5hBzeBBzAFeuZfr9bzWJJED51l9pR4HX5nyZA== X-Received: by 2002:a17:902:9044:b0:15d:1c51:5bef with SMTP id w4-20020a170902904400b0015d1c515befmr65260044plz.170.1654079970845; Wed, 01 Jun 2022 03:39:30 -0700 (PDT) Received: from hsinyi-z840.tpe.corp.google.com ([2401:fa00:1:10:dc30:e75c:ae95:f2d6]) by smtp.gmail.com with ESMTPSA id i9-20020a17090332c900b00163bfaf0b17sm1183867plr.233.2022.06.01.03.39.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jun 2022 03:39:30 -0700 (PDT) From: Hsin-Yi Wang To: Phillip Lougher , Matthew Wilcox , Xiongwei Song Cc: Zheng Liang , Zhang Yi , Hou Tao , Miao Xie , Andrew Morton , "linux-mm @ kvack . org" , "squashfs-devel @ lists . sourceforge . net" , linux-kernel@vger.kernel.org Subject: [PATCH v4 1/3] Revert "squashfs: provide backing_dev_info in order to disable read-ahead" Date: Wed, 1 Jun 2022 18:39:20 +0800 Message-Id: <20220601103922.1338320-2-hsinyi@chromium.org> X-Mailer: git-send-email 2.36.1.255.ge46751e96f-goog In-Reply-To: <20220601103922.1338320-1-hsinyi@chromium.org> References: <20220601103922.1338320-1-hsinyi@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This reverts commit 9eec1d897139e5de287af5d559a02b811b844d82. Revert closing the readahead to squashfs since the readahead callback for squashfs is implemented. Suggested-by: Xiongwei Song Signed-off-by: Hsin-Yi Wang --- fs/squashfs/super.c | 33 --------------------------------- 1 file changed, 33 deletions(-) diff --git a/fs/squashfs/super.c b/fs/squashfs/super.c index 6d594ba2ed28..32565dafa7f3 100644 --- a/fs/squashfs/super.c +++ b/fs/squashfs/super.c @@ -29,7 +29,6 @@ #include #include #include -#include =20 #include "squashfs_fs.h" #include "squashfs_fs_sb.h" @@ -113,24 +112,6 @@ static const struct squashfs_decompressor *supported_s= quashfs_filesystem( return decompressor; } =20 -static int squashfs_bdi_init(struct super_block *sb) -{ - int err; - unsigned int major =3D MAJOR(sb->s_dev); - unsigned int minor =3D MINOR(sb->s_dev); - - bdi_put(sb->s_bdi); - sb->s_bdi =3D &noop_backing_dev_info; - - err =3D super_setup_bdi_name(sb, "squashfs_%u_%u", major, minor); - if (err) - return err; - - sb->s_bdi->ra_pages =3D 0; - sb->s_bdi->io_pages =3D 0; - - return 0; -} =20 static int squashfs_fill_super(struct super_block *sb, struct fs_context *= fc) { @@ -146,20 +127,6 @@ static int squashfs_fill_super(struct super_block *sb,= struct fs_context *fc) =20 TRACE("Entered squashfs_fill_superblock\n"); =20 - /* - * squashfs provides 'backing_dev_info' in order to disable read-ahead. F= or - * squashfs, I/O is not deferred, it is done immediately in read_folio, - * which means the user would always have to wait their own I/O. So the e= ffect - * of readahead is very weak for squashfs. squashfs_bdi_init will set - * sb->s_bdi->ra_pages and sb->s_bdi->io_pages to 0 and close readahead f= or - * squashfs. - */ - err =3D squashfs_bdi_init(sb); - if (err) { - errorf(fc, "squashfs init bdi failed"); - return err; - } - sb->s_fs_info =3D kzalloc(sizeof(*msblk), GFP_KERNEL); if (sb->s_fs_info =3D=3D NULL) { ERROR("Failed to allocate squashfs_sb_info\n"); --=20 2.36.1.255.ge46751e96f-goog From nobody Tue Apr 28 10:33:55 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 02532C433FE for ; Wed, 1 Jun 2022 10:39:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1352135AbiFAKjo (ORCPT ); Wed, 1 Jun 2022 06:39:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43924 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1352117AbiFAKjf (ORCPT ); Wed, 1 Jun 2022 06:39:35 -0400 Received: from mail-pf1-x435.google.com (mail-pf1-x435.google.com [IPv6:2607:f8b0:4864:20::435]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 002547CDCC for ; Wed, 1 Jun 2022 03:39:33 -0700 (PDT) Received: by mail-pf1-x435.google.com with SMTP id 187so1592212pfu.9 for ; Wed, 01 Jun 2022 03:39:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=pVK/jozl1uAfEzK6vleMbKcySwChksKYsG5Iw08IS/c=; b=C78pEyOpmxImWyrV8RjqLJf8nPmlGYFD0fqdmXSu3XWNvntM2agBp44iozoainWKJ3 Axaui0YVALbQSEnR8rjEVrFcjCX26PCWreT1waD7QsntpteG59FKz9Mnrrnuu3nB9eve oCddJpnbDynKK9HCCW91lnavxEvDNpWEdylgo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=pVK/jozl1uAfEzK6vleMbKcySwChksKYsG5Iw08IS/c=; b=A5AjWdry73xiEKwKoloqwEFZNMOJqKE9OjNwdG/2V8QONu6+Z69E+suylsZg1TMT5a hpyFtqOrVdegNHGQQQmWoncMZ2YR9QD6t0lRsYA49fNP7pMOVKv/DzuPKFkbo5dm3HMD nqF1KrFpSzzDBH83M3OBtE7ovRzi/MsPnc0tK/abnJpBT3lUeSNyWo5LwTZrvPeFupyf MLyXfSUCF9avtG4wARDswq1wEDVUBBDxSkQSTFBw3x++/piciQOVm+b+sGqHQJQRYcf8 JnnsdBqhFxPc84m43C2J8EyFihRW7TO+ELbBza0etr/Z9nD5Qt/Z0MS5fJNZhJYAfoYR MWaQ== X-Gm-Message-State: AOAM532jD9wR0/qiG9bxvvOPx+nEeLTpl3dJtDAKUSzGQAlbsev6bVdY ySvsIIZPF3OAiZi7+I47DdbpwA== X-Google-Smtp-Source: ABdhPJxPBOFPDzYcJlTD535ykPd7L0x0pOe9kzUL+ouANmI7/8e7l2tiHiElnHP5BQ4D4XG6GTHbZA== X-Received: by 2002:a65:6b94:0:b0:3fb:16f4:3620 with SMTP id d20-20020a656b94000000b003fb16f43620mr26218963pgw.464.1654079973429; Wed, 01 Jun 2022 03:39:33 -0700 (PDT) Received: from hsinyi-z840.tpe.corp.google.com ([2401:fa00:1:10:dc30:e75c:ae95:f2d6]) by smtp.gmail.com with ESMTPSA id i9-20020a17090332c900b00163bfaf0b17sm1183867plr.233.2022.06.01.03.39.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jun 2022 03:39:32 -0700 (PDT) From: Hsin-Yi Wang To: Phillip Lougher , Matthew Wilcox , Xiongwei Song Cc: Zheng Liang , Zhang Yi , Hou Tao , Miao Xie , Andrew Morton , "linux-mm @ kvack . org" , "squashfs-devel @ lists . sourceforge . net" , linux-kernel@vger.kernel.org Subject: [PATCH v4 2/3] squashfs: always build "file direct" version of page actor Date: Wed, 1 Jun 2022 18:39:21 +0800 Message-Id: <20220601103922.1338320-3-hsinyi@chromium.org> X-Mailer: git-send-email 2.36.1.255.ge46751e96f-goog In-Reply-To: <20220601103922.1338320-1-hsinyi@chromium.org> References: <20220601103922.1338320-1-hsinyi@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Phillip Lougher Squashfs_readahead uses the "file direct" version of the page actor, and so build it unconditionally. Reported-by: kernel test robot Signed-off-by: Phillip Lougher Signed-off-by: Hsin-Yi Wang --- fs/squashfs/Makefile | 4 ++-- fs/squashfs/page_actor.h | 41 ---------------------------------------- 2 files changed, 2 insertions(+), 43 deletions(-) diff --git a/fs/squashfs/Makefile b/fs/squashfs/Makefile index 7bd9b8b856d0..477c89a519ee 100644 --- a/fs/squashfs/Makefile +++ b/fs/squashfs/Makefile @@ -5,9 +5,9 @@ =20 obj-$(CONFIG_SQUASHFS) +=3D squashfs.o squashfs-y +=3D block.o cache.o dir.o export.o file.o fragment.o id.o inod= e.o -squashfs-y +=3D namei.o super.o symlink.o decompressor.o +squashfs-y +=3D namei.o super.o symlink.o decompressor.o page_actor.o squashfs-$(CONFIG_SQUASHFS_FILE_CACHE) +=3D file_cache.o -squashfs-$(CONFIG_SQUASHFS_FILE_DIRECT) +=3D file_direct.o page_actor.o +squashfs-$(CONFIG_SQUASHFS_FILE_DIRECT) +=3D file_direct.o squashfs-$(CONFIG_SQUASHFS_DECOMP_SINGLE) +=3D decompressor_single.o squashfs-$(CONFIG_SQUASHFS_DECOMP_MULTI) +=3D decompressor_multi.o squashfs-$(CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU) +=3D decompressor_multi_pe= rcpu.o diff --git a/fs/squashfs/page_actor.h b/fs/squashfs/page_actor.h index 2e3073ace009..26e07373af8a 100644 --- a/fs/squashfs/page_actor.h +++ b/fs/squashfs/page_actor.h @@ -6,46 +6,6 @@ * Phillip Lougher */ =20 -#ifndef CONFIG_SQUASHFS_FILE_DIRECT -struct squashfs_page_actor { - void **page; - int pages; - int length; - int next_page; -}; - -static inline struct squashfs_page_actor *squashfs_page_actor_init(void **= page, - int pages, int length) -{ - struct squashfs_page_actor *actor =3D kmalloc(sizeof(*actor), GFP_KERNEL); - - if (actor =3D=3D NULL) - return NULL; - - actor->length =3D length ? : pages * PAGE_SIZE; - actor->page =3D page; - actor->pages =3D pages; - actor->next_page =3D 0; - return actor; -} - -static inline void *squashfs_first_page(struct squashfs_page_actor *actor) -{ - actor->next_page =3D 1; - return actor->page[0]; -} - -static inline void *squashfs_next_page(struct squashfs_page_actor *actor) -{ - return actor->next_page =3D=3D actor->pages ? NULL : - actor->page[actor->next_page++]; -} - -static inline void squashfs_finish_page(struct squashfs_page_actor *actor) -{ - /* empty */ -} -#else struct squashfs_page_actor { union { void **buffer; @@ -76,4 +36,3 @@ static inline void squashfs_finish_page(struct squashfs_p= age_actor *actor) actor->squashfs_finish_page(actor); } #endif -#endif --=20 2.36.1.255.ge46751e96f-goog From nobody Tue Apr 28 10:33:55 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 605FAC433EF for ; Wed, 1 Jun 2022 10:39:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1352150AbiFAKjs (ORCPT ); Wed, 1 Jun 2022 06:39:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44054 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1352120AbiFAKjh (ORCPT ); Wed, 1 Jun 2022 06:39:37 -0400 Received: from mail-pf1-x430.google.com (mail-pf1-x430.google.com [IPv6:2607:f8b0:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8E3117CDF3 for ; Wed, 1 Jun 2022 03:39:36 -0700 (PDT) Received: by mail-pf1-x430.google.com with SMTP id y196so1599399pfb.6 for ; Wed, 01 Jun 2022 03:39:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Pt3emh9sRv27GcQGoBsy8VqQGPtdBSzil539OvyNfVQ=; b=npgk1ZKmueI5lZFFzNwkrfAGR35TrhiHe4Bt8ftRQ7yumNW8F6tPSmv7mEhm6/tuF1 7KJLx0nwVtdymcisO3+aXt05FKhJ5TbtRgzZihTNkGr/JGrnvVP58/6M3kQoKvJVXwya dbJBblmhBe8tx8v5Ukuu9w4JvI8rSw1qLt5Rk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Pt3emh9sRv27GcQGoBsy8VqQGPtdBSzil539OvyNfVQ=; b=bi9osYxP96W8OBuFlIZrsR+b9BA5t6Y5T7LttIGzi+b6LehuKI18aIAev/9ifPO4b2 op983gRQlXBRJLazkYi2zJF2ZHkT3ClSEQGgI3vb6d/qLNx5e+L0GexIEKnewGzb/jTz Gkyl48LD8FDiRTc/HfTkFAmWjDL35QJB5LRaKACnvc+BL7xKoJw5IbTnV9R52StCnfNl hz0+WxfrcZnCtOFcKzbb3uTVkbdCH+RqOMFfKKTGhV6RAXBCw9olgYi8igRcSYskBNRL dBF5q/vZ8I6o/uZsQp3iLfbYRbLjZhoIfd8lKBC/Own6ZQUKuHawTM/+j2zB7IzDM4kQ RJBQ== X-Gm-Message-State: AOAM530qxuIINcOMhO06EeyNG69muhtmEn1TTc+Jq9zNdD5FZwwakiwn jp1qtDTJX93lCNlGLFKwOGlSFpK6v7WqMA== X-Google-Smtp-Source: ABdhPJyTATonbx8DBaAETQIhbDZDdB/jypUUcYIpqGWAzeXLbC2fOMCBWG9ub55OlJpr43hOQgu0SQ== X-Received: by 2002:a63:894a:0:b0:3fc:a724:578c with SMTP id v71-20020a63894a000000b003fca724578cmr1936274pgd.499.1654079976036; Wed, 01 Jun 2022 03:39:36 -0700 (PDT) Received: from hsinyi-z840.tpe.corp.google.com ([2401:fa00:1:10:dc30:e75c:ae95:f2d6]) by smtp.gmail.com with ESMTPSA id i9-20020a17090332c900b00163bfaf0b17sm1183867plr.233.2022.06.01.03.39.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jun 2022 03:39:35 -0700 (PDT) From: Hsin-Yi Wang To: Phillip Lougher , Matthew Wilcox , Xiongwei Song Cc: Zheng Liang , Zhang Yi , Hou Tao , Miao Xie , Andrew Morton , "linux-mm @ kvack . org" , "squashfs-devel @ lists . sourceforge . net" , linux-kernel@vger.kernel.org Subject: [PATCH v4 3/3] squashfs: implement readahead Date: Wed, 1 Jun 2022 18:39:22 +0800 Message-Id: <20220601103922.1338320-4-hsinyi@chromium.org> X-Mailer: git-send-email 2.36.1.255.ge46751e96f-goog In-Reply-To: <20220601103922.1338320-1-hsinyi@chromium.org> References: <20220601103922.1338320-1-hsinyi@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Implement readahead callback for squashfs. It will read datablocks which cover pages in readahead request. For a few cases it will not mark page as uptodate, including: - file end is 0. - zero filled blocks. - current batch of pages isn't in the same datablock or not enough in a datablock. - decompressor error. Otherwise pages will be marked as uptodate. The unhandled pages will be updated by readpage later. Suggested-by: Matthew Wilcox Signed-off-by: Hsin-Yi Wang Reported-by: Matthew Wilcox Reported-by: Phillip Lougher Reported-by: Xiongwei Song --- v3->v4: Fix a few variable type and their locations. v3: https://lore.kernel.org/lkml/20220523065909.883444-4-hsinyi@chromium.or= g/ v2: https://lore.kernel.org/lkml/20220517082650.2005840-4-hsinyi@chromium.o= rg/ v1: https://lore.kernel.org/lkml/20220516105100.1412740-3-hsinyi@chromium.o= rg/ --- fs/squashfs/file.c | 97 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 96 insertions(+), 1 deletion(-) diff --git a/fs/squashfs/file.c b/fs/squashfs/file.c index a8e495d8eb86..df7ad4b3e99c 100644 --- a/fs/squashfs/file.c +++ b/fs/squashfs/file.c @@ -39,6 +39,7 @@ #include "squashfs_fs_sb.h" #include "squashfs_fs_i.h" #include "squashfs.h" +#include "page_actor.h" =20 /* * Locate cache slot in range [offset, index] for specified inode. If @@ -495,7 +496,101 @@ static int squashfs_read_folio(struct file *file, str= uct folio *folio) return 0; } =20 +static void squashfs_readahead(struct readahead_control *ractl) +{ + struct inode *inode =3D ractl->mapping->host; + struct squashfs_sb_info *msblk =3D inode->i_sb->s_fs_info; + size_t mask =3D (1UL << msblk->block_log) - 1; + unsigned short shift =3D msblk->block_log - PAGE_SHIFT; + loff_t start =3D readahead_pos(ractl) &~ mask; + size_t len =3D readahead_length(ractl) + readahead_pos(ractl) - start; + struct squashfs_page_actor *actor; + unsigned int nr_pages =3D 0; + struct page **pages; + int i, file_end =3D i_size_read(inode) >> msblk->block_log; + unsigned int max_pages =3D 1UL << shift; + + readahead_expand(ractl, start, (len | mask) + 1); + + if (file_end =3D=3D 0) + return; + + pages =3D kmalloc_array(max_pages, sizeof(void *), GFP_KERNEL); + if (!pages) + return; + + actor =3D squashfs_page_actor_init_special(pages, max_pages, 0); + if (!actor) + goto out; + + for (;;) { + pgoff_t index; + int res, bsize; + u64 block =3D 0; + unsigned int expected; + + nr_pages =3D __readahead_batch(ractl, pages, max_pages); + if (!nr_pages) + break; + + if (readahead_pos(ractl) >=3D i_size_read(inode) || + nr_pages < max_pages) + goto skip_pages; + + index =3D pages[0]->index >> shift; + if ((pages[nr_pages - 1]->index >> shift) !=3D index) + goto skip_pages; + + expected =3D index =3D=3D file_end ? + (i_size_read(inode) & (msblk->block_size - 1)) : + msblk->block_size; + + bsize =3D read_blocklist(inode, index, &block); + if (bsize =3D=3D 0) + goto skip_pages; + + res =3D squashfs_read_data(inode->i_sb, block, bsize, NULL, + actor); + + if (res =3D=3D expected) { + int bytes; + + /* Last page may have trailing bytes not filled */ + bytes =3D res % PAGE_SIZE; + if (bytes) { + void *pageaddr; + + pageaddr =3D kmap_atomic(pages[nr_pages - 1]); + memset(pageaddr + bytes, 0, PAGE_SIZE - bytes); + kunmap_atomic(pageaddr); + } + + for (i =3D 0; i < nr_pages; i++) + SetPageUptodate(pages[i]); + } + + for (i =3D 0; i < nr_pages; i++) { + unlock_page(pages[i]); + put_page(pages[i]); + } + } + + kfree(actor); + kfree(pages); + return; + +skip_pages: + for (i =3D 0; i < nr_pages; i++) { + unlock_page(pages[i]); + put_page(pages[i]); + } + + kfree(actor); +out: + kfree(pages); +} =20 const struct address_space_operations squashfs_aops =3D { - .read_folio =3D squashfs_read_folio + .read_folio =3D squashfs_read_folio, + .readahead =3D squashfs_readahead }; --=20 2.36.1.255.ge46751e96f-goog