From nobody Sun May 5 17:21:14 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1678204254; cv=none; d=zohomail.com; s=zohoarc; b=bABcCoWse0kJJTgXq/W4yTw1A1iTbnB/UOB0BFWxtAop2NC0SvqqYeu80bDVgVvALMSb2exCCnE4s2S4XmBZdU17ezg/g0J7Iekglkw44rgfyfdepu7E3h/6g240x9eLE/pjeqs40ZgNRS4wOZTO9TV6Tw8NHB/Dr3Bp2gck+yM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678204254; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=QqaftkyDbqGGCRgUROzP3fpD9UFmNe6YDuSREpxzUWM=; b=mSipL9+taalTO/CgOY0in5oVQitKim7wyV1N5CxerCwhvqdx2vwpzRcEMsZ1hstVf1EpC2gxaGc7z4SSngu3rBGsxGroOzCk8CJSsFyL6AePFagrvrquyW8zW6YHaAi57qX3ouBE3S4JTCYKkzB+du7AZuW2QFA8c4dEs8rksMs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1678204254014480.49074239143783; Tue, 7 Mar 2023 07:50:54 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.507547.781199 (Exim 4.92) (envelope-from ) id 1pZZaH-00032T-1f; Tue, 07 Mar 2023 15:50:37 +0000 Received: by outflank-mailman (output) from mailman id 507547.781199; Tue, 07 Mar 2023 15:50:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pZZaG-00032C-UD; Tue, 07 Mar 2023 15:50:36 +0000 Received: by outflank-mailman (input) for mailman id 507547; Tue, 07 Mar 2023 15:50:35 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pZZaF-0002U3-Cl for xen-devel@lists.xenproject.org; Tue, 07 Mar 2023 15:50:35 +0000 Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [2a00:1450:4864:20::32f]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id cb36f466-bcff-11ed-a550-8520e6686977; Tue, 07 Mar 2023 16:50:33 +0100 (CET) Received: by mail-wm1-x32f.google.com with SMTP id j3so8090492wms.2 for ; Tue, 07 Mar 2023 07:50:33 -0800 (PST) Received: from fedora.. (46.204.108.143.nat.umts.dynamic.t-mobile.pl. [46.204.108.143]) by smtp.gmail.com with ESMTPSA id k7-20020a05600c080700b003e21ba8684dsm13450744wmp.26.2023.03.07.07.50.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Mar 2023 07:50:32 -0800 (PST) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: cb36f466-bcff-11ed-a550-8520e6686977 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678204232; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=QqaftkyDbqGGCRgUROzP3fpD9UFmNe6YDuSREpxzUWM=; b=C0VaV5jEOf4ZiomXEY+GsD2A/enFIf3+aUNyxdqbrzDOToSz7dXLUMN373/WWRo0/I OGBgMIcwyzsLfu40JjqnK1AEk1cjDhxCRYGMnwFE6snUKqQvxP5tNhFq9Ttp6C00GucM YQENDSpFchDvvqueVLbbgZIofb7RzDZex7LqNpVosuSlwdIEMMM4FAQ3vTqwL7KiXfa9 IKcmAm/NrOCmlcS29RfWQYbDBRaFp1Ml51BfiHyFWFrzKhTXdNM2acKkCvScCjpZ8Jwc h00M0RCeg1YUn9bkNx1phzkR5igbjvd1tk/limqEiWscTAWhgD3NdNkUZS6B41eTcQL9 IS0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678204232; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QqaftkyDbqGGCRgUROzP3fpD9UFmNe6YDuSREpxzUWM=; b=1TIVXWoD/qOjHZjIQOdw9UbwVX1P1kJolJFIUQLC7zZa2/sHm0J9wq8+2nLEUJGnSy mgsfmnWvkVIlpw4EMfAXi3s5O876HL1jZ7BsqhCXIAqucyvEtp/rc8DyUML3S1PkCAim z4givg9giJ6oPoOFGc4jGoJh3KAa3VX7qxItkElLNL/ymNwnNypbWI5V23H/oOE7HRT8 6WAu9t+hZhRnPlucdL2ndJOu9Fge4l0NOdnF3TU/xqaIkVB+X2Fh8NRtqmX2gnYN3zO5 D/cWmpsT/Qb1xPOruOL8z/Y5qJpRyMLyhUXj9ItQhjqrpG7WdqG4EdE617npAb2dBbz6 VuXw== X-Gm-Message-State: AO0yUKW4c9Tr/pe/aODpmCb8Euji2YhElmNIl0quUnrXoexbZztslW1c 5hp9EuN2L7stowkfbWng4jXECCAtKFs= X-Google-Smtp-Source: AK7set+c1Y3kFtvIlpqhp0X1nLCQ1yHXXbZRWy1Qh++6+62CBBKmqK80k4Tb3LVlF8pPf++CPht/Eg== X-Received: by 2002:a05:600c:a48:b0:3da:acb1:2f09 with SMTP id c8-20020a05600c0a4800b003daacb12f09mr13858619wmq.19.1678204232262; Tue, 07 Mar 2023 07:50:32 -0800 (PST) From: Oleksii Kurochko To: xen-devel@lists.xenproject.org Cc: Julien Grall , Jan Beulich , Andrew Cooper , Stefano Stabellini , Gianluca Guida , Oleksii Kurochko , George Dunlap , Wei Liu Subject: [PATCH v6 1/4] xen: introduce CONFIG_GENERIC_BUG_FRAME Date: Tue, 7 Mar 2023 17:50:23 +0200 Message-Id: <1e83d371581aee41a3369434c49b90c2fc478f1f.1678202233.git.oleksii.kurochko@gmail.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1678204255494100001 Content-Type: text/plain; charset="utf-8" A large part of the content of the bug.h is repeated among all architectures, so it was decided to create a new config CONFIG_GENERIC_BUG_FRAME. The version of from x86 was taken as the base version. The patch introduces the following stuff: * common bug.h header * generic implementation of do_bug_frame * new config CONFIG_GENERIC_BUG_FRAME Signed-off-by: Oleksii Kurochko --- Changes in V6: * fix code style. * change -EINVAL to -ENOENT in case when bug_frame wasn't found in generic do_bug_frame() * change all 'return id' to 'break' inside switch/case of generic do_bug_f= rame() * move up "#ifndef __ASSEMBLY__" to include BUG_DEBUGGER_TRAP_FATAL * update the comment of BUG_ASM_CONST * make the line with 'BUILD_BUG_ON((line) >> (BUG_LINE_LO_WIDTH + BUG_LINE= _HI_WIDTH))' in BUG_FRAME macros more abstract * remove #ifndef BUG_FRAME_STRUCT around BUG_DISP_WIDTH, BUG_LINE_LO_WIDTH= as it is required to be defined before as it is used by x86's when the header is included in assembly code. --- Changes in V5: * Remove "#ifdef BUG_FN_REG..." from generic do_bug_frame() as ARM will use generic implementation fully. --- Changes in V4: * common/bug.c: - Use BUG_DEBUGGER_TRAP_FATAL(regs) mnacros instead of debugger_trap_fata= l(TRAP_invalid_op, regs) in as TRAP_invalid_op is x86-specific thereby BUG_DEBUGG= ER_TRAP_FATAL should be defined for each architecture. - add information about what do_bug_frame() returns. - invert the condition 'if ( region )' in do_bug_frame() to reduce the in= dention. - change type of variable i from 'unsigned int' to 'size_t' as it is com= pared with n_bugs which has type 'size_t' * xen/bug.h: - Introduce generic BUG_DEBUGGER_TRAP_FATAL(regs) mnacros which is used t= o deal with=20 debugger_trap_fatal(TRAP_invalid_op, regs) where TRAP_invalid_op is x86= -specific - remove '#include ' as it doesn't need any more after s= witch to x86 implementation. - remove '#include ' as it isn't needed any more - move bug_*() macros inside '#ifndef BUG_FRAME_STRUCT' - add to fix compile issue with BUILD_ON()... - Add documentation for BUG_ASM_CONST. * Update the commit message --- Changes in V3: * Add debugger_trap_fatal() to do_bug_frame(). It simplifies usage of do_bug_frame() for x86 so making handle_bug_frame() and find_bug_frame() not needed anymore. * Update do_bug_frame() to return -EINVAL if something goes wrong; otherwi= se id of bug_frame * Update _ASM_BUGFRAME_TEXT to make it more portable. * Drop unnecessary comments. * define stub value for TRAP_invalid_op in case if wasn't defined in arch-specific folders. --- Changes in V2: - Switch to x86 implementation as generic as it is more compact ( at least from the point of view of bug frame structure ). - Rename CONFIG_GENERIC_DO_BUG_FRAME to CONFIG_GENERIC_BUG_FRAME. - Change the macro bug_loc(b) to avoid the need for a cast: #define bug_loc(b) ((unsigned long)(b) + (b)->loc_disp) - Rename BUG_FRAME_STUFF to BUG_FRAME_STRUCT - Make macros related to bug frame structure more generic. - Introduce BUG_INSTR and MODIFIER to make _ASM_BUGFRAME_TEXT reusable between x86 and RISC-V. - Rework do_bug_frame() and introduce find_bug_frame() and handle_bug_fra= me() functions to make it reusable by x86. - code style fixes --- xen/common/Kconfig | 3 + xen/common/Makefile | 1 + xen/common/bug.c | 104 +++++++++++++++++++++++++++ xen/include/xen/bug.h | 158 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 266 insertions(+) create mode 100644 xen/common/bug.c create mode 100644 xen/include/xen/bug.h diff --git a/xen/common/Kconfig b/xen/common/Kconfig index f1ea3199c8..b226323537 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -28,6 +28,9 @@ config ALTERNATIVE_CALL config ARCH_MAP_DOMAIN_PAGE bool =20 +config GENERIC_BUG_FRAME + bool + config HAS_ALTERNATIVE bool =20 diff --git a/xen/common/Makefile b/xen/common/Makefile index bbd75b4be6..46049eac35 100644 --- a/xen/common/Makefile +++ b/xen/common/Makefile @@ -1,5 +1,6 @@ obj-$(CONFIG_ARGO) +=3D argo.o obj-y +=3D bitmap.o +obj-$(CONFIG_GENERIC_BUG_FRAME) +=3D bug.o obj-$(CONFIG_HYPFS_CONFIG) +=3D config_data.o obj-$(CONFIG_CORE_PARKING) +=3D core_parking.o obj-y +=3D cpu.o diff --git a/xen/common/bug.c b/xen/common/bug.c new file mode 100644 index 0000000000..be8f3b783d --- /dev/null +++ b/xen/common/bug.c @@ -0,0 +1,104 @@ +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +/* + * Returns a negative value in case of an error otherwise + * BUGFRAME_{run_fn, warn, bug, assert} + */ +int do_bug_frame(struct cpu_user_regs *regs, unsigned long pc) +{ + const struct bug_frame *bug =3D NULL; + const struct virtual_region *region; + const char *prefix =3D "", *filename, *predicate; + unsigned long fixup; + unsigned int id =3D BUGFRAME_NR, lineno; + + region =3D find_text_region(pc); + if ( !region ) + return -EINVAL; + + for ( id =3D 0; id < BUGFRAME_NR; id++ ) + { + const struct bug_frame *b; + size_t i; + + for ( i =3D 0, b =3D region->frame[id].bugs; + i < region->frame[id].n_bugs; b++, i++ ) + { + if ( bug_loc(b) =3D=3D pc ) + { + bug =3D b; + goto found; + } + } + } + + found: + if ( !bug ) + return -ENOENT; + + if ( id =3D=3D BUGFRAME_run_fn ) + { + void (*fn)(const struct cpu_user_regs *) =3D bug_ptr(bug); + + fn(regs); + + return id; + } + + /* WARN, BUG or ASSERT: decode the filename pointer and line number. */ + filename =3D bug_ptr(bug); + if ( !is_kernel(filename) && !is_patch(filename) ) + return -EINVAL; + fixup =3D strlen(filename); + if ( fixup > 50 ) + { + filename +=3D fixup - 47; + prefix =3D "..."; + } + lineno =3D bug_line(bug); + + switch ( id ) + { + case BUGFRAME_warn: + printk("Xen WARN at %s%s:%d\n", prefix, filename, lineno); + show_execution_state(regs); + + break; + + case BUGFRAME_bug: + printk("Xen BUG at %s%s:%d\n", prefix, filename, lineno); + + if ( BUG_DEBUGGER_TRAP_FATAL(regs) ) + break; + + 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 =3D bug_msg(bug); + if ( !is_kernel(predicate) && !is_patch(predicate) ) + predicate =3D ""; + + printk("Assertion '%s' failed at %s%s:%d\n", + predicate, prefix, filename, lineno); + + if ( BUG_DEBUGGER_TRAP_FATAL(regs) ) + break; + + show_execution_state(regs); + panic("Assertion '%s' failed at %s%s:%d\n", + predicate, prefix, filename, lineno); + } + + return id; +} diff --git a/xen/include/xen/bug.h b/xen/include/xen/bug.h new file mode 100644 index 0000000000..de793f324d --- /dev/null +++ b/xen/include/xen/bug.h @@ -0,0 +1,158 @@ +#ifndef __XEN_BUG_H__ +#define __XEN_BUG_H__ + +#define BUGFRAME_run_fn 0 +#define BUGFRAME_warn 1 +#define BUGFRAME_bug 2 +#define BUGFRAME_assert 3 + +#define BUGFRAME_NR 4 + +#define BUG_DISP_WIDTH 24 +#define BUG_LINE_LO_WIDTH (31 - BUG_DISP_WIDTH) +#define BUG_LINE_HI_WIDTH (31 - BUG_DISP_WIDTH) + +#include + +#ifndef __ASSEMBLY__ + +#ifndef BUG_DEBUGGER_TRAP_FATAL +#define BUG_DEBUGGER_TRAP_FATAL(regs) 0 +#endif + +#include + +#ifndef BUG_FRAME_STRUCT + +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) ((unsigned long)(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]) + +#endif /* BUG_FRAME_STRUCT */ + +/* + * Some architectures mark immediate instruction operands in a special way. + * In such cases the special marking may need omitting when specifying + * directive operands. Allow architectures to specify a suitable + * modifier. + */ +#ifndef BUG_ASM_CONST +#define BUG_ASM_CONST "" +#endif + +#ifndef _ASM_BUGFRAME_TEXT + +#define _ASM_BUGFRAME_TEXT(second_frame) = \ + ".Lbug%=3D:"BUG_INSTR"\n" = \ + " .pushsection .bug_frames.%"BUG_ASM_CONST"[bf_type], \"a\", %%progb= its\n" \ + " .p2align 2\n" = \ + ".Lfrm%=3D:\n" = \ + " .long (.Lbug%=3D - .Lfrm%=3D) + %"BUG_ASM_CONST"[bf_line_hi]\n" = \ + " .long (%"BUG_ASM_CONST"[bf_ptr] - .Lfrm%=3D) + %"BUG_ASM_CONST"[bf= _line_lo]\n"\ + " .if " #second_frame "\n" = \ + " .long 0, %"BUG_ASM_CONST"[bf_msg] - .Lfrm%=3D\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) + +#endif /* _ASM_BUGFRAME_TEXT */ + +#ifndef BUILD_BUG_ON_LINE_WIDTH +#define BUILD_BUG_ON_LINE_WIDTH(line) \ + BUILD_BUG_ON((line) >> (BUG_LINE_LO_WIDTH + BUG_LINE_HI_WIDTH)) +#endif + +#ifndef BUG_FRAME + +#define BUG_FRAME(type, line, ptr, second_frame, msg) do { = \ + BUILD_BUG_ON_LINE_WIDTH(line); = \ + BUILD_BUG_ON((type) >=3D BUGFRAME_NR); = \ + asm volatile ( _ASM_BUGFRAME_TEXT(second_frame) = \ + :: _ASM_BUGFRAME_INFO(type, line, ptr, msg) ); = \ +} while (false) + +#endif + +#ifndef run_in_exception_handler + +/* + * 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) =3D=3D (void (*)(struct cpu_user_regs *))NULL); \ + BUG_FRAME(BUGFRAME_run_fn, 0, fn, 0, NULL); \ +} while ( false ) + +#endif /* run_in_exception_handler */ + +#ifndef WARN +#define WARN() BUG_FRAME(BUGFRAME_warn, __LINE__, __FILE__, 0, NULL) +#endif + +#ifndef BUG +#define BUG() do { \ + BUG_FRAME(BUGFRAME_bug, __LINE__, __FILE__, 0, NULL); \ + unreachable(); \ +} while (false) +#endif + +#ifndef assert_failed +#define assert_failed(msg) do { \ + BUG_FRAME(BUGFRAME_assert, __LINE__, __FILE__, 1, msg); \ + unreachable(); \ +} while (false) +#endif + +#ifdef CONFIG_GENERIC_BUG_FRAME + +struct cpu_user_regs; + +/* + * Returns a negative value in case of an error otherwise + * BUGFRAME_{run_fn, warn, bug, assert} + */ +int do_bug_frame(struct cpu_user_regs *regs, unsigned long pc); + +#endif /* CONFIG_GENERIC_BUG_FRAME */ + +extern const struct bug_frame __start_bug_frames[], + __stop_bug_frames_0[], + __stop_bug_frames_1[], + __stop_bug_frames_2[], + __stop_bug_frames_3[]; + +#endif /* !__ASSEMBLY__ */ + +#endif /* __XEN_BUG_H__ */ +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ --=20 2.39.0 From nobody Sun May 5 17:21:14 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1678204258; cv=none; d=zohomail.com; s=zohoarc; b=lDJ/r3yCweBOmopfP6Hjy8MekDykOss2mhHGFQOBYG+Jrfb6/cf1lbRYeO8nLfy6igtAi4IdZPksRkrL7HTNHhvpSwJ4wAoPe3s88rS4rboO1wzWLWt5lFZpakR+W13n4PCZhjN9U7S4wtHkS1IokjsDMLWAAQE5fBt8dNECE0Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678204258; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=vdAbCYBuyKjn949EJzxdCxEuOobxphs23ThoiGVDWyI=; b=bJzyXZYUzSfZQ1U5BgZTbj7SgxtKvAz5klYqvcai/52VnMlaWeasTqgNsUhlUBOq9JD4qc5aAElp3/10oOFFy8g2zXMsboiGUEVByf2pPjPKNFH2/EcaOjKLAWw91FJ0ygsNdD6VjwICKaBPWe1wgdCCCt/rZ+C7einfRmLNuCU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1678204258500436.66184991253806; Tue, 7 Mar 2023 07:50:58 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.507548.781204 (Exim 4.92) (envelope-from ) id 1pZZaH-00036C-Ff; Tue, 07 Mar 2023 15:50:37 +0000 Received: by outflank-mailman (output) from mailman id 507548.781204; Tue, 07 Mar 2023 15:50:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pZZaH-00035G-7I; Tue, 07 Mar 2023 15:50:37 +0000 Received: by outflank-mailman (input) for mailman id 507548; Tue, 07 Mar 2023 15:50:36 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pZZaF-0002jw-Si for xen-devel@lists.xenproject.org; Tue, 07 Mar 2023 15:50:36 +0000 Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [2a00:1450:4864:20::332]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id cc2aa390-bcff-11ed-96b5-2f268f93b82a; Tue, 07 Mar 2023 16:50:34 +0100 (CET) Received: by mail-wm1-x332.google.com with SMTP id j19-20020a05600c191300b003eb3e1eb0caso10716571wmq.1 for ; Tue, 07 Mar 2023 07:50:34 -0800 (PST) Received: from fedora.. (46.204.108.143.nat.umts.dynamic.t-mobile.pl. [46.204.108.143]) by smtp.gmail.com with ESMTPSA id k7-20020a05600c080700b003e21ba8684dsm13450744wmp.26.2023.03.07.07.50.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Mar 2023 07:50:33 -0800 (PST) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: cc2aa390-bcff-11ed-96b5-2f268f93b82a DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678204234; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=vdAbCYBuyKjn949EJzxdCxEuOobxphs23ThoiGVDWyI=; b=qRy8dMZ73mI7bvlMUMK1KbaHimifCeZ+TGJojUbvRHbMseaspWUjox77UD07qEkxul 1lWy1ea5A9ntIROf7kMj3Rl2yprEaN7M1sDFeUg2mOX78ejv385LjCfzATlg6aKc2YXb OBrEOPIdhH4OQyvjKgecaYUPqN8ESV8PpNGrS68lwp7DxLd+XAzs/kN80NF/zSFxyoks 88Tec8H+ULBthmGVSd0+NwgrHhKD/S3xOGMJuVxF/WJLDvERx6tAw8v1jBixgrUf00Jw nKuwgkyDB8lA0dpwvKdRNiT7ewT03da66c6cjwOQZgcLI0M7SU/V8BZAytuV2DEIZt8i yAGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678204234; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vdAbCYBuyKjn949EJzxdCxEuOobxphs23ThoiGVDWyI=; b=j2wqqP7b7+5imH1DB5m5LCSEnLKlrtlo3Q4yCMOU0hxA7FcLt/RIleIc6rR1Slw3bU X+5KGuF8UHZFXelo/gwCgGE0kxwz3XUKje8cBI7KB2z6bZ7s2NHmY8ZZSwx6424IF/bm xfkOA8ZZs4jROut9MbY7tB8v0DDvCcimGSN51zwksYTg++KVfioTewvDtg9PLGh0rIym L2GhSMiuNh97FIbUgAawr6ZQP+/adMVpBgHuw/H9k6kPQwNjUExdZZSNUecc6tE5isNq Uepql1D1q5ML24IGDoTBFhZ/K+i1Wi1Hwxe29NEvfsHdgMhqRy6LeqFCG3U2uF0rUtCi w/NQ== X-Gm-Message-State: AO0yUKUn1W4R5BDq6TlxYlgx0kAYUgN2Aeg79dHOdZ4xm/lcizsjBVQc W3FQCFw8EvPE1AyJwwwZRxXKzkIBlfY= X-Google-Smtp-Source: AK7set9ojmXXdl1g77F/MlLkraj3E5pit7HljWz8wg/mHRidKezK2J+rD9ZrW/GNz1nsfbGl605mgQ== X-Received: by 2002:a05:600c:1c1f:b0:3eb:246d:7efd with SMTP id j31-20020a05600c1c1f00b003eb246d7efdmr12778524wms.2.1678204233866; Tue, 07 Mar 2023 07:50:33 -0800 (PST) From: Oleksii Kurochko To: xen-devel@lists.xenproject.org Cc: Julien Grall , Jan Beulich , Andrew Cooper , Stefano Stabellini , Gianluca Guida , Oleksii Kurochko , Bertrand Marquis , Volodymyr Babchuk , George Dunlap , Wei Liu , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= Subject: [PATCH v6 2/4] xen: change to Date: Tue, 7 Mar 2023 17:50:24 +0200 Message-Id: X-Mailer: git-send-email 2.39.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1678204259206100005 Content-Type: text/plain; charset="utf-8" The idea of the patch is to change all to and keep Xen compilable with adding only minimal amount of changes: 1. It was added "#include " to ARM's "" as it uses uint_{16,32}t in 'struct bug_frame'. 2. It was added '#define BUG_FRAME_STRUCT' which means that ARM hasn't been switched to generic implementation yet. 3. It was added '#define BUG_FRAME_STRUCT' which means that x86 hasn't been switched to generic implementation yet. 4. BUGFRAME_* and _start_bug_frame[], _stop_bug_frame_*[] were removed for ARM & x86 to deal with compilation errors such as: redundant redeclaration of ... 5. It was added undef of BUG_DISP_WIDTH, BUG_LINE_LO_WIDTH for ARM & x86 as they were introduced unconditionally in . The macros should be defined before in as x86's implementation requires them in case when the header is included in assembly code. The macros will be deleted in the following patches where the architectures will be switched fully to generic implementation. In the following two patches x86 and ARM archictectures will be switched fully: * xen/arm: switch ARM to use generic implementation of bug.h * xen/x86: switch x86 to use generic implemetation of bug.h Signed-off-by: Oleksii Kurochko Reviewed-by: Jan Beulich --- Changes in V6: - change the inclusion order of . - add #undef of BUG_DISP_WIDTH, BUG_LINE_LO_WIDTH for ARM & x86 as they were introduced unconditionally in . - update the commit message --- Changes in V5: - Nothing changed --- Changes in V4: - defines BUG_DISP_WIDTH, BUG_LINE_LO_WIDTH, BUG_LINE_HI_WIDTH were moved = into "ifndef BUG_FRAME_STRUCT" in as they are specific for 'struc= t bug_frame' and so should co-exist together. So the defines were back to until BUG_FRA= ME_STRUCT will be defined in . - Update the comment message. --- Changes in V3: * Update patch 2 not to break compilation: move some parts from patches 3 = and 4 to patch 2: * move some generic parts from to * add define BUG_FRAME_STRUCT in ARM's --- Changes in V2: * Put [PATCH v1 4/4] xen: change to as second patc= h, update the patch to change all to among the whol= e project to not break build. * Update the commit message. --- xen/arch/arm/include/asm/bug.h | 21 ++++++++------------- xen/arch/arm/include/asm/div64.h | 2 +- xen/arch/arm/vgic/vgic-v2.c | 2 +- xen/arch/arm/vgic/vgic.c | 2 +- xen/arch/x86/acpi/cpufreq/cpufreq.c | 2 +- xen/arch/x86/include/asm/asm_defns.h | 2 +- xen/arch/x86/include/asm/bug.h | 19 ++++++------------- xen/drivers/cpufreq/cpufreq.c | 2 +- xen/include/xen/lib.h | 2 +- 9 files changed, 21 insertions(+), 33 deletions(-) diff --git a/xen/arch/arm/include/asm/bug.h b/xen/arch/arm/include/asm/bug.h index f4088d0913..9ed9412fa8 100644 --- a/xen/arch/arm/include/asm/bug.h +++ b/xen/arch/arm/include/asm/bug.h @@ -1,6 +1,8 @@ #ifndef __ARM_BUG_H__ #define __ARM_BUG_H__ =20 +#include + #if defined(CONFIG_ARM_32) # include #elif defined(CONFIG_ARM_64) @@ -9,10 +11,16 @@ # error "unknown ARM variant" #endif =20 +#undef BUG_DISP_WIDTH +#undef BUG_LINE_LO_WIDTH +#undef BUG_LINE_HI_WIDTH + #define BUG_DISP_WIDTH 24 #define BUG_LINE_LO_WIDTH (31 - BUG_DISP_WIDTH) #define BUG_LINE_HI_WIDTH (31 - BUG_DISP_WIDTH) =20 +#define BUG_FRAME_STRUCT + struct bug_frame { signed int loc_disp; /* Relative address to the bug address */ signed int file_disp; /* Relative address to the filename */ @@ -26,13 +34,6 @@ struct bug_frame { #define bug_line(b) ((b)->line) #define bug_msg(b) ((const char *)(b) + (b)->msg_disp) =20 -#define BUGFRAME_run_fn 0 -#define BUGFRAME_warn 1 -#define BUGFRAME_bug 2 -#define BUGFRAME_assert 3 - -#define BUGFRAME_NR 4 - /* Many versions of GCC doesn't support the asm %c parameter which would * be preferable to this unpleasantness. We use mergeable string * sections to avoid multiple copies of the string appearing in the @@ -89,12 +90,6 @@ struct bug_frame { unreachable(); \ } while (0) =20 -extern const struct bug_frame __start_bug_frames[], - __stop_bug_frames_0[], - __stop_bug_frames_1[], - __stop_bug_frames_2[], - __stop_bug_frames_3[]; - #endif /* __ARM_BUG_H__ */ /* * Local variables: diff --git a/xen/arch/arm/include/asm/div64.h b/xen/arch/arm/include/asm/di= v64.h index 1cd58bc51a..fc667a80f9 100644 --- a/xen/arch/arm/include/asm/div64.h +++ b/xen/arch/arm/include/asm/div64.h @@ -74,7 +74,7 @@ =20 #elif __GNUC__ >=3D 4 =20 -#include +#include =20 /* * If the divisor happens to be constant, we determine the appropriate diff --git a/xen/arch/arm/vgic/vgic-v2.c b/xen/arch/arm/vgic/vgic-v2.c index 1a99d3a8b4..c90e88fddb 100644 --- a/xen/arch/arm/vgic/vgic-v2.c +++ b/xen/arch/arm/vgic/vgic-v2.c @@ -16,8 +16,8 @@ */ =20 #include -#include #include +#include #include #include =20 diff --git a/xen/arch/arm/vgic/vgic.c b/xen/arch/arm/vgic/vgic.c index f0f2ea5021..b9463a5f27 100644 --- a/xen/arch/arm/vgic/vgic.c +++ b/xen/arch/arm/vgic/vgic.c @@ -15,9 +15,9 @@ * along with this program. If not, see . */ =20 +#include #include #include -#include #include #include =20 diff --git a/xen/arch/x86/acpi/cpufreq/cpufreq.c b/xen/arch/x86/acpi/cpufre= q/cpufreq.c index c27cbb2304..18ff2a443b 100644 --- a/xen/arch/x86/acpi/cpufreq/cpufreq.c +++ b/xen/arch/x86/acpi/cpufreq/cpufreq.c @@ -27,6 +27,7 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~= ~~~ */ =20 +#include #include #include #include @@ -35,7 +36,6 @@ #include #include #include -#include #include #include #include diff --git a/xen/arch/x86/include/asm/asm_defns.h b/xen/arch/x86/include/as= m/asm_defns.h index d9431180cf..baaaccb26e 100644 --- a/xen/arch/x86/include/asm/asm_defns.h +++ b/xen/arch/x86/include/asm/asm_defns.h @@ -6,8 +6,8 @@ /* NB. Auto-generated from arch/.../asm-offsets.c */ #include #endif -#include #include +#include #include #include #include diff --git a/xen/arch/x86/include/asm/bug.h b/xen/arch/x86/include/asm/bug.h index b7265bdfbe..ff5cca1f19 100644 --- a/xen/arch/x86/include/asm/bug.h +++ b/xen/arch/x86/include/asm/bug.h @@ -1,19 +1,18 @@ #ifndef __X86_BUG_H__ #define __X86_BUG_H__ =20 +#undef BUG_DISP_WIDTH +#undef BUG_LINE_LO_WIDTH +#undef BUG_LINE_HI_WIDTH + #define BUG_DISP_WIDTH 24 #define BUG_LINE_LO_WIDTH (31 - BUG_DISP_WIDTH) #define BUG_LINE_HI_WIDTH (31 - BUG_DISP_WIDTH) =20 -#define BUGFRAME_run_fn 0 -#define BUGFRAME_warn 1 -#define BUGFRAME_bug 2 -#define BUGFRAME_assert 3 - -#define BUGFRAME_NR 4 - #ifndef __ASSEMBLY__ =20 +#define BUG_FRAME_STRUCT + struct bug_frame { signed int loc_disp:BUG_DISP_WIDTH; unsigned int line_hi:BUG_LINE_HI_WIDTH; @@ -80,12 +79,6 @@ struct bug_frame { unreachable(); \ } while (0) =20 -extern const struct bug_frame __start_bug_frames[], - __stop_bug_frames_0[], - __stop_bug_frames_1[], - __stop_bug_frames_2[], - __stop_bug_frames_3[]; - #else /* !__ASSEMBLY__ */ =20 /* diff --git a/xen/drivers/cpufreq/cpufreq.c b/xen/drivers/cpufreq/cpufreq.c index a94520ee57..354f78580b 100644 --- a/xen/drivers/cpufreq/cpufreq.c +++ b/xen/drivers/cpufreq/cpufreq.c @@ -26,6 +26,7 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~= ~~~ */ =20 +#include #include #include #include @@ -39,7 +40,6 @@ #include #include #include -#include #include #include =20 diff --git a/xen/include/xen/lib.h b/xen/include/xen/lib.h index 05ee1e18af..e914ccade0 100644 --- a/xen/include/xen/lib.h +++ b/xen/include/xen/lib.h @@ -24,12 +24,12 @@ =20 #ifndef __ASSEMBLY__ =20 +#include #include #include #include #include #include -#include =20 #define BUG_ON(p) do { if (unlikely(p)) BUG(); } while (0) #define WARN_ON(p) ({ \ --=20 2.39.0 From nobody Sun May 5 17:21:14 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1678204258; cv=none; d=zohomail.com; s=zohoarc; b=F9AzFrAPe97sc2a9THLwiXgxSyyZm2c9+1OP7L2gAYqkMxbqHQXadXxngZZh52PiqB7ND08rinC/S3PPqU/mXFfqgrkF6kLIi8wSjI6UIOEDMaXVzAwCuz8nqTD0o++1PoyKy23hzIircRhcYJKllqM8Gvf8yqWkLm+cWJPCw3A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678204258; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=SWqdQEuZGkwgk77gBfBAgiVpyDMuAYJ3EMjUebqsVl0=; b=ZOHPnLt2DZofg57saXSs9NBtXYkd33dVtLL/XeKZXfpXyclN537fAipfKSG7K6ajKbXxEXcu+FQJfqQRT4qOVIRwud6d2XOkudNaCtnsSZuHAEeEGgivq6jtCcbvwh975AwUqWOc5suGPjIXYUXITFf6IkWSTn9VDE9ZXwrat8M= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1678204258914364.63081041321493; Tue, 7 Mar 2023 07:50:58 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.507549.781212 (Exim 4.92) (envelope-from ) id 1pZZaI-0003KH-3q; Tue, 07 Mar 2023 15:50:38 +0000 Received: by outflank-mailman (output) from mailman id 507549.781212; Tue, 07 Mar 2023 15:50:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pZZaH-0003J9-Vd; Tue, 07 Mar 2023 15:50:37 +0000 Received: by outflank-mailman (input) for mailman id 507549; Tue, 07 Mar 2023 15:50:37 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pZZaH-0002jw-0Q for xen-devel@lists.xenproject.org; Tue, 07 Mar 2023 15:50:37 +0000 Received: from mail-wm1-x32d.google.com (mail-wm1-x32d.google.com [2a00:1450:4864:20::32d]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id ccf00929-bcff-11ed-96b5-2f268f93b82a; Tue, 07 Mar 2023 16:50:36 +0100 (CET) Received: by mail-wm1-x32d.google.com with SMTP id k37so8116145wms.0 for ; Tue, 07 Mar 2023 07:50:36 -0800 (PST) Received: from fedora.. (46.204.108.143.nat.umts.dynamic.t-mobile.pl. [46.204.108.143]) by smtp.gmail.com with ESMTPSA id k7-20020a05600c080700b003e21ba8684dsm13450744wmp.26.2023.03.07.07.50.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Mar 2023 07:50:35 -0800 (PST) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: ccf00929-bcff-11ed-96b5-2f268f93b82a DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678204235; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=SWqdQEuZGkwgk77gBfBAgiVpyDMuAYJ3EMjUebqsVl0=; b=KEFplGAQHHmsG7c5UY7c5KJ8lcJhLL/CCC5i5b7SP7JmR9OANtZmvatkwdzNZzFuYN I2s9MQErdpnx/RFW4C8pRhE3vh4kQTsf8ujrMpJqMoEiELtl1kPKXjhcmfV5SJuPXv72 eQcCYRG7PpbXbSnWLbnjkuyHv/XrSWO729/XDLRr2TY0P2ZRm9UNf505+y7IXB+HI2bj tFnRMH9sbeeZXG5AysLStiTDl4R5CiofImfgGRprJUrQ/z/0oJdj1f9pMxEPfGkbVUTo CLYFfqGx6ILjDOmyvTVlMN+PwSzG4C6MjK/sz60QxfioMLpiPOA6vY9Pp+5/UvPSEbdW 4tPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678204235; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SWqdQEuZGkwgk77gBfBAgiVpyDMuAYJ3EMjUebqsVl0=; b=5RkpIJRvAoZpaoE12DMr2Qsv1MRJMtNceZiRnrF60AF14uGf0FDTErtn4vnxdqTJMd Qbg1saxu44WTH3nOx9VYiMkngYIifqhd86YDOmVlQkFHJvxhcqKwuDPXg+0AptQrQQAE rqTt0+vCdthe86Q9LH1utSiJCETl+z9nsLH893YvQevRK0yxGq/qkf4Z8TaQ3Ai1SgzP q3+L3PXBoMCSHV8aVqyz+T/FHW/D0RhSMnZzb/nSeE2yE5KBqixmizWOaOXl7UPL9wqL b0rEaXjSIvqqcL049XZy0Xl73vnZHE4hrOVxVMTXKFp4EmteCkIOpP4CykwBSyat1f4U BMcA== X-Gm-Message-State: AO0yUKXQp0NpmPtyolocB4sltNVNe38lzP7SrVl6tkW+sPUZZoj4rL62 oKD1aou+2AUyJr7/fiSQ5NSn3Nej59A= X-Google-Smtp-Source: AK7set+IbHo2UCPmw7yChOvhmMhVevD/HZTio2gFBTz2lfKjPcka0xaDcZXdIzZgJN6tzXlRk4Wz+A== X-Received: by 2002:a05:600c:4f96:b0:3eb:29fe:7b9b with SMTP id n22-20020a05600c4f9600b003eb29fe7b9bmr12875778wmq.9.1678204235318; Tue, 07 Mar 2023 07:50:35 -0800 (PST) From: Oleksii Kurochko To: xen-devel@lists.xenproject.org Cc: Julien Grall , Jan Beulich , Andrew Cooper , Stefano Stabellini , Gianluca Guida , Oleksii Kurochko , Bertrand Marquis , Volodymyr Babchuk Subject: [PATCH v6 3/4] xen/arm: switch ARM to use generic implementation of bug.h Date: Tue, 7 Mar 2023 17:50:25 +0200 Message-Id: <7b4a2ad3267a6cd01c41f4d1a86f6fb867689a82.1678202233.git.oleksii.kurochko@gmail.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1678204259244100006 Content-Type: text/plain; charset="utf-8" The following changes were made: * make GENERIC_BUG_FRAME mandatory for ARM * As do_bug_frame() returns -EINVAL in case something goes wrong otherwise id of bug frame. Thereby 'if' cases where do_bug_frame() was updated to check if the returned value is less than 0 * Switch ARM's implementation of bug.h macros to generic one Signed-off-by: Oleksii Kurochko --- Changes in V6: * Update the "changes in v5" * Rebase on top of the patch [xen: introduce CONFIG_GENERIC_BUG_FRAME] as there were minor changes. --- Changes in V5: * common/bug.c changes were removed after rebase (the patch [xen: introduce CONFIG_GENERIC_BUG_FRAME] was reworked to make ARM implementation to use generic do_bug_frame()) --- Changes in V4: * Switch ARM implementation to generic one * Remove BUG_FN_REG from arm{16,32}/bug.h as it isn't needed after switch = to generic implementation * Update commit message --- Changes in V3: * As prototype and what do_bug_frame() returns was changed so patch 3 and 4 was updated to use a new version of do_bug_frame --- Changes in V2: * Rename bug_file() in ARM implementation to bug_ptr() as generic do_bug_frame() uses bug_ptr(). * Remove generic parts from bug.h * Remove declaration of 'int do_bug_frame(...)' from as it was introduced in --- xen/arch/arm/Kconfig | 1 + xen/arch/arm/arm32/traps.c | 2 +- xen/arch/arm/include/asm/arm32/bug.h | 2 - xen/arch/arm/include/asm/arm64/bug.h | 2 - xen/arch/arm/include/asm/bug.h | 79 +-------------------------- xen/arch/arm/include/asm/traps.h | 2 - xen/arch/arm/traps.c | 81 +--------------------------- 7 files changed, 4 insertions(+), 165 deletions(-) diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig index 239d3aed3c..aad6644a7b 100644 --- a/xen/arch/arm/Kconfig +++ b/xen/arch/arm/Kconfig @@ -12,6 +12,7 @@ config ARM_64 =20 config ARM def_bool y + select GENERIC_BUG_FRAME select HAS_ALTERNATIVE select HAS_DEVICE_TREE select HAS_PASSTHROUGH diff --git a/xen/arch/arm/arm32/traps.c b/xen/arch/arm/arm32/traps.c index a2fc1c22cb..61c61132c7 100644 --- a/xen/arch/arm/arm32/traps.c +++ b/xen/arch/arm/arm32/traps.c @@ -48,7 +48,7 @@ void do_trap_undefined_instruction(struct cpu_user_regs *= regs) if ( instr !=3D BUG_OPCODE ) goto die; =20 - if ( do_bug_frame(regs, pc) ) + if ( do_bug_frame(regs, pc) < 0 ) goto die; =20 regs->pc +=3D 4; diff --git a/xen/arch/arm/include/asm/arm32/bug.h b/xen/arch/arm/include/as= m/arm32/bug.h index 25cce151dc..3e66f35969 100644 --- a/xen/arch/arm/include/asm/arm32/bug.h +++ b/xen/arch/arm/include/asm/arm32/bug.h @@ -10,6 +10,4 @@ =20 #define BUG_INSTR ".word " __stringify(BUG_OPCODE) =20 -#define BUG_FN_REG r0 - #endif /* __ARM_ARM32_BUG_H__ */ diff --git a/xen/arch/arm/include/asm/arm64/bug.h b/xen/arch/arm/include/as= m/arm64/bug.h index 5e11c0dfd5..59f664d7de 100644 --- a/xen/arch/arm/include/asm/arm64/bug.h +++ b/xen/arch/arm/include/asm/arm64/bug.h @@ -6,6 +6,4 @@ =20 #define BUG_INSTR "brk " __stringify(BRK_BUG_FRAME_IMM) =20 -#define BUG_FN_REG x0 - #endif /* __ARM_ARM64_BUG_H__ */ diff --git a/xen/arch/arm/include/asm/bug.h b/xen/arch/arm/include/asm/bug.h index 9ed9412fa8..1d87533044 100644 --- a/xen/arch/arm/include/asm/bug.h +++ b/xen/arch/arm/include/asm/bug.h @@ -11,84 +11,7 @@ # error "unknown ARM variant" #endif =20 -#undef BUG_DISP_WIDTH -#undef BUG_LINE_LO_WIDTH -#undef BUG_LINE_HI_WIDTH - -#define BUG_DISP_WIDTH 24 -#define BUG_LINE_LO_WIDTH (31 - BUG_DISP_WIDTH) -#define BUG_LINE_HI_WIDTH (31 - BUG_DISP_WIDTH) - -#define BUG_FRAME_STRUCT - -struct bug_frame { - signed int loc_disp; /* Relative address to the bug address */ - signed int file_disp; /* Relative address to the filename */ - signed int msg_disp; /* Relative address to the predicate (for ASSE= RT) */ - uint16_t line; /* Line number */ - uint32_t pad0:16; /* Padding for 8-bytes align */ -}; - -#define bug_loc(b) ((const void *)(b) + (b)->loc_disp) -#define bug_file(b) ((const void *)(b) + (b)->file_disp); -#define bug_line(b) ((b)->line) -#define bug_msg(b) ((const char *)(b) + (b)->msg_disp) - -/* Many versions of GCC doesn't support the asm %c parameter which would - * be preferable to this unpleasantness. We use mergeable string - * sections to avoid multiple copies of the string appearing in the - * Xen image. BUGFRAME_run_fn needs to be handled separately. - */ -#define BUG_FRAME(type, line, file, has_msg, msg) do { = \ - BUILD_BUG_ON((line) >> 16); = \ - BUILD_BUG_ON((type) >=3D BUGFRAME_NR); = \ - asm ("1:"BUG_INSTR"\n" = \ - ".pushsection .rodata.str, \"aMS\", %progbits, 1\n" = \ - "2:\t.asciz " __stringify(file) "\n" = \ - "3:\n" = \ - ".if " #has_msg "\n" = \ - "\t.asciz " #msg "\n" = \ - ".endif\n" = \ - ".popsection\n" = \ - ".pushsection .bug_frames." __stringify(type) ", \"a\", %progbits= \n"\ - "4:\n" = \ - ".p2align 2\n" = \ - ".long (1b - 4b)\n" = \ - ".long (2b - 4b)\n" = \ - ".long (3b - 4b)\n" = \ - ".hword " __stringify(line) ", 0\n" = \ - ".popsection"); = \ -} while (0) - -/* - * GCC will not allow to use "i" when PIE is enabled (Xen doesn't set the - * flag but instead rely on the default value from the compiler). So the - * easiest way to implement run_in_exception_handler() is to pass the to - * be called function in a fixed register. - */ -#define run_in_exception_handler(fn) do { = \ - asm ("mov " __stringify(BUG_FN_REG) ", %0\n" = \ - "1:"BUG_INSTR"\n" = \ - ".pushsection .bug_frames." __stringify(BUGFRAME_run_fn) "," = \ - " \"a\", %%progbits\n" = \ - "2:\n" = \ - ".p2align 2\n" = \ - ".long (1b - 2b)\n" = \ - ".long 0, 0, 0\n" = \ - ".popsection" :: "r" (fn) : __stringify(BUG_FN_REG) ); = \ -} while (0) - -#define WARN() BUG_FRAME(BUGFRAME_warn, __LINE__, __FILE__, 0, "") - -#define BUG() do { \ - BUG_FRAME(BUGFRAME_bug, __LINE__, __FILE__, 0, ""); \ - unreachable(); \ -} while (0) - -#define assert_failed(msg) do { \ - BUG_FRAME(BUGFRAME_assert, __LINE__, __FILE__, 1, msg); \ - unreachable(); \ -} while (0) +#define BUG_ASM_CONST "c" =20 #endif /* __ARM_BUG_H__ */ /* diff --git a/xen/arch/arm/include/asm/traps.h b/xen/arch/arm/include/asm/tr= aps.h index 883dae368e..c6518008ec 100644 --- a/xen/arch/arm/include/asm/traps.h +++ b/xen/arch/arm/include/asm/traps.h @@ -69,8 +69,6 @@ void do_cp(struct cpu_user_regs *regs, const union hsr hs= r); void do_trap_smc(struct cpu_user_regs *regs, const union hsr hsr); void do_trap_hvc_smccc(struct cpu_user_regs *regs); =20 -int do_bug_frame(const struct cpu_user_regs *regs, vaddr_t pc); - void noreturn do_unexpected_trap(const char *msg, const struct cpu_user_regs *regs); void do_trap_hyp_sync(struct cpu_user_regs *regs); diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 061c92acbd..9c6eb66422 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -1197,85 +1197,6 @@ void do_unexpected_trap(const char *msg, const struc= t cpu_user_regs *regs) panic("CPU%d: Unexpected Trap: %s\n", smp_processor_id(), msg); } =20 -int do_bug_frame(const struct cpu_user_regs *regs, vaddr_t pc) -{ - const struct bug_frame *bug =3D NULL; - const char *prefix =3D "", *filename, *predicate; - unsigned long fixup; - int id =3D -1, lineno; - const struct virtual_region *region; - - region =3D find_text_region(pc); - if ( region ) - { - for ( id =3D 0; id < BUGFRAME_NR; id++ ) - { - const struct bug_frame *b; - unsigned int i; - - for ( i =3D 0, b =3D region->frame[id].bugs; - i < region->frame[id].n_bugs; b++, i++ ) - { - if ( ((vaddr_t)bug_loc(b)) =3D=3D pc ) - { - bug =3D b; - goto found; - } - } - } - } - found: - if ( !bug ) - return -ENOENT; - - if ( id =3D=3D BUGFRAME_run_fn ) - { - void (*fn)(const struct cpu_user_regs *) =3D (void *)regs->BUG_FN_= REG; - - fn(regs); - return 0; - } - - /* WARN, BUG or ASSERT: decode the filename pointer and line number. */ - filename =3D bug_file(bug); - if ( !is_kernel(filename) ) - return -EINVAL; - fixup =3D strlen(filename); - if ( fixup > 50 ) - { - filename +=3D fixup - 47; - prefix =3D "..."; - } - lineno =3D bug_line(bug); - - switch ( id ) - { - case BUGFRAME_warn: - printk("Xen WARN at %s%s:%d\n", prefix, filename, lineno); - show_execution_state(regs); - return 0; - - case BUGFRAME_bug: - printk("Xen BUG at %s%s:%d\n", prefix, filename, lineno); - 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 =3D bug_msg(bug); - if ( !is_kernel(predicate) ) - predicate =3D ""; - - printk("Assertion '%s' failed at %s%s:%d\n", - predicate, prefix, filename, lineno); - show_execution_state(regs); - panic("Assertion '%s' failed at %s%s:%d\n", - predicate, prefix, filename, lineno); - } - - return -EINVAL; -} - #ifdef CONFIG_ARM_64 static void do_trap_brk(struct cpu_user_regs *regs, const union hsr hsr) { @@ -1292,7 +1213,7 @@ static void do_trap_brk(struct cpu_user_regs *regs, c= onst union hsr hsr) switch ( hsr.brk.comment ) { case BRK_BUG_FRAME_IMM: - if ( do_bug_frame(regs, regs->pc) ) + if ( do_bug_frame(regs, regs->pc) < 0 ) goto die; =20 regs->pc +=3D 4; --=20 2.39.0 From nobody Sun May 5 17:21:14 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1678204256; cv=none; d=zohomail.com; s=zohoarc; b=XuijGAQpePhvk2vtIFvL0oBUkvTTCi1YyQdAKuaAnL8Dflhx2nKOlACu6pZe2jQmAziV6uEDC5cDmljH0U3SN65DQoCyx1BnurJM+TfhRyrDACO5rxJ2UC4dVQ8olj2Ma/WeqamMiq2iTVRqVBPoFK2MU0OtQHf/4AX4pSznTiQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678204256; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ZjFgCafaqgt0LZ5o7IxJ9jiNr8SztV4KikE+ZegSEUU=; b=ArffOcuQt92WPzFDDXeyYsPr0jXdpv600lYeGJjFi9uAX6Pm/Z7T5ymzJPH7ZRcAPoqIvQkcCTMrJDPz9r0hH/nxu7BtGOnZrQr8aFRexV6F0H5qFvtE6vbwbWHTfiJFcQp6rAEE1U5TJgBtnMnSlQT1R26IDReDDyUxF6Y32dw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1678204256771386.1782961324625; Tue, 7 Mar 2023 07:50:56 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.507550.781228 (Exim 4.92) (envelope-from ) id 1pZZaJ-0003kn-Ef; Tue, 07 Mar 2023 15:50:39 +0000 Received: by outflank-mailman (output) from mailman id 507550.781228; Tue, 07 Mar 2023 15:50:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pZZaJ-0003kJ-7x; Tue, 07 Mar 2023 15:50:39 +0000 Received: by outflank-mailman (input) for mailman id 507550; Tue, 07 Mar 2023 15:50:38 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pZZaI-0002jw-Am for xen-devel@lists.xenproject.org; Tue, 07 Mar 2023 15:50:38 +0000 Received: from mail-wm1-x333.google.com (mail-wm1-x333.google.com [2a00:1450:4864:20::333]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id cdbe6539-bcff-11ed-96b5-2f268f93b82a; Tue, 07 Mar 2023 16:50:37 +0100 (CET) Received: by mail-wm1-x333.google.com with SMTP id l7-20020a05600c1d0700b003eb5e6d906bso7475063wms.5 for ; Tue, 07 Mar 2023 07:50:37 -0800 (PST) Received: from fedora.. (46.204.108.143.nat.umts.dynamic.t-mobile.pl. [46.204.108.143]) by smtp.gmail.com with ESMTPSA id k7-20020a05600c080700b003e21ba8684dsm13450744wmp.26.2023.03.07.07.50.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Mar 2023 07:50:36 -0800 (PST) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: cdbe6539-bcff-11ed-96b5-2f268f93b82a DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678204236; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ZjFgCafaqgt0LZ5o7IxJ9jiNr8SztV4KikE+ZegSEUU=; b=DJKZhaPj9WfOomtVb6CRuZSNHlsfzHdzTYt2walFtqpNPLVf03a+LObqbMR9LjaZeH VokIucciJsi+sTXObHsJnOG+Y05gSKiwwF1fHzE2hAlAebceKcYy4huT3g8b5PmfPbM9 xXI+htQijcaAW9raYEM/XsRs9FhXWWUoUpUuGBwnL9NeChohdx6R5BZRbrGYIFHoue8F zelfDuFycT1VsxK4jAO0BnCOHkzf6h2ow7kdti52KjBX6hoaWh3HMIQm/K2rVsf5sE7i kajHtUEKlPhDoL8vix/uKyAa7DG98Knrwvowv2d6ZSbZ+2Qn7OOaKwsAYzaGmgiLCMYS q0Ag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678204236; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZjFgCafaqgt0LZ5o7IxJ9jiNr8SztV4KikE+ZegSEUU=; b=QuKMFkhDbbL3cbBKa/GWHog2BPsj+zpo6Ko8peUZ1DYR4i5GxZ3qhzJXoHE61aLgAe dQo8lYz12+TqPKMyQHdpbVKY00fGohDJbXSc9z1H27BUIFO0dATmILiMZKeJqcwu2Cd9 v1Y9JXlAX0ms6/1fQyhOEgsxNMSlUIyCKgq3oY7/czidBXMlN1YleAM2169ilIFQGmTD o+iG9IvFHUhvrXRzPW/xK0+o+gSeYk63sR4kU0Egslob+9kQLHKC1qAUdkXWaOhZbp47 oJFHKwVhxpmyDwcEEeV9KmfwvtQFzVBIFEAxtiZP5G8IqAVCKk2dbHCVEkXuaDFQd1OC zJKw== X-Gm-Message-State: AO0yUKUgSPeI0fFSTJ5f9qlaIp7iCKKfBoZOJX4RTli+RQOkzMVQ++Gj VGBKugdVczdvaY+/htPIap80dzmL1qQ= X-Google-Smtp-Source: AK7set/bfa8nAyobFYQuCkW56PYhjSI2SVw7d5hflVA3SuA4MZcXB0O5aWUoFU0Axmj4J+Kx6ST4Kg== X-Received: by 2002:a05:600c:4f0c:b0:3ea:c100:f18d with SMTP id l12-20020a05600c4f0c00b003eac100f18dmr13624245wmq.9.1678204236557; Tue, 07 Mar 2023 07:50:36 -0800 (PST) From: Oleksii Kurochko To: xen-devel@lists.xenproject.org Cc: Julien Grall , Jan Beulich , Andrew Cooper , Stefano Stabellini , Gianluca Guida , Oleksii Kurochko , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Wei Liu Subject: [PATCH v6 4/4] xen/x86: switch x86 to use generic implemetation of bug.h Date: Tue, 7 Mar 2023 17:50:26 +0200 Message-Id: X-Mailer: git-send-email 2.39.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1678204257218100003 Content-Type: text/plain; charset="utf-8" The following changes were made: * Make GENERIC_BUG_FRAME mandatory for X86 * Update asm/bug.h using generic implementation in * 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 'void *' Signed-off-by: Oleksii Kurochko Reviewed-by: Jan Beulich --- Changes in V6: * update the commit message * update the type of eip to 'void *' in do_invalid_op() * fix the logic of do_invalid_op() * move macros BUG_DEBUGGER_TRAP_FATAL under #ifndef __ASSEMBLY__ as it is not necessary to be in assembly code. --- Changes in V5: * Nothing changed --- Changes in V4: * Back comment /* !__ASSEMBLY__ */ for #else case in * Remove changes related to x86/.../asm/debuger.h as do_bug_frame() protot= ype was updated and cpu_user_regs isn't const any more. --- Changes in V3: * As prototype and what do_bug_frame() returns was changed so patch 3 and 4 was updated to use a new version of do_bug_frame * MODIFIER was change to BUG_ASM_CONST to align with generic implementation --- Changes in V2: * Remove all unnecessary things from as they were introduced = in . * Define BUG_INSTR =3D 'ud2' and MODIFIER =3D 'c' ( it is needed to skip = '$' when use an imidiate in x86 assembly ) * Update do_invalid_op() to re-use handle_bug_frame() and find_bug_frame() from generic implemetation of CONFIG_GENERIC_BUG_FRAME * Code style fixes. --- xen/arch/x86/Kconfig | 1 + xen/arch/x86/include/asm/bug.h | 77 ++------------------------------ xen/arch/x86/traps.c | 81 ++++------------------------------ 3 files changed, 12 insertions(+), 147 deletions(-) diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig index 6a7825f4ba..b0ff1f3ee6 100644 --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -11,6 +11,7 @@ config X86 select ARCH_MAP_DOMAIN_PAGE select ARCH_SUPPORTS_INT128 select CORE_PARKING + select GENERIC_BUG_FRAME select HAS_ALTERNATIVE select HAS_COMPAT select HAS_CPUFREQ diff --git a/xen/arch/x86/include/asm/bug.h b/xen/arch/x86/include/asm/bug.h index ff5cca1f19..f852cd0ee9 100644 --- a/xen/arch/x86/include/asm/bug.h +++ b/xen/arch/x86/include/asm/bug.h @@ -1,83 +1,12 @@ #ifndef __X86_BUG_H__ #define __X86_BUG_H__ =20 -#undef BUG_DISP_WIDTH -#undef BUG_LINE_LO_WIDTH -#undef BUG_LINE_HI_WIDTH - -#define BUG_DISP_WIDTH 24 -#define BUG_LINE_LO_WIDTH (31 - BUG_DISP_WIDTH) -#define BUG_LINE_HI_WIDTH (31 - BUG_DISP_WIDTH) - #ifndef __ASSEMBLY__ =20 -#define BUG_FRAME_STRUCT - -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%=3D: ud2\n" = \ - ".pushsection .bug_frames.%c[bf_type], \"a\", @progbits\n" = \ - ".p2align 2\n" = \ - ".Lfrm%=3D:\n" = \ - ".long (.Lbug%=3D - .Lfrm%=3D) + %c[bf_line_hi]\n" = \ - ".long (%c[bf_ptr] - .Lfrm%=3D) + %c[bf_line_lo]\n" = \ - ".if " #second_frame "\n" = \ - ".long 0, %c[bf_msg] - .Lfrm%=3D\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) >=3D 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) =3D=3D (void (*)(struct cpu_user_regs *))NULL); \ - BUG_FRAME(BUGFRAME_run_fn, 0, fn, 0, NULL); \ - } while ( 0 ) +#define BUG_DEBUGGER_TRAP_FATAL(regs) debugger_trap_fatal(X86_EXC_GP,regs) =20 -#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" =20 #else /* !__ASSEMBLY__ */ =20 diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index cade9e12f8..3ee256f469 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -24,6 +24,7 @@ * Gareth Hughes , May 2000 */ =20 +#include #include #include #include @@ -1166,12 +1167,9 @@ void cpuid_hypervisor_leaves(const struct vcpu *v, u= int32_t leaf, =20 void do_invalid_op(struct cpu_user_regs *regs) { - const struct bug_frame *bug =3D NULL; u8 bug_insn[2]; - const char *prefix =3D "", *filename, *predicate, *eip =3D (char *)reg= s->rip; - unsigned long fixup; - int id =3D -1, lineno; - const struct virtual_region *region; + void *eip =3D (void *)regs->rip; + int id; =20 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; =20 - region =3D find_text_region(regs->rip); - if ( region ) - { - for ( id =3D 0; id < BUGFRAME_NR; id++ ) - { - const struct bug_frame *b; - unsigned int i; - - for ( i =3D 0, b =3D region->frame[id].bugs; - i < region->frame[id].n_bugs; b++, i++ ) - { - if ( bug_loc(b) =3D=3D eip ) - { - bug =3D b; - goto found; - } - } - } - } - - found: - if ( !bug ) + id =3D do_bug_frame(regs, regs->rip); + if ( id < 0 ) goto die; - eip +=3D sizeof(bug_insn); - if ( id =3D=3D BUGFRAME_run_fn ) - { - void (*fn)(struct cpu_user_regs *) =3D bug_ptr(bug); - - fn(regs); - fixup_exception_return(regs, (unsigned long)eip); - return; - } =20 - /* WARN, BUG or ASSERT: decode the filename pointer and line number. */ - filename =3D bug_ptr(bug); - if ( !is_kernel(filename) && !is_patch(filename) ) - goto die; - fixup =3D strlen(filename); - if ( fixup > 50 ) - { - filename +=3D fixup - 47; - prefix =3D "..."; - } - lineno =3D bug_line(bug); + eip =3D (unsigned char *)eip + sizeof(bug_insn); =20 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 =3D bug_msg(bug); - if ( !is_kernel(predicate) && !is_patch(predicate) ) - predicate =3D ""; - - 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; } =20 die: --=20 2.39.0