* [tip: perf/urgent] tools headers uapi: Sync linux/fscrypt.h with the kernel sources
@ 2020-02-15 8:41 tip-bot2 for Arnaldo Carvalho de Melo
0 siblings, 0 replies; 3+ messages in thread
From: tip-bot2 for Arnaldo Carvalho de Melo @ 2020-02-15 8:41 UTC (permalink / raw)
To: linux-tip-commits
Cc: Adrian Hunter, Eric Biggers, Jiri Olsa, Namhyung Kim,
Arnaldo Carvalho de Melo, x86, LKML
The following commit has been merged into the perf/urgent branch of tip:
Commit-ID: f65b9dba5733de8e285cf9d7e8672b46dd0cb709
Gitweb: https://git.kernel.org/tip/f65b9dba5733de8e285cf9d7e8672b46dd0cb709
Author: Arnaldo Carvalho de Melo <acme@redhat.com>
AuthorDate: Wed, 12 Feb 2020 10:13:25 -03:00
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitterDate: Wed, 12 Feb 2020 10:13:25 -03:00
tools headers uapi: Sync linux/fscrypt.h with the kernel sources
To pick the changes from:
e933adde6f97 ("fscrypt: include <linux/ioctl.h> in UAPI header")
93edd392cad7 ("fscrypt: support passing a keyring key to FS_IOC_ADD_ENCRYPTION_KEY")
That don't trigger any changes in tooling.
This silences this perf build warning:
Warning: Kernel ABI header at 'tools/include/uapi/linux/fscrypt.h' differs from latest version at 'include/uapi/linux/fscrypt.h'
diff -u tools/include/uapi/linux/fscrypt.h include/uapi/linux/fscrypt.h
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Eric Biggers <ebiggers@google.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/include/uapi/linux/fscrypt.h | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/tools/include/uapi/linux/fscrypt.h b/tools/include/uapi/linux/fscrypt.h
index 1beb174..0d8a6f4 100644
--- a/tools/include/uapi/linux/fscrypt.h
+++ b/tools/include/uapi/linux/fscrypt.h
@@ -8,6 +8,7 @@
#ifndef _UAPI_LINUX_FSCRYPT_H
#define _UAPI_LINUX_FSCRYPT_H
+#include <linux/ioctl.h>
#include <linux/types.h>
/* Encryption policy flags */
@@ -109,11 +110,22 @@ struct fscrypt_key_specifier {
} u;
};
+/*
+ * Payload of Linux keyring key of type "fscrypt-provisioning", referenced by
+ * fscrypt_add_key_arg::key_id as an alternative to fscrypt_add_key_arg::raw.
+ */
+struct fscrypt_provisioning_key_payload {
+ __u32 type;
+ __u32 __reserved;
+ __u8 raw[];
+};
+
/* Struct passed to FS_IOC_ADD_ENCRYPTION_KEY */
struct fscrypt_add_key_arg {
struct fscrypt_key_specifier key_spec;
__u32 raw_size;
- __u32 __reserved[9];
+ __u32 key_id;
+ __u32 __reserved[8];
__u8 raw[];
};
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [tip: perf/urgent] tools headers UAPI: Sync linux/fscrypt.h with the kernel sources
@ 2020-04-16 8:31 tip-bot2 for Arnaldo Carvalho de Melo
0 siblings, 0 replies; 3+ messages in thread
From: tip-bot2 for Arnaldo Carvalho de Melo @ 2020-04-16 8:31 UTC (permalink / raw)
To: linux-tip-commits
Cc: Adrian Hunter, Eric Biggers, Jiri Olsa, Namhyung Kim,
Arnaldo Carvalho de Melo, x86, LKML
The following commit has been merged into the perf/urgent branch of tip:
Commit-ID: 1abcb9d96dada352c7721105f4efec16784ae87c
Gitweb: https://git.kernel.org/tip/1abcb9d96dada352c7721105f4efec16784ae87c
Author: Arnaldo Carvalho de Melo <acme@redhat.com>
AuthorDate: Tue, 14 Apr 2020 09:17:22 -03:00
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitterDate: Tue, 14 Apr 2020 11:02:52 -03:00
tools headers UAPI: Sync linux/fscrypt.h with the kernel sources
To pick the changes from:
e98ad464750c ("fscrypt: add FS_IOC_GET_ENCRYPTION_NONCE ioctl")
That don't trigger any changes in tooling.
This silences this perf build warning:
Warning: Kernel ABI header at 'tools/include/uapi/linux/fscrypt.h' differs from latest version at 'include/uapi/linux/fscrypt.h'
diff -u tools/include/uapi/linux/fscrypt.h include/uapi/linux/fscrypt.h
In time we should come up with something like:
$ tools/perf/trace/beauty/fsconfig.sh
static const char *fsconfig_cmds[] = {
[0] = "SET_FLAG",
[1] = "SET_STRING",
[2] = "SET_BINARY",
[3] = "SET_PATH",
[4] = "SET_PATH_EMPTY",
[5] = "SET_FD",
[6] = "CMD_CREATE",
[7] = "CMD_RECONFIGURE",
};
$
And:
$ tools/perf/trace/beauty/drm_ioctl.sh | head
#ifndef DRM_COMMAND_BASE
#define DRM_COMMAND_BASE 0x40
#endif
static const char *drm_ioctl_cmds[] = {
[0x00] = "VERSION",
[0x01] = "GET_UNIQUE",
[0x02] = "GET_MAGIC",
[0x03] = "IRQ_BUSID",
[0x04] = "GET_MAP",
[0x05] = "GET_CLIENT",
$
For fscrypt's ioctls.
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Eric Biggers <ebiggers@google.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/include/uapi/linux/fscrypt.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/tools/include/uapi/linux/fscrypt.h b/tools/include/uapi/linux/fscrypt.h
index 0d8a6f4..a10e3cd 100644
--- a/tools/include/uapi/linux/fscrypt.h
+++ b/tools/include/uapi/linux/fscrypt.h
@@ -163,6 +163,7 @@ struct fscrypt_get_key_status_arg {
#define FS_IOC_REMOVE_ENCRYPTION_KEY _IOWR('f', 24, struct fscrypt_remove_key_arg)
#define FS_IOC_REMOVE_ENCRYPTION_KEY_ALL_USERS _IOWR('f', 25, struct fscrypt_remove_key_arg)
#define FS_IOC_GET_ENCRYPTION_KEY_STATUS _IOWR('f', 26, struct fscrypt_get_key_status_arg)
+#define FS_IOC_GET_ENCRYPTION_NONCE _IOR('f', 27, __u8[16])
/**********************************************************************/
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [tip: perf/urgent] tools headers uapi: Sync linux/fscrypt.h with the kernel sources
[not found] <tip-cgfz3ffe07pw2m8hmstvkudl@git.kernel.org>
@ 2019-12-04 7:53 ` tip-bot2 for Arnaldo Carvalho de Melo
0 siblings, 0 replies; 3+ messages in thread
From: tip-bot2 for Arnaldo Carvalho de Melo @ 2019-12-04 7:53 UTC (permalink / raw)
To: linux-tip-commits
Cc: Adrian Hunter, Eric Biggers, Jiri Olsa, Namhyung Kim,
Arnaldo Carvalho de Melo, x86, LKML
The following commit has been merged into the perf/urgent branch of tip:
Commit-ID: ad46f35cca45e3164137271cd7f06d7e66dae6be
Gitweb: https://git.kernel.org/tip/ad46f35cca45e3164137271cd7f06d7e66dae6be
Author: Arnaldo Carvalho de Melo <acme@redhat.com>
AuthorDate: Mon, 02 Dec 2019 12:19:24 -03:00
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitterDate: Mon, 02 Dec 2019 12:19:24 -03:00
tools headers uapi: Sync linux/fscrypt.h with the kernel sources
To pick the changes from:
b103fb7653ff ("fscrypt: add support for IV_INO_LBLK_64 policies")
That don't trigger any changes in tooling.
This silences this perf build warning:
Warning: Kernel ABI header at 'tools/include/uapi/linux/fscrypt.h' differs from latest version at 'include/uapi/linux/fscrypt.h'
diff -u tools/include/uapi/linux/fscrypt.h include/uapi/linux/fscrypt.h
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Eric Biggers <ebiggers@google.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: https://lkml.kernel.org/n/tip-cgfz3ffe07pw2m8hmstvkudl@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/include/uapi/linux/fscrypt.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tools/include/uapi/linux/fscrypt.h b/tools/include/uapi/linux/fscrypt.h
index 39ccfe9..1beb174 100644
--- a/tools/include/uapi/linux/fscrypt.h
+++ b/tools/include/uapi/linux/fscrypt.h
@@ -17,7 +17,8 @@
#define FSCRYPT_POLICY_FLAGS_PAD_32 0x03
#define FSCRYPT_POLICY_FLAGS_PAD_MASK 0x03
#define FSCRYPT_POLICY_FLAG_DIRECT_KEY 0x04
-#define FSCRYPT_POLICY_FLAGS_VALID 0x07
+#define FSCRYPT_POLICY_FLAG_IV_INO_LBLK_64 0x08
+#define FSCRYPT_POLICY_FLAGS_VALID 0x0F
/* Encryption algorithms */
#define FSCRYPT_MODE_AES_256_XTS 1
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-04-16 9:14 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-15 8:41 [tip: perf/urgent] tools headers uapi: Sync linux/fscrypt.h with the kernel sources tip-bot2 for Arnaldo Carvalho de Melo
-- strict thread matches above, loose matches on Subject: below --
2020-04-16 8:31 [tip: perf/urgent] tools headers UAPI: " tip-bot2 for Arnaldo Carvalho de Melo
[not found] <tip-cgfz3ffe07pw2m8hmstvkudl@git.kernel.org>
2019-12-04 7:53 ` [tip: perf/urgent] tools headers uapi: " tip-bot2 for Arnaldo Carvalho de Melo
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.