From nobody Fri Jun 17 19:40:57 2022 X-Original-To: dev-commits-src-all@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 38A1085D4CE; Fri, 17 Jun 2022 19:40:59 +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 4LPqCZ0HKgz3hpS; Fri, 17 Jun 2022 19:40:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494858; 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=/PeokmpTNQJT6orkm76Oo/ebVGpKrXj5uVi4PcTVOOM=; b=THvt3GqqrvWXzkPfl0ytwf4/mdtR/J65kucZSfy2W1XRtzw7jIsPqEqmPlO0Sp7evaEOvM ue/gPo1b/yCwOrvpc4VfKTcvygfqRy1ajXIlHKOZ9plAF9t3hFDE4XlPU7bHAwE3hU7x8Z Vp2CfX1C+ynpBle2YJA9abiME3aGZTQXY5Ym7lXzLBS1cPRDp7wKyYbrAWtjCFJPNJQ1r1 GabMDDOso55ca/7OTFgErBMfoEd0S4DsyIDs6tpvDMfkD8v44JuAEpFKSsAXR7A5BgRn5s We/ZyVeZhVQphf7m+naOX2TWbGwxJoUJmtaJqr4kZcnbvw7CHTtE0zGanTF60Q== 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 787C325CA0; Fri, 17 Jun 2022 19:40:57 +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 25HJevAV028940; Fri, 17 Jun 2022 19:40:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25HJevVd028927; Fri, 17 Jun 2022 19:40:57 GMT (envelope-from git) Date: Fri, 17 Jun 2022 19:40:57 GMT Message-Id: <202206171940.25HJevVd028927@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: 06f6414a648a - stable/13 - linux(4): Deduplicate bsd_to_linux_trapcode() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 06f6414a648add4a0fbd90f3001be193d80fe4f5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494858; 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=/PeokmpTNQJT6orkm76Oo/ebVGpKrXj5uVi4PcTVOOM=; b=myEwI4EWtILm31jONc802IeE1tDvO4DjigoNhJ/xmSeJ4dCru9Ya/rQQD3GuVCkKmxNpNV QgusBwGys9aMbdR0/S3JQbOM3xRuxGKDYE6E/9r9QNRNXY8efPw85hXS4d+sLD+2G6xdeo F5GGiiAuushpNawhIdKXq+7LTD5NvbgL7yB9kFlk1p/P99aiLrLlK1Evm3fJjrQCerqXkp Y9UvvIJoXYu0//1QVavbTm3XNPxEOMRW0c/s/5H/1YBwdxYvBO1QmBU5cL18tpI7USbxF2 pMwtMrX8Ix/SVq8fKlX1yWSR8bQaVABke/sEvcyEscAzGaIA0zA2YzxmZ+Ip1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655494858; a=rsa-sha256; cv=none; b=mySqBIOTgNU9gXcRoUOEol04RcggOuCzM6DUAV6HFn5Q4UTVdSy3KrsxjoM7Pu177W/a5a bo5uNxwc26MBtVnBZmfau25ztVZsGXxN1n8FUtwNa6Z3RPEycM27nlnaToMp0i/ooAatn0 gGcvPOr0qvP+B8HHmPLr/HbmMsI1agfnSMvX9vibV9CAwdLwHEcdIsMRp9ssk3ozN7FTI1 iR9bpW3wMqLn9ZKshkiSc8veK3dCg+0A2yFHBcLg2JROKW0ymdizVWZUbKBnER8EgntkOz 6L+YwoQJjq38aZ4eeGCN+lB9vEJ9eNgKsR0lDObLONwzcRv9ikOljB0DBcM0vA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=06f6414a648add4a0fbd90f3001be193d80fe4f5 commit 06f6414a648add4a0fbd90f3001be193d80fe4f5 Author: Dmitry Chagin AuthorDate: 2022-05-23 10:16:58 +0000 Commit: Dmitry Chagin CommitDate: 2022-06-17 19:35:28 +0000 linux(4): Deduplicate bsd_to_linux_trapcode() As bsd_to_linux_trapcode() is common for x86 Linuxulators, move it under x86/linux. MFC after: 2 weeks (cherry picked from commit 9016ec056ae3896522798ead39bb2f3ff4f68809) --- sys/amd64/linux/linux_sysvec.c | 39 ---------------------------------- sys/amd64/linux32/linux32_sysvec.c | 39 ---------------------------------- sys/i386/linux/linux_sysvec.c | 39 ---------------------------------- sys/x86/linux/linux_x86.c | 43 ++++++++++++++++++++++++++++++++++++++ sys/x86/linux/linux_x86.h | 1 + 5 files changed, 44 insertions(+), 117 deletions(-) diff --git a/sys/amd64/linux/linux_sysvec.c b/sys/amd64/linux/linux_sysvec.c index 96df6b25cf12..329a0a2567c0 100644 --- a/sys/amd64/linux/linux_sysvec.c +++ b/sys/amd64/linux/linux_sysvec.c @@ -131,45 +131,6 @@ static int linux_on_exec_vmspace(struct proc *p, static void linux_set_fork_retval(struct thread *td); static int linux_vsyscall(struct thread *td); -#define LINUX_T_UNKNOWN 255 -static int _bsd_to_linux_trapcode[] = { - LINUX_T_UNKNOWN, /* 0 */ - 6, /* 1 T_PRIVINFLT */ - LINUX_T_UNKNOWN, /* 2 */ - 3, /* 3 T_BPTFLT */ - LINUX_T_UNKNOWN, /* 4 */ - LINUX_T_UNKNOWN, /* 5 */ - 16, /* 6 T_ARITHTRAP */ - 254, /* 7 T_ASTFLT */ - LINUX_T_UNKNOWN, /* 8 */ - 13, /* 9 T_PROTFLT */ - 1, /* 10 T_TRCTRAP */ - LINUX_T_UNKNOWN, /* 11 */ - 14, /* 12 T_PAGEFLT */ - LINUX_T_UNKNOWN, /* 13 */ - 17, /* 14 T_ALIGNFLT */ - LINUX_T_UNKNOWN, /* 15 */ - LINUX_T_UNKNOWN, /* 16 */ - LINUX_T_UNKNOWN, /* 17 */ - 0, /* 18 T_DIVIDE */ - 2, /* 19 T_NMI */ - 4, /* 20 T_OFLOW */ - 5, /* 21 T_BOUND */ - 7, /* 22 T_DNA */ - 8, /* 23 T_DOUBLEFLT */ - 9, /* 24 T_FPOPFLT */ - 10, /* 25 T_TSSFLT */ - 11, /* 26 T_SEGNPFLT */ - 12, /* 27 T_STKFLT */ - 18, /* 28 T_MCHK */ - 19, /* 29 T_XMMFLT */ - 15 /* 30 T_RESERVED */ -}; -#define bsd_to_linux_trapcode(code) \ - ((code) +#define LINUX_T_UNKNOWN 255 +static int _bsd_to_linux_trapcode[] = { + LINUX_T_UNKNOWN, /* 0 */ + 6, /* 1 T_PRIVINFLT */ + LINUX_T_UNKNOWN, /* 2 */ + 3, /* 3 T_BPTFLT */ + LINUX_T_UNKNOWN, /* 4 */ + LINUX_T_UNKNOWN, /* 5 */ + 16, /* 6 T_ARITHTRAP */ + 254, /* 7 T_ASTFLT */ + LINUX_T_UNKNOWN, /* 8 */ + 13, /* 9 T_PROTFLT */ + 1, /* 10 T_TRCTRAP */ + LINUX_T_UNKNOWN, /* 11 */ + 14, /* 12 T_PAGEFLT */ + LINUX_T_UNKNOWN, /* 13 */ + 17, /* 14 T_ALIGNFLT */ + LINUX_T_UNKNOWN, /* 15 */ + LINUX_T_UNKNOWN, /* 16 */ + LINUX_T_UNKNOWN, /* 17 */ + 0, /* 18 T_DIVIDE */ + 2, /* 19 T_NMI */ + 4, /* 20 T_OFLOW */ + 5, /* 21 T_BOUND */ + 7, /* 22 T_DNA */ + 8, /* 23 T_DOUBLEFLT */ + 9, /* 24 T_FPOPFLT */ + 10, /* 25 T_TSSFLT */ + 11, /* 26 T_SEGNPFLT */ + 12, /* 27 T_STKFLT */ + 18, /* 28 T_MCHK */ + 19, /* 29 T_XMMFLT */ + 15 /* 30 T_RESERVED */ +}; + /* * If FreeBSD & Linux have a difference of opinion about what a trap * means, deal with it here. @@ -54,3 +89,11 @@ linux_translate_traps(int signal, int trap_code) return (signal); } } + +int +bsd_to_linux_trapcode(int code) +{ + + return (code < nitems(_bsd_to_linux_trapcode) ? + _bsd_to_linux_trapcode[code] : LINUX_T_UNKNOWN); +} \ No newline at end of file diff --git a/sys/x86/linux/linux_x86.h b/sys/x86/linux/linux_x86.h index a7eb871113ee..ce083bb1c3f5 100644 --- a/sys/x86/linux/linux_x86.h +++ b/sys/x86/linux/linux_x86.h @@ -36,5 +36,6 @@ int linux_vdso_tsc_selector_idx(void); int linux_vdso_cpu_selector_idx(void); int linux_translate_traps(int, int); +int bsd_to_linux_trapcode(int); #endif /* _X86_INCLUDE_LINUX_LINUX_X86_H_ */