Commit af8601ad authored by Ingo Molnar's avatar Ingo Molnar

kasan, sched/headers: Uninline kasan_enable/disable_current()

<linux/kasan.h> is a low level header that is included early
in affected kernel headers. But it includes <linux/sched.h>
which complicates the cleanup of sched.h dependencies.

But kasan.h has almost no need for sched.h: its only use of
scheduler functionality is in two inline functions which are
not used very frequently - so uninline kasan_enable_current()
and kasan_disable_current().

Also add a <linux/sched.h> dependency to a .c file that depended
on kasan.h including it.

This paves the way to remove the <linux/sched.h> include from kasan.h.
Acked-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 314ff785
...@@ -30,16 +30,10 @@ static inline void *kasan_mem_to_shadow(const void *addr) ...@@ -30,16 +30,10 @@ static inline void *kasan_mem_to_shadow(const void *addr)
} }
/* Enable reporting bugs after kasan_disable_current() */ /* Enable reporting bugs after kasan_disable_current() */
static inline void kasan_enable_current(void) extern void kasan_enable_current(void);
{
current->kasan_depth++;
}
/* Disable reporting bugs for current task */ /* Disable reporting bugs for current task */
static inline void kasan_disable_current(void) extern void kasan_disable_current(void);
{
current->kasan_depth--;
}
void kasan_unpoison_shadow(const void *address, size_t size); void kasan_unpoison_shadow(const void *address, size_t size);
......
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
#include <linux/sched.h>
#include <linux/random.h> #include <linux/random.h>
#include <linux/sbitmap.h> #include <linux/sbitmap.h>
#include <linux/seq_file.h> #include <linux/seq_file.h>
......
...@@ -39,6 +39,16 @@ ...@@ -39,6 +39,16 @@
#include "kasan.h" #include "kasan.h"
#include "../slab.h" #include "../slab.h"
void kasan_enable_current(void)
{
current->kasan_depth++;
}
void kasan_disable_current(void)
{
current->kasan_depth--;
}
/* /*
* Poisons the shadow memory for 'size' bytes starting from 'addr'. * Poisons the shadow memory for 'size' bytes starting from 'addr'.
* Memory addresses should be aligned to KASAN_SHADOW_SCALE_SIZE. * Memory addresses should be aligned to KASAN_SHADOW_SCALE_SIZE.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment