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

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

[Stephen Rothwell]

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

Hi all,

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

  drivers/net/ethernet/mellanox/mlx5/core/main.c

between commit:

  b33886971dbc ("net/mlx5: Initialize flow steering during driver probe")

from the net tree and commits:

  40379a0084c2 ("net/mlx5_fpga: Drop INNOVA TLS support")
  f2b41b32cde8 ("net/mlx5: Remove ipsec_ops function table")

from the rdma 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 drivers/net/ethernet/mellanox/mlx5/core/main.c
index ef196cb764e2,d504c8cb8f96..000000000000
--- a/drivers/net/ethernet/mellanox/mlx5/core/main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c
@@@ -1192,15 -1181,7 +1190,7 @@@ static int mlx5_load(struct mlx5_core_d
  		goto err_fpga_start;
  	}
  
- 	mlx5_accel_ipsec_init(dev);
- 
- 	err = mlx5_accel_tls_init(dev);
- 	if (err) {
- 		mlx5_core_err(dev, "TLS device start failed %d\n", err);
- 		goto err_tls_start;
- 	}
- 
 -	err = mlx5_init_fs(dev);
 +	err = mlx5_fs_core_init(dev);
  	if (err) {
  		mlx5_core_err(dev, "Failed to init flow steering\n");
  		goto err_fs;
@@@ -1245,11 -1226,8 +1235,8 @@@ err_ec
  err_vhca:
  	mlx5_vhca_event_stop(dev);
  err_set_hca:
 -	mlx5_cleanup_fs(dev);
 +	mlx5_fs_core_cleanup(dev);
  err_fs:
- 	mlx5_accel_tls_cleanup(dev);
- err_tls_start:
- 	mlx5_accel_ipsec_cleanup(dev);
  	mlx5_fpga_device_stop(dev);
  err_fpga_start:
  	mlx5_rsc_dump_cleanup(dev);
@@@ -1274,9 -1252,7 +1261,7 @@@ static void mlx5_unload(struct mlx5_cor
  	mlx5_ec_cleanup(dev);
  	mlx5_sf_hw_table_destroy(dev);
  	mlx5_vhca_event_stop(dev);
 -	mlx5_cleanup_fs(dev);
 +	mlx5_fs_core_cleanup(dev);
- 	mlx5_accel_ipsec_cleanup(dev);
- 	mlx5_accel_tls_cleanup(dev);
  	mlx5_fpga_device_stop(dev);
  	mlx5_rsc_dump_cleanup(dev);
  	mlx5_hv_vhca_cleanup(dev->hv_vhca);

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

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

[Saeed Mahameed]

On 19 May 11:35, Stephen Rothwell wrote:
>Hi all,
>
>Today's linux-next merge of the rdma tree got a conflict in:
>
>  drivers/net/ethernet/mellanox/mlx5/core/main.c
>
>between commit:
>
>  b33886971dbc ("net/mlx5: Initialize flow steering during driver probe")
>
>from the net tree and commits:
>
>  40379a0084c2 ("net/mlx5_fpga: Drop INNOVA TLS support")
>  f2b41b32cde8 ("net/mlx5: Remove ipsec_ops function table")
>
>from the rdma 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 drivers/net/ethernet/mellanox/mlx5/core/main.c
>index ef196cb764e2,d504c8cb8f96..000000000000
>--- a/drivers/net/ethernet/mellanox/mlx5/core/main.c
>+++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c
>@@@ -1192,15 -1181,7 +1190,7 @@@ static int mlx5_load(struct mlx5_core_d
>  		goto err_fpga_start;
>  	}
>
>- 	mlx5_accel_ipsec_init(dev);
>-
>- 	err = mlx5_accel_tls_init(dev);
>- 	if (err) {
>- 		mlx5_core_err(dev, "TLS device start failed %d\n", err);
>- 		goto err_tls_start;
>- 	}
>-
> -	err = mlx5_init_fs(dev);
> +	err = mlx5_fs_core_init(dev);
>  	if (err) {
>  		mlx5_core_err(dev, "Failed to init flow steering\n");
>  		goto err_fs;
>@@@ -1245,11 -1226,8 +1235,8 @@@ err_ec
>  err_vhca:
>  	mlx5_vhca_event_stop(dev);
>  err_set_hca:
> -	mlx5_cleanup_fs(dev);
> +	mlx5_fs_core_cleanup(dev);
>  err_fs:
>- 	mlx5_accel_tls_cleanup(dev);
>- err_tls_start:
>- 	mlx5_accel_ipsec_cleanup(dev);
>  	mlx5_fpga_device_stop(dev);
>  err_fpga_start:
>  	mlx5_rsc_dump_cleanup(dev);
>@@@ -1274,9 -1252,7 +1261,7 @@@ static void mlx5_unload(struct mlx5_cor
>  	mlx5_ec_cleanup(dev);
>  	mlx5_sf_hw_table_destroy(dev);
>  	mlx5_vhca_event_stop(dev);
> -	mlx5_cleanup_fs(dev);
> +	mlx5_fs_core_cleanup(dev);
>- 	mlx5_accel_ipsec_cleanup(dev);
>- 	mlx5_accel_tls_cleanup(dev);
>  	mlx5_fpga_device_stop(dev);
>  	mlx5_rsc_dump_cleanup(dev);
>  	mlx5_hv_vhca_cleanup(dev->hv_vhca);

I already mentioned this to the netdev maintainers, same conflict should
appear in net-next, this is the correct resolution, Thanks Stephen.

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

[Jakub Kicinski]

On Wed, 18 May 2022 21:03:45 -0700 Saeed Mahameed wrote:
> >@@@ -1274,9 -1252,7 +1261,7 @@@ static void mlx5_unload(struct mlx5_cor
> >  	mlx5_ec_cleanup(dev);
> >  	mlx5_sf_hw_table_destroy(dev);
> >  	mlx5_vhca_event_stop(dev);
> > -	mlx5_cleanup_fs(dev);
> > +	mlx5_fs_core_cleanup(dev);
> >- 	mlx5_accel_ipsec_cleanup(dev);
> >- 	mlx5_accel_tls_cleanup(dev);
> >  	mlx5_fpga_device_stop(dev);
> >  	mlx5_rsc_dump_cleanup(dev);
> >  	mlx5_hv_vhca_cleanup(dev->hv_vhca);  
> 
> I already mentioned this to the netdev maintainers, same conflict should
> appear in net-next, this is the correct resolution, Thanks Stephen.

FTR could you not have held off the mlx5_$verb_fs() -> mlx5_fs_$verb
rename until net-next? This conflict looks avoidable :/

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

[Saeed Mahameed]

On 19 May 10:48, Jakub Kicinski wrote:
>On Wed, 18 May 2022 21:03:45 -0700 Saeed Mahameed wrote:
>> >@@@ -1274,9 -1252,7 +1261,7 @@@ static void mlx5_unload(struct mlx5_cor
>> >  	mlx5_ec_cleanup(dev);
>> >  	mlx5_sf_hw_table_destroy(dev);
>> >  	mlx5_vhca_event_stop(dev);
>> > -	mlx5_cleanup_fs(dev);
>> > +	mlx5_fs_core_cleanup(dev);
>> >- 	mlx5_accel_ipsec_cleanup(dev);
>> >- 	mlx5_accel_tls_cleanup(dev);
>> >  	mlx5_fpga_device_stop(dev);
>> >  	mlx5_rsc_dump_cleanup(dev);
>> >  	mlx5_hv_vhca_cleanup(dev->hv_vhca);
>>
>> I already mentioned this to the netdev maintainers, same conflict should
>> appear in net-next, this is the correct resolution, Thanks Stephen.
>
>FTR could you not have held off the mlx5_$verb_fs() -> mlx5_fs_$verb
>rename until net-next? This conflict looks avoidable :/

Yes, sorry again, will be more careful in the future. 

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

[Stephen Rothwell]

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

Hi all,

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

  include/linux/mlx5/mlx5_ifc.h

between commit:

  663f146f2ecf ("net/mlx5: E-Switch, Fix fdb cap bits swap")

from the net tree and commit:

  c74d90c11c05 ("net/mlx5: Fix offsets of ifc reserved fields")

from the rdma tree.

I fixed it up (I just used the net tree version) 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

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

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

[Saeed Mahameed]

On Sun, Dec 16, 2018 at 4:08 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> Today's linux-next merge of the rdma tree got a conflict in:
>
>   include/linux/mlx5/mlx5_ifc.h
>
> between commit:
>
>   663f146f2ecf ("net/mlx5: E-Switch, Fix fdb cap bits swap")
>
> from the net tree and commit:
>
>   c74d90c11c05 ("net/mlx5: Fix offsets of ifc reserved fields")
>
> from the rdma tree.
>
> I fixed it up (I just used the net tree version) and can carry the fix

Yes this is the correct resolution.

> 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.

Dave was already notified about this merge conflict.
This conflict will go away once Dave merges net with net-next, and
linux-next of rdma merge with net-next
will not have this problem.

Thanks,
Saeed.

>
> --
> Cheers,
> Stephen Rothwell

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

[Stephen Rothwell]

Hi all,

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

  drivers/infiniband/hw/mlx5/main.c

between commits:

  8978cc921fc7 ("{net,ib}/mlx5: Don't disable local loopback multicast traffic when needed")
  72f36be06138 ("net/mlx5: Fix mlx5_get_uars_page to return error code")

from the net tree and commits:

  16c1975f1032 ("IB/mlx5: Create profile infrastructure to add and remove stages")
  c8b8992446a9 ("IB/mlx5: Move loopback initialization to the corresponding stage")

from the rdma 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 drivers/infiniband/hw/mlx5/main.c
index 262c1aa2e028,91e6b42798e5..000000000000
--- a/drivers/infiniband/hw/mlx5/main.c
+++ b/drivers/infiniband/hw/mlx5/main.c
@@@ -4111,8 -4669,38 +4671,39 @@@ static int mlx5_ib_stage_caps_init(stru
  			(1ull << IB_USER_VERBS_EX_CMD_CREATE_FLOW) |
  			(1ull << IB_USER_VERBS_EX_CMD_DESTROY_FLOW);
  
- 	if (mlx5_ib_port_link_layer(&dev->ib_dev, 1) ==
- 	    IB_LINK_LAYER_ETHERNET) {
+ 	err = init_node_data(dev);
+ 	if (err)
+ 		return err;
+ 
+ 	if ((MLX5_CAP_GEN(dev->mdev, port_type) == MLX5_CAP_PORT_TYPE_ETH) &&
 -	    MLX5_CAP_GEN(dev->mdev, disable_local_lb))
++	    (MLX5_CAP_GEN(dev->mdev, disable_local_lb_uc) ||
++	     MLX5_CAP_GEN(dev->mdev, disable_local_lb_mc)))
+ 		mutex_init(&dev->lb_mutex);
+ 
+ 	return 0;
+ }
+ 
+ static int mlx5_ib_stage_roce_init(struct mlx5_ib_dev *dev)
+ {
+ 	struct mlx5_core_dev *mdev = dev->mdev;
+ 	enum rdma_link_layer ll;
+ 	int port_type_cap;
+ 	u8 port_num;
+ 	int err;
+ 	int i;
+ 
+ 	port_num = mlx5_core_native_port_num(dev->mdev) - 1;
+ 	port_type_cap = MLX5_CAP_GEN(mdev, port_type);
+ 	ll = mlx5_port_type_cap_to_rdma_ll(port_type_cap);
+ 
+ 	if (ll == IB_LINK_LAYER_ETHERNET) {
+ 		for (i = 0; i < dev->num_ports; i++) {
+ 			dev->roce[i].dev = dev;
+ 			dev->roce[i].native_port_num = i + 1;
+ 			dev->roce[i].last_port_state = IB_PORT_DOWN;
+ 		}
+ 
+ 		dev->ib_dev.get_netdev	= mlx5_ib_get_netdev;
  		dev->ib_dev.create_wq	 = mlx5_ib_create_wq;
  		dev->ib_dev.modify_wq	 = mlx5_ib_modify_wq;
  		dev->ib_dev.destroy_wq	 = mlx5_ib_destroy_wq;
@@@ -4124,44 -4712,94 +4715,94 @@@
  			(1ull << IB_USER_VERBS_EX_CMD_DESTROY_WQ) |
  			(1ull << IB_USER_VERBS_EX_CMD_CREATE_RWQ_IND_TBL) |
  			(1ull << IB_USER_VERBS_EX_CMD_DESTROY_RWQ_IND_TBL);
+ 		err = mlx5_enable_eth(dev, port_num);
+ 		if (err)
+ 			return err;
  	}
- 	err = init_node_data(dev);
- 	if (err)
- 		goto err_free_port;
  
- 	mutex_init(&dev->flow_db.lock);
- 	mutex_init(&dev->cap_mask_mutex);
- 	INIT_LIST_HEAD(&dev->qp_list);
- 	spin_lock_init(&dev->reset_flow_resource_lock);
+ 	return 0;
+ }
+ 
+ static void mlx5_ib_stage_roce_cleanup(struct mlx5_ib_dev *dev)
+ {
+ 	struct mlx5_core_dev *mdev = dev->mdev;
+ 	enum rdma_link_layer ll;
+ 	int port_type_cap;
+ 	u8 port_num;
+ 
+ 	port_num = mlx5_core_native_port_num(dev->mdev) - 1;
+ 	port_type_cap = MLX5_CAP_GEN(mdev, port_type);
+ 	ll = mlx5_port_type_cap_to_rdma_ll(port_type_cap);
  
  	if (ll == IB_LINK_LAYER_ETHERNET) {
- 		err = mlx5_enable_eth(dev);
- 		if (err)
- 			goto err_free_port;
- 		dev->roce.last_port_state = IB_PORT_DOWN;
+ 		mlx5_disable_eth(dev);
+ 		mlx5_remove_netdev_notifier(dev, port_num);
  	}
+ }
  
- 	err = create_dev_resources(&dev->devr);
- 	if (err)
- 		goto err_disable_eth;
+ static int mlx5_ib_stage_dev_res_init(struct mlx5_ib_dev *dev)
+ {
+ 	return create_dev_resources(&dev->devr);
+ }
  
- 	err = mlx5_ib_odp_init_one(dev);
- 	if (err)
- 		goto err_rsrc;
+ static void mlx5_ib_stage_dev_res_cleanup(struct mlx5_ib_dev *dev)
+ {
+ 	destroy_dev_resources(&dev->devr);
+ }
+ 
+ static int mlx5_ib_stage_odp_init(struct mlx5_ib_dev *dev)
+ {
+ 	mlx5_ib_internal_fill_odp_caps(dev);
  
+ 	return mlx5_ib_odp_init_one(dev);
+ }
+ 
+ static int mlx5_ib_stage_counters_init(struct mlx5_ib_dev *dev)
+ {
  	if (MLX5_CAP_GEN(dev->mdev, max_qp_cnt)) {
- 		err = mlx5_ib_alloc_counters(dev);
- 		if (err)
- 			goto err_odp;
+ 		dev->ib_dev.get_hw_stats	= mlx5_ib_get_hw_stats;
+ 		dev->ib_dev.alloc_hw_stats	= mlx5_ib_alloc_hw_stats;
+ 
+ 		return mlx5_ib_alloc_counters(dev);
  	}
  
- 	err = mlx5_ib_init_cong_debugfs(dev);
- 	if (err)
- 		goto err_cnt;
+ 	return 0;
+ }
+ 
+ static void mlx5_ib_stage_counters_cleanup(struct mlx5_ib_dev *dev)
+ {
+ 	if (MLX5_CAP_GEN(dev->mdev, max_qp_cnt))
+ 		mlx5_ib_dealloc_counters(dev);
+ }
+ 
+ static int mlx5_ib_stage_cong_debugfs_init(struct mlx5_ib_dev *dev)
+ {
+ 	return mlx5_ib_init_cong_debugfs(dev,
+ 					 mlx5_core_native_port_num(dev->mdev) - 1);
+ }
  
+ static void mlx5_ib_stage_cong_debugfs_cleanup(struct mlx5_ib_dev *dev)
+ {
+ 	mlx5_ib_cleanup_cong_debugfs(dev,
+ 				     mlx5_core_native_port_num(dev->mdev) - 1);
+ }
+ 
+ static int mlx5_ib_stage_uar_init(struct mlx5_ib_dev *dev)
+ {
  	dev->mdev->priv.uar = mlx5_get_uars_page(dev->mdev);
 -	if (!dev->mdev->priv.uar)
 +	if (IS_ERR(dev->mdev->priv.uar))
- 		goto err_cong;
+ 		return -ENOMEM;
+ 	return 0;
+ }
+ 
+ static void mlx5_ib_stage_uar_cleanup(struct mlx5_ib_dev *dev)
+ {
+ 	mlx5_put_uars_page(dev->mdev, dev->mdev->priv.uar);
+ }
+ 
+ static int mlx5_ib_stage_bfrag_init(struct mlx5_ib_dev *dev)
+ {
+ 	int err;
  
  	err = mlx5_alloc_bfreg(dev->mdev, &dev->bfreg, false, false);
  	if (err)

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

[Leon Romanovsky]

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

On Mon, Jan 15, 2018 at 11:53:21AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the rdma tree got a conflict in:
>
>   drivers/infiniband/hw/mlx5/main.c
>
> between commits:
>
>   8978cc921fc7 ("{net,ib}/mlx5: Don't disable local loopback multicast traffic when needed")
>   72f36be06138 ("net/mlx5: Fix mlx5_get_uars_page to return error code")
>
> from the net tree and commits:
>
>   16c1975f1032 ("IB/mlx5: Create profile infrastructure to add and remove stages")
>   c8b8992446a9 ("IB/mlx5: Move loopback initialization to the corresponding stage")
>
> from the rdma 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
>

Thanks, Stephen.
It looks right to me.

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