From owner-dev-commits-src-main@freebsd.org Thu Jul 29 09:46:11 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id DF2EC66FFE5; Thu, 29 Jul 2021 09:46:11 +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 4Gb5JM1W06z3sFt; Thu, 29 Jul 2021 09:46:11 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 ECD4C76AB; Thu, 29 Jul 2021 09:46:10 +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 16T9kA1c056829; Thu, 29 Jul 2021 09:46:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16T9kAl4056828; Thu, 29 Jul 2021 09:46:10 GMT (envelope-from git) Date: Thu, 29 Jul 2021 09:46:10 GMT Message-Id: <202107290946.16T9kAl4056828@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: 8e4d22c01d8f - main - umtx: Add umtxq_requeue Linux emulation layer extension. 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: 8e4d22c01d8f76ae144f32b4c5fac40451429891 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Jul 2021 09:46:12 -0000 The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=8e4d22c01d8f76ae144f32b4c5fac40451429891 commit 8e4d22c01d8f76ae144f32b4c5fac40451429891 Author: Dmitry Chagin AuthorDate: 2021-07-29 09:43:07 +0000 Commit: Dmitry Chagin CommitDate: 2021-07-29 09:43:07 +0000 umtx: Add umtxq_requeue Linux emulation layer extension. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D31235 MFC after: 2 weeks --- sys/kern/kern_umtx.c | 37 +++++++++++++++++++++++++++++++++++++ sys/sys/umtxvar.h | 1 + 2 files changed, 38 insertions(+) diff --git a/sys/kern/kern_umtx.c b/sys/kern/kern_umtx.c index d869d5870000..7c850c0d78d8 100644 --- a/sys/kern/kern_umtx.c +++ b/sys/kern/kern_umtx.c @@ -621,6 +621,43 @@ umtxq_signal_thread(struct umtx_q *uq) wakeup(uq); } +/* + * Wake up a maximum of n_wake threads that are waiting on an userland + * object identified by key. The remaining threads are removed from queue + * identified by key and added to the queue identified by key2 (requeued). + * The n_requeue specifies an upper limit on the number of threads that + * are requeued to the second queue. + */ +int +umtxq_requeue(struct umtx_key *key, int n_wake, struct umtx_key *key2, + int n_requeue) +{ + struct umtxq_queue *uh, *uh2; + struct umtx_q *uq, *uq_temp; + int ret; + + ret = 0; + UMTXQ_LOCKED_ASSERT(umtxq_getchain(key)); + UMTXQ_LOCKED_ASSERT(umtxq_getchain(key2)); + uh = umtxq_queue_lookup(key, UMTX_SHARED_QUEUE); + uh2 = umtxq_queue_lookup(key2, UMTX_SHARED_QUEUE); + if (uh == NULL) + return (0); + TAILQ_FOREACH_SAFE(uq, &uh->head, uq_link, uq_temp) { + if (++ret <= n_wake) { + umtxq_remove(uq); + wakeup_one(uq); + } else { + umtxq_remove(uq); + uq->uq_key = *key2; + umtxq_insert(uq); + if (ret - n_wake == n_requeue) + break; + } + } + return (ret); +} + static inline int tstohz(const struct timespec *tsp) { diff --git a/sys/sys/umtxvar.h b/sys/sys/umtxvar.h index de1b649ed8d7..ed2d8046a5fb 100644 --- a/sys/sys/umtxvar.h +++ b/sys/sys/umtxvar.h @@ -210,6 +210,7 @@ void umtxq_free(struct umtx_q *); struct umtxq_chain *umtxq_getchain(struct umtx_key *); void umtxq_insert_queue(struct umtx_q *, int); void umtxq_remove_queue(struct umtx_q *, int); +int umtxq_requeue(struct umtx_key *, int, struct umtx_key *, int); int umtxq_signal_mask(struct umtx_key *, int, u_int); int umtxq_sleep(struct umtx_q *, const char *, struct umtx_abs_timeout *);