From nobody Fri Jun 17 19:36:55 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 AD25685A3BC; Fri, 17 Jun 2022 19:36:56 +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 4LPq6w1ZWXz3PPG; Fri, 17 Jun 2022 19:36:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494616; 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=LnS9pWWEInrqrK0SBoafSQvMECHauMNcJkYxJQNEPLM=; b=Dt+GlPH/8LP/hDrAoyFi0Li8pb4HoKNPIEo8jJC9OL3Z7crSZ+Sl2ZTo97F5cfemYTQ2CJ f+lfWcr6Tespug0gNMGY20Gk+0ihBl00TeMxE8QoD+U4wKWKTJ7i8wKHUlL0XmGGZP7DJV FTsFuU/YKZWRTCqVUY4cdloa8QVsXNTNVYgjgVKvlfyx20FeiwWXOqhD6dg1KVqgruJNCh XuKU3hwCMdFGtfKG0wEQAzsLzK+N7DdNW1HDQni+ELJekdw9TIMcFo2SrBSbF477ZWQVv5 wI8bigDOkoFZwp5fkt3EXBqdsQGXdL8VXJeBEQ3V4VPfL3N9NkhKo3ay+0JDOA== 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 F2CCA25AAF; Fri, 17 Jun 2022 19:36:55 +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 25HJat68012679; Fri, 17 Jun 2022 19:36:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25HJatkq012678; Fri, 17 Jun 2022 19:36:55 GMT (envelope-from git) Date: Fri, 17 Jun 2022 19:36:55 GMT Message-Id: <202206171936.25HJatkq012678@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: 4e34c0445c40 - stable/13 - linux(4): Fixup the vDSO initialization order. 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: 4e34c0445c4084a17444691f22146af4ba28bf52 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494616; 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=LnS9pWWEInrqrK0SBoafSQvMECHauMNcJkYxJQNEPLM=; b=wNCZURNw0ySCdZTH06xNYy5m12KiN7QG0Hb0Ul7qlr2Q5SEyLhweUXB28Vc+zNIDYPczH0 AqEeqBsRkFCJLrz8aLL85vzyfKNbSgabdqhOyyh84+Fhhuj6zI5NmyscY1Zb3g2F6JJDTV 4M83okiiBpCWPYWh8D/eqKB8Sk32e/RPvsMG2dqHMNWvqOnqtNoWuak2hF9c/Jy71xt9cB 87PTG+Tqvm6UG9/6mP8xOEZTT1TPVGvJsVEo0fxnwYxhcby9Qa0JgQT+yuygq1nPeprl3F qGTmkxc7WAsTbPq5krIvfOlsMrAiQgFcOqnUOmLSoaKr30BNJYlOdAVluhaDtQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655494616; a=rsa-sha256; cv=none; b=a3diT/XyKwn9YHN/t9ZPN6iYpBEhioYaBU8skD4N7e8p0yND+fRUtPccT4/rjsxSEWeVHv ygmptiUAOdZQTpPFFB2eccVA/i439UdD26SsbkuCjsIBLSkPrKAS6aTP67kTgU2jri3uou xiLZvjfXACSfNUZjXaoy0/Jho80lK9co5RwZptFH3/reUj5gyNYuYmZ8cRYC0Ywos5z8bF gxiv96SlZmKr+KkTdbh0SWrtthFDG7m8doDY93u3p0ksP55gEbVJWR3xKVF5FQKgA0p+8O CZbOMlb71gv945Ss30qncJMSd8rMRGuAwy8GD9+YkmomcU1stzL9TvXZ9Wl8eQ== 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=4e34c0445c4084a17444691f22146af4ba28bf52 commit 4e34c0445c4084a17444691f22146af4ba28bf52 Author: Dmitry Chagin AuthorDate: 2021-07-20 07:02:34 +0000 Commit: Dmitry Chagin CommitDate: 2022-06-17 19:33:07 +0000 linux(4): Fixup the vDSO initialization order. The vDSO initialisation order should be as follows: - native abi init via exec_sysvec_init(); - vDSO symbols queued to the linux_vdso_syms list; - linux_vdso_install(); - linux_exec_sysvec_init(); As the exec_sysvec_init() called with SI_ORDER_ANY (last) at SI_SUB_EXEC order, move linux_vdso_install() and linux_exec_sysvec_init() to the SI_SUB_EXEC+1 order. Reviewed by: trasz Differential Revision: https://reviews.freebsd.org/D30902 MFC after 2 weeks (cherry picked from commit 09cffde975b87b293457c9a228cb980ec729384a) --- sys/amd64/linux/linux_sysvec.c | 8 ++++++-- sys/amd64/linux32/linux32_sysvec.c | 8 ++++++-- sys/arm64/linux/linux_sysvec.c | 8 ++++++-- sys/i386/linux/linux_sysvec.c | 13 +++++++++++-- 4 files changed, 29 insertions(+), 8 deletions(-) diff --git a/sys/amd64/linux/linux_sysvec.c b/sys/amd64/linux/linux_sysvec.c index 092452366fba..d3e8ce5ad035 100644 --- a/sys/amd64/linux/linux_sysvec.c +++ b/sys/amd64/linux/linux_sysvec.c @@ -798,6 +798,10 @@ linux_on_exec_vmspace(struct proc *p, struct image_params *imgp) return (error); } +/* + * linux_vdso_install() and linux_exec_sysvec_init() must be called + * after exec_sysvec_init() which is SI_SUB_EXEC (SI_ORDER_ANY). + */ static void linux_exec_sysvec_init(void *param) { @@ -820,7 +824,7 @@ linux_exec_sysvec_init(void *param) if (bootverbose) printf("Linux x86-64 vDSO tsc_selector: %lu\n", *ktsc_selector); } -SYSINIT(elf_linux_exec_sysvec_init, SI_SUB_EXEC, SI_ORDER_ANY, +SYSINIT(elf_linux_exec_sysvec_init, SI_SUB_EXEC + 1, SI_ORDER_ANY, linux_exec_sysvec_init, &elf_linux_sysvec); static void @@ -844,7 +848,7 @@ linux_vdso_install(const void *param) linux_vdso_reloc(linux_vdso_mapping, linux_vdso_base); } -SYSINIT(elf_linux_vdso_init, SI_SUB_EXEC, SI_ORDER_FIRST, +SYSINIT(elf_linux_vdso_init, SI_SUB_EXEC + 1, SI_ORDER_FIRST, linux_vdso_install, NULL); static void diff --git a/sys/amd64/linux32/linux32_sysvec.c b/sys/amd64/linux32/linux32_sysvec.c index a97ac7337120..d94ee6c87fd6 100644 --- a/sys/amd64/linux32/linux32_sysvec.c +++ b/sys/amd64/linux32/linux32_sysvec.c @@ -961,6 +961,10 @@ linux_on_exec_vmspace(struct proc *p, struct image_params *imgp) return (error); } +/* + * linux_vdso_install() and linux_exec_sysvec_init() must be called + * after exec_sysvec_init() which is SI_SUB_EXEC (SI_ORDER_ANY). + */ static void linux_exec_sysvec_init(void *param) { @@ -982,7 +986,7 @@ linux_exec_sysvec_init(void *param) if (bootverbose) printf("Linux i386 vDSO tsc_selector: %u\n", *ktsc_selector); } -SYSINIT(elf_linux_exec_sysvec_init, SI_SUB_EXEC, SI_ORDER_ANY, +SYSINIT(elf_linux_exec_sysvec_init, SI_SUB_EXEC + 1, SI_ORDER_ANY, linux_exec_sysvec_init, &elf_linux_sysvec); static void @@ -1004,7 +1008,7 @@ linux_vdso_install(const void *param) linux_vdso_reloc(linux_vdso_mapping, linux_vdso_base); } -SYSINIT(elf_linux_vdso_init, SI_SUB_EXEC, SI_ORDER_FIRST, +SYSINIT(elf_linux_vdso_init, SI_SUB_EXEC + 1, SI_ORDER_FIRST, linux_vdso_install, NULL); static void diff --git a/sys/arm64/linux/linux_sysvec.c b/sys/arm64/linux/linux_sysvec.c index 48d628d365d8..0e9800291e26 100644 --- a/sys/arm64/linux/linux_sysvec.c +++ b/sys/arm64/linux/linux_sysvec.c @@ -471,6 +471,10 @@ linux_on_exec_vmspace(struct proc *p, struct image_params *imgp) return (error); } +/* + * linux_vdso_install() and linux_exec_sysvec_init() must be called + * after exec_sysvec_init() which is SI_SUB_EXEC (SI_ORDER_ANY). + */ static void linux_exec_sysvec_init(void *param) { @@ -486,7 +490,7 @@ linux_exec_sysvec_init(void *param) ktimekeep_base = (l_uintptr_t *)(linux_vdso_mapping + tkoff); *ktimekeep_base = sv->sv_timekeep_base; } -SYSINIT(elf_linux_exec_sysvec_init, SI_SUB_EXEC, SI_ORDER_ANY, +SYSINIT(elf_linux_exec_sysvec_init, SI_SUB_EXEC + 1, SI_ORDER_ANY, linux_exec_sysvec_init, &elf_linux_sysvec); static void @@ -508,7 +512,7 @@ linux_vdso_install(const void *param) linux_vdso_reloc(linux_vdso_mapping, linux_vdso_base); } -SYSINIT(elf_linux_vdso_init, SI_SUB_EXEC, SI_ORDER_FIRST, +SYSINIT(elf_linux_vdso_init, SI_SUB_EXEC + 1, SI_ORDER_FIRST, linux_vdso_install, NULL); static void diff --git a/sys/i386/linux/linux_sysvec.c b/sys/i386/linux/linux_sysvec.c index b15854ff85a8..d312e7e9003e 100644 --- a/sys/i386/linux/linux_sysvec.c +++ b/sys/i386/linux/linux_sysvec.c @@ -912,6 +912,10 @@ linux_on_exec_vmspace(struct proc *p, struct image_params *imgp) return (error); } +/* + * linux_vdso_install() and linux_exec_sysvec_init() must be called + * after exec_sysvec_init() which is SI_SUB_EXEC (SI_ORDER_ANY). + */ static void linux_exec_sysvec_init(void *param) { @@ -933,7 +937,7 @@ linux_exec_sysvec_init(void *param) if (bootverbose) printf("Linux i386 vDSO tsc_selector: %u\n", *ktsc_selector); } -SYSINIT(elf_linux_exec_sysvec_init, SI_SUB_EXEC, SI_ORDER_ANY, +SYSINIT(elf_linux_exec_sysvec_init, SI_SUB_EXEC + 1, SI_ORDER_ANY, linux_exec_sysvec_init, &elf_linux_sysvec); static void @@ -955,7 +959,7 @@ linux_vdso_install(const void *param) linux_vdso_reloc(linux_vdso_mapping, linux_vdso_base); } -SYSINIT(elf_linux_vdso_init, SI_SUB_EXEC, SI_ORDER_FIRST, +SYSINIT(elf_linux_vdso_init, SI_SUB_EXEC + 1, SI_ORDER_FIRST, linux_vdso_install, NULL); static void @@ -1166,3 +1170,8 @@ static moduledata_t linux_elf_mod = { DECLARE_MODULE_TIED(linuxelf, linux_elf_mod, SI_SUB_EXEC, SI_ORDER_ANY); FEATURE(linux, "Linux 32bit support"); + +/* + * linux_vdso_install() and linux_exec_sysvec_init() must be called + * after exec_sysvec_init() which is SI_SUB_EXEC (SI_ORDER_ANY). + */