Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1677435

[RFC PATCH 1/4] Provide linux/set_memory.h

Show all headers | View raw

Currently code that wants to use set_memory_ro() etc, needs to include
asm/set_memory.h, which doesn't exist on all arches. Some code knows
it only builds on arches which have the header, other code guards the
inclusion with an #ifdef, neither is ideal.

So create linux/set_memory.h. This always exists, so users don't need
an #ifdef just to include the header.

When CONFIG_ARCH_HAS_SET_MEMORY=y it includes asm/set_memory.h,
otherwise it provides empty non-failing implementations.

Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
---
 include/linux/set_memory.h | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 include/linux/set_memory.h


Does this look OK to people? If so it would be great if someone, Kees?,
Andrew?, could pick up patch 1 (it's a nop by itself) and then we can send the
conversions separately later in the merge window?

cheers

diff --git a/include/linux/set_memory.h b/include/linux/set_memory.h
new file mode 100644
index 000000000000..e5140648f638
--- /dev/null
+++ b/include/linux/set_memory.h
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2017, Michael Ellerman, IBM Corporation.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version
+ * 2 as published by the Free Software Foundation;
+ */
+#ifndef _LINUX_SET_MEMORY_H_
+#define _LINUX_SET_MEMORY_H_
+
+#ifdef CONFIG_ARCH_HAS_SET_MEMORY
+#include <asm/set_memory.h>
+#else
+static inline int set_memory_ro(unsigned long addr, int numpages) { return 0; }
+static inline int set_memory_rw(unsigned long addr, int numpages) { return 0; }
+static inline int set_memory_x(unsigned long addr,  int numpages) { return 0; }
+static inline int set_memory_nx(unsigned long addr, int numpages) { return 0; }
+#endif
+
+#endif /* _LINUX_SET_MEMORY_H_ */
-- 
2.7.4

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[RFC PATCH 1/4] Provide linux/set_memory.h Michael Ellerman <mpe@ellerman.id.au> - 2017-06-29 08:40 +0200
  [RFC PATCH 3/4] module: Use linux/set_memory.h Michael Ellerman <mpe@ellerman.id.au> - 2017-06-29 08:40 +0200
  [RFC PATCH 4/4] bpf: Use linux/set_memory.h Michael Ellerman <mpe@ellerman.id.au> - 2017-06-29 08:40 +0200
    Re: [kernel-hardening] [RFC PATCH 4/4] bpf: Use linux/set_memory.h Daniel Borkmann <daniel@iogearbox.net> - 2017-06-29 11:00 +0200
  Re: [kernel-hardening] [RFC PATCH 1/4] Provide linux/set_memory.h Daniel Borkmann <daniel@iogearbox.net> - 2017-06-29 11:10 +0200
    Re: [kernel-hardening] [RFC PATCH 1/4] Provide linux/set_memory.h Kees Cook <keescook@chromium.org> - 2017-06-29 18:20 +0200
      Re: [kernel-hardening] [RFC PATCH 1/4] Provide linux/set_memory.h Michael Ellerman <mpe@ellerman.id.au> - 2017-06-30 03:50 +0200
  Re: [RFC PATCH 1/4] Provide linux/set_memory.h Laura Abbott <labbott@redhat.com> - 2017-06-29 18:50 +0200

csiph-web