xen-project/xen
1
0 Fork 0
mirror of https://github.com/xen-project/xen.git synced 2026-10-28 02:01:24 +01:00
Code Issues Activity

xen/x86: switch to use generic implemetation of bug.h

Browse Source 
The following changes were made:
* Make GENERIC_BUG_FRAME mandatory for X86
* Update asm/bug.h using generic implementation in <xen/bug.h>
* Update do_invalid_op using generic do_bug_frame()
* Define BUG_DEBUGGER_TRAP_FATAL to debugger_trap_fatal(X86_EXC_GP,regs)
* type of eip variable was changed to 'const void *'

Signed-off-by: Oleksii Kurochko <oleksii.kurochko@gmail.com>
Reviewed-by: Jan Beulich <jbeulich@suse.com>
This commit is contained in:
Oleksii Kurochko authored and Jan Beulich committed 2023-04-03 12:53:29 +02:00
1 parent 71efa7b868
commit 720ebfbad3
3 files changed
+30 -139
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

xen/arch/x86/Kconfig
+1
View File
@@ -11,6 +11,7 @@ config X86
select ARCH_MAP_DOMAIN_PAGE
select ARCH_SUPPORTS_INT128
imply CORE_PARKING
select GENERIC_BUG_FRAME
select HAS_ALTERNATIVE
select HAS_COMPAT
select HAS_CPUFREQ
xen/arch/x86/include/asm/bug.h
+21 -66
View File
@@ -1,75 +1,30 @@
#ifndef __X86_BUG_H__
#define __X86_BUG_H__
/*
* Please do not include in the header any header that might
* use BUG/ASSERT/etc maros asthey will be defined later after
* the return to <xen/bug.h> from the current header:
*
* <xen/bug.h>:
* ...
* <asm/bug.h>:
* ...
* <any_header_which_uses_BUG/ASSERT/etc macros.h>
* ...
* ...
* #define BUG() ...
* ...
* #define ASSERT() ...
* ...
*/
#ifndef __ASSEMBLY__
#define BUG_FRAME_STRUCT
#define BUG_DEBUGGER_TRAP_FATAL(regs) debugger_trap_fatal(X86_EXC_GP,regs)
struct bug_frame {
signed int loc_disp:BUG_DISP_WIDTH;
unsigned int line_hi:BUG_LINE_HI_WIDTH;
signed int ptr_disp:BUG_DISP_WIDTH;
unsigned int line_lo:BUG_LINE_LO_WIDTH;
signed int msg_disp[];
};
#define bug_loc(b) ((const void *)(b) + (b)->loc_disp)
#define bug_ptr(b) ((const void *)(b) + (b)->ptr_disp)
#define bug_line(b) (((((b)->line_hi + ((b)->loc_disp < 0)) & \
((1 << BUG_LINE_HI_WIDTH) - 1)) << \
BUG_LINE_LO_WIDTH) + \
(((b)->line_lo + ((b)->ptr_disp < 0)) & \
((1 << BUG_LINE_LO_WIDTH) - 1)))
#define bug_msg(b) ((const char *)(b) + (b)->msg_disp[1])
#define _ASM_BUGFRAME_TEXT(second_frame) \
".Lbug%=: ud2\n" \
".pushsection .bug_frames.%c[bf_type], \"a\", @progbits\n" \
".p2align 2\n" \
".Lfrm%=:\n" \
".long (.Lbug%= - .Lfrm%=) + %c[bf_line_hi]\n" \
".long (%c[bf_ptr] - .Lfrm%=) + %c[bf_line_lo]\n" \
".if " #second_frame "\n" \
".long 0, %c[bf_msg] - .Lfrm%=\n" \
".endif\n" \
".popsection\n" \
#define _ASM_BUGFRAME_INFO(type, line, ptr, msg) \
[bf_type] "i" (type), \
[bf_ptr] "i" (ptr), \
[bf_msg] "i" (msg), \
[bf_line_lo] "i" ((line & ((1 << BUG_LINE_LO_WIDTH) - 1)) \
<< BUG_DISP_WIDTH), \
[bf_line_hi] "i" (((line) >> BUG_LINE_LO_WIDTH) << BUG_DISP_WIDTH)
#define BUG_FRAME(type, line, ptr, second_frame, msg) do { \
BUILD_BUG_ON((line) >> (BUG_LINE_LO_WIDTH + BUG_LINE_HI_WIDTH)); \
BUILD_BUG_ON((type) >= BUGFRAME_NR); \
asm volatile ( _ASM_BUGFRAME_TEXT(second_frame) \
:: _ASM_BUGFRAME_INFO(type, line, ptr, msg) ); \
} while (0)
#define WARN() BUG_FRAME(BUGFRAME_warn, __LINE__, __FILE__, 0, NULL)
#define BUG() do { \
BUG_FRAME(BUGFRAME_bug, __LINE__, __FILE__, 0, NULL); \
unreachable(); \
} while (0)
/*
* TODO: untangle header dependences, break BUILD_BUG_ON() out of xen/lib.h,
* and use a real static inline here to get proper type checking of fn().
*/
#define run_in_exception_handler(fn) \
do { \
(void)((fn) == (void (*)(struct cpu_user_regs *))NULL); \
BUG_FRAME(BUGFRAME_run_fn, 0, fn, 0, NULL); \
} while ( 0 )
#define assert_failed(msg) do { \
BUG_FRAME(BUGFRAME_assert, __LINE__, __FILE__, 1, msg); \
unreachable(); \
} while (0)
#define BUG_INSTR "ud2"
#define BUG_ASM_CONST "c"
#else /* !__ASSEMBLY__ */
xen/arch/x86/traps.c
+8 -73
View File
@@ -24,6 +24,7 @@
* Gareth Hughes <gareth@valinux.com>, May 2000
*/
#include <xen/bug.h>
#include <xen/init.h>
#include <xen/sched.h>
#include <xen/lib.h>
@@ -1166,12 +1167,9 @@ void cpuid_hypervisor_leaves(const struct vcpu *v, uint32_t leaf,
void do_invalid_op(struct cpu_user_regs *regs)
{
const struct bug_frame *bug = NULL;
u8 bug_insn[2];
const char *prefix = "", *filename, *predicate, *eip = (char *)regs->rip;
unsigned long fixup;
int id = -1, lineno;
const struct virtual_region *region;
const void *eip = (const void *)regs->rip;
int id;
if ( likely(guest_mode(regs)) )
{
@@ -1185,83 +1183,20 @@ void do_invalid_op(struct cpu_user_regs *regs)
memcmp(bug_insn, "\xf\xb", sizeof(bug_insn)) )
goto die;
region = find_text_region(regs->rip);
if ( region )
{
for ( id = 0; id < BUGFRAME_NR; id++ )
{
const struct bug_frame *b;
unsigned int i;
for ( i = 0, b = region->frame[id].bugs;
i < region->frame[id].n_bugs; b++, i++ )
{
if ( bug_loc(b) == eip )
{
bug = b;
goto found;
}
}
}
}
found:
if ( !bug )
id = do_bug_frame(regs, regs->rip);
if ( id < 0 )
goto die;
eip += sizeof(bug_insn);
if ( id == BUGFRAME_run_fn )
{
void (*fn)(struct cpu_user_regs *) = bug_ptr(bug);
fn(regs);
fixup_exception_return(regs, (unsigned long)eip);
return;
}
/* WARN, BUG or ASSERT: decode the filename pointer and line number. */
filename = bug_ptr(bug);
if ( !is_kernel(filename) && !is_patch(filename) )
goto die;
fixup = strlen(filename);
if ( fixup > 50 )
{
filename += fixup - 47;
prefix = "...";
}
lineno = bug_line(bug);
switch ( id )
{
case BUGFRAME_run_fn:
case BUGFRAME_warn:
printk("Xen WARN at %s%s:%d\n", prefix, filename, lineno);
show_execution_state(regs);
fixup_exception_return(regs, (unsigned long)eip);
return;
case BUGFRAME_bug:
printk("Xen BUG at %s%s:%d\n", prefix, filename, lineno);
if ( debugger_trap_fatal(TRAP_invalid_op, regs) )
return;
show_execution_state(regs);
panic("Xen BUG at %s%s:%d\n", prefix, filename, lineno);
case BUGFRAME_assert:
/* ASSERT: decode the predicate string pointer. */
predicate = bug_msg(bug);
if ( !is_kernel(predicate) && !is_patch(predicate) )
predicate = "<unknown>";
printk("Assertion '%s' failed at %s%s:%d\n",
predicate, prefix, filename, lineno);
if ( debugger_trap_fatal(TRAP_invalid_op, regs) )
return;
show_execution_state(regs);
panic("Assertion '%s' failed at %s%s:%d\n",
predicate, prefix, filename, lineno);
return;
}
die:
Reference in new issue
xen-project/xen
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.

The note is not visible to the blocked user.