From nobody Mon May 30 17:04:23 2022 X-Original-To: dev-commits-src-main@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 16E5A1B60AB2; Mon, 30 May 2022 17:04:24 +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 4LBhbC61G1z4krG; Mon, 30 May 2022 17:04:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653930263; 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=zIol8LPCWPOIcIfzxGfCZC+XtYQQR4j8ajyZg9n2v9Y=; b=FVCS+42J9wQ9fNshD1u3Xi0h60J4ksuzUVlyVOgnZgTAB3gxh+EUHw4qe/9AloCXv7lK7G kc5VgkW3RMvSc3dU80zBzRiJ41HXh9zVqxDWpjRZ2VuTLnpE8EpU7VMNamW4NMpamPhnZV 1JXFj0+Lw4gAHE6SwcuAWfBVdaIoSmRc5BG1skjC8Md/xpQshiU0X/cDdKp6kcOgCk/Uab 6OTmD43TDtoHkFOP7KaLIf+emNqAD4L9/oBgJheoKEZNjnn+6QTSZLpQG5kSphSAvLBMkL SiVFzcJ/tUL8DRSNX+09pJrfXZbWIcy8W4LKRHiFhq1W1lFx9kvPoTFBunmv3g== 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 33C761AF66; Mon, 30 May 2022 17:04:23 +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 24UH4Nto067900; Mon, 30 May 2022 17:04:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24UH4Nwc067899; Mon, 30 May 2022 17:04:23 GMT (envelope-from git) Date: Mon, 30 May 2022 17:04:23 GMT Message-Id: <202205301704.24UH4Nwc067899@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: 7a7cee558501 - main - linux(4): Refactor SIGPWR mapping List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 7a7cee558501a27e5b7437d012a1139ca77d97f2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653930263; 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=zIol8LPCWPOIcIfzxGfCZC+XtYQQR4j8ajyZg9n2v9Y=; b=F7hszI5L6UY3PAnrE0tRFgmze13eGXn5kVosSWZcSfrm5+Uy1Vn4T97v73p3OC3wYT0LOu WGWTaArpUYUkg6C/+MZBR12XUueBoC1I0Q1Sq0RpIoSLBDvJZls4fYom1PnNdQhAUcbK2t f64kAZzNzTsRY5Z9yhJaWbp9GpxNzam9sJzXydF0ZL8MOCZ2KU576kxHAEEUE7JKSqTt5S Re0ADaWnVuMRLKzj1C+xI2hfAvIvMfwMnC/zoJIgO1F0VyNm6smV45eFsCXTBCSX+WyQwk rRnk+2rdpqYxs8LrCi5ddaWLEm6B0ioyABW8gS/VZPrG6afWVnDnGveWHK2aUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653930263; a=rsa-sha256; cv=none; b=Zbu0llLgPmc4MKgJ/15PqCKuMkX8xqMRjZKT4MOWREtGEzWmlCUFuciOKiC30ZYUNXmtUj wzUPEfYIn82TXTpCzFbnvaQVKzSYo1kTYff6EltoZpsorF6s5FPlrBZGgEINEHEF1zy2D2 Im9n8Jy0SesiowF3onO5z9mUKOPXccu3jkTWpyJVGul48dUL/BDrFFSJsmdCdNHLH/HuBY jpbP9hv7eTosh5lv+6wMN1faua2/L28PyHPsAyFhlE+2/Jl9GH2xkNot4+qdHQMeoxJmCD zDbSM2y1u5jA8eDyOIjsoN4V6TQzD+9owd04mlFanV+zCkkgFZFnjgxuEdElrw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=7a7cee558501a27e5b7437d012a1139ca77d97f2 commit 7a7cee558501a27e5b7437d012a1139ca77d97f2 Author: Dmitry Chagin AuthorDate: 2022-05-30 16:55:49 +0000 Commit: Dmitry Chagin CommitDate: 2022-05-30 16:55:49 +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 --- 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 f29fc2b6743a..340fdb37e2a2 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));