Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Huang Jianan <huangjianan@oppo.com>
To:     linux-erofs@lists.ozlabs.org
Cc:     huangjianan@oppo.com, guoweichao@oppo.com, guanyuwei@oppo.com,
        yh@oppo.com, zhangshiming@oppo.com, linux-kernel@vger.kernel.org
Subject: [PATCH 2/2] erofs: add sysfs node to control sync decompression strategy
Date:   Tue,  9 Nov 2021 10:54:45 +0800
Message-Id: <20211109025445.12427-2-huangjianan@oppo.com>
In-Reply-To: <20211109025445.12427-1-huangjianan@oppo.com>
References: <20211109025445.12427-1-huangjianan@oppo.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?2bwV9y1UsqybOPMsoErokG3wE9Zhly5Ba1mAirz6XyftAbLJnPfr/HECoci0?=
 =?us-ascii?Q?D5hVMxQaKwKiG85UzLYy3SnbQQSV3OQe0RdBnfpTVKuU2vzT+lBWj2NupuVC?=
 =?us-ascii?Q?pTt6tYfapGp3i4Ycz/GxA5cMm3fF9EwRooLv41d7cf7nKmtCiI4p/q6DdoSC?=
 =?us-ascii?Q?PoZQm6AIYqAShy0B8VhSLNZ73vZfnOoubD4azUpaZKRhPNokBICfx1YTlg0R?=
 =?us-ascii?Q?rXHR2lLPtAe9KUpECu0mKV+/Spb57YLGmdzH1PjlRvEQm8RaD0xeewI7G4MB?=
 =?us-ascii?Q?QIaQ5lXKswXlTthyOYukAgCyYR8AnenDB2dU08/eQ2K9HnO2VXLX5mXgi+YE?=
 =?us-ascii?Q?dyNB+1jrIEeMdePv6J1JBI9imAzVCe3L5TDjsfLmcZ8PJl8BdD0/S6YH6ccL?=
 =?us-ascii?Q?hlMBfrisqwaRrlL48YSEZg+0ov6XCrtB7jlYTdg82z9y8Fe8RQ29JJ9FegVD?=
 =?us-ascii?Q?XdujMK75IQMCD3ItSUdEpV7+MFyXpf112kHio9ZT2w4u12HTx85nMQf/qxa6?=
 =?us-ascii?Q?OGR5PzUIBRM85nBj/lCqvumJuAToSVDa8r21GUsQRHoyhRZOBD035UZSS15C?=
 =?us-ascii?Q?5Hi6bO38L7a941ZYEJyvOnFkM+eFxM5w2MLaDDRo/mZl+b5r+eo2KmwGOEPD?=
 =?us-ascii?Q?k6b6S28eenqpqP+4ozzbzfiOkpbqeZf52CAAvXe7NKsXBidrSn09MxeSK1uZ?=
 =?us-ascii?Q?fbVWVQA7qvA0HRFe8qDaShZw8JEstTHnbX4de2V3mUXREn/kLJlAoqWlO+41?=
 =?us-ascii?Q?iLROGrlR2Ot5Cgcl6Zsx7vT50EVFsj5gXKLZEJp5Hfo+y6Xaqwuok5siQIHf?=
 =?us-ascii?Q?xVDGnLteh97le7iCWYb1ppBXA1KEYCYVJN36RWsz2hFnp50+y6ed5JdsrAMi?=
 =?us-ascii?Q?EBohmqhg4m5HvioibrhhveWywsSDVvib850ViFevG7eb9DGtLhx+t00B0OWe?=
 =?us-ascii?Q?CHaK962CzYN1E1OTlHLH6DAOAJkixPSXwKey0zFE+bkZVbs092eUvuA5p+Ya?=
 =?us-ascii?Q?Vxh9kOf81c5HaGK2T0j2aLaU8/Uh4s8ghMQxcxrkYbn5SEKL2ZCEHlHecZhK?=
 =?us-ascii?Q?rMTmpXjbSsb8csL0DT4O7cqEuvI7tpiMPi+2UA5bicUd1AP9qG02jXU997YE?=
 =?us-ascii?Q?IoplsrQlCEwyVwkp7GpVVIOKdXMDoyq4ogexO6dRmzSoOf6OSzrXHsCmLIkZ?=
 =?us-ascii?Q?Rz/9zigKvslENq0XujZ9HF2cl7d7N0ro91lOsrkU7CuWGFp9LGpj0Bg5HhVx?=
 =?us-ascii?Q?UDK8Zhle3/AOG65KrGdm6WwT+B59FNASY5/xzN+nu9E4kIAMZH4vHp+fJdnn?=
 =?us-ascii?Q?6bmfKJwh7g4cNvVW83QxSka52cnzgdc8JWGyFiXZVDSRv6q0F+bE8MiWU7Jy?=
 =?us-ascii?Q?V3KBQT3G7wRTpGsGJ/Ma1edR8Oz8ebgfzKK3I9zUxHedCCMxx2lX+X0IzFYR?=
 =?us-ascii?Q?j2QxJdOaXorGGOs4jG5vp0K7kXuNptYCqCbZXRIGo11fxWp6/JigSTgIWeHr?=
 =?us-ascii?Q?VETGRPkpeVRJ5M4wzhFnpEznG5xpBgtFxFIA8dWHiQ3cpt5uHOiMN/nO/gX0?=
 =?us-ascii?Q?6Br2nYn/VpjYo7bPGhV6Z08vvdieSk5m42Px2CExVBF2shChVrTtjdxvxDUi?=
 =?us-ascii?Q?u76qJf/PH/hlberVqZuN3hQ=3D?=
X-OriginatorOrg: oppo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: a4daefe5-1fe0-4ce2-06bb-08d9a32c537a
X-MS-Exchange-CrossTenant-AuthSource: SG2PR02MB4108.apcprd02.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Nov 2021 02:55:02.5489
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: f1905eb1-c353-41c5-9516-62b4a54b5ee6
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: H6xK90Ev5x5x+6ltvMRsYVYKPBy6A9WDZkeCTPBPosV9nfLtj3avNJ+b5Ln5lUQJf7yFpcP8MZW/exuUq9dIpQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SG2PR02MB2699
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Although readpage is a synchronous path, there will be no additional
kworker scheduling overhead in non-atomic contexts. So we can add a
sysfs node to allow disable sync decompression.

Signed-off-by: Huang Jianan <huangjianan@oppo.com>
---
 fs/erofs/internal.h | 2 +-
 fs/erofs/super.c    | 2 +-
 fs/erofs/sysfs.c    | 6 ++++++
 fs/erofs/zdata.c    | 9 ++++-----
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/fs/erofs/internal.h b/fs/erofs/internal.h
index d0cd712dc222..1ab96878009d 100644
--- a/fs/erofs/internal.h
+++ b/fs/erofs/internal.h
@@ -60,7 +60,7 @@ struct erofs_mount_opts {
 #ifdef CONFIG_EROFS_FS_ZIP
 	/* current strategy of how to use managed cache */
 	unsigned char cache_strategy;
-	/* strategy of sync decompression (false - auto, true - force on) */
+	/* strategy of sync decompression (false - disable, true - force on) */
 	bool readahead_sync_decompress;
 
 	/* threshold for decompression synchronously */
diff --git a/fs/erofs/super.c b/fs/erofs/super.c
index abc1da5d1719..26585d865503 100644
--- a/fs/erofs/super.c
+++ b/fs/erofs/super.c
@@ -423,7 +423,7 @@ static void erofs_default_options(struct erofs_fs_context *ctx)
 #ifdef CONFIG_EROFS_FS_ZIP
 	ctx->opt.cache_strategy = EROFS_ZIP_CACHE_READAROUND;
 	ctx->opt.max_sync_decompress_pages = 3;
-	ctx->opt.readahead_sync_decompress = false;
+	ctx->opt.readahead_sync_decompress = true;
 #endif
 #ifdef CONFIG_EROFS_FS_XATTR
 	set_opt(&ctx->opt, XATTR_USER);
diff --git a/fs/erofs/sysfs.c b/fs/erofs/sysfs.c
index c7685f1a8f34..fe67ed490735 100644
--- a/fs/erofs/sysfs.c
+++ b/fs/erofs/sysfs.c
@@ -16,6 +16,7 @@ enum {
 
 enum {
 	struct_erofs_sb_info,
+	struct_erofs_mount_opts,
 };
 
 struct erofs_attr {
@@ -55,7 +56,10 @@ static struct erofs_attr erofs_attr_##_name = {			\
 
 #define ATTR_LIST(name) (&erofs_attr_##name.attr)
 
+EROFS_RW_ATTR_BOOL(readahead_sync_decompress, erofs_mount_opts);
+
 static struct attribute *erofs_attrs[] = {
+	ATTR_LIST(readahead_sync_decompress),
 	NULL,
 };
 ATTRIBUTE_GROUPS(erofs);
@@ -82,6 +86,8 @@ static unsigned char *__struct_ptr(struct erofs_sb_info *sbi,
 {
 	if (struct_type == struct_erofs_sb_info)
 		return (unsigned char *)sbi + offset;
+	if (struct_type == struct_erofs_mount_opts)
+		return (unsigned char *)&sbi->opt + offset;
 	return NULL;
 }
 
diff --git a/fs/erofs/zdata.c b/fs/erofs/zdata.c
index bcb1b91b234f..ad11333b367a 100644
--- a/fs/erofs/zdata.c
+++ b/fs/erofs/zdata.c
@@ -776,8 +776,6 @@ static void z_erofs_decompressqueue_work(struct work_struct *work);
 static void z_erofs_decompress_kickoff(struct z_erofs_decompressqueue *io,
 				       bool sync, int bios)
 {
-	struct erofs_sb_info *const sbi = EROFS_SB(io->sb);
-
 	/* wake up the caller thread for sync decompression */
 	if (sync) {
 		unsigned long flags;
@@ -791,10 +789,9 @@ static void z_erofs_decompress_kickoff(struct z_erofs_decompressqueue *io,
 
 	if (atomic_add_return(bios, &io->pending_bios))
 		return;
-	/* Use workqueue and sync decompression for atomic contexts only */
+	/* Use workqueue decompression for atomic contexts only */
 	if (in_atomic() || irqs_disabled()) {
 		queue_work(z_erofs_workqueue, &io->u.work);
-		sbi->opt.readahead_sync_decompress = true;
 		return;
 	}
 	z_erofs_decompressqueue_work(&io->u.work);
@@ -1454,6 +1451,7 @@ static void z_erofs_pcluster_readmore(struct z_erofs_decompress_frontend *f,
 static int z_erofs_readpage(struct file *file, struct page *page)
 {
 	struct inode *const inode = page->mapping->host;
+	struct erofs_sb_info *const sbi = EROFS_I_SB(inode);
 	struct z_erofs_decompress_frontend f = DECOMPRESS_FRONTEND_INIT(inode);
 	struct page *pagepool = NULL;
 	int err;
@@ -1469,7 +1467,8 @@ static int z_erofs_readpage(struct file *file, struct page *page)
 	(void)z_erofs_collector_end(&f.clt);
 
 	/* if some compressed cluster ready, need submit them anyway */
-	z_erofs_runqueue(inode->i_sb, &f, &pagepool, true);
+	z_erofs_runqueue(inode->i_sb, &f, &pagepool,
+			 sbi->opt.readahead_sync_decompress);
 
 	if (err)
 		erofs_err(inode->i_sb, "failed to read, err [%d]", err);
-- 
2.25.1