From nobody Fri Jun 17 19:36:54 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 3F4F885A4A8; Fri, 17 Jun 2022 19:36:55 +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 4LPq6v0kHQz3P9l; Fri, 17 Jun 2022 19:36:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494615; 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=7EPkoCLBZD3I+SiUavOqCgQKlhRcELkYPFaksRo9nms=; b=QjcNsv1nXuweU1v5aUBE2a+Ss/KmCuQ1V0/SGOdfkbXEKAUNif8pCKznoOQbVFS3RBBjdW JxeoZ+B399oTb+8aO/F3DBwdEQGF20b7woT7nJAz85WFc7opzpU7a/QbK83I448SPJ31Dq mrlnFb1CrKR676GdDoMQfkMnWL0TtGT/BpVzTVHgcw9083KjUMCsL47Qx+kwQ4REjxjOLl aH2+BNmvyEN4+W0YLZTLKR714/7vt/XbHhuFRmCXmZ9N9K9iX6owuZHTfkq5sZABt60wNg z3A4MuJB8usJufTDPmuoMlspjcDMDsjEnHBffySJpDsnBOo1sT1lLMiufE7aRw== 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 D032625AAE; Fri, 17 Jun 2022 19:36:54 +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 25HJasV7012655; Fri, 17 Jun 2022 19:36:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25HJasmE012654; Fri, 17 Jun 2022 19:36:54 GMT (envelope-from git) Date: Fri, 17 Jun 2022 19:36:54 GMT Message-Id: <202206171936.25HJasmE012654@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: b960dd481535 - stable/13 - linux(4): Constify vdso install/deinstall. 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b960dd481535dae25324df708bedf55d4f2b8472 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494615; 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=7EPkoCLBZD3I+SiUavOqCgQKlhRcELkYPFaksRo9nms=; b=JmOMw88Mpz5FZJcsnmFN4wGN7sM0aHt6gPaY4G5y96xP585XhajgHHFKZRc6kOatk+kecZ iIUewIoPEr/m8DkGXUtbt1IB4YgaQ528DcS75xb4u4Kxbxl8k9jnOAkbcxvFOyoAsqb43a T8pMRf+pfsXUgYpeJIUPx2tphKF022Z0dDSvchOTfjsfhO3KkVaoD7SVne/EA+/Ekf6/4X hIau/4tyWJsWAXaWP+4w9WVqr+csbC05DzTE7EtHoFjhmwO4GfPKmGPymWtzLLmRaAhaUd wIcTcAXadQ86y1E1N2f+Kby2kTvdQmYaoH6lfvSx2dusoPZnj/L4JXQURVFfHA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655494615; a=rsa-sha256; cv=none; b=FotZ0V41AGj2kAZfR2shcrf3z5KS8ceWhZp4eE89qoNeJ4w6X9VIdxV6P9oKDvTeg7jsK2 NFGHuPXwKkSz3Kiu0GhRFj7egn8AFLr5HY1AO9N88mwfZUKTi5t4GZYtdjEahdvTCF11nQ SiivogUGj0d4pa7qU4WQ5N9WiCSaIl6JAJTlOV3T+As78OBnFdpc5JVJhAIJ0NfqpGxcsd Cs7LTNtt9HaWWBJKUaC81PyPK64G0OxSc0UDbTSoGhgq60i4fTD/luCg38i19FXEQxxDBI n/h7uELQAjGgmVSCjCpHAhfGa+QKEYOkWb0ssn4qYfBUtdi0Yk5DCtN4naBVJQ== 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=b960dd481535dae25324df708bedf55d4f2b8472 commit b960dd481535dae25324df708bedf55d4f2b8472 Author: Dmitry Chagin AuthorDate: 2021-07-20 07:01:47 +0000 Commit: Dmitry Chagin CommitDate: 2022-06-17 19:33:07 +0000 linux(4): Constify vdso install/deinstall. In order to reduce diff between arches constify vdso install/deinstall functions like arm64. Reviewed by: emaste Differential revision: https://reviews.freebsd.org/D30901 MFC after: 2 weeks (cherry picked from commit a543556c8128c52fb044250b8f52f9702c81788d) --- sys/amd64/linux/linux_sysvec.c | 8 ++++---- sys/amd64/linux32/linux32_sysvec.c | 8 ++++---- sys/i386/linux/linux_sysvec.c | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/sys/amd64/linux/linux_sysvec.c b/sys/amd64/linux/linux_sysvec.c index f13526b00d85..092452366fba 100644 --- a/sys/amd64/linux/linux_sysvec.c +++ b/sys/amd64/linux/linux_sysvec.c @@ -115,8 +115,8 @@ static int linux_copyout_strings(struct image_params *imgp, static int linux_fixup_elf(uintptr_t *stack_base, struct image_params *iparams); static bool linux_trans_osrel(const Elf_Note *note, int32_t *osrel); -static void linux_vdso_install(void *param); -static void linux_vdso_deinstall(void *param); +static void linux_vdso_install(const void *param); +static void linux_vdso_deinstall(const void *param); static void linux_vdso_reloc(char *mapping, Elf_Addr offset); static void linux_set_syscall_retval(struct thread *td, int error); static int linux_fetch_syscall_args(struct thread *td); @@ -824,7 +824,7 @@ SYSINIT(elf_linux_exec_sysvec_init, SI_SUB_EXEC, SI_ORDER_ANY, linux_exec_sysvec_init, &elf_linux_sysvec); static void -linux_vdso_install(void *param) +linux_vdso_install(const void *param) { char *vdso_start = &_binary_linux_vdso_so_o_start; char *vdso_end = &_binary_linux_vdso_so_o_end; @@ -848,7 +848,7 @@ SYSINIT(elf_linux_vdso_init, SI_SUB_EXEC, SI_ORDER_FIRST, linux_vdso_install, NULL); static void -linux_vdso_deinstall(void *param) +linux_vdso_deinstall(const void *param) { __elfN(linux_shared_page_fini)(linux_vdso_obj, diff --git a/sys/amd64/linux32/linux32_sysvec.c b/sys/amd64/linux32/linux32_sysvec.c index 10f616c56510..a97ac7337120 100644 --- a/sys/amd64/linux32/linux32_sysvec.c +++ b/sys/amd64/linux32/linux32_sysvec.c @@ -125,8 +125,8 @@ static int linux_on_exec_vmspace(struct proc *p, struct image_params *imgp); static void linux32_fixlimit(struct rlimit *rl, int which); static bool linux32_trans_osrel(const Elf_Note *note, int32_t *osrel); -static void linux_vdso_install(void *param); -static void linux_vdso_deinstall(void *param); +static void linux_vdso_install(const void *param); +static void linux_vdso_deinstall(const void *param); static void linux_vdso_reloc(char *mapping, Elf_Addr offset); static void linux32_set_syscall_retval(struct thread *td, int error); @@ -986,7 +986,7 @@ SYSINIT(elf_linux_exec_sysvec_init, SI_SUB_EXEC, SI_ORDER_ANY, linux_exec_sysvec_init, &elf_linux_sysvec); static void -linux_vdso_install(void *param) +linux_vdso_install(const void *param) { char *vdso_start = &_binary_linux32_vdso_so_o_start; char *vdso_end = &_binary_linux32_vdso_so_o_end; @@ -1008,7 +1008,7 @@ SYSINIT(elf_linux_vdso_init, SI_SUB_EXEC, SI_ORDER_FIRST, linux_vdso_install, NULL); static void -linux_vdso_deinstall(void *param) +linux_vdso_deinstall(const void *param) { __elfN(linux_shared_page_fini)(linux_vdso_obj, diff --git a/sys/i386/linux/linux_sysvec.c b/sys/i386/linux/linux_sysvec.c index 0736fb8734d8..b15854ff85a8 100644 --- a/sys/i386/linux/linux_sysvec.c +++ b/sys/i386/linux/linux_sysvec.c @@ -111,8 +111,8 @@ static int linux_on_exec_vmspace(struct proc *p, static int linux_copyout_strings(struct image_params *imgp, uintptr_t *stack_base); static bool linux_trans_osrel(const Elf_Note *note, int32_t *osrel); -static void linux_vdso_install(void *param); -static void linux_vdso_deinstall(void *param); +static void linux_vdso_install(const void *param); +static void linux_vdso_deinstall(const void *param); static void linux_vdso_reloc(char *mapping, Elf_Addr offset); #define LINUX_T_UNKNOWN 255 @@ -937,7 +937,7 @@ SYSINIT(elf_linux_exec_sysvec_init, SI_SUB_EXEC, SI_ORDER_ANY, linux_exec_sysvec_init, &elf_linux_sysvec); static void -linux_vdso_install(void *param) +linux_vdso_install(const void *param) { char *vdso_start = &_binary_linux_vdso_so_o_start; char *vdso_end = &_binary_linux_vdso_so_o_end; @@ -959,7 +959,7 @@ SYSINIT(elf_linux_vdso_init, SI_SUB_EXEC, SI_ORDER_FIRST, linux_vdso_install, NULL); static void -linux_vdso_deinstall(void *param) +linux_vdso_deinstall(const void *param) { __elfN(linux_shared_page_fini)(linux_vdso_obj,