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=-13.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,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 10A80C63777 for ; Mon, 23 Nov 2020 03:18:19 +0000 (UTC) Received: from lists.sourceforge.net (lists.sourceforge.net [216.105.38.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 95D44212CC; Mon, 23 Nov 2020 03:18:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=sourceforge.net header.i=@sourceforge.net header.b="jI486JfG"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=sf.net header.i=@sf.net header.b="XZdrilg5"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="loHH8aLf" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 95D44212CC Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linux-f2fs-devel-bounces@lists.sourceforge.net Received: from [127.0.0.1] (helo=sfs-ml-2.v29.lw.sourceforge.com) by sfs-ml-2.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1kh2Mq-0001Ku-7M; Mon, 23 Nov 2020 03:18:16 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kh2Mp-0001Ki-2M for linux-f2fs-devel@lists.sourceforge.net; Mon, 23 Nov 2020 03:18:15 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=zjLsbUaqfKFGANYSzVJCJ4DzwFOIjnzbFmDEwR+KDb0=; b=jI486JfGgio5HmbVR/AEAGTa9o bvgfFRwQTnZAsgNCzga3UnFM0u8t3Dd4HX9V7AklApMhsjyDgwRClS0hkQ3a7cpFOgL0sWQA/0S5F 1aqjX4H310/UjHApfzYkzCNJHLHt/Gc2gKmQmT2bk+g6caMsgpyrqmhgCU8Y0iHqhETA=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject:Cc:To:From :Sender:Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post: List-Owner:List-Archive; bh=zjLsbUaqfKFGANYSzVJCJ4DzwFOIjnzbFmDEwR+KDb0=; b=X Zdrilg5vXGRZjvhDvGak2p3fAU5oW3J1zL2VEnTxHjAn+xnh8eE29V/bemdt2MDbMlpe+466TEhFr Kp7qfglJ3WKhLFLhHs/aoSwtWWTflTjpa8gvlIpBvktJUHAFzBgZLIRkYKgA/2sLYnLxOygjJhntY 1/qm2GbBH1eoz33s=; Received: from mail-pg1-f171.google.com ([209.85.215.171]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.92.2) id 1kh2Mi-009mct-9Y for linux-f2fs-devel@lists.sourceforge.net; Mon, 23 Nov 2020 03:18:14 +0000 Received: by mail-pg1-f171.google.com with SMTP id m9so12949273pgb.4 for ; Sun, 22 Nov 2020 19:18:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=zjLsbUaqfKFGANYSzVJCJ4DzwFOIjnzbFmDEwR+KDb0=; b=loHH8aLfeAQgvSfnU1RknoT/L5AuC9ISVx2CV+eDlWFIf3I+0zTaa/StP6GO6TOWpn 6WVwK18ORrkwgAPIpeqRl367g1r6zxXJZwGJ8DkGzsrvOWnJz/Uj31jrMCzpEDY8Fgpx 3DLaPyK7WaaxKqFR1Y3HygAuP7rEyufqqwpx2EMAreuDjvyKitMX6Cvc5eqn2gk/YZhc j2qBnTniU73l+cpMRV6/j1lGdv9+4eEDavazVeLfUZX5VrTUUP+kBmiMWk3346lfVL/2 aDR7mIUB+LWPVkuE5FCJ9K/zU6FnxxSSmHx4quoQZUMqOaNtrndF3Jv2zRL8K4SqMgwA r+zQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=zjLsbUaqfKFGANYSzVJCJ4DzwFOIjnzbFmDEwR+KDb0=; b=hs0qD1CcNpP/A/Vl84f9fAZgf2ECDYTnHtlQuP483xTjrDSc7/sS32p5ecUeYY7XtB MmBG69hGtsLpdEsdPKGv5V5Idmcj0bBLjB70GAil21VPO6Az8k33IYDG8Sb7KWg4UbD1 fDwinp/zUP0ZlqNHJn3dQi/T+4wXMgZUF71KJE28T/SVIee5xsUjBPuvXSz5bKvcmYzK Py4hWw8tsrobHz7haJN0o8p1Bwc/KzEaJO2IDw6dOwPJ/Vu1Mdy2Q5QSaC7/Y7JUzxI/ 9GNMSiADKq+gc/QGgdorHHebN41G9GlpjAZjGkLIoerjXV1itHt5Yarec5qP7fBtXvTq A9Jw== X-Gm-Message-State: AOAM531BnyerNDgujL/3pbTruw5dkGr+sJ4IdXWgKMaVcGkyAHsRCo1E fBHWlemgx0QHgPUlu/lY5dM= X-Google-Smtp-Source: ABdhPJzzCisCzij78K2z6i2/m4zf8gNnqD6i7qRO1OWPlMTJrCEYBjbOhMuhP0ycswTxRC96j4GfGQ== X-Received: by 2002:a65:52c4:: with SMTP id z4mr26938950pgp.238.1606101482693; Sun, 22 Nov 2020 19:18:02 -0800 (PST) Received: from daehojeong1.seo.corp.google.com ([2401:fa00:d:11:a6ae:11ff:fe18:6ce2]) by smtp.gmail.com with ESMTPSA id i3sm7214044pjs.34.2020.11.22.19.18.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Nov 2020 19:18:02 -0800 (PST) From: Daeho Jeong To: linux-kernel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, kernel-team@android.com Date: Mon, 23 Nov 2020 12:17:50 +0900 Message-Id: <20201123031751.36811-1-daeho43@gmail.com> X-Mailer: git-send-email 2.29.2.454.gaff20da3a2-goog MIME-Version: 1.0 X-Headers-End: 1kh2Mi-009mct-9Y Subject: [f2fs-dev] [PATCH 1/2] f2fs: add compress_mode mount option X-BeenThere: linux-f2fs-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daeho Jeong Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net From: Daeho Jeong We will add a new "compress_mode" mount option to control file compression mode. This supports "fs-based" and "user-based". In "fs-based" mode (default), f2fs does automatic compression on the compression enabled files. In "user-based" mode, f2fs disables the automaic compression and gives the user discretion of choosing the target file and the timing. It means the user can do manual compression/decompression on the compression enabled files using ioctls. Signed-off-by: Daeho Jeong --- Documentation/filesystems/f2fs.rst | 7 +++++++ fs/f2fs/data.c | 10 +++++----- fs/f2fs/f2fs.h | 30 ++++++++++++++++++++++++++++++ fs/f2fs/segment.c | 2 +- fs/f2fs/super.c | 23 +++++++++++++++++++++++ 5 files changed, 66 insertions(+), 6 deletions(-) diff --git a/Documentation/filesystems/f2fs.rst b/Documentation/filesystems/f2fs.rst index b8ee761c9922..0679c53d5012 100644 --- a/Documentation/filesystems/f2fs.rst +++ b/Documentation/filesystems/f2fs.rst @@ -260,6 +260,13 @@ compress_extension=%s Support adding specified extension, so that f2fs can enab For other files, we can still enable compression via ioctl. Note that, there is one reserved special extension '*', it can be set to enable compression for all files. +compress_mode=%s Control file compression mode. This supports "fs-based" and + "user-based". In "fs-based" mode (default), f2fs does + automatic compression on the compression enabled files. + In "user-based" mode, f2fs disables the automaic compression + and gives the user discretion of choosing the target file and + the timing. The user can do manual compression/decompression + on the compression enabled files using ioctls. inlinecrypt When possible, encrypt/decrypt the contents of encrypted files using the blk-crypto framework rather than filesystem-layer encryption. This allows the use of diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c index be4da52604ed..69370f0073dd 100644 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c @@ -2896,7 +2896,7 @@ static int f2fs_write_data_page(struct page *page, if (unlikely(f2fs_cp_error(F2FS_I_SB(inode)))) goto out; - if (f2fs_compressed_file(inode)) { + if (f2fs_need_compress_write(inode)) { if (f2fs_is_compressed_cluster(inode, page->index)) { redirty_page_for_writepage(wbc, page); return AOP_WRITEPAGE_ACTIVATE; @@ -2988,7 +2988,7 @@ static int f2fs_write_cache_pages(struct address_space *mapping, readd: need_readd = false; #ifdef CONFIG_F2FS_FS_COMPRESSION - if (f2fs_compressed_file(inode)) { + if (f2fs_need_compress_write(inode)) { ret = f2fs_init_compress_ctx(&cc); if (ret) { done = 1; @@ -3067,7 +3067,7 @@ static int f2fs_write_cache_pages(struct address_space *mapping, goto continue_unlock; #ifdef CONFIG_F2FS_FS_COMPRESSION - if (f2fs_compressed_file(inode)) { + if (f2fs_need_compress_write(inode)) { get_page(page); f2fs_compress_ctx_add_page(&cc, page); continue; @@ -3120,7 +3120,7 @@ static int f2fs_write_cache_pages(struct address_space *mapping, } #ifdef CONFIG_F2FS_FS_COMPRESSION /* flush remained pages in compress cluster */ - if (f2fs_compressed_file(inode) && !f2fs_cluster_is_empty(&cc)) { + if (f2fs_need_compress_write(inode) && !f2fs_cluster_is_empty(&cc)) { ret = f2fs_write_multi_pages(&cc, &submitted, wbc, io_type); nwritten += submitted; wbc->nr_to_write -= submitted; @@ -3164,7 +3164,7 @@ static inline bool __should_serialize_io(struct inode *inode, if (IS_NOQUOTA(inode)) return false; - if (f2fs_compressed_file(inode)) + if (f2fs_need_compress_write(inode)) return true; if (wbc->sync_mode != WB_SYNC_ALL) return true; diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index e0826779a101..88e012d07ad5 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -149,6 +149,7 @@ struct f2fs_mount_info { unsigned char compress_algorithm; /* algorithm type */ unsigned compress_log_size; /* cluster log size */ unsigned char compress_ext_cnt; /* extension count */ + int compress_mode; /* compression mode */ unsigned char extensions[COMPRESS_EXT_NUM][F2FS_EXTENSION_LEN]; /* extensions */ }; @@ -677,6 +678,7 @@ enum { FI_VERITY_IN_PROGRESS, /* building fs-verity Merkle tree */ FI_COMPRESSED_FILE, /* indicate file's data can be compressed */ FI_MMAP_FILE, /* indicate file was mmapped */ + FI_ENABLE_COMPRESS, /* enable compression in user-based compression mode */ FI_MAX, /* max flag, never be used */ }; @@ -1243,6 +1245,18 @@ enum fsync_mode { FSYNC_MODE_NOBARRIER, /* fsync behaves nobarrier based on posix */ }; +enum { + COMPR_MODE_FS, /* + * automatically compress compression + * enabled files + */ + COMPR_MODE_USER, /* + * automatical compression is disabled. + * user can control the file compression + * using ioctls + */ +}; + /* * this value is set in page as a private data which indicate that * the page is atomically written, and it is in inmem_pages list. @@ -2752,6 +2766,22 @@ static inline int f2fs_compressed_file(struct inode *inode) is_inode_flag_set(inode, FI_COMPRESSED_FILE); } +static inline int f2fs_need_compress_write(struct inode *inode) +{ + int compress_mode = F2FS_OPTION(F2FS_I_SB(inode)).compress_mode; + + if (!f2fs_compressed_file(inode)) + return 0; + + if (compress_mode == COMPR_MODE_FS) + return 1; + else if (compress_mode == COMPR_MODE_USER && + is_inode_flag_set(inode, FI_ENABLE_COMPRESS)) + return 1; + + return 0; +} + static inline unsigned int addrs_per_inode(struct inode *inode) { unsigned int addrs = CUR_ADDRS_PER_INODE(inode) - diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c index 1596502f7375..652ca049bb7e 100644 --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c @@ -3254,7 +3254,7 @@ static int __get_segment_type_6(struct f2fs_io_info *fio) else return CURSEG_COLD_DATA; } - if (file_is_cold(inode) || f2fs_compressed_file(inode)) + if (file_is_cold(inode) || f2fs_need_compress_write(inode)) return CURSEG_COLD_DATA; if (file_is_hot(inode) || is_inode_flag_set(inode, FI_HOT_DATA) || diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index 87f7a6e86370..ea2385aa7f48 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -146,6 +146,7 @@ enum { Opt_compress_algorithm, Opt_compress_log_size, Opt_compress_extension, + Opt_compress_mode, Opt_atgc, Opt_err, }; @@ -214,6 +215,7 @@ static match_table_t f2fs_tokens = { {Opt_compress_algorithm, "compress_algorithm=%s"}, {Opt_compress_log_size, "compress_log_size=%u"}, {Opt_compress_extension, "compress_extension=%s"}, + {Opt_compress_mode, "compress_mode=%s"}, {Opt_atgc, "atgc"}, {Opt_err, NULL}, }; @@ -934,10 +936,25 @@ static int parse_options(struct super_block *sb, char *options, bool is_remount) F2FS_OPTION(sbi).compress_ext_cnt++; kfree(name); break; + case Opt_compress_mode: + name = match_strdup(&args[0]); + if (!name) + return -ENOMEM; + if (!strcmp(name, "fs-based")) { + F2FS_OPTION(sbi).compress_mode = COMPR_MODE_FS; + } else if (!strcmp(name, "user-based")) { + F2FS_OPTION(sbi).compress_mode = COMPR_MODE_USER; + } else { + kfree(name); + return -EINVAL; + } + kfree(name); + break; #else case Opt_compress_algorithm: case Opt_compress_log_size: case Opt_compress_extension: + case Opt_compress_mode: f2fs_info(sbi, "compression options not supported"); break; #endif @@ -1523,6 +1540,11 @@ static inline void f2fs_show_compress_options(struct seq_file *seq, seq_printf(seq, ",compress_extension=%s", F2FS_OPTION(sbi).extensions[i]); } + + if (F2FS_OPTION(sbi).compress_mode == COMPR_MODE_FS) + seq_printf(seq, ",compress_mode=%s", "fs-based"); + else if (F2FS_OPTION(sbi).compress_mode == COMPR_MODE_USER) + seq_printf(seq, ",compress_mode=%s", "user-based"); } static int f2fs_show_options(struct seq_file *seq, struct dentry *root) @@ -1672,6 +1694,7 @@ static void default_options(struct f2fs_sb_info *sbi) F2FS_OPTION(sbi).compress_algorithm = COMPRESS_LZ4; F2FS_OPTION(sbi).compress_log_size = MIN_COMPRESS_LOG_SIZE; F2FS_OPTION(sbi).compress_ext_cnt = 0; + F2FS_OPTION(sbi).compress_mode = COMPR_MODE_FS; F2FS_OPTION(sbi).bggc_mode = BGGC_MODE_ON; sbi->sb->s_flags &= ~SB_INLINECRYPT; -- 2.29.2.454.gaff20da3a2-goog _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel