Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge tag 'f2fs-for-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs 

Pull f2fs updates from Jaegeuk Kim:
 "In this round, we've mainly focused on discard, aka unmap, control
  along with fstrim for Android-specific usage model. In addition, we've
  fixed writepage flow which returned EAGAIN previously resulting in EIO
  of fsync(2) due to mapping's error state. In order to avoid old MM bug
  [1], we decided not to use __GFP_ZERO for the mapping for node and
  meta page caches. As always, we've cleaned up many places for future
  fsverity and symbol conflicts.

  Enhancements:
   - do discard/fstrim in lower priority considering fs utilization
   - split large discard commands into smaller ones for better responsiveness
   - add more sanity checks to address syzbot reports
   - add a mount option, fsync_mode=nobarrier, which can reduce # of cache flushes
   - clean up symbol namespace with modified function names
   - be strict on block allocation and IO control in corner cases

  Bug fixes:
   - don't use __GFP_ZERO for mappings
   - fix error reports in writepage to avoid fsync() failure
   - avoid selinux denial on CAP_RESOURCE on resgid/resuid
   - fix some subtle race conditions in GC/atomic writes/shutdown
   - fix overflow bugs in sanity_check_raw_super
   - fix missing bits on get_flags

  Clean-ups:
   - prepare the generic flow for future fsverity integration
   - fix some broken coding standard"

[1] https://lkml.org/lkml/2018/4/8/661

* tag 'f2fs-for-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs: (79 commits)
  f2fs: fix to clear FI_VOLATILE_FILE correctly
  f2fs: let sync node IO interrupt async one
  f2fs: don't change wbc->sync_mode
  f2fs: fix to update mtime correctly
  fs: f2fs: insert space around that ':' and ', '
  fs: f2fs: add missing blank lines after declarations
  fs: f2fs: changed variable type of offset "unsigned" to "loff_t"
  f2fs: clean up symbol namespace
  f2fs: make set_de_type() static
  f2fs: make __f2fs_write_data_pages() static
  f2fs: fix to avoid accessing cross the boundary
  f2fs: fix to let caller retry allocating block address
  disable loading f2fs module on PAGE_SIZE > 4KB
  f2fs: fix error path of move_data_page
  f2fs: don't drop dentry pages after fs shutdown
  f2fs: fix to avoid race during access gc_thread pointer
  f2fs: clean up with clear_radix_tree_dirty_tag
  f2fs: fix to don't trigger writeback during recovery
  f2fs: clear discard_wake earlier
  f2fs: let discard thread wait a little longer if dev is busy
  ...
parents a2225d93 dfa74280

Documentation/ABI/testing/sysfs-fs-f2fs

+2 −1
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ Date: February 2015 
Contact:	"Jaegeuk Kim" <jaegeuk@kernel.org>

Description:

		 Controls the trimming rate in batch mode.

		 <deprecated>



What:		/sys/fs/f2fs/<disk>/cp_interval

Date:		October 2015
@@ -140,7 +141,7 @@ Contact: "Shuoran Liu" <liushuoran@huawei.com> 
Description:

		 Shows total written kbytes issued to disk.



What:		/sys/fs/f2fs/<disk>/feature

What:		/sys/fs/f2fs/<disk>/features

Date:		July 2017

Contact:	"Jaegeuk Kim" <jaegeuk@kernel.org>

Description:

Documentation/filesystems/f2fs.txt

+9 −7
Original line number Diff line number Diff line
@@ -182,13 +182,15 @@ whint_mode=%s Control which write hints are passed down to block 
                       passes down hints with its policy.

alloc_mode=%s          Adjust block allocation policy, which supports "reuse"

                       and "default".

fsync_mode=%s          Control the policy of fsync. Currently supports "posix"

                       and "strict". In "posix" mode, which is default, fsync

                       will follow POSIX semantics and does a light operation

                       to improve the filesystem performance. In "strict" mode,

                       fsync will be heavy and behaves in line with xfs, ext4

                       and btrfs, where xfstest generic/342 will pass, but the

                       performance will regress.

fsync_mode=%s          Control the policy of fsync. Currently supports "posix",

                       "strict", and "nobarrier". In "posix" mode, which is

                       default, fsync will follow POSIX semantics and does a

                       light operation to improve the filesystem performance.

                       In "strict" mode, fsync will be heavy and behaves in line

                       with xfs, ext4 and btrfs, where xfstest generic/342 will

                       pass, but the performance will regress. "nobarrier" is

                       based on "posix", but doesn't issue flush command for

                       non-atomic files likewise "nobarrier" mount option.

test_dummy_encryption  Enable dummy encryption, which provides a fake fscrypt

                       context. The fake fscrypt context is used by xfstests.

fs/crypto/bio.c

+22 −13
Original line number Diff line number Diff line
@@ -26,15 +26,8 @@ 
#include <linux/namei.h>

#include "fscrypt_private.h"



/*

 * Call fscrypt_decrypt_page on every single page, reusing the encryption

 * context.

 */

static void completion_pages(struct work_struct *work)

static void __fscrypt_decrypt_bio(struct bio *bio, bool done)

{

	struct fscrypt_ctx *ctx =

		container_of(work, struct fscrypt_ctx, r.work);

	struct bio *bio = ctx->r.bio;

	struct bio_vec *bv;

	int i;
@@ -46,22 +39,38 @@ static void completion_pages(struct work_struct *work) 
		if (ret) {

			WARN_ON_ONCE(1);

			SetPageError(page);

		} else {

		} else if (done) {

			SetPageUptodate(page);

		}

		if (done)

			unlock_page(page);

	}

}



void fscrypt_decrypt_bio(struct bio *bio)

{

	__fscrypt_decrypt_bio(bio, false);

}

EXPORT_SYMBOL(fscrypt_decrypt_bio);



static void completion_pages(struct work_struct *work)

{

	struct fscrypt_ctx *ctx =

		container_of(work, struct fscrypt_ctx, r.work);

	struct bio *bio = ctx->r.bio;



	__fscrypt_decrypt_bio(bio, true);

	fscrypt_release_ctx(ctx);

	bio_put(bio);

}



void fscrypt_decrypt_bio_pages(struct fscrypt_ctx *ctx, struct bio *bio)

void fscrypt_enqueue_decrypt_bio(struct fscrypt_ctx *ctx, struct bio *bio)

{

	INIT_WORK(&ctx->r.work, completion_pages);

	ctx->r.bio = bio;

	queue_work(fscrypt_read_workqueue, &ctx->r.work);

	fscrypt_enqueue_decrypt_work(&ctx->r.work);

}

EXPORT_SYMBOL(fscrypt_decrypt_bio_pages);

EXPORT_SYMBOL(fscrypt_enqueue_decrypt_bio);



void fscrypt_pullback_bio_page(struct page **page, bool restore)

{

fs/crypto/crypto.c

+7 −1
Original line number Diff line number Diff line
@@ -45,12 +45,18 @@ static mempool_t *fscrypt_bounce_page_pool = NULL; 
static LIST_HEAD(fscrypt_free_ctxs);

static DEFINE_SPINLOCK(fscrypt_ctx_lock);



struct workqueue_struct *fscrypt_read_workqueue;

static struct workqueue_struct *fscrypt_read_workqueue;

static DEFINE_MUTEX(fscrypt_init_mutex);



static struct kmem_cache *fscrypt_ctx_cachep;

struct kmem_cache *fscrypt_info_cachep;



void fscrypt_enqueue_decrypt_work(struct work_struct *work)

{

	queue_work(fscrypt_read_workqueue, work);

}

EXPORT_SYMBOL(fscrypt_enqueue_decrypt_work);



/**

 * fscrypt_release_ctx() - Releases an encryption context

 * @ctx: The encryption context to release.

fs/crypto/fscrypt_private.h

+0 −1
Original line number Diff line number Diff line
@@ -93,7 +93,6 @@ static inline bool fscrypt_valid_enc_modes(u32 contents_mode, 
/* crypto.c */

extern struct kmem_cache *fscrypt_info_cachep;

extern int fscrypt_initialize(unsigned int cop_flags);

extern struct workqueue_struct *fscrypt_read_workqueue;

extern int fscrypt_do_page_crypto(const struct inode *inode,

				  fscrypt_direction_t rw, u64 lblk_num,

				  struct page *src_page,