Commit 9d045ed1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull networking fixes from David Miller:
 "Nothing earth shattering here, lots of small fixes (f.e. missing RCU
  protection, bad ref counting, missing memset(), etc.) all over the
  place:

   1) Use get_file_rcu() in task_file iterator, from Yonghong Song.

   2) There are two ways to set remote source MAC addresses in macvlan
      driver, but only one of which validates things properly. Fix this.
      From Alvin Šipraga.

   3) Missing of_node_put() in gianfar probing, from Sumera
      Priyadarsini.

   4) Preserve device wanted feature bits across multiple netlink
      ethtool requests, from Maxim Mikityanskiy.

   5) Fix rcu_sched stall in task and task_file bpf iterators, from
      Yonghong Song.

   6) Avoid reset after device destroy in ena driver, from Shay
      Agroskin.

   7) Missing memset() in netlink policy export reallocation path, from
      Johannes Berg.

   8) Fix info leak in __smc_diag_dump(), from Peilin Ye.

   9) Decapsulate ECN properly for ipv6 in ipv4 tunnels, from Mark
      Tomlinson.

  10) Fix number of data stream negotiation in SCTP, from David Laight.

  11) Fix double free in connection tracker action module, from Alaa
      Hleihel.

  12) Don't allow empty NHA_GROUP attributes, from Nikolay Aleksandrov"

* git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (46 commits)
  net: nexthop: don't allow empty NHA_GROUP
  bpf: Fix two typos in uapi/linux/bpf.h
  net: dsa: b53: check for timeout
  tipc: call rcu_read_lock() in tipc_aead_encrypt_done()
  net/sched: act_ct: Fix skb double-free in tcf_ct_handle_fragments() error flow
  net: sctp: Fix negotiation of the number of data streams.
  dt-bindings: net: renesas, ether: Improve schema validation
  gre6: Fix reception with IP6_TNL_F_RCV_DSCP_COPY
  hv_netvsc: Fix the queue_mapping in netvsc_vf_xmit()
  hv_netvsc: Remove "unlikely" from netvsc_select_queue
  bpf: selftests: global_funcs: Check err_str before strstr
  bpf: xdp: Fix XDP mode when no mode flags specified
  selftests/bpf: Remove test_align leftovers
  tools/resolve_btfids: Fix sections with wrong alignment
  net/smc: Prevent kernel-infoleak in __smc_diag_dump()
  sfc: fix build warnings on 32-bit
  net: phy: mscc: Fix a couple of spelling mistakes "spcified" -> "specified"
  libbpf: Fix map index used in error message
  net: gemini: Fix missing free_netdev() in error path of gemini_ethernet_port_probe()
  net: atlantic: Use readx_poll_timeout() for large timeout
  ...
parents f320ac6e eeaac363

Documentation/devicetree/bindings/net/renesas,ether.yaml

+15 −7
Original line number Diff line number Diff line
@@ -59,9 +59,15 @@ properties: 
  clocks:

    maxItems: 1



  pinctrl-0: true

  power-domains:

    maxItems: 1



  resets:

    maxItems: 1



  pinctrl-names: true

  phy-mode: true



  phy-handle: true



  renesas,no-ether-link:

    type: boolean
@@ -74,6 +80,11 @@ properties: 
      specify when the Ether LINK signal is active-low instead of normal

      active-high



patternProperties:

  "^ethernet-phy@[0-9a-f]$":

    type: object

    $ref: ethernet-phy.yaml#



required:

  - compatible

  - reg
@@ -83,7 +94,8 @@ required: 
  - '#address-cells'

  - '#size-cells'

  - clocks

  - pinctrl-0



additionalProperties: false



examples:

  # Lager board
@@ -99,8 +111,6 @@ examples: 
        clocks = <&mstp8_clks R8A7790_CLK_ETHER>;

        phy-mode = "rmii";

        phy-handle = <&phy1>;

        pinctrl-0 = <&ether_pins>;

        pinctrl-names = "default";

        renesas,ether-link-active-low;

        #address-cells = <1>;

        #size-cells = <0>;
@@ -109,7 +119,5 @@ examples: 
            reg = <1>;

            interrupt-parent = <&irqc0>;

            interrupts = <0 IRQ_TYPE_LEVEL_LOW>;

            pinctrl-0 = <&phy1_pins>;

            pinctrl-names = "default";

        };

    };

drivers/net/bonding/bond_main.c

+16 −2
Original line number Diff line number Diff line
@@ -2948,6 +2948,9 @@ static int bond_ab_arp_inspect(struct bonding *bond) 
			if (bond_time_in_interval(bond, last_rx, 1)) {

				bond_propose_link_state(slave, BOND_LINK_UP);

				commit++;

			} else if (slave->link == BOND_LINK_BACK) {

				bond_propose_link_state(slave, BOND_LINK_FAIL);

				commit++;

			}

			continue;

		}
@@ -3056,6 +3059,19 @@ static void bond_ab_arp_commit(struct bonding *bond) 


			continue;



		case BOND_LINK_FAIL:

			bond_set_slave_link_state(slave, BOND_LINK_FAIL,

						  BOND_SLAVE_NOTIFY_NOW);

			bond_set_slave_inactive_flags(slave,

						      BOND_SLAVE_NOTIFY_NOW);



			/* A slave has just been enslaved and has become

			 * the current active slave.

			 */

			if (rtnl_dereference(bond->curr_active_slave))

				RCU_INIT_POINTER(bond->current_arp_slave, NULL);

			continue;



		default:

			slave_err(bond->dev, slave->dev,

				  "impossible: link_new_state %d on slave\n",
@@ -3106,8 +3122,6 @@ static bool bond_ab_arp_probe(struct bonding *bond) 
			return should_notify_rtnl;

	}



	bond_set_slave_inactive_flags(curr_arp_slave, BOND_SLAVE_NOTIFY_LATER);



	bond_for_each_slave_rcu(bond, slave, iter) {

		if (!found && !before && bond_slave_is_up(slave))

			before = slave;

drivers/net/dsa/b53/b53_common.c

+2 −0
Original line number Diff line number Diff line
@@ -1554,6 +1554,8 @@ static int b53_arl_op(struct b53_device *dev, int op, int port, 
		return ret;



	switch (ret) {

	case -ETIMEDOUT:

		return ret;

	case -ENOSPC:

		dev_dbg(dev->dev, "{%pM,%.4d} no space left in ARL\n",

			addr, vid);

drivers/net/dsa/ocelot/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ config NET_DSA_MSCC_FELIX 
	select NET_DSA_TAG_OCELOT

	select FSL_ENETC_MDIO

	help

	  This driver supports network switches from the the Vitesse /

	  This driver supports network switches from the Vitesse /

	  Microsemi / Microchip Ocelot family of switching cores that are

	  connected to their host CPU via Ethernet.

	  The following switches are supported:

drivers/net/ethernet/amazon/ena/ena_netdev.c

+18 −17
Original line number Diff line number Diff line
@@ -2180,12 +2180,9 @@ static void ena_del_napi_in_range(struct ena_adapter *adapter, 
	int i;



	for (i = first_index; i < first_index + count; i++) {

		/* Check if napi was initialized before */

		if (!ENA_IS_XDP_INDEX(adapter, i) ||

		    adapter->ena_napi[i].xdp_ring)

		netif_napi_del(&adapter->ena_napi[i].napi);

		else

			WARN_ON(ENA_IS_XDP_INDEX(adapter, i) &&



		WARN_ON(!ENA_IS_XDP_INDEX(adapter, i) &&

			adapter->ena_napi[i].xdp_ring);

	}

}
@@ -3601,16 +3598,14 @@ static void ena_fw_reset_device(struct work_struct *work) 
{

	struct ena_adapter *adapter =

		container_of(work, struct ena_adapter, reset_task);

	struct pci_dev *pdev = adapter->pdev;



	if (unlikely(!test_bit(ENA_FLAG_TRIGGER_RESET, &adapter->flags))) {

		dev_err(&pdev->dev,

			"device reset schedule while reset bit is off\n");

		return;

	}

	rtnl_lock();



	if (likely(test_bit(ENA_FLAG_TRIGGER_RESET, &adapter->flags))) {

		ena_destroy_device(adapter, false);

		ena_restore_device(adapter);

	}



	rtnl_unlock();

}
@@ -3692,7 +3687,7 @@ static int check_missing_comp_in_tx_queue(struct ena_adapter *adapter, 
	}



	u64_stats_update_begin(&tx_ring->syncp);

	tx_ring->tx_stats.missed_tx = missed_tx;

	tx_ring->tx_stats.missed_tx += missed_tx;

	u64_stats_update_end(&tx_ring->syncp);



	return rc;
@@ -4389,8 +4384,11 @@ static void __ena_shutoff(struct pci_dev *pdev, bool shutdown) 
		netdev->rx_cpu_rmap = NULL;

	}

#endif /* CONFIG_RFS_ACCEL */

	del_timer_sync(&adapter->timer_service);



	/* Make sure timer and reset routine won't be called after

	 * freeing device resources.

	 */

	del_timer_sync(&adapter->timer_service);

	cancel_work_sync(&adapter->reset_task);



	rtnl_lock(); /* lock released inside the below if-else block */
@@ -4558,6 +4556,9 @@ static void ena_keep_alive_wd(void *adapter_data, 
	tx_drops = ((u64)desc->tx_drops_high << 32) | desc->tx_drops_low;



	u64_stats_update_begin(&adapter->syncp);

	/* These stats are accumulated by the device, so the counters indicate

	 * all drops since last reset.

	 */

	adapter->dev_stats.rx_drops = rx_drops;

	adapter->dev_stats.tx_drops = tx_drops;

	u64_stats_update_end(&adapter->syncp);