From nobody Fri Jun 17 19:41:29 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 2125585DD1C; Fri, 17 Jun 2022 19:41:31 +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 4LPqDB1l5sz3jTd; Fri, 17 Jun 2022 19:41:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494890; 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=w3gQ8vWdTMktPi4ke/8Re88KcQ1dCLZMw2lqtLX7DdU=; b=qjeDMaBFHnjNo3/JguPxXVSj9tE2+u4zABoqssySoM6Vln1tOH6cNnEACnGgjKrKS3Zjjv bPqezviqAJuGVRwUW3AYU76IfK2fAGDuZzhl1lGskpsQ23FVfHya01zHre3wfKHTY7eBQo HHJcK7JVUdslgiGZDzfnNpmEepJblTJ9rOgeuPDoXu8Ppr+XCWmCKZ6Fv5sF2gqoB+1QKh d6kdRX9Nuc0uLTlPpXSH2DaT0Oiuek55roKNPUcByzCO5DgtBD+KL089K6ntPrRywT+K39 gvyCqIwSFRm2kSbF3auX4+PpqTpR4WnCBG9U38mCt90jDj/ALpX8cq2sWalqOg== 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 8D18A259E8; Fri, 17 Jun 2022 19:41:29 +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 25HJfTb3030539; Fri, 17 Jun 2022 19:41:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25HJfTSo030538; Fri, 17 Jun 2022 19:41:29 GMT (envelope-from git) Date: Fri, 17 Jun 2022 19:41:29 GMT Message-Id: <202206171941.25HJfTSo030538@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: 4312a49826db - stable/13 - linux(4): Refactor SIGPWR mapping 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: 4312a49826db566704e7729719559e6a495b6ceb Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494890; 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=w3gQ8vWdTMktPi4ke/8Re88KcQ1dCLZMw2lqtLX7DdU=; b=WOJ8pBnnrnNtpPkJCvoN+nmIVGAzQRkza6HhP7I0lc6EaOe+QDF04nwnqqYWS073GVLSVa 33Q9sRr+3ctC5YpN3i6rRi+c4EVcY7M5HuBFC9hDr99koi3b8Is5hTlx9GKAkAbblyT4y8 xsZpNLNAV/mXrnz2MABQ0aRrPAj/cU7y684dO6Z7igDCcEENdMrpd+3oQov7H8RHOdFhcp gQdXUwJTQalfhf8hsjPNbf+7mVTTqjfN0n/Zd9POYfHcQaiPqdi0RTLe+VuDhhj/ttfD3B XeFULGJoRRBpLAyGwmH2LmnCtABsIgetzTAJKMTyvTMzZvWZnSc+X7tESDHFLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655494890; a=rsa-sha256; cv=none; b=qVF/EC4+tyUE0uXf8WLHUUDKV4cyNsM4qHfNp7PasFqdKVYX44CZL+mghqHtpFovS91OI8 ixeRYWdgatKqqJlv35Fpbmt3MfZof8ng2DLvPd341SnOnHAM5zENj2KbGBvleJBKD2OWKk BGN2TzH+FhnjCvZaxpyGNF+z+sxVKKI2T8jo3yqXuXxHuI97hbJv+H2chym613aUw0wC6C DcDiIROpkJx2c6pMwssrF0cQ3EgMGo/LLZoAwu55Fa5tMc4KdY2YcV+jgTXqN1tP6z8Zz4 3pBdcB+eILuE1T7jRherON2vTZoKerpgWvYD2MTmXKnZfaUAjFbPR1etXPqIpw== 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=4312a49826db566704e7729719559e6a495b6ceb commit 4312a49826db566704e7729719559e6a495b6ceb Author: Dmitry Chagin AuthorDate: 2022-05-30 16:55:49 +0000 Commit: Dmitry Chagin CommitDate: 2022-06-17 19:35:39 +0000 linux(4): Refactor SIGPWR mapping Map Linux RT signals to the native RT signals starting from SIGRTMIN, and Linux SIGPWR signal map to after the last RT signal. MFC after: 2 weeks (cherry picked from commit 7a7cee558501a27e5b7437d012a1139ca77d97f2) --- sys/compat/linux/linux.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sys/compat/linux/linux.c b/sys/compat/linux/linux.c index 7d16edf88b67..542c6f37dd83 100644 --- a/sys/compat/linux/linux.c +++ b/sys/compat/linux/linux.c @@ -92,6 +92,8 @@ static int bsd_to_linux_sigtbl[LINUX_SIGTBLSZ] = { LINUX_SIGUSR2 /* SIGUSR2 */ }; +#define LINUX_SIGPWREMU (SIGRTMIN + (LINUX_SIGRTMAX - LINUX_SIGRTMIN) + 1) + static int linux_to_bsd_sigtbl[LINUX_SIGTBLSZ] = { SIGHUP, /* LINUX_SIGHUP */ SIGINT, /* LINUX_SIGINT */ @@ -127,7 +129,7 @@ static int linux_to_bsd_sigtbl[LINUX_SIGTBLSZ] = { * to the first unused FreeBSD signal number. Since Linux supports * signals from 1 to 64 we are ok here as our SIGRTMIN = 65. */ - SIGRTMIN, /* LINUX_SIGPWR */ + LINUX_SIGPWREMU,/* LINUX_SIGPWR */ SIGSYS /* LINUX_SIGSYS */ }; @@ -144,14 +146,14 @@ static inline int linux_to_bsd_rt_signal(int sig) { - return (SIGRTMIN + 1 + sig - LINUX_SIGRTMIN); + return (SIGRTMIN + sig - LINUX_SIGRTMIN); } static inline int bsd_to_linux_rt_signal(int sig) { - return (sig - SIGRTMIN - 1 + LINUX_SIGRTMIN); + return (sig - SIGRTMIN + LINUX_SIGRTMIN); } int @@ -172,7 +174,7 @@ bsd_to_linux_signal(int sig) if (sig <= LINUX_SIGTBLSZ) return (bsd_to_linux_sigtbl[_SIG_IDX(sig)]); - if (sig == SIGRTMIN) + if (sig == LINUX_SIGPWREMU) return (LINUX_SIGPWR); return (bsd_to_linux_rt_signal(sig));