Commit 6279d812 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'net-5.11-rc3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 

Pull more networking fixes from Jakub Kicinski:
 "Slightly lighter pull request to get back into the Thursday cadence.

  Current release - always broken:

   - can: mcp251xfd: fix Tx/Rx ring buffer driver race conditions

   - dsa: hellcreek: fix led_classdev build errors

  Previous releases - regressions:

   - ipv6: fib: flush exceptions when purging route to avoid netdev
     reference leak

   - ip_tunnels: fix pmtu check in nopmtudisc mode

   - ip: always refragment ip defragmented packets to avoid MTU issues
     when forwarding through tunnels, correct "packet too big" message
     is prohibitively tricky to generate

   - s390/qeth: fix locking for discipline setup / removal and during
     recovery to prevent both deadlocks and races

   - mlx5: Use port_num 1 instead of 0 when delete a RoCE address

  Previous releases - always broken:

   - cdc_ncm: correct overhead calculation in delayed_ndp_size to
     prevent out of bound accesses with Huawei 909s-120 LTE module

   - fix stmmac dwmac-sun8i suspend/resume:
           - PHY being left powered off
           - MAC syscon configuration being reset
           - reference to the reset controller being improperly dropped

   - qrtr: fix null-ptr-deref in qrtr_ns_remove

   - can: tcan4x5x: fix bittiming const, use common bittiming from m_can
     driver

   - mlx5e: CT: Use per flow counter when CT flow accounting is enabled

   - mlx5e: Fix SWP offsets when vlan inserted by driver

  Misc:

   - bpf: Fix a task_iter bug caused by a bpf -> net merge conflict
     resolution

  And the usual many fixes to various error paths"

* tag 'net-5.11-rc3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (69 commits)
  net: dsa: lantiq_gswip: Exclude RMII from modes that report 1 GbE
  s390/qeth: fix L2 header access in qeth_l3_osa_features_check()
  s390/qeth: fix locking for discipline setup / removal
  s390/qeth: fix deadlock during recovery
  selftests: fib_nexthops: Fix wrong mausezahn invocation
  nexthop: Bounce NHA_GATEWAY in FDB nexthop groups
  nexthop: Unlink nexthop group entry in error path
  nexthop: Fix off-by-one error in error path
  octeontx2-af: fix memory leak of lmac and lmac->name
  chtls: Fix chtls resources release sequence
  chtls: Added a check to avoid NULL pointer dereference
  chtls: Replace skb_dequeue with skb_peek
  chtls: Avoid unnecessary freeing of oreq pointer
  chtls: Fix panic when route to peer not configured
  chtls: Remove invalid set_tcb call
  chtls: Fix hardware tid leak
  net: ip: always refragment ip defragmented packets
  net: fix pmtu check in nopmtudisc mode
  selftests: netfilter: add selftest for ipip pmtu discovery with enabled connection tracking
  docs: octeontx2: tune rst markup
  ...
parents ea1c87c1 220efcf9

Documentation/networking/device_drivers/ethernet/marvell/octeontx2.rst

+36 −26
Original line number Diff line number Diff line
@@ -164,20 +164,28 @@ Devlink health reporters 


NPA Reporters

-------------

The NPA reporters are responsible for reporting and recovering the following group of errors

The NPA reporters are responsible for reporting and recovering the following group of errors:



1. GENERAL events



   - Error due to operation of unmapped PF.

   - Error due to disabled alloc/free for other HW blocks (NIX, SSO, TIM, DPI and AURA).



2. ERROR events



   - Fault due to NPA_AQ_INST_S read or NPA_AQ_RES_S write.

   - AQ Doorbell Error.



3. RAS events



   - RAS Error Reporting for NPA_AQ_INST_S/NPA_AQ_RES_S.



4. RVU events



   - Error due to unmapped slot.



Sample Output

-------------

Sample Output::



	~# devlink health

	pci/0002:01:00.0:

	  reporter hw_npa_intr
@@ -190,11 +198,13 @@ pci/0002:01:00.0: 
	      state healthy error 0 recover 0 last_dump_date 2020-12-10 last_dump_time 09:32:40 grace_period 0 auto_recover true auto_dump true



Each reporter dumps the



 - Error Type

 - Error Register value

 - Reason in words



For eg:

For example::



	~# devlink health dump show  pci/0002:01:00.0 reporter hw_npa_gen

	 NPA_AF_GENERAL:

	         NPA General Interrupt Reg : 1

Documentation/networking/netdevices.rst

+2 −2
Original line number Diff line number Diff line
@@ -64,8 +64,8 @@ ndo_do_ioctl: 
	Context: process



ndo_get_stats:

	Synchronization: dev_base_lock rwlock.

	Context: nominally process, but don't sleep inside an rwlock

	Synchronization: rtnl_lock() semaphore, dev_base_lock rwlock, or RCU.

	Context: atomic (can't sleep under rwlock or RCU)



ndo_start_xmit:

	Synchronization: __netif_tx_lock spinlock.

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -10847,7 +10847,7 @@ F: drivers/media/radio/radio-maxiradio* 








MCAN MMIO DEVICE DRIVER









M:	Dan Murphy <dmurphy@ti.com>









M:	Sriram Dash <sriram.dash@samsung.com>









M:	Pankaj Sharma <pankj.sharma@samsung.com>









L:	linux-can@vger.kernel.org









S:	Maintained









F:	Documentation/devicetree/bindings/net/can/bosch,m_can.yaml
































drivers/isdn/mISDN/Kconfig



+1
−0






























Original line number
Diff line number
Diff line







@@ -13,6 +13,7 @@ if MISDN != n







config MISDN_DSP









	tristate "Digital Audio Processing of transparent data"









	depends on MISDN









	select BITREVERSE









	help









	  Enable support for digital audio processing capability.










































drivers/net/bareudp.c



+14
−8






























Original line number
Diff line number
Diff line







@@ -645,11 +645,20 @@ static int bareudp_link_config(struct net_device *dev,







	return 0;









}



















static void bareudp_dellink(struct net_device *dev, struct list_head *head)









{









	struct bareudp_dev *bareudp = netdev_priv(dev);



















	list_del(&bareudp->next);









	unregister_netdevice_queue(dev, head);









}



















static int bareudp_newlink(struct net *net, struct net_device *dev,









			   struct nlattr *tb[], struct nlattr *data[],









			   struct netlink_ext_ack *extack)









{









	struct bareudp_conf conf;









	LIST_HEAD(list_kill);









	int err;



















	err = bareudp2info(data, &conf, extack);








@@ -662,17 +671,14 @@ static int bareudp_newlink(struct net *net, struct net_device *dev,

















	err = bareudp_link_config(dev, tb);









	if (err)









		return err;









		goto err_unconfig;



















	return 0;









}



















static void bareudp_dellink(struct net_device *dev, struct list_head *head)









{









	struct bareudp_dev *bareudp = netdev_priv(dev);



















	list_del(&bareudp->next);









	unregister_netdevice_queue(dev, head);









err_unconfig:









	bareudp_dellink(dev, &list_kill);









	unregister_netdevice_many(&list_kill);









	return err;









}



















static size_t bareudp_get_size(const struct net_device *dev)