History

Merge tag 'v5.2-rc6' into asoc-5.3

Linux 5.2-rc6

Mark Brown committed 7 years ago

Commit 53c8b292 parents e330326 4b972a022568 files · +38036 −153902Browse files

Showing the changes to include/uapi (10 of 22568 files). Show all

Unified · Split

10 files
  1. include/uapi/linux/Kbuild +1 −0
  2. include/uapi/linux/bpf.h +4 −2
  3. include/uapi/linux/btf.h +1 −1
  4. include/uapi/linux/fuse.h +6 −1
  5. include/uapi/linux/psp-sev.h +1 −4
  6. include/uapi/linux/rxrpc.h +1 −5
  7. include/uapi/linux/snmp.h +1 −0
  8. include/uapi/linux/tipc_config.h +7 −3
  9. include/uapi/linux/wmi.h +1 −4
  10. include/uapi/misc/habanalabs.h +20 −2
include/uapi/linux/Kbuild+1−0
@@ -1,3 +1,4 @@
1+# SPDX-License-Identifier: GPL-2.0
12 ifeq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/a.out.h),)
23 no-export-headers += a.out.h
34 endif
include/uapi/linux/bpf.h+4−2
@@ -192,6 +192,8 @@ enum bpf_attach_type { · 191 unmodified lines
192192 BPF_LIRC_MODE2,
193193 BPF_FLOW_DISSECTOR,
194194 BPF_CGROUP_SYSCTL,
195+ BPF_CGROUP_UDP4_RECVMSG,
196+ BPF_CGROUP_UDP6_RECVMSG,
195197 __MAX_BPF_ATTACH_TYPE
196198 };
197199
@@ -3376,8 +3378,8 @@ struct bpf_raw_tracepoint_args { · 3178 unmodified lines
33763378 /* DIRECT: Skip the FIB rules and go to FIB table associated with device
33773379 * OUTPUT: Do lookup from egress perspective; default is ingress
33783380 */
3379−#define BPF_FIB_LOOKUP_DIRECT BIT(0)
3380−#define BPF_FIB_LOOKUP_OUTPUT BIT(1)
3381+#define BPF_FIB_LOOKUP_DIRECT (1U << 0)
3382+#define BPF_FIB_LOOKUP_OUTPUT (1U << 1)
33813383
33823384 enum {
33833385 BPF_FIB_LKUP_RET_SUCCESS, /* lookup successful */
include/uapi/linux/btf.h+1−1
@@ -83,7 +83,7 @@ struct btf_type { · 82 unmodified lines
8383 * is the 32 bits arrangement:
8484 */
8585 #define BTF_INT_ENCODING(VAL) (((VAL) & 0x0f000000) >> 24)
86−#define BTF_INT_OFFSET(VAL) (((VAL & 0x00ff0000)) >> 16)
86+#define BTF_INT_OFFSET(VAL) (((VAL) & 0x00ff0000) >> 16)
8787 #define BTF_INT_BITS(VAL) ((VAL) & 0x000000ff)
8888
8989 /* Attributes stored in the BTF_INT_ENCODING */
include/uapi/linux/fuse.h+6−1
@@ -130,6 +130,9 @@ · 129 unmodified lines
130130 * 7.30
131131 * - add FUSE_EXPLICIT_INVAL_DATA
132132 * - add FUSE_IOCTL_COMPAT_X32
133+ *
134+ * 7.31
135+ * - add FUSE_WRITE_KILL_PRIV flag
133136 */
134137
135138 #ifndef _LINUX_FUSE_H
@@ -165,7 +168,7 @@ · 29 unmodified lines
165168 #define FUSE_KERNEL_VERSION 7
166169
167170 /** Minor version number of this interface */
168−#define FUSE_KERNEL_MINOR_VERSION 30
171+#define FUSE_KERNEL_MINOR_VERSION 31
169172
170173 /** The node ID of the root inode */
171174 #define FUSE_ROOT_ID 1
@@ -327,9 +330,11 @@ struct fuse_file_lock { · 155 unmodified lines
327330 *
328331 * FUSE_WRITE_CACHE: delayed write from page cache, file handle is guessed
329332 * FUSE_WRITE_LOCKOWNER: lock_owner field is valid
333+ * FUSE_WRITE_KILL_PRIV: kill suid and sgid bits
330334 */
331335 #define FUSE_WRITE_CACHE (1 << 0)
332336 #define FUSE_WRITE_LOCKOWNER (1 << 1)
337+#define FUSE_WRITE_KILL_PRIV (1 << 2)
333338
334339 /**
335340 * Read flags
include/uapi/linux/psp-sev.h+1−4
@@ -1,3 +1,4 @@
1+/* SPDX-License-Identifier: GPL-2.0-only */
12 /*
23 * Userspace interface for AMD Secure Encrypted Virtualization (SEV)
34 * platform management commands.
@@ -7,10 +8,6 @@ · 3 unmodified lines
78 * Author: Brijesh Singh <brijesh.singh@amd.com>
89 *
910 * SEV API specification is available at: https://developer.amd.com/sev/
10− *
11− * This program is free software; you can redistribute it and/or modify
12− * it under the terms of the GNU General Public License version 2 as
13− * published by the Free Software Foundation.
1411 */
1512
1613 #ifndef __PSP_SEV_USER_H__
include/uapi/linux/rxrpc.h+1−5
@@ -1,12 +1,8 @@
1+/* SPDX-License-Identifier: GPL-2.0-or-later */
12 /* Types and definitions for AF_RXRPC.
23 *
34 * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
45 * Written by David Howells (dhowells@redhat.com)
5− *
6− * This program is free software; you can redistribute it and/or
7− * modify it under the terms of the GNU General Public Licence
8− * as published by the Free Software Foundation; either version
9− * 2 of the Licence, or (at your option) any later version.
106 */
117
128 #ifndef _UAPI_LINUX_RXRPC_H
include/uapi/linux/snmp.h+1−0
@@ -283,6 +283,7 @@ enum · 282 unmodified lines
283283 LINUX_MIB_TCPACKCOMPRESSED, /* TCPAckCompressed */
284284 LINUX_MIB_TCPZEROWINDOWDROP, /* TCPZeroWindowDrop */
285285 LINUX_MIB_TCPRCVQDROP, /* TCPRcvQDrop */
286+ LINUX_MIB_TCPWQUEUETOOBIG, /* TCPWqueueTooBig */
286287 __LINUX_MIB_MAX
287288 };
288289
include/uapi/linux/tipc_config.h+7−3
@@ -307,8 +307,10 @@ static inline int TLV_SET(void *tlv, __u16 type, void *data, __u16 len) · 306 unmodified lines
307307 tlv_ptr = (struct tlv_desc *)tlv;
308308 tlv_ptr->tlv_type = htons(type);
309309 tlv_ptr->tlv_len = htons(tlv_len);
310− if (len && data)
311− memcpy(TLV_DATA(tlv_ptr), data, tlv_len);
310+ if (len && data) {
311+ memcpy(TLV_DATA(tlv_ptr), data, len);
312+ memset(TLV_DATA(tlv_ptr) + len, 0, TLV_SPACE(len) - tlv_len);
313+ }
312314 return TLV_SPACE(len);
313315 }
314316
@@ -405,8 +407,10 @@ static inline int TCM_SET(void *msg, __u16 cmd, __u16 flags, · 90 unmodified lines
405407 tcm_hdr->tcm_len = htonl(msg_len);
406408 tcm_hdr->tcm_type = htons(cmd);
407409 tcm_hdr->tcm_flags = htons(flags);
408− if (data_len && data)
410+ if (data_len && data) {
409411 memcpy(TCM_DATA(msg), data, data_len);
412+ memset(TCM_DATA(msg) + data_len, 0, TCM_SPACE(data_len) - msg_len);
413+ }
410414 return TCM_SPACE(data_len);
411415 }
412416
include/uapi/linux/wmi.h+1−4
@@ -1,11 +1,8 @@
1+/* SPDX-License-Identifier: GPL-2.0-only */
12 /*
23 * User API methods for ACPI-WMI mapping driver
34 *
45 * Copyright (C) 2017 Dell, Inc.
5− *
6− * This program is free software; you can redistribute it and/or modify
7− * it under the terms of the GNU General Public License version 2 as
8− * published by the Free Software Foundation.
96 */
107 #ifndef _UAPI_LINUX_WMI_H
118 #define _UAPI_LINUX_WMI_H
include/uapi/misc/habanalabs.h+20−2
@@ -413,6 +413,10 @@ struct hl_debug_params_spmu { · 412 unmodified lines
413413 #define HL_DEBUG_OP_SPMU 5
414414 /* Opcode for timestamp */
415415 #define HL_DEBUG_OP_TIMESTAMP 6
416+/* Opcode for setting the device into or out of debug mode. The enable
417+ * variable should be 1 for enabling debug mode and 0 for disabling it
418+ */
419+#define HL_DEBUG_OP_SET_MODE 7
416420
417421 struct hl_debug_args {
418422 /*
@@ -574,8 +578,22 @@ struct hl_debug_args { · 155 unmodified lines
574578 *
575579 * This IOCTL allows the user to get debug traces from the chip.
576580 *
577− * The user needs to provide the register index and essential data such as
578− * buffer address and size.
581+ * Before the user can send configuration requests of the various
582+ * debug/profile engines, it needs to set the device into debug mode.
583+ * This is because the debug/profile infrastructure is shared component in the
584+ * device and we can't allow multiple users to access it at the same time.
585+ *
586+ * Once a user set the device into debug mode, the driver won't allow other
587+ * users to "work" with the device, i.e. open a FD. If there are multiple users
588+ * opened on the device, the driver won't allow any user to debug the device.
589+ *
590+ * For each configuration request, the user needs to provide the register index
591+ * and essential data such as buffer address and size.
592+ *
593+ * Once the user has finished using the debug/profile engines, he should
594+ * set the device into non-debug mode, i.e. disable debug mode.
595+ *
596+ * The driver can decide to "kick out" the user if he abuses this interface.
579597 *
580598 */
581599 #define HL_IOCTL_DEBUG \