Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4314b1f6 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'mlxsw-fixes' 



Daniel Borkmann says:

====================
pull-request: bpf 2019-01-08

The following pull-request contains BPF updates for your *net* tree.

The main changes are:

1) Fix BSD'ism in sendmsg(2) to rewrite unspecified IPv6 dst for
   unconnected UDP sockets with [::1] _after_ cgroup BPF invocation,
   from Andrey.

2) Follow-up fix to the speculation fix where we need to reject a
   corner case for sanitation when ptr and scalars are mixed in the
   same alu op. Also, some unrelated minor doc fixes, from Daniel.

3) Fix BPF kselftest's incorrect uses of create_and_get_cgroup()
   by not assuming fd of zero value to be the result of an error
   case, from Stanislav.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 11287b69 4fabf3bf

drivers/net/ethernet/mellanox/mlxsw/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ config MLXSW_SPECTRUM 
	depends on IPV6 || IPV6=n

	depends on NET_IPGRE || NET_IPGRE=n

	depends on IPV6_GRE || IPV6_GRE=n

	depends on VXLAN || VXLAN=n

	select GENERIC_ALLOCATOR

	select PARMAN

	select OBJAGG

drivers/net/ethernet/mellanox/mlxsw/spectrum.c

+5 −2
Original line number Diff line number Diff line
@@ -5005,12 +5005,15 @@ static int mlxsw_sp_netdevice_port_upper_event(struct net_device *lower_dev, 
							   lower_dev,

							   upper_dev);

		} else if (netif_is_lag_master(upper_dev)) {

			if (info->linking)

			if (info->linking) {

				err = mlxsw_sp_port_lag_join(mlxsw_sp_port,

							     upper_dev);

			else

			} else {

				mlxsw_sp_port_lag_tx_en_set(mlxsw_sp_port,

							    false);

				mlxsw_sp_port_lag_leave(mlxsw_sp_port,

							upper_dev);

			}

		} else if (netif_is_ovs_master(upper_dev)) {

			if (info->linking)

				err = mlxsw_sp_port_ovs_join(mlxsw_sp_port);

drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_ctcam.c

+9 −1
Original line number Diff line number Diff line
@@ -72,7 +72,15 @@ mlxsw_sp_acl_ctcam_region_entry_insert(struct mlxsw_sp *mlxsw_sp, 
	act_set = mlxsw_afa_block_first_set(rulei->act_block);

	mlxsw_reg_ptce2_flex_action_set_memcpy_to(ptce2_pl, act_set);



	return mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(ptce2), ptce2_pl);

	err = mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(ptce2), ptce2_pl);

	if (err)

		goto err_ptce2_write;



	return 0;



err_ptce2_write:

	cregion->ops->entry_remove(cregion, centry);

	return err;

}



static void

drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_erp.c

+0 −2
Original line number Diff line number Diff line
@@ -1022,7 +1022,6 @@ void mlxsw_sp_acl_erp_mask_put(struct mlxsw_sp_acl_atcam_region *aregion, 
{

	struct objagg_obj *objagg_obj = (struct objagg_obj *) erp_mask;



	ASSERT_RTNL();

	objagg_obj_put(aregion->erp_table->objagg, objagg_obj);

}
@@ -1054,7 +1053,6 @@ void mlxsw_sp_acl_erp_bf_remove(struct mlxsw_sp *mlxsw_sp, 
	const struct mlxsw_sp_acl_erp *erp = objagg_obj_root_priv(objagg_obj);

	unsigned int erp_bank;



	ASSERT_RTNL();

	if (!mlxsw_sp_acl_erp_table_is_used(erp->erp_table))

		return;

drivers/net/ethernet/mellanox/mlxsw/spectrum_nve.c

+2 −2
Original line number Diff line number Diff line
@@ -816,14 +816,14 @@ int mlxsw_sp_nve_fid_enable(struct mlxsw_sp *mlxsw_sp, struct mlxsw_sp_fid *fid, 
	ops = nve->nve_ops_arr[params->type];



	if (!ops->can_offload(nve, params->dev, extack))

		return -EOPNOTSUPP;

		return -EINVAL;



	memset(&config, 0, sizeof(config));

	ops->nve_config(nve, params->dev, &config);

	if (nve->num_nve_tunnels &&

	    memcmp(&config, &nve->config, sizeof(config))) {

		NL_SET_ERR_MSG_MOD(extack, "Conflicting NVE tunnels configuration");

		return -EOPNOTSUPP;

		return -EINVAL;

	}



	err = mlxsw_sp_nve_tunnel_init(mlxsw_sp, &config);