mirror of
https://kernel.googlesource.com/pub/scm/linux/kernel/git/stable/linux.git
synced 2026-09-09 00:02:02 +08:00
tools: Update context analysis macros in compiler_types.h
In sync with the main kernel headers, include a stub version of compiler-context-analysis.h in tools/include/linux/compiler_types.h and remove the sparse context tracking definitions. Since tools/ headers are generally self-contained, provide a standalone tools/include/linux/compiler-context-analysis.h with no-op stubs for now. Also clean up redundant stubs in tools/testing/shared/linux/kernel.h that are now redundant. This fixes build errors in tools/testing/radix-tree/ where headers from include/linux/ (like cleanup.h) are used directly and expect these macros to be defined: | cc -I../shared -I. -I../../include -I../../arch/x86/include -I../../../lib -g -Og -Wall -D_LGPL_SOURCE -fsanitize=address -fsanitize=undefined -c -o radix-tree.o radix-tree.c | In file included from ../shared/linux/cleanup.h:2, | from ../shared/linux/../../../../include/linux/idr.h:18, | from ../shared/linux/idr.h:5, | from radix-tree.c:18: | ../shared/linux/../../../../include/linux/idr.h: In function ‘class_idr_alloc_destructor’: | ../shared/linux/../../../../include/linux/cleanup.h:283:9: error: expected declaration specifiers before ‘__no_context_analysis’ | 283 | __no_context_analysis \ | | ^~~~~~~~~~~~~~~~~~~~~ Closes: https://lore.kernel.org/oe-lkp/202601261546.d7ae2447-lkp@intel.com Reported-by: kernel test robot <oliver.sang@intel.com> Signed-off-by: Marco Elver <elver@google.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Reviewed-by: Lorenzo Stoakes <lorenzo.stoakes@oracle.com> Tested-by: Lorenzo Stoakes <lorenzo.stoakes@oracle.com> Link: https://patch.msgid.link/20260127111428.3747328-1-elver@google.com
This commit is contained in:
committed by
Peter Zijlstra
parent
e6de07249e
commit
944e3f7562
@@ -0,0 +1,42 @@
|
||||
/* SPDX-License-Identifier: GPL-2.0 */
|
||||
#ifndef _TOOLS_LINUX_COMPILER_CONTEXT_ANALYSIS_H
|
||||
#define _TOOLS_LINUX_COMPILER_CONTEXT_ANALYSIS_H
|
||||
|
||||
/*
|
||||
* Macros and attributes for compiler-based static context analysis.
|
||||
* No-op stubs for tools.
|
||||
*/
|
||||
|
||||
#define __guarded_by(...)
|
||||
#define __pt_guarded_by(...)
|
||||
|
||||
#define context_lock_struct(name, ...) struct __VA_ARGS__ name
|
||||
|
||||
#define __no_context_analysis
|
||||
#define __context_unsafe(comment)
|
||||
#define context_unsafe(...) ({ __VA_ARGS__; })
|
||||
#define context_unsafe_alias(p)
|
||||
#define disable_context_analysis()
|
||||
#define enable_context_analysis()
|
||||
|
||||
#define __must_hold(...)
|
||||
#define __must_not_hold(...)
|
||||
#define __acquires(...)
|
||||
#define __cond_acquires(ret, x)
|
||||
#define __releases(...)
|
||||
#define __acquire(x) (void)0
|
||||
#define __release(x) (void)0
|
||||
|
||||
#define __must_hold_shared(...)
|
||||
#define __acquires_shared(...)
|
||||
#define __cond_acquires_shared(ret, x)
|
||||
#define __releases_shared(...)
|
||||
#define __acquire_shared(x) (void)0
|
||||
#define __release_shared(x) (void)0
|
||||
|
||||
#define __acquire_ret(call, expr) (call)
|
||||
#define __acquire_shared_ret(call, expr) (call)
|
||||
#define __acquires_ret
|
||||
#define __acquires_shared_ret
|
||||
|
||||
#endif /* _TOOLS_LINUX_COMPILER_CONTEXT_ANALYSIS_H */
|
||||
@@ -13,21 +13,7 @@
|
||||
#define __has_builtin(x) (0)
|
||||
#endif
|
||||
|
||||
#ifdef __CHECKER__
|
||||
/* context/locking */
|
||||
# define __must_hold(x) __attribute__((context(x,1,1)))
|
||||
# define __acquires(x) __attribute__((context(x,0,1)))
|
||||
# define __releases(x) __attribute__((context(x,1,0)))
|
||||
# define __acquire(x) __context__(x,1)
|
||||
# define __release(x) __context__(x,-1)
|
||||
#else /* __CHECKER__ */
|
||||
/* context/locking */
|
||||
# define __must_hold(x)
|
||||
# define __acquires(x)
|
||||
# define __releases(x)
|
||||
# define __acquire(x) (void)0
|
||||
# define __release(x) (void)0
|
||||
#endif /* __CHECKER__ */
|
||||
#include <linux/compiler-context-analysis.h>
|
||||
|
||||
/* Compiler specific macros. */
|
||||
#ifdef __GNUC__
|
||||
|
||||
@@ -21,9 +21,5 @@
|
||||
#define schedule()
|
||||
#define PAGE_SHIFT 12
|
||||
|
||||
#define __acquires(x)
|
||||
#define __releases(x)
|
||||
#define __must_hold(x)
|
||||
|
||||
#define EXPORT_PER_CPU_SYMBOL_GPL(x)
|
||||
#endif /* _KERNEL_H */
|
||||
|
||||
Reference in New Issue
Block a user