linux-next: manual merge of the block tree with the net-next tree

linux-next: manual merge of the block tree with the net-next tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2650 bytes --]

Hi all,

Today's linux-next merge of the block tree got a conflict in:

  fs/splice.c

between commit:

  2bfc66850952 ("splice, net: Add a splice_eof op to file-ops and socket-ops")

from the net-next tree and commit:

  6a3f30b8bdb2 ("splice: Make do_splice_to() generic and export it")

from the block tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc fs/splice.c
index 67ddaac1f5c5,2420ead610a7..000000000000
--- a/fs/splice.c
+++ b/fs/splice.c
@@@ -969,23 -841,24 +937,35 @@@ static long do_splice_from(struct pipe_
  	return out->f_op->splice_write(pipe, out, ppos, len, flags);
  }
  
 +/*
 + * Indicate to the caller that there was a premature EOF when reading from the
 + * source and the caller didn't indicate they would be sending more data after
 + * this.
 + */
 +static void do_splice_eof(struct splice_desc *sd)
 +{
 +	if (sd->splice_eof)
 +		sd->splice_eof(sd);
 +}
 +
- /*
-  * Attempt to initiate a splice from a file to a pipe.
+ /**
+  * vfs_splice_read - Read data from a file and splice it into a pipe
+  * @in:		File to splice from
+  * @ppos:	Input file offset
+  * @pipe:	Pipe to splice to
+  * @len:	Number of bytes to splice
+  * @flags:	Splice modifier flags (SPLICE_F_*)
+  *
+  * Splice the requested amount of data from the input file to the pipe.  This
+  * is synchronous as the caller must hold the pipe lock across the entire
+  * operation.
+  *
+  * If successful, it returns the amount of data spliced, 0 if it hit the EOF or
+  * a hole and a negative error code otherwise.
   */
- static long do_splice_to(struct file *in, loff_t *ppos,
- 			 struct pipe_inode_info *pipe, size_t len,
- 			 unsigned int flags)
+ long vfs_splice_read(struct file *in, loff_t *ppos,
+ 		     struct pipe_inode_info *pipe, size_t len,
+ 		     unsigned int flags)
  {
  	unsigned int p_space;
  	int ret;
@@@ -1081,9 -959,9 +1070,9 @@@ ssize_t splice_direct_to_actor(struct f
  		size_t read_len;
  		loff_t pos = sd->pos, prev_pos = pos;
  
- 		ret = do_splice_to(in, &pos, pipe, len, flags);
+ 		ret = vfs_splice_read(in, &pos, pipe, len, flags);
  		if (unlikely(ret <= 0))
 -			goto out_release;
 +			goto read_failure;
  
  		read_len = ret;
  		sd->total_len = read_len;

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the block tree with the net-next tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2961 bytes --]

Hi all,

On Tue, 13 Jun 2023 12:59:39 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the block tree got a conflict in:
> 
>   fs/splice.c
> 
> between commit:
> 
>   2bfc66850952 ("splice, net: Add a splice_eof op to file-ops and socket-ops")
> 
> from the net-next tree and commit:
> 
>   6a3f30b8bdb2 ("splice: Make do_splice_to() generic and export it")
> 
> from the block tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
> 
> diff --cc fs/splice.c
> index 67ddaac1f5c5,2420ead610a7..000000000000
> --- a/fs/splice.c
> +++ b/fs/splice.c
> @@@ -969,23 -841,24 +937,35 @@@ static long do_splice_from(struct pipe_
>   	return out->f_op->splice_write(pipe, out, ppos, len, flags);
>   }
>   
>  +/*
>  + * Indicate to the caller that there was a premature EOF when reading from the
>  + * source and the caller didn't indicate they would be sending more data after
>  + * this.
>  + */
>  +static void do_splice_eof(struct splice_desc *sd)
>  +{
>  +	if (sd->splice_eof)
>  +		sd->splice_eof(sd);
>  +}
>  +
> - /*
> -  * Attempt to initiate a splice from a file to a pipe.
> + /**
> +  * vfs_splice_read - Read data from a file and splice it into a pipe
> +  * @in:		File to splice from
> +  * @ppos:	Input file offset
> +  * @pipe:	Pipe to splice to
> +  * @len:	Number of bytes to splice
> +  * @flags:	Splice modifier flags (SPLICE_F_*)
> +  *
> +  * Splice the requested amount of data from the input file to the pipe.  This
> +  * is synchronous as the caller must hold the pipe lock across the entire
> +  * operation.
> +  *
> +  * If successful, it returns the amount of data spliced, 0 if it hit the EOF or
> +  * a hole and a negative error code otherwise.
>    */
> - static long do_splice_to(struct file *in, loff_t *ppos,
> - 			 struct pipe_inode_info *pipe, size_t len,
> - 			 unsigned int flags)
> + long vfs_splice_read(struct file *in, loff_t *ppos,
> + 		     struct pipe_inode_info *pipe, size_t len,
> + 		     unsigned int flags)
>   {
>   	unsigned int p_space;
>   	int ret;
> @@@ -1081,9 -959,9 +1070,9 @@@ ssize_t splice_direct_to_actor(struct f
>   		size_t read_len;
>   		loff_t pos = sd->pos, prev_pos = pos;
>   
> - 		ret = do_splice_to(in, &pos, pipe, len, flags);
> + 		ret = vfs_splice_read(in, &pos, pipe, len, flags);
>   		if (unlikely(ret <= 0))
>  -			goto out_release;
>  +			goto read_failure;
>   
>   		read_len = ret;
>   		sd->total_len = read_len;

This is now a conflict between the net-next tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the block tree with the net-next tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1369 bytes --]

Hi all,

Today's linux-next merge of the block tree got a conflict in:

  tools/testing/selftests/drivers/net/hw/Makefile

between commit:

  185646a8a0a8 ("selftests: drv-net: add tests for napi IRQ affinity notifiers")

from the net-next tree and commit:

  71082faa2c64 ("io_uring/zcrx: add selftest")

from the block tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc tools/testing/selftests/drivers/net/hw/Makefile
index cde5814ff9a7,7efc47c89463..000000000000
--- a/tools/testing/selftests/drivers/net/hw/Makefile
+++ b/tools/testing/selftests/drivers/net/hw/Makefile
@@@ -10,7 -12,7 +12,8 @@@ TEST_PROGS = 
  	ethtool_rmon.sh \
  	hw_stats_l3.sh \
  	hw_stats_l3_gre.sh \
+ 	iou-zcrx.py \
 +	irq.py \
  	loopback.sh \
  	nic_link_layer.py \
  	nic_performance.py \
@@@ -43,4 -42,4 +46,6 @@@ include ../../../lib.m
  YNL_GENS := ethtool netdev
  include ../../../net/ynl.mk
  
+ $(OUTPUT)/iou-zcrx: LDLIBS += -luring
++
 +include ../../../net/bpf.mk

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the block tree with the net-next tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 2424 bytes --]

Hi all,

Today's linux-next merge of the block tree got a conflict in:

  io_uring/zcrx.c

between commit:

  222b5566a02dbf ("net: Proxy netdev_queue_get_dma_dev for leased queues")

from the net-next tree and commit:

  06fc3b6d388dfa ("io_uring/zcrx: extract netdev+area init into a helper")

from the block tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc io_uring/zcrx.c
index f4a7809ba0c2b1,bd970fb084c19a..00000000000000
--- a/io_uring/zcrx.c
+++ b/io_uring/zcrx.c
@@@ -754,10 -779,50 +782,51 @@@ err
  	return ret;
  }
  
- int io_register_zcrx_ifq(struct io_ring_ctx *ctx,
- 			  struct io_uring_zcrx_ifq_reg __user *arg)
+ static int zcrx_register_netdev(struct io_zcrx_ifq *ifq,
+ 				struct io_uring_zcrx_ifq_reg *reg,
+ 				struct io_uring_zcrx_area_reg *area)
  {
  	struct pp_memory_provider_params mp_param = {};
+ 	unsigned if_rxq = reg->if_rxq;
+ 	int ret;
+ 
+ 	ifq->netdev = netdev_get_by_index_lock(current->nsproxy->net_ns,
+ 						reg->if_idx);
+ 	if (!ifq->netdev)
+ 		return -ENODEV;
+ 
+ 	netdev_hold(ifq->netdev, &ifq->netdev_tracker, GFP_KERNEL);
+ 
 -	ifq->dev = netdev_queue_get_dma_dev(ifq->netdev, if_rxq);
++	ifq->dev = netdev_queue_get_dma_dev(ifq->netdev, if_rxq,
++					    NETDEV_QUEUE_TYPE_RX);
+ 	if (!ifq->dev) {
+ 		ret = -EOPNOTSUPP;
+ 		goto netdev_put_unlock;
+ 	}
+ 	get_device(ifq->dev);
+ 
+ 	ret = io_zcrx_create_area(ifq, area, reg);
+ 	if (ret)
+ 		goto netdev_put_unlock;
+ 
+ 	if (reg->rx_buf_len)
+ 		mp_param.rx_page_size = 1U << ifq->niov_shift;
+ 	mp_param.mp_ops = &io_uring_pp_zc_ops;
+ 	mp_param.mp_priv = ifq;
+ 	ret = __net_mp_open_rxq(ifq->netdev, if_rxq, &mp_param, NULL);
+ 	if (ret)
+ 		goto netdev_put_unlock;
+ 
+ 	ifq->if_rxq = if_rxq;
+ 	ret = 0;
+ netdev_put_unlock:
+ 	netdev_unlock(ifq->netdev);
+ 	return ret;
+ }
+ 
+ int io_register_zcrx(struct io_ring_ctx *ctx,
+ 		     struct io_uring_zcrx_ifq_reg __user *arg)
+ {
  	struct io_uring_zcrx_area_reg area;
  	struct io_uring_zcrx_ifq_reg reg;
  	struct io_uring_region_desc rd;

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the block tree with the net-next tree

[Pavel Begunkov]

On 4/10/26 13:21, Mark Brown wrote:
> Hi all,
> 
> Today's linux-next merge of the block tree got a conflict in:
> 
>    io_uring/zcrx.c
> 
> between commit:
> 
>    222b5566a02dbf ("net: Proxy netdev_queue_get_dma_dev for leased queues")

It's the first time I see this commit, but the resolution looks
correct, thanks

> from the net-next tree and commit:
> 
>    06fc3b6d388dfa ("io_uring/zcrx: extract netdev+area init into a helper")
> 
> from the block tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
...

-- 
Pavel Begunkov