Commit e1469f56 authored by David Howells's avatar David Howells Committed by Steve French
Browse files

cifs: Use netfs_alloc/free_folioq_buffer() 



Use netfs_alloc/free_folioq_buffer() rather than doing its own version.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
cc: Steve French <sfrench@samba.org>
cc: Paulo Alcantara <pc@manguebit.org>
cc: Shyam Prasad N <sprasad@microsoft.com>
cc: Tom Talpey <tom@talpey.com> (RDMA, smbdirect)
cc: linux-cifs@vger.kernel.org
cc: netfs@lists.linux.dev
cc: linux-fsdevel@vger.kernel.org
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent f78b83dc

fs/smb/client/smb2ops.c

+10 −63
Original line number Diff line number Diff line
@@ -4484,61 +4484,6 @@ crypt_message(struct TCP_Server_Info *server, int num_rqst, 
	return rc;

}



/*

 * Clear a read buffer, discarding the folios which have the 1st mark set.

 */

static void cifs_clear_folioq_buffer(struct folio_queue *buffer)

{

	struct folio_queue *folioq;



	while ((folioq = buffer)) {

		for (int s = 0; s < folioq_count(folioq); s++)

			if (folioq_is_marked(folioq, s))

				folio_put(folioq_folio(folioq, s));

		buffer = folioq->next;

		kfree(folioq);

	}

}



/*

 * Allocate buffer space into a folio queue.

 */

static struct folio_queue *cifs_alloc_folioq_buffer(ssize_t size)

{

	struct folio_queue *buffer = NULL, *tail = NULL, *p;

	struct folio *folio;

	unsigned int slot;



	do {

		if (!tail || folioq_full(tail)) {

			p = kmalloc(sizeof(*p), GFP_NOFS);

			if (!p)

				goto nomem;

			folioq_init(p, 0);

			if (tail) {

				tail->next = p;

				p->prev = tail;

			} else {

				buffer = p;

			}

			tail = p;

		}



		folio = folio_alloc(GFP_KERNEL|__GFP_HIGHMEM, 0);

		if (!folio)

			goto nomem;



		slot = folioq_append_mark(tail, folio);

		size -= folioq_folio_size(tail, slot);

	} while (size > 0);



	return buffer;



nomem:

	cifs_clear_folioq_buffer(buffer);

	return NULL;

}



/*

 * Copy data from an iterator to the folios in a folio queue buffer.

 */
@@ -4564,7 +4509,7 @@ void 
smb3_free_compound_rqst(int num_rqst, struct smb_rqst *rqst)

{

	for (int i = 0; i < num_rqst; i++)

		cifs_clear_folioq_buffer(rqst[i].rq_buffer);

		netfs_free_folioq_buffer(rqst[i].rq_buffer);

}



/*
@@ -4599,8 +4544,10 @@ smb3_init_transform_rq(struct TCP_Server_Info *server, int num_rqst, 
		new->rq_nvec = old->rq_nvec;



		if (size > 0) {

			buffer = cifs_alloc_folioq_buffer(size);

			if (!buffer)

			size_t cur_size = 0;

			rc = netfs_alloc_folioq_buffer(NULL, &buffer, &cur_size,

						       size, GFP_NOFS);

			if (rc < 0)

				goto err_free;



			new->rq_buffer = buffer;
@@ -4932,7 +4879,7 @@ static void smb2_decrypt_offload(struct work_struct *work) 
	}



free_pages:

	cifs_clear_folioq_buffer(dw->buffer);

	netfs_free_folioq_buffer(dw->buffer);

	cifs_small_buf_release(dw->buf);

	kfree(dw);

}
@@ -4970,9 +4917,9 @@ receive_encrypted_read(struct TCP_Server_Info *server, struct mid_q_entry **mid, 
	dw->len = len;

	len = round_up(dw->len, PAGE_SIZE);



	rc = -ENOMEM;

	dw->buffer = cifs_alloc_folioq_buffer(len);

	if (!dw->buffer)

	size_t cur_size = 0;

	rc = netfs_alloc_folioq_buffer(NULL, &dw->buffer, &cur_size, len, GFP_NOFS);

	if (rc < 0)

		goto discard_data;



	iov_iter_folio_queue(&iter, ITER_DEST, dw->buffer, 0, 0, len);
@@ -5033,7 +4980,7 @@ receive_encrypted_read(struct TCP_Server_Info *server, struct mid_q_entry **mid, 
	}



free_pages:

	cifs_clear_folioq_buffer(dw->buffer);

	netfs_free_folioq_buffer(dw->buffer);

free_dw:

	kfree(dw);

	return rc;