From nobody Sun Nov 06 14:55:40 2022 X-Original-To: dev-commits-src-branches@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 4N4y8s1XhWz4hMqp; Sun, 6 Nov 2022 14:55:41 +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 4N4y8r5tH1z3VjN; Sun, 6 Nov 2022 14:55:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667746540; 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=YQ6LUGWSLalVUfugxngk9vCSGF+BRSWu/NfZTrODKhg=; b=wBBVUJ2FKLV7So3zojsYDh5d2/ttYA/e90XJMKh9sVaiCyK+tKjofSheU16Gzd4OLx7ALH dMRyKr6rEkSDAgtYxhya7q9NnYvorURtnc6kMqWtrHf50wgg4OAaVUjLBJR/dAfHvehn9N qA4ugi+mTbDN/XXnptAhXNNSZDOmFafWwE+m4ZMt19h56p8lCdqP84QYQ5zrP4LxqHBlrx 2xBnqsVO7nEDL1DJZ4Y51YvjwmDW891ysgC14ugcpxIebzfOSmP8pbqeS5jKBbpZe+lEAx 9c375Ul2vuhNsLoGaFPPhyaOa8g9gyBxkAdBRVKXrsUUcYzY5x1w0PoYJ6Ahag== 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 4N4y8r4yH3zQBm; Sun, 6 Nov 2022 14:55:40 +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 2A6Etemc025676; Sun, 6 Nov 2022 14:55:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A6EteAd025675; Sun, 6 Nov 2022 14:55:40 GMT (envelope-from git) Date: Sun, 6 Nov 2022 14:55:40 GMT Message-Id: <202211061455.2A6EteAd025675@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: d96eebfdb351 - stable/13 - linux: populate sv_syscallnames in each sysentvec List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d96eebfdb351abf5e604f43e8f022f8bb861bdbd Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667746540; 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=YQ6LUGWSLalVUfugxngk9vCSGF+BRSWu/NfZTrODKhg=; b=H6jV6gp9Bpr7oDW3SsYKoLP0q3t+GiW0XgFr6zvlvj+ftN/Bi/Czh+hVjC4ghSKbUp185s H6yV9Pq1yfQZpieamLBflvB1NiWkKjjeJe2y+mGMOWlWXTHbimQ0eqJIwfoQvI137ePM4e Jh9YkYYevmrDu9uIagxtGZthsEcKm6DGEqmD8tGlTO4zS52Zq9p7UaXw0Dw40JK4qLgN/V /BNWXzQ9/5HrglP23yjqUaMIZ4K0GY5pEmQlJd2XAmkoYG4CqHnlw5UP3jTOaGEpA4EL8W 9IiLaohfeip+vCdDslGhmXP5UCdtIfQk9okGO5cZpeAqwj9nrkG3/SHGwYzYrw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667746540; a=rsa-sha256; cv=none; b=joJmf37YVqpXtuUiDmax0pQBLemC4kcMfds6dNWImygChk8wbSMkbwsCISaNhxBWIuewEJ 7EPLhW/OIyGq2jId6V3zHotga5stdzO9WzAcqSl9ER4OcsjY6OqyMFIBMNq5CP5G7zw+CL mqOcHqNWBOjU+eN2RwxM2js+So1HDa/xbuI4t6W3iK3CbklIvRagi5MGJ06WPcZXBigyf1 AvvHVVHN6znZNIL91kvr3lkFQcrRc/bzyOr8+/llYP7gzFJG1Xmxc8k4HFUhOzOWOBPr0n 3n6wNGAEVpvIeH39D+7LpYDDOA2fQJk0bVjUtEkHv8pcXzXLln3rBuDI8iqEzw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=d96eebfdb351abf5e604f43e8f022f8bb861bdbd commit d96eebfdb351abf5e604f43e8f022f8bb861bdbd Author: Mitchell Horne AuthorDate: 2022-10-28 21:19:39 +0000 Commit: Mitchell Horne CommitDate: 2022-11-06 14:54:46 +0000 linux: populate sv_syscallnames in each sysentvec This allows the syscallname() function to give a usable result for Linux ABIs. Reported by: jrtc27 Reviewed by: jrtc27, markj, jhb MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D37199 (cherry picked from commit 1da65dcb1c57fae7be75ddf1bd300ddf19ced850) (cherry picked from commit f396f9b6c96f6d68d4e3606ddb090287230fc565) --- sys/amd64/linux/linux_sysvec.c | 3 ++- sys/amd64/linux32/linux32_sysvec.c | 3 ++- sys/arm64/linux/linux_sysvec.c | 3 ++- sys/i386/linux/linux_sysvec.c | 3 ++- sys/modules/linux/Makefile | 1 + sys/modules/linux64/Makefile | 1 + 6 files changed, 10 insertions(+), 4 deletions(-) diff --git a/sys/amd64/linux/linux_sysvec.c b/sys/amd64/linux/linux_sysvec.c index dbf702d51bb1..60e90c03ad95 100644 --- a/sys/amd64/linux/linux_sysvec.c +++ b/sys/amd64/linux/linux_sysvec.c @@ -110,6 +110,7 @@ extern char _binary_linux_vdso_so_o_end; static vm_offset_t linux_vdso_base; extern struct sysent linux_sysent[LINUX_SYS_MAXSYSCALL]; +extern const char *linux_syscallnames[]; SET_DECLARE(linux_ioctl_handler_set, struct linux_ioctl_handler); @@ -728,7 +729,7 @@ struct sysentvec elf_linux_sysvec = { SV_SIG_WAITNDQ | SV_TIMEKEEP, .sv_set_syscall_retval = linux_set_syscall_retval, .sv_fetch_syscall_args = linux_fetch_syscall_args, - .sv_syscallnames = NULL, + .sv_syscallnames = linux_syscallnames, .sv_shared_page_base = LINUX_SHAREDPAGE_LA48, .sv_shared_page_len = PAGE_SIZE, .sv_schedtail = linux_schedtail, diff --git a/sys/amd64/linux32/linux32_sysvec.c b/sys/amd64/linux32/linux32_sysvec.c index 4b6464bd7b81..dc87d1a8a531 100644 --- a/sys/amd64/linux32/linux32_sysvec.c +++ b/sys/amd64/linux32/linux32_sysvec.c @@ -113,6 +113,7 @@ extern char _binary_linux32_vdso_so_o_end; static vm_offset_t linux_vdso_base; extern struct sysent linux32_sysent[LINUX32_SYS_MAXSYSCALL]; +extern const char *linux32_syscallnames[]; SET_DECLARE(linux_ioctl_handler_set, struct linux_ioctl_handler); @@ -881,7 +882,7 @@ struct sysentvec elf_linux_sysvec = { SV_SIG_DISCIGN | SV_SIG_WAITNDQ | SV_TIMEKEEP, .sv_set_syscall_retval = linux32_set_syscall_retval, .sv_fetch_syscall_args = linux32_fetch_syscall_args, - .sv_syscallnames = NULL, + .sv_syscallnames = linux32_syscallnames, .sv_shared_page_base = LINUX32_SHAREDPAGE, .sv_shared_page_len = PAGE_SIZE, .sv_schedtail = linux_schedtail, diff --git a/sys/arm64/linux/linux_sysvec.c b/sys/arm64/linux/linux_sysvec.c index b8361584c31a..2533092b4cfd 100644 --- a/sys/arm64/linux/linux_sysvec.c +++ b/sys/arm64/linux/linux_sysvec.c @@ -98,6 +98,7 @@ extern char _binary_linux_vdso_so_o_end; static vm_offset_t linux_vdso_base; extern struct sysent linux_sysent[LINUX_SYS_MAXSYSCALL]; +extern const char *linux_syscallnames[]; SET_DECLARE(linux_ioctl_handler_set, struct linux_ioctl_handler); @@ -574,7 +575,7 @@ struct sysentvec elf_linux_sysvec = { SV_SIG_WAITNDQ | SV_TIMEKEEP, .sv_set_syscall_retval = linux_set_syscall_retval, .sv_fetch_syscall_args = linux_fetch_syscall_args, - .sv_syscallnames = NULL, + .sv_syscallnames = linux_syscallnames, .sv_shared_page_base = LINUX_SHAREDPAGE, .sv_shared_page_len = PAGE_SIZE, .sv_schedtail = linux_schedtail, diff --git a/sys/i386/linux/linux_sysvec.c b/sys/i386/linux/linux_sysvec.c index 14be8f7aa36b..6726dc2cf0fd 100644 --- a/sys/i386/linux/linux_sysvec.c +++ b/sys/i386/linux/linux_sysvec.c @@ -96,6 +96,7 @@ extern char _binary_linux_vdso_so_o_end; static vm_offset_t linux_vdso_base; extern struct sysent linux_sysent[LINUX_SYS_MAXSYSCALL]; +extern const char *linux_syscallnames[]; SET_DECLARE(linux_ioctl_handler_set, struct linux_ioctl_handler); @@ -781,7 +782,7 @@ struct sysentvec linux_sysvec = { SV_SIG_DISCIGN | SV_SIG_WAITNDQ, .sv_set_syscall_retval = linux_set_syscall_retval, .sv_fetch_syscall_args = linux_fetch_syscall_args, - .sv_syscallnames = NULL, + .sv_syscallnames = linux_syscallnames, .sv_schedtail = linux_schedtail, .sv_thread_detach = linux_thread_detach, .sv_trap = NULL, diff --git a/sys/modules/linux/Makefile b/sys/modules/linux/Makefile index 808f87f87dc7..2cd7c54cd216 100644 --- a/sys/modules/linux/Makefile +++ b/sys/modules/linux/Makefile @@ -25,6 +25,7 @@ SRCS= linux${SFX}_dummy_machdep.c \ linux_signal.c \ linux_socket.c \ linux_stats.c \ + linux${SFX}_syscalls.c \ linux_sysctl.c \ linux${SFX}_sysent.c \ linux${SFX}_sysvec.c \ diff --git a/sys/modules/linux64/Makefile b/sys/modules/linux64/Makefile index 3d7b973742e9..ef6644c3deb7 100644 --- a/sys/modules/linux64/Makefile +++ b/sys/modules/linux64/Makefile @@ -22,6 +22,7 @@ SRCS= linux_dummy_machdep.c \ linux_signal.c \ linux_socket.c \ linux_stats.c \ + linux_syscalls.c \ linux_sysctl.c \ linux_sysent.c \ linux_sysvec.c \