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

Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/linux 

Pull fscrypt updates from Eric Biggers:
 "A few cleanups for fs/crypto/, and another patch to prepare for the
  upcoming CephFS encryption support"

* tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/linux:
  fscrypt: optimize fscrypt_initialize()
  fscrypt: use WARN_ON_ONCE instead of WARN_ON
  fscrypt: new helper function - fscrypt_prepare_lookup_partial()
  fs/buffer.c: use b_folio for fscrypt work
parents 733f7e9c 83e57e47

fs/buffer.c

+2 −2
Original line number Diff line number Diff line
@@ -331,8 +331,8 @@ static void decrypt_bh(struct work_struct *work) 
	struct buffer_head *bh = ctx->bh;

	int err;



	err = fscrypt_decrypt_pagecache_blocks(page_folio(bh->b_page),

					       bh->b_size, bh_offset(bh));

	err = fscrypt_decrypt_pagecache_blocks(bh->b_folio, bh->b_size,

					       bh_offset(bh));

	if (err == 0 && need_fsverity(bh)) {

		/*

		 * We use different work queues for decryption and for verity

fs/crypto/bio.c

+3 −3
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ static int fscrypt_zeroout_range_inline_crypt(const struct inode *inode, 
					pblk << (blockbits - SECTOR_SHIFT);

		}

		ret = bio_add_page(bio, ZERO_PAGE(0), bytes_this_page, 0);

		if (WARN_ON(ret != bytes_this_page)) {

		if (WARN_ON_ONCE(ret != bytes_this_page)) {

			err = -EIO;

			goto out;

		}
@@ -147,7 +147,7 @@ int fscrypt_zeroout_range(const struct inode *inode, pgoff_t lblk, 
			break;

	}

	nr_pages = i;

	if (WARN_ON(nr_pages <= 0))

	if (WARN_ON_ONCE(nr_pages <= 0))

		return -EINVAL;



	/* This always succeeds since __GFP_DIRECT_RECLAIM is set. */
@@ -170,7 +170,7 @@ int fscrypt_zeroout_range(const struct inode *inode, pgoff_t lblk, 
			offset += blocksize;

			if (offset == PAGE_SIZE || len == 0) {

				ret = bio_add_page(bio, pages[i++], offset, 0);

				if (WARN_ON(ret != offset)) {

				if (WARN_ON_ONCE(ret != offset)) {

					err = -EIO;

					goto out;

				}

fs/crypto/crypto.c

+12 −7
Original line number Diff line number Diff line
@@ -308,19 +308,24 @@ EXPORT_SYMBOL(fscrypt_decrypt_block_inplace); 


/**

 * fscrypt_initialize() - allocate major buffers for fs encryption.

 * @cop_flags:  fscrypt operations flags

 * @sb: the filesystem superblock

 *

 * We only call this when we start accessing encrypted files, since it

 * results in memory getting allocated that wouldn't otherwise be used.

 *

 * Return: 0 on success; -errno on failure

 */

int fscrypt_initialize(unsigned int cop_flags)

int fscrypt_initialize(struct super_block *sb)

{

	int err = 0;

	mempool_t *pool;



	/* pairs with smp_store_release() below */

	if (likely(smp_load_acquire(&fscrypt_bounce_page_pool)))

		return 0;



	/* No need to allocate a bounce page pool if this FS won't use it. */

	if (cop_flags & FS_CFLG_OWN_PAGES)

	if (sb->s_cop->flags & FS_CFLG_OWN_PAGES)

		return 0;



	mutex_lock(&fscrypt_init_mutex);
@@ -328,11 +333,11 @@ int fscrypt_initialize(unsigned int cop_flags) 
		goto out_unlock;



	err = -ENOMEM;

	fscrypt_bounce_page_pool =

		mempool_create_page_pool(num_prealloc_crypto_pages, 0);

	if (!fscrypt_bounce_page_pool)

	pool = mempool_create_page_pool(num_prealloc_crypto_pages, 0);

	if (!pool)

		goto out_unlock;



	/* pairs with smp_load_acquire() above */

	smp_store_release(&fscrypt_bounce_page_pool, pool);

	err = 0;

out_unlock:

	mutex_unlock(&fscrypt_init_mutex);

fs/crypto/fname.c

+2 −2
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ int fscrypt_fname_encrypt(const struct inode *inode, const struct qstr *iname, 
	 * Copy the filename to the output buffer for encrypting in-place and

	 * pad it with the needed number of NUL bytes.

	 */

	if (WARN_ON(olen < iname->len))

	if (WARN_ON_ONCE(olen < iname->len))

		return -ENOBUFS;

	memcpy(out, iname->name, iname->len);

	memset(out + iname->len, 0, olen - iname->len);
@@ -570,7 +570,7 @@ u64 fscrypt_fname_siphash(const struct inode *dir, const struct qstr *name) 
{

	const struct fscrypt_info *ci = dir->i_crypt_info;



	WARN_ON(!ci->ci_dirhash_key_initialized);

	WARN_ON_ONCE(!ci->ci_dirhash_key_initialized);



	return siphash(name->name, name->len, &ci->ci_dirhash_key);

}

fs/crypto/fscrypt_private.h

+3 −3
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ static inline const u8 *fscrypt_context_nonce(const union fscrypt_context *ctx) 
	case FSCRYPT_CONTEXT_V2:

		return ctx->v2.nonce;

	}

	WARN_ON(1);

	WARN_ON_ONCE(1);

	return NULL;

}
@@ -264,7 +264,7 @@ typedef enum { 


/* crypto.c */

extern struct kmem_cache *fscrypt_info_cachep;

int fscrypt_initialize(unsigned int cop_flags);

int fscrypt_initialize(struct super_block *sb);

int fscrypt_crypt_block(const struct inode *inode, fscrypt_direction_t rw,

			u64 lblk_num, struct page *src_page,

			struct page *dest_page, unsigned int len,
@@ -386,7 +386,7 @@ fscrypt_prepare_inline_crypt_key(struct fscrypt_prepared_key *prep_key, 
				 const u8 *raw_key,

				 const struct fscrypt_info *ci)

{

	WARN_ON(1);

	WARN_ON_ONCE(1);

	return -EOPNOTSUPP;

}