Commit 87a201b4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'erofs-for-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs 

Pull erofs updates from Gao Xiang:
 "Nothing exciting lands for this cycle, since we're still busying in
  developing support for sub-page blocks and large-folios of compressed
  data for new scenarios on Android.

  In this cycle, MicroLZMA format is marked as stable, and there are
  minor cleanups around documentation and codebase. In addition, it also
  fixes incorrect lockref usage in erofs_insert_workgroup().

  Summary:

   - Fix inode metadata space layout documentation

   - Avoid warning for MicroLZMA format anymore

   - Fix erofs_insert_workgroup() lockref usage

   - Some cleanups"

* tag 'erofs-for-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs:
  erofs: fix erofs_insert_workgroup() lockref usage
  erofs: tidy up redundant includes
  erofs: get rid of ROOT_NID()
  erofs: simplify compression configuration parser
  erofs: don't warn MicroLZMA format anymore
  erofs: fix inode metadata space layout description in documentation
parents 57aff997 1a0ac8bd

Documentation/filesystems/erofs.rst

+1 −1
Original line number Diff line number Diff line
@@ -199,7 +199,7 @@ may not. All metadatas can be now observed in two different spaces (views): 
                                        |                  |

                                        |__________________| 64 bytes



    Xattrs, extents, data inline are followed by the corresponding inode with

    Xattrs, extents, data inline are placed after the corresponding inode with

    proper alignment, and they could be optional for different data mappings.

    _currently_ total 5 data layouts are supported:

fs/erofs/Kconfig

+2 −5
Original line number Diff line number Diff line
@@ -91,13 +91,10 @@ config EROFS_FS_ZIP_LZMA 
	select XZ_DEC_MICROLZMA

	help

	  Saying Y here includes support for reading EROFS file systems

	  containing LZMA compressed data, specifically called microLZMA. it

	  gives better compression ratios than the LZ4 algorithm, at the

	  containing LZMA compressed data, specifically called microLZMA. It

	  gives better compression ratios than the default LZ4 format, at the

	  expense of more CPU overhead.



	  LZMA support is an experimental feature for now and so most file

	  systems will be readable without selecting this option.



	  If unsure, say N.



config EROFS_FS_ZIP_DEFLATE

fs/erofs/compress.h

+6 −0
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ struct z_erofs_decompress_req { 
};



struct z_erofs_decompressor {

	int (*config)(struct super_block *sb, struct erofs_super_block *dsb,

		      void *data, int size);

	int (*decompress)(struct z_erofs_decompress_req *rq,

			  struct page **pagepool);

	char *name;
@@ -92,6 +94,10 @@ int z_erofs_fixup_insize(struct z_erofs_decompress_req *rq, const char *padbuf, 
extern const struct z_erofs_decompressor erofs_decompressors[];



/* prototypes for specific algorithms */

int z_erofs_load_lzma_config(struct super_block *sb,

			struct erofs_super_block *dsb, void *data, int size);

int z_erofs_load_deflate_config(struct super_block *sb,

			struct erofs_super_block *dsb, void *data, int size);

int z_erofs_lzma_decompress(struct z_erofs_decompress_req *rq,

			    struct page **pagepool);

int z_erofs_deflate_decompress(struct z_erofs_decompress_req *rq,

fs/erofs/data.c

+0 −2
Original line number Diff line number Diff line
@@ -5,9 +5,7 @@ 
 * Copyright (C) 2021, Alibaba Cloud

 */

#include "internal.h"

#include <linux/prefetch.h>

#include <linux/sched/mm.h>

#include <linux/dax.h>

#include <trace/events/erofs.h>



void erofs_unmap_metabuf(struct erofs_buf *buf)

fs/erofs/decompressor.c

+59 −4
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 
 *             https://www.huawei.com/

 */

#include "compress.h"

#include <linux/module.h>

#include <linux/lz4.h>



#ifndef LZ4_DISTANCE_MAX	/* history window size */
@@ -24,11 +23,11 @@ struct z_erofs_lz4_decompress_ctx { 
	unsigned int oend;

};



int z_erofs_load_lz4_config(struct super_block *sb,

			    struct erofs_super_block *dsb,

			    struct z_erofs_lz4_cfgs *lz4, int size)

static int z_erofs_load_lz4_config(struct super_block *sb,

			    struct erofs_super_block *dsb, void *data, int size)

{

	struct erofs_sb_info *sbi = EROFS_SB(sb);

	struct z_erofs_lz4_cfgs *lz4 = data;

	u16 distance;



	if (lz4) {
@@ -370,19 +369,75 @@ const struct z_erofs_decompressor erofs_decompressors[] = { 
		.name = "interlaced"

	},

	[Z_EROFS_COMPRESSION_LZ4] = {

		.config = z_erofs_load_lz4_config,

		.decompress = z_erofs_lz4_decompress,

		.name = "lz4"

	},

#ifdef CONFIG_EROFS_FS_ZIP_LZMA

	[Z_EROFS_COMPRESSION_LZMA] = {

		.config = z_erofs_load_lzma_config,

		.decompress = z_erofs_lzma_decompress,

		.name = "lzma"

	},

#endif

#ifdef CONFIG_EROFS_FS_ZIP_DEFLATE

	[Z_EROFS_COMPRESSION_DEFLATE] = {

		.config = z_erofs_load_deflate_config,

		.decompress = z_erofs_deflate_decompress,

		.name = "deflate"

	},

#endif

};



int z_erofs_parse_cfgs(struct super_block *sb, struct erofs_super_block *dsb)

{

	struct erofs_sb_info *sbi = EROFS_SB(sb);

	struct erofs_buf buf = __EROFS_BUF_INITIALIZER;

	unsigned int algs, alg;

	erofs_off_t offset;

	int size, ret = 0;



	if (!erofs_sb_has_compr_cfgs(sbi)) {

		sbi->available_compr_algs = Z_EROFS_COMPRESSION_LZ4;

		return z_erofs_load_lz4_config(sb, dsb, NULL, 0);

	}



	sbi->available_compr_algs = le16_to_cpu(dsb->u1.available_compr_algs);

	if (sbi->available_compr_algs & ~Z_EROFS_ALL_COMPR_ALGS) {

		erofs_err(sb, "unidentified algorithms %x, please upgrade kernel",

			  sbi->available_compr_algs & ~Z_EROFS_ALL_COMPR_ALGS);

		return -EOPNOTSUPP;

	}



	erofs_init_metabuf(&buf, sb);

	offset = EROFS_SUPER_OFFSET + sbi->sb_size;

	alg = 0;

	for (algs = sbi->available_compr_algs; algs; algs >>= 1, ++alg) {

		void *data;



		if (!(algs & 1))

			continue;



		data = erofs_read_metadata(sb, &buf, &offset, &size);

		if (IS_ERR(data)) {

			ret = PTR_ERR(data);

			break;

		}



		if (alg >= ARRAY_SIZE(erofs_decompressors) ||

		    !erofs_decompressors[alg].config) {

			erofs_err(sb, "algorithm %d isn't enabled on this kernel",

				  alg);

			ret = -EOPNOTSUPP;

		} else {

			ret = erofs_decompressors[alg].config(sb,

					dsb, data, size);

		}



		kfree(data);

		if (ret)

			break;

	}

	erofs_put_metabuf(&buf);

	return ret;

}