From nobody Fri Jun 17 19:40:51 2022 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 96BF885D434; Fri, 17 Jun 2022 19:40:53 +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 4LPqCS6qMCz3hd8; Fri, 17 Jun 2022 19:40:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494853; 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=AhvZbjfaL4OXocfrb+XLmf7fupEoDvXAxhlf/w268fM=; b=ih6MaM5Og8rhw0MTzJLBmxSzf/VyA29+3KWvPquJdoZ1lgPbMl6pp0mLNrik3URt07ljB/ +padqh/VI1IZK1xU1mF57YH0mrxPiKbZbRGp5nxcZz/kouTJ58RvTOfHb6MlZUd9Aq0vOg 692BW7zbfrUAexuMoeRHyB/t6qktn0/JzmPKu0oKzhZd2rIP4xPU1iS09J2rkrzrT1HdbO PsHFQ1STofHnl468MjdEki+l9XTScIVRxCB4S/439EG8sDTP3Ny+ns2qpTs5Fqb4yoFNq3 cx3J4cl4CcidbOH0pxl3XXEiZ1gdOrmEMqhtCfzKVDX1NXRoLQRtGVy+IZ8k2A== 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 D7B2B25C9F; Fri, 17 Jun 2022 19:40:51 +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 25HJepmb026367; Fri, 17 Jun 2022 19:40:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25HJep8S026366; Fri, 17 Jun 2022 19:40:51 GMT (envelope-from git) Date: Fri, 17 Jun 2022 19:40:51 GMT Message-Id: <202206171940.25HJep8S026366@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: f78fd0224353 - stable/13 - linux(4): Convert the native kernel signal codes into the Linux codes 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: f78fd022435371f9c7c1da2161e3cfe4274989eb Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494853; 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=AhvZbjfaL4OXocfrb+XLmf7fupEoDvXAxhlf/w268fM=; b=ixH2ZhbgAJflVCEQGR3rdK4Aov6iok0I2bI8oA4xqG+ZMh8d9G310dkDcdHIRyx/qjUgy3 sHBgRG+1B9KqBMbTrWHt0zyQDWlskPMz3ems3PrmdbgKLdDCbJVhG+mhGJYB3+2ve2Rc86 XtjuSLWmrgAGfgehjar/AkuZGx18FmgxJfyUzJstOG7NYZjRZ+63Q02NrLHkwm4I5eW6PJ teNCt2SIVTNjz6BTvX9n08sRoIFvGB94lF9WpDNuoI39Gm7ZkbZwaJEnLPjs0+C3U554qr EQilhayQ92q9JE8ZtL0KGH2rxHDibnu7ucRGNTyM9wHWNp6hjUaa23WrVfgRvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655494853; a=rsa-sha256; cv=none; b=Nk8By8eFh/6vs+bOA3vhO0z1Ku5UXxdaV27OePrBLo8uOntuWc4a7fJr0Kpt5f2SeepTr/ aTNhwebgjS0c52Wdt1iSf5/xoSsEmhTs/NS2rw4jTBl4HkWtkhkJCbeRbUheubHOoGaBFO 0xq9l4u+xXUxMhQkYX6fwE6SaxFIxNArURqWyrhVx74COcWo4Tv5zyBUfcmcfNkrGejIER 4t/S/hkzp/RYZZzkivyJKBoBq5O5hVRkQZPFbeG5K36su+DKV53qT2rSQoWzt4LooZiia0 OJ/kHpoWwTO5JRx00r1yu711A33VP3OtncxKgIVvRChiKOZQ75MnKMYoYn65Vw== 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=f78fd022435371f9c7c1da2161e3cfe4274989eb commit f78fd022435371f9c7c1da2161e3cfe4274989eb Author: Dmitry Chagin AuthorDate: 2022-05-19 16:56:50 +0000 Commit: Dmitry Chagin CommitDate: 2022-06-17 19:35:26 +0000 linux(4): Convert the native kernel signal codes into the Linux codes MFC after: 2 weeks (cherry picked from commit a6f85b12bbe8e50243350c77b0c5879d9e72f85b) --- sys/compat/linux/linux_signal.c | 78 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 74 insertions(+), 4 deletions(-) diff --git a/sys/compat/linux/linux_signal.c b/sys/compat/linux/linux_signal.c index a9af0d726f56..9aecb8497f3b 100644 --- a/sys/compat/linux/linux_signal.c +++ b/sys/compat/linux/linux_signal.c @@ -65,7 +65,7 @@ static int linux_tdksignal(struct thread *td, lwpid_t tid, int tgid, int sig, ksiginfo_t *ksi); static int linux_tdsignal(struct thread *td, lwpid_t tid, int tgid, int sig); -static void sicode_to_lsicode(int si_code, int *lsi_code); +static void sicode_to_lsicode(int sig, int si_code, int *lsi_code); static int linux_common_rt_sigtimedwait(struct thread *, l_sigset_t *, struct timespec *, l_siginfo_t *, l_size_t); @@ -565,8 +565,62 @@ linux_tkill(struct thread *td, struct linux_tkill_args *args) return (linux_tdsignal(td, args->tid, -1, sig)); } +static int +sigfpe_sicode2lsicode(int si_code) +{ + + switch (si_code) { + case FPE_INTOVF: + return (LINUX_FPE_INTOVF); + case FPE_INTDIV: + return (LINUX_FPE_INTDIV); + case FPE_FLTIDO: + return (LINUX_FPE_FLTUNK); + default: + return (si_code); + } +} + +static int +sigbus_sicode2lsicode(int si_code) +{ + + switch (si_code) { + case BUS_OOMERR: + return (LINUX_BUS_MCEERR_AR); + default: + return (si_code); + } +} + +static int +sigsegv_sicode2lsicode(int si_code) +{ + + switch (si_code) { + case SEGV_PKUERR: + return (LINUX_SEGV_PKUERR); + default: + return (si_code); + } +} + +static int +sigtrap_sicode2lsicode(int si_code) +{ + + switch (si_code) { + case TRAP_DTRACE: + return (LINUX_TRAP_TRACE); + case TRAP_CAP: + return (LINUX_TRAP_UNK); + default: + return (si_code); + } +} + static void -sicode_to_lsicode(int si_code, int *lsi_code) +sicode_to_lsicode(int sig, int si_code, int *lsi_code) { switch (si_code) { @@ -592,7 +646,23 @@ sicode_to_lsicode(int si_code, int *lsi_code) *lsi_code = LINUX_SI_TKILL; break; default: - *lsi_code = si_code; + switch (sig) { + case LINUX_SIGFPE: + *lsi_code = sigfpe_sicode2lsicode(si_code); + break; + case LINUX_SIGBUS: + *lsi_code = sigbus_sicode2lsicode(si_code); + break; + case LINUX_SIGSEGV: + *lsi_code = sigsegv_sicode2lsicode(si_code); + break; + case LINUX_SIGTRAP: + *lsi_code = sigtrap_sicode2lsicode(si_code); + break; + default: + *lsi_code = si_code; + break; + } break; } } @@ -603,7 +673,7 @@ siginfo_to_lsiginfo(const siginfo_t *si, l_siginfo_t *lsi, l_int sig) /* sig alredy converted */ lsi->lsi_signo = sig; - sicode_to_lsicode(si->si_code, &lsi->lsi_code); + sicode_to_lsicode(sig, si->si_code, &lsi->lsi_code); switch (si->si_code) { case SI_LWP: