Re: [PATCHv2 2/2] mm/page_poisoning.c: Allow for zero poisoning

[Pavel Machek]

Hi!

> >>By default, page poisoning uses a poison value (0xaa) on free. If this
> >>is changed to 0, the page is not only sanitized but zeroing on alloc
> >>with __GFP_ZERO can be skipped as well. The tradeoff is that detecting
> >>corruption from the poisoning is harder to detect. This feature also
> >>cannot be used with hibernation since pages are not guaranteed to be
> >>zeroed after hibernation.
> >
> >So... this makes kernel harder to debug for performance advantage...?
> >If so.. how big is the performance advantage?

> 
> The performance advantage really depends on the benchmark you are
> running.

You are trying to improve performance, so you should publish at least
one benchmark where it helps.

Alternatively, quote kernel build times with and without the
patch.

If it speeds kernel compile twice, I guess I may even help with
hibernation support. If it makes kernel compile faster by .0034%
(or slows it down), we should probably simply ignore this patch.

Pavel
-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) 
http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

Re: [PATCHv2 2/2] mm/page_poisoning.c: Allow for zero poisoning

[Pavel Machek]

Hi!

> >>By default, page poisoning uses a poison value (0xaa) on free. If this
> >>is changed to 0, the page is not only sanitized but zeroing on alloc
> >>with __GFP_ZERO can be skipped as well. The tradeoff is that detecting
> >>corruption from the poisoning is harder to detect. This feature also
> >>cannot be used with hibernation since pages are not guaranteed to be
> >>zeroed after hibernation.
> >
> >So... this makes kernel harder to debug for performance advantage...?
> >If so.. how big is the performance advantage?

> 
> The performance advantage really depends on the benchmark you are
> running.

You are trying to improve performance, so you should publish at least
one benchmark where it helps.

Alternatively, quote kernel build times with and without the
patch.

If it speeds kernel compile twice, I guess I may even help with
hibernation support. If it makes kernel compile faster by .0034%
(or slows it down), we should probably simply ignore this patch.

Pavel
-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) 
http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

Re: [PATCHv2 2/2] mm/page_poisoning.c: Allow for zero poisoning

[Laura Abbott]

On 01/29/2016 02:45 AM, Pavel Machek wrote:

Hi!


By default, page poisoning uses a poison value (0xaa) on free. If this
is changed to 0, the page is not only sanitized but zeroing on alloc
with __GFP_ZERO can be skipped as well. The tradeoff is that detecting
corruption from the poisoning is harder to detect. This feature also
cannot be used with hibernation since pages are not guaranteed to be
zeroed after hibernation.


So... this makes kernel harder to debug for performance advantage...?
If so.. how big is the performance advantage?
Pavel



The performance advantage really depends on the benchmark you are running.
It was pointed out this may help some unknown amount with merging pages
in VMs since the pages are now identical and can be merged. The debugging
is also only slightly more difficult. With the non-zero poisoning value
it's easier to see that a crash was caused by triggering the poison vs.
just some random NULL pointer.

As as been pointed out, this help text could use some updating so I'll
clarify this more.

Thanks,
Laura

Re: [PATCHv2 2/2] mm/page_poisoning.c: Allow for zero poisoning

[Laura Abbott]

On 01/28/2016 08:46 PM, Kees Cook wrote:

On Thu, Jan 28, 2016 at 6:38 PM, Laura Abbott  wrote:

By default, page poisoning uses a poison value (0xaa) on free. If this
is changed to 0, the page is not only sanitized but zeroing on alloc
with __GFP_ZERO can be skipped as well. The tradeoff is that detecting
corruption from the poisoning is harder to detect. This feature also
cannot be used with hibernation since pages are not guaranteed to be
zeroed after hibernation.

Credit to Grsecurity/PaX team for inspiring this work

Signed-off-by: Laura Abbott 
---
  include/linux/mm.h   |  2 ++
  include/linux/poison.h   |  4 
  kernel/power/hibernate.c | 17 +
  mm/Kconfig.debug | 14 ++
  mm/page_alloc.c  | 11 ++-
  mm/page_ext.c| 10 --
  mm/page_poison.c |  7 +--
  7 files changed, 60 insertions(+), 5 deletions(-)

diff --git a/include/linux/mm.h b/include/linux/mm.h
index 966bf0e..59ce0dc 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -2177,10 +2177,12 @@ extern int apply_to_page_range(struct mm_struct *mm, 
unsigned long address,
  #ifdef CONFIG_PAGE_POISONING
  extern bool page_poisoning_enabled(void);
  extern void kernel_poison_pages(struct page *page, int numpages, int enable);
+extern bool page_is_poisoned(struct page *page);
  #else
  static inline bool page_poisoning_enabled(void) { return false; }
  static inline void kernel_poison_pages(struct page *page, int numpages,
 int enable) { }
+static inline bool page_is_poisoned(struct page *page) { return false; }
  #endif

  #ifdef CONFIG_DEBUG_PAGEALLOC
diff --git a/include/linux/poison.h b/include/linux/poison.h
index 4a27153..51334ed 100644
--- a/include/linux/poison.h
+++ b/include/linux/poison.h
@@ -30,7 +30,11 @@
  #define TIMER_ENTRY_STATIC ((void *) 0x300 + POISON_POINTER_DELTA)

  /** mm/debug-pagealloc.c **/
+#ifdef CONFIG_PAGE_POISONING_ZERO
+#define PAGE_POISON 0x00
+#else
  #define PAGE_POISON 0xaa
+#endif

  /** mm/page_alloc.c /

diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
index b7342a2..aa0f26b 100644
--- a/kernel/power/hibernate.c
+++ b/kernel/power/hibernate.c
@@ -1158,6 +1158,22 @@ static int __init kaslr_nohibernate_setup(char *str)
 return nohibernate_setup(str);
  }

+static int __init page_poison_nohibernate_setup(char *str)
+{
+#ifdef CONFIG_PAGE_POISONING_ZERO
+   /*
+* The zeroing option for page poison skips the checks on alloc.
+* since hibernation doesn't save free pages there's no way to
+* guarantee the pages will still be zeroed.
+*/
+   if (!strcmp(str, "on")) {
+   pr_info("Disabling hibernation due to page poisoning\n");
+   return nohibernate_setup(str);
+   }
+#endif
+   return 1;
+}
+
  __setup("noresume", noresume_setup);
  __setup("resume_offset=", resume_offset_setup);
  __setup("resume=", resume_setup);
@@ -1166,3 +1182,4 @@ __setup("resumewait", resumewait_setup);
  __setup("resumedelay=", resumedelay_setup);
  __setup("nohibernate", nohibernate_setup);
  __setup("kaslr", kaslr_nohibernate_setup);
+__setup("page_poison=", page_poison_nohibernate_setup);
diff --git a/mm/Kconfig.debug b/mm/Kconfig.debug
index 25c98ae..3d3b954 100644
--- a/mm/Kconfig.debug
+++ b/mm/Kconfig.debug
@@ -48,3 +48,17 @@ config PAGE_POISONING_NO_SANITY

If you are only interested in sanitization, say Y. Otherwise
say N.
+
+config PAGE_POISONING_ZERO
+   bool "Use zero for poisoning instead of random data"
+   depends on PAGE_POISONING
+   ---help---
+  Instead of using the existing poison value, fill the pages with
+  zeros. This makes it harder to detect when errors are occurring
+  due to sanitization but the zeroing at free means that it is
+  no longer necessary to write zeros when GFP_ZERO is used on
+  allocation.


May be worth noting the security benefit in this help text.



This is supposed to build on the existing page poisoning which mentions the
security bit. I think this text needs to be clarified how this works.
 

+
+  Enabling page poisoning with this option will disable hibernation


This isn't obvious to me. It looks like you need to both use
CONFIG_PAGE_POISOING_ZERO and put "page_poison=on" on the command line
to enable it?


Yeah, this isn't really clear. I'll make it more obvious this is an extension
of page poisoning so page poisoning must be enabled first.



-Kees



Thanks,
Laura
 

+
+  If unsure, say N
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index cc4762a..59bd9dc 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -1382,15 +1382,24 @@ static inline int check_new_page(struct page *page)
 return 0;
  }

+static inline bool free_pages_prezeroed(bool poisoned)
+{
+   return IS_ENABLED(CONFIG_PAGE_POISONING_ZERO) &&
+ 

Re: [PATCHv2 2/2] mm/page_poisoning.c: Allow for zero poisoning

[Pavel Machek]

Hi!

> By default, page poisoning uses a poison value (0xaa) on free. If this
> is changed to 0, the page is not only sanitized but zeroing on alloc
> with __GFP_ZERO can be skipped as well. The tradeoff is that detecting
> corruption from the poisoning is harder to detect. This feature also
> cannot be used with hibernation since pages are not guaranteed to be
> zeroed after hibernation.

So... this makes kernel harder to debug for performance advantage...?
If so.. how big is the performance advantage?
Pavel
-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) 
http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

Re: [PATCHv2 2/2] mm/page_poisoning.c: Allow for zero poisoning

[Pavel Machek]

Hi!

> By default, page poisoning uses a poison value (0xaa) on free. If this
> is changed to 0, the page is not only sanitized but zeroing on alloc
> with __GFP_ZERO can be skipped as well. The tradeoff is that detecting
> corruption from the poisoning is harder to detect. This feature also
> cannot be used with hibernation since pages are not guaranteed to be
> zeroed after hibernation.

So... this makes kernel harder to debug for performance advantage...?
If so.. how big is the performance advantage?
Pavel
-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) 
http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

Re: [PATCHv2 2/2] mm/page_poisoning.c: Allow for zero poisoning

[Laura Abbott]

On 01/28/2016 08:46 PM, Kees Cook wrote:

On Thu, Jan 28, 2016 at 6:38 PM, Laura Abbott  wrote:

By default, page poisoning uses a poison value (0xaa) on free. If this
is changed to 0, the page is not only sanitized but zeroing on alloc
with __GFP_ZERO can be skipped as well. The tradeoff is that detecting
corruption from the poisoning is harder to detect. This feature also
cannot be used with hibernation since pages are not guaranteed to be
zeroed after hibernation.

Credit to Grsecurity/PaX team for inspiring this work

Signed-off-by: Laura Abbott 
---
  include/linux/mm.h   |  2 ++
  include/linux/poison.h   |  4 
  kernel/power/hibernate.c | 17 +
  mm/Kconfig.debug | 14 ++
  mm/page_alloc.c  | 11 ++-
  mm/page_ext.c| 10 --
  mm/page_poison.c |  7 +--
  7 files changed, 60 insertions(+), 5 deletions(-)

diff --git a/include/linux/mm.h b/include/linux/mm.h
index 966bf0e..59ce0dc 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -2177,10 +2177,12 @@ extern int apply_to_page_range(struct mm_struct *mm, 
unsigned long address,
  #ifdef CONFIG_PAGE_POISONING
  extern bool page_poisoning_enabled(void);
  extern void kernel_poison_pages(struct page *page, int numpages, int enable);
+extern bool page_is_poisoned(struct page *page);
  #else
  static inline bool page_poisoning_enabled(void) { return false; }
  static inline void kernel_poison_pages(struct page *page, int numpages,
 int enable) { }
+static inline bool page_is_poisoned(struct page *page) { return false; }
  #endif

  #ifdef CONFIG_DEBUG_PAGEALLOC
diff --git a/include/linux/poison.h b/include/linux/poison.h
index 4a27153..51334ed 100644
--- a/include/linux/poison.h
+++ b/include/linux/poison.h
@@ -30,7 +30,11 @@
  #define TIMER_ENTRY_STATIC ((void *) 0x300 + POISON_POINTER_DELTA)

  /** mm/debug-pagealloc.c **/
+#ifdef CONFIG_PAGE_POISONING_ZERO
+#define PAGE_POISON 0x00
+#else
  #define PAGE_POISON 0xaa
+#endif

  /** mm/page_alloc.c /

diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
index b7342a2..aa0f26b 100644
--- a/kernel/power/hibernate.c
+++ b/kernel/power/hibernate.c
@@ -1158,6 +1158,22 @@ static int __init kaslr_nohibernate_setup(char *str)
 return nohibernate_setup(str);
  }

+static int __init page_poison_nohibernate_setup(char *str)
+{
+#ifdef CONFIG_PAGE_POISONING_ZERO
+   /*
+* The zeroing option for page poison skips the checks on alloc.
+* since hibernation doesn't save free pages there's no way to
+* guarantee the pages will still be zeroed.
+*/
+   if (!strcmp(str, "on")) {
+   pr_info("Disabling hibernation due to page poisoning\n");
+   return nohibernate_setup(str);
+   }
+#endif
+   return 1;
+}
+
  __setup("noresume", noresume_setup);
  __setup("resume_offset=", resume_offset_setup);
  __setup("resume=", resume_setup);
@@ -1166,3 +1182,4 @@ __setup("resumewait", resumewait_setup);
  __setup("resumedelay=", resumedelay_setup);
  __setup("nohibernate", nohibernate_setup);
  __setup("kaslr", kaslr_nohibernate_setup);
+__setup("page_poison=", page_poison_nohibernate_setup);
diff --git a/mm/Kconfig.debug b/mm/Kconfig.debug
index 25c98ae..3d3b954 100644
--- a/mm/Kconfig.debug
+++ b/mm/Kconfig.debug
@@ -48,3 +48,17 @@ config PAGE_POISONING_NO_SANITY

If you are only interested in sanitization, say Y. Otherwise
say N.
+
+config PAGE_POISONING_ZERO
+   bool "Use zero for poisoning instead of random data"
+   depends on PAGE_POISONING
+   ---help---
+  Instead of using the existing poison value, fill the pages with
+  zeros. This makes it harder to detect when errors are occurring
+  due to sanitization but the zeroing at free means that it is
+  no longer necessary to write zeros when GFP_ZERO is used on
+  allocation.


May be worth noting the security benefit in this help text.



This is supposed to build on the existing page poisoning which mentions the
security bit. I think this text needs to be clarified how this works.
 

+
+  Enabling page poisoning with this option will disable hibernation


This isn't obvious to me. It looks like you need to both use
CONFIG_PAGE_POISOING_ZERO and put "page_poison=on" on the command line
to enable it?


Yeah, this isn't really clear. I'll make it more obvious this is an extension
of page poisoning so page poisoning must be enabled first.



-Kees



Thanks,
Laura
 

+
+  If unsure, say N
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index cc4762a..59bd9dc 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -1382,15 +1382,24 @@ static inline int check_new_page(struct page *page)
 return 0;
  }

+static inline bool free_pages_prezeroed(bool poisoned)
+{
+   

Re: [PATCHv2 2/2] mm/page_poisoning.c: Allow for zero poisoning

[Laura Abbott]

On 01/29/2016 02:45 AM, Pavel Machek wrote:

Hi!


By default, page poisoning uses a poison value (0xaa) on free. If this
is changed to 0, the page is not only sanitized but zeroing on alloc
with __GFP_ZERO can be skipped as well. The tradeoff is that detecting
corruption from the poisoning is harder to detect. This feature also
cannot be used with hibernation since pages are not guaranteed to be
zeroed after hibernation.


So... this makes kernel harder to debug for performance advantage...?
If so.. how big is the performance advantage?
Pavel



The performance advantage really depends on the benchmark you are running.
It was pointed out this may help some unknown amount with merging pages
in VMs since the pages are now identical and can be merged. The debugging
is also only slightly more difficult. With the non-zero poisoning value
it's easier to see that a crash was caused by triggering the poison vs.
just some random NULL pointer.

As as been pointed out, this help text could use some updating so I'll
clarify this more.

Thanks,
Laura

Re: [PATCHv2 2/2] mm/page_poisoning.c: Allow for zero poisoning

[Kees Cook]

On Thu, Jan 28, 2016 at 6:38 PM, Laura Abbott  wrote:
> By default, page poisoning uses a poison value (0xaa) on free. If this
> is changed to 0, the page is not only sanitized but zeroing on alloc
> with __GFP_ZERO can be skipped as well. The tradeoff is that detecting
> corruption from the poisoning is harder to detect. This feature also
> cannot be used with hibernation since pages are not guaranteed to be
> zeroed after hibernation.
>
> Credit to Grsecurity/PaX team for inspiring this work
>
> Signed-off-by: Laura Abbott 
> ---
>  include/linux/mm.h   |  2 ++
>  include/linux/poison.h   |  4 
>  kernel/power/hibernate.c | 17 +
>  mm/Kconfig.debug | 14 ++
>  mm/page_alloc.c  | 11 ++-
>  mm/page_ext.c| 10 --
>  mm/page_poison.c |  7 +--
>  7 files changed, 60 insertions(+), 5 deletions(-)
>
> diff --git a/include/linux/mm.h b/include/linux/mm.h
> index 966bf0e..59ce0dc 100644
> --- a/include/linux/mm.h
> +++ b/include/linux/mm.h
> @@ -2177,10 +2177,12 @@ extern int apply_to_page_range(struct mm_struct *mm, 
> unsigned long address,
>  #ifdef CONFIG_PAGE_POISONING
>  extern bool page_poisoning_enabled(void);
>  extern void kernel_poison_pages(struct page *page, int numpages, int enable);
> +extern bool page_is_poisoned(struct page *page);
>  #else
>  static inline bool page_poisoning_enabled(void) { return false; }
>  static inline void kernel_poison_pages(struct page *page, int numpages,
> int enable) { }
> +static inline bool page_is_poisoned(struct page *page) { return false; }
>  #endif
>
>  #ifdef CONFIG_DEBUG_PAGEALLOC
> diff --git a/include/linux/poison.h b/include/linux/poison.h
> index 4a27153..51334ed 100644
> --- a/include/linux/poison.h
> +++ b/include/linux/poison.h
> @@ -30,7 +30,11 @@
>  #define TIMER_ENTRY_STATIC ((void *) 0x300 + POISON_POINTER_DELTA)
>
>  /** mm/debug-pagealloc.c **/
> +#ifdef CONFIG_PAGE_POISONING_ZERO
> +#define PAGE_POISON 0x00
> +#else
>  #define PAGE_POISON 0xaa
> +#endif
>
>  /** mm/page_alloc.c /
>
> diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
> index b7342a2..aa0f26b 100644
> --- a/kernel/power/hibernate.c
> +++ b/kernel/power/hibernate.c
> @@ -1158,6 +1158,22 @@ static int __init kaslr_nohibernate_setup(char *str)
> return nohibernate_setup(str);
>  }
>
> +static int __init page_poison_nohibernate_setup(char *str)
> +{
> +#ifdef CONFIG_PAGE_POISONING_ZERO
> +   /*
> +* The zeroing option for page poison skips the checks on alloc.
> +* since hibernation doesn't save free pages there's no way to
> +* guarantee the pages will still be zeroed.
> +*/
> +   if (!strcmp(str, "on")) {
> +   pr_info("Disabling hibernation due to page poisoning\n");
> +   return nohibernate_setup(str);
> +   }
> +#endif
> +   return 1;
> +}
> +
>  __setup("noresume", noresume_setup);
>  __setup("resume_offset=", resume_offset_setup);
>  __setup("resume=", resume_setup);
> @@ -1166,3 +1182,4 @@ __setup("resumewait", resumewait_setup);
>  __setup("resumedelay=", resumedelay_setup);
>  __setup("nohibernate", nohibernate_setup);
>  __setup("kaslr", kaslr_nohibernate_setup);
> +__setup("page_poison=", page_poison_nohibernate_setup);
> diff --git a/mm/Kconfig.debug b/mm/Kconfig.debug
> index 25c98ae..3d3b954 100644
> --- a/mm/Kconfig.debug
> +++ b/mm/Kconfig.debug
> @@ -48,3 +48,17 @@ config PAGE_POISONING_NO_SANITY
>
>If you are only interested in sanitization, say Y. Otherwise
>say N.
> +
> +config PAGE_POISONING_ZERO
> +   bool "Use zero for poisoning instead of random data"
> +   depends on PAGE_POISONING
> +   ---help---
> +  Instead of using the existing poison value, fill the pages with
> +  zeros. This makes it harder to detect when errors are occurring
> +  due to sanitization but the zeroing at free means that it is
> +  no longer necessary to write zeros when GFP_ZERO is used on
> +  allocation.

May be worth noting the security benefit in this help text.

> +
> +  Enabling page poisoning with this option will disable hibernation

This isn't obvious to me. It looks like you need to both use
CONFIG_PAGE_POISOING_ZERO and put "page_poison=on" on the command line
to enable it?

-Kees

> +
> +  If unsure, say N
> diff --git a/mm/page_alloc.c b/mm/page_alloc.c
> index cc4762a..59bd9dc 100644
> --- a/mm/page_alloc.c
> +++ b/mm/page_alloc.c
> @@ -1382,15 +1382,24 @@ static inline int check_new_page(struct page *page)
> return 0;
>  }
>
> +static inline bool free_pages_prezeroed(bool poisoned)
> +{
> +   return IS_ENABLED(CONFIG_PAGE_POISONING_ZERO) &&
> +   page_poisoning_enabled() && poisoned;
> +}
> +
>  static int prep_new_page(struct page *page, unsigned int order, gfp_t 
> gfp_flags,
>   

Re: [PATCHv2 2/2] mm/page_poisoning.c: Allow for zero poisoning

[Rafael J. Wysocki]

On Thursday, January 28, 2016 06:38:19 PM Laura Abbott wrote:
> By default, page poisoning uses a poison value (0xaa) on free. If this
> is changed to 0, the page is not only sanitized but zeroing on alloc
> with __GFP_ZERO can be skipped as well. The tradeoff is that detecting
> corruption from the poisoning is harder to detect. This feature also
> cannot be used with hibernation since pages are not guaranteed to be
> zeroed after hibernation.
> 
> Credit to Grsecurity/PaX team for inspiring this work
> 
> Signed-off-by: Laura Abbott 

The hibernation disabling part is fine by me.

Please feel free to add an ACK from me to this if that helps.

Thanks,
Rafael

[PATCHv2 2/2] mm/page_poisoning.c: Allow for zero poisoning

[Laura Abbott]

By default, page poisoning uses a poison value (0xaa) on free. If this
is changed to 0, the page is not only sanitized but zeroing on alloc
with __GFP_ZERO can be skipped as well. The tradeoff is that detecting
corruption from the poisoning is harder to detect. This feature also
cannot be used with hibernation since pages are not guaranteed to be
zeroed after hibernation.

Credit to Grsecurity/PaX team for inspiring this work

Signed-off-by: Laura Abbott 
---
 include/linux/mm.h   |  2 ++
 include/linux/poison.h   |  4 
 kernel/power/hibernate.c | 17 +
 mm/Kconfig.debug | 14 ++
 mm/page_alloc.c  | 11 ++-
 mm/page_ext.c| 10 --
 mm/page_poison.c |  7 +--
 7 files changed, 60 insertions(+), 5 deletions(-)

diff --git a/include/linux/mm.h b/include/linux/mm.h
index 966bf0e..59ce0dc 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -2177,10 +2177,12 @@ extern int apply_to_page_range(struct mm_struct *mm, 
unsigned long address,
 #ifdef CONFIG_PAGE_POISONING
 extern bool page_poisoning_enabled(void);
 extern void kernel_poison_pages(struct page *page, int numpages, int enable);
+extern bool page_is_poisoned(struct page *page);
 #else
 static inline bool page_poisoning_enabled(void) { return false; }
 static inline void kernel_poison_pages(struct page *page, int numpages,
int enable) { }
+static inline bool page_is_poisoned(struct page *page) { return false; }
 #endif
 
 #ifdef CONFIG_DEBUG_PAGEALLOC
diff --git a/include/linux/poison.h b/include/linux/poison.h
index 4a27153..51334ed 100644
--- a/include/linux/poison.h
+++ b/include/linux/poison.h
@@ -30,7 +30,11 @@
 #define TIMER_ENTRY_STATIC ((void *) 0x300 + POISON_POINTER_DELTA)
 
 /** mm/debug-pagealloc.c **/
+#ifdef CONFIG_PAGE_POISONING_ZERO
+#define PAGE_POISON 0x00
+#else
 #define PAGE_POISON 0xaa
+#endif
 
 /** mm/page_alloc.c /
 
diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
index b7342a2..aa0f26b 100644
--- a/kernel/power/hibernate.c
+++ b/kernel/power/hibernate.c
@@ -1158,6 +1158,22 @@ static int __init kaslr_nohibernate_setup(char *str)
return nohibernate_setup(str);
 }
 
+static int __init page_poison_nohibernate_setup(char *str)
+{
+#ifdef CONFIG_PAGE_POISONING_ZERO
+   /*
+* The zeroing option for page poison skips the checks on alloc.
+* since hibernation doesn't save free pages there's no way to
+* guarantee the pages will still be zeroed.
+*/
+   if (!strcmp(str, "on")) {
+   pr_info("Disabling hibernation due to page poisoning\n");
+   return nohibernate_setup(str);
+   }
+#endif
+   return 1;
+}
+
 __setup("noresume", noresume_setup);
 __setup("resume_offset=", resume_offset_setup);
 __setup("resume=", resume_setup);
@@ -1166,3 +1182,4 @@ __setup("resumewait", resumewait_setup);
 __setup("resumedelay=", resumedelay_setup);
 __setup("nohibernate", nohibernate_setup);
 __setup("kaslr", kaslr_nohibernate_setup);
+__setup("page_poison=", page_poison_nohibernate_setup);
diff --git a/mm/Kconfig.debug b/mm/Kconfig.debug
index 25c98ae..3d3b954 100644
--- a/mm/Kconfig.debug
+++ b/mm/Kconfig.debug
@@ -48,3 +48,17 @@ config PAGE_POISONING_NO_SANITY
 
   If you are only interested in sanitization, say Y. Otherwise
   say N.
+
+config PAGE_POISONING_ZERO
+   bool "Use zero for poisoning instead of random data"
+   depends on PAGE_POISONING
+   ---help---
+  Instead of using the existing poison value, fill the pages with
+  zeros. This makes it harder to detect when errors are occurring
+  due to sanitization but the zeroing at free means that it is
+  no longer necessary to write zeros when GFP_ZERO is used on
+  allocation.
+
+  Enabling page poisoning with this option will disable hibernation
+
+  If unsure, say N
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index cc4762a..59bd9dc 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -1382,15 +1382,24 @@ static inline int check_new_page(struct page *page)
return 0;
 }
 
+static inline bool free_pages_prezeroed(bool poisoned)
+{
+   return IS_ENABLED(CONFIG_PAGE_POISONING_ZERO) &&
+   page_poisoning_enabled() && poisoned;
+}
+
 static int prep_new_page(struct page *page, unsigned int order, gfp_t 
gfp_flags,
int alloc_flags)
 {
int i;
+   bool poisoned = true;
 
for (i = 0; i < (1 << order); i++) {
struct page *p = page + i;
if (unlikely(check_new_page(p)))
return 1;
+   if (poisoned)
+   poisoned &= page_is_poisoned(p);
}
 
set_page_private(page, 0);
@@ -1401,7 +1410,7 @@ static int prep_new_page(struct page *page, unsigned int 

Re: [PATCHv2 2/2] mm/page_poisoning.c: Allow for zero poisoning

[Kees Cook]

On Thu, Jan 28, 2016 at 6:38 PM, Laura Abbott  wrote:
> By default, page poisoning uses a poison value (0xaa) on free. If this
> is changed to 0, the page is not only sanitized but zeroing on alloc
> with __GFP_ZERO can be skipped as well. The tradeoff is that detecting
> corruption from the poisoning is harder to detect. This feature also
> cannot be used with hibernation since pages are not guaranteed to be
> zeroed after hibernation.
>
> Credit to Grsecurity/PaX team for inspiring this work
>
> Signed-off-by: Laura Abbott 
> ---
>  include/linux/mm.h   |  2 ++
>  include/linux/poison.h   |  4 
>  kernel/power/hibernate.c | 17 +
>  mm/Kconfig.debug | 14 ++
>  mm/page_alloc.c  | 11 ++-
>  mm/page_ext.c| 10 --
>  mm/page_poison.c |  7 +--
>  7 files changed, 60 insertions(+), 5 deletions(-)
>
> diff --git a/include/linux/mm.h b/include/linux/mm.h
> index 966bf0e..59ce0dc 100644
> --- a/include/linux/mm.h
> +++ b/include/linux/mm.h
> @@ -2177,10 +2177,12 @@ extern int apply_to_page_range(struct mm_struct *mm, 
> unsigned long address,
>  #ifdef CONFIG_PAGE_POISONING
>  extern bool page_poisoning_enabled(void);
>  extern void kernel_poison_pages(struct page *page, int numpages, int enable);
> +extern bool page_is_poisoned(struct page *page);
>  #else
>  static inline bool page_poisoning_enabled(void) { return false; }
>  static inline void kernel_poison_pages(struct page *page, int numpages,
> int enable) { }
> +static inline bool page_is_poisoned(struct page *page) { return false; }
>  #endif
>
>  #ifdef CONFIG_DEBUG_PAGEALLOC
> diff --git a/include/linux/poison.h b/include/linux/poison.h
> index 4a27153..51334ed 100644
> --- a/include/linux/poison.h
> +++ b/include/linux/poison.h
> @@ -30,7 +30,11 @@
>  #define TIMER_ENTRY_STATIC ((void *) 0x300 + POISON_POINTER_DELTA)
>
>  /** mm/debug-pagealloc.c **/
> +#ifdef CONFIG_PAGE_POISONING_ZERO
> +#define PAGE_POISON 0x00
> +#else
>  #define PAGE_POISON 0xaa
> +#endif
>
>  /** mm/page_alloc.c /
>
> diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
> index b7342a2..aa0f26b 100644
> --- a/kernel/power/hibernate.c
> +++ b/kernel/power/hibernate.c
> @@ -1158,6 +1158,22 @@ static int __init kaslr_nohibernate_setup(char *str)
> return nohibernate_setup(str);
>  }
>
> +static int __init page_poison_nohibernate_setup(char *str)
> +{
> +#ifdef CONFIG_PAGE_POISONING_ZERO
> +   /*
> +* The zeroing option for page poison skips the checks on alloc.
> +* since hibernation doesn't save free pages there's no way to
> +* guarantee the pages will still be zeroed.
> +*/
> +   if (!strcmp(str, "on")) {
> +   pr_info("Disabling hibernation due to page poisoning\n");
> +   return nohibernate_setup(str);
> +   }
> +#endif
> +   return 1;
> +}
> +
>  __setup("noresume", noresume_setup);
>  __setup("resume_offset=", resume_offset_setup);
>  __setup("resume=", resume_setup);
> @@ -1166,3 +1182,4 @@ __setup("resumewait", resumewait_setup);
>  __setup("resumedelay=", resumedelay_setup);
>  __setup("nohibernate", nohibernate_setup);
>  __setup("kaslr", kaslr_nohibernate_setup);
> +__setup("page_poison=", page_poison_nohibernate_setup);
> diff --git a/mm/Kconfig.debug b/mm/Kconfig.debug
> index 25c98ae..3d3b954 100644
> --- a/mm/Kconfig.debug
> +++ b/mm/Kconfig.debug
> @@ -48,3 +48,17 @@ config PAGE_POISONING_NO_SANITY
>
>If you are only interested in sanitization, say Y. Otherwise
>say N.
> +
> +config PAGE_POISONING_ZERO
> +   bool "Use zero for poisoning instead of random data"
> +   depends on PAGE_POISONING
> +   ---help---
> +  Instead of using the existing poison value, fill the pages with
> +  zeros. This makes it harder to detect when errors are occurring
> +  due to sanitization but the zeroing at free means that it is
> +  no longer necessary to write zeros when GFP_ZERO is used on
> +  allocation.

May be worth noting the security benefit in this help text.

> +
> +  Enabling page poisoning with this option will disable hibernation

This isn't obvious to me. It looks like you need to both use
CONFIG_PAGE_POISOING_ZERO and put "page_poison=on" on the command line
to enable it?

-Kees

> +
> +  If unsure, say N
> diff --git a/mm/page_alloc.c b/mm/page_alloc.c
> index cc4762a..59bd9dc 100644
> --- a/mm/page_alloc.c
> +++ b/mm/page_alloc.c
> @@ -1382,15 +1382,24 @@ static inline int check_new_page(struct page *page)
> return 0;
>  }
>
> +static inline bool free_pages_prezeroed(bool poisoned)
> +{
> +   return IS_ENABLED(CONFIG_PAGE_POISONING_ZERO) &&
> +   page_poisoning_enabled() && poisoned;
> +}
> +
>  static int prep_new_page(struct page *page, 

[PATCHv2 2/2] mm/page_poisoning.c: Allow for zero poisoning

[Laura Abbott]

By default, page poisoning uses a poison value (0xaa) on free. If this
is changed to 0, the page is not only sanitized but zeroing on alloc
with __GFP_ZERO can be skipped as well. The tradeoff is that detecting
corruption from the poisoning is harder to detect. This feature also
cannot be used with hibernation since pages are not guaranteed to be
zeroed after hibernation.

Credit to Grsecurity/PaX team for inspiring this work

Signed-off-by: Laura Abbott 
---
 include/linux/mm.h   |  2 ++
 include/linux/poison.h   |  4 
 kernel/power/hibernate.c | 17 +
 mm/Kconfig.debug | 14 ++
 mm/page_alloc.c  | 11 ++-
 mm/page_ext.c| 10 --
 mm/page_poison.c |  7 +--
 7 files changed, 60 insertions(+), 5 deletions(-)

diff --git a/include/linux/mm.h b/include/linux/mm.h
index 966bf0e..59ce0dc 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -2177,10 +2177,12 @@ extern int apply_to_page_range(struct mm_struct *mm, 
unsigned long address,
 #ifdef CONFIG_PAGE_POISONING
 extern bool page_poisoning_enabled(void);
 extern void kernel_poison_pages(struct page *page, int numpages, int enable);
+extern bool page_is_poisoned(struct page *page);
 #else
 static inline bool page_poisoning_enabled(void) { return false; }
 static inline void kernel_poison_pages(struct page *page, int numpages,
int enable) { }
+static inline bool page_is_poisoned(struct page *page) { return false; }
 #endif
 
 #ifdef CONFIG_DEBUG_PAGEALLOC
diff --git a/include/linux/poison.h b/include/linux/poison.h
index 4a27153..51334ed 100644
--- a/include/linux/poison.h
+++ b/include/linux/poison.h
@@ -30,7 +30,11 @@
 #define TIMER_ENTRY_STATIC ((void *) 0x300 + POISON_POINTER_DELTA)
 
 /** mm/debug-pagealloc.c **/
+#ifdef CONFIG_PAGE_POISONING_ZERO
+#define PAGE_POISON 0x00
+#else
 #define PAGE_POISON 0xaa
+#endif
 
 /** mm/page_alloc.c /
 
diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
index b7342a2..aa0f26b 100644
--- a/kernel/power/hibernate.c
+++ b/kernel/power/hibernate.c
@@ -1158,6 +1158,22 @@ static int __init kaslr_nohibernate_setup(char *str)
return nohibernate_setup(str);
 }
 
+static int __init page_poison_nohibernate_setup(char *str)
+{
+#ifdef CONFIG_PAGE_POISONING_ZERO
+   /*
+* The zeroing option for page poison skips the checks on alloc.
+* since hibernation doesn't save free pages there's no way to
+* guarantee the pages will still be zeroed.
+*/
+   if (!strcmp(str, "on")) {
+   pr_info("Disabling hibernation due to page poisoning\n");
+   return nohibernate_setup(str);
+   }
+#endif
+   return 1;
+}
+
 __setup("noresume", noresume_setup);
 __setup("resume_offset=", resume_offset_setup);
 __setup("resume=", resume_setup);
@@ -1166,3 +1182,4 @@ __setup("resumewait", resumewait_setup);
 __setup("resumedelay=", resumedelay_setup);
 __setup("nohibernate", nohibernate_setup);
 __setup("kaslr", kaslr_nohibernate_setup);
+__setup("page_poison=", page_poison_nohibernate_setup);
diff --git a/mm/Kconfig.debug b/mm/Kconfig.debug
index 25c98ae..3d3b954 100644
--- a/mm/Kconfig.debug
+++ b/mm/Kconfig.debug
@@ -48,3 +48,17 @@ config PAGE_POISONING_NO_SANITY
 
   If you are only interested in sanitization, say Y. Otherwise
   say N.
+
+config PAGE_POISONING_ZERO
+   bool "Use zero for poisoning instead of random data"
+   depends on PAGE_POISONING
+   ---help---
+  Instead of using the existing poison value, fill the pages with
+  zeros. This makes it harder to detect when errors are occurring
+  due to sanitization but the zeroing at free means that it is
+  no longer necessary to write zeros when GFP_ZERO is used on
+  allocation.
+
+  Enabling page poisoning with this option will disable hibernation
+
+  If unsure, say N
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index cc4762a..59bd9dc 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -1382,15 +1382,24 @@ static inline int check_new_page(struct page *page)
return 0;
 }
 
+static inline bool free_pages_prezeroed(bool poisoned)
+{
+   return IS_ENABLED(CONFIG_PAGE_POISONING_ZERO) &&
+   page_poisoning_enabled() && poisoned;
+}
+
 static int prep_new_page(struct page *page, unsigned int order, gfp_t 
gfp_flags,
int alloc_flags)
 {
int i;
+   bool poisoned = true;
 
for (i = 0; i < (1 << order); i++) {
struct page *p = page + i;
if (unlikely(check_new_page(p)))
return 1;
+   if (poisoned)
+   poisoned &= page_is_poisoned(p);
}
 
set_page_private(page, 0);
@@ -1401,7 +1410,7 @@ static int prep_new_page(struct page 

Re: [PATCHv2 2/2] mm/page_poisoning.c: Allow for zero poisoning

[Rafael J. Wysocki]

On Thursday, January 28, 2016 06:38:19 PM Laura Abbott wrote:
> By default, page poisoning uses a poison value (0xaa) on free. If this
> is changed to 0, the page is not only sanitized but zeroing on alloc
> with __GFP_ZERO can be skipped as well. The tradeoff is that detecting
> corruption from the poisoning is harder to detect. This feature also
> cannot be used with hibernation since pages are not guaranteed to be
> zeroed after hibernation.
> 
> Credit to Grsecurity/PaX team for inspiring this work
> 
> Signed-off-by: Laura Abbott 

The hibernation disabling part is fine by me.

Please feel free to add an ACK from me to this if that helps.

Thanks,
Rafael