From nobody Fri Jun 17 19:32:02 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 53332853A52; Fri, 17 Jun 2022 19:32:04 +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 4LPq1H0RkDz3K7x; Fri, 17 Jun 2022 19:32:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494324; 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=gxzzzHyJI+sEA9twsTnHVq49qGgYTAcVrz1mFNp2yNs=; b=O+DYJbSZFmn3zRfuch49VRp+TUq1iWZhxuHJgNk03ZG5y+8HMzI1rO5vDXOzEXurIIP343 W76uBKULO8N2avqhmD9NPcFektmJ0dLsGVUmqOJrtdeAqKevtDMmgh3tfaASHpt0yqNbfR nmsyWI2mYI7S1gfj27WvbhvgCx1VubrfTk8wUFVh96mS0P2aM2qWHJxvd/vZ/XHZ/zByG1 C2/XqNlENiJ9RMFkZCIhpCVRwwJjCXA8oHH9nKwk7tEqOVWA8nend48G8a72qtvZ6V7+jE 0VPar9lscROeXej6iv1XxsLRIp9hqYgFhXV3Y8NHZQ1r/xIwa39oRUvyU+X0MQ== 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 ABFC4257BF; Fri, 17 Jun 2022 19:32:02 +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 25HJW2p5007937; Fri, 17 Jun 2022 19:32:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25HJW2rV007936; Fri, 17 Jun 2022 19:32:02 GMT (envelope-from git) Date: Fri, 17 Jun 2022 19:32:02 GMT Message-Id: <202206171932.25HJW2rV007936@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: b7289a2e083f - stable/13 - linux(4): Implement poll system call via linux_common_ppol() for the sake of converting events to/from native. 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: b7289a2e083f127c4c7abd9157d4412ad75d733a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494324; 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=gxzzzHyJI+sEA9twsTnHVq49qGgYTAcVrz1mFNp2yNs=; b=wBrf8+Jk7fFKNn5huAB9ChVq80I6YS/ZhbMHfeMmVUFzqHb0mO0ztQsdU0OUpZsIXZ/rpx uU1GBi9c28ueQg23dqzUquZsmHF6ZegpuT2BUHXW6mD9XH/DMtFmqxNvKkFSCLIi7VwJvh QcVtm69wZyho2T9khVt7FyxgMaWuXMf3VlT7gmgS0BJG8vVBBrl0Hl1wuxA0zq+5aconN5 hNAXdHGawLu/UhAIMa/aemxpuW8k/mXX71zMts+2nAXfr+JZ6UH4qF8/B1/590NonIT1EL 0MOW7l5OttzO8CaFVmJ7vUntBLFcUAeeqtHJfH38TkKqE4qN/Y/IMSKNuV0MeQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655494324; a=rsa-sha256; cv=none; b=h8YWF5fGCurNOlL3V5js6i4J6V2UtWDR6PF/ug748OU4Tq443QsyWC3QNJ3SSY2+aPb52a POUtM5QTgWxiaG+K9ZKG7pZXDdF/XJZrgZllkvOZ7eytttxPARp5CIWNFVoHod/GxDA+mz racxzJ0pfoZrvqvRw116EurzvPhSpGFos3kttdhUdNJcpXFR+NmQOBV+Dquk8YxzzQaESH IBoGbls9mzo1blTB55cTrrrSrgyVwY8hyiY3vsRV5Zbj3mmILlXhgNpZREj1jxgv1+Q2jp rsga5VvwzUTA+4LJAp6PgtlW/cSFgGQaaOVCqAiUxQHIYR+WUGo2zdNkOeqvjw== 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=b7289a2e083f127c4c7abd9157d4412ad75d733a commit b7289a2e083f127c4c7abd9157d4412ad75d733a Author: Dmitry Chagin AuthorDate: 2021-06-22 05:07:46 +0000 Commit: Dmitry Chagin CommitDate: 2022-06-17 19:30:19 +0000 linux(4): Implement poll system call via linux_common_ppol() for the sake of converting events to/from native. MFC after: 2 weeks (cherry picked from commit 2eff670fde51762239fc64139b0cfb5272ce9cdd) --- sys/amd64/linux/syscalls.master | 4 ++-- sys/amd64/linux32/syscalls.master | 4 ++-- sys/arm/linux/syscalls.master | 4 ++-- sys/compat/linux/linux_misc.c | 20 ++++++++++++++++++++ sys/i386/linux/syscalls.master | 4 ++-- 5 files changed, 28 insertions(+), 8 deletions(-) diff --git a/sys/amd64/linux/syscalls.master b/sys/amd64/linux/syscalls.master index 0cac26337ef1..4762a2ccc6a5 100644 --- a/sys/amd64/linux/syscalls.master +++ b/sys/amd64/linux/syscalls.master @@ -82,8 +82,8 @@ struct l_newstat *buf ); } -7 AUE_POLL NOPROTO { - int poll( +7 AUE_POLL STD { + int linux_poll( struct pollfd *fds, u_int nfds, int timeout diff --git a/sys/amd64/linux32/syscalls.master b/sys/amd64/linux32/syscalls.master index 0ca919182998..be6c150eebfa 100644 --- a/sys/amd64/linux32/syscalls.master +++ b/sys/amd64/linux32/syscalls.master @@ -887,8 +887,8 @@ } 166 AUE_NULL UNIMPL vm86 167 AUE_NULL UNIMPL query_module -168 AUE_POLL NOPROTO { - int poll( +168 AUE_POLL STD { + int linux_poll( struct pollfd *fds, unsigned int nfds, int timeout diff --git a/sys/arm/linux/syscalls.master b/sys/arm/linux/syscalls.master index 42adc18bbe1e..46cf988c3dfe 100644 --- a/sys/arm/linux/syscalls.master +++ b/sys/arm/linux/syscalls.master @@ -744,8 +744,8 @@ } 166 AUE_NULL UNIMPL ; was linux_vm86 167 AUE_NULL UNIMPL ; was linux_query_module -168 AUE_POLL NOPROTO { - int poll( +168 AUE_POLL STD { + int linux_poll( struct pollfd* fds, unsigned int nfds, long timeout diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c index 90a89578fc8f..a6e170f47435 100644 --- a/sys/compat/linux/linux_misc.c +++ b/sys/compat/linux/linux_misc.c @@ -2867,3 +2867,23 @@ linux_getcpu(struct thread *td, struct linux_getcpu_args *args) error = copyout(&node, args->node, sizeof(l_int)); return (error); } + +#if defined(__i386__) || defined(__amd64__) +int +linux_poll(struct thread *td, struct linux_poll_args *args) +{ + struct timespec ts, *tsp; + + if (args->timeout != INFTIM) { + if (args->timeout < 0) + return (EINVAL); + ts.tv_sec = args->timeout / 1000; + ts.tv_nsec = (args->timeout % 1000) * 1000000; + tsp = &ts; + } else + tsp = NULL; + + return (linux_common_ppoll(td, args->fds, args->nfds, + tsp, NULL, 0)); +} +#endif /* __i386__ || __amd64__ */ diff --git a/sys/i386/linux/syscalls.master b/sys/i386/linux/syscalls.master index f75b1253bc14..acbe5628e7ce 100644 --- a/sys/i386/linux/syscalls.master +++ b/sys/i386/linux/syscalls.master @@ -912,8 +912,8 @@ int linux_vm86(void); } 167 AUE_NULL UNIMPL query_module -168 AUE_POLL NOPROTO { - int poll( +168 AUE_POLL STD { + int linux_poll( struct pollfd *fds, unsigned int nfds, long timeout