From nobody Fri Jun 17 19:37:25 2022 X-Original-To: dev-commits-src-all@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 D9A9A85A839; Fri, 17 Jun 2022 19:37:26 +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 4LPq7V0zQ4z3Pl6; Fri, 17 Jun 2022 19:37:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494646; 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=Og3iwHpZ0hBw+k6msaBcJ9Xd9eLQvCHF+NnfPxUa+/w=; b=vht8VKhesA8Ob8RnAFbRprZncHGI4HMqlQT5oZO7G54Xq8LmcWbmMH7Q3lYnSM51XxUrNL GSzHy57CqL/MG9SODMNM9a2kibRoIwiYsErhC62KWYqBFAeqcHDLkyyFuQTYX49qh+CQ9d G5KSS5ZxI7grRw/9fWJj5g9JGUf6QjeV9PldPqHKPBa78pnXRjcTv4BUXTrCMPV+VdDSdu c3uxltKZp72JHZJ4kV61Dia4fksvmVKb5twCpFxYoQHWjb34fG2z4jMNMyrv1V5QgttlKc 8CmeBjJfIC5CvXQE4NY6MEMjVYqRWVa1OW6Zrjdn+WD8lPS8sp/8ZYw0vwVohQ== 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 BA44C257D1; Fri, 17 Jun 2022 19:37:25 +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 25HJbPCG013335; Fri, 17 Jun 2022 19:37:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25HJbP6Y013334; Fri, 17 Jun 2022 19:37:25 GMT (envelope-from git) Date: Fri, 17 Jun 2022 19:37:25 GMT Message-Id: <202206171937.25HJbP6Y013334@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: 85f6b0c801ab - stable/13 - umtx: Add umtxq_requeue Linux emulation layer extension. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 85f6b0c801abecd35a42d630fe3a2b6f301fc785 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494646; 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=Og3iwHpZ0hBw+k6msaBcJ9Xd9eLQvCHF+NnfPxUa+/w=; b=g7P+HTfKVJQYcA/UmQKIdpTyqBEjXonmnacyrjeTjrDOBX1FK8mZK1Ccq23OJ5ZVZttkPj 1WiXBOYJrJUXRPMmuUx2h7zwHsXOgxwDV1BDyQMXMiGazEvXrhAItBH3Dx5Eh3/cXHKst9 bNYLixFtAOCfrM4AyOe0B8gkNcAV6z9spX0hWDaL7g+IRGsTa7urAaagvIKu7d5QshpYIK +lPYG9LIeELwCYd82x69/s1ClOcdqKP4Qdp4k+n/Zp4e78k6ZSjl0++9cd47UEl8trzz6p S4yCUNxIuTEA9o1HZXEaX4wm+WDGh5LNtvrOQ23ALzDe9PuwQ1HfeI15w4/cCg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655494646; a=rsa-sha256; cv=none; b=v+/tuSm9c+L7peAke14JgtwKro/EdyrtPVyI+Jiz2yyX6I/I3Je/fhOt0uXk0U66Qn1RJ/ W2CjlzHpeuDhuCK807sMHlQEagybNaNNq3b/xilDODdoOzIthsmkVASYNpBtr235SnZtu+ 0EDl1O0WS0guTacSgHuX22UJTQBadU/UjaCJc2djuJKJjFGEZBU6VseJqefMGFzAimuw/j FAFJJtv8ukyq6wrYFiDwrZEnaE3Otn0/0n3R5Xz6UyP4icdkset+lEj2FebM7CgarY7z2t 0QmpmRzEBRrSKqH1ga53aw4CmmoykTz+agiBnvNAIMCjq/4BMTjF9/G+YFoWhQ== 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=85f6b0c801abecd35a42d630fe3a2b6f301fc785 commit 85f6b0c801abecd35a42d630fe3a2b6f301fc785 Author: Dmitry Chagin AuthorDate: 2021-07-29 09:43:07 +0000 Commit: Dmitry Chagin CommitDate: 2022-06-17 19:33:17 +0000 umtx: Add umtxq_requeue Linux emulation layer extension. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D31235 MFC after: 2 weeks (cherry picked from commit 8e4d22c01d8f76ae144f32b4c5fac40451429891) --- 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 256c7e048ba5..1ffa14b7cadb 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 *);