From nobody Sat Apr 27 21:15:48 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1573720144; cv=none; d=zoho.com; s=zohoarc; b=IGHCd5W80yE9KXELT4g1QN9PJMEImfug+rL/Dp2biGRmNNyU9FEEzo23GopCMSskBEvK/Ub1S0wZpT0Dbkr5XAAFO/JL1iclgd9r0eP3NbCbkEBuOZJMYFyXhB1vxnfv7NT6DFaC9F6m3JKoEXGfn0OD4sVdJ9OOb0fQdqUpRy0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1573720144; h=Content-Type: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=+SdK+hmMx1mSON3Od4Sfbj0FHVcWrqC+X3uBacdGf3I=; b=jGdbjdrlj19TQF/lHYztYSQu2zNiOIchedcd8vT9fFAQQ77/LR+URdjssCLryukefHX7flHmoUzOAOlizO3BPuDjPNNFPh+pniK6BwZwHzNQzfgCQNVOQdw4+joqcyVrUrI6RB/Z7orK1u7go7LO2XuhNZo3gKEpFbNz06DgnCc= ARC-Authentication-Results: i=1; mx.zoho.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1573720144313800.0377825246678; Thu, 14 Nov 2019 00:29:04 -0800 (PST) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iVATr-00067q-78; Thu, 14 Nov 2019 08:27:55 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iVATq-00067i-99 for xen-devel@lists.xenproject.org; Thu, 14 Nov 2019 08:27:54 +0000 Received: from mx1.suse.de (unknown [195.135.220.15]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id a064fdde-06b8-11ea-b678-bc764e2007e4; Thu, 14 Nov 2019 08:27:42 +0000 (UTC) Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id DD769B199; Thu, 14 Nov 2019 08:27:41 +0000 (UTC) X-Inumbo-ID: a064fdde-06b8-11ea-b678-bc764e2007e4 X-Virus-Scanned: by amavisd-new at test-mx.suse.de From: Juergen Gross To: xen-devel@lists.xenproject.org Date: Thu, 14 Nov 2019 09:27:38 +0100 Message-Id: <20191114082739.7928-2-jgross@suse.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20191114082739.7928-1-jgross@suse.com> References: <20191114082739.7928-1-jgross@suse.com> Subject: [Xen-devel] [PATCH v2 1/2] xen: put more code under CONFIG_CRASH_DEBUG X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Juergen Gross , Stefano Stabellini , Julien Grall , Wei Liu , Konrad Rzeszutek Wilk , George Dunlap , Andrew Cooper , Ian Jackson , Jan Beulich , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Some code is not needed with CONFIG_CRASH_DEBUG, so only include it if CONFIG_CRASH_DEBUG is defined. While at it remove CONFIG_HAS_GDBSX as it can easily be replaced by CONFIG_CRASH_DEBUG. Signed-off-by: Juergen Gross --- xen/arch/x86/Kconfig | 1 - xen/common/Kconfig | 3 --- xen/common/domain.c | 2 +- xen/include/asm-x86/debugger.h | 30 ++++++++++++++++++------------ xen/include/xen/sched.h | 4 ++++ 5 files changed, 23 insertions(+), 17 deletions(-) diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig index 28b3b4692a..c72da8964a 100644 --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -13,7 +13,6 @@ config X86 select HAS_EHCI select HAS_EX_TABLE select HAS_FAST_MULTIPLY - select HAS_GDBSX select HAS_IOPORTS select HAS_KEXEC select MEM_ACCESS_ALWAYS_ON diff --git a/xen/common/Kconfig b/xen/common/Kconfig index f754741972..7bde6aff02 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -57,9 +57,6 @@ config HAS_UBSAN config HAS_KEXEC bool =20 -config HAS_GDBSX - bool - config HAS_IOPORTS bool =20 diff --git a/xen/common/domain.c b/xen/common/domain.c index 611116c7fc..c06efedc8e 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -915,7 +915,7 @@ void vcpu_end_shutdown_deferral(struct vcpu *v) vcpu_check_shutdown(v); } =20 -#ifdef CONFIG_HAS_GDBSX +#ifdef CONFIG_CRASH_DEBUG void domain_pause_for_debugger(void) { struct vcpu *curr =3D current; diff --git a/xen/include/asm-x86/debugger.h b/xen/include/asm-x86/debugger.h index b1b627f1fa..e23f2fa4a3 100644 --- a/xen/include/asm-x86/debugger.h +++ b/xen/include/asm-x86/debugger.h @@ -47,18 +47,6 @@ static inline bool debugger_trap_fatal( /* Int3 is a trivial way to gather cpu_user_regs context. */ #define debugger_trap_immediate() __asm__ __volatile__ ( "int3" ); =20 -#else - -static inline bool debugger_trap_fatal( - unsigned int vector, struct cpu_user_regs *regs) -{ - return false; -} - -#define debugger_trap_immediate() ((void)0) - -#endif - static inline bool debugger_trap_entry( unsigned int vector, struct cpu_user_regs *regs) { @@ -84,6 +72,24 @@ static inline bool debugger_trap_entry( return false; } =20 +#else + +static inline bool debugger_trap_fatal( + unsigned int vector, struct cpu_user_regs *regs) +{ + return false; +} + +#define debugger_trap_immediate() ((void)0) + +static inline bool debugger_trap_entry( + unsigned int vector, struct cpu_user_regs *regs) +{ + return false; +} + +#endif + unsigned int dbg_rw_mem(void * __user addr, void * __user buf, unsigned int len, domid_t domid, bool toaddr, uint64_t pgd3); diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 9f7bc69293..d2d30ece7d 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -652,7 +652,11 @@ void domain_destroy(struct domain *d); int domain_kill(struct domain *d); int domain_shutdown(struct domain *d, u8 reason); void domain_resume(struct domain *d); +#ifdef CONFIG_CRASH_DEBUG void domain_pause_for_debugger(void); +#else +static inline void domain_pause_for_debugger(void) { } +#endif =20 int domain_soft_reset(struct domain *d); =20 --=20 2.16.4 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel From nobody Sat Apr 27 21:15:48 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1573720145; cv=none; d=zoho.com; s=zohoarc; b=L7hlBU4w/nYaB73MHBVYndb+Fyl1mwOC/SS5xdDCKkt5unBGYlbjtjKtcxYFZBvt6PQlI/7Q9IeA1iT5epZDsgDksuj0AJaGgDDBBbONNQZzrNWRMvLnqeip1t2oP3PT/D0RW9mrWTcQHtx63ZJJzJ2MgHgjst68UMYyrhS/6zA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1573720145; h=Content-Type: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=MRwWaoyBT3rK4kcL326yQgoHd8I5922/PWw6mfOpohs=; b=CMHQSUjxb2CdYANghDK7X6o9vBv2pTQdfcq2MhmaIHMxBXHc2lqzV1TrZZB9TYJKvoMVCgMwXTyk8NmK5RSyAnkMDVxsLLpJ2jM5gXLDS0Nfpa8LQdrQ3hc+lgLeeUaOaPiabbn9nhwcxRsnVSU17MxsUqw7fjWqWXwRnhkPbvI= ARC-Authentication-Results: i=1; mx.zoho.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1573720145712345.0745300923552; Thu, 14 Nov 2019 00:29:05 -0800 (PST) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iVATg-00067G-M1; Thu, 14 Nov 2019 08:27:44 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iVATg-00067B-9H for xen-devel@lists.xenproject.org; Thu, 14 Nov 2019 08:27:44 +0000 Received: from mx1.suse.de (unknown [195.135.220.15]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id a079ab58-06b8-11ea-b678-bc764e2007e4; Thu, 14 Nov 2019 08:27:42 +0000 (UTC) Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 20B74B1C6; Thu, 14 Nov 2019 08:27:42 +0000 (UTC) X-Inumbo-ID: a079ab58-06b8-11ea-b678-bc764e2007e4 X-Virus-Scanned: by amavisd-new at test-mx.suse.de From: Juergen Gross To: xen-devel@lists.xenproject.org Date: Thu, 14 Nov 2019 09:27:39 +0100 Message-Id: <20191114082739.7928-3-jgross@suse.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20191114082739.7928-1-jgross@suse.com> References: <20191114082739.7928-1-jgross@suse.com> Subject: [Xen-devel] [PATCH v2 2/2] xen: make gdbsx support configurable X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Juergen Gross , Elena Ufimtseva , Stefano Stabellini , Julien Grall , Wei Liu , Konrad Rzeszutek Wilk , George Dunlap , Andrew Cooper , Ian Jackson , Jan Beulich , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Gdbsx support in the hypervisor is rarely used and it is opening a way for dom0 to modify the running hypervisor by very easy means. Add a Kconfig option to control support of gdbsx. Default is off. While at it correct a wrong comment in related code and remove dead code. Signed-off-by: Juergen Gross --- xen/Kconfig.debug | 7 ++++++ xen/arch/x86/Makefile | 2 +- xen/arch/x86/debug.c | 52 +-------------------------------------= ---- xen/arch/x86/domctl.c | 4 ++++ xen/include/asm-x86/debugger.h | 2 ++ 5 files changed, 15 insertions(+), 52 deletions(-) diff --git a/xen/Kconfig.debug b/xen/Kconfig.debug index 22573e74db..253910036e 100644 --- a/xen/Kconfig.debug +++ b/xen/Kconfig.debug @@ -20,6 +20,13 @@ config CRASH_DEBUG If you want to attach gdb to Xen to debug Xen if it crashes then say Y. =20 +config GDBSX + bool "Guest debugging with gdbsx" + depends on X86 + ---help--- + If you want to enable support for debugging guests from dom0 via + gdbsx then say Y. + config DEBUG_INFO bool "Compile Xen with debug info" default y diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index 5e6b9d7028..46a6c9d72b 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -19,7 +19,7 @@ obj-bin-y +=3D copy_page.o obj-y +=3D cpuid.o obj-$(CONFIG_PV) +=3D compat.o x86_64/compat.o obj-$(CONFIG_KEXEC) +=3D crash.o -obj-y +=3D debug.o +obj-$(CONFIG_GDBSX) +=3D debug.o obj-y +=3D delay.o obj-y +=3D desc.o obj-bin-y +=3D dmi_scan.init.o diff --git a/xen/arch/x86/debug.c b/xen/arch/x86/debug.c index a500df01ac..7b82f77df4 100644 --- a/xen/arch/x86/debug.c +++ b/xen/arch/x86/debug.c @@ -22,22 +22,6 @@ #include #include =20 -/*=20 - * This file for general routines common to more than one debugger, like k= db, - * gdbsx, etc.. - */ - -#ifdef XEN_KDB_CONFIG -#include "../kdb/include/kdbdefs.h" -#include "../kdb/include/kdbproto.h" -#define DBGP(...) {(kdbdbg) ? kdbp(__VA_ARGS__):0;} -#define DBGP1(...) {(kdbdbg>1) ? kdbp(__VA_ARGS__):0;} -#define DBGP2(...) {(kdbdbg>2) ? kdbp(__VA_ARGS__):0;} -#else -#define DBGP1(...) ((void)0) -#define DBGP2(...) ((void)0) -#endif - typedef unsigned long dbgva_t; typedef unsigned char dbgbyte_t; =20 @@ -49,24 +33,13 @@ dbg_hvm_va2mfn(dbgva_t vaddr, struct domain *dp, int to= addr, gfn_t *gfn) uint32_t pfec =3D PFEC_page_present; p2m_type_t gfntype; =20 - DBGP2("vaddr:%lx domid:%d\n", vaddr, dp->domain_id); - *gfn =3D _gfn(paging_gva_to_gfn(dp->vcpu[0], vaddr, &pfec)); if ( gfn_eq(*gfn, INVALID_GFN) ) - { - DBGP2("kdb:bad gfn from gva_to_gfn\n"); return INVALID_MFN; - } =20 mfn =3D get_gfn(dp, gfn_x(*gfn), &gfntype); if ( p2m_is_readonly(gfntype) && toaddr ) - { - DBGP2("kdb:p2m_is_readonly: gfntype:%x\n", gfntype); mfn =3D INVALID_MFN; - } - else - DBGP2("X: vaddr:%lx domid:%d mfn:%#"PRI_mfn"\n", - vaddr, dp->domain_id, mfn_x(mfn)); =20 if ( mfn_eq(mfn, INVALID_MFN) ) { @@ -100,55 +73,36 @@ dbg_pv_va2mfn(dbgva_t vaddr, struct domain *dp, uint64= _t pgd3val) unsigned long cr3 =3D (pgd3val ? pgd3val : dp->vcpu[0]->arch.cr3); mfn_t mfn =3D maddr_to_mfn(cr3_pa(cr3)); =20 - DBGP2("vaddr:%lx domid:%d cr3:%lx pgd3:%lx\n", vaddr, dp->domain_id,=20 - cr3, pgd3val); - if ( pgd3val =3D=3D 0 ) { l4t =3D map_domain_page(mfn); l4e =3D l4t[l4_table_offset(vaddr)]; unmap_domain_page(l4t); mfn =3D l4e_get_mfn(l4e); - DBGP2("l4t:%p l4to:%lx l4e:%lx mfn:%#"PRI_mfn"\n", l4t, - l4_table_offset(vaddr), l4e, mfn_x(mfn)); if ( !(l4e_get_flags(l4e) & _PAGE_PRESENT) ) - { - DBGP1("l4 PAGE not present. vaddr:%lx cr3:%lx\n", vaddr, cr3); return INVALID_MFN; - } =20 l3t =3D map_domain_page(mfn); l3e =3D l3t[l3_table_offset(vaddr)]; unmap_domain_page(l3t); mfn =3D l3e_get_mfn(l3e); - DBGP2("l3t:%p l3to:%lx l3e:%lx mfn:%#"PRI_mfn"\n", l3t, - l3_table_offset(vaddr), l3e, mfn_x(mfn)); if ( !(l3e_get_flags(l3e) & _PAGE_PRESENT) || (l3e_get_flags(l3e) & _PAGE_PSE) ) - { - DBGP1("l3 PAGE not present. vaddr:%lx cr3:%lx\n", vaddr, cr3); return INVALID_MFN; - } } =20 l2t =3D map_domain_page(mfn); l2e =3D l2t[l2_table_offset(vaddr)]; unmap_domain_page(l2t); mfn =3D l2e_get_mfn(l2e); - DBGP2("l2t:%p l2to:%lx l2e:%lx mfn:%#"PRI_mfn"\n", - l2t, l2_table_offset(vaddr), l2e, mfn_x(mfn)); if ( !(l2e_get_flags(l2e) & _PAGE_PRESENT) || (l2e_get_flags(l2e) & _PAGE_PSE) ) - { - DBGP1("l2 PAGE not present. vaddr:%lx cr3:%lx\n", vaddr, cr3); return INVALID_MFN; - } + l1t =3D map_domain_page(mfn); l1e =3D l1t[l1_table_offset(vaddr)]; unmap_domain_page(l1t); mfn =3D l1e_get_mfn(l1e); - DBGP2("l1t:%p l1to:%lx l1e:%lx mfn:%#"PRI_mfn"\n", l1t, l1_table_offse= t(vaddr), - l1e, mfn_x(mfn)); =20 return mfn_valid(mfn) ? mfn : INVALID_MFN; } @@ -210,9 +164,6 @@ unsigned int dbg_rw_mem(void * __user addr, void * __us= er buf, unsigned int len, domid_t domid, bool toaddr, uint64_t pgd3) { - DBGP2("gmem:addr:%lx buf:%p len:$%u domid:%d toaddr:%x\n", - addr, buf, len, domid, toaddr); - if ( domid =3D=3D DOMID_IDLE ) { if ( toaddr ) @@ -232,7 +183,6 @@ unsigned int dbg_rw_mem(void * __user addr, void * __us= er buf, } } =20 - DBGP2("gmem:exit:len:$%d\n", len); return len; } =20 diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index 43e368d63b..90e36b9ad8 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -36,6 +36,7 @@ #include #include =20 +#ifdef CONFIG_GDBSX static int gdbsx_guest_mem_io(domid_t domid, struct xen_domctl_gdbsx_memio= *iop) { void * __user gva =3D (void *)iop->gva, * __user uva =3D (void *)iop->= uva; @@ -45,6 +46,7 @@ static int gdbsx_guest_mem_io(domid_t domid, struct xen_d= omctl_gdbsx_memio *iop) =20 return iop->remain ? -EFAULT : 0; } +#endif =20 static void domain_cpu_policy_changed(struct domain *d) { @@ -912,6 +914,7 @@ long arch_do_domctl( } #endif =20 +#ifdef CONFIG_GDBSX case XEN_DOMCTL_gdbsx_guestmemio: domctl->u.gdbsx_guest_memio.remain =3D domctl->u.gdbsx_guest_memio= .len; ret =3D gdbsx_guest_mem_io(domctl->domain, &domctl->u.gdbsx_guest_= memio); @@ -976,6 +979,7 @@ long arch_do_domctl( copyback =3D true; break; } +#endif =20 case XEN_DOMCTL_setvcpuextstate: case XEN_DOMCTL_getvcpuextstate: diff --git a/xen/include/asm-x86/debugger.h b/xen/include/asm-x86/debugger.h index e23f2fa4a3..2dc05b32d6 100644 --- a/xen/include/asm-x86/debugger.h +++ b/xen/include/asm-x86/debugger.h @@ -90,8 +90,10 @@ static inline bool debugger_trap_entry( =20 #endif =20 +#ifdef CONFIG_GDBSX unsigned int dbg_rw_mem(void * __user addr, void * __user buf, unsigned int len, domid_t domid, bool toaddr, uint64_t pgd3); +#endif =20 #endif /* __X86_DEBUGGER_H__ */ --=20 2.16.4 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel