Commit a1d21081 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:
 "Some merge window fallout, some longer term fixes:

   1) Handle headroom properly in lapbether and x25_asy drivers, from
      Xie He.

   2) Fetch MAC address from correct r8152 device node, from Thierry
      Reding.

   3) In the sw kTLS path we should allow MSG_CMSG_COMPAT in sendmsg,
      from Rouven Czerwinski.

   4) Correct fdputs in socket layer, from Miaohe Lin.

   5) Revert troublesome sockptr_t optimization, from Christoph Hellwig.

   6) Fix TCP TFO key reading on big endian, from Jason Baron.

   7) Missing CAP_NET_RAW check in nfc, from Qingyu Li.

   8) Fix inet fastreuse optimization with tproxy sockets, from Tim
      Froidcoeur.

   9) Fix 64-bit divide in new SFC driver, from Edward Cree.

  10) Add a tracepoint for prandom_u32 so that we can more easily
      perform usage analysis. From Eric Dumazet.

  11) Fix rwlock imbalance in AF_PACKET, from John Ogness"

* git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (49 commits)
  net: openvswitch: introduce common code for flushing flows
  af_packet: TPACKET_V3: fix fill status rwlock imbalance
  random32: add a tracepoint for prandom_u32()
  Revert "ipv4: tunnel: fix compilation on ARCH=um"
  net: accept an empty mask in /sys/class/net/*/queues/rx-*/rps_cpus
  net: ethernet: stmmac: Disable hardware multicast filter
  net: stmmac: dwmac1000: provide multicast filter fallback
  ipv4: tunnel: fix compilation on ARCH=um
  vsock: fix potential null pointer dereference in vsock_poll()
  sfc: fix ef100 design-param checking
  net: initialize fastreuse on inet_inherit_port
  net: refactor bind_bucket fastreuse into helper
  net: phy: marvell10g: fix null pointer dereference
  net: Fix potential memory leak in proto_register()
  net: qcom/emac: add missed clk_disable_unprepare in error path of emac_clks_phase1_init
  ionic_lif: Use devm_kcalloc() in ionic_qcq_alloc()
  net/nfc/rawsock.c: add CAP_NET_RAW check.
  hinic: fix strncpy output truncated compile warnings
  drivers/net/wan/x25_asy: Added needed_headroom and a skb->len check
  net/tls: Fix kmap usage
  ...
parents e764a1e3 1f3a090b

Documentation/bpf/bpf_design_QA.rst

+0 −11
Original line number Diff line number Diff line
@@ -246,17 +246,6 @@ program is loaded the kernel will print warning message, so 
this helper is only useful for experiments and prototypes.

Tracing BPF programs are root only.



Q: bpf_trace_printk() helper warning

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

Q: When bpf_trace_printk() helper is used the kernel prints nasty

warning message. Why is that?



A: This is done to nudge program authors into better interfaces when

programs need to pass data to user space. Like bpf_perf_event_output()

can be used to efficiently stream data via perf ring buffer.

BPF maps can be used for asynchronous data sharing between kernel

and user space. bpf_trace_printk() should only be used for debugging.



Q: New functionality via kernel modules?

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

Q: Can BPF functionality such as new program or map types, new

MAINTAINERS

+2 −1
Original line number Diff line number Diff line
@@ -11986,7 +11986,8 @@ F: include/uapi/linux/netrom.h 
F:	net/netrom/









NETRONOME ETHERNET DRIVERS









M:	Jakub Kicinski <kuba@kernel.org>









M:	Simon Horman <simon.horman@netronome.com>









R:	Jakub Kicinski <kuba@kernel.org>









L:	oss-drivers@netronome.com









S:	Maintained









F:	drivers/net/ethernet/netronome/
































drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -1728,7 +1728,7 @@ static int hclgevf_reset_wait(struct hclgevf_dev *hdev)







	/* hardware completion status should be available by this time */









	if (ret) {









		dev_err(&hdev->pdev->dev,









			"could'nt get reset done status from h/w, timeout!\n");









			"couldn't get reset done status from h/w, timeout!\n");









		return ret;









	}










































drivers/net/ethernet/huawei/hinic/hinic_devlink.c



+12
−20






























Original line number
Diff line number
Diff line







@@ -334,19 +334,14 @@ void hinic_devlink_unregister(struct hinic_devlink_priv *priv)







static int chip_fault_show(struct devlink_fmsg *fmsg,









			   struct hinic_fault_event *event)









{









	char fault_level[FAULT_TYPE_MAX][FAULT_SHOW_STR_LEN + 1] = {









		"fatal", "reset", "flr", "general", "suggestion"};









	char level_str[FAULT_SHOW_STR_LEN + 1] = {0};









	u8 level;









	const char * const level_str[FAULT_LEVEL_MAX + 1] = {









		"fatal", "reset", "flr", "general", "suggestion", "Unknown"};









	u8 fault_level;









	int err;



















	level = event->event.chip.err_level;









	if (level < FAULT_LEVEL_MAX)









		strncpy(level_str, fault_level[level], strlen(fault_level[level]));









	else









		strncpy(level_str, "Unknown", strlen("Unknown"));



















	if (level == FAULT_LEVEL_SERIOUS_FLR) {









	fault_level = (event->event.chip.err_level < FAULT_LEVEL_MAX) ?









		event->event.chip.err_level : FAULT_LEVEL_MAX;









	if (fault_level == FAULT_LEVEL_SERIOUS_FLR) {









		err = devlink_fmsg_u32_pair_put(fmsg, "Function level err func_id",









						(u32)event->event.chip.func_id);









		if (err)








@@ -361,7 +356,7 @@ static int chip_fault_show(struct devlink_fmsg *fmsg,







	if (err)









		return err;



















	err = devlink_fmsg_string_pair_put(fmsg, "err_level", level_str);









	err = devlink_fmsg_string_pair_put(fmsg, "err_level", level_str[fault_level]);









	if (err)









		return err;


















@@ -381,18 +376,15 @@ static int chip_fault_show(struct devlink_fmsg *fmsg,







static int fault_report_show(struct devlink_fmsg *fmsg,









			     struct hinic_fault_event *event)









{









	char fault_type[FAULT_TYPE_MAX][FAULT_SHOW_STR_LEN + 1] = {









	const char * const type_str[FAULT_TYPE_MAX + 1] = {









		"chip", "ucode", "mem rd timeout", "mem wr timeout",









		"reg rd timeout", "reg wr timeout", "phy fault"};









	char type_str[FAULT_SHOW_STR_LEN + 1] = {0};









		"reg rd timeout", "reg wr timeout", "phy fault", "Unknown"};









	u8 fault_type;









	int err;



















	if (event->type < FAULT_TYPE_MAX)









		strncpy(type_str, fault_type[event->type], strlen(fault_type[event->type]));









	else









		strncpy(type_str, "Unknown", strlen("Unknown"));









	fault_type = (event->type < FAULT_TYPE_MAX) ? event->type : FAULT_TYPE_MAX;



















	err = devlink_fmsg_string_pair_put(fmsg, "Fault type", type_str);









	err = devlink_fmsg_string_pair_put(fmsg, "Fault type", type_str[fault_type]);









	if (err)









		return err;










































drivers/net/ethernet/huawei/hinic/hinic_hw_dev.h



+0
−2






























Original line number
Diff line number
Diff line







@@ -504,8 +504,6 @@ enum hinic_fault_type {







	FAULT_TYPE_MAX,









};



















#define FAULT_SHOW_STR_LEN 16



















enum hinic_fault_err_level {









	FAULT_LEVEL_FATAL,









	FAULT_LEVEL_SERIOUS_RESET,








































































CRA Git | Maintained and supported by SUSTech CRA and CCSE