Commit 212dab05 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 

Pull networking fixes from David Miller:

 1) Handle frames in error situations properly in AF_XDP, from Jakub
    Kicinski.

 2) tcp_mmap test case only tests ipv6 due to a thinko, fix from
    Maninder Singh.

 3) Session refcnt fix in l2tp_ppp, from Guillaume Nault.

 4) Fix regression in netlink bind handling of multicast gruops, from
    Dmitry Safonov.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
  netlink: Don't shift on 64 for ngroups
  net/smc: no cursor update send in state SMC_INIT
  l2tp: fix missing refcount drop in pppol2tp_tunnel_ioctl()
  mlxsw: core_acl_flex_actions: Remove redundant mirror resource destruction
  mlxsw: core_acl_flex_actions: Remove redundant counter destruction
  mlxsw: core_acl_flex_actions: Remove redundant resource destruction
  mlxsw: core_acl_flex_actions: Return error for conflicting actions
  selftests/bpf: update test_lwt_seg6local.sh according to iproute2
  drivers: net: lmc: fix case value for target abort error
  selftest/net: fix protocol family to work for IPv4.
  net: xsk: don't return frames via the allocator on error
  tools/bpftool: fix a percpu_array map dump problem
parents 60f5a217 91874ecf

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

+29 −22
Original line number Diff line number Diff line
@@ -327,12 +327,16 @@ static void mlxsw_afa_resource_add(struct mlxsw_afa_block *block, 
	list_add(&resource->list, &block->resource_list);

}



static void mlxsw_afa_resource_del(struct mlxsw_afa_resource *resource)

{

	list_del(&resource->list);

}



static void mlxsw_afa_resources_destroy(struct mlxsw_afa_block *block)

{

	struct mlxsw_afa_resource *resource, *tmp;



	list_for_each_entry_safe(resource, tmp, &block->resource_list, list) {

		list_del(&resource->list);

		resource->destructor(block, resource);

	}

}
@@ -530,6 +534,7 @@ static void 
mlxsw_afa_fwd_entry_ref_destroy(struct mlxsw_afa_block *block,

				struct mlxsw_afa_fwd_entry_ref *fwd_entry_ref)

{

	mlxsw_afa_resource_del(&fwd_entry_ref->resource);

	mlxsw_afa_fwd_entry_put(block->afa, fwd_entry_ref->fwd_entry);

	kfree(fwd_entry_ref);

}
@@ -579,6 +584,7 @@ static void 
mlxsw_afa_counter_destroy(struct mlxsw_afa_block *block,

			  struct mlxsw_afa_counter *counter)

{

	mlxsw_afa_resource_del(&counter->resource);

	block->afa->ops->counter_index_put(block->afa->ops_priv,

					   counter->counter_index);

	kfree(counter);
@@ -626,8 +632,8 @@ static char *mlxsw_afa_block_append_action(struct mlxsw_afa_block *block, 
	char *oneact;

	char *actions;



	if (WARN_ON(block->finished))

		return NULL;

	if (block->finished)

		return ERR_PTR(-EINVAL);

	if (block->cur_act_index + action_size >

	    block->afa->max_acts_per_set) {

		struct mlxsw_afa_set *set;
@@ -637,7 +643,7 @@ static char *mlxsw_afa_block_append_action(struct mlxsw_afa_block *block, 
		 */

		set = mlxsw_afa_set_create(false);

		if (!set)

			return NULL;

			return ERR_PTR(-ENOBUFS);

		set->prev = block->cur_set;

		block->cur_act_index = 0;

		block->cur_set->next = set;
@@ -724,8 +730,8 @@ int mlxsw_afa_block_append_vlan_modify(struct mlxsw_afa_block *block, 
						  MLXSW_AFA_VLAN_CODE,

						  MLXSW_AFA_VLAN_SIZE);



	if (!act)

		return -ENOBUFS;

	if (IS_ERR(act))

		return PTR_ERR(act);

	mlxsw_afa_vlan_pack(act, MLXSW_AFA_VLAN_VLAN_TAG_CMD_NOP,

			    MLXSW_AFA_VLAN_CMD_SET_OUTER, vid,

			    MLXSW_AFA_VLAN_CMD_SET_OUTER, pcp,
@@ -806,8 +812,8 @@ int mlxsw_afa_block_append_drop(struct mlxsw_afa_block *block) 
						  MLXSW_AFA_TRAPDISC_CODE,

						  MLXSW_AFA_TRAPDISC_SIZE);



	if (!act)

		return -ENOBUFS;

	if (IS_ERR(act))

		return PTR_ERR(act);

	mlxsw_afa_trapdisc_pack(act, MLXSW_AFA_TRAPDISC_TRAP_ACTION_NOP,

				MLXSW_AFA_TRAPDISC_FORWARD_ACTION_DISCARD, 0);

	return 0;
@@ -820,8 +826,8 @@ int mlxsw_afa_block_append_trap(struct mlxsw_afa_block *block, u16 trap_id) 
						  MLXSW_AFA_TRAPDISC_CODE,

						  MLXSW_AFA_TRAPDISC_SIZE);



	if (!act)

		return -ENOBUFS;

	if (IS_ERR(act))

		return PTR_ERR(act);

	mlxsw_afa_trapdisc_pack(act, MLXSW_AFA_TRAPDISC_TRAP_ACTION_TRAP,

				MLXSW_AFA_TRAPDISC_FORWARD_ACTION_DISCARD,

				trap_id);
@@ -836,8 +842,8 @@ int mlxsw_afa_block_append_trap_and_forward(struct mlxsw_afa_block *block, 
						  MLXSW_AFA_TRAPDISC_CODE,

						  MLXSW_AFA_TRAPDISC_SIZE);



	if (!act)

		return -ENOBUFS;

	if (IS_ERR(act))

		return PTR_ERR(act);

	mlxsw_afa_trapdisc_pack(act, MLXSW_AFA_TRAPDISC_TRAP_ACTION_TRAP,

				MLXSW_AFA_TRAPDISC_FORWARD_ACTION_FORWARD,

				trap_id);
@@ -856,6 +862,7 @@ static void 
mlxsw_afa_mirror_destroy(struct mlxsw_afa_block *block,

			 struct mlxsw_afa_mirror *mirror)

{

	mlxsw_afa_resource_del(&mirror->resource);

	block->afa->ops->mirror_del(block->afa->ops_priv,

				    mirror->local_in_port,

				    mirror->span_id,
@@ -908,8 +915,8 @@ mlxsw_afa_block_append_allocated_mirror(struct mlxsw_afa_block *block, 
	char *act = mlxsw_afa_block_append_action(block,

						  MLXSW_AFA_TRAPDISC_CODE,

						  MLXSW_AFA_TRAPDISC_SIZE);

	if (!act)

		return -ENOBUFS;

	if (IS_ERR(act))

		return PTR_ERR(act);

	mlxsw_afa_trapdisc_pack(act, MLXSW_AFA_TRAPDISC_TRAP_ACTION_NOP,

				MLXSW_AFA_TRAPDISC_FORWARD_ACTION_FORWARD, 0);

	mlxsw_afa_trapdisc_mirror_pack(act, true, mirror_agent);
@@ -996,8 +1003,8 @@ int mlxsw_afa_block_append_fwd(struct mlxsw_afa_block *block, 


	act = mlxsw_afa_block_append_action(block, MLXSW_AFA_FORWARD_CODE,

					    MLXSW_AFA_FORWARD_SIZE);

	if (!act) {

		err = -ENOBUFS;

	if (IS_ERR(act)) {

		err = PTR_ERR(act);

		goto err_append_action;

	}

	mlxsw_afa_forward_pack(act, MLXSW_AFA_FORWARD_TYPE_PBS,
@@ -1052,8 +1059,8 @@ int mlxsw_afa_block_append_allocated_counter(struct mlxsw_afa_block *block, 
{

	char *act = mlxsw_afa_block_append_action(block, MLXSW_AFA_POLCNT_CODE,

						  MLXSW_AFA_POLCNT_SIZE);

	if (!act)

		return -ENOBUFS;

	if (IS_ERR(act))

		return PTR_ERR(act);

	mlxsw_afa_polcnt_pack(act, MLXSW_AFA_POLCNT_COUNTER_SET_TYPE_PACKETS_BYTES,

			      counter_index);

	return 0;
@@ -1123,8 +1130,8 @@ int mlxsw_afa_block_append_fid_set(struct mlxsw_afa_block *block, u16 fid) 
	char *act = mlxsw_afa_block_append_action(block,

						  MLXSW_AFA_VIRFWD_CODE,

						  MLXSW_AFA_VIRFWD_SIZE);

	if (!act)

		return -ENOBUFS;

	if (IS_ERR(act))

		return PTR_ERR(act);

	mlxsw_afa_virfwd_pack(act, MLXSW_AFA_VIRFWD_FID_CMD_SET, fid);

	return 0;

}
@@ -1193,8 +1200,8 @@ int mlxsw_afa_block_append_mcrouter(struct mlxsw_afa_block *block, 
	char *act = mlxsw_afa_block_append_action(block,

						  MLXSW_AFA_MCROUTER_CODE,

						  MLXSW_AFA_MCROUTER_SIZE);

	if (!act)

		return -ENOBUFS;

	if (IS_ERR(act))

		return PTR_ERR(act);

	mlxsw_afa_mcrouter_pack(act, MLXSW_AFA_MCROUTER_RPF_ACTION_TRAP,

				expected_irif, min_mtu, rmid_valid, kvdl_index);

	return 0;

drivers/net/wan/lmc/lmc_main.c

+1 −1
Original line number Diff line number Diff line
@@ -1362,7 +1362,7 @@ static irqreturn_t lmc_interrupt (int irq, void *dev_instance) /*fold00*/ 
            case 0x001:

                printk(KERN_WARNING "%s: Master Abort (naughty)\n", dev->name);

                break;

            case 0x010:

            case 0x002:

                printk(KERN_WARNING "%s: Target Abort (not so naughty)\n", dev->name);

                break;

            default:

net/l2tp/l2tp_ppp.c

+9 −4
Original line number Diff line number Diff line
@@ -1201,13 +1201,18 @@ static int pppol2tp_tunnel_ioctl(struct l2tp_tunnel *tunnel, 
				l2tp_session_get(sock_net(sk), tunnel,

						 stats.session_id);



			if (session && session->pwtype == L2TP_PWTYPE_PPP) {

				err = pppol2tp_session_ioctl(session, cmd,

							     arg);

			if (!session) {

				err = -EBADR;

				break;

			}

			if (session->pwtype != L2TP_PWTYPE_PPP) {

				l2tp_session_dec_refcount(session);

			} else {

				err = -EBADR;

				break;

			}



			err = pppol2tp_session_ioctl(session, cmd, arg);

			l2tp_session_dec_refcount(session);

			break;

		}

#ifdef CONFIG_XFRM

net/netlink/af_netlink.c

+2 −2
Original line number Diff line number Diff line
@@ -1013,8 +1013,8 @@ static int netlink_bind(struct socket *sock, struct sockaddr *addr, 


	if (nlk->ngroups == 0)

		groups = 0;

	else

		groups &= (1ULL << nlk->ngroups) - 1;

	else if (nlk->ngroups < 8*sizeof(groups))

		groups &= (1UL << nlk->ngroups) - 1;



	bound = nlk->bound;

	if (bound) {

net/smc/smc_cdc.c

+2 −1
Original line number Diff line number Diff line
@@ -233,6 +233,7 @@ static void smc_cdc_msg_recv_action(struct smc_sock *smc, 
			/* force immediate tx of current consumer cursor, but

			 * under send_lock to guarantee arrival in seqno-order

			 */

			if (smc->sk.sk_state != SMC_INIT)

				smc_tx_sndbuf_nonempty(conn);

		}

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE