From nobody Thu Feb 29 00:26:15 2024 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 4TlX873gJsz5Cj0b; Thu, 29 Feb 2024 00:26: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 4TlX873DlTz54Sv; Thu, 29 Feb 2024 00:26:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709166375; 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=G4gEB4ty9woF0P/0EW6hUK5nCW4U6TdSo1KgvHYTuhA=; b=UWIhPh02syd5lTkaa8DuNMNSfnj3w+m7UBe/nu/ocgkDJoZJghyK1/s1Xzf3yMWd2oJhkx Z/hb4/3P+S2NNmC8TRWAyfyRfOLgp3MEGl6vNoJBTk5zNLJZXXCjg5LYCHhgwClFwTEiWQ qHsd8JX+GuLnQr4UYrHiJVW5zrRZj6DtIr/x/YvG3xRDAW/Bm9QpecBSdFqeuwi36dFQXS GlENHHEGNxjnMZ4wHpP2S47l2cDBlcRF6G3Q5EjTJWPqpfU3fCjg38pnQgSHnbrKU1Cv/y FaGeRczJKC+vOuYm4Xl6mIqDgjU3SQCuSAWEpsteIZUGjQBA0ZrJ7YDA6qwCMQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709166375; a=rsa-sha256; cv=none; b=Y2BKH4HSD4j9j9P5zB2WbmjHABCYg3mz/xGhshfL7NvX+mErXI54dTpEIRv4bv7bkLxBUs cO3GICqZT1xMF7bVEn5jbEfSvHqr05169tRDdygnolOXulXb9LItJSKg6WBBC2Rf5Wz0hb AatMHdUD7CqtLqF4Dj4DSA6XTpjkeafwAoV9X/YehiEuws1ryE1MHMg/gd4Jp4h3bd7pSW CRxKEIS08y9YosriSrJatIbUgT76oQfgYJwPKpMkkjkgQW1toQoqjXEGqyeudxpmoe9Zil Z0dknw7LlYLX8zLGwl97OJ0yxfhpylsWvRbxrg8AqRbzX+izfi1FKID7St+VrQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709166375; 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=G4gEB4ty9woF0P/0EW6hUK5nCW4U6TdSo1KgvHYTuhA=; b=bo+flw0v/mJBBqlL7DiJ3zAbu4Wmzs84YjJO2pVxiJeBZRD63mNRX8YSuPkmP16PyIEJAK 8hCwMd71WN67vduMsHAznvsQNcP8ycYzr6dbandcMIfaZAfE48Uu1MZMwTg/xcx+GkLmYF 9GbLeD5huXgdX1+at2y1h/3DNEiS7Bvbfjqqh+BKfIpdkuS4y2xecRGiq7vWLvCjYRq0vh BS5NEPLpJEstiG11XatHLr4nd5biJJRQIpesMjJzxQ6MYYA8jNKkMd4Iuj55STYGt/L4gR YsKDmg44WTJbI8vGtSabddVWkIPnRNNf8mXOGSZsZqy9nhc45jXmbbb6lxW1fw== 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 4TlX872rf4zJGY; Thu, 29 Feb 2024 00:26:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41T0QFUp096768; Thu, 29 Feb 2024 00:26:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41T0QF4w096765; Thu, 29 Feb 2024 00:26:15 GMT (envelope-from git) Date: Thu, 29 Feb 2024 00:26:15 GMT Message-Id: <202402290026.41T0QF4w096765@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: 2d5c2324af33 - stable/13 - rtld-elf: Avoid unnecessary lock_restart_for_upgrade() calls 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: 2d5c2324af335541c40bf9ba682283c7e735ef89 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=2d5c2324af335541c40bf9ba682283c7e735ef89 commit 2d5c2324af335541c40bf9ba682283c7e735ef89 Author: Mark Johnston AuthorDate: 2024-02-01 22:43:05 +0000 Commit: Konstantin Belousov CommitDate: 2024-02-29 00:24:43 +0000 rtld-elf: Avoid unnecessary lock_restart_for_upgrade() calls (cherry picked from commit e7951d0b04e6464b37264b8166b1e9ce368a9f1d) --- libexec/rtld-elf/rtld.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index 27958ce00398..56fca9cd60b2 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -2617,8 +2617,8 @@ static void load_filtees(Obj_Entry *obj, int flags, RtldLockState *lockstate) { - lock_restart_for_upgrade(lockstate); if (!obj->filtees_loaded) { + lock_restart_for_upgrade(lockstate); load_filtee1(obj, obj->needed_filtees, flags, lockstate); load_filtee1(obj, obj->needed_aux_filtees, flags, lockstate); obj->filtees_loaded = true;