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

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

[Stephen Rothwell]

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

Hi all,

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

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

between commits:

  955858009708 ("net/mlx5e: Fix number of vports for ingress ACL configuration")
  d4a18e16c570 ("net/mlx5e: Enable setting multiple match criteria for flow group")

from the net-next tree and commits:

  7445cfb1169c ("net/mlx5: E-Switch, Tag packet with vport number in VF vports and uplink ingress ACLs")
  c01cfd0f1115 ("net/mlx5: E-Switch, Add match on vport metadata for rule in fast path")

from the mlx5-next tree.

I fixed it up (I basically used the latter versions) 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 mlx5-next tree with the net-next tree

[Saeed Mahameed]

On Wed, Jun 26, 2019 at 9:09 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> Today's linux-next merge of the mlx5-next tree got a conflict in:
>
>   drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
>
> between commits:
>
>   955858009708 ("net/mlx5e: Fix number of vports for ingress ACL configuration")
>   d4a18e16c570 ("net/mlx5e: Enable setting multiple match criteria for flow group")
>
> from the net-next tree and commits:
>
>   7445cfb1169c ("net/mlx5: E-Switch, Tag packet with vport number in VF vports and uplink ingress ACLs")
>   c01cfd0f1115 ("net/mlx5: E-Switch, Add match on vport metadata for rule in fast path")
>
> from the mlx5-next tree.
>
> I fixed it up (I basically used the latter versions) 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.
>

Thanks Stephen, this will be handled in my next pull request to net-next.


> --
> Cheers,
> Stephen Rothwell

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

[Leon Romanovsky]

On Tue, Oct 03, 2023 at 10:37:12AM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the mlx5-next tree got a conflict in:
> 
>   include/linux/mlx5/device.h
> 
> between commit:
> 
>   ac5f395685bd ("net/mlx5: SF, Implement peer devlink set for SF representor devlink port")
> 
> from the net-next tree and commit:
> 
>   0d293714ac32 ("RDMA/mlx5: Send events from IB driver about device affiliation state")
> 
> from the mlx5-next 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 include/linux/mlx5/device.h
> index 8fbe22de16ef,26333d602a50..000000000000
> --- a/include/linux/mlx5/device.h
> +++ b/include/linux/mlx5/device.h
> @@@ -366,7 -366,8 +366,9 @@@ enum mlx5_driver_event 
>   	MLX5_DRIVER_EVENT_UPLINK_NETDEV,
>   	MLX5_DRIVER_EVENT_MACSEC_SA_ADDED,
>   	MLX5_DRIVER_EVENT_MACSEC_SA_DELETED,
>  +	MLX5_DRIVER_EVENT_SF_PEER_DEVLINK,
> + 	MLX5_DRIVER_EVENT_AFFILIATION_DONE,
> + 	MLX5_DRIVER_EVENT_AFFILIATION_REMOVED,
>   };

Thanks a lot

>   
>   enum {

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

[Stephen Rothwell]

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

Hi all,

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

  include/linux/mlx5/device.h

between commit:

  ac5f395685bd ("net/mlx5: SF, Implement peer devlink set for SF representor devlink port")

from the net-next tree and commit:

  0d293714ac32 ("RDMA/mlx5: Send events from IB driver about device affiliation state")

from the mlx5-next 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 include/linux/mlx5/device.h
index 8fbe22de16ef,26333d602a50..000000000000
--- a/include/linux/mlx5/device.h
+++ b/include/linux/mlx5/device.h
@@@ -366,7 -366,8 +366,9 @@@ enum mlx5_driver_event 
  	MLX5_DRIVER_EVENT_UPLINK_NETDEV,
  	MLX5_DRIVER_EVENT_MACSEC_SA_ADDED,
  	MLX5_DRIVER_EVENT_MACSEC_SA_DELETED,
 +	MLX5_DRIVER_EVENT_SF_PEER_DEVLINK,
+ 	MLX5_DRIVER_EVENT_AFFILIATION_DONE,
+ 	MLX5_DRIVER_EVENT_AFFILIATION_REMOVED,
  };
  
  enum {

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

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

[Stephen Rothwell]

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

Hi all,

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

  include/linux/mlx5/driver.h

between commits:

  c8e350e62fc5 ("net/mlx5e: Make TC and IPsec offloads mutually exclusive on a netdev")
  1f507e80c700 ("net/mlx5: Expose NIC temperature via hardware monitoring kernel API")

from the net-next tree and commits:

  e26051386a94 ("net/mlx5e: Move MACsec flow steering and statistics database from ethernet to core")
  17c5c415b9cb ("net/mlx5: Add RoCE MACsec steering infrastructure in core")

from the mlx5-next 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 include/linux/mlx5/driver.h
index e1c7e502a4fc,728bcd6d184c..000000000000
--- a/include/linux/mlx5/driver.h
+++ b/include/linux/mlx5/driver.h
@@@ -806,9 -804,12 +806,14 @@@ struct mlx5_core_dev 
  	struct mlx5_rsc_dump    *rsc_dump;
  	u32                      vsc_addr;
  	struct mlx5_hv_vhca	*hv_vhca;
 -	struct mlx5_thermal	*thermal;
 +	struct mlx5_hwmon	*hwmon;
 +	u64			num_block_tc;
 +	u64			num_block_ipsec;
+ #ifdef CONFIG_MLX5_MACSEC
+ 	struct mlx5_macsec_fs *macsec_fs;
+ 	/* MACsec notifier chain to sync MACsec core and IB database */
+ 	struct blocking_notifier_head macsec_nh;
+ #endif
  };
  
  struct mlx5_db {

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

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

[Leon Romanovsky]

On Thu, Feb 02, 2023 at 09:14:33AM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the mlx5-next tree got a conflict in:
> 
>   include/linux/mlx5/driver.h
> 
> between commit:
> 
>   fe298bdf6f65 ("net/mlx5: Prepare for fast crypto key update if hardware supports it")
> 
> from the net-next tree and commit:
> 
>   2fd0e75727a8 ("net/mlx5e: Propagate an internal event in case uplink netdev changes")
> 
> from the mlx5-next 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 include/linux/mlx5/driver.h
> index 234334194b38,cc48aa308269..000000000000
> --- a/include/linux/mlx5/driver.h
> +++ b/include/linux/mlx5/driver.h
> @@@ -674,7 -675,7 +675,8 @@@ struct mlx5e_resources 
>   	} hw_objs;
>   	struct devlink_port dl_port;
>   	struct net_device *uplink_netdev;
>  +	struct mlx5_crypto_dek_priv *dek_priv;
> + 	struct mutex uplink_netdev_lock;
>   };
>   
>   enum mlx5_sw_icm_type {

LGTM, thanks for the conflict resolution.

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

[Stephen Rothwell]

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

Hi all,

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

  include/linux/mlx5/driver.h

between commit:

  fe298bdf6f65 ("net/mlx5: Prepare for fast crypto key update if hardware supports it")

from the net-next tree and commit:

  2fd0e75727a8 ("net/mlx5e: Propagate an internal event in case uplink netdev changes")

from the mlx5-next 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 include/linux/mlx5/driver.h
index 234334194b38,cc48aa308269..000000000000
--- a/include/linux/mlx5/driver.h
+++ b/include/linux/mlx5/driver.h
@@@ -674,7 -675,7 +675,8 @@@ struct mlx5e_resources 
  	} hw_objs;
  	struct devlink_port dl_port;
  	struct net_device *uplink_netdev;
 +	struct mlx5_crypto_dek_priv *dek_priv;
+ 	struct mutex uplink_netdev_lock;
  };
  
  enum mlx5_sw_icm_type {

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

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

[Stephen Rothwell]

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

Hi all,

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

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

between commit:

  8ff0ac5be144 ("net/mlx5: Add MACsec offload Tx command support")

from the net-next tree and commits:

  939838632b91 ("net/mlx5: Query ADV_VIRTUALIZATION capabilities")
  6182534c2678 ("net/mlx5: Add NVMEoTCP caps, HW bits, 128B CQE and enumerations")

from the mlx5-next 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/fw.c
index c63ce03e79e0,2140bf161c90..000000000000
--- a/drivers/net/ethernet/mellanox/mlx5/core/fw.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/fw.c
@@@ -273,13 -273,18 +273,25 @@@ int mlx5_query_hca_caps(struct mlx5_cor
  			return err;
  	}
  
 +	if (MLX5_CAP_GEN_64(dev, general_obj_types) &
 +	    MLX5_GENERAL_OBJ_TYPES_CAP_MACSEC_OFFLOAD) {
 +		err = mlx5_core_get_caps(dev, MLX5_CAP_MACSEC);
 +		if (err)
 +			return err;
 +	}
 +
+ 	if (MLX5_CAP_GEN(dev, adv_virtualization)) {
+ 		err = mlx5_core_get_caps(dev, MLX5_CAP_ADV_VIRTUALIZATION);
+ 		if (err)
+ 			return err;
+ 	}
+ 
+ 	if (MLX5_CAP_GEN(dev, nvmeotcp)) {
+ 		err = mlx5_core_get_caps(dev, MLX5_CAP_DEV_NVMEOTCP);
+ 		if (err)
+ 			return err;
+ 	}
+ 
  	return 0;
  }
  

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

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

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the mlx5-next tree got conflicts in:

  include/linux/mlx5/device.h
  include/linux/mlx5/mlx5_ifc.h

between commit:

  8385c51ff5bc ("net/mlx5: Introduce MACsec Connect-X offload hardware bits and structures")

from the net-next tree and commits:

  6182534c2678 ("net/mlx5: Add NVMEoTCP caps, HW bits, 128B CQE and enumerations")
  4ced81c02b03 ("net/mlx5: Add IFC bits and enums for crypto key")

from the mlx5-next 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 include/linux/mlx5/device.h
index 2927810f172b,1288aee9d9aa..000000000000
--- a/include/linux/mlx5/device.h
+++ b/include/linux/mlx5/device.h
@@@ -1197,10 -1226,11 +1226,12 @@@ enum mlx5_cap_type 
  	MLX5_CAP_VDPA_EMULATION = 0x13,
  	MLX5_CAP_DEV_EVENT = 0x14,
  	MLX5_CAP_IPSEC,
+ 	MLX5_CAP_DEV_NVMEOTCP = 0x19,
  	MLX5_CAP_DEV_SHAMPO = 0x1d,
 +	MLX5_CAP_MACSEC = 0x1f,
  	MLX5_CAP_GENERAL_2 = 0x20,
  	MLX5_CAP_PORT_SELECTION = 0x25,
+ 	MLX5_CAP_ADV_VIRTUALIZATION = 0x26,
  	/* NUM OF CAP Types */
  	MLX5_CAP_NUM
  };
@@@ -1447,9 -1485,14 +1486,17 @@@ enum mlx5_qcam_feature_groups 
  #define MLX5_CAP_DEV_SHAMPO(mdev, cap)\
  	MLX5_GET(shampo_cap, mdev->caps.hca_cur[MLX5_CAP_DEV_SHAMPO], cap)
  
 +#define MLX5_CAP_MACSEC(mdev, cap)\
 +	MLX5_GET(macsec_cap, (mdev)->caps.hca[MLX5_CAP_MACSEC]->cur, cap)
 +
+ #define MLX5_CAP_DEV_NVMEOTCP(mdev, cap)\
+ 	MLX5_GET(nvmeotcp_cap, \
+ 		 (mdev)->caps.hca[MLX5_CAP_DEV_NVMEOTCP]->cur, cap)
+ 
+ #define MLX5_CAP64_DEV_NVMEOTCP(mdev, cap)\
+ 	MLX5_GET64(nvmeotcp_cap, \
+ 		   (mdev)->caps.hca[MLX5_CAP_DEV_NVMEOTCP]->cur, cap)
+ 
  enum {
  	MLX5_CMD_STAT_OK			= 0x0,
  	MLX5_CMD_STAT_INT_ERR			= 0x1,
diff --cc include/linux/mlx5/mlx5_ifc.h
index 8decbf9a7bdd,3fb7b0d6cbb5..000000000000
--- a/include/linux/mlx5/mlx5_ifc.h
+++ b/include/linux/mlx5/mlx5_ifc.h
@@@ -3323,7 -3382,8 +3410,9 @@@ union mlx5_ifc_hca_cap_union_bits 
  	struct mlx5_ifc_device_mem_cap_bits device_mem_cap;
  	struct mlx5_ifc_virtio_emulation_cap_bits virtio_emulation_cap;
  	struct mlx5_ifc_shampo_cap_bits shampo_cap;
 +	struct mlx5_ifc_macsec_cap_bits macsec_cap;
+ 	struct mlx5_ifc_nvmeotcp_cap_bits nvmeotcp_cap;
+ 	struct mlx5_ifc_crypto_cap_bits crypto_cap;
  	u8         reserved_at_0[0x8000];
  };
  
@@@ -11506,8 -11588,9 +11624,10 @@@ enum 
  	MLX5_GENERAL_OBJECT_TYPES_ENCRYPTION_KEY = 0xc,
  	MLX5_GENERAL_OBJECT_TYPES_IPSEC = 0x13,
  	MLX5_GENERAL_OBJECT_TYPES_SAMPLER = 0x20,
+ 	MLX5_GENERAL_OBJECT_TYPES_NVMEOTCP_TAG_BUFFER_TABLE = 0x21,
  	MLX5_GENERAL_OBJECT_TYPES_FLOW_METER_ASO = 0x24,
 +	MLX5_GENERAL_OBJECT_TYPES_MACSEC = 0x27,
+ 	MLX5_GENERAL_OBJECT_TYPES_INT_KEK = 0x47,
  };
  
  enum {
@@@ -11558,67 -11641,38 +11678,99 @@@ struct mlx5_ifc_modify_ipsec_obj_in_bit
  	struct mlx5_ifc_ipsec_obj_bits ipsec_object;
  };
  
 +struct mlx5_ifc_macsec_aso_bits {
 +	u8    valid[0x1];
 +	u8    reserved_at_1[0x1];
 +	u8    mode[0x2];
 +	u8    window_size[0x2];
 +	u8    soft_lifetime_arm[0x1];
 +	u8    hard_lifetime_arm[0x1];
 +	u8    remove_flow_enable[0x1];
 +	u8    epn_event_arm[0x1];
 +	u8    reserved_at_a[0x16];
 +
 +	u8    remove_flow_packet_count[0x20];
 +
 +	u8    remove_flow_soft_lifetime[0x20];
 +
 +	u8    reserved_at_60[0x80];
 +
 +	u8    mode_parameter[0x20];
 +
 +	u8    replay_protection_window[8][0x20];
 +};
 +
 +struct mlx5_ifc_macsec_offload_obj_bits {
 +	u8    modify_field_select[0x40];
 +
 +	u8    confidentiality_en[0x1];
 +	u8    reserved_at_41[0x1];
 +	u8    esn_en[0x1];
 +	u8    esn_overlap[0x1];
 +	u8    reserved_at_44[0x2];
 +	u8    confidentiality_offset[0x2];
 +	u8    reserved_at_48[0x4];
 +	u8    aso_return_reg[0x4];
 +	u8    reserved_at_50[0x10];
 +
 +	u8    esn_msb[0x20];
 +
 +	u8    reserved_at_80[0x8];
 +	u8    dekn[0x18];
 +
 +	u8    reserved_at_a0[0x20];
 +
 +	u8    sci[0x40];
 +
 +	u8    reserved_at_100[0x8];
 +	u8    macsec_aso_access_pd[0x18];
 +
 +	u8    reserved_at_120[0x60];
 +
 +	u8    salt[3][0x20];
 +
 +	u8    reserved_at_1e0[0x20];
 +
 +	struct mlx5_ifc_macsec_aso_bits macsec_aso;
 +};
 +
 +struct mlx5_ifc_create_macsec_obj_in_bits {
 +	struct mlx5_ifc_general_obj_in_cmd_hdr_bits general_obj_in_cmd_hdr;
 +	struct mlx5_ifc_macsec_offload_obj_bits macsec_object;
 +};
 +
+ struct mlx5_ifc_wrapped_dek_bits {
+ 	u8         gcm_iv[0x60];
+ 
+ 	u8         reserved_at_60[0x20];
+ 
+ 	u8         const0[0x1];
+ 	u8         key_size[0x1];
+ 	u8         reserved_at_82[0x2];
+ 	u8         key2_invalid[0x1];
+ 	u8         reserved_at_85[0x3];
+ 	u8         pd[0x18];
+ 
+ 	u8         key_purpose[0x5];
+ 	u8         reserved_at_a5[0x13];
+ 	u8         kek_id[0x8];
+ 
+ 	u8         reserved_at_c0[0x40];
+ 
+ 	u8         key1[0x8][0x20];
+ 
+ 	u8         key2[0x8][0x20];
+ 
+ 	u8         reserved_at_300[0x40];
+ 
+ 	u8         const1[0x1];
+ 	u8         reserved_at_341[0x1f];
+ 
+ 	u8         reserved_at_360[0x20];
+ 
+ 	u8         auth_tag[0x80];
+ };
+ 
  struct mlx5_ifc_encryption_key_obj_bits {
  	u8         modify_field_select[0x40];
  
@@@ -11736,10 -11846,20 +11944,21 @@@ enum 
  enum {
  	MLX5_GENERAL_OBJECT_TYPE_ENCRYPTION_KEY_TYPE_TLS = 0x1,
  	MLX5_GENERAL_OBJECT_TYPE_ENCRYPTION_KEY_TYPE_IPSEC = 0x2,
 +	MLX5_GENERAL_OBJECT_TYPE_ENCRYPTION_KEY_TYPE_MACSEC = 0x4,
  };
  
- struct mlx5_ifc_tls_static_params_bits {
+ enum {
+ 	MLX5_TRANSPORT_STATIC_PARAMS_ACC_TYPE_TLS               = 0x1,
+ 	MLX5_TRANSPORT_STATIC_PARAMS_ACC_TYPE_NVMETCP           = 0x2,
+ 	MLX5_TRANSPORT_STATIC_PARAMS_ACC_TYPE_NVMETCP_WITH_TLS  = 0x3,
+ };
+ 
+ enum {
+ 	MLX5_TRANSPORT_STATIC_PARAMS_TI_INITIATOR  = 0x0,
+ 	MLX5_TRANSPORT_STATIC_PARAMS_TI_TARGET     = 0x1,
+ };
+ 
+ struct mlx5_ifc_transport_static_params_bits {
  	u8         const_2[0x2];
  	u8         tls_version[0x4];
  	u8         const_1[0x2];

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