kmemcheck: kill kmemcheck
Subsystems (34)
v2 cover kmemcheck: kill kmemcheck
2 Years ago I proposed to kill kmemcheck:
Quoted 7 lines
As discussed on LSF/MM, kill kmemcheck.
KASan is a replacement that is able to work without the limitation of kmemcheck (single CPU, slow). KASan is already upstream.
We are also not aware of any users of kmemcheck (or users who don't consider KASan as a suitable replacement).
The only objection was that since KASAN wasn't supported by all GCC versions provided by distros at that time we should hold off for 2 years, and try again.
Now that 2 years have passed, and all distros provide gcc that supports KASAN, kill kmemcheck again for the very same reasons.
Changes for v2:
- Break patch out.
Sasha Levin (4):
kmemcheck: remove annotations
kmemcheck: stop using GFP_NOTRACK and SLAB_NOTRACK
kmemcheck: rip it out
kmemcheck: remove whats left of NOTRACK flags
Documentation/admin-guide/kernel-parameters.txt | 7 - Documentation/dev-tools/index.rst | 1 - Documentation/dev-tools/kmemcheck.rst | 733 ------------------------ MAINTAINERS | 10 - arch/arm/include/asm/dma-iommu.h | 1 - arch/arm/include/asm/pgalloc.h | 2 +- arch/arm64/include/asm/pgalloc.h | 2 +- arch/openrisc/include/asm/dma-mapping.h | 1 - arch/powerpc/include/asm/pgalloc.h | 2 +- arch/sh/kernel/dwarf.c | 4 +- arch/sh/kernel/process.c | 2 +- arch/sparc/mm/init_64.c | 4 +- arch/unicore32/include/asm/pgalloc.h | 2 +- arch/x86/Kconfig | 3 +- arch/x86/Makefile | 5 - arch/x86/include/asm/dma-mapping.h | 1 - arch/x86/include/asm/kmemcheck.h | 42 -- arch/x86/include/asm/pgtable.h | 5 - arch/x86/include/asm/pgtable_types.h | 13 - arch/x86/include/asm/string_32.h | 9 - arch/x86/include/asm/string_64.h | 8 - arch/x86/include/asm/xor.h | 5 +- arch/x86/kernel/cpu/intel.c | 15 - arch/x86/kernel/espfix_64.c | 2 +- arch/x86/kernel/traps.c | 5 - arch/x86/mm/Makefile | 2 - arch/x86/mm/fault.c | 6 - arch/x86/mm/init.c | 8 +- arch/x86/mm/init_64.c | 2 +- arch/x86/mm/kmemcheck/Makefile | 1 - arch/x86/mm/kmemcheck/error.c | 227 -------- arch/x86/mm/kmemcheck/error.h | 15 - arch/x86/mm/kmemcheck/kmemcheck.c | 658 --------------------- arch/x86/mm/kmemcheck/opcode.c | 106 ---- arch/x86/mm/kmemcheck/opcode.h | 9 - arch/x86/mm/kmemcheck/pte.c | 22 - arch/x86/mm/kmemcheck/pte.h | 10 - arch/x86/mm/kmemcheck/selftest.c | 70 --- arch/x86/mm/kmemcheck/selftest.h | 6 - arch/x86/mm/kmemcheck/shadow.c | 173 ------ arch/x86/mm/kmemcheck/shadow.h | 18 - arch/x86/mm/pageattr.c | 10 +- arch/x86/mm/pgtable.c | 2 +- arch/x86/platform/efi/efi_64.c | 2 +- crypto/xor.c | 7 +- drivers/char/random.c | 1 - drivers/misc/c2port/core.c | 2 - fs/dcache.c | 2 - include/linux/c2port.h | 4 - include/linux/dma-mapping.h | 4 - include/linux/filter.h | 2 - include/linux/gfp.h | 9 - include/linux/interrupt.h | 15 - include/linux/kmemcheck.h | 171 ------ include/linux/mm_types.h | 8 - include/linux/net.h | 3 - include/linux/ring_buffer.h | 3 - include/linux/skbuff.h | 3 - include/linux/slab.h | 6 - include/linux/thread_info.h | 5 +- include/net/inet_sock.h | 3 - include/net/inet_timewait_sock.h | 4 - include/net/sock.h | 3 - include/trace/events/mmflags.h | 1 - init/do_mounts.c | 3 +- init/main.c | 1 - kernel/bpf/core.c | 6 - kernel/fork.c | 12 +- kernel/locking/lockdep.c | 3 - kernel/signal.c | 3 +- kernel/softirq.c | 10 - kernel/sysctl.c | 10 - kernel/trace/ring_buffer.c | 3 - lib/Kconfig.debug | 6 +- lib/Kconfig.kmemcheck | 94 --- mm/Kconfig.debug | 1 - mm/Makefile | 2 - mm/kmemcheck.c | 125 ---- mm/kmemleak.c | 9 - mm/page_alloc.c | 14 - mm/slab.c | 16 +- mm/slab.h | 7 +- mm/slab_common.c | 2 +- mm/slub.c | 31 +- net/core/skbuff.c | 5 - net/core/sock.c | 2 - net/ipv4/inet_timewait_sock.c | 3 - net/ipv4/tcp_input.c | 1 - net/socket.c | 1 - scripts/kernel-doc | 2 - tools/include/linux/kmemcheck.h | 8 - tools/perf/builtin-kmem.c | 1 - 92 files changed, 43 insertions(+), 2825 deletions(-) delete mode 100644 Documentation/dev-tools/kmemcheck.rst delete mode 100644 arch/x86/include/asm/kmemcheck.h delete mode 100644 arch/x86/mm/kmemcheck/Makefile delete mode 100644 arch/x86/mm/kmemcheck/error.c delete mode 100644 arch/x86/mm/kmemcheck/error.h delete mode 100644 arch/x86/mm/kmemcheck/kmemcheck.c delete mode 100644 arch/x86/mm/kmemcheck/opcode.c delete mode 100644 arch/x86/mm/kmemcheck/opcode.h delete mode 100644 arch/x86/mm/kmemcheck/pte.c delete mode 100644 arch/x86/mm/kmemcheck/pte.h delete mode 100644 arch/x86/mm/kmemcheck/selftest.c delete mode 100644 arch/x86/mm/kmemcheck/selftest.h delete mode 100644 arch/x86/mm/kmemcheck/shadow.c delete mode 100644 arch/x86/mm/kmemcheck/shadow.h delete mode 100644 include/linux/kmemcheck.h delete mode 100644 lib/Kconfig.kmemcheck delete mode 100644 mm/kmemcheck.c delete mode 100644 tools/include/linux/kmemcheck.h
Signature · 1 line
2.11.0
PATCH v2 1/4 kmemcheck: remove annotations
Remove kmemcheck annotations, and calls to kmemcheck from the kernel.
--- arch/arm/include/asm/dma-iommu.h | 1 - arch/openrisc/include/asm/dma-mapping.h | 1 - arch/x86/Makefile | 5 ----- arch/x86/include/asm/dma-mapping.h | 1 - arch/x86/include/asm/xor.h | 5 +---- arch/x86/kernel/traps.c | 5 ----- arch/x86/mm/fault.c | 6 ------ drivers/char/random.c | 1 - drivers/misc/c2port/core.c | 2 -- fs/dcache.c | 2 -- include/linux/c2port.h | 4 ---- include/linux/dma-mapping.h | 4 ---- include/linux/filter.h | 2 -- include/linux/mm_types.h | 8 -------- include/linux/net.h | 3 --- include/linux/ring_buffer.h | 3 --- include/linux/skbuff.h | 3 --- include/net/inet_sock.h | 3 --- include/net/inet_timewait_sock.h | 4 ---- include/net/sock.h | 3 --- init/main.c | 1 - kernel/bpf/core.c | 6 ------ kernel/locking/lockdep.c | 3 --- kernel/trace/ring_buffer.c | 3 --- mm/kmemleak.c | 9 --------- mm/page_alloc.c | 14 -------------- mm/slab.c | 14 -------------- mm/slab.h | 2 -- mm/slub.c | 20 -------------------- net/core/skbuff.c | 5 ----- net/core/sock.c | 2 -- net/ipv4/inet_timewait_sock.c | 3 --- net/ipv4/tcp_input.c | 1 - net/socket.c | 1 - 34 files changed, 1 insertion(+), 149 deletions(-)
arch/arm/include/asm/dma-iommu.h +0 -1
@@ -6,7 +6,6 @@#include <linux/mm_types.h> #include <linux/scatterlist.h> #include <linux/dma-debug.h> -#include <linux/kmemcheck.h> #include <linux/kref.h> #define ARM_MAPPING_ERROR (~(dma_addr_t)0x0)
arch/openrisc/include/asm/dma-mapping.h +0 -1
@@ -23,7 +23,6 @@*/ #include <linux/dma-debug.h> -#include <linux/kmemcheck.h> #include <linux/dma-mapping.h> extern const struct dma_map_ops or1k_dma_map_ops;
arch/x86/Makefile +0 -5
@@ -157,11 +157,6 @@ ifdef CONFIG_X86_X32 endif export CONFIG_X86_X32_ABI -# Don't unroll struct assignments with kmemcheck enabled -ifeq ($(CONFIG_KMEMCHECK),y) - KBUILD_CFLAGS += $(call cc-option,-fno-builtin-memcpy) -endif - # # If the function graph tracer is used with mcount instead of fentry, # '-maccumulate-outgoing-args' is needed to prevent a GCC bug
arch/x86/include/asm/dma-mapping.h +0 -1
@@ -6,7 +6,6 @@* Documentation/DMA-API.txt for documentation. */ -#include <linux/kmemcheck.h> #include <linux/scatterlist.h> #include <linux/dma-debug.h> #include <asm/io.h>
arch/x86/include/asm/xor.h +1 -4
@@ -1,7 +1,4 @@ -#ifdef CONFIG_KMEMCHECK -/* kmemcheck doesn't handle MMX/SSE/SSE2 instructions */ -# include <asm-generic/xor.h> -#elif !defined(_ASM_X86_XOR_H) +#ifndef _ASM_X86_XOR_H#define _ASM_X86_XOR_H/*
arch/x86/kernel/traps.c +0 -5
@@ -42,7 +42,6 @@#include <linux/edac.h> #endif -#include <asm/kmemcheck.h> #include <asm/stacktrace.h> #include <asm/processor.h> #include <asm/debugreg.h>
@@ -740,10 +739,6 @@ dotraplinkage void do_debug(struct pt_regs *regs, long error_code)if (!dr6 &&user_mode (regs)) user_icebp =1 ; -/* Catch kmemcheck conditions! */ -if ((dr6 &DR_STEP ) &&kmemcheck_trap (regs)) - goto exit; -/* Store the virtualized DR6 value */ tsk->thread.debugreg6 = dr6;
arch/x86/mm/fault.c +0 -6
@@ -19,7 +19,6 @@#include <asm/cpufeature.h> /* boot_cpu_has, ... */ #include <asm/traps.h> /* dotraplinkage, ... */ #include <asm/pgalloc.h> /* pgd_*(), ... */ -#include <asm/kmemcheck.h> /* kmemcheck_*(), ... */ #include <asm/fixmap.h> /* VSYSCALL_ADDR */ #include <asm/vsyscall.h> /* emulate_vsyscall */ #include <asm/vm86.h> /* struct vm86 */
@@ -1275,8 +1274,6 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code,* Detect and handle instructions that would cause a page fault for * both a tracked kernel page and a userspace page. */ -if (kmemcheck_active (regs)) -kmemcheck_hide (regs);prefetchw (&mm->mmap_sem);if (unlikely (kmmio_fault (regs, address)))
@@ -1299,9 +1296,6 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code,if (!(error_code & (PF_RSVD |PF_USER |PF_PROT ))) {if (vmalloc_fault (address) >=0 )return ; - -if (kmemcheck_fault (regs, address, error_code)) -return ; }/* Can handle a stale RO->RW TLB: */
drivers/char/random.c +0 -1
@@ -259,7 +259,6 @@#include <linux/cryptohash.h> #include <linux/fips.h> #include <linux/ptrace.h> -#include <linux/kmemcheck.h> #include <linux/workqueue.h> #include <linux/irq.h> #include <linux/syscalls.h>
drivers/misc/c2port/core.c +0 -2
@@ -15,7 +15,6 @@#include <linux/errno.h> #include <linux/err.h> #include <linux/kernel.h> -#include <linux/kmemcheck.h> #include <linux/ctype.h> #include <linux/delay.h> #include <linux/idr.h>
@@ -904,7 +903,6 @@ struct c2port_device *c2port_device_register(char *name,return ERR_PTR (-EINVAL ); c2dev =kmalloc (sizeof (struct c2port_device ),GFP_KERNEL ); -kmemcheck_annotate_bitfield (c2dev, flags);if (unlikely (!c2dev))return ERR_PTR (-ENOMEM );
fs/dcache.c +0 -2
@@ -2705,8 +2705,6 @@ static void swap_names(struct dentry *dentry, struct dentry *target)*/ unsigned int i;BUILD_BUG_ON (!IS_ALIGNED (DNAME_INLINE_LEN ,sizeof (long ))); -kmemcheck_mark_initialized (dentry->d_iname,DNAME_INLINE_LEN ); -kmemcheck_mark_initialized (target->d_iname,DNAME_INLINE_LEN );for (i =0 ; i <DNAME_INLINE_LEN /sizeof (long ); i++) {swap (((long *) &dentry->d_iname)[i], ((long *) &target->d_iname)[i]);
include/linux/c2port.h +0 -4
@@ -9,8 +9,6 @@* the Free Software Foundation */ -#include <linux/kmemcheck.h> -#define C2PORT_NAME_LEN 32struct device ;
@@ -22,10 +20,8 @@ struct device;/* Main struct */ struct c2port_ops ;struct c2port_device { -kmemcheck_bitfield_begin (flags);unsigned int access:1 ;unsigned int flash_access:1 ; -kmemcheck_bitfield_end (flags);int id;char name[C2PORT_NAME_LEN ];
include/linux/dma-mapping.h +0 -4
@@ -8,7 +8,6 @@#include <linux/dma-debug.h> #include <linux/dma-direction.h> #include <linux/scatterlist.h> -#include <linux/kmemcheck.h> #include <linux/bug.h> #include <linux/mem_encrypt.h>
@@ -229,7 +228,6 @@ static inline dma_addr_t dma_map_single_attrs(struct device *dev, void *ptr,const struct dma_map_ops *ops =get_dma_ops (dev);dma_addr_t addr; -kmemcheck_mark_initialized (ptr, size);BUG_ON (!valid_dma_direction (dir)); addr = ops->map_page(dev, virt_to_page(ptr), offset_in_page(ptr), size,
@@ -266,7 +264,6 @@ static inline int dma_map_sg_attrs(struct device *dev, struct scatterlist *sg,struct scatterlist *s;for_each_sg (sg, s, nents, i) -kmemcheck_mark_initialized (sg_virt (s), s->length);BUG_ON (!valid_dma_direction (dir)); ents = ops->map_sg (dev, sg, nents, dir, attrs);BUG_ON (ents <0 );
@@ -296,7 +293,6 @@ static inline dma_addr_t dma_map_page_attrs(struct device *dev,const struct dma_map_ops *ops =get_dma_ops (dev);dma_addr_t addr; -kmemcheck_mark_initialized (page_address (page) + offset, size);BUG_ON (!valid_dma_direction (dir)); addr = ops->map_page (dev, page, offset, size, dir, attrs);debug_dma_map_page (dev, page, offset, size, dir, addr, false);
include/linux/filter.h +0 -2
@@ -453,13 +453,11 @@ struct bpf_binary_header {struct bpf_prog {u16 pages;/* Number of allocated pages */ -kmemcheck_bitfield_begin (meta);u16 jited:1 ,/* Is our filter JIT'ed? */ locked:1 ,/* Program image locked? */ gpl_compatible:1 ,/* Is filter GPL compatible? */ cb_access:1 ,/* Is control block accessed? */ dst_needed:1 ;/* Do we need dst entry? */ -kmemcheck_bitfield_end (meta);enum bpf_prog_type type;/* Type of BPF program */ u32 len;/* Number of filter blocks */ u32 jited_len;/* Size of jited insns in bytes */
include/linux/mm_types.h +0 -8
@@ -206,14 +206,6 @@ struct page {not kmapped, ie. highmem) */ #endif /* WANT_PAGE_VIRTUAL */ -#ifdef CONFIG_KMEMCHECK -/* -* kmemcheck wants to track the status of each byte in a page; this -* is a pointer to such a status block. NULL if not tracked. -*/ -void *shadow; -#endif -#ifdef LAST_CPUPID_NOT_IN_PAGE_FLAGS int _last_cpupid;#endif
include/linux/net.h +0 -3
@@ -22,7 +22,6 @@#include <linux/random.h> #include <linux/wait.h> #include <linux/fcntl.h> /* For O_CLOEXEC and O_NONBLOCK */ -#include <linux/kmemcheck.h> #include <linux/rcupdate.h> #include <linux/once.h> #include <linux/fs.h>
@@ -111,9 +110,7 @@ struct socket_wq {struct socket {socket_state state; -kmemcheck_bitfield_begin (type);short type; -kmemcheck_bitfield_end (type);unsigned long flags;
include/linux/ring_buffer.h +0 -3
@@ -1,7 +1,6 @@#ifndef _LINUX_RING_BUFFER_H#define _LINUX_RING_BUFFER_H -#include <linux/kmemcheck.h> #include <linux/mm.h> #include <linux/seq_file.h> #include <linux/poll.h>
@@ -13,9 +12,7 @@ struct ring_buffer_iter;* Don't refer to this struct directly, use functions below. */ struct ring_buffer_event { -kmemcheck_bitfield_begin (bitfield);u32 type_len:5 , time_delta:27 ; -kmemcheck_bitfield_end (bitfield);u32 array[]; };
include/linux/skbuff.h +0 -3
@@ -15,7 +15,6 @@#define _LINUX_SKBUFF_H#include <linux/kernel.h> -#include <linux/kmemcheck.h> #include <linux/compiler.h> #include <linux/time.h> #include <linux/bug.h>
@@ -704,7 +703,6 @@ struct sk_buff {/* Following fields are _not_ copied in __copy_skb_header() * Note that queue_mapping is here mostly to fill a hole. */ -kmemcheck_bitfield_begin (flags1);__u16 queue_mapping;/* if you move cloned around you also must adapt those constants */
@@ -723,7 +721,6 @@ struct sk_buff { head_frag:1, xmit_more:1, __unused:1; /* one bit hole */ -kmemcheck_bitfield_end (flags1);/* fields enclosed in headers_start/headers_end are copied * using a single memcpy() in __copy_skb_header()
include/net/inet_sock.h +0 -3
@@ -17,7 +17,6 @@#define _INET_SOCK_H#include <linux/bitops.h> -#include <linux/kmemcheck.h> #include <linux/string.h> #include <linux/types.h> #include <linux/jhash.h>
@@ -84,7 +83,6 @@ struct inet_request_sock {#define ireq_state req.__req_common.skc_state#define ireq_family req.__req_common.skc_family -kmemcheck_bitfield_begin (flags); u16 snd_wscale : 4, rcv_wscale : 4, tstamp_ok : 1,
@@ -93,7 +91,6 @@ struct inet_request_sock { ecn_ok : 1, acked : 1, no_srccheck: 1; -kmemcheck_bitfield_end (flags);u32 ir_mark;union {struct ip_options_rcu *opt;
include/net/inet_timewait_sock.h +0 -4
@@ -15,8 +15,6 @@#ifndef _INET_TIMEWAIT_SOCK_#define _INET_TIMEWAIT_SOCK_ - -#include <linux/kmemcheck.h> #include <linux/list.h> #include <linux/timer.h> #include <linux/types.h>
@@ -69,14 +67,12 @@ struct inet_timewait_sock {/* Socket demultiplex comparisons on incoming packets. */ /* these three are in inet_sock */ __be16 tw_sport; -kmemcheck_bitfield_begin (flags);/* And these are ours. */ unsigned int tw_kill : 1, tw_transparent : 1, tw_flowlabel : 20, tw_pad : 2, /* 2 bits hole */ tw_tos : 8; -kmemcheck_bitfield_end (flags);struct timer_list tw_timer;struct inet_bind_bucket *tw_tb; };
include/net/sock.h +0 -3
@@ -436,7 +436,6 @@ struct sock {#define SK_FL_TYPE_MASK 0xffff0000#endif -kmemcheck_bitfield_begin (flags); unsigned int sk_padding : 1, sk_kern_sock : 1, sk_no_check_tx : 1,
@@ -445,8 +444,6 @@ struct sock { sk_protocol :8 , sk_type : 16;#define SK_PROTOCOL_MAX U8_MAX -kmemcheck_bitfield_end (flags); -u16 sk_gso_max_segs;unsigned long sk_lingertime;struct proto *sk_prot_creator;
init/main.c +0 -1
@@ -69,7 +69,6 @@#include <linux/kgdb.h> #include <linux/ftrace.h> #include <linux/async.h> -#include <linux/kmemcheck.h> #include <linux/sfi.h> #include <linux/shmem_fs.h> #include <linux/slab.h>
kernel/bpf/core.c +0 -6
@@ -85,8 +85,6 @@ struct bpf_prog *bpf_prog_alloc(unsigned int size, gfp_t gfp_extra_flags)if (fp ==NULL )return NULL ; -kmemcheck_annotate_bitfield (fp, meta); - aux =kzalloc (sizeof (*aux),GFP_KERNEL | gfp_extra_flags);if (aux ==NULL ) {vfree (fp);
@@ -127,8 +125,6 @@ struct bpf_prog *bpf_prog_realloc(struct bpf_prog *fp_old, unsigned int size,if (fp ==NULL ) {__bpf_prog_uncharge (fp_old->aux->user, delta); }else { -kmemcheck_annotate_bitfield (fp, meta); -memcpy (fp, fp_old, fp_old->pages *PAGE_SIZE ); fp->pages = pages; fp->aux->prog = fp;
@@ -662,8 +658,6 @@ static struct bpf_prog *bpf_prog_clone_create(struct bpf_prog *fp_other, fp =__vmalloc (fp_other->pages *PAGE_SIZE , gfp_flags,PAGE_KERNEL );if (fp !=NULL ) { -kmemcheck_annotate_bitfield (fp, meta); -/* aux->prog still points to the fp_other one, so * when promoting the clone to the real program, * this still needs to be adapted.
kernel/locking/lockdep.c +0 -3
@@ -47,7 +47,6 @@#include <linux/stringify.h> #include <linux/bitops.h> #include <linux/gfp.h> -#include <linux/kmemcheck.h> #include <linux/random.h> #include <linux/jhash.h>
@@ -3233,8 +3232,6 @@ static void __lockdep_init_map(struct lockdep_map *lock, const char *name, {int i; -kmemcheck_mark_initialized (lock,sizeof (*lock)); -for (i =0 ; i <NR_LOCKDEP_CACHING_CLASSES ; i++) lock->class_cache[i] =NULL ;
kernel/trace/ring_buffer.c +0 -3
@@ -13,7 +13,6 @@#include <linux/uaccess.h> #include <linux/hardirq.h> #include <linux/kthread.h> /* for self test */ -#include <linux/kmemcheck.h> #include <linux/module.h> #include <linux/percpu.h> #include <linux/mutex.h>
@@ -2055,7 +2054,6 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer, } event =__rb_page_index (tail_page, tail); -kmemcheck_annotate_bitfield (event, bitfield);/* account for padding bytes */ local_add (BUF_PAGE_SIZE - tail, &cpu_buffer->entries_bytes);
@@ -2686,7 +2684,6 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,/* We reserved something on the buffer */ event =__rb_page_index (tail_page, tail); -kmemcheck_annotate_bitfield (event, bitfield);rb_update_event (cpu_buffer, event, info);local_inc (&tail_page->entries);
mm/kmemleak.c +0 -9
@@ -110,7 +110,6 @@#include <linux/atomic.h> #include <linux/kasan.h> -#include <linux/kmemcheck.h> #include <linux/kmemleak.h> #include <linux/memory_hotplug.h>
@@ -1238,9 +1237,6 @@ static bool update_checksum(struct kmemleak_object *object) {u32 old_csum = object->checksum; -if (!kmemcheck_is_obj_initialized (object->pointer, object->size)) -return false; -kasan_disable_current (); object->checksum =crc32 (0 , (void *)object->pointer, object->size);kasan_enable_current ();
@@ -1314,11 +1310,6 @@ static void scan_block(void *_start, void *_end,if (scan_should_stop ())break ; -/* don't scan uninitialized memory */ -if (!kmemcheck_is_obj_initialized ((unsigned long )ptr, -BYTES_PER_POINTER )) -continue ; -kasan_disable_current (); pointer = *ptr;kasan_enable_current ();
mm/page_alloc.c +0 -14
@@ -24,7 +24,6 @@#include <linux/memblock.h> #include <linux/compiler.h> #include <linux/kernel.h> -#include <linux/kmemcheck.h> #include <linux/kasan.h> #include <linux/module.h> #include <linux/suspend.h>
@@ -1013,7 +1012,6 @@ static __always_inline bool free_pages_prepare(struct page *page,VM_BUG_ON_PAGE (PageTail (page), page);trace_mm_page_free (page, order); -kmemcheck_free_shadow (page, order);/* * Check tail pages before head page information is cleared to
@@ -2669,15 +2667,6 @@ void split_page(struct page *page, unsigned int order)VM_BUG_ON_PAGE (PageCompound (page), page);VM_BUG_ON_PAGE (!page_count (page), page); -#ifdef CONFIG_KMEMCHECK -/* -* Split shadow pages too, because free(page[0]) would -* otherwise free the whole shadow. -*/ -if (kmemcheck_page_is_tracked (page)) -split_page (virt_to_page (page[0 ].shadow), order); -#endif -for (i =1 ; i < (1 << order); i++)set_page_refcounted (page + i);split_page_owner (page, order);
@@ -4223,9 +4212,6 @@ __alloc_pages_nodemask(gfp_t gfp_mask, unsigned int order, int preferred_nid, page =NULL ; } -if (kmemcheck_enabled && page) -kmemcheck_pagealloc_alloc (page, order, gfp_mask); -trace_mm_page_alloc (page, order, alloc_mask, ac.migratetype);return page;
mm/slab.c +0 -14
@@ -113,7 +113,6 @@#include <linux/rtmutex.h> #include <linux/reciprocal_div.h> #include <linux/debugobjects.h> -#include <linux/kmemcheck.h> #include <linux/memory.h> #include <linux/prefetch.h> #include <linux/sched/task_stack.h>
@@ -1434,15 +1433,6 @@ static struct page *kmem_getpages(struct kmem_cache *cachep, gfp_t flags,if (sk_memalloc_socks () &&page_is_pfmemalloc (page))SetPageSlabPfmemalloc (page); -if (kmemcheck_enabled && !(cachep->flags &SLAB_NOTRACK )) { -kmemcheck_alloc_shadow (page, cachep->gfporder, flags, nodeid); - -if (cachep->ctor) -kmemcheck_mark_uninitialized_pages (page, nr_pages); -else -kmemcheck_mark_unallocated_pages (page, nr_pages); - } -return page; }
@@ -1454,8 +1444,6 @@ static void kmem_freepages(struct kmem_cache *cachep, struct page *page)int order = cachep->gfporder;unsigned long nr_freed = (1 << order); -kmemcheck_free_shadow (page, order); -if (cachep->flags &SLAB_RECLAIM_ACCOUNT )mod_lruvec_page_state (page,NR_SLAB_RECLAIMABLE , -nr_freed);else
@@ -3515,8 +3503,6 @@ void ___cache_free(struct kmem_cache *cachep, void *objp,kmemleak_free_recursive (objp, cachep->flags); objp =cache_free_debugcheck (cachep, objp, caller); -kmemcheck_slab_free (cachep, objp, cachep->object_size); -/* * Skip calling cache_free_alien() when the platform is not numa. * This will avoid cache misses that happen while accessing slabp (which
mm/slab.h +0 -2
@@ -39,7 +39,6 @@ struct kmem_cache {#include <linux/memcontrol.h> #include <linux/fault-inject.h> -#include <linux/kmemcheck.h> #include <linux/kasan.h> #include <linux/kmemleak.h> #include <linux/random.h>
@@ -438,7 +437,6 @@ static inline void slab_post_alloc_hook(struct kmem_cache *s, gfp_t flags,for (i =0 ; i < size; i++) {void *object = p[i]; -kmemcheck_slab_alloc (s, flags, object,slab_ksize (s));kmemleak_alloc_recursive (object, s->object_size,1 , s->flags, flags);kasan_slab_alloc (s, object, flags);
mm/slub.c +0 -20
@@ -21,7 +21,6 @@#include <linux/notifier.h> #include <linux/seq_file.h> #include <linux/kasan.h> -#include <linux/kmemcheck.h> #include <linux/cpu.h> #include <linux/cpuset.h> #include <linux/mempolicy.h>
@@ -1374,7 +1373,6 @@ static inline void *slab_free_hook(struct kmem_cache *s, void *x)unsigned long flags;local_irq_save (flags); -kmemcheck_slab_free (s, x, s->object_size);debug_check_no_locks_freed (x, s->object_size);local_irq_restore (flags); }
@@ -1595,22 +1593,6 @@ static struct page *allocate_slab(struct kmem_cache *s, gfp_t flags, int node)stat (s,ORDER_FALLBACK ); } -if (kmemcheck_enabled && - !(s->flags & (SLAB_NOTRACK |DEBUG_DEFAULT_FLAGS ))) { -int pages =1 <<oo_order (oo); - -kmemcheck_alloc_shadow (page,oo_order (oo), alloc_gfp, node); - -/* -* Objects from caches that have a constructor don't get -* cleared when they're allocated, so we need to do it here. -*/ -if (s->ctor) -kmemcheck_mark_uninitialized_pages (page, pages); -else -kmemcheck_mark_unallocated_pages (page, pages); - } - page->objects =oo_objects (oo); order =compound_order (page);
@@ -1686,8 +1668,6 @@ static void __free_slab(struct kmem_cache *s, struct page *page)check_object (s, page, p,SLUB_RED_INACTIVE ); } -kmemcheck_free_shadow (page,compound_order (page)); - mod_lruvec_page_state(page, (s->flags & SLAB_RECLAIM_ACCOUNT) ? NR_SLAB_RECLAIMABLE : NR_SLAB_UNRECLAIMABLE,
net/core/skbuff.c +0 -5
@@ -41,7 +41,6 @@#include <linux/module.h> #include <linux/types.h> #include <linux/kernel.h> -#include <linux/kmemcheck.h> #include <linux/mm.h> #include <linux/interrupt.h> #include <linux/in.h>
@@ -234,14 +233,12 @@ struct sk_buff *__alloc_skb(unsigned int size, gfp_t gfp_mask, shinfo =skb_shinfo (skb);memset (shinfo,0 , offsetof(struct skb_shared_info , dataref));atomic_set (&shinfo->dataref,1 ); -kmemcheck_annotate_variable (shinfo->destructor_arg);if (flags &SKB_ALLOC_FCLONE ) {struct sk_buff_fclones *fclones; fclones = container_of(skb, struct sk_buff_fclones, skb1); -kmemcheck_annotate_bitfield (&fclones->skb2, flags1); skb->fclone =SKB_FCLONE_ORIG ;refcount_set (&fclones->fclone_ref,1 );
@@ -301,7 +298,6 @@ struct sk_buff *__build_skb(void *data, unsigned int frag_size) shinfo =skb_shinfo (skb);memset (shinfo,0 , offsetof(struct skb_shared_info , dataref));atomic_set (&shinfo->dataref,1 ); -kmemcheck_annotate_variable (shinfo->destructor_arg);return skb; }
@@ -1279,7 +1275,6 @@ struct sk_buff *skb_clone(struct sk_buff *skb, gfp_t gfp_mask)if (!n)return NULL ; -kmemcheck_annotate_bitfield (n, flags1); n->fclone =SKB_FCLONE_UNAVAILABLE ; }
net/core/sock.c +0 -2
@@ -1469,8 +1469,6 @@ static struct sock *sk_prot_alloc(struct proto *prot, gfp_t priority, sk =kmalloc (prot->obj_size, priority);if (sk !=NULL ) { -kmemcheck_annotate_bitfield (sk, flags); -if (security_sk_alloc (sk, family, priority)) goto out_free;
net/ipv4/inet_timewait_sock.c +0 -3
@@ -9,7 +9,6 @@*/ #include <linux/kernel.h> -#include <linux/kmemcheck.h> #include <linux/slab.h> #include <linux/module.h> #include <net/inet_hashtables.h>
@@ -167,8 +166,6 @@ struct inet_timewait_sock *inet_twsk_alloc(const struct sock *sk,if (tw) {const struct inet_sock *inet =inet_sk (sk); -kmemcheck_annotate_bitfield (tw, flags); - tw->tw_dr = dr;/* Give us an identity. */ tw->tw_daddr = inet->inet_daddr;
net/ipv4/tcp_input.c +0 -1
@@ -6195,7 +6195,6 @@ struct request_sock *inet_reqsk_alloc(const struct request_sock_ops *ops,if (req) {struct inet_request_sock *ireq =inet_rsk (req); -kmemcheck_annotate_bitfield (ireq, flags); ireq->opt =NULL ;#if IS_ENABLED (CONFIG_IPV6 ) ireq->pktopts =NULL ;
net/socket.c +0 -1
@@ -568,7 +568,6 @@ struct socket *sock_alloc(void) sock =SOCKET_I (inode); -kmemcheck_annotate_bitfield (sock, type); inode->i_ino =get_next_ino (); inode->i_mode =S_IFSOCK |S_IRWXUGO ; inode->i_uid =current_fsuid ();
Signature · 1 line
2.11.0
Re: [PATCH v2 1/4] kmemcheck: remove annotations
Quoted 1 line · Sasha Levin
Remove kmemcheck annotations, and calls to kmemcheck from the kernel.
How did you generate this? I suspect a git grep + sed? Because this doesn't seem to be correct. I didn't get further than this
include/linux/dma-mapping.h static inline int dma_map_sg_attrs(struct device *dev, struct scatterlist *sg, · line 269
Quoted 8 lines
include/linux/dma-mapping.h +0
-1@@ -266,7 +264,6 @@ static inline int dma_map_sg_attrs(struct device *dev, struct scatterlist *sg,struct scatterlist *s;for_each_sg (sg, s, nents, i) -kmemcheck_mark_initialized (sg_virt (s), s->length);BUG_ON (!valid_dma_direction (dir)); ents = ops->map_sg (dev, sg, nents, dir, attrs);BUG_ON (ents <0 );
which doesn't really look correct. I appreciate you have split this up and the resulting code might even be correct I find it quite important to have such a large changes be reproducible by reviewers because it is simply impossible to review this manually.
Signature · 2 lines
Michal Hocko SUSE Labs
Re: [PATCH v2 1/4] kmemcheck: remove annotations
Quoted 5 lines · Michal Hocko
Quoted 1 line · Sasha Levin
Remove kmemcheck annotations, and calls to kmemcheck from the kernel.
How did you generate this? I suspect a git grep + sed? Because this doesn't seem to be correct. I didn't get further than this
I had an (apparently broken) Coccinelle script to remove references to kmemcheck hooks.
Quoted 13 lines
include/linux/dma-mapping.h static inline int dma_map_sg_attrs(struct device *dev, struct scatterlist *sg, · line 269
Quoted 8 lines
include/linux/dma-mapping.h +0
-1@@ -266,7 +264,6 @@ static inline int dma_map_sg_attrs(struct device *dev, struct scatterlist *sg,struct scatterlist *s;for_each_sg (sg, s, nents, i) -kmemcheck_mark_initialized (sg_virt (s), s->length);BUG_ON (!valid_dma_direction (dir)); ents = ops->map_sg (dev, sg, nents, dir, attrs);BUG_ON (ents <0 );which doesn't really look correct. I appreciate you have split this up and the resulting code might even be correct I find it quite important to have such a large changes be reproducible by reviewers because it is simply impossible to review this manually.
Let me send a fix for that, and review this again.
Thanks for the review!
Quoted 3 lines
Signature · 2 lines
Michal Hocko SUSE Labs
Signature · 2 lines
Thanks, Sasha
PATCH v2 2/4 kmemcheck: stop using GFP_NOTRACK and SLAB_NOTRACK
In reply to Levin, Alexander (Sasha Levin)Convert all allocations that used a NOTRACK flag to stop using it.
--- arch/arm/include/asm/pgalloc.h | 2 +- arch/arm64/include/asm/pgalloc.h | 2 +- arch/powerpc/include/asm/pgalloc.h | 2 +- arch/sh/kernel/dwarf.c | 4 ++-- arch/sh/kernel/process.c | 2 +- arch/sparc/mm/init_64.c | 4 ++-- arch/unicore32/include/asm/pgalloc.h | 2 +- arch/x86/kernel/espfix_64.c | 2 +- arch/x86/mm/init.c | 3 +-- arch/x86/mm/init_64.c | 2 +- arch/x86/mm/pageattr.c | 10 +++++----- arch/x86/mm/pgtable.c | 2 +- arch/x86/platform/efi/efi_64.c | 2 +- crypto/xor.c | 7 +------ include/linux/thread_info.h | 5 ++--- init/do_mounts.c | 3 +-- kernel/fork.c | 12 ++++++------ kernel/signal.c | 3 +-- mm/kmemcheck.c | 2 +- mm/slab.c | 2 +- mm/slab.h | 5 ++--- mm/slab_common.c | 2 +- mm/slub.c | 4 +--- 23 files changed, 36 insertions(+), 48 deletions(-)
arch/arm/include/asm/pgalloc.h +1 -1
@@ -57,7 +57,7 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)extern pgd_t *pgd_alloc (struct mm_struct *mm);extern void pgd_free (struct mm_struct *mm,pgd_t *pgd); -#define PGALLOC_GFP (GFP_KERNEL | __GFP_NOTRACK | __GFP_ZERO) +#define PGALLOC_GFP (GFP_KERNEL | __GFP_ZERO)static inline void clean_pte_table (pte_t *pte) {
arch/arm64/include/asm/pgalloc.h +1 -1
@@ -26,7 +26,7 @@#define check_pgt_cache () do { } while (0) -#define PGALLOC_GFP (GFP_KERNEL | __GFP_NOTRACK | __GFP_ZERO) +#define PGALLOC_GFP (GFP_KERNEL | __GFP_ZERO)#define PGD_SIZE (PTRS_PER_PGD * sizeof(pgd_t))#if CONFIG_PGTABLE_LEVELS >2
arch/powerpc/include/asm/pgalloc.h +1 -1
@@ -17,7 +17,7 @@ static inline gfp_t pgtable_gfp_flags(struct mm_struct *mm, gfp_t gfp) }#endif /* MODULE */ -#define PGALLOC_GFP (GFP_KERNEL | __GFP_NOTRACK | __GFP_ZERO) +#define PGALLOC_GFP (GFP_KERNEL | __GFP_ZERO)#ifdef CONFIG_PPC_BOOK3S #include <asm/book3s/pgalloc.h>
arch/sh/kernel/dwarf.c +2 -2
@@ -1172,11 +1172,11 @@ static int __init dwarf_unwinder_init(void) dwarf_frame_cachep =kmem_cache_create ("dwarf_frames" ,sizeof (struct dwarf_frame ),0 , -SLAB_PANIC |SLAB_HWCACHE_ALIGN |SLAB_NOTRACK ,NULL ); +SLAB_PANIC |SLAB_HWCACHE_ALIGN ,NULL ); dwarf_reg_cachep =kmem_cache_create ("dwarf_regs" ,sizeof (struct dwarf_reg ),0 , -SLAB_PANIC |SLAB_HWCACHE_ALIGN |SLAB_NOTRACK ,NULL ); +SLAB_PANIC |SLAB_HWCACHE_ALIGN ,NULL ); dwarf_frame_pool =mempool_create_slab_pool (DWARF_FRAME_MIN_REQ , dwarf_frame_cachep);
arch/sh/kernel/process.c +1 -1
@@ -58,7 +58,7 @@ void arch_task_cache_init(void) task_xstate_cachep =kmem_cache_create ("task_xstate" , xstate_size, __alignof__(union thread_xstate ), -SLAB_PANIC |SLAB_NOTRACK ,NULL ); +SLAB_PANIC ,NULL ); }#ifdef CONFIG_SH_FPU_EMU
arch/sparc/mm/init_64.c +2 -2
@@ -2926,7 +2926,7 @@ void __flush_tlb_all(void)pte_t *pte_alloc_one_kernel (struct mm_struct *mm,unsigned long address) { -struct page *page =alloc_page (GFP_KERNEL | __GFP_NOTRACK | __GFP_ZERO); +struct page *page =alloc_page (GFP_KERNEL | __GFP_ZERO);pte_t *pte =NULL ;if (page)
@@ -2938,7 +2938,7 @@ pte_t *pte_alloc_one_kernel(struct mm_struct *mm,pgtable_t pte_alloc_one (struct mm_struct *mm,unsigned long address) { -struct page *page =alloc_page (GFP_KERNEL | __GFP_NOTRACK | __GFP_ZERO); +struct page *page =alloc_page (GFP_KERNEL | __GFP_ZERO);if (!page)return NULL ;if (!pgtable_page_ctor (page)) {
arch/unicore32/include/asm/pgalloc.h +1 -1
@@ -28,7 +28,7 @@ extern void free_pgd_slow(struct mm_struct *mm, pgd_t *pgd);#define pgd_alloc (mm) get_pgd_slow(mm)#define pgd_free (mm, pgd) free_pgd_slow(mm, pgd) -#define PGALLOC_GFP (GFP_KERNEL | __GFP_NOTRACK | __GFP_ZERO) +#define PGALLOC_GFP (GFP_KERNEL | __GFP_ZERO)/* * Allocate one PTE table.
arch/x86/kernel/espfix_64.c +1 -1
@@ -57,7 +57,7 @@# error "Need more virtual address space for the ESPFIX hack"#endif -#define PGALLOC_GFP (GFP_KERNEL | __GFP_NOTRACK | __GFP_ZERO) +#define PGALLOC_GFP (GFP_KERNEL | __GFP_ZERO)/* This contains the *bottom* address of the espfix stack */ DEFINE_PER_CPU_READ_MOSTLY(unsigned long, espfix_stack);
arch/x86/mm/init.c +1 -2
@@ -92,8 +92,7 @@ __ref void *alloc_low_pages(unsigned int num)unsigned int order; order =get_order ((unsigned long )num <<PAGE_SHIFT ); -return (void *)__get_free_pages (GFP_ATOMIC | __GFP_NOTRACK | - __GFP_ZERO, order); +return (void *)__get_free_pages (GFP_ATOMIC | __GFP_ZERO, order); }if ((pgt_buf_end + num) > pgt_buf_top || !can_use_brk_pgt) {
arch/x86/mm/init_64.c +1 -1
@@ -184,7 +184,7 @@ static __ref void *spp_getpage(void)void *ptr;if (after_bootmem) - ptr = (void *)get_zeroed_page (GFP_ATOMIC | __GFP_NOTRACK); + ptr = (void *)get_zeroed_page (GFP_ATOMIC );else ptr =alloc_bootmem_pages (PAGE_SIZE );
arch/x86/mm/pageattr.c +5 -5
@@ -753,7 +753,7 @@ static int split_large_page(struct cpa_data *cpa, pte_t *kpte,if (!debug_pagealloc_enabled ())spin_unlock (&cpa_lock); - base =alloc_pages (GFP_KERNEL | __GFP_NOTRACK,0 ); + base =alloc_pages (GFP_KERNEL ,0 );if (!debug_pagealloc_enabled ())spin_lock (&cpa_lock);if (!base)
@@ -904,7 +904,7 @@ static void unmap_pud_range(p4d_t *p4d, unsigned long start, unsigned long end)static int alloc_pte_page (pmd_t *pmd) { -pte_t *pte = (pte_t *)get_zeroed_page (GFP_KERNEL | __GFP_NOTRACK); +pte_t *pte = (pte_t *)get_zeroed_page (GFP_KERNEL );if (!pte)return -1 ;
@@ -914,7 +914,7 @@ static int alloc_pte_page(pmd_t *pmd)static int alloc_pmd_page (pud_t *pud) { -pmd_t *pmd = (pmd_t *)get_zeroed_page (GFP_KERNEL | __GFP_NOTRACK); +pmd_t *pmd = (pmd_t *)get_zeroed_page (GFP_KERNEL );if (!pmd)return -1 ;
@@ -1120,7 +1120,7 @@ static int populate_pgd(struct cpa_data *cpa, unsigned long addr) pgd_entry = cpa->pgd +pgd_index (addr);if (pgd_none (*pgd_entry)) { - p4d = (p4d_t *)get_zeroed_page (GFP_KERNEL | __GFP_NOTRACK); + p4d = (p4d_t *)get_zeroed_page (GFP_KERNEL );if (!p4d)return -1 ;
@@ -1132,7 +1132,7 @@ static int populate_pgd(struct cpa_data *cpa, unsigned long addr)*/ p4d =p4d_offset (pgd_entry, addr);if (p4d_none (*p4d)) { - pud = (pud_t *)get_zeroed_page (GFP_KERNEL | __GFP_NOTRACK); + pud = (pud_t *)get_zeroed_page (GFP_KERNEL );if (!pud)return -1 ;
arch/x86/mm/pgtable.c +1 -1
@@ -6,7 +6,7 @@#include <asm/fixmap.h> #include <asm/mtrr.h> -#define PGALLOC_GFP (GFP_KERNEL_ACCOUNT | __GFP_NOTRACK | __GFP_ZERO) +#define PGALLOC_GFP (GFP_KERNEL_ACCOUNT | __GFP_ZERO)#ifdef CONFIG_HIGHPTE #define PGALLOC_USER_GFP __GFP_HIGHMEM
arch/x86/platform/efi/efi_64.c +1 -1
@@ -205,7 +205,7 @@ int __init efi_alloc_page_tables(void)if (efi_enabled (EFI_OLD_MEMMAP ))return 0 ; - gfp_mask =GFP_KERNEL | __GFP_NOTRACK | __GFP_ZERO; + gfp_mask =GFP_KERNEL | __GFP_ZERO; efi_pgd = (pgd_t *)__get_free_page (gfp_mask);if (!efi_pgd)return -ENOMEM ;
crypto/xor.c +1 -6
@@ -122,12 +122,7 @@ calibrate_xor_blocks(void) goto out; } -/* -* Note: Since the memory is not actually used for _anything_ but to -* test the XOR speed, we don't really want kmemcheck to warn about -* reading uninitialized bytes here. -*/ - b1 = (void *)__get_free_pages (GFP_KERNEL | __GFP_NOTRACK,2 ); + b1 = (void *)__get_free_pages (GFP_KERNEL ,2 );if (!b1) {printk (KERN_WARNING "xor: Yikes! No memory available.\n" );return -ENOMEM ;
include/linux/thread_info.h +2 -3
@@ -43,10 +43,9 @@ enum {#endif #ifdef CONFIG_DEBUG_STACK_USAGE -# define THREADINFO_GFP (GFP_KERNEL_ACCOUNT | __GFP_NOTRACK | \ - __GFP_ZERO) +# define THREADINFO_GFP (GFP_KERNEL_ACCOUNT | __GFP_ZERO)#else -# define THREADINFO_GFP (GFP_KERNEL_ACCOUNT | __GFP_NOTRACK) +# define THREADINFO_GFP (GFP_KERNEL_ACCOUNT)#endif /*
init/do_mounts.c +1 -2
@@ -380,8 +380,7 @@ static int __init do_mount_root(char *name, char *fs, int flags, void *data)void __init mount_block_root (char *name,int flags) { -struct page *page =alloc_page (GFP_KERNEL | - __GFP_NOTRACK_FALSE_POSITIVE); +struct page *page =alloc_page (GFP_KERNEL );char *fs_names =page_address (page);char *p;#ifdef CONFIG_BLOCK
kernel/fork.c +6 -6
@@ -465,7 +465,7 @@ void __init fork_init(void)/* create a slab on which task_structs can be allocated */ task_struct_cachep =kmem_cache_create ("task_struct" , arch_task_struct_size, align, -SLAB_PANIC |SLAB_NOTRACK |SLAB_ACCOUNT ,NULL ); +SLAB_PANIC |SLAB_ACCOUNT ,NULL );#endif /* do the arch specific task caches init */
@@ -2205,18 +2205,18 @@ void __init proc_caches_init(void) sighand_cachep =kmem_cache_create ("sighand_cache" ,sizeof (struct sighand_struct ),0 ,SLAB_HWCACHE_ALIGN |SLAB_PANIC |SLAB_TYPESAFE_BY_RCU | -SLAB_NOTRACK |SLAB_ACCOUNT , sighand_ctor); +SLAB_ACCOUNT , sighand_ctor); signal_cachep =kmem_cache_create ("signal_cache" ,sizeof (struct signal_struct ),0 , -SLAB_HWCACHE_ALIGN |SLAB_PANIC |SLAB_NOTRACK |SLAB_ACCOUNT , +SLAB_HWCACHE_ALIGN |SLAB_PANIC |SLAB_ACCOUNT ,NULL ); files_cachep =kmem_cache_create ("files_cache" ,sizeof (struct files_struct ),0 , -SLAB_HWCACHE_ALIGN |SLAB_PANIC |SLAB_NOTRACK |SLAB_ACCOUNT , +SLAB_HWCACHE_ALIGN |SLAB_PANIC |SLAB_ACCOUNT ,NULL ); fs_cachep =kmem_cache_create ("fs_cache" ,sizeof (struct fs_struct ),0 , -SLAB_HWCACHE_ALIGN |SLAB_PANIC |SLAB_NOTRACK |SLAB_ACCOUNT , +SLAB_HWCACHE_ALIGN |SLAB_PANIC |SLAB_ACCOUNT ,NULL );/* * FIXME! The "sizeof(struct mm_struct)" currently includes the
@@ -2227,7 +2227,7 @@ void __init proc_caches_init(void)*/ mm_cachep =kmem_cache_create ("mm_struct" ,sizeof (struct mm_struct ),ARCH_MIN_MMSTRUCT_ALIGN , -SLAB_HWCACHE_ALIGN |SLAB_PANIC |SLAB_NOTRACK |SLAB_ACCOUNT , +SLAB_HWCACHE_ALIGN |SLAB_PANIC |SLAB_ACCOUNT ,NULL ); vm_area_cachep =KMEM_CACHE (vm_area_struct,SLAB_PANIC |SLAB_ACCOUNT );mmap_init ();
kernel/signal.c +1 -2
@@ -1036,8 +1036,7 @@ static int __send_signal(int sig, struct siginfo *info, struct task_struct *t,else override_rlimit =0 ; - q =__sigqueue_alloc (sig, t,GFP_ATOMIC | __GFP_NOTRACK_FALSE_POSITIVE, - override_rlimit); + q =__sigqueue_alloc (sig, t,GFP_ATOMIC , override_rlimit);if (q) {list_add_tail (&q->list, &pending->list);switch ((unsigned long ) info) {
mm/kmemcheck.c +1 -1
@@ -17,7 +17,7 @@ void kmemcheck_alloc_shadow(struct page *page, int order, gfp_t flags, int node)* With kmemcheck enabled, we need to allocate a memory area for the * shadow bits as well. */ - shadow =alloc_pages_node (node, flags | __GFP_NOTRACK, order); + shadow =alloc_pages_node (node, flags, order);if (!shadow) {if (printk_ratelimit ())pr_err ("kmemcheck: failed to allocate shadow bitmap\n" );
mm/slab.c +1 -1
@@ -1411,7 +1411,7 @@ static struct page *kmem_getpages(struct kmem_cache *cachep, gfp_t flags,if (cachep->flags &SLAB_RECLAIM_ACCOUNT ) flags |= __GFP_RECLAIMABLE; - page =__alloc_pages_node (nodeid, flags | __GFP_NOTRACK, cachep->gfporder); + page =__alloc_pages_node (nodeid, flags, cachep->gfporder);if (!page) {slab_out_of_memory (cachep, flags, nodeid);return NULL ;
mm/slab.h +2 -3
@@ -140,10 +140,10 @@ static inline unsigned long kmem_cache_flags(unsigned long object_size,#if defined(CONFIG_SLAB )#define SLAB_CACHE_FLAGS (SLAB_MEM_SPREAD | SLAB_NOLEAKTRACE | \ SLAB_RECLAIM_ACCOUNT | SLAB_TEMPORARY | \ - SLAB_NOTRACK | SLAB_ACCOUNT) + SLAB_ACCOUNT)#elif defined(CONFIG_SLUB )#define SLAB_CACHE_FLAGS (SLAB_NOLEAKTRACE | SLAB_RECLAIM_ACCOUNT | \ - SLAB_TEMPORARY | SLAB_NOTRACK | SLAB_ACCOUNT) + SLAB_TEMPORARY | SLAB_ACCOUNT)#else #define SLAB_CACHE_FLAGS (0)#endif
@@ -162,7 +162,6 @@ static inline unsigned long kmem_cache_flags(unsigned long object_size, SLAB_NOLEAKTRACE | \ SLAB_RECLAIM_ACCOUNT | \ SLAB_TEMPORARY | \ - SLAB_NOTRACK | \ SLAB_ACCOUNT)int __kmem_cache_shutdown (struct kmem_cache *);
mm/slab_common.c +1 -1
@@ -43,7 +43,7 @@ static DECLARE_WORK(slab_caches_to_rcu_destroy_work, SLAB_FAILSLAB | SLAB_KASAN)#define SLAB_MERGE_SAME (SLAB_RECLAIM_ACCOUNT | SLAB_CACHE_DMA | \ - SLAB_NOTRACK | SLAB_ACCOUNT) + SLAB_ACCOUNT)/* * Merge control. If this is set then no merging of slab caches will occur.
mm/slub.c +1 -3
@@ -1433,8 +1433,6 @@ static inline struct page *alloc_slab_page(struct kmem_cache *s,struct page *page;int order =oo_order (oo); - flags |= __GFP_NOTRACK; -if (node ==NUMA_NO_NODE ) page =alloc_pages (flags, order);else
@@ -3771,7 +3769,7 @@ static void *kmalloc_large_node(size_t size, gfp_t flags, int node)struct page *page;void *ptr =NULL ; - flags |= __GFP_COMP | __GFP_NOTRACK; + flags |= __GFP_COMP; page =alloc_pages_node (node, flags,get_order (size));if (page) ptr =page_address (page);
Signature · 1 line
2.11.0
PATCH v2 3/4 kmemcheck: rip it out
In reply to Levin, Alexander (Sasha Levin)Fix up makefiles, remove references, and git rm kmemcheck.
--- Documentation/admin-guide/kernel-parameters.txt | 7 - Documentation/dev-tools/index.rst | 1 - Documentation/dev-tools/kmemcheck.rst | 733 ------------------------ MAINTAINERS | 10 - arch/x86/Kconfig | 3 +- arch/x86/include/asm/kmemcheck.h | 42 -- arch/x86/include/asm/string_32.h | 9 - arch/x86/include/asm/string_64.h | 8 - arch/x86/kernel/cpu/intel.c | 15 - arch/x86/mm/Makefile | 2 - arch/x86/mm/init.c | 5 +- arch/x86/mm/kmemcheck/Makefile | 1 - arch/x86/mm/kmemcheck/error.c | 227 -------- arch/x86/mm/kmemcheck/error.h | 15 - arch/x86/mm/kmemcheck/kmemcheck.c | 658 --------------------- arch/x86/mm/kmemcheck/opcode.c | 106 ---- arch/x86/mm/kmemcheck/opcode.h | 9 - arch/x86/mm/kmemcheck/pte.c | 22 - arch/x86/mm/kmemcheck/pte.h | 10 - arch/x86/mm/kmemcheck/selftest.c | 70 --- arch/x86/mm/kmemcheck/selftest.h | 6 - arch/x86/mm/kmemcheck/shadow.c | 173 ------ arch/x86/mm/kmemcheck/shadow.h | 18 - include/linux/interrupt.h | 15 - include/linux/kmemcheck.h | 171 ------ kernel/softirq.c | 10 - kernel/sysctl.c | 10 - lib/Kconfig.debug | 6 +- lib/Kconfig.kmemcheck | 94 --- mm/Kconfig.debug | 1 - mm/Makefile | 2 - mm/kmemcheck.c | 125 ---- mm/slub.c | 5 +- scripts/kernel-doc | 2 - tools/include/linux/kmemcheck.h | 8 - 35 files changed, 7 insertions(+), 2592 deletions(-) delete mode 100644 Documentation/dev-tools/kmemcheck.rst delete mode 100644 arch/x86/include/asm/kmemcheck.h delete mode 100644 arch/x86/mm/kmemcheck/Makefile delete mode 100644 arch/x86/mm/kmemcheck/error.c delete mode 100644 arch/x86/mm/kmemcheck/error.h delete mode 100644 arch/x86/mm/kmemcheck/kmemcheck.c delete mode 100644 arch/x86/mm/kmemcheck/opcode.c delete mode 100644 arch/x86/mm/kmemcheck/opcode.h delete mode 100644 arch/x86/mm/kmemcheck/pte.c delete mode 100644 arch/x86/mm/kmemcheck/pte.h delete mode 100644 arch/x86/mm/kmemcheck/selftest.c delete mode 100644 arch/x86/mm/kmemcheck/selftest.h delete mode 100644 arch/x86/mm/kmemcheck/shadow.c delete mode 100644 arch/x86/mm/kmemcheck/shadow.h delete mode 100644 include/linux/kmemcheck.h delete mode 100644 lib/Kconfig.kmemcheck delete mode 100644 mm/kmemcheck.c delete mode 100644 tools/include/linux/kmemcheck.h
Documentation/admin-guide/kernel-parameters.txt +0 -7
@@ -1841,13 +1841,6 @@ Built with CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y, the default is off. - kmemcheck= [X86] Boot-time kmemcheck enable/disable/one-shot mode - Valid arguments: 0, 1, 2 - kmemcheck=0 (disabled) - kmemcheck=1 (enabled) - kmemcheck=2 (one-shot mode) - Default: 2 (one-shot mode) - kvm.ignore_msrs=[KVM] Ignore guest accesses to unhandled MSRs. Default is 0 (don't ignore, but inject #GP)
Documentation/dev-tools/index.rst +0 -1
@@ -21,7 +21,6 @@ whole; patches welcome! kasan ubsan kmemleak - kmemcheck gdb-kernel-debugging kgdb kselftest
Documentation/dev-tools/kmemcheck.rst deleted +0 -733
733 lines not on this page · raw message
MAINTAINERS +0 -10
@@ -7669,16 +7669,6 @@ F: include/linux/kdb.h F: include/linux/kgdb.h F: kernel/debug/ -KMEMCHECK -M: Vegard Nossum <[email protected]> -M: Pekka Enberg <[email protected]> -S: Maintained -F: Documentation/dev-tools/kmemcheck.rst -F: arch/x86/include/asm/kmemcheck.h -F: arch/x86/mm/kmemcheck/ -F: include/linux/kmemcheck.h -F: mm/kmemcheck.c - KMEMLEAK M: Catalin Marinas <[email protected]> S: Maintained
arch/x86/Kconfig +1 -2
@@ -109,7 +109,6 @@ config X86 select HAVE_ARCH_JUMP_LABEL select HAVE_ARCH_KASAN if X86_64 && SPARSEMEM_VMEMMAP select HAVE_ARCH_KGDB - select HAVE_ARCH_KMEMCHECK select HAVE_ARCH_MMAP_RND_BITS if MMU select HAVE_ARCH_MMAP_RND_COMPAT_BITS if MMU && COMPAT select HAVE_ARCH_COMPAT_MMAP_BASES if MMU && COMPAT
@@ -1428,7 +1427,7 @@ config ARCH_DMA_ADDR_T_64BIT config X86_DIRECT_GBPAGES def_bool y - depends on X86_64 && !DEBUG_PAGEALLOC && !KMEMCHECK + depends on X86_64 && !DEBUG_PAGEALLOC ---help--- Certain kernel features effectively disable kernel linear 1 GB mappings (even if the CPU otherwise
arch/x86/include/asm/kmemcheck.h deleted +0 -42
42 lines not on this page · raw message
arch/x86/include/asm/string_32.h +0 -9
@@ -178,8 +178,6 @@ static inline void *__memcpy3d(void *to, const void *from, size_t len)* No 3D Now! */ -#ifndef CONFIG_KMEMCHECK -#if (__GNUC__ >=4 )#define memcpy (t, f, n) __builtin_memcpy(t, f, n)#else
@@ -188,13 +186,6 @@ static inline void *__memcpy3d(void *to, const void *from, size_t len) ? __constant_memcpy((t), (f), (n)) \ : __memcpy((t), (f), (n)))#endif -#else -/* -* kmemcheck becomes very happy if we use the REP instructions unconditionally, -* because it means that we know both memory operands in advance. -*/ -#define memcpy (t, f, n) __memcpy((t), (f), (n)) -#endif #endif #endif /* !CONFIG_FORTIFY_SOURCE */
arch/x86/include/asm/string_64.h +0 -8
@@ -32,7 +32,6 @@ extern void *memcpy(void *to, const void *from, size_t len);extern void *__memcpy (void *to,const void *from,size_t len);#ifndef CONFIG_FORTIFY_SOURCE -#ifndef CONFIG_KMEMCHECK #if (__GNUC__ ==4 && __GNUC_MINOR__ <3 ) || __GNUC__ <4 #define memcpy (dst, src, len) \ ({ \
@@ -45,13 +44,6 @@ extern void *__memcpy(void *to, const void *from, size_t len); __ret; \ })#endif -#else -/* -* kmemcheck becomes very happy if we use the REP instructions unconditionally, -* because it means that we know both memory operands in advance. -*/ -#define memcpy (dst, src, len) __inline_memcpy((dst), (src), (len)) -#endif #endif /* !CONFIG_FORTIFY_SOURCE */ #define __HAVE_ARCH_MEMSET
arch/x86/kernel/cpu/intel.c +0 -15
@@ -186,21 +186,6 @@ static void early_init_intel(struct cpuinfo_x86 *c)if (c->x86 ==6 && c->x86_model <15 )clear_cpu_cap (c,X86_FEATURE_PAT ); -#ifdef CONFIG_KMEMCHECK -/* -* P4s have a "fast strings" feature which causes single- -* stepping REP instructions to only generate a #DB on -* cache-line boundaries. -* -* Ingo Molnar reported a Pentium D (model 6) and a Xeon -* (model 2) with the same problem. -*/ -if (c->x86 ==15 ) -if (msr_clear_bit (MSR_IA32_MISC_ENABLE , -MSR_IA32_MISC_ENABLE_FAST_STRING_BIT ) >0 ) -pr_info ("kmemcheck: Disabling fast string operations\n" ); -#endif -/* * If fast string is not enabled in IA32_MISC_ENABLE for any reason, * clear the fast string and enhanced fast string CPU capabilities.
arch/x86/mm/Makefile +0 -2
@@ -21,8 +21,6 @@ obj-$(CONFIG_X86_PTDUMP) += debug_pagetables.o obj-$(CONFIG_HIGHMEM) += highmem_32.o -obj-$(CONFIG_KMEMCHECK) += kmemcheck/ - KASAN_SANITIZE_kasan_init_$(BITS).o := n obj-$(CONFIG_KASAN) += kasan_init_$(BITS).o
arch/x86/mm/init.c +2 -3
@@ -163,12 +163,11 @@ static int page_size_mask;static void __init probe_page_size_mask (void ) {/* -* For CONFIG_KMEMCHECK or pagealloc debugging, identity mapping will -* use small pages. +* For pagealloc debugging, identity mapping will use small pages. * This will simplify cpa(), which otherwise needs to support splitting * large pages into small in interrupt context, etc. */ -if (boot_cpu_has (X86_FEATURE_PSE ) && !debug_pagealloc_enabled () && !IS_ENABLED (CONFIG_KMEMCHECK )) +if (boot_cpu_has (X86_FEATURE_PSE ) && !debug_pagealloc_enabled ()) page_size_mask |=1 <<PG_LEVEL_2M ;else direct_gbpages =0 ;
arch/x86/mm/kmemcheck/Makefile deleted +0 -1
@@ -1 +0,0 @@ -obj-y := error.o kmemcheck.o opcode.o pte.o selftest.o shadow.o
arch/x86/mm/kmemcheck/error.c deleted +0 -227
227 lines not on this page · raw message
arch/x86/mm/kmemcheck/error.h deleted +0 -15
@@ -1,15 +0,0 @@ -#ifndef ARCH__X86__MM__KMEMCHECK__ERROR_H -#define ARCH__X86__MM__KMEMCHECK__ERROR_H - -#include <linux/ptrace.h> - -#include "shadow.h" - -void kmemcheck_error_save (enum kmemcheck_shadow state, -unsigned long address,unsigned int size,struct pt_regs *regs); - -void kmemcheck_error_save_bug (struct pt_regs *regs); - -void kmemcheck_error_recall (void ); - -#endif
arch/x86/mm/kmemcheck/kmemcheck.c deleted +0 -658
658 lines not on this page · raw message
arch/x86/mm/kmemcheck/opcode.c deleted +0 -106
106 lines not on this page · raw message
arch/x86/mm/kmemcheck/opcode.h deleted +0 -9
@@ -1,9 +0,0 @@ -#ifndef ARCH__X86__MM__KMEMCHECK__OPCODE_H -#define ARCH__X86__MM__KMEMCHECK__OPCODE_H - -#include <linux/types.h> - -void kmemcheck_opcode_decode (const uint8_t *op,unsigned int *size); -const uint8_t *kmemcheck_opcode_get_primary (const uint8_t *op); - -#endif
arch/x86/mm/kmemcheck/pte.c deleted +0 -22
@@ -1,22 +0,0 @@ -#include <linux/mm.h> - -#include <asm/pgtable.h> - -#include "pte.h" - -pte_t *kmemcheck_pte_lookup (unsigned long address) -{ -pte_t *pte; -unsigned int level; - - pte =lookup_address (address, &level); -if (!pte) -return NULL ; -if (level !=PG_LEVEL_4K ) -return NULL ; -if (!pte_hidden (*pte)) -return NULL ; - -return pte; -} -
arch/x86/mm/kmemcheck/pte.h deleted +0 -10
@@ -1,10 +0,0 @@ -#ifndef ARCH__X86__MM__KMEMCHECK__PTE_H -#define ARCH__X86__MM__KMEMCHECK__PTE_H - -#include <linux/mm.h> - -#include <asm/pgtable.h> - -pte_t *kmemcheck_pte_lookup (unsigned long address); - -#endif
arch/x86/mm/kmemcheck/selftest.c deleted +0 -70
70 lines not on this page · raw message
arch/x86/mm/kmemcheck/selftest.h deleted +0 -6
@@ -1,6 +0,0 @@ -#ifndef ARCH_X86_MM_KMEMCHECK_SELFTEST_H -#define ARCH_X86_MM_KMEMCHECK_SELFTEST_H - -bool kmemcheck_selftest (void ); - -#endif
arch/x86/mm/kmemcheck/shadow.c deleted +0 -173
173 lines not on this page · raw message
arch/x86/mm/kmemcheck/shadow.h deleted +0 -18
@@ -1,18 +0,0 @@ -#ifndef ARCH__X86__MM__KMEMCHECK__SHADOW_H -#define ARCH__X86__MM__KMEMCHECK__SHADOW_H - -enum kmemcheck_shadow { -KMEMCHECK_SHADOW_UNALLOCATED , -KMEMCHECK_SHADOW_UNINITIALIZED , -KMEMCHECK_SHADOW_INITIALIZED , -KMEMCHECK_SHADOW_FREED , -}; - -void *kmemcheck_shadow_lookup (unsigned long address); - -enum kmemcheck_shadow kmemcheck_shadow_test (void *shadow,unsigned int size); -enum kmemcheck_shadow kmemcheck_shadow_test_all (void *shadow, -unsigned int size); -void kmemcheck_shadow_set (void *shadow,unsigned int size); - -#endif
include/linux/interrupt.h +0 -15
@@ -593,21 +593,6 @@ static inline void tasklet_hi_schedule(struct tasklet_struct *t)__tasklet_hi_schedule (t); } -extern void __tasklet_hi_schedule_first (struct tasklet_struct *t); - -/* -* This version avoids touching any other tasklets. Needed for kmemcheck -* in order not to take any page faults while enqueueing this tasklet; -* consider VERY carefully whether you really need this or -* tasklet_hi_schedule()... -*/ -static inline void tasklet_hi_schedule_first (struct tasklet_struct *t) -{ -if (!test_and_set_bit (TASKLET_STATE_SCHED , &t->state)) -__tasklet_hi_schedule_first (t); -} - -static inline void tasklet_disable_nosync (struct tasklet_struct *t) {atomic_inc (&t->count);
include/linux/kmemcheck.h deleted +0 -171
171 lines not on this page · raw message
kernel/softirq.c +0 -10
@@ -486,16 +486,6 @@ void __tasklet_hi_schedule(struct tasklet_struct *t) }EXPORT_SYMBOL (__tasklet_hi_schedule); -void __tasklet_hi_schedule_first (struct tasklet_struct *t) -{ -BUG_ON (!irqs_disabled ()); - - t->next =__this_cpu_read (tasklet_hi_vec.head); -__this_cpu_write (tasklet_hi_vec.head, t); -__raise_softirq_irqoff (HI_SOFTIRQ ); -} -EXPORT_SYMBOL (__tasklet_hi_schedule_first); - static __latent_entropy void tasklet_action(struct softirq_action *a) {struct tasklet_struct *list;
kernel/sysctl.c +0 -10
@@ -30,7 +30,6 @@#include <linux/proc_fs.h> #include <linux/security.h> #include <linux/ctype.h> -#include <linux/kmemcheck.h> #include <linux/kmemleak.h> #include <linux/fs.h> #include <linux/init.h>
@@ -1178,15 +1177,6 @@ static struct ctl_table kern_table[] = { .extra2 = &one_thousand, },#endif -#ifdef CONFIG_KMEMCHECK - { - .procname = "kmemcheck", - .data = &kmemcheck_enabled, - .maxlen = sizeof(int), - .mode = 0644, - .proc_handler = proc_dointvec, - }, -#endif { .procname = "panic_on_warn", .data = &panic_on_warn,
lib/Kconfig.debug +2 -4
@@ -504,7 +504,7 @@ config DEBUG_OBJECTS_ENABLE_DEFAULT config DEBUG_SLAB bool "Debug slab memory allocations" - depends on DEBUG_KERNEL && SLAB && !KMEMCHECK + depends on DEBUG_KERNEL && SLAB help Say Y here to have the kernel do limited verification on memory allocation as well as poisoning memory on free to catch use of freed
@@ -516,7 +516,7 @@ config DEBUG_SLAB_LEAK config SLUB_DEBUG_ON bool "SLUB debugging on by default" - depends on SLUB && SLUB_DEBUG && !KMEMCHECK + depends on SLUB && SLUB_DEBUG default n help Boot with debugging on by default. SLUB boots by default with
@@ -730,8 +730,6 @@ config DEBUG_STACKOVERFLOW If in doubt, say "N". -source "lib/Kconfig.kmemcheck" - source "lib/Kconfig.kasan" endmenu # "Memory Debugging"
lib/Kconfig.kmemcheck deleted +0 -94
94 lines not on this page · raw message
mm/Kconfig.debug +0 -1
@@ -11,7 +11,6 @@ config DEBUG_PAGEALLOC bool "Debug page memory allocations" depends on DEBUG_KERNEL depends on !HIBERNATION || ARCH_SUPPORTS_DEBUG_PAGEALLOC && !PPC && !SPARC - depends on !KMEMCHECK select PAGE_EXTENSION select PAGE_POISONING if !ARCH_SUPPORTS_DEBUG_PAGEALLOC ---help---
mm/Makefile +0 -2
@@ -16,7 +16,6 @@ KCOV_INSTRUMENT_slub.o := n KCOV_INSTRUMENT_page_alloc.o := n KCOV_INSTRUMENT_debug-pagealloc.o := n KCOV_INSTRUMENT_kmemleak.o := n -KCOV_INSTRUMENT_kmemcheck.o := n KCOV_INSTRUMENT_memcontrol.o := n KCOV_INSTRUMENT_mmzone.o := n KCOV_INSTRUMENT_vmstat.o := n
@@ -69,7 +68,6 @@ obj-$(CONFIG_KSM) += ksm.o obj-$(CONFIG_PAGE_POISONING) += page_poison.o obj-$(CONFIG_SLAB) += slab.o obj-$(CONFIG_SLUB) += slub.o -obj-$(CONFIG_KMEMCHECK) += kmemcheck.o obj-$(CONFIG_KASAN) += kasan/ obj-$(CONFIG_FAILSLAB) += failslab.o obj-$(CONFIG_MEMORY_HOTPLUG) += memory_hotplug.o
mm/kmemcheck.c deleted +0 -125
125 lines not on this page · raw message
mm/slub.c +2 -3
@@ -1368,7 +1368,7 @@ static inline void *slab_free_hook(struct kmem_cache *s, void *x)* So in order to make the debug calls that expect irqs to be * disabled we need to disable interrupts temporarily. */ -#if defined(CONFIG_KMEMCHECK ) || defined(CONFIG_LOCKDEP ) +#ifdef CONFIG_LOCKDEP {unsigned long flags;
@@ -1396,8 +1396,7 @@ static inline void slab_free_freelist_hook(struct kmem_cache *s,* Compiler cannot detect this function can be removed if slab_free_hook() * evaluates to nothing. Thus, catch all relevant config debug options here. */ -#if defined(CONFIG_KMEMCHECK ) || \ - defined(CONFIG_LOCKDEP ) || \ +#if defined(CONFIG_LOCKDEP ) || \ defined(CONFIG_DEBUG_KMEMLEAK ) || \ defined(CONFIG_DEBUG_OBJECTS_FREE ) || \ defined(CONFIG_KASAN )
scripts/kernel-doc +0 -2
@@ -2182,8 +2182,6 @@ sub dump_struct($$) { # strip comments: $members =~ s/\/\*.*?\*\///gos; $nested =~ s/\/\*.*?\*\///gos; - # strip kmemcheck_bitfield_{begin,end}.*; - $members =~ s/kmemcheck_bitfield_.*?;//gos; # strip attributes $members =~ s/__attribute__\s*\(\([a-z,_\*\s\(\)]*\)\)//i; $members =~ s/__aligned\s*\([^;]*\)//gos;
tools/include/linux/kmemcheck.h deleted +0 -8
@@ -1,8 +0,0 @@ -#ifndef _LIBLOCKDEP_LINUX_KMEMCHECK_H_ -#define _LIBLOCKDEP_LINUX_KMEMCHECK_H_ - -static inline void kmemcheck_mark_initialized (void *address,unsigned int n) -{ -} - -#endif
Signature · 1 line
2.11.0
PATCH v2 4/4 kmemcheck: remove whats left of NOTRACK flags
In reply to Levin, Alexander (Sasha Levin)Now that kmemcheck is gone, we don't need the NOTRACK flags.
--- arch/x86/include/asm/pgtable.h | 5 ----- arch/x86/include/asm/pgtable_types.h | 13 ------------- include/linux/gfp.h | 9 --------- include/linux/slab.h | 6 ------ include/trace/events/mmflags.h | 1 - mm/slub.c | 2 -- tools/perf/builtin-kmem.c | 1 - 7 files changed, 37 deletions(-)
arch/x86/include/asm/pgtable.h +0 -5
@@ -666,11 +666,6 @@ static inline bool pte_accessible(struct mm_struct *mm, pte_t a)return false; } -static inline int pte_hidden (pte_t pte) -{ -return pte_flags (pte) & _PAGE_HIDDEN; -} -static inline int pmd_present (pmd_t pmd) {/*
arch/x86/include/asm/pgtable_types.h +0 -13
@@ -31,7 +31,6 @@#define _PAGE_BIT_SPECIAL _PAGE_BIT_SOFTW1#define _PAGE_BIT_CPA_TEST _PAGE_BIT_SOFTW1 -#define _PAGE_BIT_HIDDEN _PAGE_BIT_SOFTW3/* hidden by kmemcheck */ #define _PAGE_BIT_SOFT_DIRTY _PAGE_BIT_SOFTW3/* software dirty tracking */ #define _PAGE_BIT_DEVMAP _PAGE_BIT_SOFTW4
@@ -78,18 +77,6 @@#define _PAGE_KNL_ERRATUM_MASK 0#endif -#ifdef CONFIG_KMEMCHECK -#define _PAGE_HIDDEN (_AT(pteval_t, 1) << _PAGE_BIT_HIDDEN) -#else -#define _PAGE_HIDDEN (_AT(pteval_t, 0)) -#endif - -/* -* The same hidden bit is used by kmemcheck, but since kmemcheck -* works on kernel pages while soft-dirty engine on user space, -* they do not conflict with each other. -*/ -#ifdef CONFIG_MEM_SOFT_DIRTY #define _PAGE_SOFT_DIRTY (_AT(pteval_t, 1) << _PAGE_BIT_SOFT_DIRTY)#else
include/linux/gfp.h +0 -9
@@ -36,7 +36,6 @@ struct vm_area_struct;#define ___GFP_THISNODE 0x40000u#define ___GFP_ATOMIC 0x80000u#define ___GFP_ACCOUNT 0x100000u -#define ___GFP_NOTRACK 0x200000u#define ___GFP_DIRECT_RECLAIM 0x400000u#define ___GFP_WRITE 0x800000u#define ___GFP_KSWAPD_RECLAIM 0x1000000u
@@ -200,19 +199,11 @@ struct vm_area_struct;* __GFP_COMP address compound page metadata. * * __GFP_ZERO returns a zeroed page on success. -* -* __GFP_NOTRACK avoids tracking with kmemcheck. -* -* __GFP_NOTRACK_FALSE_POSITIVE is an alias of __GFP_NOTRACK. It's a means of -* distinguishing in the source between false positives and allocations that -* cannot be supported (e.g. page tables). */ #define __GFP_COLD ((__force gfp_t)___GFP_COLD)#define __GFP_NOWARN ((__force gfp_t)___GFP_NOWARN)#define __GFP_COMP ((__force gfp_t)___GFP_COMP)#define __GFP_ZERO ((__force gfp_t)___GFP_ZERO) -#define __GFP_NOTRACK ((__force gfp_t)___GFP_NOTRACK) -#define __GFP_NOTRACK_FALSE_POSITIVE (__GFP_NOTRACK)/* Disable lockdep for GFP context tracking */ #define __GFP_NOLOCKDEP ((__force gfp_t)___GFP_NOLOCKDEP)
include/linux/slab.h +0 -6
@@ -77,12 +77,6 @@#define SLAB_NOLEAKTRACE 0x00800000UL/* Avoid kmemleak tracing */ -/* Don't track use of uninitialized memory */ -#ifdef CONFIG_KMEMCHECK -# define SLAB_NOTRACK 0x01000000UL -#else -# define SLAB_NOTRACK 0x00000000UL -#endif #ifdef CONFIG_FAILSLAB # define SLAB_FAILSLAB 0x02000000UL/* Fault injection mark */ #else
include/trace/events/mmflags.h +0 -1
@@ -45,7 +45,6 @@ {(unsigned long)__GFP_RECLAIMABLE, "__GFP_RECLAIMABLE"}, \ {(unsigned long)__GFP_MOVABLE, "__GFP_MOVABLE"}, \ {(unsigned long)__GFP_ACCOUNT, "__GFP_ACCOUNT"}, \ - {(unsigned long)__GFP_NOTRACK, "__GFP_NOTRACK"}, \ {(unsigned long)__GFP_WRITE, "__GFP_WRITE"}, \ {(unsigned long)__GFP_RECLAIM, "__GFP_RECLAIM"}, \ {(unsigned long)__GFP_DIRECT_RECLAIM, "__GFP_DIRECT_RECLAIM"},\
mm/slub.c +0 -2
@@ -5631,8 +5631,6 @@ static char *create_unique_id(struct kmem_cache *s) *p++ ='a' ;if (s->flags &SLAB_CONSISTENCY_CHECKS ) *p++ ='F' ; -if (!(s->flags &SLAB_NOTRACK )) - *p++ ='t' ;if (s->flags &SLAB_ACCOUNT ) *p++ ='A' ;if (p != name +1 )
tools/perf/builtin-kmem.c +0 -1
@@ -654,7 +654,6 @@ static const struct { { "__GFP_RECLAIMABLE", "RC" }, { "__GFP_MOVABLE", "M" }, { "__GFP_ACCOUNT", "AC" }, - { "__GFP_NOTRACK", "NT" }, { "__GFP_WRITE", "WR" }, { "__GFP_RECLAIM", "R" }, { "__GFP_DIRECT_RECLAIM", "DR" },
Signature · 1 line
2.11.0