From nobody Mon Feb 5 20:38:24 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 4TTJ9s2zyVz58xqc; Mon, 5 Feb 2024 20:38:25 +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 4TTJ9s1mcsz4pnS; Mon, 5 Feb 2024 20:38:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707165505; 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=sBVHGIvZWh9i7lCwFgkfghvceu8deaxzTuTOJxASKTI=; b=xs6vAlZ2F6WgFnJgWpyH42I3yZnlDoQqPPAQlU8f0JSR/o0OlHkAjtHwFPXeZVij0R02yY NTurxOdP0WGp/6/k4hW2EivqyfjFm2T9YDH1NHgbPpwKI1RnNlJnioc9XWdQyOsx2kvkNE 9LRoojQ338HqrOgFHzPsQ/WC5+AhphlTzz1/bg0XF18UjWlYEurYpMJ41DByGM65XF2f0u IsxQtbxOd7xHPtkHD8AwAESiOyMMk10thl5LWUbGCVnVPdJnGSaES3OVJif2vEOyWxftjb 7DJCui27K2eetlzzJ6JhSaO/M/Shf7A5uYI+FNNxMKZzHaooRxe5ZymJanWaLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707165505; 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=sBVHGIvZWh9i7lCwFgkfghvceu8deaxzTuTOJxASKTI=; b=g3kDKdNDBQR+2+c3nXzBwUGvMypxkI1B1raTyjf7KqeIvSz2makHtRYPBhLHTkvzaZvU1J m0d/I7M4h21aEEP+vscbsH0TL0VqjQzkvvtDLiDcxaRBwez+Xa6ZJnz/pChOFw2R8MWSdD uuekUyQnY+JbsN+FvQZx5629kKz6cpj+hoW5dxU6RZzTVUYWpT0dsgg3zih97wUZou5zQ7 sZgiBDrmfp/h1w4yux6kCMagNh/d3BR78meiAYyFmzODpRW3XticKUQBPVCp70TjaQNf5p xdB7znvcmvXvJNBPZCV4yvl9wQhmMwU7iEANPUnxSjBoSvPpY1j1zZfaWB/mnQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707165505; a=rsa-sha256; cv=none; b=L9zTMFJlwF/mIOAB0O0v5adQAeZIvyrfraEKiEG2EzwZekuSDVGzWBT7byDy/NeeSXZG0p sB6z+jEUsQe38aOTxixQkMr3gh9YzAYXOG6bbJCH2yVeFZjBnCWT4BxZgyK5NJGM0xVUZF QjX8jCqLfP4aP2YfHoMc+QBjmmWgqaVam19D91m4/rkBDMd7eAOWGecQ3QKeAS/ZDzSEeE TwKfM/97g3MgO9NkLoxRi/VNFlb/FFD/WJR71vIzsAkJwnmsc4F6GZqc2mXKaXgZmB24EO qX7RIl8y945T6ijZ3euLEbQl/JG4E9R/lxE/cSXSQYoaZYXbZ2Zi9z/V5vSS0w== 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 4TTJ9s0WgFzvZQ; Mon, 5 Feb 2024 20:38:25 +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 415KcOXa068855; Mon, 5 Feb 2024 20:38:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 415KcOhN068852; Mon, 5 Feb 2024 20:38:24 GMT (envelope-from git) Date: Mon, 5 Feb 2024 20:38:24 GMT Message-Id: <202402052038.415KcOhN068852@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 228d8c9efe1e - main - libc: split libc and syscall interposing (2/2) 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: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 228d8c9efe1e9a2946a5e64ff33362a54b9c3b5d Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=228d8c9efe1e9a2946a5e64ff33362a54b9c3b5d commit 228d8c9efe1e9a2946a5e64ff33362a54b9c3b5d Author: Brooks Davis AuthorDate: 2024-01-16 22:51:40 +0000 Commit: Brooks Davis CommitDate: 2024-02-05 20:34:55 +0000 libc: split libc and syscall interposing (2/2) Move the __libc_interposing implementation to libc/gen so it doesn't end up in libsys. Reviewed by: kib, emaste, imp Pull Request: https://github.com/freebsd/freebsd-src/pull/908 --- lib/libc/gen/Makefile.inc | 1 + lib/libc/gen/Symbol.map | 2 ++ lib/libc/gen/libc_interposing_table.c | 56 +++++++++++++++++++++++++++++++++++ lib/libc/sys/Symbol.map | 1 - lib/libc/sys/interposing_table.c | 20 ------------- 5 files changed, 59 insertions(+), 21 deletions(-) diff --git a/lib/libc/gen/Makefile.inc b/lib/libc/gen/Makefile.inc index f657bd949cb7..5c3f029586b8 100644 --- a/lib/libc/gen/Makefile.inc +++ b/lib/libc/gen/Makefile.inc @@ -98,6 +98,7 @@ SRCS+= __getosreldate.c \ kqueue1.c \ lcong48.c \ libc_dlopen.c \ + libc_interposing_table.c \ lockf.c \ lrand48.c \ memalign.c \ diff --git a/lib/libc/gen/Symbol.map b/lib/libc/gen/Symbol.map index 51c7348c5cc4..ee23d6112e44 100644 --- a/lib/libc/gen/Symbol.map +++ b/lib/libc/gen/Symbol.map @@ -567,6 +567,8 @@ FBSDprivate_1.0 { __waitpid; _waitpid; + __libc_interposing_slot; + _libc_sem_init_compat; _libc_sem_destroy_compat; _libc_sem_open_compat; diff --git a/lib/libc/gen/libc_interposing_table.c b/lib/libc/gen/libc_interposing_table.c new file mode 100644 index 000000000000..6997dce86569 --- /dev/null +++ b/lib/libc/gen/libc_interposing_table.c @@ -0,0 +1,56 @@ +/* + * Copyright (c) 2014 The FreeBSD Foundation. + * + * Portions of this software were developed by Konstantin Belousov + * under sponsorship from the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice(s), this list of conditions and the following disclaimer as + * the first lines of this file unmodified other than the possible + * addition of one or more copyright notices. + * 2. Redistributions in binary form must reproduce the above copyright + * notice(s), this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include +#include +#include "libc_private.h" + +#define SLOT(a, b) \ + [INTERPOS_##a] = (interpos_func_t)b +interpos_func_t __libc_interposing[INTERPOS_MAX] = { + SLOT(system, __libc_system), + SLOT(tcdrain, __libc_tcdrain), + SLOT(_pthread_mutex_init_calloc_cb, _pthread_mutex_init_calloc_cb_stub), + SLOT(spinlock, __libc_spinlock_stub), + SLOT(spinunlock, __libc_spinunlock_stub), + SLOT(map_stacks_exec, __libc_map_stacks_exec), + SLOT(distribute_static_tls, __libc_distribute_static_tls), +}; +#undef SLOT + +interpos_func_t * +__libc_interposing_slot(int interposno) +{ + /* XXX: forward compat. Remove after 15.0-RELEASE. */ + if (__libc_interposing[interposno] == NULL) + return (__libsys_interposing_slot(interposno)); + return (&__libc_interposing[interposno]); +} diff --git a/lib/libc/sys/Symbol.map b/lib/libc/sys/Symbol.map index ff35693d808d..3b207e59fec6 100644 --- a/lib/libc/sys/Symbol.map +++ b/lib/libc/sys/Symbol.map @@ -1049,7 +1049,6 @@ FBSDprivate_1.0 { __sys_writev; /* Things that aren't system calls (in sort(1) order) */ - __libc_interposing_slot; __libc_sigwait; __libsys_interposing_slot; __set_error_selector; diff --git a/lib/libc/sys/interposing_table.c b/lib/libc/sys/interposing_table.c index f7678a1352ff..4ee36da4c4c4 100644 --- a/lib/libc/sys/interposing_table.c +++ b/lib/libc/sys/interposing_table.c @@ -30,21 +30,10 @@ */ #include -#include #include "libc_private.h" #define SLOT(a, b) \ [INTERPOS_##a] = (interpos_func_t)b -interpos_func_t __libc_interposing[INTERPOS_MAX] = { - SLOT(system, __libc_system), - SLOT(tcdrain, __libc_tcdrain), - SLOT(_pthread_mutex_init_calloc_cb, _pthread_mutex_init_calloc_cb_stub), - SLOT(spinlock, __libc_spinlock_stub), - SLOT(spinunlock, __libc_spinunlock_stub), - SLOT(map_stacks_exec, __libc_map_stacks_exec), - SLOT(distribute_static_tls, __libc_distribute_static_tls), -}; - interpos_func_t __libsys_interposing[INTERPOS_MAX] = { SLOT(accept, __sys_accept), SLOT(accept4, __sys_accept4), @@ -86,15 +75,6 @@ interpos_func_t __libsys_interposing[INTERPOS_MAX] = { }; #undef SLOT -interpos_func_t * -__libc_interposing_slot(int interposno) -{ - /* XXX: forward compat. Remove after 15.0-RELEASE. */ - if (__libc_interposing[interposno] == NULL) - return (__libsys_interposing_slot(interposno)); - return (&__libc_interposing[interposno]); -} - interpos_func_t * __libsys_interposing_slot(int interposno) {