From nobody Thu Feb 9 07:56:43 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PC8Md0y8pz3myDT; Thu, 9 Feb 2023 07:56:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PC8Mb3TZZz44m3; Thu, 9 Feb 2023 07:56:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675929403; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Wd4KTKEYp7g7K8oBtZUhlbVFhVnMCl7IGzRqCyGCQBE=; b=r88MbllfnXkecNhVGIvdk065yGCBW1UB9VordjPz9pBNfHy4JVPNPGqrGA+aJBSOzTDLl4 gkzGDsEJyEigb4P0y6ODeEp2GQAJyIKmgYwHtx2jWyAKNDcsZTfg9SCNuMHGKg70zGBpb0 dfaJRDvEQWtBqjKUev2vCO/lG+A7ImajPxrKAa0X+UslFRFiDUQR2T9TZQkG/fSlTnCmLM UdOosCLbgTPcZYfGDv9ze8slbGLezmpL8KUZlCl0g7idXZkMf0Ct1YMQPZ1lr77qwtsoqT fmQgWWvzfdI91o5E+ra9uNNZr7mW1/mbCgfqzMRrX6T/LPAwIUkdSBC/vbq+3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675929403; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Wd4KTKEYp7g7K8oBtZUhlbVFhVnMCl7IGzRqCyGCQBE=; b=JsGCCBdzBSGNs+SoJJqVsauSgklrpsjMImRqZ6YZTBmJ6DsJ3KhuwEwJmH+VfHT/noXns0 BZRfIJ4zjv05gDqUcOpEw6gY2i8cFRxhIL3kueeRSx6JMsWLyyBopGkSpYiIlRPgIVD4nK d9GKIXU2FohoPDsC7TPg2bDo55mtGw4RDwpyfYW3hv4hzXkVzP6Xhw0BJVxKXKfJG0h/qO B3AFSOxVn+s/zkh+7PO4WNx/Bo5uZc4BdrZFKBJn3o9pTbPvy0OzJ9ruqxWKver6y7Hkc8 n7juXElmvpvhS7Ssd75hquaRvsoBaiBeCQZprGt4usn+VJr6rdPgjhErdMFOWw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675929403; a=rsa-sha256; cv=none; b=gFHHcv7gQqB1xzqoI1EGpGXDn4YJBiP4oVdMruyRWzDdu/cD5CrjfvwnpuzN0KwmanxoEm PAmyQ7aCPCoJtKtwLu3pQVBICRr9r+XE40Q5uW3A1ygbmYNK0xI91ftt/VZAuBi7dRUdkD EEayrX+PUxmQQmFQBYlkM33uXsbLqXy99ir69XXOhQHsrx9hpv79rbpNQLyfutDlFZEqjQ /DvAs0juL53uLBQ93PcErCqAvFkOkB3jzAOejhmNzI405YoZB/N//Y5VFy56sFGuMiC5Rw oOnL51R3DOmSElOZMLqb09ez5w0KQh4jYbLzSB7CfijuPEKHPxRvjc5sfCpmwg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PC8Mb2ZvyzVSw; Thu, 9 Feb 2023 07:56:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 3197uhmh092896; Thu, 9 Feb 2023 07:56:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3197uh6M092895; Thu, 9 Feb 2023 07:56:43 GMT (envelope-from git) Date: Thu, 9 Feb 2023 07:56:43 GMT Message-Id: <202302090756.3197uh6M092895@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: b8c62b5a07e3 - stable/13 - linux(4): Add coredump support to i386. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b8c62b5a07e333dd08b78361ba763994ec47a5fc Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=b8c62b5a07e333dd08b78361ba763994ec47a5fc commit b8c62b5a07e333dd08b78361ba763994ec47a5fc Author: Dmitry Chagin AuthorDate: 2023-02-02 14:58:06 +0000 Commit: Dmitry Chagin CommitDate: 2023-02-09 07:55:18 +0000 linux(4): Add coredump support to i386. MFC after: 1 week (cherry picked from commit cc1b0f7d9626bbd116429014444cbf61edf708a2) --- sys/i386/linux/linux.h | 28 ++++++++++++++++++++++++++++ sys/i386/linux/linux_machdep.c | 26 ++++++++++++++++++++++++++ sys/i386/linux/linux_sysvec.c | 9 ++++++--- sys/modules/linux/Makefile | 2 +- 4 files changed, 61 insertions(+), 4 deletions(-) diff --git a/sys/i386/linux/linux.h b/sys/i386/linux/linux.h index c651da6b5857..43bf3ca126b6 100644 --- a/sys/i386/linux/linux.h +++ b/sys/i386/linux/linux.h @@ -395,4 +395,32 @@ struct l_desc_struct { #define linux_copyout_rusage(r, u) copyout(r, u, sizeof(*r)) +/* This corresponds to 'struct user_regs_struct' in Linux. */ +struct linux_pt_regset { + l_uint ebx; + l_uint ecx; + l_uint edx; + l_uint esi; + l_uint edi; + l_uint ebp; + l_uint eax; + l_uint ds; + l_uint es; + l_uint fs; + l_uint gs; + l_uint orig_eax; + l_uint eip; + l_uint cs; + l_uint eflags; + l_uint esp; + l_uint ss; +}; + +#ifdef _KERNEL +struct reg; + +void bsd_to_linux_regset(const struct reg *b_reg, + struct linux_pt_regset *l_regset); +#endif /* _KERNEL */ + #endif /* !_I386_LINUX_H_ */ diff --git a/sys/i386/linux/linux_machdep.c b/sys/i386/linux/linux_machdep.c index dc156dbd673d..fb42c3e9df84 100644 --- a/sys/i386/linux/linux_machdep.c +++ b/sys/i386/linux/linux_machdep.c @@ -60,6 +60,8 @@ __FBSDID("$FreeBSD$"); #include #include +#include + #include #include #include @@ -675,3 +677,27 @@ linux_mq_getsetattr(struct thread *td, struct linux_mq_getsetattr_args *args) return (ENOSYS); #endif } + +void +bsd_to_linux_regset(const struct reg *b_reg, + struct linux_pt_regset *l_regset) +{ + + l_regset->ebx = b_reg->r_ebx; + l_regset->ecx = b_reg->r_ecx; + l_regset->edx = b_reg->r_edx; + l_regset->esi = b_reg->r_esi; + l_regset->edi = b_reg->r_edi; + l_regset->ebp = b_reg->r_ebp; + l_regset->eax = b_reg->r_eax; + l_regset->ds = b_reg->r_ds; + l_regset->es = b_reg->r_es; + l_regset->fs = b_reg->r_fs; + l_regset->gs = b_reg->r_gs; + l_regset->orig_eax = b_reg->r_eax; + l_regset->eip = b_reg->r_eip; + l_regset->cs = b_reg->r_cs; + l_regset->eflags = b_reg->r_eflags; + l_regset->esp = b_reg->r_esp; + l_regset->ss = b_reg->r_ss; +} diff --git a/sys/i386/linux/linux_sysvec.c b/sys/i386/linux/linux_sysvec.c index 6726dc2cf0fd..cff9b1c780d5 100644 --- a/sys/i386/linux/linux_sysvec.c +++ b/sys/i386/linux/linux_sysvec.c @@ -29,6 +29,8 @@ #include __FBSDID("$FreeBSD$"); +#define __ELF_WORD_SIZE 32 + #include #include #include @@ -65,6 +67,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -803,9 +806,9 @@ struct sysentvec elf_linux_sysvec = { .sv_szsigcode = &linux_szsigcode, .sv_name = "Linux ELF32", .sv_coredump = elf32_coredump, - .sv_elf_core_osabi = ELFOSABI_FREEBSD, - .sv_elf_core_abi_vendor = FREEBSD_ABI_VENDOR, - .sv_elf_core_prepare_notes = elf32_prepare_notes, + .sv_elf_core_osabi = ELFOSABI_NONE, + .sv_elf_core_abi_vendor = LINUX_ABI_VENDOR, + .sv_elf_core_prepare_notes = __linuxN(prepare_notes), .sv_imgact_try = linux_exec_imgact_try, .sv_minsigstksz = LINUX_MINSIGSTKSZ, .sv_minuser = VM_MIN_ADDRESS, diff --git a/sys/modules/linux/Makefile b/sys/modules/linux/Makefile index 2cd7c54cd216..4e41f8e9403c 100644 --- a/sys/modules/linux/Makefile +++ b/sys/modules/linux/Makefile @@ -12,6 +12,7 @@ CFLAGS+=-DCOMPAT_FREEBSD32 -DCOMPAT_LINUX32 KMOD= linux SRCS= linux${SFX}_dummy_machdep.c \ + linux_elf32.c \ linux_event.c \ linux_file.c \ linux_fork.c \ @@ -46,7 +47,6 @@ VDSODEPS=linux_vdso_gettc_x86.inc .endif .if ${MACHINE_CPUARCH} == "amd64" SRCS+= linux${SFX}_support.s -SRCS+= linux_elf32.c .else SRCS+= linux_copyout.c .endif