Skip to content

Commit e9ef1fe

Browse files
torvaldstorvalds
committed
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Pull networking fixes from David Miller: 1) CAN fixes from Martin Kelly (cancel URBs properly in all the CAN usb drivers). 2) Revert returning -EEXIST from __dev_alloc_name() as this propagates to userspace and broke some apps. From Johannes Berg. 3) Fix conn memory leaks and crashes in TIPC, from Jon Malloc and Cong Wang. 4) Gianfar MAC can't do EEE so don't advertise it by default, from Claudiu Manoil. 5) Relax strict netlink attribute validation, but emit a warning. From David Ahern. 6) Fix regression in checksum offload of thunderx driver, from Florian Westphal. 7) Fix UAPI bpf issues on s390, from Hendrik Brueckner. 8) New card support in iwlwifi, from Ihab Zhaika. 9) BBR congestion control bug fixes from Neal Cardwell. 10) Fix port stats in nfp driver, from Pieter Jansen van Vuuren. 11) Fix leaks in qualcomm rmnet, from Subash Abhinov Kasiviswanathan. 12) Fix DMA API handling in sh_eth driver, from Thomas Petazzoni. 13) Fix spurious netpoll warnings in bnxt_en, from Calvin Owens. * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (67 commits) net: mvpp2: fix the RSS table entry offset tcp: evaluate packet losses upon RTT change tcp: fix off-by-one bug in RACK tcp: always evaluate losses in RACK upon undo tcp: correctly test congestion state in RACK bnxt_en: Fix sources of spurious netpoll warnings tcp_bbr: reset long-term bandwidth sampling on loss recovery undo tcp_bbr: reset full pipe detection on loss recovery undo tcp_bbr: record "full bw reached" decision in new full_bw_reached bit sfc: pass valid pointers from efx_enqueue_unwind gianfar: Disable EEE autoneg by default tcp: invalidate rate samples during SACK reneging can: peak/pcie_fd: fix potential bug in restarting tx queue can: usb_8dev: cancel urb on -EPIPE and -EPROTO can: kvaser_usb: cancel urb on -EPIPE and -EPROTO can: esd_usb2: cancel urb on -EPIPE and -EPROTO can: ems_usb: cancel urb on -EPIPE and -EPROTO can: mcba_usb: cancel urb on -EPROTO usbnet: fix alignment for frames with no ethernet header tcp: use current time in tcp_rcv_space_adjust() ...
2 parents 77071bc + fd29117 commit e9ef1fe

File tree

113 files changed

+1052
-367
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

113 files changed

+1052
-367
lines changed

‎arch/alpha/include/uapi/asm/Kbuild

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
# UAPI Header export list
22
include include/uapi/asm-generic/Kbuild.asm
3+
4+
generic-y += bpf_perf_event.h

‎arch/arc/include/uapi/asm/Kbuild

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ include include/uapi/asm-generic/Kbuild.asm
33

44
generic-y += auxvec.h
55
generic-y += bitsperlong.h
6+
generic-y += bpf_perf_event.h
67
generic-y += errno.h
78
generic-y += fcntl.h
89
generic-y += ioctl.h

‎arch/arm/include/uapi/asm/Kbuild

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ generated-y += unistd-oabi.h
77
generated-y += unistd-eabi.h
88

99
generic-y += bitsperlong.h
10+
generic-y += bpf_perf_event.h
1011
generic-y += errno.h
1112
generic-y += ioctl.h
1213
generic-y += ipcbuf.h

‎arch/arm64/include/asm/perf_event.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#define __ASM_PERF_EVENT_H
1919

2020
#include <asm/stack_pointer.h>
21+
#include <asm/ptrace.h>
2122

2223
#define ARMV8_PMU_MAX_COUNTERS 32
2324
#define ARMV8_PMU_COUNTER_MASK (ARMV8_PMU_MAX_COUNTERS - 1)
@@ -79,6 +80,7 @@ struct pt_regs;
7980
extern unsigned long perf_instruction_pointer(struct pt_regs *regs);
8081
extern unsigned long perf_misc_flags(struct pt_regs *regs);
8182
#define perf_misc_flags(regs) perf_misc_flags(regs)
83+
#define perf_arch_bpf_user_pt_regs(regs) &regs->user_regs
8284
#endif
8385

8486
#define perf_arch_fetch_caller_regs(regs, __ip) { \

‎arch/arm64/include/uapi/asm/bpf_perf_event.h

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
/* SPDX-License-Identifier: GPL-2.0 */
2+
#ifndef _UAPI__ASM_BPF_PERF_EVENT_H__
3+
#define _UAPI__ASM_BPF_PERF_EVENT_H__
4+
5+
#include <asm/ptrace.h>
6+
7+
typedef struct user_pt_regs bpf_user_pt_regs_t;
8+
9+
#endif /* _UAPI__ASM_BPF_PERF_EVENT_H__ */

‎arch/blackfin/include/uapi/asm/Kbuild

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ include include/uapi/asm-generic/Kbuild.asm
33

44
generic-y += auxvec.h
55
generic-y += bitsperlong.h
6+
generic-y += bpf_perf_event.h
67
generic-y += errno.h
78
generic-y += ioctl.h
89
generic-y += ipcbuf.h

‎arch/c6x/include/uapi/asm/Kbuild

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ include include/uapi/asm-generic/Kbuild.asm
33

44
generic-y += auxvec.h
55
generic-y += bitsperlong.h
6+
generic-y += bpf_perf_event.h
67
generic-y += errno.h
78
generic-y += fcntl.h
89
generic-y += ioctl.h

‎arch/cris/include/uapi/asm/Kbuild

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ include include/uapi/asm-generic/Kbuild.asm
33

44
generic-y += auxvec.h
55
generic-y += bitsperlong.h
6+
generic-y += bpf_perf_event.h
67
generic-y += errno.h
78
generic-y += fcntl.h
89
generic-y += ioctl.h

‎arch/frv/include/uapi/asm/Kbuild

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
# UAPI Header export list
22
include include/uapi/asm-generic/Kbuild.asm
3+
4+
generic-y += bpf_perf_event.h

‎arch/h8300/include/uapi/asm/Kbuild

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
include include/uapi/asm-generic/Kbuild.asm
33

44
generic-y += auxvec.h
5+
generic-y += bpf_perf_event.h
56
generic-y += errno.h
67
generic-y += fcntl.h
78
generic-y += ioctl.h

‎arch/hexagon/include/uapi/asm/Kbuild

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
include include/uapi/asm-generic/Kbuild.asm
33

44
generic-y += auxvec.h
5+
generic-y += bpf_perf_event.h
56
generic-y += errno.h
67
generic-y += fcntl.h
78
generic-y += ioctl.h

‎arch/ia64/include/uapi/asm/Kbuild

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# UAPI Header export list
22
include include/uapi/asm-generic/Kbuild.asm
33

4+
generic-y += bpf_perf_event.h
45
generic-y += kvm_para.h

‎arch/m32r/include/uapi/asm/Kbuild

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# UAPI Header export list
22
include include/uapi/asm-generic/Kbuild.asm
33

4+
generic-y += bpf_perf_event.h
45
generic-y += kvm_para.h
56
generic-y += siginfo.h

‎arch/m68k/include/uapi/asm/Kbuild

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ include include/uapi/asm-generic/Kbuild.asm
33

44
generic-y += auxvec.h
55
generic-y += bitsperlong.h
6+
generic-y += bpf_perf_event.h
67
generic-y += errno.h
78
generic-y += ioctl.h
89
generic-y += ipcbuf.h

‎arch/metag/include/uapi/asm/Kbuild

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ include include/uapi/asm-generic/Kbuild.asm
33

44
generic-y += auxvec.h
55
generic-y += bitsperlong.h
6+
generic-y += bpf_perf_event.h
67
generic-y += errno.h
78
generic-y += fcntl.h
89
generic-y += ioctl.h

‎arch/microblaze/include/uapi/asm/Kbuild

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
include include/uapi/asm-generic/Kbuild.asm
33

44
generic-y += bitsperlong.h
5+
generic-y += bpf_perf_event.h
56
generic-y += errno.h
67
generic-y += fcntl.h
78
generic-y += ioctl.h

‎arch/mips/include/uapi/asm/Kbuild

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# UAPI Header export list
22
include include/uapi/asm-generic/Kbuild.asm
33

4+
generic-y += bpf_perf_event.h
45
generic-y += ipcbuf.h

‎arch/mn10300/include/uapi/asm/Kbuild

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# UAPI Header export list
22
include include/uapi/asm-generic/Kbuild.asm
33

4+
generic-y += bpf_perf_event.h
45
generic-y += siginfo.h

‎arch/nios2/include/uapi/asm/Kbuild

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ include include/uapi/asm-generic/Kbuild.asm
33

44
generic-y += auxvec.h
55
generic-y += bitsperlong.h
6+
generic-y += bpf_perf_event.h
67
generic-y += errno.h
78
generic-y += fcntl.h
89
generic-y += ioctl.h

‎arch/openrisc/include/uapi/asm/Kbuild

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ include include/uapi/asm-generic/Kbuild.asm
33

44
generic-y += auxvec.h
55
generic-y += bitsperlong.h
6+
generic-y += bpf_perf_event.h
67
generic-y += errno.h
78
generic-y += fcntl.h
89
generic-y += ioctl.h

‎arch/parisc/include/uapi/asm/Kbuild

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
include include/uapi/asm-generic/Kbuild.asm
33

44
generic-y += auxvec.h
5+
generic-y += bpf_perf_event.h
56
generic-y += kvm_para.h
67
generic-y += param.h
78
generic-y += poll.h

‎arch/powerpc/include/uapi/asm/Kbuild

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# UAPI Header export list
22
include include/uapi/asm-generic/Kbuild.asm
33

4+
generic-y += bpf_perf_event.h
45
generic-y += param.h
56
generic-y += poll.h
67
generic-y += resource.h

‎arch/riscv/include/uapi/asm/Kbuild

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ include include/uapi/asm-generic/Kbuild.asm
33

44
generic-y += setup.h
55
generic-y += unistd.h
6+
generic-y += bpf_perf_event.h
67
generic-y += errno.h
78
generic-y += fcntl.h
89
generic-y += ioctl.h

‎arch/s390/include/asm/perf_event.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ struct pt_regs;
4040
extern unsigned long perf_instruction_pointer(struct pt_regs *regs);
4141
extern unsigned long perf_misc_flags(struct pt_regs *regs);
4242
#define perf_misc_flags(regs) perf_misc_flags(regs)
43+
#define perf_arch_bpf_user_pt_regs(regs) &regs->user_regs
4344

4445
/* Perf pt_regs extension for sample-data-entry indicators */
4546
struct perf_sf_sde_regs {

‎arch/s390/include/asm/ptrace.h

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,14 @@ enum {
7474
*/
7575
struct pt_regs
7676
{
77-
unsigned long args[1];
78-
psw_t psw;
79-
unsigned long gprs[NUM_GPRS];
77+
union {
78+
user_pt_regs user_regs;
79+
struct {
80+
unsigned long args[1];
81+
psw_t psw;
82+
unsigned long gprs[NUM_GPRS];
83+
};
84+
};
8085
unsigned long orig_gpr2;
8186
unsigned int int_code;
8287
unsigned int int_parm;

‎arch/s390/include/uapi/asm/bpf_perf_event.h

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
/* SPDX-License-Identifier: GPL-2.0 */
2+
#ifndef _UAPI__ASM_BPF_PERF_EVENT_H__
3+
#define _UAPI__ASM_BPF_PERF_EVENT_H__
4+
5+
#include <asm/ptrace.h>
6+
7+
typedef user_pt_regs bpf_user_pt_regs_t;
8+
9+
#endif /* _UAPI__ASM_BPF_PERF_EVENT_H__ */

0 commit comments

Comments
 (0)