From nobody Thu Feb 09 07:56:53 2023 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 4PC8Mp3g5Pz3myGZ; Thu, 9 Feb 2023 07:56:54 +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 4PC8Mn49kHz44wG; Thu, 9 Feb 2023 07:56:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675929413; 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=yAiMqKK/kY8Etc+YQSLis8pTqaYpnOjlMSWXy/wI3bo=; b=gZqpBECAAtatKcrELd2ZKNL1ydcmhjdeJ2TpkmvDw9t9YsCt+FfI400F5Fu00O24cquy10 sF46NwxxY361cwwT+4q7+joOrZubjA0HSGKseGQJgNmF7QArUNcyo1tIAk6luPJYV1E7Fx Z1ll/Poo7i6bkfejz7tOdBHR0S/NDf97vaIiRCHmgIbn827upQapIqRTQ423tiC4A1YlKS BoINEWjdmaOxiWYz0033Ya4vRtIjD+o1vDNtk9OnrLGbHMAKuPEp4fAHBXvyMQBavRr1io xCPPyOLKiCBZ2SJ610pWK5kE6s+/T1O7/3dwh33gR7m7oIg0UHfyabFljDL8ow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675929413; 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=yAiMqKK/kY8Etc+YQSLis8pTqaYpnOjlMSWXy/wI3bo=; b=B3WuI4D7FNv/RCwVTt/sMSxY/WFRq0mJwtUyLz3zTxwCbXW5LeSZyDR6iBHXlwjsVZgy7g 1J2pptV35zM52pypqDYYBpNZjxvzDaHZXsmtuuCmKhYHKs8JuDz2u4/0JpKGq8tKx7MHPd lv41OrEbpXN+c/BAqHS8PtgcyuObvaWBTOtZVIT0rNfig/9xCd1NJd48YCkbySzkNYra44 CkAJghd5IF9C7xUPGmz7TGZD2grP2YvC4M2nesIhTxz5o093tuPOh03rgoc3jZPymQ3uX8 kzEOvaODnENgNPsayi/oc2gNnoyY7+J8D6xm6KSWC6FdmF41h4zBNiw3SdQH2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675929413; a=rsa-sha256; cv=none; b=Rhrj3ClhRrYJnj6VSyt+IG7+LtCLSMTwmMR3avet8KGoMXBl/5xhsvpWoEZmtXeD2o1VCs B60t39SVaQlHhXuKYV6DdtaUUzut09ZeY48WFfBFJHLzRopZ7u+gc93q9uyxa9P3nxzqsO LG+Wdnjd3XIZy2Ckvyg4Txac0RWTZKMB9HTAgXJ3+lh+T+i3TF3QVWA6MkQEzw8Han1pBW 17XvquUpLaFOz3vaF8VDxPOTG2/PpOXVAim1mIXFODO2Pku38lOqRqrSyA5vnOyuAIBR5w ooxO5fxo43fbQuWj2z4soRHgE3/yshRVVzid0qNXvwyoW8ZJFYxP/+aOQhktlQ== 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 4PC8Mn3GXczV5T; Thu, 9 Feb 2023 07:56:53 +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 3197urk4093124; Thu, 9 Feb 2023 07:56:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3197urNT093123; Thu, 9 Feb 2023 07:56:53 GMT (envelope-from git) Date: Thu, 9 Feb 2023 07:56:53 GMT Message-Id: <202302090756.3197urNT093123@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: 603cdb0f092c - stable/13 - linux(4): Attach netlink on i386. 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: 603cdb0f092c741a5774e4bea7a94714d9d835ba Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=603cdb0f092c741a5774e4bea7a94714d9d835ba commit 603cdb0f092c741a5774e4bea7a94714d9d835ba Author: Dmitry Chagin AuthorDate: 2023-02-06 14:00:44 +0000 Commit: Dmitry Chagin CommitDate: 2023-02-09 07:55:25 +0000 linux(4): Attach netlink on i386. Discussed with: melifaro MFC after: 3 days (cherry picked from commit 07db1f36848c008efb7ab6b37e199212560833ae) --- sys/i386/linux/linux_sysvec.c | 3 +++ sys/modules/linux/Makefile | 1 + 2 files changed, 4 insertions(+) diff --git a/sys/i386/linux/linux_sysvec.c b/sys/i386/linux/linux_sysvec.c index 39249cb25320..d8eee3f96a93 100644 --- a/sys/i386/linux/linux_sysvec.c +++ b/sys/i386/linux/linux_sysvec.c @@ -911,6 +911,7 @@ linux_elf_modevent(module_t mod, int type, void *data) linux_ioctl_register_handler(*lihp); linux_dev_shm_create(); linux_osd_jail_register(); + linux_netlink_register(); stclohz = (stathz ? stathz : hz); if (bootverbose) printf("Linux ELF exec handler installed\n"); @@ -931,6 +932,7 @@ linux_elf_modevent(module_t mod, int type, void *data) if (error == 0) { SET_FOREACH(lihp, linux_ioctl_handler_set) linux_ioctl_unregister_handler(*lihp); + linux_netlink_deregister(); linux_dev_shm_destroy(); linux_osd_jail_deregister(); if (bootverbose) @@ -951,4 +953,5 @@ static moduledata_t linux_elf_mod = { }; DECLARE_MODULE_TIED(linuxelf, linux_elf_mod, SI_SUB_EXEC, SI_ORDER_ANY); +MODULE_DEPEND(linuxelf, netlink, 1, 1, 1); FEATURE(linux, "Linux 32bit support"); diff --git a/sys/modules/linux/Makefile b/sys/modules/linux/Makefile index 4e41f8e9403c..fad03e8a8ca0 100644 --- a/sys/modules/linux/Makefile +++ b/sys/modules/linux/Makefile @@ -49,6 +49,7 @@ VDSODEPS=linux_vdso_gettc_x86.inc SRCS+= linux${SFX}_support.s .else SRCS+= linux_copyout.c +SRCS+= linux_netlink.c .endif DPSRCS= assym.inc linux${SFX}_genassym.c