From nobody Wed Feb 8 00:27:14 2023 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 4PBLRR18l5z3p8lS; Wed, 8 Feb 2023 00:27:15 +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 4PBLRQ58bdz43X0; Wed, 8 Feb 2023 00:27:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675816034; 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=7Nkr+nZiLd6IXkuZtC9J907L3yZJJk1IK+4MS+Lmzsg=; b=gcXCOUVqmfP5DEy6m9ryxJNE19zzfjqzbfEKIRFLYDByVOyAgs19rKArOp1xHFPNDIZpJx 6mH5VJLzvfRQwkJcEUU+sQy07HoILo6xlQ1LQRbYtc+i7h410q95ADH2Mfx6Rtg/4yLn7e Q+eykXHj2NXzhpN3tW0ZimGY/DvWFYtD9iI/kxpMgK6d6GIsjcOo+cdvfJhhOlbYexuyjB GfXFBQYqoC5pZhts1nhI8dTa0oc0eWjHRnonPeYRSkadWKb1Oapj8lVEQL8fIaxx6/zXkn sux/gNwWfCZftsSsjoS09T4gsmkIktUfiG/WxRdS0B3SZvFnyfD1EP0pFkipWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675816034; 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=7Nkr+nZiLd6IXkuZtC9J907L3yZJJk1IK+4MS+Lmzsg=; b=Ej5k8c1ODsOhpREO/attlUYBLurqLDTowJcxiM4NEL0fiKgRs44nCziVN2lAha3+AS3cxo xtF9iXSGDigOnSH1TldbWoDSkC/4TbZMTFcD0Ec1M8fp/VtpIeKyCHQU+AjQARnBKWJ3Iy Q17YcArslD3IGtpq10Kf4WAQbcCI0sTgMF8WPVD+MRWa9R6BSdnDdN8c952GA/vE59wi3M gt6tPI0uKqFYI6Zo0/fuy4lnzpT55804H29Y2r3Js1gSABf+LoFnD2HZbhpgtSEgEjnyg3 1TZpsxqFBnpSlYer2HehNX7Pzet4BYoVdbDg5FAm2a9FiWas2KAmpN0xzdE8hg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675816034; a=rsa-sha256; cv=none; b=ncgEgvTuNsUeS5ksnSNsqdfvykQic64de/T3Fw6LdrprkHpwzhP/h+IOtynqU1VJpZH1R1 ML/ZHcZ/Tyr8jwugL8nzEZVCcS08kYIyuB08uaEelLI30LaZiRvb9xM0BNr/sK4V1m5HLo 0enAGPSvcw8JtUUaK/qkC8+W4wO3RRCFCESif3/CBhcmQZB86AI6JKDOamo7EUTNn3aNpf DskAmw+UO1tJGro9rXOoQrgpQ7fT8usL9PKUeTNOGruG0bKEBSDmLrCzCEp3HOdL39usKs OrS7fVVtGkE4Yf1dbnr1LuoQaxnukpoANIM3CfvvN52Ku3LA2clgxNZKUK6uEw== 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 4PBLRQ4C2PzcVF; Wed, 8 Feb 2023 00:27:14 +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 3180REmq096576; Wed, 8 Feb 2023 00:27:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3180REGH096575; Wed, 8 Feb 2023 00:27:14 GMT (envelope-from git) Date: Wed, 8 Feb 2023 00:27:14 GMT Message-Id: <202302080027.3180REGH096575@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: c8452bdeed4f - stable/13 - libthr pshared: correct a bug in allocation 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c8452bdeed4fc1f1feadf36c6008367263292254 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c8452bdeed4fc1f1feadf36c6008367263292254 commit c8452bdeed4fc1f1feadf36c6008367263292254 Author: Konstantin Belousov AuthorDate: 2023-02-01 20:12:45 +0000 Commit: Konstantin Belousov CommitDate: 2023-02-08 00:26:59 +0000 libthr pshared: correct a bug in allocation PR: 269277 (cherry picked from commit 25c862ae503a1c99458f4e055fd50c878fadbea3) --- lib/libthr/thread/thr_pshared.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/lib/libthr/thread/thr_pshared.c b/lib/libthr/thread/thr_pshared.c index 37b44ab73582..446e9983bcae 100644 --- a/lib/libthr/thread/thr_pshared.c +++ b/lib/libthr/thread/thr_pshared.c @@ -232,11 +232,16 @@ __thr_pshared_offpage(void *key, int doalloc) int fd, ins_done; curthread = _get_curthread(); - pshared_rlock(curthread); - res = pshared_lookup(key); - pshared_unlock(curthread); - if (res != NULL) - return (res); + if (doalloc) { + pshared_destroy(curthread, key); + res = NULL; + } else { + pshared_rlock(curthread); + res = pshared_lookup(key); + pshared_unlock(curthread); + if (res != NULL) + return (res); + } fd = _umtx_op(NULL, UMTX_OP_SHM, doalloc ? UMTX_SHM_CREAT : UMTX_SHM_LOOKUP, key, NULL); if (fd == -1)