From patchwork Mon May 23 06:59:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hsin-Yi Wang X-Patchwork-Id: 12858487 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 2A432C433EF for ; Mon, 23 May 2022 06:59:53 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B86806B0006; Mon, 23 May 2022 02:59:52 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B37176B0007; Mon, 23 May 2022 02:59:52 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A25EA6B0008; Mon, 23 May 2022 02:59:52 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 95C5F6B0006 for ; Mon, 23 May 2022 02:59:52 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay12.hostedemail.com (Postfix) with ESMTP id 6365F120CA4 for ; Mon, 23 May 2022 06:59:52 +0000 (UTC) X-FDA: 79496107824.12.3585D12 Received: from mail-pg1-f173.google.com (mail-pg1-f173.google.com [209.85.215.173]) by imf29.hostedemail.com (Postfix) with ESMTP id A1EFF120019 for ; Mon, 23 May 2022 06:59:41 +0000 (UTC) Received: by mail-pg1-f173.google.com with SMTP id q76so12877704pgq.10 for ; Sun, 22 May 2022 23:59:51 -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=HDi9xEtp8+cj5bsf5JN5+R5BFytv9jkvX5VZGd9dnU0=; b=UxqkeG4TS7Vls3G5OKJGYepxuYjCZ6IqBoXYMtw9AN7M89IC4p4tPHJspPyVwwNDPz bYcgjDax771MYz9EiTay7QZhCfg2Pvkqx1v/ArsV2Sxu74SUvjVz2R6Eo8P7Gd8o/X5d FpFXd96eS2on1YHqFDjZE6a9RnvvkboSSOBSo= 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=HDi9xEtp8+cj5bsf5JN5+R5BFytv9jkvX5VZGd9dnU0=; b=g5gPNo4qC4UmtMRsFwaS//g1uxnTLK/tfVzFwojcaOUCUBZypju38W6f/YLXUNOSMM AE95R8PhESzN9XS+Gl+JgxcykNfuswrd5NgusH6ByCIKCHJY3z68RlW5hqopgiKkzYn+ AvWbR9x1DAxuMKpuAZepNXNhbYlcjnpEYK/hAcOvurkW94u+5uPyAzMRXlvqhgz8Dbqy BPE4Zf6S39Tg+3PVR5Z9eTq68Iefqma355aASWxTYFYNMgwhqXoKscTCsoWcQbEf3kOc mc8qxZ7Jy5aup8yPJ5ALgEsv8xLYu/e9EtTN/SPASf0O/UlhgpQsIVpwXgdAydCiLK2H 2QmA== X-Gm-Message-State: AOAM533rv9rd1/PeIlnmnCo8LF+qSYO19LkXigcaTLEAQV4w+Tsf9qD/ fqZPJn0SG8kLSDWmYQYZp1GrETEE2dhStw== X-Google-Smtp-Source: ABdhPJxTXxgVtmCDvjsu+UF9iPAHjiAob+1BBg8pK++x+mFwZJSzqMQrBWqk7s5ILPFs5E8RXtjNgQ== X-Received: by 2002:a05:6a00:8cb:b0:510:9ec4:8f85 with SMTP id s11-20020a056a0008cb00b005109ec48f85mr22585467pfu.24.1653289191034; Sun, 22 May 2022 23:59:51 -0700 (PDT) Received: from hsinyi-z840.tpe.corp.google.com ([2401:fa00:1:10:76d5:494d:1690:d003]) by smtp.gmail.com with ESMTPSA id m2-20020a629402000000b005180f4733a8sm3099527pfe.106.2022.05.22.23.59.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 May 2022 23:59:50 -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 v3 1/3] Revert "squashfs: provide backing_dev_info in order to disable read-ahead" Date: Mon, 23 May 2022 14:59:09 +0800 Message-Id: <20220523065909.883444-2-hsinyi@chromium.org> X-Mailer: git-send-email 2.36.1.124.g0e6072fb45-goog In-Reply-To: <20220523065909.883444-1-hsinyi@chromium.org> References: <20220523065909.883444-1-hsinyi@chromium.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: A1EFF120019 X-Stat-Signature: a3sf3qdb8y5epngpnefhkwwwuddtqqgn Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=UxqkeG4T; dmarc=pass (policy=none) header.from=chromium.org; spf=pass (imf29.hostedemail.com: domain of hsinyi@chromium.org designates 209.85.215.173 as permitted sender) smtp.mailfrom=hsinyi@chromium.org X-Rspam-User: X-Rspamd-Server: rspam06 X-HE-Tag: 1653289181-446506 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: 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 #include "squashfs_fs.h" #include "squashfs_fs_sb.h" @@ -113,24 +112,6 @@ static const struct squashfs_decompressor *supported_squashfs_filesystem( return decompressor; } -static int squashfs_bdi_init(struct super_block *sb) -{ - int err; - unsigned int major = MAJOR(sb->s_dev); - unsigned int minor = MINOR(sb->s_dev); - - bdi_put(sb->s_bdi); - sb->s_bdi = &noop_backing_dev_info; - - err = super_setup_bdi_name(sb, "squashfs_%u_%u", major, minor); - if (err) - return err; - - sb->s_bdi->ra_pages = 0; - sb->s_bdi->io_pages = 0; - - return 0; -} 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) TRACE("Entered squashfs_fill_superblock\n"); - /* - * squashfs provides 'backing_dev_info' in order to disable read-ahead. For - * 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 effect - * 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 for - * squashfs. - */ - err = squashfs_bdi_init(sb); - if (err) { - errorf(fc, "squashfs init bdi failed"); - return err; - } - sb->s_fs_info = kzalloc(sizeof(*msblk), GFP_KERNEL); if (sb->s_fs_info == NULL) { ERROR("Failed to allocate squashfs_sb_info\n"); From patchwork Mon May 23 06:59:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hsin-Yi Wang X-Patchwork-Id: 12858488 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 772C3C433EF for ; Mon, 23 May 2022 07:00:03 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 14D386B0007; Mon, 23 May 2022 03:00:03 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0FE236B0008; Mon, 23 May 2022 03:00:03 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F2EB56B000A; Mon, 23 May 2022 03:00:02 -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 E46D56B0007 for ; Mon, 23 May 2022 03:00:02 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id B4EBA345FB for ; Mon, 23 May 2022 07:00:02 +0000 (UTC) X-FDA: 79496108244.05.5650FF2 Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by imf15.hostedemail.com (Postfix) with ESMTP id C03A4A0002 for ; Mon, 23 May 2022 06:59:43 +0000 (UTC) Received: by mail-pl1-f174.google.com with SMTP id q18so12261099pln.12 for ; Mon, 23 May 2022 00:00:01 -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=l9zzjHGygGfmD2mjiCjABBiOJyHxbV3Xb2gkS3Lpi4w=; b=iQ6M1fZ5Q3+FC+7blG98I3zIIvX/yTF2CLpnO+Hh13i/JAHcQd87xBGJTrWupW27XH Sb1AwdIpu2meybIIwwOeh6fZAOUOQu5fRyD4FaoWpcCzLONtTAcyZs5cXuuRotq2WTUE 3xdrV3vWw3+v0DzRExLgBNJncwKj+Sm+Aj8vY= 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=l9zzjHGygGfmD2mjiCjABBiOJyHxbV3Xb2gkS3Lpi4w=; b=MfuH1ATq2QvLMyI8DDT/4/fO+NgWKUxO+GRNaxuXdi1FQmEcOHcaxHdQ88azqaDEWG iMi1796ftEOaHCiuziACjXKhh4oWsc7iKRto460ZaukSKYe7TdHI7aYCFaOIydF5whWR m6C0Bf6CeLPlA7BBcLLR0wbb6lWvQ1lA2+V0BCJSfzL1WWRRMfYanqJV2qeMBau71yjR rlZRyJ2Bpx3/DfX5tfVg5yI0PmNQ7hqKYh5OAav6tp4y9t7oeYXngLb/PWa0eOGiZRRR UT7xoLPdrAeLw/Iy/dPi2P1hV1KX/6AOkBbnOit2QjPD9lL7qy8l7fothE5IDRYm82BI VGLA== X-Gm-Message-State: AOAM530xP8Z71QKY6NSCaVIBNVic9kRvtAjkPW6mYB8ZlqmBBWbD4Auw XWfT4Vv4VlzY7i58i3pwl2zwZA== X-Google-Smtp-Source: ABdhPJyuPsrnOB4bRdIX3zgGhGWxkP1cXNBva/WVX5JNyJKxhRqlesxK7b7121frjUkQT2vBRVSNVQ== X-Received: by 2002:a17:90a:1b6c:b0:1df:6940:e856 with SMTP id q99-20020a17090a1b6c00b001df6940e856mr25130152pjq.240.1653289201243; Mon, 23 May 2022 00:00:01 -0700 (PDT) Received: from hsinyi-z840.tpe.corp.google.com ([2401:fa00:1:10:76d5:494d:1690:d003]) by smtp.gmail.com with ESMTPSA id m2-20020a629402000000b005180f4733a8sm3099527pfe.106.2022.05.22.23.59.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 May 2022 00:00:00 -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 v3 2/3] squashfs: always build "file direct" version of page actor Date: Mon, 23 May 2022 14:59:11 +0800 Message-Id: <20220523065909.883444-3-hsinyi@chromium.org> X-Mailer: git-send-email 2.36.1.124.g0e6072fb45-goog In-Reply-To: <20220523065909.883444-1-hsinyi@chromium.org> References: <20220523065909.883444-1-hsinyi@chromium.org> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Queue-Id: C03A4A0002 X-Stat-Signature: zum9ann57o9u4tfiutkmhatfynnyxb7k Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=iQ6M1fZ5; dmarc=pass (policy=none) header.from=chromium.org; spf=pass (imf15.hostedemail.com: domain of hsinyi@chromium.org designates 209.85.214.174 as permitted sender) smtp.mailfrom=hsinyi@chromium.org X-Rspamd-Server: rspam04 X-HE-Tag: 1653289183-677386 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: 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 @@ obj-$(CONFIG_SQUASHFS) += squashfs.o squashfs-y += block.o cache.o dir.o export.o file.o fragment.o id.o inode.o -squashfs-y += namei.o super.o symlink.o decompressor.o +squashfs-y += namei.o super.o symlink.o decompressor.o page_actor.o squashfs-$(CONFIG_SQUASHFS_FILE_CACHE) += file_cache.o -squashfs-$(CONFIG_SQUASHFS_FILE_DIRECT) += file_direct.o page_actor.o +squashfs-$(CONFIG_SQUASHFS_FILE_DIRECT) += file_direct.o squashfs-$(CONFIG_SQUASHFS_DECOMP_SINGLE) += decompressor_single.o squashfs-$(CONFIG_SQUASHFS_DECOMP_MULTI) += decompressor_multi.o squashfs-$(CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU) += decompressor_multi_percpu.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 */ -#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 = kmalloc(sizeof(*actor), GFP_KERNEL); - - if (actor == NULL) - return NULL; - - actor->length = length ? : pages * PAGE_SIZE; - actor->page = page; - actor->pages = pages; - actor->next_page = 0; - return actor; -} - -static inline void *squashfs_first_page(struct squashfs_page_actor *actor) -{ - actor->next_page = 1; - return actor->page[0]; -} - -static inline void *squashfs_next_page(struct squashfs_page_actor *actor) -{ - return actor->next_page == 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_page_actor *actor) actor->squashfs_finish_page(actor); } #endif -#endif From patchwork Mon May 23 06:59:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hsin-Yi Wang X-Patchwork-Id: 12858489 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 76715C433F5 for ; Mon, 23 May 2022 07:00:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 14D0A6B0008; Mon, 23 May 2022 03:00:14 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0FD8D6B000A; Mon, 23 May 2022 03:00:14 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F2E856B000C; Mon, 23 May 2022 03:00:13 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id E33006B0008 for ; Mon, 23 May 2022 03:00:13 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id B5213DAF for ; Mon, 23 May 2022 07:00:13 +0000 (UTC) X-FDA: 79496108706.14.1D9E2F2 Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) by imf21.hostedemail.com (Postfix) with ESMTP id ED3B21C0026 for ; Mon, 23 May 2022 07:00:01 +0000 (UTC) Received: by mail-pf1-f178.google.com with SMTP id y199so12852299pfb.9 for ; Mon, 23 May 2022 00:00:13 -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=n/ak3fxbDlmFRvOmVIgctXK5enM9fzzhqOEs66o/WZM=; b=BJYsjmLTVsLt/DTcxdKUZlCPRaGxYqNgQ3iPjE0uaCVFHbQ5IfcSm2bRKpCOy1sKyB P8SRFu76e4eKYu2KV3zIGjFcZQz/o/iMiGBWw6KU64KmqHFC1s2lZDKrqqSxtW6As6L0 iXUZ6q4c8IEnzqZTeXStFgBDuLzkBwg/vZEYc= 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=n/ak3fxbDlmFRvOmVIgctXK5enM9fzzhqOEs66o/WZM=; b=SG/YgFghU7DSAsp8lL+ilYnpVcKTw4rUJaRxR89Gn8QeA9iVkUUaQWebw+bvfZo3ce Bu+0TRFDWfteuXRqil5Dj3+RvDZytyRqPqTgcH/Xrc+C2NHBQKKaEphPMBtufAuILneb fOqc4YTbIFGiQnZBOP/GLnOwTPeP+nUS+cbv1qeWkxUHTFcQzv7Bif0XfBOvMpkmpHmT 8FnOZkmpa+CNiFOvdaPu8RqK53dwdEhdkDfCe9yPhBvwlIo4RpNfCFt8B4LeiivewHDG aXJc7aeIzeU5Tno1w3KvZMsj+SdfAk+EF3lc+eQH/8qQZqcYmzEKMeSekvAHeiwxifyR Pzgw== X-Gm-Message-State: AOAM530674AijIdrsgC+h1jHBE2GXeX4DgenGDXBblwf+FPWMR0tRWXO vpxgnJQTvH8YTYQd8b76UlEFbg== X-Google-Smtp-Source: ABdhPJwEV3eRY3ezvap02NItAMRg3nkr6LiufW/9apHU0swp7gID6uukw67Oyat2knY8vtCPnx9gMw== X-Received: by 2002:a05:6a00:a85:b0:506:b9e:7f43 with SMTP id b5-20020a056a000a8500b005060b9e7f43mr22302851pfl.5.1653289212266; Mon, 23 May 2022 00:00:12 -0700 (PDT) Received: from hsinyi-z840.tpe.corp.google.com ([2401:fa00:1:10:76d5:494d:1690:d003]) by smtp.gmail.com with ESMTPSA id m2-20020a629402000000b005180f4733a8sm3099527pfe.106.2022.05.23.00.00.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 May 2022 00:00:11 -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 v3 3/3] squashfs: implement readahead Date: Mon, 23 May 2022 14:59:13 +0800 Message-Id: <20220523065909.883444-4-hsinyi@chromium.org> X-Mailer: git-send-email 2.36.1.124.g0e6072fb45-goog In-Reply-To: <20220523065909.883444-1-hsinyi@chromium.org> References: <20220523065909.883444-1-hsinyi@chromium.org> MIME-Version: 1.0 X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: ED3B21C0026 X-Stat-Signature: bmkn4aoa3tud16tf4mzz15qgk8a6s8jg X-Rspam-User: Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=BJYsjmLT; dmarc=pass (policy=none) header.from=chromium.org; spf=pass (imf21.hostedemail.com: domain of hsinyi@chromium.org designates 209.85.210.178 as permitted sender) smtp.mailfrom=hsinyi@chromium.org X-HE-Tag: 1653289201-418819 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: 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 --- v2->v3: Add checks on - decompressed block size. - fill zeros if the last page is not a full page. v2: https://lore.kernel.org/lkml/20220517082650.2005840-4-hsinyi@chromium.org/ v1: https://lore.kernel.org/lkml/20220516105100.1412740-3-hsinyi@chromium.org/ --- fs/squashfs/file.c | 91 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 90 insertions(+), 1 deletion(-) diff --git a/fs/squashfs/file.c b/fs/squashfs/file.c index a8e495d8eb86..c311fc685fe4 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" /* * Locate cache slot in range [offset, index] for specified inode. If @@ -495,7 +496,95 @@ static int squashfs_read_folio(struct file *file, struct folio *folio) return 0; } +static void squashfs_readahead(struct readahead_control *ractl) +{ + struct inode *inode = ractl->mapping->host; + struct squashfs_sb_info *msblk = inode->i_sb->s_fs_info; + size_t mask = (1UL << msblk->block_log) - 1; + size_t shift = msblk->block_log - PAGE_SHIFT; + loff_t start = readahead_pos(ractl) &~ mask; + size_t len = readahead_length(ractl) + readahead_pos(ractl) - start; + struct squashfs_page_actor *actor; + unsigned int nr_pages = 0; + struct page **pages; + u64 block = 0; + int bsize, res, i, index, bytes, expected; + int file_end = i_size_read(inode) >> msblk->block_log; + unsigned int max_pages = 1UL << shift; + void *pageaddr; + + readahead_expand(ractl, start, (len | mask) + 1); + + if (file_end == 0) + return; + + pages = kmalloc_array(max_pages, sizeof(void *), GFP_KERNEL); + if (!pages) + return; + + actor = squashfs_page_actor_init_special(pages, max_pages, 0); + if (!actor) + goto out; + + for (;;) { + nr_pages = __readahead_batch(ractl, pages, max_pages); + if (!nr_pages) + break; + + if (readahead_pos(ractl) >= i_size_read(inode) || + nr_pages < max_pages) + goto skip_pages; + + index = pages[0]->index >> shift; + if ((pages[nr_pages - 1]->index >> shift) != index) + goto skip_pages; + + expected = index == file_end ? + (i_size_read(inode) & (msblk->block_size - 1)) : + msblk->block_size; + + bsize = read_blocklist(inode, index, &block); + if (bsize == 0) + goto skip_pages; + + res = squashfs_read_data(inode->i_sb, block, bsize, NULL, + actor); + + if (res == expected) { + /* Last page may have trailing bytes not filled */ + bytes = res % PAGE_SIZE; + if (bytes) { + pageaddr = kmap_atomic(pages[nr_pages - 1]); + memset(pageaddr + bytes, 0, PAGE_SIZE - bytes); + kunmap_atomic(pageaddr); + } + + for (i = 0; i < nr_pages; i++) + SetPageUptodate(pages[i]); + } + + for (i = 0; i < nr_pages; i++) { + unlock_page(pages[i]); + put_page(pages[i]); + } + } + + kfree(actor); + kfree(pages); + return; + +skip_pages: + for (i = 0; i < nr_pages; i++) { + unlock_page(pages[i]); + put_page(pages[i]); + } + + kfree(actor); +out: + kfree(pages); +} const struct address_space_operations squashfs_aops = { - .read_folio = squashfs_read_folio + .read_folio = squashfs_read_folio, + .readahead = squashfs_readahead };