Commit dc483c85 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull erofs updates from Gao Xiang:
 "The most noticeable feature for this cycle is per-CPU kthread
  decompression since Android use cases need low-latency I/O handling in
  order to ensure the app runtime performance, currently unbounded
  workqueue latencies are not quite good for production on many aarch64
  hardwares and thus we need to introduce a deterministic expectation
  for these. Decompression is CPU-intensive and it is sleepable for
  EROFS, so other alternatives like decompression under softirq contexts
  are not considered. More details are in the corresponding commit
  message.

  Others are random cleanups around the whole codebase and we will
  continue to clean up further in the next few months.

  Due to Lunar New Year holidays, some other new features were not
  completely reviewed and solidified as expected and we may delay them
  into the next version.

  Summary:

   - Add per-cpu kthreads for low-latency decompression for Android use
     cases

   - Get rid of tagged pointer helpers since they are rarely used now

   - Several code cleanups to reduce codebase

   - Documentation and MAINTAINERS updates"

* tag 'erofs-for-6.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs: (21 commits)
  erofs: fix an error code in z_erofs_init_zip_subsystem()
  erofs: unify anonymous inodes for blob
  erofs: relinquish volume with mutex held
  erofs: maintain cookies of share domain in self-contained list
  erofs: remove unused device mapping in meta routine
  MAINTAINERS: erofs: Add Documentation/ABI/testing/sysfs-fs-erofs
  Documentation/ABI: sysfs-fs-erofs: update supported features
  erofs: remove unused EROFS_GET_BLOCKS_RAW flag
  erofs: update print symbols for various flags in trace
  erofs: make kobj_type structures constant
  erofs: add per-cpu threads for decompression as an option
  erofs: tidy up internal.h
  erofs: get rid of z_erofs_do_map_blocks() forward declaration
  erofs: move zdata.h into zdata.c
  erofs: remove tagged pointer helpers
  erofs: avoid tagged pointers to mark sync decompression
  erofs: get rid of erofs_inode_datablocks()
  erofs: simplify iloc()
  erofs: get rid of debug_one_dentry()
  erofs: remove linux/buffer_head.h dependency
  ...
parents 91bc559d 8d1b80a7

Documentation/ABI/testing/sysfs-fs-erofs

+2 −1
Original line number Diff line number Diff line
@@ -4,7 +4,8 @@ Contact: "Huang Jianan" <huangjianan@oppo.com> 
Description:	Shows all enabled kernel features.

		Supported features:

		zero_padding, compr_cfgs, big_pcluster, chunked_file,

		device_table, compr_head2, sb_chksum.

		device_table, compr_head2, sb_chksum, ztailpacking,

		dedupe, fragments.



What:		/sys/fs/erofs/<disk>/sync_decompress

Date:		November 2021

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -7747,6 +7747,7 @@ R: Jeffle Xu <jefflexu@linux.alibaba.com> 
L:	linux-erofs@lists.ozlabs.org

S:	Maintained

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git

F:	Documentation/ABI/testing/sysfs-fs-erofs

F:	Documentation/filesystems/erofs.rst

F:	fs/erofs/

F:	include/trace/events/erofs.h

fs/erofs/Kconfig

+18 −0
Original line number Diff line number Diff line
@@ -108,3 +108,21 @@ config EROFS_FS_ONDEMAND 
	  read support.



	  If unsure, say N.



config EROFS_FS_PCPU_KTHREAD

	bool "EROFS per-cpu decompression kthread workers"

	depends on EROFS_FS_ZIP

	help

	  Saying Y here enables per-CPU kthread workers pool to carry out

	  async decompression for low latencies on some architectures.



	  If unsure, say N.



config EROFS_FS_PCPU_KTHREAD_HIPRI

	bool "EROFS high priority per-CPU kthread workers"

	depends on EROFS_FS_ZIP && EROFS_FS_PCPU_KTHREAD

	help

	  This permits EROFS to configure per-CPU kthread workers to run

	  at higher priority.



	  If unsure, say N.

fs/erofs/data.c

+9 −14
Original line number Diff line number Diff line
@@ -74,8 +74,7 @@ void *erofs_read_metabuf(struct erofs_buf *buf, struct super_block *sb, 
}



static int erofs_map_blocks_flatmode(struct inode *inode,

				     struct erofs_map_blocks *map,

				     int flags)

				     struct erofs_map_blocks *map)

{

	erofs_blk_t nblocks, lastblk;

	u64 offset = map->m_la;
@@ -91,11 +90,8 @@ static int erofs_map_blocks_flatmode(struct inode *inode, 
		map->m_pa = blknr_to_addr(vi->raw_blkaddr) + map->m_la;

		map->m_plen = blknr_to_addr(lastblk) - offset;

	} else if (tailendpacking) {

		/* 2 - inode inline B: inode, [xattrs], inline last blk... */

		struct erofs_sb_info *sbi = EROFS_SB(inode->i_sb);



		map->m_pa = iloc(sbi, vi->nid) + vi->inode_isize +

			vi->xattr_isize + erofs_blkoff(map->m_la);

		map->m_pa = erofs_iloc(inode) + vi->inode_isize +

			vi->xattr_isize + erofs_blkoff(offset);

		map->m_plen = inode->i_size - offset;



		/* inline data should be located in the same meta block */
@@ -117,8 +113,7 @@ static int erofs_map_blocks_flatmode(struct inode *inode, 
	return 0;

}



int erofs_map_blocks(struct inode *inode,

		     struct erofs_map_blocks *map, int flags)

int erofs_map_blocks(struct inode *inode, struct erofs_map_blocks *map)

{

	struct super_block *sb = inode->i_sb;

	struct erofs_inode *vi = EROFS_I(inode);
@@ -130,7 +125,7 @@ int erofs_map_blocks(struct inode *inode, 
	void *kaddr;

	int err = 0;



	trace_erofs_map_blocks_enter(inode, map, flags);

	trace_erofs_map_blocks_enter(inode, map, 0);

	map->m_deviceid = 0;

	if (map->m_la >= inode->i_size) {

		/* leave out-of-bound access unmapped */
@@ -140,7 +135,7 @@ int erofs_map_blocks(struct inode *inode, 
	}



	if (vi->datalayout != EROFS_INODE_CHUNK_BASED) {

		err = erofs_map_blocks_flatmode(inode, map, flags);

		err = erofs_map_blocks_flatmode(inode, map);

		goto out;

	}
@@ -150,7 +145,7 @@ int erofs_map_blocks(struct inode *inode, 
		unit = EROFS_BLOCK_MAP_ENTRY_SIZE;	/* block map */



	chunknr = map->m_la >> vi->chunkbits;

	pos = ALIGN(iloc(EROFS_SB(sb), vi->nid) + vi->inode_isize +

	pos = ALIGN(erofs_iloc(inode) + vi->inode_isize +

		    vi->xattr_isize, unit) + unit * chunknr;



	kaddr = erofs_read_metabuf(&buf, sb, erofs_blknr(pos), EROFS_KMAP);
@@ -192,7 +187,7 @@ int erofs_map_blocks(struct inode *inode, 
out:

	if (!err)

		map->m_llen = map->m_plen;

	trace_erofs_map_blocks_exit(inode, map, flags, 0);

	trace_erofs_map_blocks_exit(inode, map, 0, err);

	return err;

}
@@ -255,7 +250,7 @@ static int erofs_iomap_begin(struct inode *inode, loff_t offset, loff_t length, 
	map.m_la = offset;

	map.m_llen = length;



	ret = erofs_map_blocks(inode, &map, EROFS_GET_BLOCKS_RAW);

	ret = erofs_map_blocks(inode, &map);

	if (ret < 0)

		return ret;

fs/erofs/dir.c

+0 −17
Original line number Diff line number Diff line
@@ -6,21 +6,6 @@ 
 */

#include "internal.h"



static void debug_one_dentry(unsigned char d_type, const char *de_name,

			     unsigned int de_namelen)

{

#ifdef CONFIG_EROFS_FS_DEBUG

	/* since the on-disk name could not have the trailing '\0' */

	unsigned char dbg_namebuf[EROFS_NAME_LEN + 1];



	memcpy(dbg_namebuf, de_name, de_namelen);

	dbg_namebuf[de_namelen] = '\0';



	erofs_dbg("found dirent %s de_len %u d_type %d", dbg_namebuf,

		  de_namelen, d_type);

#endif

}



static int erofs_fill_dentries(struct inode *dir, struct dir_context *ctx,

			       void *dentry_blk, struct erofs_dirent *de,

			       unsigned int nameoff, unsigned int maxsize)
@@ -52,10 +37,8 @@ static int erofs_fill_dentries(struct inode *dir, struct dir_context *ctx, 
			return -EFSCORRUPTED;

		}



		debug_one_dentry(d_type, de_name, de_namelen);

		if (!dir_emit(ctx, de_name, de_namelen,

			      le64_to_cpu(de->nid), d_type))

			/* stopped by some reason */

			return 1;

		++de;

		ctx->pos += sizeof(struct erofs_dirent);