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

Merge tag 'iter-ubuf.2-2023-04-21' of git://git.kernel.dk/linux 

Pull ITER_UBUF updates from Jens Axboe:
 "This turns singe vector imports into ITER_UBUF, rather than
  ITER_IOVEC.

  The former is more trivial to iterate and advance, and hence a bit
  more efficient. From some very unscientific testing, ~60% of all iovec
  imports are single vector"

* tag 'iter-ubuf.2-2023-04-21' of git://git.kernel.dk/linux:
  iov_iter: Mark copy_compat_iovec_from_user() noinline
  iov_iter: import single vector iovecs as ITER_UBUF
  iov_iter: convert import_single_range() to ITER_UBUF
  iov_iter: overlay struct iovec and ubuf/len
  iov_iter: set nr_segs = 1 for ITER_UBUF
  iov_iter: remove iov_iter_iovec()
  iov_iter: add iter_iov_addr() and iter_iov_len() helpers
  ALSA: pcm: check for user backed iterator, not specific iterator type
  IB/qib: check for user backed iterator, not specific iterator type
  IB/hfi1: check for user backed iterator, not specific iterator type
  iov_iter: add iter_iovec() helper
  block: ensure bio_alloc_map_data() deals with ITER_UBUF correctly
parents d88867a2 50f9a76e

block/blk-map.c

+4 −3
Original line number Diff line number Diff line
@@ -29,10 +29,11 @@ static struct bio_map_data *bio_alloc_map_data(struct iov_iter *data, 
	bmd = kmalloc(struct_size(bmd, iov, data->nr_segs), gfp_mask);

	if (!bmd)

		return NULL;

	memcpy(bmd->iov, data->iov, sizeof(struct iovec) * data->nr_segs);

	bmd->iter = *data;

	if (iter_is_iovec(data))

		bmd->iter.iov = bmd->iov;

	if (iter_is_iovec(data)) {

		memcpy(bmd->iov, iter_iov(data), sizeof(struct iovec) * data->nr_segs);

		bmd->iter.__iov = bmd->iov;

	}

	return bmd;

}

drivers/infiniband/hw/hfi1/file_ops.c

+4 −6
Original line number Diff line number Diff line
@@ -267,6 +267,8 @@ static ssize_t hfi1_write_iter(struct kiocb *kiocb, struct iov_iter *from) 


	if (!HFI1_CAP_IS_KSET(SDMA))

		return -EINVAL;

	if (!from->user_backed)

		return -EINVAL;

	idx = srcu_read_lock(&fd->pq_srcu);

	pq = srcu_dereference(fd->pq, &fd->pq_srcu);

	if (!cq || !pq) {
@@ -274,11 +276,6 @@ static ssize_t hfi1_write_iter(struct kiocb *kiocb, struct iov_iter *from) 
		return -EIO;

	}



	if (!iter_is_iovec(from) || !dim) {

		srcu_read_unlock(&fd->pq_srcu, idx);

		return -EINVAL;

	}



	trace_hfi1_sdma_request(fd->dd, fd->uctxt->ctxt, fd->subctxt, dim);



	if (atomic_read(&pq->n_reqs) == pq->n_max_reqs) {
@@ -287,11 +284,12 @@ static ssize_t hfi1_write_iter(struct kiocb *kiocb, struct iov_iter *from) 
	}



	while (dim) {

		const struct iovec *iov = iter_iov(from);

		int ret;

		unsigned long count = 0;



		ret = hfi1_user_sdma_process_request(

			fd, (struct iovec *)(from->iov + done),

			fd, (struct iovec *)(iov + done),

			dim, &count);

		if (ret) {

			reqs = ret;

drivers/infiniband/hw/qib/qib_file_ops.c

+2 −2
Original line number Diff line number Diff line
@@ -2245,10 +2245,10 @@ static ssize_t qib_write_iter(struct kiocb *iocb, struct iov_iter *from) 
	struct qib_ctxtdata *rcd = ctxt_fp(iocb->ki_filp);

	struct qib_user_sdma_queue *pq = fp->pq;



	if (!iter_is_iovec(from) || !from->nr_segs || !pq)

	if (!from->user_backed || !from->nr_segs || !pq)

		return -EINVAL;



	return qib_user_sdma_writev(rcd, pq, from->iov, from->nr_segs);

	return qib_user_sdma_writev(rcd, pq, iter_iov(from), from->nr_segs);

}



static struct class *qib_class;

drivers/net/tun.c

+2 −1
Original line number Diff line number Diff line
@@ -1486,7 +1486,8 @@ static struct sk_buff *tun_napi_alloc_frags(struct tun_file *tfile, 
	skb->truesize += skb->data_len;



	for (i = 1; i < it->nr_segs; i++) {

		size_t fragsz = it->iov[i].iov_len;

		const struct iovec *iov = iter_iov(it);

		size_t fragsz = iov->iov_len;

		struct page *page;

		void *frag;

drivers/vhost/scsi.c

+1 −1
Original line number Diff line number Diff line
@@ -665,7 +665,7 @@ vhost_scsi_calc_sgls(struct iov_iter *iter, size_t bytes, int max_sgls) 
{

	int sgl_count = 0;



	if (!iter || !iter->iov) {

	if (!iter || !iter_iov(iter)) {

		pr_err("%s: iter->iov is NULL, but expected bytes: %zu"

		       " present\n", __func__, bytes);

		return -EINVAL;