From patchwork Wed Apr 20 14:13:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 12820346 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 83439C43217 for ; Wed, 20 Apr 2022 14:13:45 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.309286.525410 (Exim 4.92) (envelope-from ) id 1nhB5K-000268-Q1; Wed, 20 Apr 2022 14:13:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 309286.525410; Wed, 20 Apr 2022 14:13:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1nhB5K-00025u-Lk; Wed, 20 Apr 2022 14:13:34 +0000 Received: by outflank-mailman (input) for mailman id 309286; Wed, 20 Apr 2022 14:13:32 +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 1nhB5I-0001HT-A0 for xen-devel@lists.xenproject.org; Wed, 20 Apr 2022 14:13:32 +0000 Received: from esa3.hc3370-68.iphmx.com (esa3.hc3370-68.iphmx.com [216.71.145.155]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 0df5faec-c0b4-11ec-a405-831a346695d4; Wed, 20 Apr 2022 16:13:30 +0200 (CEST) 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: 0df5faec-c0b4-11ec-a405-831a346695d4 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1650464010; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=qmoska+aIxotu+Z9bq9lWSYhYAKM0rZmYd2eehh+pdw=; b=ZtaAE8PvL6sqmWb5OxPYlVy72qOwxQoSED31YAhOuMOU4a5MsRRn/OFd 5X5liRGvz3sG9qNIBfYkBfx7D15qRFx2RNtxtCgDLIpF4X3I8hAA/FT7w jezmkrCs6eAYrQU3An6N1QRSI64hBObjzyPu/1V7KOL3CRtMKydm+oDy8 8=; Authentication-Results: esa3.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none X-SBRS: 5.1 X-MesageID: 69517260 X-Ironport-Server: esa3.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:0kYFbKJnwVqI8b+rFE+RoZUlxSXFcZb7ZxGr2PjKsXjdYENS0zJRn zBKXmrTbv2KZmD8fNlzbY618UsPscTUxtE1HQBlqX01Q3x08seUXt7xwmUcns+xwm8vaGo9s q3yv/GZdJhcokf0/0vrav67xZVF/fngqoDUUYYoAQgsA148IMsdoUg7wbRh3tQw2YHR7z6l4 rseneWOYDdJ5BYsWo4kw/rrRMRH5amaVJsw5zTSVNgT1LPsvyB94KE3fMldG0DQUIhMdtNWc s6YpF2PEsE1yD92Yj+tuu6TnkTn2dc+NyDW4pZdc/DKbhSvOkXee0v0XRYRQR4/ttmHozx+4 Ox26YGiciESAvbFl+ECayhbFD9fIpQTrdcrIVDn2SCS50jPcn+qyPRyFkAme4Yf/46bA0kXq 6ZecmpUKEne2aTmm9pXScE17ignBODtMJkSpTdLyjbBAOx9aZvCX7/L9ZlT2zJYasVmQ6eDP pVDN2IHgBLoOTBzYnQLV7YFn/qmmVnSajkAj12MjP9ii4TU5FMoi+W8WDbPQfSVQe1Fk0Deo XjJl0zbKBwHMN2UyRKe72mhwOTImEvTSI8UUbG16PNuqFmS3XAITg0bU0Ohpvu0gVL4XMhQQ 3H44QJ38/J0rhbyCICgAVvo+xZooyLwRfJpKLEn+jqr8ZaP6gmcGVA1TTlfScMf4ZpeqSMR6 neFmNbgBDpKubKTSG6A+rr8kQ5eKRT5PkdZO3ZaEFJtD83L5dhq00mRFooL/Lud1IWdJN3m/ 9ydQMHSbZ03hNVD6ai09Euvb9mE9smQFV5dCuk6swuYAuJFiGyNOtTABbvzt68owGOlor6p5 iZspiRmxLpSZaxhbQTUKAn3IJmn5uyeLBrXikN1Ep8q+lyFoiD+JdwIum0hex05bq7onAMFh meK6Gu9A7cJYhOXgVJfOdrtW6zGM4C8fTgaahwkRoUXOcUgHON21CpveVSRzwjQfLsEyskC1 WOgWZ/0Vx4yUP0/pBLvHrt1+eJ6nUgWmDKMLa0XOjz6iNJyklbOEedbWLZPB8hkhJ65TPL9q o8BbJrbl08CCIUToED/qOYuELzDFlBjbbieliCdXrXrztZOcI35N8Ls/A== IronPort-HdrOrdr: A9a23:yVRE/65m3dlgKvVMtAPXwPLXdLJyesId70hD6qhwISY1TiX+rb HXoB17726MtN9/YgBCpTntAsa9qDbnhPpICOoqTNGftWvdyQmVxehZhOOIqVCNJ8S9zJ876U 4JSdkENDSaNzhHZKjBjjVQa+xQpeW6zA== X-IronPort-AV: E=Sophos;i="5.90,275,1643691600"; d="scan'208";a="69517260" From: Andrew Cooper To: Xen-devel CC: Andrew Cooper , Jan Beulich , =?utf-8?q?Roger_Pau_Monn=C3=A9?= , Wei Liu Subject: [PATCH v5 5/6] x86/debugger: Misc cleanup prior to splitting Date: Wed, 20 Apr 2022 15:13:06 +0100 Message-ID: <20220420141307.24153-6-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20220420141307.24153-1-andrew.cooper3@citrix.com> References: <20220420141307.24153-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 * Remove inappropriate semicolon from debugger_trap_immediate() * Try to explain what debugger_trap_fatal() is doing, and write it in a more legible way. * Drop unecessary includes. This includes common/domain.c which doesn't use any debugger functionality, even prior to this cleaup. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- CC: Jan Beulich CC: Roger Pau Monné CC: Wei Liu v5: * New --- xen/arch/x86/include/asm/debugger.h | 17 +++++++++++------ xen/common/domain.c | 1 - 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/include/asm/debugger.h b/xen/arch/x86/include/asm/debugger.h index 9a3132356fd6..5bac2ee4c2a4 100644 --- a/xen/arch/x86/include/asm/debugger.h +++ b/xen/arch/x86/include/asm/debugger.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /****************************************************************************** * asm/debugger.h * @@ -22,23 +23,27 @@ #ifndef __X86_DEBUGGER_H__ #define __X86_DEBUGGER_H__ -#include -#include -#include - #ifdef CONFIG_CRASH_DEBUG #include +#include + +#include +/* Returns true if GDB handled the trap, or it is surviveable. */ static inline bool debugger_trap_fatal( unsigned int vector, struct cpu_user_regs *regs) { int rc = __trap_to_gdb(regs, vector); - return ((rc == 0) || (vector == TRAP_int3)); + + if ( rc == 0 ) + return true; + + return vector == X86_EXC_BP; } /* Int3 is a trivial way to gather cpu_user_regs context. */ -#define debugger_trap_immediate() __asm__ __volatile__ ( "int3" ); +#define debugger_trap_immediate() __asm__ __volatile__ ( "int3" ) #else diff --git a/xen/common/domain.c b/xen/common/domain.c index 351029f8b239..8d2c2a989708 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -33,7 +33,6 @@ #include #include #include -#include #include #include #include