Commit 6e7bd3b5 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) Fix MAC address setting in mac80211 pmsr code, from Johannes Berg.

 2) Probe SFP modules after being attached, from Russell King.

 3) Byte ordering bug in SMC rx_curs_confirmed code, from Ursula Braun.

 4) Revert some r8169 changes that are causing regressions, from Heiner
    Kallweit.

 5) Fix spurious connection timeouts in netfilter nat code, from Florian
    Westphal.

 6) SKB leak in tipc, from Hoang Le.

 7) Short packet checkum issue in mlx4, similar to a previous mlx5
    change, from Saeed Mahameed. The issue is that whilst padding bytes
    are usually zero, it is not guarateed and the hardware doesn't take
    the padding bytes into consideration when generating the checksum.

 8) Fix various races in cls_tcindex, from Cong Wang.

 9) Need to set stream ext to NULL before freeing in SCTP code, from Xin
    Long.

10) Fix locking in phy_is_started, from Heiner Kallweit.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (54 commits)
  net: ethernet: freescale: set FEC ethtool regs version
  net: hns: Fix object reference leaks in hns_dsaf_roce_reset()
  mm: page_alloc: fix ref bias in page_frag_alloc() for 1-byte allocs
  net: phy: fix potential race in the phylib state machine
  net: phy: don't use locking in phy_is_started
  selftests: fix timestamping Makefile
  net: dsa: bcm_sf2: potential array overflow in bcm_sf2_sw_suspend()
  net: fix possible overflow in __sk_mem_raise_allocated()
  dsa: mv88e6xxx: Ensure all pending interrupts are handled prior to exit
  net: phy: fix interrupt handling in non-started states
  sctp: set stream ext to NULL after freeing it in sctp_stream_outq_migrate
  sctp: call gso_reset_checksum when computing checksum in sctp_gso_segment
  net/mlx5e: XDP, fix redirect resources availability check
  net/mlx5: Fix a compilation warning in events.c
  net/mlx5: No command allowed when command interface is not ready
  net/mlx5e: Fix NULL pointer derefernce in set channels error flow
  netfilter: nft_compat: use-after-free when deleting targets
  team: avoid complex list operations in team_nl_cmd_options_set()
  net_sched: fix two more memory leaks in cls_tcindex
  net_sched: fix a memory leak in cls_tcindex
  ...
parents 02d75040 f9bcc9f3

Documentation/networking/operstates.txt

+8 −6
Original line number Diff line number Diff line
@@ -22,8 +22,9 @@ and changeable from userspace under certain rules. 
2. Querying from userspace



Both admin and operational state can be queried via the netlink

operation RTM_GETLINK. It is also possible to subscribe to RTMGRP_LINK

to be notified of updates. This is important for setting from userspace.

operation RTM_GETLINK. It is also possible to subscribe to RTNLGRP_LINK

to be notified of updates while the interface is admin up. This is

important for setting from userspace.



These values contain interface state:
@@ -101,8 +102,9 @@ because some driver controlled protocol establishment has to 
complete. Corresponding functions are netif_dormant_on() to set the

flag, netif_dormant_off() to clear it and netif_dormant() to query.



On device allocation, networking core sets the flags equivalent to

netif_carrier_ok() and !netif_dormant().

On device allocation, both flags __LINK_STATE_NOCARRIER and

__LINK_STATE_DORMANT are cleared, so the effective state is equivalent

to netif_carrier_ok() and !netif_dormant().





Whenever the driver CHANGES one of these flags, a workqueue event is
@@ -133,11 +135,11 @@ netif_carrier_ok() && !netif_dormant() is set by the 
driver. Afterwards, the userspace application can set IFLA_OPERSTATE

to IF_OPER_DORMANT or IF_OPER_UP as long as the driver does not set

netif_carrier_off() or netif_dormant_on(). Changes made by userspace

are multicasted on the netlink group RTMGRP_LINK.

are multicasted on the netlink group RTNLGRP_LINK.



So basically a 802.1X supplicant interacts with the kernel like this:



-subscribe to RTMGRP_LINK

-subscribe to RTNLGRP_LINK

-set IFLA_LINKMODE to 1 via RTM_SETLINK

-query RTM_GETLINK once to get initial state

-if initial flags are not (IFF_LOWER_UP && !IFF_DORMANT), wait until

drivers/net/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -197,9 +197,9 @@ config VXLAN 


config GENEVE

       tristate "Generic Network Virtualization Encapsulation"

       depends on INET && NET_UDP_TUNNEL

       depends on INET

       depends on IPV6 || !IPV6

       select NET_IP_TUNNEL

       select NET_UDP_TUNNEL

       select GRO_CELLS

       ---help---

	  This allows one to create geneve virtual interfaces that provide

drivers/net/dsa/bcm_sf2.c

+1 −1
Original line number Diff line number Diff line
@@ -690,7 +690,7 @@ static int bcm_sf2_sw_suspend(struct dsa_switch *ds) 
	 * port, the other ones have already been disabled during

	 * bcm_sf2_sw_setup

	 */

	for (port = 0; port < DSA_MAX_PORTS; port++) {

	for (port = 0; port < ds->num_ports; port++) {

		if (dsa_is_user_port(ds, port) || dsa_is_cpu_port(ds, port))

			bcm_sf2_port_disable(ds, port, NULL);

	}

drivers/net/dsa/mv88e6xxx/chip.c

+22 −6
Original line number Diff line number Diff line
@@ -261,6 +261,7 @@ static irqreturn_t mv88e6xxx_g1_irq_thread_work(struct mv88e6xxx_chip *chip) 
	unsigned int sub_irq;

	unsigned int n;

	u16 reg;

	u16 ctl1;

	int err;



	mutex_lock(&chip->reg_lock);
@@ -270,13 +271,28 @@ static irqreturn_t mv88e6xxx_g1_irq_thread_work(struct mv88e6xxx_chip *chip) 
	if (err)

		goto out;



	do {

		for (n = 0; n < chip->g1_irq.nirqs; ++n) {

			if (reg & (1 << n)) {

			sub_irq = irq_find_mapping(chip->g1_irq.domain, n);

				sub_irq = irq_find_mapping(chip->g1_irq.domain,

							   n);

				handle_nested_irq(sub_irq);

				++nhandled;

			}

		}



		mutex_lock(&chip->reg_lock);

		err = mv88e6xxx_g1_read(chip, MV88E6XXX_G1_CTL1, &ctl1);

		if (err)

			goto unlock;

		err = mv88e6xxx_g1_read(chip, MV88E6XXX_G1_STS, &reg);

unlock:

		mutex_unlock(&chip->reg_lock);

		if (err)

			goto out;

		ctl1 &= GENMASK(chip->g1_irq.nirqs, 0);

	} while (reg & ctl1);



out:

	return (nhandled > 0 ? IRQ_HANDLED : IRQ_NONE);

}

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

+5 −5
Original line number Diff line number Diff line
@@ -2663,11 +2663,6 @@ static int ena_restore_device(struct ena_adapter *adapter) 
		goto err_device_destroy;

	}



	clear_bit(ENA_FLAG_ONGOING_RESET, &adapter->flags);

	/* Make sure we don't have a race with AENQ Links state handler */

	if (test_bit(ENA_FLAG_LINK_UP, &adapter->flags))

		netif_carrier_on(adapter->netdev);



	rc = ena_enable_msix_and_set_admin_interrupts(adapter,

						      adapter->num_queues);

	if (rc) {
@@ -2684,6 +2679,11 @@ static int ena_restore_device(struct ena_adapter *adapter) 
	}



	set_bit(ENA_FLAG_DEVICE_RUNNING, &adapter->flags);



	clear_bit(ENA_FLAG_ONGOING_RESET, &adapter->flags);

	if (test_bit(ENA_FLAG_LINK_UP, &adapter->flags))

		netif_carrier_on(adapter->netdev);



	mod_timer(&adapter->timer_service, round_jiffies(jiffies + HZ));

	dev_err(&pdev->dev,

		"Device reset completed successfully, Driver info: %s\n",

CRA Git | Maintained and supported by SUSTech CRA and CCSE