lael-labs/linux

include/uapi/asm-generic/Kbuildrenamed from include/uapi/asm-generic/Kbuild.asm+3−1

@@ -1,6 +1,8 @@
		1	# SPDX-License-Identifier: GPL-2.0
1	#	2	#
2	# Headers that are mandatory in usr/include/asm/	3	# Headers that are mandatory in usr/include/asm/
3	#	4	# (This file is not included when SRCARCH=um since UML does not support UAPI.)
		5
4	mandatory-y += auxvec.h	6	mandatory-y += auxvec.h
5	mandatory-y += bitsperlong.h	7	mandatory-y += bitsperlong.h
6	mandatory-y += bpf_perf_event.h	8	mandatory-y += bpf_perf_event.h

include/uapi/asm-generic/mman-common.h+1−3

 #define PROT_GROWSDOWN	0x01000000	/* mprotect flag: extend change to start of growsdown vma */
 #define PROT_GROWSUP	0x02000000	/* mprotect flag: extend change to end of growsup vma */
-#define MAP_SHARED	0x01		/* Share changes */
+/* 0x01 - 0x03 are defined in linux/mman.h */
-#define MAP_PRIVATE	0x02		/* Changes are private */
-#define MAP_SHARED_VALIDATE 0x03	/* share + validate extension flags */
 #define MAP_TYPE	0x0f		/* Mask for type of mapping */
 #define MAP_FIXED	0x10		/* Interpret addr exactly */
 #define MAP_ANONYMOUS	0x20		/* don't use a file */

include/uapi/asm-generic/socket.h+41−9

 #ifndef __ASM_GENERIC_SOCKET_H
 #define __ASM_GENERIC_SOCKET_H
+#include <linux/posix_types.h>
 #include <asm/sockios.h>
 /* For setsockopt(2) */
 #define SO_PEERCRED	17
 #define SO_RCVLOWAT	18
 #define SO_SNDLOWAT	19
-#define SO_RCVTIMEO	20
+#define SO_RCVTIMEO_OLD	20
-#define SO_SNDTIMEO	21
+#define SO_SNDTIMEO_OLD	21
 #endif
 /* Security levels - as per NRL IPv6 - don't actually do anything */
 #define SO_GET_FILTER		SO_ATTACH_FILTER
 #define SO_PEERNAME		28
-#define SO_TIMESTAMP		29
-#define SCM_TIMESTAMP		SO_TIMESTAMP
 #define SO_ACCEPTCONN		30
 #define SO_PEERSEC		31
 #define SO_PASSSEC		34
-#define SO_TIMESTAMPNS		35
-#define SCM_TIMESTAMPNS		SO_TIMESTAMPNS
 #define SO_MARK			36
-#define SO_TIMESTAMPING		37
-#define SCM_TIMESTAMPING	SO_TIMESTAMPING
 #define SO_PROTOCOL		38
 #define SO_DOMAIN		39
 #define SO_TXTIME		61
 #define SCM_TXTIME		SO_TXTIME
+#define SO_BINDTOIFINDEX	62
+#define SO_TIMESTAMP_OLD        29
+#define SO_TIMESTAMPNS_OLD      35
+#define SO_TIMESTAMPING_OLD     37
+#define SO_TIMESTAMP_NEW        63
+#define SO_TIMESTAMPNS_NEW      64
+#define SO_TIMESTAMPING_NEW     65
+#define SO_RCVTIMEO_NEW         66
+#define SO_SNDTIMEO_NEW         67
+#if !defined(__KERNEL__)
+#if __BITS_PER_LONG == 64 || (defined(__x86_64__) && defined(__ILP32__))
+/* on 64-bit and x32, avoid the ?: operator */
+#define SO_TIMESTAMP		SO_TIMESTAMP_OLD
+#define SO_TIMESTAMPNS		SO_TIMESTAMPNS_OLD
+#define SO_TIMESTAMPING		SO_TIMESTAMPING_OLD
+#define SO_RCVTIMEO		SO_RCVTIMEO_OLD
+#define SO_SNDTIMEO		SO_SNDTIMEO_OLD
+#else
+#define SO_TIMESTAMP (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMP_OLD : SO_TIMESTAMP_NEW)
+#define SO_TIMESTAMPNS (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPNS_OLD : SO_TIMESTAMPNS_NEW)
+#define SO_TIMESTAMPING (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPING_OLD : SO_TIMESTAMPING_NEW)
+#define SO_RCVTIMEO (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_RCVTIMEO_OLD : SO_RCVTIMEO_NEW)
+#define SO_SNDTIMEO (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_SNDTIMEO_OLD : SO_SNDTIMEO_NEW)
+#endif
+#define SCM_TIMESTAMP           SO_TIMESTAMP
+#define SCM_TIMESTAMPNS         SO_TIMESTAMPNS
+#define SCM_TIMESTAMPING        SO_TIMESTAMPING
+#endif
 #endif /* __ASM_GENERIC_SOCKET_H */

include/uapi/asm-generic/unistd.h+125−33

 __SC_COMP(__NR_io_submit, sys_io_submit, compat_sys_io_submit)
 #define __NR_io_cancel 3
 __SYSCALL(__NR_io_cancel, sys_io_cancel)
+#if defined(__ARCH_WANT_TIME32_SYSCALLS) || __BITS_PER_LONG != 32
 #define __NR_io_getevents 4
-__SC_COMP(__NR_io_getevents, sys_io_getevents, compat_sys_io_getevents)
+__SC_3264(__NR_io_getevents, sys_io_getevents_time32, sys_io_getevents)
+#endif
 /* fs/xattr.c */
 #define __NR_setxattr 5
 #define __NR_fchown 55
 __SYSCALL(__NR_fchown, sys_fchown)
 #define __NR_openat 56
-__SC_COMP(__NR_openat, sys_openat, compat_sys_openat)
+__SYSCALL(__NR_openat, sys_openat)
 #define __NR_close 57
 __SYSCALL(__NR_close, sys_close)
 #define __NR_vhangup 58
 __SYSCALL(__NR3264_sendfile, sys_sendfile64)
 /* fs/select.c */
+#if defined(__ARCH_WANT_TIME32_SYSCALLS) || __BITS_PER_LONG != 32
 #define __NR_pselect6 72
-__SC_COMP(__NR_pselect6, sys_pselect6, compat_sys_pselect6)
+__SC_COMP_3264(__NR_pselect6, sys_pselect6_time32, sys_pselect6, compat_sys_pselect6_time32)
 #define __NR_ppoll 73
-__SC_COMP(__NR_ppoll, sys_ppoll, compat_sys_ppoll)
+__SC_COMP_3264(__NR_ppoll, sys_ppoll_time32, sys_ppoll, compat_sys_ppoll_time32)
+#endif
 /* fs/signalfd.c */
 #define __NR_signalfd4 74
 /* fs/timerfd.c */
 #define __NR_timerfd_create 85
 __SYSCALL(__NR_timerfd_create, sys_timerfd_create)
+#if defined(__ARCH_WANT_TIME32_SYSCALLS) || __BITS_PER_LONG != 32
 #define __NR_timerfd_settime 86
-__SC_COMP(__NR_timerfd_settime, sys_timerfd_settime, \
+__SC_3264(__NR_timerfd_settime, sys_timerfd_settime32, \
-	  compat_sys_timerfd_settime)
+	  sys_timerfd_settime)
 #define __NR_timerfd_gettime 87
-__SC_COMP(__NR_timerfd_gettime, sys_timerfd_gettime, \
+__SC_3264(__NR_timerfd_gettime, sys_timerfd_gettime32, \
-	  compat_sys_timerfd_gettime)
+	  sys_timerfd_gettime)
+#endif
 /* fs/utimes.c */
+#if defined(__ARCH_WANT_TIME32_SYSCALLS) || __BITS_PER_LONG != 32
 #define __NR_utimensat 88
-__SC_COMP(__NR_utimensat, sys_utimensat, compat_sys_utimensat)
+__SC_3264(__NR_utimensat, sys_utimensat_time32, sys_utimensat)
+#endif
 /* kernel/acct.c */
 #define __NR_acct 89
 __SYSCALL(__NR_unshare, sys_unshare)
 /* kernel/futex.c */
+#if defined(__ARCH_WANT_TIME32_SYSCALLS) || __BITS_PER_LONG != 32
 #define __NR_futex 98
-__SC_COMP(__NR_futex, sys_futex, compat_sys_futex)
+__SC_3264(__NR_futex, sys_futex_time32, sys_futex)
+#endif
 #define __NR_set_robust_list 99
 __SC_COMP(__NR_set_robust_list, sys_set_robust_list, \
 	  compat_sys_set_robust_list)
 	  compat_sys_get_robust_list)
 /* kernel/hrtimer.c */
+#if defined(__ARCH_WANT_TIME32_SYSCALLS) || __BITS_PER_LONG != 32
 #define __NR_nanosleep 101
-__SC_COMP(__NR_nanosleep, sys_nanosleep, compat_sys_nanosleep)
+__SC_3264(__NR_nanosleep, sys_nanosleep_time32, sys_nanosleep)
+#endif
 /* kernel/itimer.c */
 #define __NR_getitimer 102
 /* kernel/posix-timers.c */
 #define __NR_timer_create 107
 __SC_COMP(__NR_timer_create, sys_timer_create, compat_sys_timer_create)
+#if defined(__ARCH_WANT_TIME32_SYSCALLS) || __BITS_PER_LONG != 32
 #define __NR_timer_gettime 108
-__SC_COMP(__NR_timer_gettime, sys_timer_gettime, compat_sys_timer_gettime)
+__SC_3264(__NR_timer_gettime, sys_timer_gettime32, sys_timer_gettime)
+#endif
 #define __NR_timer_getoverrun 109
 __SYSCALL(__NR_timer_getoverrun, sys_timer_getoverrun)
+#if defined(__ARCH_WANT_TIME32_SYSCALLS) || __BITS_PER_LONG != 32
 #define __NR_timer_settime 110
-__SC_COMP(__NR_timer_settime, sys_timer_settime, compat_sys_timer_settime)
+__SC_3264(__NR_timer_settime, sys_timer_settime32, sys_timer_settime)
+#endif
 #define __NR_timer_delete 111
 __SYSCALL(__NR_timer_delete, sys_timer_delete)
+#if defined(__ARCH_WANT_TIME32_SYSCALLS) || __BITS_PER_LONG != 32
 #define __NR_clock_settime 112
-__SC_COMP(__NR_clock_settime, sys_clock_settime, compat_sys_clock_settime)
+__SC_3264(__NR_clock_settime, sys_clock_settime32, sys_clock_settime)
 #define __NR_clock_gettime 113
-__SC_COMP(__NR_clock_gettime, sys_clock_gettime, compat_sys_clock_gettime)
+__SC_3264(__NR_clock_gettime, sys_clock_gettime32, sys_clock_gettime)
 #define __NR_clock_getres 114
-__SC_COMP(__NR_clock_getres, sys_clock_getres, compat_sys_clock_getres)
+__SC_3264(__NR_clock_getres, sys_clock_getres_time32, sys_clock_getres)
 #define __NR_clock_nanosleep 115
-__SC_COMP(__NR_clock_nanosleep, sys_clock_nanosleep, \
+__SC_3264(__NR_clock_nanosleep, sys_clock_nanosleep_time32, \
-	  compat_sys_clock_nanosleep)
+	  sys_clock_nanosleep)
+#endif
 /* kernel/printk.c */
 #define __NR_syslog 116
 __SYSCALL(__NR_sched_get_priority_max, sys_sched_get_priority_max)
 #define __NR_sched_get_priority_min 126
 __SYSCALL(__NR_sched_get_priority_min, sys_sched_get_priority_min)
+#if defined(__ARCH_WANT_TIME32_SYSCALLS) || __BITS_PER_LONG != 32
 #define __NR_sched_rr_get_interval 127
-__SC_COMP(__NR_sched_rr_get_interval, sys_sched_rr_get_interval, \
+__SC_3264(__NR_sched_rr_get_interval, sys_sched_rr_get_interval_time32, \
-	  compat_sys_sched_rr_get_interval)
+	  sys_sched_rr_get_interval)
+#endif
 /* kernel/signal.c */
 #define __NR_restart_syscall 128
 __SC_COMP(__NR_rt_sigprocmask, sys_rt_sigprocmask, compat_sys_rt_sigprocmask)
 #define __NR_rt_sigpending 136
 __SC_COMP(__NR_rt_sigpending, sys_rt_sigpending, compat_sys_rt_sigpending)
+#if defined(__ARCH_WANT_TIME32_SYSCALLS) || __BITS_PER_LONG != 32
 #define __NR_rt_sigtimedwait 137
-__SC_COMP(__NR_rt_sigtimedwait, sys_rt_sigtimedwait, \
+__SC_COMP_3264(__NR_rt_sigtimedwait, sys_rt_sigtimedwait_time32, \
-	  compat_sys_rt_sigtimedwait)
+	  sys_rt_sigtimedwait, compat_sys_rt_sigtimedwait_time32)
+#endif
 #define __NR_rt_sigqueueinfo 138
 __SC_COMP(__NR_rt_sigqueueinfo, sys_rt_sigqueueinfo, \
 	  compat_sys_rt_sigqueueinfo)
 __SYSCALL(__NR_sethostname, sys_sethostname)
 #define __NR_setdomainname 162
 __SYSCALL(__NR_setdomainname, sys_setdomainname)
+#ifdef __ARCH_WANT_SET_GET_RLIMIT
+/* getrlimit and setrlimit are superseded with prlimit64 */
 #define __NR_getrlimit 163
 __SC_COMP(__NR_getrlimit, sys_getrlimit, compat_sys_getrlimit)
 #define __NR_setrlimit 164
 __SC_COMP(__NR_setrlimit, sys_setrlimit, compat_sys_setrlimit)
+#endif
 #define __NR_getrusage 165
 __SC_COMP(__NR_getrusage, sys_getrusage, compat_sys_getrusage)
 #define __NR_umask 166
 __SYSCALL(__NR_getcpu, sys_getcpu)
 /* kernel/time.c */
+#if defined(__ARCH_WANT_TIME32_SYSCALLS) || __BITS_PER_LONG != 32
 #define __NR_gettimeofday 169
 __SC_COMP(__NR_gettimeofday, sys_gettimeofday, compat_sys_gettimeofday)
 #define __NR_settimeofday 170
 __SC_COMP(__NR_settimeofday, sys_settimeofday, compat_sys_settimeofday)
 #define __NR_adjtimex 171
-__SC_COMP(__NR_adjtimex, sys_adjtimex, compat_sys_adjtimex)
+__SC_3264(__NR_adjtimex, sys_adjtimex_time32, sys_adjtimex)
+#endif
 /* kernel/timer.c */
 #define __NR_getpid 172
 __SC_COMP(__NR_mq_open, sys_mq_open, compat_sys_mq_open)
 #define __NR_mq_unlink 181
 __SYSCALL(__NR_mq_unlink, sys_mq_unlink)
+#if defined(__ARCH_WANT_TIME32_SYSCALLS) || __BITS_PER_LONG != 32
 #define __NR_mq_timedsend 182
-__SC_COMP(__NR_mq_timedsend, sys_mq_timedsend, compat_sys_mq_timedsend)
+__SC_3264(__NR_mq_timedsend, sys_mq_timedsend_time32, sys_mq_timedsend)
 #define __NR_mq_timedreceive 183
-__SC_COMP(__NR_mq_timedreceive, sys_mq_timedreceive, \
+__SC_3264(__NR_mq_timedreceive, sys_mq_timedreceive_time32, \
-	  compat_sys_mq_timedreceive)
+	  sys_mq_timedreceive)
+#endif
 #define __NR_mq_notify 184
 __SC_COMP(__NR_mq_notify, sys_mq_notify, compat_sys_mq_notify)
 #define __NR_mq_getsetattr 185
 __SYSCALL(__NR_semget, sys_semget)
 #define __NR_semctl 191
 __SC_COMP(__NR_semctl, sys_semctl, compat_sys_semctl)
+#if defined(__ARCH_WANT_TIME32_SYSCALLS) || __BITS_PER_LONG != 32
 #define __NR_semtimedop 192
-__SC_COMP(__NR_semtimedop, sys_semtimedop, compat_sys_semtimedop)
+__SC_COMP(__NR_semtimedop, sys_semtimedop, sys_semtimedop_time32)
+#endif
 #define __NR_semop 193
 __SYSCALL(__NR_semop, sys_semop)
 __SYSCALL(__NR_perf_event_open, sys_perf_event_open)
 #define __NR_accept4 242
 __SYSCALL(__NR_accept4, sys_accept4)
+#if defined(__ARCH_WANT_TIME32_SYSCALLS) || __BITS_PER_LONG != 32
 #define __NR_recvmmsg 243
-__SC_COMP(__NR_recvmmsg, sys_recvmmsg, compat_sys_recvmmsg)
+__SC_COMP_3264(__NR_recvmmsg, sys_recvmmsg_time32, sys_recvmmsg, compat_sys_recvmmsg_time32)
+#endif
 /*
  * Architectures may provide up to 16 syscalls of their own
  */
 #define __NR_arch_specific_syscall 244
+#if defined(__ARCH_WANT_TIME32_SYSCALLS) || __BITS_PER_LONG != 32
 #define __NR_wait4 260
 __SC_COMP(__NR_wait4, sys_wait4, compat_sys_wait4)
+#endif
 #define __NR_prlimit64 261
 __SYSCALL(__NR_prlimit64, sys_prlimit64)
 #define __NR_fanotify_init 262
 #define __NR_name_to_handle_at         264
 __SYSCALL(__NR_name_to_handle_at, sys_name_to_handle_at)
 #define __NR_open_by_handle_at         265
-__SC_COMP(__NR_open_by_handle_at, sys_open_by_handle_at, \
+__SYSCALL(__NR_open_by_handle_at, sys_open_by_handle_at)
-	  compat_sys_open_by_handle_at)
+#if defined(__ARCH_WANT_TIME32_SYSCALLS) || __BITS_PER_LONG != 32
 #define __NR_clock_adjtime 266
-__SC_COMP(__NR_clock_adjtime, sys_clock_adjtime, compat_sys_clock_adjtime)
+__SC_3264(__NR_clock_adjtime, sys_clock_adjtime32, sys_clock_adjtime)
+#endif
 #define __NR_syncfs 267
 __SYSCALL(__NR_syncfs, sys_syncfs)
 #define __NR_setns 268
 __SYSCALL(__NR_pkey_free,     sys_pkey_free)
 #define __NR_statx 291
 __SYSCALL(__NR_statx,     sys_statx)
+#if defined(__ARCH_WANT_TIME32_SYSCALLS) || __BITS_PER_LONG != 32
 #define __NR_io_pgetevents 292
-__SC_COMP(__NR_io_pgetevents, sys_io_pgetevents, compat_sys_io_pgetevents)
+__SC_COMP_3264(__NR_io_pgetevents, sys_io_pgetevents_time32, sys_io_pgetevents, compat_sys_io_pgetevents)
+#endif
 #define __NR_rseq 293
 __SYSCALL(__NR_rseq, sys_rseq)
 #define __NR_kexec_file_load 294
 __SYSCALL(__NR_kexec_file_load,     sys_kexec_file_load)
+/* 295 through 402 are unassigned to sync up with generic numbers, don't use */
+#if __BITS_PER_LONG == 32
+#define __NR_clock_gettime64 403
+__SYSCALL(__NR_clock_gettime64, sys_clock_gettime)
+#define __NR_clock_settime64 404
+__SYSCALL(__NR_clock_settime64, sys_clock_settime)
+#define __NR_clock_adjtime64 405
+__SYSCALL(__NR_clock_adjtime64, sys_clock_adjtime)
+#define __NR_clock_getres_time64 406
+__SYSCALL(__NR_clock_getres_time64, sys_clock_getres)
+#define __NR_clock_nanosleep_time64 407
+__SYSCALL(__NR_clock_nanosleep_time64, sys_clock_nanosleep)
+#define __NR_timer_gettime64 408
+__SYSCALL(__NR_timer_gettime64, sys_timer_gettime)
+#define __NR_timer_settime64 409
+__SYSCALL(__NR_timer_settime64, sys_timer_settime)
+#define __NR_timerfd_gettime64 410
+__SYSCALL(__NR_timerfd_gettime64, sys_timerfd_gettime)
+#define __NR_timerfd_settime64 411
+__SYSCALL(__NR_timerfd_settime64, sys_timerfd_settime)
+#define __NR_utimensat_time64 412
+__SYSCALL(__NR_utimensat_time64, sys_utimensat)
+#define __NR_pselect6_time64 413
+__SC_COMP(__NR_pselect6_time64, sys_pselect6, compat_sys_pselect6_time64)
+#define __NR_ppoll_time64 414
+__SC_COMP(__NR_ppoll_time64, sys_ppoll, compat_sys_ppoll_time64)
+#define __NR_io_pgetevents_time64 416
+__SYSCALL(__NR_io_pgetevents_time64, sys_io_pgetevents)
+#define __NR_recvmmsg_time64 417
+__SC_COMP(__NR_recvmmsg_time64, sys_recvmmsg, compat_sys_recvmmsg_time64)
+#define __NR_mq_timedsend_time64 418
+__SYSCALL(__NR_mq_timedsend_time64, sys_mq_timedsend)
+#define __NR_mq_timedreceive_time64 419
+__SYSCALL(__NR_mq_timedreceive_time64, sys_mq_timedreceive)
+#define __NR_semtimedop_time64 420
+__SYSCALL(__NR_semtimedop_time64, sys_semtimedop)
+#define __NR_rt_sigtimedwait_time64 421
+__SC_COMP(__NR_rt_sigtimedwait_time64, sys_rt_sigtimedwait, compat_sys_rt_sigtimedwait_time64)
+#define __NR_futex_time64 422
+__SYSCALL(__NR_futex_time64, sys_futex)
+#define __NR_sched_rr_get_interval_time64 423
+__SYSCALL(__NR_sched_rr_get_interval_time64, sys_sched_rr_get_interval)
+#endif
+#define __NR_pidfd_send_signal 424
+__SYSCALL(__NR_pidfd_send_signal, sys_pidfd_send_signal)
+#define __NR_io_uring_setup 425
+__SYSCALL(__NR_io_uring_setup, sys_io_uring_setup)
+#define __NR_io_uring_enter 426
+__SYSCALL(__NR_io_uring_enter, sys_io_uring_enter)
+#define __NR_io_uring_register 427
+__SYSCALL(__NR_io_uring_register, sys_io_uring_register)
 #undef __NR_syscalls
-#define __NR_syscalls 295
+#define __NR_syscalls 428
 /*
  * 32 bit systems traditionally used different

include/uapi/drm/drm_fourcc.h+29−7

 #define DRM_FORMAT_VYUY		fourcc_code('V', 'Y', 'U', 'Y') /* [31:0] Y1:Cb0:Y0:Cr0 8:8:8:8 little endian */
 #define DRM_FORMAT_AYUV		fourcc_code('A', 'Y', 'U', 'V') /* [31:0] A:Y:Cb:Cr 8:8:8:8 little endian */
-#define DRM_FORMAT_XYUV8888		fourcc_code('X', 'Y', 'U', 'V') /* [31:0] X:Y:Cb:Cr 8:8:8:8 little endian */
+#define DRM_FORMAT_XYUV8888	fourcc_code('X', 'Y', 'U', 'V') /* [31:0] X:Y:Cb:Cr 8:8:8:8 little endian */
+#define DRM_FORMAT_VUY888	fourcc_code('V', 'U', '2', '4') /* [23:0] Cr:Cb:Y 8:8:8 little endian */
+#define DRM_FORMAT_VUY101010	fourcc_code('V', 'U', '3', '0') /* Y followed by U then V, 10:10:10. Non-linear modifier only */
 /*
  * packed Y2xx indicate for each component, xx valid data occupy msb
  * 16-xx padding occupy lsb
  */
-#define DRM_FORMAT_Y210         fourcc_code('Y', '2', '1', '0') /* [63:0] Y0:x:Cb0:x:Y1:x:Cr1:x 10:6:10:6:10:6:10:6 little endian per 2 Y pixels */
+#define DRM_FORMAT_Y210         fourcc_code('Y', '2', '1', '0') /* [63:0] Cr0:0:Y1:0:Cb0:0:Y0:0 10:6:10:6:10:6:10:6 little endian per 2 Y pixels */
-#define DRM_FORMAT_Y212         fourcc_code('Y', '2', '1', '2') /* [63:0] Y0:x:Cb0:x:Y1:x:Cr1:x 12:4:12:4:12:4:12:4 little endian per 2 Y pixels */
+#define DRM_FORMAT_Y212         fourcc_code('Y', '2', '1', '2') /* [63:0] Cr0:0:Y1:0:Cb0:0:Y0:0 12:4:12:4:12:4:12:4 little endian per 2 Y pixels */
-#define DRM_FORMAT_Y216         fourcc_code('Y', '2', '1', '6') /* [63:0] Y0:Cb0:Y1:Cr1 16:16:16:16 little endian per 2 Y pixels */
+#define DRM_FORMAT_Y216         fourcc_code('Y', '2', '1', '6') /* [63:0] Cr0:Y1:Cb0:Y0 16:16:16:16 little endian per 2 Y pixels */
 /*
  * packed Y4xx indicate for each component, xx valid data occupy msb
  * 16-xx padding occupy lsb except Y410
  */
-#define DRM_FORMAT_Y410         fourcc_code('Y', '4', '1', '0') /* [31:0] X:V:Y:U 2:10:10:10 little endian */
+#define DRM_FORMAT_Y410         fourcc_code('Y', '4', '1', '0') /* [31:0] A:Cr:Y:Cb 2:10:10:10 little endian */
-#define DRM_FORMAT_Y412         fourcc_code('Y', '4', '1', '2') /* [63:0] X:x:V:x:Y:x:U:x 12:4:12:4:12:4:12:4 little endian */
+#define DRM_FORMAT_Y412         fourcc_code('Y', '4', '1', '2') /* [63:0] A:0:Cr:0:Y:0:Cb:0 12:4:12:4:12:4:12:4 little endian */
-#define DRM_FORMAT_Y416         fourcc_code('Y', '4', '1', '6') /* [63:0] X:V:Y:U 16:16:16:16 little endian */
+#define DRM_FORMAT_Y416         fourcc_code('Y', '4', '1', '6') /* [63:0] A:Cr:Y:Cb 16:16:16:16 little endian */
+#define DRM_FORMAT_XVYU2101010	fourcc_code('X', 'V', '3', '0') /* [31:0] X:Cr:Y:Cb 2:10:10:10 little endian */
+#define DRM_FORMAT_XVYU12_16161616	fourcc_code('X', 'V', '3', '6') /* [63:0] X:0:Cr:0:Y:0:Cb:0 12:4:12:4:12:4:12:4 little endian */
+#define DRM_FORMAT_XVYU16161616	fourcc_code('X', 'V', '4', '8') /* [63:0] X:Cr:Y:Cb 16:16:16:16 little endian */
 /*
  * packed YCbCr420 2x2 tiled formats
 /* [63:0]   X3:X2:Y3:Cr0:Y2:X1:X0:Y1:Cb0:Y0  1:1:10:10:10:1:1:10:10:10 little endian */
 #define DRM_FORMAT_X0L2		fourcc_code('X', '0', 'L', '2')
+/*
+ * 1-plane YUV 4:2:0
+ * In these formats, the component ordering is specified (Y, followed by U
+ * then V), but the exact Linear layout is undefined.
+ * These formats can only be used with a non-Linear modifier.
+ */
+#define DRM_FORMAT_YUV420_8BIT	fourcc_code('Y', 'U', '0', '8')
+#define DRM_FORMAT_YUV420_10BIT	fourcc_code('Y', 'U', '1', '0')
 /*
  * 2 plane RGB + A
  * index 0 = RGB plane, same format as the corresponding non _A8 format has
 #define DRM_FORMAT_NV24		fourcc_code('N', 'V', '2', '4') /* non-subsampled Cr:Cb plane */
 #define DRM_FORMAT_NV42		fourcc_code('N', 'V', '4', '2') /* non-subsampled Cb:Cr plane */
+/*
+ * 2 plane YCbCr MSB aligned
+ * index 0 = Y plane, [15:0] Y:x [10:6] little endian
+ * index 1 = Cr:Cb plane, [31:0] Cr:x:Cb:x [10:6:10:6] little endian
+ */
+#define DRM_FORMAT_P210		fourcc_code('P', '2', '1', '0') /* 2x1 subsampled Cr:Cb plane, 10 bit per channel */
 /*
  * 2 plane YCbCr MSB aligned
  * index 0 = Y plane, [15:0] Y:x [10:6] little endian

include/uapi/linux/android/binder.h+19−0

 enum {
 	FLAT_BINDER_FLAG_PRIORITY_MASK = 0xff,
 	FLAT_BINDER_FLAG_ACCEPTS_FDS = 0x100,
+	/**
+	 * @FLAT_BINDER_FLAG_TXN_SECURITY_CTX: request security contexts
+	 *
+	 * Only when set, causes senders to include their security
+	 * context
+	 */
+	FLAT_BINDER_FLAG_TXN_SECURITY_CTX = 0x1000,
 };
 #ifdef BINDER_IPC_32BIT
 #define BINDER_VERSION			_IOWR('b', 9, struct binder_version)
 #define BINDER_GET_NODE_DEBUG_INFO	_IOWR('b', 11, struct binder_node_debug_info)
 #define BINDER_GET_NODE_INFO_FOR_REF	_IOWR('b', 12, struct binder_node_info_for_ref)
+#define BINDER_SET_CONTEXT_MGR_EXT	_IOW('b', 13, struct flat_binder_object)
 /*
  * NOTE: Two special error codes you should check for when calling
 	} data;
 };
+struct binder_transaction_data_secctx {
+	struct binder_transaction_data transaction_data;
+	binder_uintptr_t secctx;
+};
 struct binder_transaction_data_sg {
 	struct binder_transaction_data transaction_data;
 	binder_size_t buffers_size;
 	BR_OK = _IO('r', 1),
 	/* No parameters! */
+	BR_TRANSACTION_SEC_CTX = _IOR('r', 2,
+				      struct binder_transaction_data_secctx),
+	/*
+	 * binder_transaction_data_secctx: the received command.
+	 */
 	BR_TRANSACTION = _IOR('r', 2, struct binder_transaction_data),
 	BR_REPLY = _IOR('r', 3, struct binder_transaction_data),
 	/*

include/uapi/linux/auto_fs.h+1−1

@@ -23,7 +23,7 @@ · 22 unmodified lines
23	#define AUTOFS_MIN_PROTO_VERSION 3	23	#define AUTOFS_MIN_PROTO_VERSION 3
24	#define AUTOFS_MAX_PROTO_VERSION 5	24	#define AUTOFS_MAX_PROTO_VERSION 5
25		25
26	#define AUTOFS_PROTO_SUBVERSION 4	26	#define AUTOFS_PROTO_SUBVERSION 5
27		27
28	/*	28	/*
29	* The wait_queue_token (autofs_wqt_t) is part of a structure which is passed	29	* The wait_queue_token (autofs_wqt_t) is part of a structure which is passed

include/uapi/linux/batadv_packet.h+2−2

@@ -1,5 +1,5 @@
1	/* SPDX-License-Identifier: (GPL-2.0 WITH Linux-syscall-note) */	1	/* SPDX-License-Identifier: (GPL-2.0 WITH Linux-syscall-note) */
2	/* Copyright (C) 2007-2018 B.A.T.M.A.N. contributors:	2	/* Copyright (C) 2007-2019 B.A.T.M.A.N. contributors:
3	*	3	*
4	* Marek Lindner, Simon Wunderlich	4	* Marek Lindner, Simon Wunderlich
5	*	5	*
@@ -229,7 +229,7 @@ struct batadv_ogm_packet { · 223 unmodified lines
229	* @packet_type: batman-adv packet type, part of the general header	229	* @packet_type: batman-adv packet type, part of the general header
230	* @version: batman-adv protocol version, part of the general header	230	* @version: batman-adv protocol version, part of the general header
231	* @ttl: time to live for this packet, part of the general header	231	* @ttl: time to live for this packet, part of the general header
232	* @flags: reseved for routing relevant flags - currently always 0	232	* @flags: reserved for routing relevant flags - currently always 0
233	* @seqno: sequence number	233	* @seqno: sequence number
234	* @orig: originator mac address	234	* @orig: originator mac address
235	* @tvlv_len: length of the appended tvlv buffer (in bytes)	235	* @tvlv_len: length of the appended tvlv buffer (in bytes)

include/uapi/linux/batman_adv.h+186−6

@@ -1,5 +1,5 @@
1	/* SPDX-License-Identifier: MIT */	1	/* SPDX-License-Identifier: MIT */
2	/* Copyright (C) 2016-2018 B.A.T.M.A.N. contributors:	2	/* Copyright (C) 2016-2019 B.A.T.M.A.N. contributors:
3	*	3	*
4	* Matthias Schiffer	4	* Matthias Schiffer
5	*	5	*
@@ -27,6 +27,7 @@ · 21 unmodified lines
27		27
28	#define BATADV_NL_NAME "batadv"	28	#define BATADV_NL_NAME "batadv"
29		29
		30	#define BATADV_NL_MCAST_GROUP_CONFIG "config"
30	#define BATADV_NL_MCAST_GROUP_TPMETER "tpmeter"	31	#define BATADV_NL_MCAST_GROUP_TPMETER "tpmeter"
31		32
32	/**	33	/**
@@ -138,6 +139,20 @@ enum batadv_mcast_flags_priv { · 105 unmodified lines
138	BATADV_MCAST_FLAGS_QUERIER_IPV6_SHADOWING = (1 << 4),	139	BATADV_MCAST_FLAGS_QUERIER_IPV6_SHADOWING = (1 << 4),
139	};	140	};
140		141
		142	/**
		143	* enum batadv_gw_modes - gateway mode of node
		144	*/
		145	enum batadv_gw_modes {
		146	/** @BATADV_GW_MODE_OFF: gw mode disabled */
		147	BATADV_GW_MODE_OFF,
		148
		149	/** @BATADV_GW_MODE_CLIENT: send DHCP requests to gw servers */
		150	BATADV_GW_MODE_CLIENT,
		151
		152	/** @BATADV_GW_MODE_SERVER: announce itself as gatway server */
		153	BATADV_GW_MODE_SERVER,
		154	};
		155
141	/**	156	/**
142	* enum batadv_nl_attrs - batman-adv netlink attributes	157	* enum batadv_nl_attrs - batman-adv netlink attributes
143	*/	158	*/
@@ -344,6 +359,138 @@ enum batadv_nl_attrs { · 200 unmodified lines
344	*/	359	*/
345	BATADV_ATTR_MCAST_FLAGS_PRIV,	360	BATADV_ATTR_MCAST_FLAGS_PRIV,
346		361
		362	/**
		363	* @BATADV_ATTR_VLANID: VLAN id on top of soft interface
		364	*/
		365	BATADV_ATTR_VLANID,
		366
		367	/**
		368	* @BATADV_ATTR_AGGREGATED_OGMS_ENABLED: whether the batman protocol
		369	* messages of the mesh interface shall be aggregated or not.
		370	*/
		371	BATADV_ATTR_AGGREGATED_OGMS_ENABLED,
		372
		373	/**
		374	* @BATADV_ATTR_AP_ISOLATION_ENABLED: whether the data traffic going
		375	* from a wireless client to another wireless client will be silently
		376	* dropped.
		377	*/
		378	BATADV_ATTR_AP_ISOLATION_ENABLED,
		379
		380	/**
		381	* @BATADV_ATTR_ISOLATION_MARK: the isolation mark which is used to
		382	* classify clients as "isolated" by the Extended Isolation feature.
		383	*/
		384	BATADV_ATTR_ISOLATION_MARK,
		385
		386	/**
		387	* @BATADV_ATTR_ISOLATION_MASK: the isolation (bit)mask which is used to
		388	* classify clients as "isolated" by the Extended Isolation feature.
		389	*/
		390	BATADV_ATTR_ISOLATION_MASK,
		391
		392	/**
		393	* @BATADV_ATTR_BONDING_ENABLED: whether the data traffic going through
		394	* the mesh will be sent using multiple interfaces at the same time.
		395	*/
		396	BATADV_ATTR_BONDING_ENABLED,
		397
		398	/**
		399	* @BATADV_ATTR_BRIDGE_LOOP_AVOIDANCE_ENABLED: whether the bridge loop
		400	* avoidance feature is enabled. This feature detects and avoids loops
		401	* between the mesh and devices bridged with the soft interface
		402	*/
		403	BATADV_ATTR_BRIDGE_LOOP_AVOIDANCE_ENABLED,
		404
		405	/**
		406	* @BATADV_ATTR_DISTRIBUTED_ARP_TABLE_ENABLED: whether the distributed
		407	* arp table feature is enabled. This feature uses a distributed hash
		408	* table to answer ARP requests without flooding the request through
		409	* the whole mesh.
		410	*/
		411	BATADV_ATTR_DISTRIBUTED_ARP_TABLE_ENABLED,
		412
		413	/**
		414	* @BATADV_ATTR_FRAGMENTATION_ENABLED: whether the data traffic going
		415	* through the mesh will be fragmented or silently discarded if the
		416	* packet size exceeds the outgoing interface MTU.
		417	*/
		418	BATADV_ATTR_FRAGMENTATION_ENABLED,
		419
		420	/**
		421	* @BATADV_ATTR_GW_BANDWIDTH_DOWN: defines the download bandwidth which
		422	* is propagated by this node if %BATADV_ATTR_GW_BANDWIDTH_MODE was set
		423	* to 'server'.
		424	*/
		425	BATADV_ATTR_GW_BANDWIDTH_DOWN,
		426
		427	/**
		428	* @BATADV_ATTR_GW_BANDWIDTH_UP: defines the upload bandwidth which
		429	* is propagated by this node if %BATADV_ATTR_GW_BANDWIDTH_MODE was set
		430	* to 'server'.
		431	*/
		432	BATADV_ATTR_GW_BANDWIDTH_UP,
		433
		434	/**
		435	* @BATADV_ATTR_GW_MODE: defines the state of the gateway features.
		436	* Possible values are specified in enum batadv_gw_modes
		437	*/
		438	BATADV_ATTR_GW_MODE,
		439
		440	/**
		441	* @BATADV_ATTR_GW_SEL_CLASS: defines the selection criteria this node
		442	* will use to choose a gateway if gw_mode was set to 'client'.
		443	*/
		444	BATADV_ATTR_GW_SEL_CLASS,
		445
		446	/**
		447	* @BATADV_ATTR_HOP_PENALTY: defines the penalty which will be applied
		448	* to an originator message's tq-field on every hop.
		449	*/
		450	BATADV_ATTR_HOP_PENALTY,
		451
		452	/**
		453	* @BATADV_ATTR_LOG_LEVEL: bitmask with to define which debug messages
		454	* should be send to the debug log/trace ring buffer
		455	*/
		456	BATADV_ATTR_LOG_LEVEL,
		457
		458	/**
		459	* @BATADV_ATTR_MULTICAST_FORCEFLOOD_ENABLED: whether multicast
		460	* optimizations should be replaced by simple broadcast-like flooding
		461	* of multicast packets. If set to non-zero then all nodes in the mesh
		462	* are going to use classic flooding for any multicast packet with no
		463	* optimizations.
		464	*/
		465	BATADV_ATTR_MULTICAST_FORCEFLOOD_ENABLED,
		466
		467	/**
		468	* @BATADV_ATTR_NETWORK_CODING_ENABLED: whether Network Coding (using
		469	* some magic to send fewer wifi packets but still the same content) is
		470	* enabled or not.
		471	*/
		472	BATADV_ATTR_NETWORK_CODING_ENABLED,
		473
		474	/**
		475	* @BATADV_ATTR_ORIG_INTERVAL: defines the interval in milliseconds in
		476	* which batman sends its protocol messages.
		477	*/
		478	BATADV_ATTR_ORIG_INTERVAL,
		479
		480	/**
		481	* @BATADV_ATTR_ELP_INTERVAL: defines the interval in milliseconds in
		482	* which batman emits probing packets for neighbor sensing (ELP).
		483	*/
		484	BATADV_ATTR_ELP_INTERVAL,
		485
		486	/**
		487	* @BATADV_ATTR_THROUGHPUT_OVERRIDE: defines the throughput value to be
		488	* used by B.A.T.M.A.N. V when estimating the link throughput using
		489	* this interface. If the value is set to 0 then batman-adv will try to
		490	* estimate the throughput by itself.
		491	*/
		492	BATADV_ATTR_THROUGHPUT_OVERRIDE,
		493
347	/* add attributes above here, update the policy in netlink.c */	494	/* add attributes above here, update the policy in netlink.c */
348		495
349	/**	496	/**
@@ -372,10 +519,14 @@ enum batadv_nl_commands { · 22 unmodified lines
372	BATADV_CMD_UNSPEC,	519	BATADV_CMD_UNSPEC,
373		520
374	/**	521	/**
375	* @BATADV_CMD_GET_MESH_INFO: Query basic information about batman-adv	522	* @BATADV_CMD_GET_MESH: Get attributes from softif/mesh
376	* device	523	*/
		524	BATADV_CMD_GET_MESH,
		525
		526	/**
		527	* @BATADV_CMD_GET_MESH_INFO: Alias for @BATADV_CMD_GET_MESH
377	*/	528	*/
378	BATADV_CMD_GET_MESH_INFO,	529	BATADV_CMD_GET_MESH_INFO = BATADV_CMD_GET_MESH,
379		530
380	/**	531	/**
381	* @BATADV_CMD_TP_METER: Start a tp meter session	532	* @BATADV_CMD_TP_METER: Start a tp meter session
@@ -393,9 +544,15 @@ enum batadv_nl_commands { · 11 unmodified lines
393	BATADV_CMD_GET_ROUTING_ALGOS,	544	BATADV_CMD_GET_ROUTING_ALGOS,
394		545
395	/**	546	/**
396	* @BATADV_CMD_GET_HARDIFS: Query list of hard interfaces	547	* @BATADV_CMD_GET_HARDIF: Get attributes from a hardif of the
		548	* current softif
397	*/	549	*/
398	BATADV_CMD_GET_HARDIFS,	550	BATADV_CMD_GET_HARDIF,
		551
		552	/**
		553	* @BATADV_CMD_GET_HARDIFS: Alias for @BATADV_CMD_GET_HARDIF
		554	*/
		555	BATADV_CMD_GET_HARDIFS = BATADV_CMD_GET_HARDIF,
399		556
400	/**	557	/**
401	* @BATADV_CMD_GET_TRANSTABLE_LOCAL: Query list of local translations	558	* @BATADV_CMD_GET_TRANSTABLE_LOCAL: Query list of local translations
@@ -443,6 +600,29 @@ enum batadv_nl_commands { · 41 unmodified lines
443	*/	600	*/
444	BATADV_CMD_GET_MCAST_FLAGS,	601	BATADV_CMD_GET_MCAST_FLAGS,
445		602
		603	/**
		604	* @BATADV_CMD_SET_MESH: Set attributes for softif/mesh
		605	*/
		606	BATADV_CMD_SET_MESH,
		607
		608	/**
		609	* @BATADV_CMD_SET_HARDIF: Set attributes for hardif of the
		610	* current softif
		611	*/
		612	BATADV_CMD_SET_HARDIF,
		613
		614	/**
		615	* @BATADV_CMD_GET_VLAN: Get attributes from a VLAN of the
		616	* current softif
		617	*/
		618	BATADV_CMD_GET_VLAN,
		619
		620	/**
		621	* @BATADV_CMD_SET_VLAN: Set attributes for VLAN of the
		622	* current softif
		623	*/
		624	BATADV_CMD_SET_VLAN,
		625
446	/* add new commands above here */	626	/* add new commands above here */
447		627
448	/**	628	/**

include/uapi/linux/binfmts.h+1−1

@@ -16,6 +16,6 @@ struct pt_regs; · 15 unmodified lines
16	#define MAX_ARG_STRINGS 0x7FFFFFFF	16	#define MAX_ARG_STRINGS 0x7FFFFFFF
17		17
18	/* sizeof(linux_binprm->buf) */	18	/* sizeof(linux_binprm->buf) */
19	#define BINPRM_BUF_SIZE 128	19	#define BINPRM_BUF_SIZE 256
20		20
21	#endif /* _UAPI_LINUX_BINFMTS_H */	21	#endif /* _UAPI_LINUX_BINFMTS_H */

include/uapi/linux/bpf.h+107−9

@@ -14,6 +14,7 @@ · 13 unmodified lines
14	/* Extended instruction set based on top of classic BPF */	14	/* Extended instruction set based on top of classic BPF */
15		15
16	/* instruction classes */	16	/* instruction classes */
		17	#define BPF_JMP32 0x06 /* jmp mode in word width */
17	#define BPF_ALU64 0x07 /* alu mode in double word width */	18	#define BPF_ALU64 0x07 /* alu mode in double word width */
18		19
19	/* ld/ldx fields */	20	/* ld/ldx fields */
@@ -266,6 +267,7 @@ enum bpf_attach_type { · 246 unmodified lines
266	#define BPF_ANY 0 /* create new element or update existing */	267	#define BPF_ANY 0 /* create new element or update existing */
267	#define BPF_NOEXIST 1 /* create new element if it didn't exist */	268	#define BPF_NOEXIST 1 /* create new element if it didn't exist */
268	#define BPF_EXIST 2 /* update existing element */	269	#define BPF_EXIST 2 /* update existing element */
		270	#define BPF_F_LOCK 4 /* spin_lock-ed map_lookup/map_update */
269		271
270	/* flags for BPF_MAP_CREATE command */	272	/* flags for BPF_MAP_CREATE command */
271	#define BPF_F_NO_PREALLOC (1U << 0)	273	#define BPF_F_NO_PREALLOC (1U << 0)
@@ -2014,6 +2016,19 @@ union bpf_attr { · 1742 unmodified lines
2014	* Only works if skb contains an IPv6 packet. Insert a	2016	* Only works if skb contains an IPv6 packet. Insert a
2015	* Segment Routing Header (struct ipv6_sr_hdr) inside	2017	* Segment Routing Header (struct ipv6_sr_hdr) inside
2016	* the IPv6 header.	2018	* the IPv6 header.
		2019	* BPF_LWT_ENCAP_IP
		2020	* IP encapsulation (GRE/GUE/IPIP/etc). The outer header
		2021	* must be IPv4 or IPv6, followed by zero or more
		2022	* additional headers, up to LWT_BPF_MAX_HEADROOM total
		2023	* bytes in all prepended headers. Please note that
		2024	* if skb_is_gso(skb) is true, no more than two headers
		2025	* can be prepended, and the inner header, if present,
		2026	* should be either GRE or UDP/GUE.
		2027	*
		2028	* BPF_LWT_ENCAP_SEG6*** types can be called by bpf programs of
		2029	* type BPF_PROG_TYPE_LWT_IN; BPF_LWT_ENCAP_IP type can be called
		2030	* by bpf programs of types BPF_PROG_TYPE_LWT_IN and
		2031	* BPF_PROG_TYPE_LWT_XMIT.
2017	*	2032	*
2018	* A call to this helper is susceptible to change the underlaying	2033	* A call to this helper is susceptible to change the underlaying
2019	* packet buffer. Therefore, at load time, all checks on pointers	2034	* packet buffer. Therefore, at load time, all checks on pointers
@@ -2327,6 +2342,30 @@ union bpf_attr { · 307 unmodified lines
2327	* "y".	2342	* "y".
2328	* Return	2343	* Return
2329	* 0	2344	* 0
		2345	*
		2346	* struct bpf_sock bpf_sk_fullsock(struct bpf_sock sk)
		2347	* Description
		2348	* This helper gets a struct bpf_sock pointer such
		2349	* that all the fields in bpf_sock can be accessed.
		2350	* Return
		2351	* A struct bpf_sock pointer on success, or NULL in
		2352	* case of failure.
		2353	*
		2354	* struct bpf_tcp_sock bpf_tcp_sock(struct bpf_sock sk)
		2355	* Description
		2356	* This helper gets a struct bpf_tcp_sock pointer from a
		2357	* struct bpf_sock pointer.
		2358	*
		2359	* Return
		2360	* A struct bpf_tcp_sock pointer on success, or NULL in
		2361	* case of failure.
		2362	*
		2363	* int bpf_skb_ecn_set_ce(struct sk_buf *skb)
		2364	* Description
		2365	* Sets ECN of IP header to ce (congestion encountered) if
		2366	* current value is ect (ECN capable). Works with IPv6 and IPv4.
		2367	* Return
		2368	* 1 if set, 0 if not set.
2330	*/	2369	*/
2331	#define __BPF_FUNC_MAPPER(FN) \	2370	#define __BPF_FUNC_MAPPER(FN) \
2332	FN(unspec), \	2371	FN(unspec), \
@@ -2421,7 +2460,12 @@ union bpf_attr { · 88 unmodified lines
2421	FN(map_peek_elem), \	2460	FN(map_peek_elem), \
2422	FN(msg_push_data), \	2461	FN(msg_push_data), \
2423	FN(msg_pop_data), \	2462	FN(msg_pop_data), \
2424	FN(rc_pointer_rel),	2463	FN(rc_pointer_rel), \
		2464	FN(spin_lock), \
		2465	FN(spin_unlock), \
		2466	FN(sk_fullsock), \
		2467	FN(tcp_sock), \
		2468	FN(skb_ecn_set_ce),
2425		2469
2426	/* integer value in 'imm' field of BPF_CALL instruction selects which helper	2470	/* integer value in 'imm' field of BPF_CALL instruction selects which helper
2427	* function eBPF program intends to call	2471	* function eBPF program intends to call
@@ -2494,7 +2538,8 @@ enum bpf_hdr_start_off { · 66 unmodified lines
2494	/* Encapsulation type for BPF_FUNC_lwt_push_encap helper. */	2538	/* Encapsulation type for BPF_FUNC_lwt_push_encap helper. */
2495	enum bpf_lwt_encap_mode {	2539	enum bpf_lwt_encap_mode {
2496	BPF_LWT_ENCAP_SEG6,	2540	BPF_LWT_ENCAP_SEG6,
2497	BPF_LWT_ENCAP_SEG6_INLINE	2541	BPF_LWT_ENCAP_SEG6_INLINE,
		2542	BPF_LWT_ENCAP_IP,
2498	};	2543	};
2499		2544
2500	#define __bpf_md_ptr(type, name) \	2545	#define __bpf_md_ptr(type, name) \
@@ -2540,6 +2585,8 @@ struct __sk_buff { · 39 unmodified lines
2540	__bpf_md_ptr(struct bpf_flow_keys *, flow_keys);	2585	__bpf_md_ptr(struct bpf_flow_keys *, flow_keys);
2541	__u64 tstamp;	2586	__u64 tstamp;
2542	__u32 wire_len;	2587	__u32 wire_len;
		2588	__u32 gso_segs;
		2589	__bpf_md_ptr(struct bpf_sock *, sk);
2543	};	2590	};
2544		2591
2545	struct bpf_tunnel_key {	2592	struct bpf_tunnel_key {
@@ -2581,7 +2628,15 @@ enum bpf_ret_code { · 35 unmodified lines
2581	BPF_DROP = 2,	2628	BPF_DROP = 2,
2582	/* 3-6 reserved */	2629	/* 3-6 reserved */
2583	BPF_REDIRECT = 7,	2630	BPF_REDIRECT = 7,
2584	/* >127 are reserved for prog type specific return codes */	2631	/* >127 are reserved for prog type specific return codes.
		2632	*
		2633	* BPF_LWT_REROUTE: used by BPF_PROG_TYPE_LWT_IN and
		2634	* BPF_PROG_TYPE_LWT_XMIT to indicate that skb had been
		2635	* changed and should be routed based on its new L3 header.
		2636	* (This is an L3 redirect, as opposed to L2 redirect
		2637	* represented by BPF_REDIRECT above).
		2638	*/
		2639	BPF_LWT_REROUTE = 128,
2585	};	2640	};
2586		2641
2587	struct bpf_sock {	2642	struct bpf_sock {
@@ -2591,14 +2646,52 @@ struct bpf_sock { · 3 unmodified lines
2591	__u32 protocol;	2646	__u32 protocol;
2592	__u32 mark;	2647	__u32 mark;
2593	__u32 priority;	2648	__u32 priority;
2594	__u32 src_ip4; /* Allows 1,2,4-byte read.	2649	/* IP address also allows 1 and 2 bytes access */
2595	* Stored in network byte order.	2650	__u32 src_ip4;
		2651	__u32 src_ip6[4];
		2652	__u32 src_port; /* host byte order */
		2653	__u32 dst_port; /* network byte order */
		2654	__u32 dst_ip4;
		2655	__u32 dst_ip6[4];
		2656	__u32 state;
		2657	};
		2658
		2659	struct bpf_tcp_sock {
		2660	__u32 snd_cwnd; /* Sending congestion window */
		2661	__u32 srtt_us; /* smoothed round trip time << 3 in usecs */
		2662	__u32 rtt_min;
		2663	__u32 snd_ssthresh; /* Slow start size threshold */
		2664	__u32 rcv_nxt; /* What we want to receive next */
		2665	__u32 snd_nxt; /* Next sequence we send */
		2666	__u32 snd_una; /* First byte we want an ack for */
		2667	__u32 mss_cache; /* Cached effective mss, not including SACKS */
		2668	__u32 ecn_flags; /* ECN status bits. */
		2669	__u32 rate_delivered; /* saved rate sample: packets delivered */
		2670	__u32 rate_interval_us; /* saved rate sample: time elapsed */
		2671	__u32 packets_out; /* Packets which are "in flight" */
		2672	__u32 retrans_out; /* Retransmitted packets out */
		2673	__u32 total_retrans; /* Total retransmits for entire connection */
		2674	__u32 segs_in; /* RFC4898 tcpEStatsPerfSegsIn
		2675	* total number of segments in.
2596	*/	2676	*/
2597	__u32 src_ip6[4]; /* Allows 1,2,4-byte read.	2677	__u32 data_segs_in; /* RFC4898 tcpEStatsPerfDataSegsIn
2598	* Stored in network byte order.	2678	* total number of data segments in.
2599	*/	2679	*/
2600	__u32 src_port; /* Allows 4-byte read.	2680	__u32 segs_out; /* RFC4898 tcpEStatsPerfSegsOut
2601	* Stored in host byte order	2681	* The total number of segments sent.
		2682	*/
		2683	__u32 data_segs_out; /* RFC4898 tcpEStatsPerfDataSegsOut
		2684	* total number of data segments sent.
		2685	*/
		2686	__u32 lost_out; /* Lost packets */
		2687	__u32 sacked_out; /* SACK'd packets */
		2688	__u64 bytes_received; /* RFC4898 tcpEStatsAppHCThruOctetsReceived
		2689	* sum(delta(rcv_nxt)), or how many bytes
		2690	* were acked.
		2691	*/
		2692	__u64 bytes_acked; /* RFC4898 tcpEStatsAppHCThruOctetsAcked
		2693	* sum(delta(snd_una)), or how many bytes
		2694	* were acked.
2602	*/	2695	*/
2603	};	2696	};
2604		2697
@@ -2728,6 +2821,8 @@ struct bpf_prog_info { · 123 unmodified lines
2728	__u32 jited_line_info_rec_size;	2821	__u32 jited_line_info_rec_size;
2729	__u32 nr_prog_tags;	2822	__u32 nr_prog_tags;
2730	__aligned_u64 prog_tags;	2823	__aligned_u64 prog_tags;
		2824	__u64 run_time_ns;
		2825	__u64 run_cnt;
2731	} __attribute__((aligned(8)));	2826	} __attribute__((aligned(8)));
2732		2827
2733	struct bpf_map_info {	2828	struct bpf_map_info {
@@ -3054,4 +3149,7 @@ struct bpf_line_info { · 320 unmodified lines
3054	__u32 line_col;	3149	__u32 line_col;
3055	};	3150	};
3056		3151
		3152	struct bpf_spin_lock {
		3153	__u32 val;
		3154	};
3057	#endif /* _UAPI__LINUX_BPF_H__ */	3155	#endif /* _UAPI__LINUX_BPF_H__ */

include/uapi/linux/btrfs.h+2−0

 				   struct btrfs_ioctl_vol_args)
 #define BTRFS_IOC_SCAN_DEV _IOW(BTRFS_IOCTL_MAGIC, 4, \
 				   struct btrfs_ioctl_vol_args)
+#define BTRFS_IOC_FORGET_DEV _IOW(BTRFS_IOCTL_MAGIC, 5, \
+				   struct btrfs_ioctl_vol_args)
 /* trans start and trans end are dangerous, and only for
  * use by applications that know how to avoid the
  * resulting deadlocks

include/uapi/linux/devlink.h+47−0

@@ -89,6 +89,22 @@ enum devlink_command { · 88 unmodified lines
89	DEVLINK_CMD_REGION_DEL,	89	DEVLINK_CMD_REGION_DEL,
90	DEVLINK_CMD_REGION_READ,	90	DEVLINK_CMD_REGION_READ,
91		91
		92	DEVLINK_CMD_PORT_PARAM_GET, /* can dump */
		93	DEVLINK_CMD_PORT_PARAM_SET,
		94	DEVLINK_CMD_PORT_PARAM_NEW,
		95	DEVLINK_CMD_PORT_PARAM_DEL,
		96
		97	DEVLINK_CMD_INFO_GET, /* can dump */
		98
		99	DEVLINK_CMD_HEALTH_REPORTER_GET,
		100	DEVLINK_CMD_HEALTH_REPORTER_SET,
		101	DEVLINK_CMD_HEALTH_REPORTER_RECOVER,
		102	DEVLINK_CMD_HEALTH_REPORTER_DIAGNOSE,
		103	DEVLINK_CMD_HEALTH_REPORTER_DUMP_GET,
		104	DEVLINK_CMD_HEALTH_REPORTER_DUMP_CLEAR,
		105
		106	DEVLINK_CMD_FLASH_UPDATE,
		107
92	/* add new commands above here */	108	/* add new commands above here */
93	__DEVLINK_CMD_MAX,	109	__DEVLINK_CMD_MAX,
94	DEVLINK_CMD_MAX = __DEVLINK_CMD_MAX - 1	110	DEVLINK_CMD_MAX = __DEVLINK_CMD_MAX - 1
@@ -285,6 +301,37 @@ enum devlink_attr { · 190 unmodified lines
285	DEVLINK_ATTR_REGION_CHUNK_ADDR, /* u64 */	301	DEVLINK_ATTR_REGION_CHUNK_ADDR, /* u64 */
286	DEVLINK_ATTR_REGION_CHUNK_LEN, /* u64 */	302	DEVLINK_ATTR_REGION_CHUNK_LEN, /* u64 */
287		303
		304	DEVLINK_ATTR_INFO_DRIVER_NAME, /* string */
		305	DEVLINK_ATTR_INFO_SERIAL_NUMBER, /* string */
		306	DEVLINK_ATTR_INFO_VERSION_FIXED, /* nested */
		307	DEVLINK_ATTR_INFO_VERSION_RUNNING, /* nested */
		308	DEVLINK_ATTR_INFO_VERSION_STORED, /* nested */
		309	DEVLINK_ATTR_INFO_VERSION_NAME, /* string */
		310	DEVLINK_ATTR_INFO_VERSION_VALUE, /* string */
		311
		312	DEVLINK_ATTR_SB_POOL_CELL_SIZE, /* u32 */
		313
		314	DEVLINK_ATTR_FMSG, /* nested */
		315	DEVLINK_ATTR_FMSG_OBJ_NEST_START, /* flag */
		316	DEVLINK_ATTR_FMSG_PAIR_NEST_START, /* flag */
		317	DEVLINK_ATTR_FMSG_ARR_NEST_START, /* flag */
		318	DEVLINK_ATTR_FMSG_NEST_END, /* flag */
		319	DEVLINK_ATTR_FMSG_OBJ_NAME, /* string */
		320	DEVLINK_ATTR_FMSG_OBJ_VALUE_TYPE, /* u8 */
		321	DEVLINK_ATTR_FMSG_OBJ_VALUE_DATA, /* dynamic */
		322
		323	DEVLINK_ATTR_HEALTH_REPORTER, /* nested */
		324	DEVLINK_ATTR_HEALTH_REPORTER_NAME, /* string */
		325	DEVLINK_ATTR_HEALTH_REPORTER_STATE, /* u8 */
		326	DEVLINK_ATTR_HEALTH_REPORTER_ERR_COUNT, /* u64 */
		327	DEVLINK_ATTR_HEALTH_REPORTER_RECOVER_COUNT, /* u64 */
		328	DEVLINK_ATTR_HEALTH_REPORTER_DUMP_TS, /* u64 */
		329	DEVLINK_ATTR_HEALTH_REPORTER_GRACEFUL_PERIOD, /* u64 */
		330	DEVLINK_ATTR_HEALTH_REPORTER_AUTO_RECOVER, /* u8 */
		331
		332	DEVLINK_ATTR_FLASH_UPDATE_FILE_NAME, /* string */
		333	DEVLINK_ATTR_FLASH_UPDATE_COMPONENT, /* string */
		334
288	/* add new attributes above here, update the policy in devlink.c */	335	/* add new attributes above here, update the policy in devlink.c */
289		336
290	__DEVLINK_ATTR_MAX,	337	__DEVLINK_ATTR_MAX,

include/uapi/linux/dm-ioctl.h+2−2

@@ -270,9 +270,9 @@ enum { · 269 unmodified lines
270	#define DM_DEV_SET_GEOMETRY _IOWR(DM_IOCTL, DM_DEV_SET_GEOMETRY_CMD, struct dm_ioctl)	270	#define DM_DEV_SET_GEOMETRY _IOWR(DM_IOCTL, DM_DEV_SET_GEOMETRY_CMD, struct dm_ioctl)
271		271
272	#define DM_VERSION_MAJOR 4	272	#define DM_VERSION_MAJOR 4
273	#define DM_VERSION_MINOR 39	273	#define DM_VERSION_MINOR 40
274	#define DM_VERSION_PATCHLEVEL 0	274	#define DM_VERSION_PATCHLEVEL 0
275	#define DM_VERSION_EXTRA "-ioctl (2018-04-03)"	275	#define DM_VERSION_EXTRA "-ioctl (2019-01-18)"
276		276
277	/* Status bits */	277	/* Status bits */
278	#define DM_READONLY_FLAG (1 << 0) /* In/Out */	278	#define DM_READONLY_FLAG (1 << 0) /* In/Out */

include/uapi/linux/elf.h+2−0

 #define NT_ARM_SYSTEM_CALL	0x404	/* ARM system call number */
 #define NT_ARM_SVE	0x405		/* ARM Scalable Vector Extension registers */
 #define NT_ARM_PAC_MASK		0x406	/* ARM pointer authentication code masks */
+#define NT_ARM_PACA_KEYS	0x407	/* ARM pointer authentication address keys */
+#define NT_ARM_PACG_KEYS	0x408	/* ARM pointer authentication generic key */
 #define NT_ARC_V2	0x600		/* ARCv2 accumulator/extra registers */
 #define NT_VMCOREDD	0x700		/* Vmcore Device Dump Note */
 #define NT_MIPS_DSP	0x800		/* MIPS DSP ASE registers */

include/uapi/linux/errqueue.h+5−0

 #define _UAPI_LINUX_ERRQUEUE_H
 #include <linux/types.h>
+#include <linux/time_types.h>
 struct sock_extended_err {
 	__u32	ee_errno;
 	struct timespec ts[3];
 };
+struct scm_timestamping64 {
+	struct __kernel_timespec ts[3];
+};
 /* The type of scm_timestamping, passed in sock_extended_err ee_info.
  * This defines the type of ts[0]. For SCM_TSTAMP_SND only, if ts[0]
  * is zero, then this is a hardware timestamp and recorded in ts[2].

include/uapi/linux/ethtool.h+26−9

@@ -1432,6 +1432,13 @@ enum ethtool_link_mode_bit_indices { · 1431 unmodified lines
1432	ETHTOOL_LINK_MODE_56000baseSR4_Full_BIT = 29,	1432	ETHTOOL_LINK_MODE_56000baseSR4_Full_BIT = 29,
1433	ETHTOOL_LINK_MODE_56000baseLR4_Full_BIT = 30,	1433	ETHTOOL_LINK_MODE_56000baseLR4_Full_BIT = 30,
1434	ETHTOOL_LINK_MODE_25000baseCR_Full_BIT = 31,	1434	ETHTOOL_LINK_MODE_25000baseCR_Full_BIT = 31,
		1435
		1436	/* Last allowed bit for __ETHTOOL_LINK_MODE_LEGACY_MASK is bit
		1437	* 31. Please do NOT define any SUPPORTED_* or ADVERTISED_*
		1438	* macro for bits > 31. The only way to use indices > 31 is to
		1439	* use the new ETHTOOL_GLINKSETTINGS/ETHTOOL_SLINKSETTINGS API.
		1440	*/
		1441
1435	ETHTOOL_LINK_MODE_25000baseKR_Full_BIT = 32,	1442	ETHTOOL_LINK_MODE_25000baseKR_Full_BIT = 32,
1436	ETHTOOL_LINK_MODE_25000baseSR_Full_BIT = 33,	1443	ETHTOOL_LINK_MODE_25000baseSR_Full_BIT = 33,
1437	ETHTOOL_LINK_MODE_50000baseCR2_Full_BIT = 34,	1444	ETHTOOL_LINK_MODE_50000baseCR2_Full_BIT = 34,
@@ -1453,15 +1460,24 @@ enum ethtool_link_mode_bit_indices { · 15 unmodified lines
1453	ETHTOOL_LINK_MODE_FEC_NONE_BIT = 49,	1460	ETHTOOL_LINK_MODE_FEC_NONE_BIT = 49,
1454	ETHTOOL_LINK_MODE_FEC_RS_BIT = 50,	1461	ETHTOOL_LINK_MODE_FEC_RS_BIT = 50,
1455	ETHTOOL_LINK_MODE_FEC_BASER_BIT = 51,	1462	ETHTOOL_LINK_MODE_FEC_BASER_BIT = 51,
1456		1463	ETHTOOL_LINK_MODE_50000baseKR_Full_BIT = 52,
1457	/* Last allowed bit for __ETHTOOL_LINK_MODE_LEGACY_MASK is bit	1464	ETHTOOL_LINK_MODE_50000baseSR_Full_BIT = 53,
1458	* 31. Please do NOT define any SUPPORTED_* or ADVERTISED_*	1465	ETHTOOL_LINK_MODE_50000baseCR_Full_BIT = 54,
1459	* macro for bits > 31. The only way to use indices > 31 is to	1466	ETHTOOL_LINK_MODE_50000baseLR_ER_FR_Full_BIT = 55,
1460	* use the new ETHTOOL_GLINKSETTINGS/ETHTOOL_SLINKSETTINGS API.	1467	ETHTOOL_LINK_MODE_50000baseDR_Full_BIT = 56,
1461	*/	1468	ETHTOOL_LINK_MODE_100000baseKR2_Full_BIT = 57,
1462		1469	ETHTOOL_LINK_MODE_100000baseSR2_Full_BIT = 58,
1463	__ETHTOOL_LINK_MODE_LAST	1470	ETHTOOL_LINK_MODE_100000baseCR2_Full_BIT = 59,
1464	= ETHTOOL_LINK_MODE_FEC_BASER_BIT,	1471	ETHTOOL_LINK_MODE_100000baseLR2_ER2_FR2_Full_BIT = 60,
		1472	ETHTOOL_LINK_MODE_100000baseDR2_Full_BIT = 61,
		1473	ETHTOOL_LINK_MODE_200000baseKR4_Full_BIT = 62,
		1474	ETHTOOL_LINK_MODE_200000baseSR4_Full_BIT = 63,
		1475	ETHTOOL_LINK_MODE_200000baseLR4_ER4_FR4_Full_BIT = 64,
		1476	ETHTOOL_LINK_MODE_200000baseDR4_Full_BIT = 65,
		1477	ETHTOOL_LINK_MODE_200000baseCR4_Full_BIT = 66,
		1478
		1479	/* must be last entry */
		1480	__ETHTOOL_LINK_MODE_MASK_NBITS
1465	};	1481	};
1466		1482
1467	#define __ETHTOOL_LINK_MODE_LEGACY_MASK(base_name) \	1483	#define __ETHTOOL_LINK_MODE_LEGACY_MASK(base_name) \
@@ -1569,6 +1585,7 @@ enum ethtool_link_mode_bit_indices { · 101 unmodified lines
1569	#define SPEED_50000 50000	1585	#define SPEED_50000 50000
1570	#define SPEED_56000 56000	1586	#define SPEED_56000 56000
1571	#define SPEED_100000 100000	1587	#define SPEED_100000 100000
		1588	#define SPEED_200000 200000
1572		1589
1573	#define SPEED_UNKNOWN -1	1590	#define SPEED_UNKNOWN -1
1574		1591

include/uapi/linux/fanotify.h+29−0

@@ -7,9 +7,16 @@ · 6 unmodified lines
7	/* the following events that user-space can register for */	7	/* the following events that user-space can register for */
8	#define FAN_ACCESS 0x00000001 /* File was accessed */	8	#define FAN_ACCESS 0x00000001 /* File was accessed */
9	#define FAN_MODIFY 0x00000002 /* File was modified */	9	#define FAN_MODIFY 0x00000002 /* File was modified */
		10	#define FAN_ATTRIB 0x00000004 /* Metadata changed */
10	#define FAN_CLOSE_WRITE 0x00000008 /* Writtable file closed */	11	#define FAN_CLOSE_WRITE 0x00000008 /* Writtable file closed */
11	#define FAN_CLOSE_NOWRITE 0x00000010 /* Unwrittable file closed */	12	#define FAN_CLOSE_NOWRITE 0x00000010 /* Unwrittable file closed */
12	#define FAN_OPEN 0x00000020 /* File was opened */	13	#define FAN_OPEN 0x00000020 /* File was opened */
		14	#define FAN_MOVED_FROM 0x00000040 /* File was moved from X */
		15	#define FAN_MOVED_TO 0x00000080 /* File was moved to Y */
		16	#define FAN_CREATE 0x00000100 /* Subfile was created */
		17	#define FAN_DELETE 0x00000200 /* Subfile was deleted */
		18	#define FAN_DELETE_SELF 0x00000400 /* Self was deleted */
		19	#define FAN_MOVE_SELF 0x00000800 /* Self was moved */
13	#define FAN_OPEN_EXEC 0x00001000 /* File was opened for exec */	20	#define FAN_OPEN_EXEC 0x00001000 /* File was opened for exec */
14		21
15	#define FAN_Q_OVERFLOW 0x00004000 /* Event queued overflowed */	22	#define FAN_Q_OVERFLOW 0x00004000 /* Event queued overflowed */
@@ -24,6 +31,7 @@ · 8 unmodified lines
24		31
25	/* helper events */	32	/* helper events */
26	#define FAN_CLOSE (FAN_CLOSE_WRITE \| FAN_CLOSE_NOWRITE) /* close */	33	#define FAN_CLOSE (FAN_CLOSE_WRITE \| FAN_CLOSE_NOWRITE) /* close */
		34	#define FAN_MOVE (FAN_MOVED_FROM \| FAN_MOVED_TO) /* moves */
27		35
28	/* flags used for fanotify_init() */	36	/* flags used for fanotify_init() */
29	#define FAN_CLOEXEC 0x00000001	37	#define FAN_CLOEXEC 0x00000001
@@ -44,6 +52,7 @@ · 14 unmodified lines
44		52
45	/* Flags to determine fanotify event format */	53	/* Flags to determine fanotify event format */
46	#define FAN_REPORT_TID 0x00000100 /* event->pid is thread id */	54	#define FAN_REPORT_TID 0x00000100 /* event->pid is thread id */
		55	#define FAN_REPORT_FID 0x00000200 /* Report unique file id */
47		56
48	/* Deprecated - do not use this in programs and do not add new flags here! */	57	/* Deprecated - do not use this in programs and do not add new flags here! */
49	#define FAN_ALL_INIT_FLAGS (FAN_CLOEXEC \| FAN_NONBLOCK \| \	58	#define FAN_ALL_INIT_FLAGS (FAN_CLOEXEC \| FAN_NONBLOCK \| \
@@ -106,6 +115,26 @@ struct fanotify_event_metadata { · 56 unmodified lines
106	__s32 pid;	115	__s32 pid;
107	};	116	};
108		117
		118	#define FAN_EVENT_INFO_TYPE_FID 1
		119
		120	/* Variable length info record following event metadata */
		121	struct fanotify_event_info_header {
		122	__u8 info_type;
		123	__u8 pad;
		124	__u16 len;
		125	};
		126
		127	/* Unique file identifier info record */
		128	struct fanotify_event_info_fid {
		129	struct fanotify_event_info_header hdr;
		130	__kernel_fsid_t fsid;
		131	/*
		132	* Following is an opaque struct file_handle that can be passed as
		133	* an argument to open_by_handle_at(2).
		134	*/
		135	unsigned char handle[0];
		136	};
		137
109	struct fanotify_response {	138	struct fanotify_response {
110	__s32 fd;	139	__s32 fd;
111	__u32 response;	140	__u32 response;

include/uapi/linux/fcntl.h+1−0

@@ -41,6 +41,7 @@ · 40 unmodified lines
41	#define F_SEAL_SHRINK 0x0002 /* prevent file from shrinking */	41	#define F_SEAL_SHRINK 0x0002 /* prevent file from shrinking */
42	#define F_SEAL_GROW 0x0004 /* prevent file from growing */	42	#define F_SEAL_GROW 0x0004 /* prevent file from growing */
43	#define F_SEAL_WRITE 0x0008 /* prevent writes */	43	#define F_SEAL_WRITE 0x0008 /* prevent writes */
		44	#define F_SEAL_FUTURE_WRITE 0x0010 /* prevent future writes while mapped */
44	/* (1U << 31) is reserved for signed error codes */	45	/* (1U << 31) is reserved for signed error codes */
45		46
46	/*	47	/*

include/uapi/linux/fuse.h+6−1

  *  - add FOPEN_CACHE_DIR
  *  - add FUSE_MAX_PAGES, add max_pages to init_out
  *  - add FUSE_CACHE_SYMLINKS
+ *
+ *  7.29
+ *  - add FUSE_NO_OPENDIR_SUPPORT flag
  */
 #ifndef _LINUX_FUSE_H
 #define FUSE_KERNEL_VERSION 7
 /** Minor version number of this interface */
-#define FUSE_KERNEL_MINOR_VERSION 28
+#define FUSE_KERNEL_MINOR_VERSION 29
 /** The node ID of the root inode */
 #define FUSE_ROOT_ID 1
  * FUSE_ABORT_ERROR: reading the device after abort returns ECONNABORTED
  * FUSE_MAX_PAGES: init_out.max_pages contains the max number of req pages
  * FUSE_CACHE_SYMLINKS: cache READLINK responses
+ * FUSE_NO_OPENDIR_SUPPORT: kernel supports zero-message opendir
  */
 #define FUSE_ASYNC_READ		(1 << 0)
 #define FUSE_POSIX_LOCKS	(1 << 1)
 #define FUSE_ABORT_ERROR	(1 << 21)
 #define FUSE_MAX_PAGES		(1 << 22)
 #define FUSE_CACHE_SYMLINKS	(1 << 23)
+#define FUSE_NO_OPENDIR_SUPPORT (1 << 24)
 /**
  * CUSE INIT request/reply flags

include/uapi/linux/icmpv6.h+2−0

@@ -108,6 +108,8 @@ struct icmp6hdr { · 107 unmodified lines
108	#define ICMPV6_MOBILE_PREFIX_SOL 146	108	#define ICMPV6_MOBILE_PREFIX_SOL 146
109	#define ICMPV6_MOBILE_PREFIX_ADV 147	109	#define ICMPV6_MOBILE_PREFIX_ADV 147
110		110
		111	#define ICMPV6_MRDISC_ADV 151
		112
111	/*	113	/*
112	* Codes for Destination Unreachable	114	* Codes for Destination Unreachable
113	*/	115	*/

include/uapi/linux/if_bonding.h+24−0

@@ -117,6 +117,30 @@ struct ad_info { · 116 unmodified lines
117	__u8 partner_system[ETH_ALEN];	117	__u8 partner_system[ETH_ALEN];
118	};	118	};
119		119
		120	/* Embedded inside LINK_XSTATS_TYPE_BOND */
		121	enum {
		122	BOND_XSTATS_UNSPEC,
		123	BOND_XSTATS_3AD,
		124	__BOND_XSTATS_MAX
		125	};
		126	#define BOND_XSTATS_MAX (__BOND_XSTATS_MAX - 1)
		127
		128	/* Embedded inside BOND_XSTATS_3AD */
		129	enum {
		130	BOND_3AD_STAT_LACPDU_RX,
		131	BOND_3AD_STAT_LACPDU_TX,
		132	BOND_3AD_STAT_LACPDU_UNKNOWN_RX,
		133	BOND_3AD_STAT_LACPDU_ILLEGAL_RX,
		134	BOND_3AD_STAT_MARKER_RX,
		135	BOND_3AD_STAT_MARKER_TX,
		136	BOND_3AD_STAT_MARKER_RESP_RX,
		137	BOND_3AD_STAT_MARKER_RESP_TX,
		138	BOND_3AD_STAT_MARKER_UNKNOWN_RX,
		139	BOND_3AD_STAT_PAD,
		140	__BOND_3AD_STAT_MAX
		141	};
		142	#define BOND_3AD_STAT_MAX (__BOND_3AD_STAT_MAX - 1)
		143
120	#endif /* _LINUX_IF_BONDING_H */	144	#endif /* _LINUX_IF_BONDING_H */
121		145
122	/*	146	/*

include/uapi/linux/if_link.h+1−0

@@ -925,6 +925,7 @@ enum { · 924 unmodified lines
925	enum {	925	enum {
926	LINK_XSTATS_TYPE_UNSPEC,	926	LINK_XSTATS_TYPE_UNSPEC,
927	LINK_XSTATS_TYPE_BRIDGE,	927	LINK_XSTATS_TYPE_BRIDGE,
		928	LINK_XSTATS_TYPE_BOND,
928	__LINK_XSTATS_TYPE_MAX	929	__LINK_XSTATS_TYPE_MAX
929	};	930	};
930	#define LINK_XSTATS_TYPE_MAX (__LINK_XSTATS_TYPE_MAX - 1)	931	#define LINK_XSTATS_TYPE_MAX (__LINK_XSTATS_TYPE_MAX - 1)

include/uapi/linux/igmp.h+1−0

@@ -93,6 +93,7 @@ struct igmpv3_query { · 92 unmodified lines
93	#define IGMP_MTRACE_RESP 0x1e	93	#define IGMP_MTRACE_RESP 0x1e
94	#define IGMP_MTRACE 0x1f	94	#define IGMP_MTRACE 0x1f
95		95
		96	#define IGMP_MRDISC_ADV 0x30 /* From RFC4286 */
96		97
97	/*	98	/*
98	* Use the BSD names for these for compatibility	99	* Use the BSD names for these for compatibility

include/uapi/linux/iio/types.h+7−0

 	IIO_GRAVITY,
 	IIO_POSITIONRELATIVE,
 	IIO_PHASE,
+	IIO_MASSCONCENTRATION,
 };
 enum iio_modifier {
 	IIO_MOD_VOC,
 	IIO_MOD_LIGHT_UV,
 	IIO_MOD_LIGHT_DUV,
+	IIO_MOD_PM1,
+	IIO_MOD_PM2P5,
+	IIO_MOD_PM4,
+	IIO_MOD_PM10,
+	IIO_MOD_ETHANOL,
+	IIO_MOD_H2,
 };
 enum iio_event_type {

include/uapi/linux/in.h+5−4

@@ -292,10 +292,11 @@ struct sockaddr_in { · 291 unmodified lines
292	#define IN_LOOPBACK(a) ((((long int) (a)) & 0xff000000) == 0x7f000000)	292	#define IN_LOOPBACK(a) ((((long int) (a)) & 0xff000000) == 0x7f000000)
293		293
294	/* Defines for Multicast INADDR */	294	/* Defines for Multicast INADDR */
295	#define INADDR_UNSPEC_GROUP 0xe0000000U /* 224.0.0.0 */	295	#define INADDR_UNSPEC_GROUP 0xe0000000U /* 224.0.0.0 */
296	#define INADDR_ALLHOSTS_GROUP 0xe0000001U /* 224.0.0.1 */	296	#define INADDR_ALLHOSTS_GROUP 0xe0000001U /* 224.0.0.1 */
297	#define INADDR_ALLRTRS_GROUP 0xe0000002U /* 224.0.0.2 */	297	#define INADDR_ALLRTRS_GROUP 0xe0000002U /* 224.0.0.2 */
298	#define INADDR_MAX_LOCAL_GROUP 0xe00000ffU /* 224.0.0.255 */	298	#define INADDR_ALLSNOOPERS_GROUP 0xe000006aU /* 224.0.0.106 */
		299	#define INADDR_MAX_LOCAL_GROUP 0xe00000ffU /* 224.0.0.255 */
299	#endif	300	#endif
300		301
301	/* <asm/byteorder.h> contains the htonl type stuff.. */	302	/* <asm/byteorder.h> contains the htonl type stuff.. */

include/uapi/linux/in6.h+1−0

@@ -178,6 +178,7 @@ struct in6_flowlabel_req { · 177 unmodified lines
178	#define IPV6_JOIN_ANYCAST 27	178	#define IPV6_JOIN_ANYCAST 27
179	#define IPV6_LEAVE_ANYCAST 28	179	#define IPV6_LEAVE_ANYCAST 28
180	#define IPV6_MULTICAST_ALL 29	180	#define IPV6_MULTICAST_ALL 29
		181	#define IPV6_ROUTER_ALERT_ISOLATE 30
181		182
182	/* IPV6_MTU_DISCOVER values */	183	/* IPV6_MTU_DISCOVER values */
183	#define IPV6_PMTUDISC_DONT 0	184	#define IPV6_PMTUDISC_DONT 0

include/uapi/linux/io_uring.h+137−0

@@ -0,0 +1,137 @@
	1	/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
	2	/*
	3	* Header file for the io_uring interface.
	4	*
	5	* Copyright (C) 2019 Jens Axboe
	6	* Copyright (C) 2019 Christoph Hellwig
	7	*/
	8	#ifndef LINUX_IO_URING_H
	9	#define LINUX_IO_URING_H
	10
	11	#include <linux/fs.h>
	12	#include <linux/types.h>
	13
	14	/*
	15	* IO submission data structure (Submission Queue Entry)
	16	*/
	17	struct io_uring_sqe {
	18	__u8 opcode; /* type of operation for this sqe */
	19	__u8 flags; /* IOSQE_ flags */
	20	__u16 ioprio; /* ioprio for the request */
	21	__s32 fd; /* file descriptor to do IO on */
	22	__u64 off; /* offset into file */
	23	__u64 addr; /* pointer to buffer or iovecs */
	24	__u32 len; /* buffer size or number of iovecs */
	25	union {
	26	__kernel_rwf_t rw_flags;
	27	__u32 fsync_flags;
	28	__u16 poll_events;
	29	};
	30	__u64 user_data; /* data to be passed back at completion time */
	31	union {
	32	__u16 buf_index; /* index into fixed buffers, if used */
	33	__u64 __pad2[3];
	34	};
	35	};
	36
	37	/*
	38	* sqe->flags
	39	*/
	40	#define IOSQE_FIXED_FILE (1U << 0) /* use fixed fileset */
	41
	42	/*
	43	* io_uring_setup() flags
	44	*/
	45	#define IORING_SETUP_IOPOLL (1U << 0) /* io_context is polled */
	46	#define IORING_SETUP_SQPOLL (1U << 1) /* SQ poll thread */
	47	#define IORING_SETUP_SQ_AFF (1U << 2) /* sq_thread_cpu is valid */
	48
	49	#define IORING_OP_NOP 0
	50	#define IORING_OP_READV 1
	51	#define IORING_OP_WRITEV 2
	52	#define IORING_OP_FSYNC 3
	53	#define IORING_OP_READ_FIXED 4
	54	#define IORING_OP_WRITE_FIXED 5
	55	#define IORING_OP_POLL_ADD 6
	56	#define IORING_OP_POLL_REMOVE 7
	57
	58	/*
	59	* sqe->fsync_flags
	60	*/
	61	#define IORING_FSYNC_DATASYNC (1U << 0)
	62
	63	/*
	64	* IO completion data structure (Completion Queue Entry)
	65	*/
	66	struct io_uring_cqe {
	67	__u64 user_data; /* sqe->data submission passed back */
	68	__s32 res; /* result code for this event */
	69	__u32 flags;
	70	};
	71
	72	/*
	73	* Magic offsets for the application to mmap the data it needs
	74	*/
	75	#define IORING_OFF_SQ_RING 0ULL
	76	#define IORING_OFF_CQ_RING 0x8000000ULL
	77	#define IORING_OFF_SQES 0x10000000ULL
	78
	79	/*
	80	* Filled with the offset for mmap(2)
	81	*/
	82	struct io_sqring_offsets {
	83	__u32 head;
	84	__u32 tail;
	85	__u32 ring_mask;
	86	__u32 ring_entries;
	87	__u32 flags;
	88	__u32 dropped;
	89	__u32 array;
	90	__u32 resv1;
	91	__u64 resv2;
	92	};
	93
	94	/*
	95	* sq_ring->flags
	96	*/
	97	#define IORING_SQ_NEED_WAKEUP (1U << 0) /* needs io_uring_enter wakeup */
	98
	99	struct io_cqring_offsets {
	100	__u32 head;
	101	__u32 tail;
	102	__u32 ring_mask;
	103	__u32 ring_entries;
	104	__u32 overflow;
	105	__u32 cqes;
	106	__u64 resv[2];
	107	};
	108
	109	/*
	110	* io_uring_enter(2) flags
	111	*/
	112	#define IORING_ENTER_GETEVENTS (1U << 0)
	113	#define IORING_ENTER_SQ_WAKEUP (1U << 1)
	114
	115	/*
	116	* Passed in for io_uring_setup(2). Copied back with updated info on success
	117	*/
	118	struct io_uring_params {
	119	__u32 sq_entries;
	120	__u32 cq_entries;
	121	__u32 flags;
	122	__u32 sq_thread_cpu;
	123	__u32 sq_thread_idle;
	124	__u32 resv[5];
	125	struct io_sqring_offsets sq_off;
	126	struct io_cqring_offsets cq_off;
	127	};
	128
	129	/*
	130	* io_uring_register(2) opcodes and arguments
	131	*/
	132	#define IORING_REGISTER_BUFFERS 0
	133	#define IORING_UNREGISTER_BUFFERS 1
	134	#define IORING_REGISTER_FILES 2
	135	#define IORING_UNREGISTER_FILES 3
	136
	137	#endif

include/uapi/linux/kernel-page-flags.h+1−1

@@ -32,7 +32,7 @@ · 31 unmodified lines
32		32
33	#define KPF_KSM 21	33	#define KPF_KSM 21
34	#define KPF_THP 22	34	#define KPF_THP 22
35	#define KPF_BALLOON 23	35	#define KPF_OFFLINE 23
36	#define KPF_ZERO_PAGE 24	36	#define KPF_ZERO_PAGE 24
37	#define KPF_IDLE 25	37	#define KPF_IDLE 25
38	#define KPF_PGTABLE 26	38	#define KPF_PGTABLE 26

include/uapi/linux/limits.h+2−2

@@ -1,6 +1,6 @@
1	/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */	1	/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
2	#ifndef _LINUX_LIMITS_H	2	#ifndef _UAPI_LINUX_LIMITS_H
3	#define _LINUX_LIMITS_H	3	#define _UAPI_LINUX_LIMITS_H
4		4
5	#define NR_OPEN 1024	5	#define NR_OPEN 1024
6		6

include/uapi/linux/lirc.h+6−0

  * @RC_PROTO_XMP: XMP protocol
  * @RC_PROTO_CEC: CEC protocol
  * @RC_PROTO_IMON: iMon Pad protocol
+ * @RC_PROTO_RCMM12: RC-MM protocol 12 bits
+ * @RC_PROTO_RCMM24: RC-MM protocol 24 bits
+ * @RC_PROTO_RCMM32: RC-MM protocol 32 bits
  */
 enum rc_proto {
 	RC_PROTO_UNKNOWN	= 0,
 	RC_PROTO_XMP		= 21,
 	RC_PROTO_CEC		= 22,
 	RC_PROTO_IMON		= 23,
+	RC_PROTO_RCMM12		= 24,
+	RC_PROTO_RCMM24		= 25,
+	RC_PROTO_RCMM32		= 26,
 };
 #endif

include/uapi/linux/mdio.h+19−0

 #define MDIO_AN_ADVERTISE	16	/* AN advertising (base page) */
 #define MDIO_AN_LPA		19	/* AN LP abilities (base page) */
 #define MDIO_PCS_EEE_ABLE	20	/* EEE Capability register */
+#define MDIO_PMA_NG_EXTABLE	21	/* 2.5G/5G PMA/PMD extended ability */
 #define MDIO_PCS_EEE_WK_ERR	22	/* EEE wake error counter */
 #define MDIO_PHYXS_LNSTAT	24	/* PHY XGXS lane state */
 #define MDIO_AN_EEE_ADV		60	/* EEE advertisement */
 #define MDIO_CTRL1_SPEED10G		(MDIO_CTRL1_SPEEDSELEXT | 0x00)
 /* 10PASS-TS/2BASE-TL */
 #define MDIO_CTRL1_SPEED10P2B		(MDIO_CTRL1_SPEEDSELEXT | 0x04)
+/* 2.5 Gb/s */
+#define MDIO_CTRL1_SPEED2_5G		(MDIO_CTRL1_SPEEDSELEXT | 0x18)
+/* 5 Gb/s */
+#define MDIO_CTRL1_SPEED5G		(MDIO_CTRL1_SPEEDSELEXT | 0x1c)
 /* Status register 1. */
 #define MDIO_STAT1_LPOWERABLE		0x0002	/* Low-power ability */
 /* Device present registers. */
 #define MDIO_DEVS_PRESENT(devad)	(1 << (devad))
+#define MDIO_DEVS_C22PRESENT		MDIO_DEVS_PRESENT(0)
 #define MDIO_DEVS_PMAPMD		MDIO_DEVS_PRESENT(MDIO_MMD_PMAPMD)
 #define MDIO_DEVS_WIS			MDIO_DEVS_PRESENT(MDIO_MMD_WIS)
 #define MDIO_DEVS_PCS			MDIO_DEVS_PRESENT(MDIO_MMD_PCS)
 #define MDIO_DEVS_TC			MDIO_DEVS_PRESENT(MDIO_MMD_TC)
 #define MDIO_DEVS_AN			MDIO_DEVS_PRESENT(MDIO_MMD_AN)
 #define MDIO_DEVS_C22EXT		MDIO_DEVS_PRESENT(MDIO_MMD_C22EXT)
+#define MDIO_DEVS_VEND1			MDIO_DEVS_PRESENT(MDIO_MMD_VEND1)
+#define MDIO_DEVS_VEND2			MDIO_DEVS_PRESENT(MDIO_MMD_VEND2)
 /* Control register 2. */
 #define MDIO_PMA_CTRL2_TYPE		0x000f	/* PMA/PMD type selection */
 #define MDIO_PMA_CTRL2_1000BKX		0x000d	/* 1000BASE-KX type */
 #define MDIO_PMA_CTRL2_100BTX		0x000e	/* 100BASE-TX type */
 #define MDIO_PMA_CTRL2_10BT		0x000f	/* 10BASE-T type */
+#define MDIO_PMA_CTRL2_2_5GBT		0x0030  /* 2.5GBaseT type */
+#define MDIO_PMA_CTRL2_5GBT		0x0031  /* 5GBaseT type */
 #define MDIO_PCS_CTRL2_TYPE		0x0003	/* PCS type selection */
 #define MDIO_PCS_CTRL2_10GBR		0x0000	/* 10GBASE-R type */
 #define MDIO_PCS_CTRL2_10GBX		0x0001	/* 10GBASE-X type */
 #define MDIO_PMA_EXTABLE_1000BKX	0x0040	/* 1000BASE-KX ability */
 #define MDIO_PMA_EXTABLE_100BTX		0x0080	/* 100BASE-TX ability */
 #define MDIO_PMA_EXTABLE_10BT		0x0100	/* 10BASE-T ability */
+#define MDIO_PMA_EXTABLE_NBT		0x4000  /* 2.5/5GBASE-T ability */
 /* PHY XGXS lane state register. */
 #define MDIO_PHYXS_LNSTAT_SYNC0		0x0001
 #define MDIO_PCS_10GBRT_STAT2_BER	0x3f00
 /* AN 10GBASE-T control register. */
+#define MDIO_AN_10GBT_CTRL_ADV2_5G	0x0080	/* Advertise 2.5GBASE-T */
+#define MDIO_AN_10GBT_CTRL_ADV5G	0x0100	/* Advertise 5GBASE-T */
 #define MDIO_AN_10GBT_CTRL_ADV10G	0x1000	/* Advertise 10GBASE-T */
 /* AN 10GBASE-T status register. */
+#define MDIO_AN_10GBT_STAT_LP2_5G	0x0020  /* LP is 2.5GBT capable */
+#define MDIO_AN_10GBT_STAT_LP5G		0x0040  /* LP is 5GBT capable */
 #define MDIO_AN_10GBT_STAT_LPTRR	0x0200	/* LP training reset req. */
 #define MDIO_AN_10GBT_STAT_LPLTABLE	0x0400	/* LP loop timing ability */
 #define MDIO_AN_10GBT_STAT_LP10G	0x0800	/* LP is 10GBT capable */
 #define MDIO_EEE_10GKX4		0x0020	/* 10G KX4 EEE cap */
 #define MDIO_EEE_10GKR		0x0040	/* 10G KR EEE cap */
+/* 2.5G/5G Extended abilities register. */
+#define MDIO_PMA_NG_EXTABLE_2_5GBT	0x0001	/* 2.5GBASET ability */
+#define MDIO_PMA_NG_EXTABLE_5GBT	0x0002	/* 5GBASET ability */
 /* LASI RX_ALARM control/status registers. */
 #define MDIO_PMA_LASI_RX_PHYXSLFLT	0x0001	/* PHY XS RX local fault */
 #define MDIO_PMA_LASI_RX_PCSLFLT	0x0008	/* PCS RX local fault */

include/uapi/linux/mman.h+4−0

 #define OVERCOMMIT_ALWAYS		1
 #define OVERCOMMIT_NEVER		2
+#define MAP_SHARED	0x01		/* Share changes */
+#define MAP_PRIVATE	0x02		/* Changes are private */
+#define MAP_SHARED_VALIDATE 0x03	/* share + validate extension flags */
 /*
  * Huge page size encoding when MAP_HUGETLB is specified, and a huge page
  * size other than the default is desired.  See hugetlb_encode.h.

include/uapi/linux/mroute.h+8−1

 #define MRT_TABLE	(MRT_BASE+9)	/* Specify mroute table ID		*/
 #define MRT_ADD_MFC_PROXY	(MRT_BASE+10)	/* Add a (*,*|G) mfc entry	*/
 #define MRT_DEL_MFC_PROXY	(MRT_BASE+11)	/* Del a (*,*|G) mfc entry	*/
-#define MRT_MAX		(MRT_BASE+11)
+#define MRT_FLUSH	(MRT_BASE+12)	/* Flush all mfc entries and/or vifs	*/
+#define MRT_MAX		(MRT_BASE+12)
 #define SIOCGETVIFCNT	SIOCPROTOPRIVATE	/* IP protocol privates */
 #define SIOCGETSGCNT	(SIOCPROTOPRIVATE+1)
 #define SIOCGETRPF	(SIOCPROTOPRIVATE+2)
+/* MRT_FLUSH optional flags */
+#define MRT_FLUSH_MFC	1	/* Flush multicast entries */
+#define MRT_FLUSH_MFC_STATIC	2	/* Flush static multicast entries */
+#define MRT_FLUSH_VIFS	4	/* Flush multicast vifs */
+#define MRT_FLUSH_VIFS_STATIC	8	/* Flush static multicast vifs */
 #define MAXVIFS		32
 typedef unsigned long vifbitmap_t;	/* User mode code depends on this lot */
 typedef unsigned short vifi_t;

include/uapi/linux/mroute6.h+8−1

 #define MRT6_TABLE	(MRT6_BASE+9)	/* Specify mroute table ID		*/
 #define MRT6_ADD_MFC_PROXY	(MRT6_BASE+10)	/* Add a (*,*|G) mfc entry	*/
 #define MRT6_DEL_MFC_PROXY	(MRT6_BASE+11)	/* Del a (*,*|G) mfc entry	*/
-#define MRT6_MAX	(MRT6_BASE+11)
+#define MRT6_FLUSH	(MRT6_BASE+12)	/* Flush all mfc entries and/or vifs	*/
+#define MRT6_MAX	(MRT6_BASE+12)
 #define SIOCGETMIFCNT_IN6	SIOCPROTOPRIVATE	/* IP protocol privates */
 #define SIOCGETSGCNT_IN6	(SIOCPROTOPRIVATE+1)
 #define SIOCGETRPF	(SIOCPROTOPRIVATE+2)
+/* MRT6_FLUSH optional flags */
+#define MRT6_FLUSH_MFC	1	/* Flush multicast entries */
+#define MRT6_FLUSH_MFC_STATIC	2	/* Flush static multicast entries */
+#define MRT6_FLUSH_MIFS	4	/* Flushing multicast vifs */
+#define MRT6_FLUSH_MIFS_STATIC	8	/* Flush static multicast vifs */
 #define MAXMIFS		32
 typedef unsigned long mifbitmap_t;	/* User mode code depends on this lot */
 typedef unsigned short mifi_t;

include/uapi/linux/ndctl.h+1−0

@@ -243,6 +243,7 @@ struct nd_cmd_pkg { · 242 unmodified lines
243	#define NVDIMM_FAMILY_HPE1 1	243	#define NVDIMM_FAMILY_HPE1 1
244	#define NVDIMM_FAMILY_HPE2 2	244	#define NVDIMM_FAMILY_HPE2 2
245	#define NVDIMM_FAMILY_MSFT 3	245	#define NVDIMM_FAMILY_MSFT 3
		246	#define NVDIMM_FAMILY_HYPERV 4
246		247
247	#define ND_IOCTL_CALL _IOWR(ND_IOCTL, ND_CMD_CALL,\	248	#define ND_IOCTL_CALL _IOWR(ND_IOCTL, ND_CMD_CALL,\
248	struct nd_cmd_pkg)	249	struct nd_cmd_pkg)

include/uapi/linux/netfilter/nf_tables.h+17−2

  * @NFTA_RULE_POSITION: numeric handle of the previous rule (NLA_U64)
  * @NFTA_RULE_USERDATA: user data (NLA_BINARY, NFT_USERDATA_MAXLEN)
  * @NFTA_RULE_ID: uniquely identifies a rule in a transaction (NLA_U32)
+ * @NFTA_RULE_POSITION_ID: transaction unique identifier of the previous rule (NLA_U32)
  */
 enum nft_rule_attributes {
 	NFTA_RULE_UNSPEC,
 	NFTA_RULE_USERDATA,
 	NFTA_RULE_PAD,
 	NFTA_RULE_ID,
+	NFTA_RULE_POSITION_ID,
 	__NFTA_RULE_MAX
 };
 #define NFTA_RULE_MAX		(__NFTA_RULE_MAX - 1)
  * @NFT_META_CGROUP: socket control group (skb->sk->sk_classid)
  * @NFT_META_PRANDOM: a 32bit pseudo-random number
  * @NFT_META_SECPATH: boolean, secpath_exists (!!skb->sp)
+ * @NFT_META_IIFKIND: packet input interface kind name (dev->rtnl_link_ops->kind)
+ * @NFT_META_OIFKIND: packet output interface kind name (dev->rtnl_link_ops->kind)
  */
 enum nft_meta_keys {
 	NFT_META_LEN,
 	NFT_META_CGROUP,
 	NFT_META_PRANDOM,
 	NFT_META_SECPATH,
+	NFT_META_IIFKIND,
+	NFT_META_OIFKIND,
 };
 /**
 	NFTA_HASH_SEED,
 	NFTA_HASH_OFFSET,
 	NFTA_HASH_TYPE,
-	NFTA_HASH_SET_NAME,
+	NFTA_HASH_SET_NAME,	/* deprecated */
-	NFTA_HASH_SET_ID,
+	NFTA_HASH_SET_ID,	/* deprecated */
 	__NFTA_HASH_MAX,
 };
 #define NFTA_HASH_MAX	(__NFTA_HASH_MAX - 1)
 };
 #define NFT_TUNNEL_MAX	(__NFT_TUNNEL_MAX - 1)
+enum nft_tunnel_mode {
+	NFT_TUNNEL_MODE_NONE,
+	NFT_TUNNEL_MODE_RX,
+	NFT_TUNNEL_MODE_TX,
+	__NFT_TUNNEL_MODE_MAX
+};
+#define NFT_TUNNEL_MODE_MAX	(__NFT_TUNNEL_MODE_MAX - 1)
 enum nft_tunnel_attributes {
 	NFTA_TUNNEL_UNSPEC,
 	NFTA_TUNNEL_KEY,
 	NFTA_TUNNEL_DREG,
+	NFTA_TUNNEL_MODE,
 	__NFTA_TUNNEL_MAX
 };
 #define NFTA_TUNNEL_MAX	(__NFTA_TUNNEL_MAX - 1)

include/uapi/linux/nl80211.h+39−5

  *	(a u32 with flags from &enum nl80211_wpa_versions).
  * @NL80211_ATTR_AKM_SUITES: Used with CONNECT, ASSOCIATE, and NEW_BEACON to
  *	indicate which key management algorithm(s) to use (an array of u32).
+ *	This attribute is also sent in response to @NL80211_CMD_GET_WIPHY,
+ *	indicating the supported AKM suites, intended for specific drivers which
+ *	implement SME and have constraints on which AKMs are supported and also
+ *	the cases where an AKM support is offloaded to the driver/firmware.
+ *	If there is no such notification from the driver, user space should
+ *	assume the driver supports all the AKM suites.
  *
  * @NL80211_ATTR_REQ_IE: (Re)association request information elements as
  *	sent out by the card, for ROAM and successful CONNECT events.
  *     &enum nl80211_external_auth_action value). This is used with the
  *     %NL80211_CMD_EXTERNAL_AUTH request event.
  * @NL80211_ATTR_EXTERNAL_AUTH_SUPPORT: Flag attribute indicating that the user
- *     space supports external authentication. This attribute shall be used
+ *	space supports external authentication. This attribute shall be used
- *     only with %NL80211_CMD_CONNECT request. The driver may offload
+ *	with %NL80211_CMD_CONNECT and %NL80211_CMD_START_AP request. The driver
- *     authentication processing to user space if this capability is indicated
+ *	may offload authentication processing to user space if this capability
- *     in NL80211_CMD_CONNECT requests from the user space.
+ *	is indicated in the respective requests from the user space.
  *
  * @NL80211_ATTR_NSS: Station's New/updated  RX_NSS value notified using this
  *	u8 attribute. This is used with %NL80211_CMD_STA_OPMODE_CHANGED.
  *	This is also used for capability advertisement in the wiphy information,
  *	with the appropriate sub-attributes.
  *
+ * @NL80211_ATTR_AIRTIME_WEIGHT: Station's weight when scheduled by the airtime
+ *	scheduler.
+ *
  * @NUM_NL80211_ATTR: total number of nl80211_attrs available
  * @NL80211_ATTR_MAX: highest attribute number currently defined
  * @__NL80211_ATTR_AFTER_LAST: internal use
 	NL80211_ATTR_PEER_MEASUREMENTS,
+	NL80211_ATTR_AIRTIME_WEIGHT,
 	/* add attributes here, update the policy in nl80211.c */
 	__NL80211_ATTR_AFTER_LAST,
  *	might not be fully accurate.
  * @NL80211_STA_INFO_CONNECTED_TO_GATE: set to true if STA has a path to a
  *	mesh gate (u8, 0 or 1)
+ * @NL80211_STA_INFO_TX_DURATION: aggregate PPDU duration for all frames
+ *	sent to the station (u64, usec)
+ * @NL80211_STA_INFO_AIRTIME_WEIGHT: current airtime weight for station (u16)
  * @__NL80211_STA_INFO_AFTER_LAST: internal
  * @NL80211_STA_INFO_MAX: highest possible station info attribute
  */
 	NL80211_STA_INFO_RX_MPDUS,
 	NL80211_STA_INFO_FCS_ERROR_COUNT,
 	NL80211_STA_INFO_CONNECTED_TO_GATE,
+	NL80211_STA_INFO_TX_DURATION,
+	NL80211_STA_INFO_AIRTIME_WEIGHT,
 	/* keep last */
 	__NL80211_STA_INFO_AFTER_LAST,
  * 	&enum nl80211_mpath_flags;
  * @NL80211_MPATH_INFO_DISCOVERY_TIMEOUT: total path discovery timeout, in msec
  * @NL80211_MPATH_INFO_DISCOVERY_RETRIES: mesh path discovery retries
+ * @NL80211_MPATH_INFO_HOP_COUNT: hop count to destination
+ * @NL80211_MPATH_INFO_PATH_CHANGE: total number of path changes to destination
  * @NL80211_MPATH_INFO_MAX: highest mesh path information attribute number
- *	currently defind
+ *	currently defined
  * @__NL80211_MPATH_INFO_AFTER_LAST: internal use
  */
 enum nl80211_mpath_info {
 	NL80211_MPATH_INFO_FLAGS,
 	NL80211_MPATH_INFO_DISCOVERY_TIMEOUT,
 	NL80211_MPATH_INFO_DISCOVERY_RETRIES,
+	NL80211_MPATH_INFO_HOP_COUNT,
+	NL80211_MPATH_INFO_PATH_CHANGE,
 	/* keep last */
 	__NL80211_MPATH_INFO_AFTER_LAST,
  *      if this flag is not set. Ignoring this can leak clear text packets and/or
  *      freeze the connection.
  *
+ * @NL80211_EXT_FEATURE_AIRTIME_FAIRNESS: Driver supports getting airtime
+ *	fairness for transmitted packets and has enabled airtime fairness
+ *	scheduling.
+ *
+ * @NL80211_EXT_FEATURE_AP_PMKSA_CACHING: Driver/device supports PMKSA caching
+ *	(set/del PMKSA operations) in AP mode.
+ *
  * @NUM_NL80211_EXT_FEATURES: number of extended features.
  * @MAX_NL80211_EXT_FEATURES: highest extended feature index.
  */
 	NL80211_EXT_FEATURE_SCAN_MIN_PREQ_CONTENT,
 	NL80211_EXT_FEATURE_CAN_REPLACE_PTK0,
 	NL80211_EXT_FEATURE_ENABLE_FTM_RESPONDER,
+	NL80211_EXT_FEATURE_AIRTIME_FAIRNESS,
+	NL80211_EXT_FEATURE_AP_PMKSA_CACHING,
 	/* add new features before the definition below */
 	NUM_NL80211_EXT_FEATURES,
  * Used by cfg80211_rx_mgmt()
  *
  * @NL80211_RXMGMT_FLAG_ANSWERED: frame was answered by device/driver.
+ * @NL80211_RXMGMT_FLAG_EXTERNAL_AUTH: Host driver intends to offload
+ *	the authentication. Exclusively defined for host drivers that
+ *	advertises the SME functionality but would like the userspace
+ *	to handle certain authentication algorithms (e.g. SAE).
  */
 enum nl80211_rxmgmt_flags {
 	NL80211_RXMGMT_FLAG_ANSWERED = 1 << 0,
+	NL80211_RXMGMT_FLAG_EXTERNAL_AUTH = 1 << 1,
 };
 /*

include/uapi/linux/nvme_ioctl.h+0−9

@@ -2,15 +2,6 @@ · 1 unmodified line
2	/*	2	/*
3	* Definitions for the NVM Express ioctl interface	3	* Definitions for the NVM Express ioctl interface
4	* Copyright (c) 2011-2014, Intel Corporation.	4	* Copyright (c) 2011-2014, Intel Corporation.
5	*
6	* This program is free software; you can redistribute it and/or modify it
7	* under the terms and conditions of the GNU General Public License,
8	* version 2, as published by the Free Software Foundation.
9	*
10	* This program is distributed in the hope it will be useful, but WITHOUT
11	* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
12	* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
13	* more details.
14	*/	5	*/
15		6
16	#ifndef _UAPI_LINUX_NVME_IOCTL_H	7	#ifndef _UAPI_LINUX_NVME_IOCTL_H

include/uapi/linux/pci_regs.h+2−0

 #define PCI_ATS_CAP		0x04	/* ATS Capability Register */
 #define  PCI_ATS_CAP_QDEP(x)	((x) & 0x1f)	/* Invalidate Queue Depth */
 #define  PCI_ATS_MAX_QDEP	32	/* Max Invalidate Queue Depth */
+#define  PCI_ATS_CAP_PAGE_ALIGNED	0x0020 /* Page Aligned Request */
 #define PCI_ATS_CTRL		0x06	/* ATS Control Register */
 #define  PCI_ATS_CTRL_ENABLE	0x8000	/* ATS Enable */
 #define  PCI_ATS_CTRL_STU(x)	((x) & 0x1f)	/* Smallest Translation Unit */
 #define  PCI_PRI_STATUS_RF	0x001	/* Response Failure */
 #define  PCI_PRI_STATUS_UPRGI	0x002	/* Unexpected PRG index */
 #define  PCI_PRI_STATUS_STOPPED	0x100	/* PRI Stopped */
+#define  PCI_PRI_STATUS_PASID	0x8000	/* PRG Response PASID Required */
 #define PCI_PRI_MAX_REQ		0x08	/* PRI max reqs supported */
 #define PCI_PRI_ALLOC_REQ	0x0c	/* PRI max reqs allowed */
 #define PCI_EXT_CAP_PRI_SIZEOF	16

include/uapi/linux/perf_event.h+52−3

@@ -372,7 +372,9 @@ struct perf_event_attr { · 371 unmodified lines
372	context_switch : 1, /* context switch data */	372	context_switch : 1, /* context switch data */
373	write_backward : 1, /* Write ring buffer from end to beginning */	373	write_backward : 1, /* Write ring buffer from end to beginning */
374	namespaces : 1, /* include namespaces data */	374	namespaces : 1, /* include namespaces data */
375	__reserved_1 : 35;	375	ksymbol : 1, /* include ksymbol events */
		376	bpf_event : 1, /* include bpf events */
		377	__reserved_1 : 33;
376		378
377	union {	379	union {
378	__u32 wakeup_events; /* wakeup every n events */	380	__u32 wakeup_events; /* wakeup every n events */
@@ -445,8 +447,6 @@ struct perf_event_query_bpf { · 66 unmodified lines
445	__u32 ids[0];	447	__u32 ids[0];
446	};	448	};
447		449
448	#define perf_flags(attr) (*(&(attr)->read_format + 1))
449
450	/*	450	/*
451	* Ioctls that can be done on a perf event fd:	451	* Ioctls that can be done on a perf event fd:
452	*/	452	*/
@@ -965,9 +965,58 @@ enum perf_event_type { · 512 unmodified lines
965	*/	965	*/
966	PERF_RECORD_NAMESPACES = 16,	966	PERF_RECORD_NAMESPACES = 16,
967		967
		968	/*
		969	* Record ksymbol register/unregister events:
		970	*
		971	* struct {
		972	* struct perf_event_header header;
		973	* u64 addr;
		974	* u32 len;
		975	* u16 ksym_type;
		976	* u16 flags;
		977	* char name[];
		978	* struct sample_id sample_id;
		979	* };
		980	*/
		981	PERF_RECORD_KSYMBOL = 17,
		982
		983	/*
		984	* Record bpf events:
		985	* enum perf_bpf_event_type {
		986	* PERF_BPF_EVENT_UNKNOWN = 0,
		987	* PERF_BPF_EVENT_PROG_LOAD = 1,
		988	* PERF_BPF_EVENT_PROG_UNLOAD = 2,
		989	* };
		990	*
		991	* struct {
		992	* struct perf_event_header header;
		993	* u16 type;
		994	* u16 flags;
		995	* u32 id;
		996	* u8 tag[BPF_TAG_SIZE];
		997	* struct sample_id sample_id;
		998	* };
		999	*/
		1000	PERF_RECORD_BPF_EVENT = 18,
		1001
968	PERF_RECORD_MAX, /* non-ABI */	1002	PERF_RECORD_MAX, /* non-ABI */
969	};	1003	};
970		1004
		1005	enum perf_record_ksymbol_type {
		1006	PERF_RECORD_KSYMBOL_TYPE_UNKNOWN = 0,
		1007	PERF_RECORD_KSYMBOL_TYPE_BPF = 1,
		1008	PERF_RECORD_KSYMBOL_TYPE_MAX /* non-ABI */
		1009	};
		1010
		1011	#define PERF_RECORD_KSYMBOL_FLAGS_UNREGISTER (1 << 0)
		1012
		1013	enum perf_bpf_event_type {
		1014	PERF_BPF_EVENT_UNKNOWN = 0,
		1015	PERF_BPF_EVENT_PROG_LOAD = 1,
		1016	PERF_BPF_EVENT_PROG_UNLOAD = 2,
		1017	PERF_BPF_EVENT_MAX, /* non-ABI */
		1018	};
		1019
971	#define PERF_MAX_STACK_DEPTH 127	1020	#define PERF_MAX_STACK_DEPTH 127
972	#define PERF_MAX_CONTEXTS_PER_STACK 8	1021	#define PERF_MAX_CONTEXTS_PER_STACK 8
973		1022

include/uapi/linux/pkt_cls.h+54−4

@@ -63,12 +63,49 @@ enum { · 62 unmodified lines
63	#define TC_ACT_GOTO_CHAIN __TC_ACT_EXT(2)	63	#define TC_ACT_GOTO_CHAIN __TC_ACT_EXT(2)
64	#define TC_ACT_EXT_OPCODE_MAX TC_ACT_GOTO_CHAIN	64	#define TC_ACT_EXT_OPCODE_MAX TC_ACT_GOTO_CHAIN
65		65
		66	/* These macros are put here for binary compatibility with userspace apps that
		67	* make use of them. For kernel code and new userspace apps, use the TCA_ID_*
		68	* versions.
		69	*/
		70	#define TCA_ACT_GACT 5
		71	#define TCA_ACT_IPT 6
		72	#define TCA_ACT_PEDIT 7
		73	#define TCA_ACT_MIRRED 8
		74	#define TCA_ACT_NAT 9
		75	#define TCA_ACT_XT 10
		76	#define TCA_ACT_SKBEDIT 11
		77	#define TCA_ACT_VLAN 12
		78	#define TCA_ACT_BPF 13
		79	#define TCA_ACT_CONNMARK 14
		80	#define TCA_ACT_SKBMOD 15
		81	#define TCA_ACT_CSUM 16
		82	#define TCA_ACT_TUNNEL_KEY 17
		83	#define TCA_ACT_SIMP 22
		84	#define TCA_ACT_IFE 25
		85	#define TCA_ACT_SAMPLE 26
		86
66	/* Action type identifiers*/	87	/* Action type identifiers*/
67	enum {	88	enum tca_id {
68	TCA_ID_UNSPEC=0,	89	TCA_ID_UNSPEC = 0,
69	TCA_ID_POLICE=1,	90	TCA_ID_POLICE = 1,
		91	TCA_ID_GACT = TCA_ACT_GACT,
		92	TCA_ID_IPT = TCA_ACT_IPT,
		93	TCA_ID_PEDIT = TCA_ACT_PEDIT,
		94	TCA_ID_MIRRED = TCA_ACT_MIRRED,
		95	TCA_ID_NAT = TCA_ACT_NAT,
		96	TCA_ID_XT = TCA_ACT_XT,
		97	TCA_ID_SKBEDIT = TCA_ACT_SKBEDIT,
		98	TCA_ID_VLAN = TCA_ACT_VLAN,
		99	TCA_ID_BPF = TCA_ACT_BPF,
		100	TCA_ID_CONNMARK = TCA_ACT_CONNMARK,
		101	TCA_ID_SKBMOD = TCA_ACT_SKBMOD,
		102	TCA_ID_CSUM = TCA_ACT_CSUM,
		103	TCA_ID_TUNNEL_KEY = TCA_ACT_TUNNEL_KEY,
		104	TCA_ID_SIMP = TCA_ACT_SIMP,
		105	TCA_ID_IFE = TCA_ACT_IFE,
		106	TCA_ID_SAMPLE = TCA_ACT_SAMPLE,
70	/* other actions go here */	107	/* other actions go here */
71	__TCA_ID_MAX=255	108	__TCA_ID_MAX = 255
72	};	109	};
73		110
74	#define TCA_ID_MAX __TCA_ID_MAX	111	#define TCA_ID_MAX __TCA_ID_MAX
@@ -333,12 +370,19 @@ enum { · 258 unmodified lines
333		370
334	/* Basic filter */	371	/* Basic filter */
335		372
		373	struct tc_basic_pcnt {
		374	__u64 rcnt;
		375	__u64 rhit;
		376	};
		377
336	enum {	378	enum {
337	TCA_BASIC_UNSPEC,	379	TCA_BASIC_UNSPEC,
338	TCA_BASIC_CLASSID,	380	TCA_BASIC_CLASSID,
339	TCA_BASIC_EMATCHES,	381	TCA_BASIC_EMATCHES,
340	TCA_BASIC_ACT,	382	TCA_BASIC_ACT,
341	TCA_BASIC_POLICE,	383	TCA_BASIC_POLICE,
		384	TCA_BASIC_PCNT,
		385	TCA_BASIC_PAD,
342	__TCA_BASIC_MAX	386	__TCA_BASIC_MAX
343	};	387	};
344		388
@@ -527,11 +571,17 @@ enum { · 182 unmodified lines
527		571
528	/* Match-all classifier */	572	/* Match-all classifier */
529		573
		574	struct tc_matchall_pcnt {
		575	__u64 rhit;
		576	};
		577
530	enum {	578	enum {
531	TCA_MATCHALL_UNSPEC,	579	TCA_MATCHALL_UNSPEC,
532	TCA_MATCHALL_CLASSID,	580	TCA_MATCHALL_CLASSID,
533	TCA_MATCHALL_ACT,	581	TCA_MATCHALL_ACT,
534	TCA_MATCHALL_FLAGS,	582	TCA_MATCHALL_FLAGS,
		583	TCA_MATCHALL_PCNT,
		584	TCA_MATCHALL_PAD,
535	__TCA_MATCHALL_MAX,	585	__TCA_MATCHALL_MAX,
536	};	586	};
537		587

include/uapi/linux/pkt_sched.h+2−1

 #define TCA_PIE_MAX   (__TCA_PIE_MAX - 1)
 struct tc_pie_xstats {
-	__u32 prob;             /* current probability */
+	__u64 prob;             /* current probability */
 	__u32 delay;            /* current delay in ms */
 	__u32 avg_dq_rate;      /* current average dq_rate in bits/pie_time */
 	__u32 packets_in;       /* total number of packets enqueued */
 	TCA_CAKE_INGRESS,
 	TCA_CAKE_ACK_FILTER,
 	TCA_CAKE_SPLIT_GSO,
+	TCA_CAKE_FWMARK,
 	__TCA_CAKE_MAX
 };
 #define TCA_CAKE_MAX	(__TCA_CAKE_MAX - 1)

include/uapi/linux/pmu.h+2−0

 #define PMU_POWER_CTRL		0x11	/* control power of some devices */
 #define PMU_ADB_CMD		0x20	/* send ADB packet */
 #define PMU_ADB_POLL_OFF	0x21	/* disable ADB auto-poll */
+#define PMU_WRITE_XPRAM		0x32	/* write eXtended Parameter RAM */
 #define PMU_WRITE_NVRAM		0x33	/* write non-volatile RAM */
+#define PMU_READ_XPRAM		0x3a	/* read eXtended Parameter RAM */
 #define PMU_READ_NVRAM		0x3b	/* read non-volatile RAM */
 #define PMU_SET_RTC		0x30	/* set real-time clock */
 #define PMU_READ_RTC		0x38	/* read real-time clock */

include/uapi/linux/prctl.h+1−0

@@ -219,6 +219,7 @@ struct prctl_mm_map { · 218 unmodified lines
219	# define PR_SPEC_ENABLE (1UL << 1)	219	# define PR_SPEC_ENABLE (1UL << 1)
220	# define PR_SPEC_DISABLE (1UL << 2)	220	# define PR_SPEC_DISABLE (1UL << 2)
221	# define PR_SPEC_FORCE_DISABLE (1UL << 3)	221	# define PR_SPEC_FORCE_DISABLE (1UL << 3)
		222	# define PR_SPEC_DISABLE_NOEXEC (1UL << 4)
222		223
223	/* Reset arm64 pointer authentication keys */	224	/* Reset arm64 pointer authentication keys */
224	#define PR_PAC_RESET_KEYS 54	225	#define PR_PAC_RESET_KEYS 54

include/uapi/linux/rds.h+11−0

 #define RDS_TRANS_COUNT	3
 #define	RDS_TRANS_NONE	(~0)
+/* IOCTLS commands for SOL_RDS */
+#define SIOCRDSSETTOS		(SIOCPROTOPRIVATE)
+#define SIOCRDSGETTOS		(SIOCPROTOPRIVATE + 1)
+typedef __u8	rds_tos_t;
 /*
  * Control message types for SOL_RDS.
  *
 	__be32		faddr;
 	__u8		transport[TRANSNAMSIZ];		/* null term ascii */
 	__u8		flags;
+	__u8		tos;
 } __attribute__((packed));
 struct rds6_info_connection {
 	__be16		lport;
 	__be16		fport;
 	__u8		flags;
+	__u8		tos;
 } __attribute__((packed));
 struct rds6_info_message {
 	__u32           last_sent_nxt;
 	__u32           last_expected_una;
 	__u32           last_seen_una;
+	__u8		tos;
 } __attribute__((packed));
 struct rds6_info_tcp_socket {
 	__u32		max_send_sge;
 	__u32		rdma_mr_max;
 	__u32		rdma_mr_size;
+	__u8		tos;
 };
 struct rds6_info_rdma_connection {
 	__u32		max_send_sge;
 	__u32		rdma_mr_max;
 	__u32		rdma_mr_size;
+	__u8		tos;
 };
 /* RDS message Receive Path Latency points */

include/uapi/linux/sctp.h+4−0

@@ -59,6 +59,10 @@ · 58 unmodified lines
59		59
60	typedef __s32 sctp_assoc_t;	60	typedef __s32 sctp_assoc_t;
61		61
		62	#define SCTP_FUTURE_ASSOC 0
		63	#define SCTP_CURRENT_ASSOC 1
		64	#define SCTP_ALL_ASSOC 2
		65
62	/* The following symbols come from the Sockets API Extensions for	66	/* The following symbols come from the Sockets API Extensions for
63	* SCTP <draft-ietf-tsvwg-sctpsocket-07.txt>.	67	* SCTP <draft-ietf-tsvwg-sctpsocket-07.txt>.
64	*/	68	*/

include/uapi/linux/serial_core.h+3−0

@@ -79,6 +79,9 @@ · 78 unmodified lines
79	/* Nuvoton UART */	79	/* Nuvoton UART */
80	#define PORT_NPCM 40	80	#define PORT_NPCM 40
81		81
		82	/* NVIDIA Tegra Combined UART */
		83	#define PORT_TEGRA_TCU 41
		84
82	/* Intel EG20 */	85	/* Intel EG20 */
83	#define PORT_PCH_8LINE 44	86	#define PORT_PCH_8LINE 44
84	#define PORT_PCH_2LINE 45	87	#define PORT_PCH_2LINE 45

include/uapi/linux/tc_act/tc_bpf.h+0−2

@@ -13,8 +13,6 @@ · 12 unmodified lines
13		13
14	#include <linux/pkt_cls.h>	14	#include <linux/pkt_cls.h>
15		15
16	#define TCA_ACT_BPF 13
17
18	struct tc_act_bpf {	16	struct tc_act_bpf {
19	tc_gen;	17	tc_gen;
20	};	18	};

include/uapi/linux/tc_act/tc_connmark.h+0−2

@@ -5,8 +5,6 @@ · 4 unmodified lines
5	#include <linux/types.h>	5	#include <linux/types.h>
6	#include <linux/pkt_cls.h>	6	#include <linux/pkt_cls.h>
7		7
8	#define TCA_ACT_CONNMARK 14
9
10	struct tc_connmark {	8	struct tc_connmark {
11	tc_gen;	9	tc_gen;
12	__u16 zone;	10	__u16 zone;

include/uapi/linux/tc_act/tc_csum.h+0−2

@@ -5,8 +5,6 @@ · 4 unmodified lines
5	#include <linux/types.h>	5	#include <linux/types.h>
6	#include <linux/pkt_cls.h>	6	#include <linux/pkt_cls.h>
7		7
8	#define TCA_ACT_CSUM 16
9
10	enum {	8	enum {
11	TCA_CSUM_UNSPEC,	9	TCA_CSUM_UNSPEC,
12	TCA_CSUM_PARMS,	10	TCA_CSUM_PARMS,

include/uapi/linux/tc_act/tc_gact.h+0−1

@@ -5,7 +5,6 @@ · 4 unmodified lines
5	#include <linux/types.h>	5	#include <linux/types.h>
6	#include <linux/pkt_cls.h>	6	#include <linux/pkt_cls.h>
7		7
8	#define TCA_ACT_GACT 5
9	struct tc_gact {	8	struct tc_gact {
10	tc_gen;	9	tc_gen;
11		10

include/uapi/linux/tc_act/tc_ife.h+0−1

@@ -6,7 +6,6 @@ · 5 unmodified lines
6	#include <linux/pkt_cls.h>	6	#include <linux/pkt_cls.h>
7	#include <linux/ife.h>	7	#include <linux/ife.h>
8		8
9	#define TCA_ACT_IFE 25
10	/* Flag bits for now just encoding/decoding; mutually exclusive */	9	/* Flag bits for now just encoding/decoding; mutually exclusive */
11	#define IFE_ENCODE 1	10	#define IFE_ENCODE 1
12	#define IFE_DECODE 0	11	#define IFE_DECODE 0

include/uapi/linux/tc_act/tc_ipt.h+0−3

@@ -4,9 +4,6 @@ · 3 unmodified lines
4		4
5	#include <linux/pkt_cls.h>	5	#include <linux/pkt_cls.h>
6		6
7	#define TCA_ACT_IPT 6
8	#define TCA_ACT_XT 10
9
10	enum {	7	enum {
11	TCA_IPT_UNSPEC,	8	TCA_IPT_UNSPEC,
12	TCA_IPT_TABLE,	9	TCA_IPT_TABLE,

include/uapi/linux/tc_act/tc_mirred.h+0−1

@@ -5,7 +5,6 @@ · 4 unmodified lines
5	#include <linux/types.h>	5	#include <linux/types.h>
6	#include <linux/pkt_cls.h>	6	#include <linux/pkt_cls.h>
7		7
8	#define TCA_ACT_MIRRED 8
9	#define TCA_EGRESS_REDIR 1 /* packet redirect to EGRESS*/	8	#define TCA_EGRESS_REDIR 1 /* packet redirect to EGRESS*/
10	#define TCA_EGRESS_MIRROR 2 /* mirror packet to EGRESS */	9	#define TCA_EGRESS_MIRROR 2 /* mirror packet to EGRESS */
11	#define TCA_INGRESS_REDIR 3 /* packet redirect to INGRESS*/	10	#define TCA_INGRESS_REDIR 3 /* packet redirect to INGRESS*/

include/uapi/linux/tc_act/tc_nat.h+0−2

@@ -5,8 +5,6 @@ · 4 unmodified lines
5	#include <linux/pkt_cls.h>	5	#include <linux/pkt_cls.h>
6	#include <linux/types.h>	6	#include <linux/types.h>
7		7
8	#define TCA_ACT_NAT 9
9
10	enum {	8	enum {
11	TCA_NAT_UNSPEC,	9	TCA_NAT_UNSPEC,
12	TCA_NAT_PARMS,	10	TCA_NAT_PARMS,

include/uapi/linux/tc_act/tc_pedit.h+0−2

@@ -5,8 +5,6 @@ · 4 unmodified lines
5	#include <linux/types.h>	5	#include <linux/types.h>
6	#include <linux/pkt_cls.h>	6	#include <linux/pkt_cls.h>
7		7
8	#define TCA_ACT_PEDIT 7
9
10	enum {	8	enum {
11	TCA_PEDIT_UNSPEC,	9	TCA_PEDIT_UNSPEC,
12	TCA_PEDIT_TM,	10	TCA_PEDIT_TM,

include/uapi/linux/tc_act/tc_sample.h+0−2

@@ -6,8 +6,6 @@ · 5 unmodified lines
6	#include <linux/pkt_cls.h>	6	#include <linux/pkt_cls.h>
7	#include <linux/if_ether.h>	7	#include <linux/if_ether.h>
8		8
9	#define TCA_ACT_SAMPLE 26
10
11	struct tc_sample {	9	struct tc_sample {
12	tc_gen;	10	tc_gen;
13	};	11	};

include/uapi/linux/tc_act/tc_skbedit.h+0−2

@@ -23,8 +23,6 @@ · 22 unmodified lines
23		23
24	#include <linux/pkt_cls.h>	24	#include <linux/pkt_cls.h>
25		25
26	#define TCA_ACT_SKBEDIT 11
27
28	#define SKBEDIT_F_PRIORITY 0x1	26	#define SKBEDIT_F_PRIORITY 0x1
29	#define SKBEDIT_F_QUEUE_MAPPING 0x2	27	#define SKBEDIT_F_QUEUE_MAPPING 0x2
30	#define SKBEDIT_F_MARK 0x4	28	#define SKBEDIT_F_MARK 0x4

include/uapi/linux/tc_act/tc_skbmod.h+0−2

@@ -13,8 +13,6 @@ · 12 unmodified lines
13		13
14	#include <linux/pkt_cls.h>	14	#include <linux/pkt_cls.h>
15		15
16	#define TCA_ACT_SKBMOD 15
17
18	#define SKBMOD_F_DMAC 0x1	16	#define SKBMOD_F_DMAC 0x1
19	#define SKBMOD_F_SMAC 0x2	17	#define SKBMOD_F_SMAC 0x2
20	#define SKBMOD_F_ETYPE 0x4	18	#define SKBMOD_F_ETYPE 0x4

include/uapi/linux/tc_act/tc_tunnel_key.h+0−2

@@ -14,8 +14,6 @@ · 13 unmodified lines
14		14
15	#include <linux/pkt_cls.h>	15	#include <linux/pkt_cls.h>
16		16
17	#define TCA_ACT_TUNNEL_KEY 17
18
19	#define TCA_TUNNEL_KEY_ACT_SET 1	17	#define TCA_TUNNEL_KEY_ACT_SET 1
20	#define TCA_TUNNEL_KEY_ACT_RELEASE 2	18	#define TCA_TUNNEL_KEY_ACT_RELEASE 2
21		19

include/uapi/linux/tc_act/tc_vlan.h+0−2

@@ -13,8 +13,6 @@ · 12 unmodified lines
13		13
14	#include <linux/pkt_cls.h>	14	#include <linux/pkt_cls.h>
15		15
16	#define TCA_ACT_VLAN 12
17
18	#define TCA_VLAN_ACT_POP 1	16	#define TCA_VLAN_ACT_POP 1
19	#define TCA_VLAN_ACT_PUSH 2	17	#define TCA_VLAN_ACT_PUSH 2
20	#define TCA_VLAN_ACT_MODIFY 3	18	#define TCA_VLAN_ACT_MODIFY 3

include/uapi/linux/time.h+1−28

@@ -3,7 +3,7 @@ · 2 unmodified lines
3	#define _UAPI_LINUX_TIME_H	3	#define _UAPI_LINUX_TIME_H
4		4
5	#include <linux/types.h>	5	#include <linux/types.h>
6		6	#include <linux/time_types.h>
7		7
8	#ifndef _STRUCT_TIMESPEC	8	#ifndef _STRUCT_TIMESPEC
9	#define _STRUCT_TIMESPEC	9	#define _STRUCT_TIMESPEC
@@ -23,7 +23,6 @@ struct timezone { · 13 unmodified lines
23	int tz_dsttime; /* type of dst correction */	23	int tz_dsttime; /* type of dst correction */
24	};	24	};
25		25
26
27	/*	26	/*
28	* Names of the interval timers, and structure	27	* Names of the interval timers, and structure
29	* defining a timer setting:	28	* defining a timer setting:
@@ -42,32 +41,6 @@ struct itimerval { · 12 unmodified lines
42	struct timeval it_value; /* current value */	41	struct timeval it_value; /* current value */
43	};	42	};
44		43
45	#ifndef __kernel_timespec
46	struct __kernel_timespec {
47	__kernel_time64_t tv_sec; /* seconds */
48	long long tv_nsec; /* nanoseconds */
49	};
50	#endif
51
52	#ifndef __kernel_itimerspec
53	struct __kernel_itimerspec {
54	struct __kernel_timespec it_interval; /* timer period */
55	struct __kernel_timespec it_value; /* timer expiration */
56	};
57	#endif
58
59	/*
60	* legacy timeval structure, only embedded in structures that
61	* traditionally used 'timeval' to pass time intervals (not absolute
62	* times). Do not add new users. If user space fails to compile
63	* here, this is probably because it is not y2038 safe and needs to
64	* be changed to use another interface.
65	*/
66	struct __kernel_old_timeval {
67	__kernel_long_t tv_sec;
68	__kernel_long_t tv_usec;
69	};
70
71	/*	44	/*
72	* The IDs of the various system clocks (for POSIX.1b interval timers):	45	* The IDs of the various system clocks (for POSIX.1b interval timers):
73	*/	46	*/

include/uapi/linux/time_types.h+36−0

@@ -0,0 +1,36 @@
	1	/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
	2	#ifndef _UAPI_LINUX_TIME_TYPES_H
	3	#define _UAPI_LINUX_TIME_TYPES_H
	4
	5	#include <linux/types.h>
	6
	7	struct __kernel_timespec {
	8	__kernel_time64_t tv_sec; /* seconds */
	9	long long tv_nsec; /* nanoseconds */
	10	};
	11
	12	struct __kernel_itimerspec {
	13	struct __kernel_timespec it_interval; /* timer period */
	14	struct __kernel_timespec it_value; /* timer expiration */
	15	};
	16
	17	/*
	18	* legacy timeval structure, only embedded in structures that
	19	* traditionally used 'timeval' to pass time intervals (not absolute
	20	* times). Do not add new users. If user space fails to compile
	21	* here, this is probably because it is not y2038 safe and needs to
	22	* be changed to use another interface.
	23	*/
	24	#ifndef __kernel_old_timeval
	25	struct __kernel_old_timeval {
	26	__kernel_long_t tv_sec;
	27	__kernel_long_t tv_usec;
	28	};
	29	#endif
	30
	31	struct __kernel_sock_timeval {
	32	__s64 tv_sec;
	33	__s64 tv_usec;
	34	};
	35
	36	#endif /* _UAPI_LINUX_TIME_TYPES_H */

include/uapi/linux/timex.h+39−0

@@ -92,6 +92,45 @@ struct timex { · 91 unmodified lines
92	int :32; int :32; int :32;	92	int :32; int :32; int :32;
93	};	93	};
94		94
		95	struct __kernel_timex_timeval {
		96	__kernel_time64_t tv_sec;
		97	long long tv_usec;
		98	};
		99
		100	struct __kernel_timex {
		101	unsigned int modes; /* mode selector */
		102	int :32; /* pad */
		103	long long offset; /* time offset (usec) */
		104	long long freq; /* frequency offset (scaled ppm) */
		105	long long maxerror;/* maximum error (usec) */
		106	long long esterror;/* estimated error (usec) */
		107	int status; /* clock command/status */
		108	int :32; /* pad */
		109	long long constant;/* pll time constant */
		110	long long precision;/* clock precision (usec) (read only) */
		111	long long tolerance;/* clock frequency tolerance (ppm)
		112	* (read only)
		113	*/
		114	struct __kernel_timex_timeval time; /* (read only, except for ADJ_SETOFFSET) */
		115	long long tick; /* (modified) usecs between clock ticks */
		116
		117	long long ppsfreq;/* pps frequency (scaled ppm) (ro) */
		118	long long jitter; /* pps jitter (us) (ro) */
		119	int shift; /* interval duration (s) (shift) (ro) */
		120	int :32; /* pad */
		121	long long stabil; /* pps stability (scaled ppm) (ro) */
		122	long long jitcnt; /* jitter limit exceeded (ro) */
		123	long long calcnt; /* calibration intervals (ro) */
		124	long long errcnt; /* calibration errors (ro) */
		125	long long stbcnt; /* stability limit exceeded (ro) */
		126
		127	int tai; /* TAI offset (ro) */
		128
		129	int :32; int :32; int :32; int :32;
		130	int :32; int :32; int :32; int :32;
		131	int :32; int :32; int :32;
		132	};
		133
95	/*	134	/*
96	* Mode codes (timex.mode)	135	* Mode codes (timex.mode)
97	*/	136	*/

include/uapi/linux/tls.h+19−0

@@ -51,6 +51,10 @@ · 50 unmodified lines
51	#define TLS_1_2_VERSION_MINOR 0x3	51	#define TLS_1_2_VERSION_MINOR 0x3
52	#define TLS_1_2_VERSION TLS_VERSION_NUMBER(TLS_1_2)	52	#define TLS_1_2_VERSION TLS_VERSION_NUMBER(TLS_1_2)
53		53
		54	#define TLS_1_3_VERSION_MAJOR 0x3
		55	#define TLS_1_3_VERSION_MINOR 0x4
		56	#define TLS_1_3_VERSION TLS_VERSION_NUMBER(TLS_1_3)
		57
54	/* Supported ciphers */	58	/* Supported ciphers */
55	#define TLS_CIPHER_AES_GCM_128 51	59	#define TLS_CIPHER_AES_GCM_128 51
56	#define TLS_CIPHER_AES_GCM_128_IV_SIZE 8	60	#define TLS_CIPHER_AES_GCM_128_IV_SIZE 8
@@ -59,6 +63,13 @@ · 2 unmodified lines
59	#define TLS_CIPHER_AES_GCM_128_TAG_SIZE 16	63	#define TLS_CIPHER_AES_GCM_128_TAG_SIZE 16
60	#define TLS_CIPHER_AES_GCM_128_REC_SEQ_SIZE 8	64	#define TLS_CIPHER_AES_GCM_128_REC_SEQ_SIZE 8
61		65
		66	#define TLS_CIPHER_AES_GCM_256 52
		67	#define TLS_CIPHER_AES_GCM_256_IV_SIZE 8
		68	#define TLS_CIPHER_AES_GCM_256_KEY_SIZE 32
		69	#define TLS_CIPHER_AES_GCM_256_SALT_SIZE 4
		70	#define TLS_CIPHER_AES_GCM_256_TAG_SIZE 16
		71	#define TLS_CIPHER_AES_GCM_256_REC_SEQ_SIZE 8
		72
62	#define TLS_SET_RECORD_TYPE 1	73	#define TLS_SET_RECORD_TYPE 1
63	#define TLS_GET_RECORD_TYPE 2	74	#define TLS_GET_RECORD_TYPE 2
64		75
@@ -75,4 +86,12 @@ struct tls12_crypto_info_aes_gcm_128 { · 10 unmodified lines
75	unsigned char rec_seq[TLS_CIPHER_AES_GCM_128_REC_SEQ_SIZE];	86	unsigned char rec_seq[TLS_CIPHER_AES_GCM_128_REC_SEQ_SIZE];
76	};	87	};
77		88
		89	struct tls12_crypto_info_aes_gcm_256 {
		90	struct tls_crypto_info info;
		91	unsigned char iv[TLS_CIPHER_AES_GCM_256_IV_SIZE];
		92	unsigned char key[TLS_CIPHER_AES_GCM_256_KEY_SIZE];
		93	unsigned char salt[TLS_CIPHER_AES_GCM_256_SALT_SIZE];
		94	unsigned char rec_seq[TLS_CIPHER_AES_GCM_256_REC_SEQ_SIZE];
		95	};
		96
78	#endif /* _UAPI_LINUX_TLS_H */	97	#endif /* _UAPI_LINUX_TLS_H */

include/uapi/linux/v4l2-controls.h+2−0

 };
 #define V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING_LAYER	(V4L2_CID_MPEG_BASE+381)
 #define V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING_LAYER_QP	(V4L2_CID_MPEG_BASE+382)
+#define V4L2_CID_MPEG_VIDEO_H264_CONSTRAINED_INTRA_PREDICTION	(V4L2_CID_MPEG_BASE+383)
+#define V4L2_CID_MPEG_VIDEO_H264_CHROMA_QP_INDEX_OFFSET		(V4L2_CID_MPEG_BASE+384)
 #define V4L2_CID_MPEG_VIDEO_MPEG4_I_FRAME_QP	(V4L2_CID_MPEG_BASE+400)
 #define V4L2_CID_MPEG_VIDEO_MPEG4_P_FRAME_QP	(V4L2_CID_MPEG_BASE+401)
 #define V4L2_CID_MPEG_VIDEO_MPEG4_B_FRAME_QP	(V4L2_CID_MPEG_BASE+402)

include/uapi/linux/videodev2.h+25−1

 	((field) == V4L2_FIELD_BOTTOM ||\
 	 (field) == V4L2_FIELD_TOP ||\
 	 (field) == V4L2_FIELD_ALTERNATE)
+#define V4L2_FIELD_IS_INTERLACED(field) \
+	((field) == V4L2_FIELD_INTERLACED ||\
+	 (field) == V4L2_FIELD_INTERLACED_TB ||\
+	 (field) == V4L2_FIELD_INTERLACED_BT)
+#define V4L2_FIELD_IS_SEQUENTIAL(field) \
+	((field) == V4L2_FIELD_SEQ_TB ||\
+	 (field) == V4L2_FIELD_SEQ_BT)
 enum v4l2_buf_type {
 	V4L2_BUF_TYPE_VIDEO_CAPTURE        = 1,
 	 || (type) == V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY	\
 	 || (type) == V4L2_BUF_TYPE_VBI_OUTPUT			\
 	 || (type) == V4L2_BUF_TYPE_SLICED_VBI_OUTPUT		\
-	 || (type) == V4L2_BUF_TYPE_SDR_OUTPUT)
+	 || (type) == V4L2_BUF_TYPE_SDR_OUTPUT			\
+	 || (type) == V4L2_BUF_TYPE_META_OUTPUT)
 enum v4l2_tuner_type {
 	V4L2_TUNER_RADIO	     = 1,
 #define V4L2_PIX_FMT_YUV555  v4l2_fourcc('Y', 'U', 'V', 'O') /* 16  YUV-5-5-5     */
 #define V4L2_PIX_FMT_YUV565  v4l2_fourcc('Y', 'U', 'V', 'P') /* 16  YUV-5-6-5     */
 #define V4L2_PIX_FMT_YUV32   v4l2_fourcc('Y', 'U', 'V', '4') /* 32  YUV-8-8-8-8   */
+#define V4L2_PIX_FMT_AYUV32  v4l2_fourcc('A', 'Y', 'U', 'V') /* 32  AYUV-8-8-8-8  */
+#define V4L2_PIX_FMT_XYUV32  v4l2_fourcc('X', 'Y', 'U', 'V') /* 32  XYUV-8-8-8-8  */
+#define V4L2_PIX_FMT_VUYA32  v4l2_fourcc('V', 'U', 'Y', 'A') /* 32  VUYA-8-8-8-8  */
+#define V4L2_PIX_FMT_VUYX32  v4l2_fourcc('V', 'U', 'Y', 'X') /* 32  VUYX-8-8-8-8  */
 #define V4L2_PIX_FMT_HI240   v4l2_fourcc('H', 'I', '2', '4') /*  8  8-bit color   */
 #define V4L2_PIX_FMT_HM12    v4l2_fourcc('H', 'M', '1', '2') /*  8  YUV 4:2:0 16x16 macroblocks */
 #define V4L2_PIX_FMT_M420    v4l2_fourcc('M', '4', '2', '0') /* 12  YUV 4:2:0 2 lines y, 1 line uv interleaved */
 	};
 };
+/**
+ * v4l2_timeval_to_ns - Convert timeval to nanoseconds
+ * @ts:		pointer to the timeval variable to be converted
+ *
+ * Returns the scalar nanosecond representation of the timeval
+ * parameter.
+ */
+static inline __u64 v4l2_timeval_to_ns(const struct timeval *tv)
+{
+	return (__u64)tv->tv_sec * 1000000000ULL + tv->tv_usec * 1000;
+}
 /*  Flags for 'flags' field */
 /* Buffer is mapped (flag) */
 #define V4L2_BUF_FLAG_MAPPED			0x00000001

include/uapi/linux/xdp_diag.h+72−0

@@ -0,0 +1,72 @@
	1	/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
	2	/*
	3	* xdp_diag: interface for query/monitor XDP sockets
	4	* Copyright(c) 2019 Intel Corporation.
	5	*/
	6
	7	#ifndef _LINUX_XDP_DIAG_H
	8	#define _LINUX_XDP_DIAG_H
	9
	10	#include <linux/types.h>
	11
	12	struct xdp_diag_req {
	13	__u8 sdiag_family;
	14	__u8 sdiag_protocol;
	15	__u16 pad;
	16	__u32 xdiag_ino;
	17	__u32 xdiag_show;
	18	__u32 xdiag_cookie[2];
	19	};
	20
	21	struct xdp_diag_msg {
	22	__u8 xdiag_family;
	23	__u8 xdiag_type;
	24	__u16 pad;
	25	__u32 xdiag_ino;
	26	__u32 xdiag_cookie[2];
	27	};
	28
	29	#define XDP_SHOW_INFO (1 << 0) /* Basic information */
	30	#define XDP_SHOW_RING_CFG (1 << 1)
	31	#define XDP_SHOW_UMEM (1 << 2)
	32	#define XDP_SHOW_MEMINFO (1 << 3)
	33
	34	enum {
	35	XDP_DIAG_NONE,
	36	XDP_DIAG_INFO,
	37	XDP_DIAG_UID,
	38	XDP_DIAG_RX_RING,
	39	XDP_DIAG_TX_RING,
	40	XDP_DIAG_UMEM,
	41	XDP_DIAG_UMEM_FILL_RING,
	42	XDP_DIAG_UMEM_COMPLETION_RING,
	43	XDP_DIAG_MEMINFO,
	44	__XDP_DIAG_MAX,
	45	};
	46
	47	#define XDP_DIAG_MAX (__XDP_DIAG_MAX - 1)
	48
	49	struct xdp_diag_info {
	50	__u32 ifindex;
	51	__u32 queue_id;
	52	};
	53
	54	struct xdp_diag_ring {
	55	__u32 entries; /num descs /
	56	};
	57
	58	#define XDP_DU_F_ZEROCOPY (1 << 0)
	59
	60	struct xdp_diag_umem {
	61	__u64 size;
	62	__u32 id;
	63	__u32 num_pages;
	64	__u32 chunk_size;
	65	__u32 headroom;
	66	__u32 ifindex;
	67	__u32 queue_id;
	68	__u32 flags;
	69	__u32 refs;
	70	};
	71
	72	#endif /* _LINUX_XDP_DIAG_H */

include/uapi/misc/fastrpc.h+41−0

@@ -0,0 +1,41 @@
	1	/* SPDX-License-Identifier: GPL-2.0 */
	2
	3	#ifndef __QCOM_FASTRPC_H__
	4	#define __QCOM_FASTRPC_H__
	5
	6	#include <linux/types.h>
	7
	8	#define FASTRPC_IOCTL_ALLOC_DMA_BUFF _IOWR('R', 1, struct fastrpc_alloc_dma_buf)
	9	#define FASTRPC_IOCTL_FREE_DMA_BUFF _IOWR('R', 2, __u32)
	10	#define FASTRPC_IOCTL_INVOKE _IOWR('R', 3, struct fastrpc_invoke)
	11	#define FASTRPC_IOCTL_INIT_ATTACH _IO('R', 4)
	12	#define FASTRPC_IOCTL_INIT_CREATE _IOWR('R', 5, struct fastrpc_init_create)
	13
	14	struct fastrpc_invoke_args {
	15	__u64 ptr;
	16	__u64 length;
	17	__s32 fd;
	18	__u32 reserved;
	19	};
	20
	21	struct fastrpc_invoke {
	22	__u32 handle;
	23	__u32 sc;
	24	__u64 args;
	25	};
	26
	27	struct fastrpc_init_create {
	28	__u32 filelen; /* elf file length */
	29	__s32 filefd; /* fd for the file */
	30	__u32 attrs;
	31	__u32 siglen;
	32	__u64 file; /* pointer to elf file */
	33	};
	34
	35	struct fastrpc_alloc_dma_buf {
	36	__s32 fd; /* fd */
	37	__u32 flags; /* flags to map with */
	38	__u64 size; /* size */
	39	};
	40
	41	#endif /* __QCOM_FASTRPC_H__ */

include/uapi/misc/habanalabs.h+450−0

@@ -0,0 +1,450 @@
	1	/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note
	2	*
	3	* Copyright 2016-2018 HabanaLabs, Ltd.
	4	* All Rights Reserved.
	5	*
	6	*/
	7
	8	#ifndef HABANALABS_H_
	9	#define HABANALABS_H_
	10
	11	#include <linux/types.h>
	12	#include <linux/ioctl.h>
	13
	14	/*
	15	* Defines that are asic-specific but constitutes as ABI between kernel driver
	16	* and userspace
	17	*/
	18	#define GOYA_KMD_SRAM_RESERVED_SIZE_FROM_START 0x8000 /* 32KB */
	19
	20	/*
	21	* Queue Numbering
	22	*
	23	* The external queues (DMA channels + CPU) MUST be before the internal queues
	24	* and each group (DMA channels + CPU and internal) must be contiguous inside
	25	* itself but there can be a gap between the two groups (although not
	26	* recommended)
	27	*/
	28
	29	enum goya_queue_id {
	30	GOYA_QUEUE_ID_DMA_0 = 0,
	31	GOYA_QUEUE_ID_DMA_1,
	32	GOYA_QUEUE_ID_DMA_2,
	33	GOYA_QUEUE_ID_DMA_3,
	34	GOYA_QUEUE_ID_DMA_4,
	35	GOYA_QUEUE_ID_CPU_PQ,
	36	GOYA_QUEUE_ID_MME,
	37	GOYA_QUEUE_ID_TPC0,
	38	GOYA_QUEUE_ID_TPC1,
	39	GOYA_QUEUE_ID_TPC2,
	40	GOYA_QUEUE_ID_TPC3,
	41	GOYA_QUEUE_ID_TPC4,
	42	GOYA_QUEUE_ID_TPC5,
	43	GOYA_QUEUE_ID_TPC6,
	44	GOYA_QUEUE_ID_TPC7,
	45	GOYA_QUEUE_ID_SIZE
	46	};
	47
	48	/* Opcode for management ioctl */
	49	#define HL_INFO_HW_IP_INFO 0
	50	#define HL_INFO_HW_EVENTS 1
	51	#define HL_INFO_DRAM_USAGE 2
	52	#define HL_INFO_HW_IDLE 3
	53
	54	#define HL_INFO_VERSION_MAX_LEN 128
	55
	56	struct hl_info_hw_ip_info {
	57	__u64 sram_base_address;
	58	__u64 dram_base_address;
	59	__u64 dram_size;
	60	__u32 sram_size;
	61	__u32 num_of_events;
	62	__u32 device_id; /* PCI Device ID */
	63	__u32 reserved[3];
	64	__u32 armcp_cpld_version;
	65	__u32 psoc_pci_pll_nr;
	66	__u32 psoc_pci_pll_nf;
	67	__u32 psoc_pci_pll_od;
	68	__u32 psoc_pci_pll_div_factor;
	69	__u8 tpc_enabled_mask;
	70	__u8 dram_enabled;
	71	__u8 pad[2];
	72	__u8 armcp_version[HL_INFO_VERSION_MAX_LEN];
	73	};
	74
	75	struct hl_info_dram_usage {
	76	__u64 dram_free_mem;
	77	__u64 ctx_dram_mem;
	78	};
	79
	80	struct hl_info_hw_idle {
	81	__u32 is_idle;
	82	__u32 pad;
	83	};
	84
	85	struct hl_info_args {
	86	/* Location of relevant struct in userspace */
	87	__u64 return_pointer;
	88	/*
	89	* The size of the return value. Just like "size" in "snprintf",
	90	* it limits how many bytes the kernel can write
	91	*
	92	* For hw_events array, the size should be
	93	* hl_info_hw_ip_info.num_of_events * sizeof(__u32)
	94	*/
	95	__u32 return_size;
	96
	97	/* HL_INFO_* */
	98	__u32 op;
	99
	100	/* Context ID - Currently not in use */
	101	__u32 ctx_id;
	102	__u32 pad;
	103	};
	104
	105	/* Opcode to create a new command buffer */
	106	#define HL_CB_OP_CREATE 0
	107	/* Opcode to destroy previously created command buffer */
	108	#define HL_CB_OP_DESTROY 1
	109
	110	struct hl_cb_in {
	111	/* Handle of CB or 0 if we want to create one */
	112	__u64 cb_handle;
	113	/* HL_CB_OP_* */
	114	__u32 op;
	115	/* Size of CB. Maximum size is 2MB. The minimum size that will be
	116	* allocated, regardless of this parameter's value, is PAGE_SIZE
	117	*/
	118	__u32 cb_size;
	119	/* Context ID - Currently not in use */
	120	__u32 ctx_id;
	121	__u32 pad;
	122	};
	123
	124	struct hl_cb_out {
	125	/* Handle of CB */
	126	__u64 cb_handle;
	127	};
	128
	129	union hl_cb_args {
	130	struct hl_cb_in in;
	131	struct hl_cb_out out;
	132	};
	133
	134	/*
	135	* This structure size must always be fixed to 64-bytes for backward
	136	* compatibility
	137	*/
	138	struct hl_cs_chunk {
	139	/*
	140	* For external queue, this represents a Handle of CB on the Host
	141	* For internal queue, this represents an SRAM or DRAM address of the
	142	* internal CB
	143	*/
	144	__u64 cb_handle;
	145	/* Index of queue to put the CB on */
	146	__u32 queue_index;
	147	/*
	148	* Size of command buffer with valid packets
	149	* Can be smaller then actual CB size
	150	*/
	151	__u32 cb_size;
	152	/* HL_CS_CHUNK_FLAGS_* */
	153	__u32 cs_chunk_flags;
	154	/* Align structure to 64 bytes */
	155	__u32 pad[11];
	156	};
	157
	158	#define HL_CS_FLAGS_FORCE_RESTORE 0x1
	159
	160	#define HL_CS_STATUS_SUCCESS 0
	161
	162	struct hl_cs_in {
	163	/* this holds address of array of hl_cs_chunk for restore phase */
	164	__u64 chunks_restore;
	165	/* this holds address of array of hl_cs_chunk for execution phase */
	166	__u64 chunks_execute;
	167	/* this holds address of array of hl_cs_chunk for store phase -
	168	* Currently not in use
	169	*/
	170	__u64 chunks_store;
	171	/* Number of chunks in restore phase array */
	172	__u32 num_chunks_restore;
	173	/* Number of chunks in execution array */
	174	__u32 num_chunks_execute;
	175	/* Number of chunks in restore phase array - Currently not in use */
	176	__u32 num_chunks_store;
	177	/* HL_CS_FLAGS_* */
	178	__u32 cs_flags;
	179	/* Context ID - Currently not in use */
	180	__u32 ctx_id;
	181	};
	182
	183	struct hl_cs_out {
	184	/* this holds the sequence number of the CS to pass to wait ioctl */
	185	__u64 seq;
	186	/* HL_CS_STATUS_* */
	187	__u32 status;
	188	__u32 pad;
	189	};
	190
	191	union hl_cs_args {
	192	struct hl_cs_in in;
	193	struct hl_cs_out out;
	194	};
	195
	196	struct hl_wait_cs_in {
	197	/* Command submission sequence number */
	198	__u64 seq;
	199	/* Absolute timeout to wait in microseconds */
	200	__u64 timeout_us;
	201	/* Context ID - Currently not in use */
	202	__u32 ctx_id;
	203	__u32 pad;
	204	};
	205
	206	#define HL_WAIT_CS_STATUS_COMPLETED 0
	207	#define HL_WAIT_CS_STATUS_BUSY 1
	208	#define HL_WAIT_CS_STATUS_TIMEDOUT 2
	209	#define HL_WAIT_CS_STATUS_ABORTED 3
	210	#define HL_WAIT_CS_STATUS_INTERRUPTED 4
	211
	212	struct hl_wait_cs_out {
	213	/* HL_WAIT_CS_STATUS_* */
	214	__u32 status;
	215	__u32 pad;
	216	};
	217
	218	union hl_wait_cs_args {
	219	struct hl_wait_cs_in in;
	220	struct hl_wait_cs_out out;
	221	};
	222
	223	/* Opcode to alloc device memory */
	224	#define HL_MEM_OP_ALLOC 0
	225	/* Opcode to free previously allocated device memory */
	226	#define HL_MEM_OP_FREE 1
	227	/* Opcode to map host memory */
	228	#define HL_MEM_OP_MAP 2
	229	/* Opcode to unmap previously mapped host memory */
	230	#define HL_MEM_OP_UNMAP 3
	231
	232	/* Memory flags */
	233	#define HL_MEM_CONTIGUOUS 0x1
	234	#define HL_MEM_SHARED 0x2
	235	#define HL_MEM_USERPTR 0x4
	236
	237	struct hl_mem_in {
	238	union {
	239	/* HL_MEM_OP_ALLOC- allocate device memory */
	240	struct {
	241	/* Size to alloc */
	242	__u64 mem_size;
	243	} alloc;
	244
	245	/* HL_MEM_OP_FREE - free device memory */
	246	struct {
	247	/* Handle returned from HL_MEM_OP_ALLOC */
	248	__u64 handle;
	249	} free;
	250
	251	/* HL_MEM_OP_MAP - map device memory */
	252	struct {
	253	/*
	254	* Requested virtual address of mapped memory.
	255	* KMD will try to map the requested region to this
	256	* hint address, as long as the address is valid and
	257	* not already mapped. The user should check the
	258	* returned address of the IOCTL to make sure he got
	259	* the hint address. Passing 0 here means that KMD
	260	* will choose the address itself.
	261	*/
	262	__u64 hint_addr;
	263	/* Handle returned from HL_MEM_OP_ALLOC */
	264	__u64 handle;
	265	} map_device;
	266
	267	/* HL_MEM_OP_MAP - map host memory */
	268	struct {
	269	/* Address of allocated host memory */
	270	__u64 host_virt_addr;
	271	/*
	272	* Requested virtual address of mapped memory.
	273	* KMD will try to map the requested region to this
	274	* hint address, as long as the address is valid and
	275	* not already mapped. The user should check the
	276	* returned address of the IOCTL to make sure he got
	277	* the hint address. Passing 0 here means that KMD
	278	* will choose the address itself.
	279	*/
	280	__u64 hint_addr;
	281	/* Size of allocated host memory */
	282	__u64 mem_size;
	283	} map_host;
	284
	285	/* HL_MEM_OP_UNMAP - unmap host memory */
	286	struct {
	287	/* Virtual address returned from HL_MEM_OP_MAP */
	288	__u64 device_virt_addr;
	289	} unmap;
	290	};
	291
	292	/* HL_MEM_OP_* */
	293	__u32 op;
	294	/* HL_MEM_* flags */
	295	__u32 flags;
	296	/* Context ID - Currently not in use */
	297	__u32 ctx_id;
	298	__u32 pad;
	299	};
	300
	301	struct hl_mem_out {
	302	union {
	303	/*
	304	* Used for HL_MEM_OP_MAP as the virtual address that was
	305	* assigned in the device VA space.
	306	* A value of 0 means the requested operation failed.
	307	*/
	308	__u64 device_virt_addr;
	309
	310	/*
	311	* Used for HL_MEM_OP_ALLOC. This is the assigned
	312	* handle for the allocated memory
	313	*/
	314	__u64 handle;
	315	};
	316	};
	317
	318	union hl_mem_args {
	319	struct hl_mem_in in;
	320	struct hl_mem_out out;
	321	};
	322
	323	/*
	324	* Various information operations such as:
	325	* - H/W IP information
	326	* - Current dram usage
	327	*
	328	* The user calls this IOCTL with an opcode that describes the required
	329	* information. The user should supply a pointer to a user-allocated memory
	330	* chunk, which will be filled by the driver with the requested information.
	331	*
	332	* The user supplies the maximum amount of size to copy into the user's memory,
	333	* in order to prevent data corruption in case of differences between the
	334	* definitions of structures in kernel and userspace, e.g. in case of old
	335	* userspace and new kernel driver
	336	*/
	337	#define HL_IOCTL_INFO \
	338	_IOWR('H', 0x01, struct hl_info_args)
	339
	340	/*
	341	* Command Buffer
	342	* - Request a Command Buffer
	343	* - Destroy a Command Buffer
	344	*
	345	* The command buffers are memory blocks that reside in DMA-able address
	346	* space and are physically contiguous so they can be accessed by the device
	347	* directly. They are allocated using the coherent DMA API.
	348	*
	349	* When creating a new CB, the IOCTL returns a handle of it, and the user-space
	350	* process needs to use that handle to mmap the buffer so it can access them.
	351	*
	352	*/
	353	#define HL_IOCTL_CB \
	354	_IOWR('H', 0x02, union hl_cb_args)
	355
	356	/*
	357	* Command Submission
	358	*
	359	* To submit work to the device, the user need to call this IOCTL with a set
	360	* of JOBS. That set of JOBS constitutes a CS object.
	361	* Each JOB will be enqueued on a specific queue, according to the user's input.
	362	* There can be more then one JOB per queue.
	363	*
	364	* There are two types of queues - external and internal. External queues
	365	* are DMA queues which transfer data from/to the Host. All other queues are
	366	* internal. The driver will get completion notifications from the device only
	367	* on JOBS which are enqueued in the external queues.
	368	*
	369	* For jobs on external queues, the user needs to create command buffers
	370	* through the CB ioctl and give the CB's handle to the CS ioctl. For jobs on
	371	* internal queues, the user needs to prepare a "command buffer" with packets
	372	* on either the SRAM or DRAM, and give the device address of that buffer to
	373	* the CS ioctl.
	374	*
	375	* This IOCTL is asynchronous in regard to the actual execution of the CS. This
	376	* means it returns immediately after ALL the JOBS were enqueued on their
	377	* relevant queues. Therefore, the user mustn't assume the CS has been completed
	378	* or has even started to execute.
	379	*
	380	* Upon successful enqueue, the IOCTL returns an opaque handle which the user
	381	* can use with the "Wait for CS" IOCTL to check whether the handle's CS
	382	* external JOBS have been completed. Note that if the CS has internal JOBS
	383	* which can execute AFTER the external JOBS have finished, the driver might
	384	* report that the CS has finished executing BEFORE the internal JOBS have
	385	* actually finish executing.
	386	*
	387	* The CS IOCTL will receive three sets of JOBS. One set is for "restore" phase,
	388	* a second set is for "execution" phase and a third set is for "store" phase.
	389	* The JOBS on the "restore" phase are enqueued only after context-switch
	390	* (or if its the first CS for this context). The user can also order the
	391	* driver to run the "restore" phase explicitly
	392	*
	393	*/
	394	#define HL_IOCTL_CS \
	395	_IOWR('H', 0x03, union hl_cs_args)
	396
	397	/*
	398	* Wait for Command Submission
	399	*
	400	* The user can call this IOCTL with a handle it received from the CS IOCTL
	401	* to wait until the handle's CS has finished executing. The user will wait
	402	* inside the kernel until the CS has finished or until the user-requeusted
	403	* timeout has expired.
	404	*
	405	* The return value of the IOCTL is a standard Linux error code. The possible
	406	* values are:
	407	*
	408	* EINTR - Kernel waiting has been interrupted, e.g. due to OS signal
	409	* that the user process received
	410	* ETIMEDOUT - The CS has caused a timeout on the device
	411	* EIO - The CS was aborted (usually because the device was reset)
	412	* ENODEV - The device wants to do hard-reset (so user need to close FD)
	413	*
	414	* The driver also returns a custom define inside the IOCTL which can be:
	415	*
	416	* HL_WAIT_CS_STATUS_COMPLETED - The CS has been completed successfully (0)
	417	* HL_WAIT_CS_STATUS_BUSY - The CS is still executing (0)
	418	* HL_WAIT_CS_STATUS_TIMEDOUT - The CS has caused a timeout on the device
	419	* (ETIMEDOUT)
	420	* HL_WAIT_CS_STATUS_ABORTED - The CS was aborted, usually because the
	421	* device was reset (EIO)
	422	* HL_WAIT_CS_STATUS_INTERRUPTED - Waiting for the CS was interrupted (EINTR)
	423	*
	424	*/
	425
	426	#define HL_IOCTL_WAIT_CS \
	427	_IOWR('H', 0x04, union hl_wait_cs_args)
	428
	429	/*
	430	* Memory
	431	* - Map host memory to device MMU
	432	* - Unmap host memory from device MMU
	433	*
	434	* This IOCTL allows the user to map host memory to the device MMU
	435	*
	436	* For host memory, the IOCTL doesn't allocate memory. The user is supposed
	437	* to allocate the memory in user-space (malloc/new). The driver pins the
	438	* physical pages (up to the allowed limit by the OS), assigns a virtual
	439	* address in the device VA space and initializes the device MMU.
	440	*
	441	* There is an option for the user to specify the requested virtual address.
	442	*
	443	*/
	444	#define HL_IOCTL_MEMORY \
	445	_IOWR('H', 0x05, union hl_mem_args)
	446
	447	#define HL_COMMAND_START 0x01
	448	#define HL_COMMAND_END 0x06
	449
	450	#endif /* HABANALABS_H_ */

include/uapi/mtd/ubi-user.h+5−0

 /* Re-name volumes */
 #define UBI_IOCRNVOL _IOW(UBI_IOC_MAGIC, 3, struct ubi_rnvol_req)
+/* Read the specified PEB and scrub it if there are bitflips */
+#define UBI_IOCRPEB _IOW(UBI_IOC_MAGIC, 4, __s32)
+/* Force scrubbing on the specified PEB */
+#define UBI_IOCSPEB _IOW(UBI_IOC_MAGIC, 5, __s32)
 /* ioctl commands of the UBI control character device */
 #define UBI_CTRL_IOC_MAGIC 'o'

include/uapi/rdma/bnxt_re-abi.h+11−0

 #define BNXT_RE_ABI_VERSION	1
+#define BNXT_RE_CHIP_ID0_CHIP_NUM_SFT		0x00
+#define BNXT_RE_CHIP_ID0_CHIP_REV_SFT		0x10
+#define BNXT_RE_CHIP_ID0_CHIP_MET_SFT		0x18
+enum {
+	BNXT_RE_UCNTX_CMASK_HAVE_CCTX = 0x1ULL
+};
 struct bnxt_re_uctx_resp {
 	__u32 dev_id;
 	__u32 max_qp;
 	__u32 cqe_sz;
 	__u32 max_cqd;
 	__u32 rsvd;
+	__aligned_u64 comp_mask;
+	__u32 chip_id0;
+	__u32 chip_id1;
 };
 /*

include/uapi/rdma/ib_user_verbs.h+2−0

@@ -270,6 +270,8 @@ struct ib_uverbs_ex_query_device_resp { · 269 unmodified lines
270	struct ib_uverbs_tm_caps tm_caps;	270	struct ib_uverbs_tm_caps tm_caps;
271	struct ib_uverbs_cq_moderation_caps cq_moderation_caps;	271	struct ib_uverbs_cq_moderation_caps cq_moderation_caps;
272	__aligned_u64 max_dm_size;	272	__aligned_u64 max_dm_size;
		273	__u32 xrc_odp_caps;
		274	__u32 reserved;
273	};	275	};
274		276
275	struct ib_uverbs_query_port {	277	struct ib_uverbs_query_port {

include/uapi/rdma/mlx5_user_ioctl_cmds.h+18−0

 	MLX5_IB_ATTR_DEVX_OBJ_QUERY_CMD_OUT,
 };
+enum mlx5_ib_devx_obj_query_async_attrs {
+	MLX5_IB_ATTR_DEVX_OBJ_QUERY_ASYNC_HANDLE = (1U << UVERBS_ID_NS_SHIFT),
+	MLX5_IB_ATTR_DEVX_OBJ_QUERY_ASYNC_CMD_IN,
+	MLX5_IB_ATTR_DEVX_OBJ_QUERY_ASYNC_FD,
+	MLX5_IB_ATTR_DEVX_OBJ_QUERY_ASYNC_WR_ID,
+	MLX5_IB_ATTR_DEVX_OBJ_QUERY_ASYNC_OUT_LEN,
+};
 enum  mlx5_ib_devx_query_eqn_attrs {
 	MLX5_IB_ATTR_DEVX_QUERY_EQN_USER_VEC = (1U << UVERBS_ID_NS_SHIFT),
 	MLX5_IB_ATTR_DEVX_QUERY_EQN_DEV_EQN,
 	MLX5_IB_METHOD_DEVX_OBJ_DESTROY,
 	MLX5_IB_METHOD_DEVX_OBJ_MODIFY,
 	MLX5_IB_METHOD_DEVX_OBJ_QUERY,
+	MLX5_IB_METHOD_DEVX_OBJ_ASYNC_QUERY,
 };
 enum mlx5_ib_devx_umem_reg_attrs {
 	MLX5_IB_METHOD_DEVX_UMEM_DEREG,
 };
+enum mlx5_ib_devx_async_cmd_fd_alloc_attrs {
+	MLX5_IB_ATTR_DEVX_ASYNC_CMD_FD_ALLOC_HANDLE = (1U << UVERBS_ID_NS_SHIFT),
+};
+enum mlx5_ib_devx_async_cmd_fd_methods {
+	MLX5_IB_METHOD_DEVX_ASYNC_CMD_FD_ALLOC = (1U << UVERBS_ID_NS_SHIFT),
+};
 enum mlx5_ib_objects {
 	MLX5_IB_OBJECT_DEVX = (1U << UVERBS_ID_NS_SHIFT),
 	MLX5_IB_OBJECT_DEVX_OBJ,
 	MLX5_IB_OBJECT_DEVX_UMEM,
 	MLX5_IB_OBJECT_FLOW_MATCHER,
+	MLX5_IB_OBJECT_DEVX_ASYNC_CMD_FD,
 };
 enum mlx5_ib_flow_matcher_create_attrs {

include/uapi/rdma/mlx5_user_ioctl_verbs.h+5−0

@@ -51,5 +51,10 @@ enum mlx5_ib_uapi_flow_action_packet_reformat_type { · 50 unmodified lines
51	MLX5_IB_UAPI_FLOW_ACTION_PACKET_REFORMAT_TYPE_L2_TO_L3_TUNNEL = 0x3,	51	MLX5_IB_UAPI_FLOW_ACTION_PACKET_REFORMAT_TYPE_L2_TO_L3_TUNNEL = 0x3,
52	};	52	};
53		53
		54	struct mlx5_ib_uapi_devx_async_cmd_hdr {
		55	__aligned_u64 wr_id;
		56	__u8 out_data[];
		57	};
		58
54	#endif	59	#endif
55		60

include/uapi/rdma/rdma_netlink.h+58−16

@@ -5,8 +5,7 @@ · 4 unmodified lines
5	#include <linux/types.h>	5	#include <linux/types.h>
6		6
7	enum {	7	enum {
8	RDMA_NL_RDMA_CM = 1,	8	RDMA_NL_IWCM = 2,
9	RDMA_NL_IWCM,
10	RDMA_NL_RSVD,	9	RDMA_NL_RSVD,
11	RDMA_NL_LS, /* RDMA Local Services */	10	RDMA_NL_LS, /* RDMA Local Services */
12	RDMA_NL_NLDEV, /* RDMA device interface */	11	RDMA_NL_NLDEV, /* RDMA device interface */
@@ -14,8 +13,7 @@ enum { · 1 unmodified line
14	};	13	};
15		14
16	enum {	15	enum {
17	RDMA_NL_GROUP_CM = 1,	16	RDMA_NL_GROUP_IWPM = 2,
18	RDMA_NL_GROUP_IWPM,
19	RDMA_NL_GROUP_LS,	17	RDMA_NL_GROUP_LS,
20	RDMA_NL_NUM_GROUPS	18	RDMA_NL_NUM_GROUPS
21	};	19	};
@@ -24,15 +22,17 @@ enum { · 2 unmodified lines
24	#define RDMA_NL_GET_OP(type) (type & ((1 << 10) - 1))	22	#define RDMA_NL_GET_OP(type) (type & ((1 << 10) - 1))
25	#define RDMA_NL_GET_TYPE(client, op) ((client << 10) + op)	23	#define RDMA_NL_GET_TYPE(client, op) ((client << 10) + op)
26		24
27	enum {	25	/* The minimum version that the iwpm kernel supports */
28	RDMA_NL_RDMA_CM_ID_STATS = 0,	26	#define IWPM_UABI_VERSION_MIN 3
29	RDMA_NL_RDMA_CM_NUM_OPS	27
30	};	28	/* The latest version that the iwpm kernel supports */
		29	#define IWPM_UABI_VERSION 4
31		30
		31	/* iwarp port mapper message flags */
32	enum {	32	enum {
33	RDMA_NL_RDMA_CM_ATTR_SRC_ADDR = 1,	33
34	RDMA_NL_RDMA_CM_ATTR_DST_ADDR,	34	/* Do not map the port for this IWPM request */
35	RDMA_NL_RDMA_CM_NUM_ATTR,	35	IWPM_FLAGS_NO_PORT_MAP = (1 << 0),
36	};	36	};
37		37
38	/* iwarp port mapper op-codes */	38	/* iwarp port mapper op-codes */
@@ -45,6 +45,7 @@ enum { · 6 unmodified lines
45	RDMA_NL_IWPM_HANDLE_ERR,	45	RDMA_NL_IWPM_HANDLE_ERR,
46	RDMA_NL_IWPM_MAPINFO,	46	RDMA_NL_IWPM_MAPINFO,
47	RDMA_NL_IWPM_MAPINFO_NUM,	47	RDMA_NL_IWPM_MAPINFO_NUM,
		48	RDMA_NL_IWPM_HELLO,
48	RDMA_NL_IWPM_NUM_OPS	49	RDMA_NL_IWPM_NUM_OPS
49	};	50	};
50		51
@@ -83,20 +84,38 @@ enum { · 32 unmodified lines
83	IWPM_NLA_MANAGE_MAPPING_UNSPEC = 0,	84	IWPM_NLA_MANAGE_MAPPING_UNSPEC = 0,
84	IWPM_NLA_MANAGE_MAPPING_SEQ,	85	IWPM_NLA_MANAGE_MAPPING_SEQ,
85	IWPM_NLA_MANAGE_ADDR,	86	IWPM_NLA_MANAGE_ADDR,
86	IWPM_NLA_MANAGE_MAPPED_LOC_ADDR,	87	IWPM_NLA_MANAGE_FLAGS,
		88	IWPM_NLA_MANAGE_MAPPING_MAX
		89	};
		90
		91	enum {
		92	IWPM_NLA_RMANAGE_MAPPING_UNSPEC = 0,
		93	IWPM_NLA_RMANAGE_MAPPING_SEQ,
		94	IWPM_NLA_RMANAGE_ADDR,
		95	IWPM_NLA_RMANAGE_MAPPED_LOC_ADDR,
		96	/* The following maintains bisectability of rdma-core */
		97	IWPM_NLA_MANAGE_MAPPED_LOC_ADDR = IWPM_NLA_RMANAGE_MAPPED_LOC_ADDR,
87	IWPM_NLA_RMANAGE_MAPPING_ERR,	98	IWPM_NLA_RMANAGE_MAPPING_ERR,
88	IWPM_NLA_RMANAGE_MAPPING_MAX	99	IWPM_NLA_RMANAGE_MAPPING_MAX
89	};	100	};
90		101
91	#define IWPM_NLA_MANAGE_MAPPING_MAX 3
92	#define IWPM_NLA_QUERY_MAPPING_MAX 4
93	#define IWPM_NLA_MAPINFO_SEND_MAX 3	102	#define IWPM_NLA_MAPINFO_SEND_MAX 3
		103	#define IWPM_NLA_REMOVE_MAPPING_MAX 3
94		104
95	enum {	105	enum {
96	IWPM_NLA_QUERY_MAPPING_UNSPEC = 0,	106	IWPM_NLA_QUERY_MAPPING_UNSPEC = 0,
97	IWPM_NLA_QUERY_MAPPING_SEQ,	107	IWPM_NLA_QUERY_MAPPING_SEQ,
98	IWPM_NLA_QUERY_LOCAL_ADDR,	108	IWPM_NLA_QUERY_LOCAL_ADDR,
99	IWPM_NLA_QUERY_REMOTE_ADDR,	109	IWPM_NLA_QUERY_REMOTE_ADDR,
		110	IWPM_NLA_QUERY_FLAGS,
		111	IWPM_NLA_QUERY_MAPPING_MAX,
		112	};
		113
		114	enum {
		115	IWPM_NLA_RQUERY_MAPPING_UNSPEC = 0,
		116	IWPM_NLA_RQUERY_MAPPING_SEQ,
		117	IWPM_NLA_RQUERY_LOCAL_ADDR,
		118	IWPM_NLA_RQUERY_REMOTE_ADDR,
100	IWPM_NLA_RQUERY_MAPPED_LOC_ADDR,	119	IWPM_NLA_RQUERY_MAPPED_LOC_ADDR,
101	IWPM_NLA_RQUERY_MAPPED_REM_ADDR,	120	IWPM_NLA_RQUERY_MAPPED_REM_ADDR,
102	IWPM_NLA_RQUERY_MAPPING_ERR,	121	IWPM_NLA_RQUERY_MAPPING_ERR,
@@ -114,6 +133,7 @@ enum { · 11 unmodified lines
114	IWPM_NLA_MAPINFO_UNSPEC = 0,	133	IWPM_NLA_MAPINFO_UNSPEC = 0,
115	IWPM_NLA_MAPINFO_LOCAL_ADDR,	134	IWPM_NLA_MAPINFO_LOCAL_ADDR,
116	IWPM_NLA_MAPINFO_MAPPED_ADDR,	135	IWPM_NLA_MAPINFO_MAPPED_ADDR,
		136	IWPM_NLA_MAPINFO_FLAGS,
117	IWPM_NLA_MAPINFO_MAX	137	IWPM_NLA_MAPINFO_MAX
118	};	138	};
119		139
@@ -132,6 +152,12 @@ enum { · 12 unmodified lines
132	IWPM_NLA_ERR_MAX	152	IWPM_NLA_ERR_MAX
133	};	153	};
134		154
		155	enum {
		156	IWPM_NLA_HELLO_UNSPEC = 0,
		157	IWPM_NLA_HELLO_ABI_VERSION,
		158	IWPM_NLA_HELLO_MAX
		159	};
		160
135	/*	161	/*
136	* Local service operations:	162	* Local service operations:
137	* RESOLVE - The client requests the local service to resolve a path.	163	* RESOLVE - The client requests the local service to resolve a path.
@@ -229,9 +255,11 @@ enum rdma_nldev_command { · 91 unmodified lines
229	RDMA_NLDEV_CMD_GET, /* can dump */	255	RDMA_NLDEV_CMD_GET, /* can dump */
230	RDMA_NLDEV_CMD_SET,	256	RDMA_NLDEV_CMD_SET,
231		257
232	/* 3 - 4 are free to use */	258	RDMA_NLDEV_CMD_NEWLINK,
233		259
234	RDMA_NLDEV_CMD_PORT_GET = 5, /* can dump */	260	RDMA_NLDEV_CMD_DELLINK,
		261
		262	RDMA_NLDEV_CMD_PORT_GET, /* can dump */
235		263
236	/* 6 - 8 are free to use */	264	/* 6 - 8 are free to use */
237		265
@@ -430,6 +458,20 @@ enum rdma_nldev_attr { · 192 unmodified lines
430	RDMA_NLDEV_ATTR_DRIVER_S64, /* s64 */	458	RDMA_NLDEV_ATTR_DRIVER_S64, /* s64 */
431	RDMA_NLDEV_ATTR_DRIVER_U64, /* u64 */	459	RDMA_NLDEV_ATTR_DRIVER_U64, /* u64 */
432		460
		461	/*
		462	* Indexes to get/set secific entry,
		463	* for QP use RDMA_NLDEV_ATTR_RES_LQPN
		464	*/
		465	RDMA_NLDEV_ATTR_RES_PDN, /* u32 */
		466	RDMA_NLDEV_ATTR_RES_CQN, /* u32 */
		467	RDMA_NLDEV_ATTR_RES_MRN, /* u32 */
		468	RDMA_NLDEV_ATTR_RES_CM_IDN, /* u32 */
		469	RDMA_NLDEV_ATTR_RES_CTXN, /* u32 */
		470	/*
		471	* Identifies the rdma driver. eg: "rxe" or "siw"
		472	*/
		473	RDMA_NLDEV_ATTR_LINK_TYPE, /* string */
		474
433	/*	475	/*
434	* Always the end	476	* Always the end
435	*/	477	*/

include/uapi/rdma/rdma_user_cm.h+4−0

 	RDMA_OPTION_ID_TOS	 = 0,
 	RDMA_OPTION_ID_REUSEADDR = 1,
 	RDMA_OPTION_ID_AFONLY	 = 2,
+	RDMA_OPTION_ID_ACK_TIMEOUT = 3
+};
+enum {
 	RDMA_OPTION_IB_PATH	 = 1
 };

include/uapi/rdma/rdma_user_rxe.h+1−2

 struct rxe_av {
 	__u8			port_num;
 	__u8			network_type;
-	__u16			reserved1;
+	__u8			dmac[6];
-	__u32			reserved2;
 	struct rxe_global_route	grh;
 	union {
 		struct sockaddr_in	_sockaddr_in;

Merge drm/drm-next into drm-intel-next-queued

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code