From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 366203B8951 for ; Wed, 4 Mar 2026 14:04:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772633084; cv=none; b=Zi9WUDuemtkPjvFk5IgEnRmawJfvHFyn0X3iG3GL3WJn2/r4nfLrqFRn7JBy3DM27RUyl2GiskAEz0dVfPWLIYbZAq8aFwYoSoqtvUy0KA0PdBknKw38nyZqSZpqo/r/s0x5WeKOz3I8fGAkJS98ZwveyKnPVSLjq/n3ezkOF48= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772633084; c=relaxed/simple; bh=6MrN12V4VZZ7dptY6LwGI4USr7oToiDAcyNb4akUwRY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=g+R7skZJuya7dOyTD+Toj1m0xH0YWaYy6ld2PqKbTbueL+S2NFPzv59OLa3E4iCwp3J691m+1yD+xaWTpu4QgnOWsm1SjpZYV5FwbU7dJo6wz1QqdpXMBny2FUd+5WDnQlpJW7ICnWejoiiADqc8yzuIbkNh8Etuwi9pKRQS+48= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=d1qHQpDb; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="d1qHQpDb" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1772633082; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tO/K2lO5KfGaTYM5btI0yX7gGyyJczpwnG5DnaU1Fys=; b=d1qHQpDbZvSrjyKAymOmB5misCP8RvkrXltFJMkRplbXfbRwXt6wzESaK5sOTQEXJJ6Dh7 N0xqrIynQG/HVqOGYcxCUuZUa6xHzd9lHEiphJpRulHz/GosZZRH+l6PoT9sBbJmxZJSn+ namrkI+d5GRfXaaeayMXkNQUqONgCEE= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-537-_QK6y5tkMJKdWl0aLJqrfg-1; Wed, 04 Mar 2026 09:04:37 -0500 X-MC-Unique: _QK6y5tkMJKdWl0aLJqrfg-1 X-Mimecast-MFC-AGG-ID: _QK6y5tkMJKdWl0aLJqrfg_1772633075 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 0347B18002CA; Wed, 4 Mar 2026 14:04:35 +0000 (UTC) Received: from warthog.procyon.org.com (unknown [10.44.32.194]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id E73CD18002A6; Wed, 4 Mar 2026 14:04:29 +0000 (UTC) From: David Howells To: Matthew Wilcox , Christoph Hellwig , Jens Axboe , Leon Romanovsky Cc: David Howells , Christian Brauner , Paulo Alcantara , netfs@lists.linux.dev, linux-afs@lists.infradead.org, linux-cifs@vger.kernel.org, linux-nfs@vger.kernel.org, ceph-devel@vger.kernel.org, v9fs@lists.linux.dev, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, Paulo Alcantara , Steve French Subject: [RFC PATCH 08/17] cifs: Use a bvecq for buffering instead of a folioq Date: Wed, 4 Mar 2026 14:03:15 +0000 Message-ID: <20260304140328.112636-9-dhowells@redhat.com> In-Reply-To: <20260304140328.112636-1-dhowells@redhat.com> References: <20260304140328.112636-1-dhowells@redhat.com> Precedence: bulk X-Mailing-List: linux-cifs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 Use a bvecq for internal buffering for crypto purposes instead of a folioq so that the latter can be phased out. Signed-off-by: David Howells cc: Paulo Alcantara cc: Matthew Wilcox cc: Christoph Hellwig cc: Steve French cc: linux-cifs@vger.kernel.org cc: netfs@lists.linux.dev cc: linux-fsdevel@vger.kernel.org --- fs/smb/client/cifsglob.h | 2 +- fs/smb/client/smb2ops.c | 70 +++++++++++++++++++--------------------- 2 files changed, 34 insertions(+), 38 deletions(-) diff --git a/fs/smb/client/cifsglob.h b/fs/smb/client/cifsglob.h index 080ea601c209..12202d9537e0 100644 --- a/fs/smb/client/cifsglob.h +++ b/fs/smb/client/cifsglob.h @@ -290,7 +290,7 @@ struct smb_rqst { struct kvec *rq_iov; /* array of kvecs */ unsigned int rq_nvec; /* number of kvecs in array */ struct iov_iter rq_iter; /* Data iterator */ - struct folio_queue *rq_buffer; /* Buffer for encryption */ + struct bvecq *rq_buffer; /* Buffer for encryption */ }; struct mid_q_entry; diff --git a/fs/smb/client/smb2ops.c b/fs/smb/client/smb2ops.c index fea9a35caa57..76baf21404df 100644 --- a/fs/smb/client/smb2ops.c +++ b/fs/smb/client/smb2ops.c @@ -4517,19 +4517,17 @@ crypt_message(struct TCP_Server_Info *server, int num_rqst, } /* - * Copy data from an iterator to the folios in a folio queue buffer. + * Copy data from an iterator to the pages in a bvec queue buffer. */ -static bool cifs_copy_iter_to_folioq(struct iov_iter *iter, size_t size, - struct folio_queue *buffer) +static bool cifs_copy_iter_to_bvecq(struct iov_iter *iter, size_t size, + struct bvecq *buffer) { for (; buffer; buffer = buffer->next) { - for (int s = 0; s < folioq_count(buffer); s++) { - struct folio *folio = folioq_folio(buffer, s); - size_t part = folioq_folio_size(buffer, s); + for (int s = 0; s < buffer->nr_segs; s++) { + struct bio_vec *bv = &buffer->bv[s]; + size_t part = umin(bv->bv_len, size); - part = umin(part, size); - - if (copy_folio_from_iter(folio, 0, part, iter) != part) + if (copy_page_from_iter(bv->bv_page, 0, part, iter) != part) return false; size -= part; } @@ -4541,7 +4539,7 @@ void smb3_free_compound_rqst(int num_rqst, struct smb_rqst *rqst) { for (int i = 0; i < num_rqst; i++) - netfs_free_folioq_buffer(rqst[i].rq_buffer); + netfs_free_bvecq_buffer(rqst[i].rq_buffer); } /* @@ -4568,7 +4566,7 @@ smb3_init_transform_rq(struct TCP_Server_Info *server, int num_rqst, for (int i = 1; i < num_rqst; i++) { struct smb_rqst *old = &old_rq[i - 1]; struct smb_rqst *new = &new_rq[i]; - struct folio_queue *buffer = NULL; + struct bvecq *buffer = NULL; size_t size = iov_iter_count(&old->rq_iter); orig_len += smb_rqst_len(server, old); @@ -4576,17 +4574,16 @@ smb3_init_transform_rq(struct TCP_Server_Info *server, int num_rqst, new->rq_nvec = old->rq_nvec; if (size > 0) { - size_t cur_size = 0; - rc = netfs_alloc_folioq_buffer(NULL, &buffer, &cur_size, - size, GFP_NOFS); - if (rc < 0) + rc = -ENOMEM; + buffer = netfs_alloc_bvecq_buffer(size, 0, GFP_NOFS); + if (!buffer) goto err_free; new->rq_buffer = buffer; - iov_iter_folio_queue(&new->rq_iter, ITER_SOURCE, - buffer, 0, 0, size); + iov_iter_bvec_queue(&new->rq_iter, ITER_SOURCE, + buffer, 0, 0, size); - if (!cifs_copy_iter_to_folioq(&old->rq_iter, size, buffer)) { + if (!cifs_copy_iter_to_bvecq(&old->rq_iter, size, buffer)) { rc = smb_EIO1(smb_eio_trace_tx_copy_iter_to_buf, size); goto err_free; } @@ -4676,16 +4673,15 @@ decrypt_raw_data(struct TCP_Server_Info *server, char *buf, } static int -cifs_copy_folioq_to_iter(struct folio_queue *folioq, size_t data_size, - size_t skip, struct iov_iter *iter) +cifs_copy_bvecq_to_iter(struct bvecq *bq, size_t data_size, + size_t skip, struct iov_iter *iter) { - for (; folioq; folioq = folioq->next) { - for (int s = 0; s < folioq_count(folioq); s++) { - struct folio *folio = folioq_folio(folioq, s); - size_t fsize = folio_size(folio); - size_t n, len = umin(fsize - skip, data_size); + for (; bq; bq = bq->next) { + for (int s = 0; s < bq->nr_segs; s++) { + struct bio_vec *bv = &bq->bv[s]; + size_t n, len = umin(bv->bv_len - skip, data_size); - n = copy_folio_to_iter(folio, skip, len, iter); + n = copy_page_to_iter(bv->bv_page, bv->bv_offset + skip, len, iter); if (n != len) { cifs_dbg(VFS, "%s: something went wrong\n", __func__); return smb_EIO2(smb_eio_trace_rx_copy_to_iter, @@ -4701,7 +4697,7 @@ cifs_copy_folioq_to_iter(struct folio_queue *folioq, size_t data_size, static int handle_read_data(struct TCP_Server_Info *server, struct mid_q_entry *mid, - char *buf, unsigned int buf_len, struct folio_queue *buffer, + char *buf, unsigned int buf_len, struct bvecq *buffer, unsigned int buffer_len, bool is_offloaded) { unsigned int data_offset; @@ -4810,8 +4806,8 @@ handle_read_data(struct TCP_Server_Info *server, struct mid_q_entry *mid, } /* Copy the data to the output I/O iterator. */ - rdata->result = cifs_copy_folioq_to_iter(buffer, buffer_len, - cur_off, &rdata->subreq.io_iter); + rdata->result = cifs_copy_bvecq_to_iter(buffer, buffer_len, + cur_off, &rdata->subreq.io_iter); if (rdata->result != 0) { if (is_offloaded) mid->mid_state = MID_RESPONSE_MALFORMED; @@ -4849,7 +4845,7 @@ handle_read_data(struct TCP_Server_Info *server, struct mid_q_entry *mid, struct smb2_decrypt_work { struct work_struct decrypt; struct TCP_Server_Info *server; - struct folio_queue *buffer; + struct bvecq *buffer; char *buf; unsigned int len; }; @@ -4863,7 +4859,7 @@ static void smb2_decrypt_offload(struct work_struct *work) struct mid_q_entry *mid; struct iov_iter iter; - iov_iter_folio_queue(&iter, ITER_DEST, dw->buffer, 0, 0, dw->len); + iov_iter_bvec_queue(&iter, ITER_DEST, dw->buffer, 0, 0, dw->len); rc = decrypt_raw_data(dw->server, dw->buf, dw->server->vals->read_rsp_size, &iter, true); if (rc) { @@ -4912,7 +4908,7 @@ static void smb2_decrypt_offload(struct work_struct *work) } free_pages: - netfs_free_folioq_buffer(dw->buffer); + netfs_free_bvecq_buffer(dw->buffer); cifs_small_buf_release(dw->buf); kfree(dw); } @@ -4950,12 +4946,12 @@ receive_encrypted_read(struct TCP_Server_Info *server, struct mid_q_entry **mid, dw->len = len; len = round_up(dw->len, PAGE_SIZE); - size_t cur_size = 0; - rc = netfs_alloc_folioq_buffer(NULL, &dw->buffer, &cur_size, len, GFP_NOFS); - if (rc < 0) + rc = -ENOMEM; + dw->buffer = netfs_alloc_bvecq_buffer(len, 0, GFP_NOFS); + if (!dw->buffer) goto discard_data; - iov_iter_folio_queue(&iter, ITER_DEST, dw->buffer, 0, 0, len); + iov_iter_bvec_queue(&iter, ITER_DEST, dw->buffer, 0, 0, len); /* Read the data into the buffer and clear excess bufferage. */ rc = cifs_read_iter_from_socket(server, &iter, dw->len); @@ -5013,7 +5009,7 @@ receive_encrypted_read(struct TCP_Server_Info *server, struct mid_q_entry **mid, } free_pages: - netfs_free_folioq_buffer(dw->buffer); + netfs_free_bvecq_buffer(dw->buffer); free_dw: kfree(dw); return rc;