Commit e3181f2c 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 IGMP handling wrt VRF, from David Ahern.

 2) Fix timer access to freed object in dccp, from Eric Dumazet.

 3) Use kmalloc_array() in ptr_ring to avoid overflow cases which are
    triggerable by userspace. Also from Eric Dumazet.

 4) Fix infinite loop in unmapping cleanup of nfp driver, from Colin Ian
    King.

 5) Correct datagram peek handling of empty SKBs, from Matthew Dawson.

 6) Fix use after free in TIPC, from Eric Dumazet.

 7) When replacing a route in ipv6 we need to reset the round robin
    pointer, from Wei Wang.

 8) Fix bug in pci_find_pcie_root_port() which was unearthed by the
    relaxed ordering changes, from Thierry Redding. I made sure to get
    an explicit ACK from Bjorn this time around :-)

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (27 commits)
  ipv6: repair fib6 tree in failure case
  net_sched: fix order of queue length updates in qdisc_replace()
  tools lib bpf: improve warning
  switchdev: documentation: minor typo fixes
  bpf, doc: also add s390x as arch to sysctl description
  net: sched: fix NULL pointer dereference when action calls some targets
  rxrpc: Fix oops when discarding a preallocated service call
  irda: do not leak initialized list.dev to userspace
  net/mlx4_core: Enable 4K UAR if SRIOV module parameter is not enabled
  PCI: Allow PCI express root ports to find themselves
  tcp: when rearming RTO, if RTO time is in past then fire RTO ASAP
  net: check and errout if res->fi is NULL when RTM_F_FIB_MATCH is set
  ipv6: reset fn->rr_ptr when replacing route
  sctp: fully initialize the IPv6 address in sctp_v6_to_addr()
  tipc: fix use-after-free
  tun: handle register_netdevice() failures properly
  datagram: When peeking datagrams with offset < 0 don't skip empty skbs
  bpf, doc: improve sysctl knob description
  netxen: fix incorrect loop counter decrement
  nfp: fix infinite loop on umapping cleanup
  ...
parents dd1c1f2f 348a4002

Documentation/networking/switchdev.txt

+2 −2
Original line number Diff line number Diff line
@@ -228,7 +228,7 @@ Learning on the device port should be enabled, as well as learning_sync: 
	bridge link set dev DEV learning on self

	bridge link set dev DEV learning_sync on self



Learning_sync attribute enables syncing of the learned/forgotton FDB entry to

Learning_sync attribute enables syncing of the learned/forgotten FDB entry to

the bridge's FDB.  It's possible, but not optimal, to enable learning on the

device port and on the bridge port, and disable learning_sync.
@@ -245,7 +245,7 @@ the responsibility of the port driver/device to age out these entries. If the 
port device supports ageing, when the FDB entry expires, it will notify the

driver which in turn will notify the bridge with SWITCHDEV_FDB_DEL.  If the

device does not support ageing, the driver can simulate ageing using a

garbage collection timer to monitor FBD entries.  Expired entries will be

garbage collection timer to monitor FDB entries.  Expired entries will be

notified to the bridge using SWITCHDEV_FDB_DEL.  See rocker driver for

example of driver running ageing timer.

Documentation/sysctl/net.txt

+36 −11
Original line number Diff line number Diff line
@@ -35,9 +35,34 @@ Table : Subdirectories in /proc/sys/net 
bpf_jit_enable

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



This enables Berkeley Packet Filter Just in Time compiler.

Currently supported on x86_64 architecture, bpf_jit provides a framework

to speed packet filtering, the one used by tcpdump/libpcap for example.

This enables the BPF Just in Time (JIT) compiler. BPF is a flexible

and efficient infrastructure allowing to execute bytecode at various

hook points. It is used in a number of Linux kernel subsystems such

as networking (e.g. XDP, tc), tracing (e.g. kprobes, uprobes, tracepoints)

and security (e.g. seccomp). LLVM has a BPF back end that can compile

restricted C into a sequence of BPF instructions. After program load

through bpf(2) and passing a verifier in the kernel, a JIT will then

translate these BPF proglets into native CPU instructions. There are

two flavors of JITs, the newer eBPF JIT currently supported on:

  - x86_64

  - arm64

  - ppc64

  - sparc64

  - mips64

  - s390x



And the older cBPF JIT supported on the following archs:

  - arm

  - mips

  - ppc

  - sparc



eBPF JITs are a superset of cBPF JITs, meaning the kernel will

migrate cBPF instructions into eBPF instructions and then JIT

compile them transparently. Older cBPF JITs can only translate

tcpdump filters, seccomp rules, etc, but not mentioned eBPF

programs loaded through bpf(2).



Values :

	0 - disable the JIT (default value)

	1 - enable the JIT
@@ -46,9 +71,9 @@ Values : 
bpf_jit_harden

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



This enables hardening for the Berkeley Packet Filter Just in Time compiler.

Supported are eBPF JIT backends. Enabling hardening trades off performance,

but can mitigate JIT spraying.

This enables hardening for the BPF JIT compiler. Supported are eBPF

JIT backends. Enabling hardening trades off performance, but can

mitigate JIT spraying.

Values :

	0 - disable JIT hardening (default value)

	1 - enable JIT hardening for unprivileged users only
@@ -57,11 +82,11 @@ Values : 
bpf_jit_kallsyms

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



When Berkeley Packet Filter Just in Time compiler is enabled, then compiled

images are unknown addresses to the kernel, meaning they neither show up in

traces nor in /proc/kallsyms. This enables export of these addresses, which

can be used for debugging/tracing. If bpf_jit_harden is enabled, this feature

is disabled.

When BPF JIT compiler is enabled, then compiled images are unknown

addresses to the kernel, meaning they neither show up in traces nor

in /proc/kallsyms. This enables export of these addresses, which can

be used for debugging/tracing. If bpf_jit_harden is enabled, this

feature is disabled.

Values :

	0 - disable JIT kallsyms export (default value)

	1 - enable JIT kallsyms export for privileged users only

drivers/net/ethernet/mellanox/mlx4/main.c

+2 −2
Original line number Diff line number Diff line
@@ -432,7 +432,7 @@ static int mlx4_dev_cap(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap) 
		/* Virtual PCI function needs to determine UAR page size from

		 * firmware. Only master PCI function can set the uar page size

		 */

		if (enable_4k_uar)

		if (enable_4k_uar || !dev->persist->num_vfs)

			dev->uar_page_shift = DEFAULT_UAR_PAGE_SHIFT;

		else

			dev->uar_page_shift = PAGE_SHIFT;
@@ -2277,7 +2277,7 @@ static int mlx4_init_hca(struct mlx4_dev *dev) 


		dev->caps.max_fmr_maps = (1 << (32 - ilog2(dev->caps.num_mpts))) - 1;



		if (enable_4k_uar) {

		if (enable_4k_uar || !dev->persist->num_vfs) {

			init_hca.log_uar_sz = ilog2(dev->caps.num_uars) +

						    PAGE_SHIFT - DEFAULT_UAR_PAGE_SHIFT;

			init_hca.uar_page_sz = DEFAULT_UAR_PAGE_SHIFT - 12;

drivers/net/ethernet/netronome/nfp/nfp_net_common.c

+1 −2
Original line number Diff line number Diff line
@@ -908,8 +908,7 @@ static int nfp_net_tx(struct sk_buff *skb, struct net_device *netdev) 
	return NETDEV_TX_OK;



err_unmap:

	--f;

	while (f >= 0) {

	while (--f >= 0) {

		frag = &skb_shinfo(skb)->frags[f];

		dma_unmap_page(dp->dev, tx_ring->txbufs[wr_idx].dma_addr,

			       skb_frag_size(frag), DMA_TO_DEVICE);

drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c

+1 −1
Original line number Diff line number Diff line
@@ -2311,7 +2311,7 @@ netxen_md_rdqueue(struct netxen_adapter *adapter, 
				 loop_cnt++) {

		NX_WR_DUMP_REG(select_addr, adapter->ahw.pci_base0, queue_id);

		read_addr = queueEntry->read_addr;

		for (k = 0; k < read_cnt; k--) {

		for (k = 0; k < read_cnt; k++) {

			NX_RD_DUMP_REG(read_addr, adapter->ahw.pci_base0,

							&read_value);

			*data_buff++ = read_value;

CRA Git | Maintained and supported by SUSTech CRA and CCSE