Merge branch 'akpm' (patches from Andrew)

Merge more updates from Andrew Morton: "VM: - z3fold fixes and enhancements by Henry Burns and Vitaly Wool - more accurate reclaimed slab caches calculations by Yafang Shao - fix MAP_UNINITIALIZED UAPI symbol to not depend on config, by Christoph Hellwig - !CONFIG_MMU fixes by Christoph Hellwig - new novmcoredd parameter to omit device dumps from vmcore, by Kairui Song - new test_meminit module for testing heap and pagealloc initialization, by Alexander Potapenko - ioremap improvements for huge mappings, by Anshuman Khandual - generalize kprobe page fault handling, by Anshuman Khandual - device-dax hotplug fixes and improvements, by Pavel Tatashin - enable synchronous DAX fault on powerpc, by Aneesh Kumar K.V - add pte_devmap() support for arm64, by Robin Murphy - unify locked_vm accounting with a helper, by Daniel Jordan - several misc fixes core/lib: - new typeof_member() macro including some users, by Alexey Dobriyan - make BIT() and GENMASK() available in asm, by Masahiro Yamada - changed LIST_POISON2 on x86_64 to 0xdead000000000122 for better code generation, by Alexey Dobriyan - rbtree code size optimizations, by Michel Lespinasse - convert struct pid count to refcount_t, by Joel Fernandes get_maintainer.pl: - add --no-moderated switch to skip moderated ML's, by Joe Perches misc: - ptrace PTRACE_GET_SYSCALL_INFO interface - coda updates - gdb scripts, various" [ Using merge message suggestion from Vlastimil Babka, with some editing - Linus ] * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (100 commits) fs/select.c: use struct_size() in kmalloc() mm: add account_locked_vm utility function arm64: mm: implement pte_devmap support mm: introduce ARCH_HAS_PTE_DEVMAP mm: clean up is_device_*_page() definitions mm/mmap: move common defines to mman-common.h mm: move MAP_SYNC to asm-generic/mman-common.h device-dax: "Hotremove" persistent memory that is used like normal RAM mm/hotplug: make remove_memory() interface usable device-dax: fix memory and resource leak if hotplug fails include/linux/lz4.h: fix spelling and copy-paste errors in documentation ipc/mqueue.c: only perform resource calculation if user valid include/asm-generic/bug.h: fix "cut here" for WARN_ON for __WARN_TAINT architectures scripts/gdb: add helpers to find and list devices scripts/gdb: add lx-genpd-summary command drivers/pps/pps.c: clear offset flags in PPS_SETPARAMS ioctl kernel/pid.c: convert struct pid count to refcount_t drivers/rapidio/devices/rio_mport_cdev.c: NUL terminate some strings select: shift restore_saved_sigmask_unless() into poll_select_copy_remaining() select: change do_poll() to return -ERESTARTNOHAND rather than -EINTR ...

Linus Torvalds committed 7 years ago

Commit 57a8ec32 parents 0a8ad0f 43e11fa151 files · +2674 −1225Browse files

Showing the changes to include/uapi/linux (3 of 151 files). Show all

Unified · Split

3 files

include/uapi/linux/coda.h +38 −18
include/uapi/linux/coda_psdev.h +0 −28
include/uapi/linux/ptrace.h +35 −0

include/uapi/linux/coda.h+38−18

 #define inline
-struct timespec {
-        long       ts_sec;
-        long       ts_nsec;
-};
 #else  /* DJGPP but not KERNEL */
 #include <sys/time.h>
 typedef unsigned long long u_quad_t;
 #define cdev_t dev_t
 #endif
-#ifdef __CYGWIN32__
-struct timespec {
-        time_t  tv_sec;         /* seconds */
-        long    tv_nsec;        /* nanoseconds */
-};
-#endif
 #ifndef __BIT_TYPES_DEFINED__
 #define __BIT_TYPES_DEFINED__
 typedef signed char	      int8_t;
  */
 enum coda_vtype	{ C_VNON, C_VREG, C_VDIR, C_VBLK, C_VCHR, C_VLNK, C_VSOCK, C_VFIFO, C_VBAD };
+struct coda_timespec {
+	int64_t		tv_sec;		/* seconds */
+	long		tv_nsec;	/* nanoseconds */
+};
 struct coda_vattr {
 	long     	va_type;	/* vnode type (for create) */
 	u_short		va_mode;	/* files access mode and type */
 	long		va_fileid;	/* file id */
 	u_quad_t	va_size;	/* file size in bytes */
 	long		va_blocksize;	/* blocksize preferred for i/o */
-	struct timespec	va_atime;	/* time of last access */
+	struct coda_timespec va_atime;	/* time of last access */
-	struct timespec	va_mtime;	/* time of last modification */
+	struct coda_timespec va_mtime;	/* time of last modification */
-	struct timespec	va_ctime;	/* time file changed */
+	struct coda_timespec va_ctime;	/* time file changed */
 	u_long		va_gen;		/* generation number of file */
 	u_long		va_flags;	/* flags defined for file */
 	cdev_t	        va_rdev;	/* device special file represents */
 #define CODA_STATFS	 34
 #define CODA_STORE	 35
 #define CODA_RELEASE	 36
-#define CODA_NCALLS 37
+#define CODA_ACCESS_INTENT 37
+#define CODA_NCALLS 38
 #define DOWNCALL(opcode) (opcode >= CODA_REPLACE && opcode <= CODA_PURGEFID)
 #define CIOC_KERNEL_VERSION _IOWR('c', 10, size_t)
-#define CODA_KERNEL_VERSION 3 /* 128-bit file identifiers */
+//      CODA_KERNEL_VERSION 0 /* don't care about kernel version number */
+//      CODA_KERNEL_VERSION 1 /* The old venus 4.6 compatible interface */
+//      CODA_KERNEL_VERSION 2 /* venus_lookup gets an extra parameter */
+//      CODA_KERNEL_VERSION 3 /* 128-bit file identifiers */
+//      CODA_KERNEL_VERSION 4 /* 64-bit timespec */
+#define CODA_KERNEL_VERSION 5 /* access intent support */
 /*
  *        Venus <-> Coda  RPC arguments
 struct coda_in_hdr {
     u_int32_t opcode;
     u_int32_t unique;	    /* Keep multiple outstanding msgs distinct */
-    pid_t pid;
+    __kernel_pid_t pid;
-    pid_t pgid;
+    __kernel_pid_t pgid;
     vuid_t uid;
 };
     struct coda_statfs stat;
 };
+#define CODA_ACCESS_TYPE_READ		1
+#define CODA_ACCESS_TYPE_WRITE		2
+#define CODA_ACCESS_TYPE_MMAP		3
+#define CODA_ACCESS_TYPE_READ_FINISH	4
+#define CODA_ACCESS_TYPE_WRITE_FINISH	5
+/* coda_access_intent: NO_OUT */
+struct coda_access_intent_in {
+	struct coda_in_hdr ih;
+	struct CodaFid VFid;
+	int count;
+	int pos;
+	int type;
+};
+struct coda_access_intent_out {
+	struct coda_out_hdr out;
+};
 /*
  * Occasionally, we don't cache the fid returned by CODA_LOOKUP.
  * For instance, if the fid is inconsistent.
     struct coda_open_by_fd_in coda_open_by_fd;
     struct coda_open_by_path_in coda_open_by_path;
     struct coda_statfs_in coda_statfs;
+    struct coda_access_intent_in coda_access_intent;
 };
 union outputArgs {

include/uapi/linux/coda_psdev.h+0−28

@@ -1,28 +0,0 @@
1	/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
2	#ifndef _UAPI__CODA_PSDEV_H
3	#define _UAPI__CODA_PSDEV_H
4
5	#include <linux/magic.h>
6
7	#define CODA_PSDEV_MAJOR 67
8	#define MAX_CODADEVS 5 /* how many do we allow */
9
10
11	/* messages between coda filesystem in kernel and Venus */
12	struct upc_req {
13	struct list_head uc_chain;
14	caddr_t uc_data;
15	u_short uc_flags;
16	u_short uc_inSize; /* Size is at most 5000 bytes */
17	u_short uc_outSize;
18	u_short uc_opcode; /* copied from data to save lookup */
19	int uc_unique;
20	wait_queue_head_t uc_sleep; /* process' wait queue */
21	};
22
23	#define CODA_REQ_ASYNC 0x1
24	#define CODA_REQ_READ 0x2
25	#define CODA_REQ_WRITE 0x4
26	#define CODA_REQ_ABORT 0x8
27
28	#endif /* _UAPI__CODA_PSDEV_H */

include/uapi/linux/ptrace.h+35−0

@@ -73,6 +73,41 @@ struct seccomp_metadata { · 72 unmodified lines
73	__u64 flags; /* Output: filter's flags */	73	__u64 flags; /* Output: filter's flags */
74	};	74	};
75		75
		76	#define PTRACE_GET_SYSCALL_INFO 0x420e
		77	#define PTRACE_SYSCALL_INFO_NONE 0
		78	#define PTRACE_SYSCALL_INFO_ENTRY 1
		79	#define PTRACE_SYSCALL_INFO_EXIT 2
		80	#define PTRACE_SYSCALL_INFO_SECCOMP 3
		81
		82	struct ptrace_syscall_info {
		83	__u8 op; /* PTRACE_SYSCALL_INFO_* */
		84	__u32 arch __attribute__((__aligned__(sizeof(__u32))));
		85	__u64 instruction_pointer;
		86	__u64 stack_pointer;
		87	union {
		88	struct {
		89	__u64 nr;
		90	__u64 args[6];
		91	} entry;
		92	struct {
		93	__s64 rval;
		94	__u8 is_error;
		95	} exit;
		96	struct {
		97	__u64 nr;
		98	__u64 args[6];
		99	__u32 ret_data;
		100	} seccomp;
		101	};
		102	};
		103
		104	/*
		105	* These values are stored in task->ptrace_message
		106	* by tracehook_report_syscall_* to describe the current syscall-stop.
		107	*/
		108	#define PTRACE_EVENTMSG_SYSCALL_ENTRY 1
		109	#define PTRACE_EVENTMSG_SYSCALL_EXIT 2
		110
76	/* Read signals from a shared (process wide) queue */	111	/* Read signals from a shared (process wide) queue */
77	#define PTRACE_PEEKSIGINFO_SHARED (1 << 0)	112	#define PTRACE_PEEKSIGINFO_SHARED (1 << 0)
78		113

Merge branch 'akpm' (patches from Andrew)

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code