From nobody Sat Mar 25 10:45:45 2023 X-Original-To: dev-commits-src-main@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 4PkG2K37W2z420rp; Sat, 25 Mar 2023 10:45:45 +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 4PkG2K2yNWz3hD2; Sat, 25 Mar 2023 10:45:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679741145; 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=DQtdaNEBak25lfWPZE62FsvPyJQiK5Ju13LEXXGRU6o=; b=FsT7G889JifE78m6HQbkSLKU5BGopEwkKAt5XPvXPe9tX5/j+uHfveoLUPl2yAA7sDWdSa JnaW6wC37XUVkCMmqCmQypk276SZrCj9N1fcGBQ1LbaODPamX9eN600JroKN42B6WltdrZ EGm0xbMYSsDuBbcdWNy1jErlsLl/XWCE5oYj2q2Bj84Jq1QtDNqjv6pI+CctNRAQ0AxRnk jNJ6Wv2mmKaAbVrXhPmTxaONk1eRgyPr2sgx6K5frrkbpIbRwO1Pm62tpE3BEE/j02Ryoj y3sjXtQEa59A+h5kdYGUrDRY1QAcXNSTGaiv+ZK1hsHbV/wnkeID4SNhD1R01w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679741145; 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=DQtdaNEBak25lfWPZE62FsvPyJQiK5Ju13LEXXGRU6o=; b=gZORm7llvjGMUOD9H5Wd+ZLErItZr+jYY0wSmUB248N5g4C88OQi/t0LOH8GmbrQXhJUX6 zVGrjpgjpPiKikCktkm6bTPtgt2NXUvbAtfeX6oASXXZtYA5lgb60gRnBdzJNaEqbymLhH 8OQjyVoTBh0fMIa6JWHuY4MS/hS6LR6ng4BjhIcwD5s96ZB1sPwZLkJ+Mxpw3uPsVy1AMQ RwhzHtdgL26adhCVVcz+wb6Cd+ubuFRSkDfgA1/I60XA4rnTxqYBUzHAs/nvTOa/0qU5WN y1fjQKvDKJ0ZQBjywOf5sNNnjtg9dl4277M9/D0cBA796D5Ip8+GpUvtedEQfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679741145; a=rsa-sha256; cv=none; b=YOITSQ4v1l+CARZA12KKoNgJF99M1ZY8JdwOoi6ToPYh4FBXaeN/RCRmeUnSdCTH6jJnvr jdeEDeIcrSSIK1fMM9HREJ4UJUMLv08CT6OL+edqS0rN6v2Y9VRgeQxlf+rtGjrd/Zrrfo MWBeVn1+1gXiMZYCBum9oRGxPl+EGAKJz7SwiOsI08MFb+7zfqhQBLiTrBcQDgWGtIpU5n IdGaNE7Wq/dKnOzuYzq0AD+YcD6yYTzj1tuMC8mGNQ9KywRr2I+y+xbtnvzi1neK6+7ErU rknq6/meWW2vlt9vo4Jd+vwQ7SyPH9E02Lz/ZLCjtAa3PD8C4PuYRBVQXXmVEg== 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 4PkG2K22DvzwRk; Sat, 25 Mar 2023 10:45:45 +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 32PAjjv9053861; Sat, 25 Mar 2023 10:45:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32PAjjHr053860; Sat, 25 Mar 2023 10:45:45 GMT (envelope-from git) Date: Sat, 25 Mar 2023 10:45:45 GMT Message-Id: <202303251045.32PAjjHr053860@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: 0b56641cfcda - main - linsysfs(4): Reimplement listnics() using ifAPI List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 0b56641cfcda30d06243223f37781ccc18455bef Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=0b56641cfcda30d06243223f37781ccc18455bef commit 0b56641cfcda30d06243223f37781ccc18455bef Author: Dmitry Chagin AuthorDate: 2023-03-25 10:40:41 +0000 Commit: Dmitry Chagin CommitDate: 2023-03-25 10:40:41 +0000 linsysfs(4): Reimplement listnics() using ifAPI Handle if arrival/departure events. Reviewed by: melifaro (early version) Differential Revision: https://reviews.freebsd.org/D38901 MFC after: 1 month XMFC with: ifAPI --- sys/compat/linsysfs/linsysfs.c | 186 +-------------------- sys/compat/linsysfs/linsysfs.h | 38 +++++ sys/compat/linsysfs/linsysfs_net.c | 326 +++++++++++++++++++++++++++++++++++++ sys/modules/linsysfs/Makefile | 2 +- 4 files changed, 373 insertions(+), 179 deletions(-) diff --git a/sys/compat/linsysfs/linsysfs.c b/sys/compat/linsysfs/linsysfs.c index 3b1bdfc280fc..298ce4508b4d 100644 --- a/sys/compat/linsysfs/linsysfs.c +++ b/sys/compat/linsysfs/linsysfs.c @@ -37,22 +37,19 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include #include #include -#include -#include -#include - -#include -#include #include #include +#include + +MALLOC_DEFINE(M_LINSYSFS, "linsysfs", "Linsysfs structures"); + struct scsi_host_queue { TAILQ_ENTRY(scsi_host_queue) scsi_host_next; char *path; @@ -69,175 +66,6 @@ atoi(const char *str) return (int)strtol(str, (char **)NULL, 10); } -static int -linsysfs_ifnet_addr(PFS_FILL_ARGS) -{ - struct epoch_tracker et; - struct l_sockaddr lsa; - struct ifnet *ifp; - int error; - - CURVNET_SET(TD_TO_VNET(td)); - NET_EPOCH_ENTER(et); - ifp = ifname_linux_to_ifp(td, pn->pn_parent->pn_name); - if (ifp != NULL && (error = linux_ifhwaddr(ifp, &lsa)) == 0) - error = sbuf_printf(sb, "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx\n", - lsa.sa_data[0], lsa.sa_data[1], lsa.sa_data[2], - lsa.sa_data[3], lsa.sa_data[4], lsa.sa_data[5]); - else - error = ENOENT; - NET_EPOCH_EXIT(et); - CURVNET_RESTORE(); - return (error == -1 ? ERANGE : error); -} - -static int -linsysfs_ifnet_addrlen(PFS_FILL_ARGS) -{ - - sbuf_printf(sb, "%d\n", LINUX_IFHWADDRLEN); - return (0); -} - -static int -linsysfs_ifnet_flags(PFS_FILL_ARGS) -{ - struct epoch_tracker et; - struct ifnet *ifp; - int error; - - CURVNET_SET(TD_TO_VNET(td)); - NET_EPOCH_ENTER(et); - ifp = ifname_linux_to_ifp(td, pn->pn_parent->pn_name); - if (ifp != NULL) - error = sbuf_printf(sb, "0x%x\n", linux_ifflags(ifp)); - else - error = ENOENT; - NET_EPOCH_EXIT(et); - CURVNET_RESTORE(); - return (error == -1 ? ERANGE : error); -} - -static int -linsysfs_ifnet_ifindex(PFS_FILL_ARGS) -{ - struct epoch_tracker et; - struct ifnet *ifp; - int error; - - CURVNET_SET(TD_TO_VNET(td)); - NET_EPOCH_ENTER(et); - ifp = ifname_linux_to_ifp(td, pn->pn_parent->pn_name); - if (ifp != NULL) - error = sbuf_printf(sb, "%u\n", if_getindex(ifp)); - else - error = ENOENT; - NET_EPOCH_EXIT(et); - CURVNET_RESTORE(); - return (error == -1 ? ERANGE : error); -} - -static int -linsysfs_ifnet_mtu(PFS_FILL_ARGS) -{ - struct epoch_tracker et; - struct ifnet *ifp; - int error; - - CURVNET_SET(TD_TO_VNET(td)); - NET_EPOCH_ENTER(et); - ifp = ifname_linux_to_ifp(td, pn->pn_parent->pn_name); - if (ifp != NULL) - error = sbuf_printf(sb, "%u\n", if_getmtu(ifp)); - else - error = ENOENT; - NET_EPOCH_EXIT(et); - CURVNET_RESTORE(); - return (error == -1 ? ERANGE : error); -} - -static int -linsysfs_ifnet_tx_queue_len(PFS_FILL_ARGS) -{ - - /* XXX */ - sbuf_printf(sb, "1000\n"); - return (0); -} - -static int -linsysfs_ifnet_type(PFS_FILL_ARGS) -{ - struct epoch_tracker et; - struct l_sockaddr lsa; - struct ifnet *ifp; - int error; - - CURVNET_SET(TD_TO_VNET(td)); - NET_EPOCH_ENTER(et); - ifp = ifname_linux_to_ifp(td, pn->pn_parent->pn_name); - if (ifp != NULL && (error = linux_ifhwaddr(ifp, &lsa)) == 0) - error = sbuf_printf(sb, "%d\n", lsa.sa_family); - else - error = ENOENT; - NET_EPOCH_EXIT(et); - CURVNET_RESTORE(); - return (error == -1 ? ERANGE : error); -} - -static void -linsysfs_listnics(struct pfs_node *dir) -{ - struct pfs_node *nic; - struct pfs_node *lo; - - nic = pfs_create_dir(dir, "eth0", NULL, NULL, NULL, 0); - - pfs_create_file(nic, "address", &linsysfs_ifnet_addr, - NULL, NULL, NULL, PFS_RD); - - pfs_create_file(nic, "addr_len", &linsysfs_ifnet_addrlen, - NULL, NULL, NULL, PFS_RD); - - pfs_create_file(nic, "flags", &linsysfs_ifnet_flags, - NULL, NULL, NULL, PFS_RD); - - pfs_create_file(nic, "ifindex", &linsysfs_ifnet_ifindex, - NULL, NULL, NULL, PFS_RD); - - pfs_create_file(nic, "mtu", &linsysfs_ifnet_mtu, - NULL, NULL, NULL, PFS_RD); - - pfs_create_file(nic, "tx_queue_len", &linsysfs_ifnet_tx_queue_len, - NULL, NULL, NULL, PFS_RD); - - pfs_create_file(nic, "type", &linsysfs_ifnet_type, - NULL, NULL, NULL, PFS_RD); - - lo = pfs_create_dir(dir, "lo", NULL, NULL, NULL, 0); - - pfs_create_file(lo, "address", &linsysfs_ifnet_addr, - NULL, NULL, NULL, PFS_RD); - - pfs_create_file(lo, "addr_len", &linsysfs_ifnet_addrlen, - NULL, NULL, NULL, PFS_RD); - - pfs_create_file(lo, "flags", &linsysfs_ifnet_flags, - NULL, NULL, NULL, PFS_RD); - - pfs_create_file(lo, "ifindex", &linsysfs_ifnet_ifindex, - NULL, NULL, NULL, PFS_RD); - - pfs_create_file(lo, "mtu", &linsysfs_ifnet_mtu, - NULL, NULL, NULL, PFS_RD); - - pfs_create_file(lo, "tx_queue_len", &linsysfs_ifnet_tx_queue_len, - NULL, NULL, NULL, PFS_RD); - - pfs_create_file(lo, "type", &linsysfs_ifnet_type, - NULL, NULL, NULL, PFS_RD); -} - /* * Filler function for proc_name */ @@ -650,7 +478,6 @@ linsysfs_init(PFS_INIT_ARGS) struct pfs_node *drm; struct pfs_node *pci; struct pfs_node *scsi; - struct pfs_node *net; struct pfs_node *devdir, *chardev; struct pfs_node *kernel; devclass_t devclass; @@ -702,7 +529,6 @@ linsysfs_init(PFS_INIT_ARGS) NULL, NULL, NULL, PFS_RD); linsysfs_listcpus(cpu); - linsysfs_listnics(net); /* /sys/kernel */ kernel = pfs_create_dir(root, "kernel", NULL, NULL, NULL, 0); @@ -712,6 +538,8 @@ linsysfs_init(PFS_INIT_ARGS) /* /sys/subsystem/... */ dir = pfs_create_dir(root, "subsystem", NULL, NULL, NULL, 0); + linsysfs_net_init(); + return (0); } @@ -730,6 +558,8 @@ linsysfs_uninit(PFS_INIT_ARGS) free(scsi_host, M_TEMP); } + linsysfs_net_uninit(); + return (0); } diff --git a/sys/compat/linsysfs/linsysfs.h b/sys/compat/linsysfs/linsysfs.h new file mode 100644 index 000000000000..005c0e090a6b --- /dev/null +++ b/sys/compat/linsysfs/linsysfs.h @@ -0,0 +1,38 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * + * Copyright (c) 2023 Dmitry Chagin + * + * 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, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, 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 AUTHOR AND CONTRIBUTORS ``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 AUTHOR OR CONTRIBUTORS 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. + */ + +#ifndef _COMPAT_LINSYSFS_LINSYSFS_H_ +#define _COMPAT_LINSYSFS_LINSYSFS_H_ + +MALLOC_DECLARE(M_LINSYSFS); + +extern struct pfs_node *net; + +void linsysfs_net_init(void); +void linsysfs_net_uninit(void); + +#endif /* _COMPAT_LINSYSFS_LINSYSFS_H_ */ diff --git a/sys/compat/linsysfs/linsysfs_net.c b/sys/compat/linsysfs/linsysfs_net.c new file mode 100644 index 000000000000..00eb642f1db2 --- /dev/null +++ b/sys/compat/linsysfs/linsysfs_net.c @@ -0,0 +1,326 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * + * Copyright (c) 2023 Dmitry Chagin + * + * 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, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, 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 AUTHOR AND CONTRIBUTORS ``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 AUTHOR OR CONTRIBUTORS 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 +__FBSDID("$FreeBSD$"); + +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +#include +#include +#include + +#include + +struct pfs_node *net; +static eventhandler_tag if_arrival_tag, if_departure_tag; + +static uint32_t net_latch_count = 0; +static struct mtx net_latch_mtx; +MTX_SYSINIT(net_latch_mtx, &net_latch_mtx, "lsfnet", MTX_DEF); + +struct ifp_nodes_queue { + TAILQ_ENTRY(ifp_nodes_queue) ifp_nodes_next; + if_t ifp; + struct pfs_node *pn; +}; +TAILQ_HEAD(,ifp_nodes_queue) ifp_nodes_q; + +static void +linsysfs_net_latch_hold(void) +{ + + mtx_lock(&net_latch_mtx); + if (net_latch_count++ > 0) + mtx_sleep(&net_latch_count, &net_latch_mtx, PDROP, "lsfnet", 0); + else + mtx_unlock(&net_latch_mtx); +} + +static void +linsysfs_net_latch_rele(void) +{ + + mtx_lock(&net_latch_mtx); + if (--net_latch_count > 0) + wakeup_one(&net_latch_count); + mtx_unlock(&net_latch_mtx); +} + +static int +linsysfs_ifnet_addr(PFS_FILL_ARGS) +{ + struct epoch_tracker et; + struct l_sockaddr lsa; + struct ifnet *ifp; + int error; + + CURVNET_SET(TD_TO_VNET(td)); + NET_EPOCH_ENTER(et); + ifp = ifname_linux_to_ifp(td, pn->pn_parent->pn_name); + if (ifp != NULL && (error = linux_ifhwaddr(ifp, &lsa)) == 0) + error = sbuf_printf(sb, "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx\n", + lsa.sa_data[0], lsa.sa_data[1], lsa.sa_data[2], + lsa.sa_data[3], lsa.sa_data[4], lsa.sa_data[5]); + else + error = ENOENT; + NET_EPOCH_EXIT(et); + CURVNET_RESTORE(); + return (error == -1 ? ERANGE : error); +} + +static int +linsysfs_ifnet_addrlen(PFS_FILL_ARGS) +{ + + sbuf_printf(sb, "%d\n", LINUX_IFHWADDRLEN); + return (0); +} + +static int +linsysfs_ifnet_flags(PFS_FILL_ARGS) +{ + struct epoch_tracker et; + struct ifnet *ifp; + int error; + + CURVNET_SET(TD_TO_VNET(td)); + NET_EPOCH_ENTER(et); + ifp = ifname_linux_to_ifp(td, pn->pn_parent->pn_name); + if (ifp != NULL) + error = sbuf_printf(sb, "0x%x\n", linux_ifflags(ifp)); + else + error = ENOENT; + NET_EPOCH_EXIT(et); + CURVNET_RESTORE(); + return (error == -1 ? ERANGE : error); +} + +static int +linsysfs_ifnet_ifindex(PFS_FILL_ARGS) +{ + struct epoch_tracker et; + struct ifnet *ifp; + int error; + + CURVNET_SET(TD_TO_VNET(td)); + NET_EPOCH_ENTER(et); + ifp = ifname_linux_to_ifp(td, pn->pn_parent->pn_name); + if (ifp != NULL) + error = sbuf_printf(sb, "%u\n", if_getindex(ifp)); + else + error = ENOENT; + NET_EPOCH_EXIT(et); + CURVNET_RESTORE(); + return (error == -1 ? ERANGE : error); +} + +static int +linsysfs_ifnet_mtu(PFS_FILL_ARGS) +{ + struct epoch_tracker et; + struct ifnet *ifp; + int error; + + CURVNET_SET(TD_TO_VNET(td)); + NET_EPOCH_ENTER(et); + ifp = ifname_linux_to_ifp(td, pn->pn_parent->pn_name); + if (ifp != NULL) + error = sbuf_printf(sb, "%u\n", if_getmtu(ifp)); + else + error = ENOENT; + NET_EPOCH_EXIT(et); + CURVNET_RESTORE(); + return (error == -1 ? ERANGE : error); +} + +static int +linsysfs_ifnet_tx_queue_len(PFS_FILL_ARGS) +{ + + /* XXX */ + sbuf_printf(sb, "1000\n"); + return (0); +} + +static int +linsysfs_ifnet_type(PFS_FILL_ARGS) +{ + struct epoch_tracker et; + struct l_sockaddr lsa; + struct ifnet *ifp; + int error; + + CURVNET_SET(TD_TO_VNET(td)); + NET_EPOCH_ENTER(et); + ifp = ifname_linux_to_ifp(td, pn->pn_parent->pn_name); + if (ifp != NULL && (error = linux_ifhwaddr(ifp, &lsa)) == 0) + error = sbuf_printf(sb, "%d\n", lsa.sa_family); + else + error = ENOENT; + NET_EPOCH_EXIT(et); + CURVNET_RESTORE(); + return (error == -1 ? ERANGE : error); +} + +static struct pfs_node * +linsysfs_net_find_node(if_t ifp) +{ + struct ifp_nodes_queue *nq, *nq_tmp; + + TAILQ_FOREACH_SAFE(nq, &ifp_nodes_q, ifp_nodes_next, nq_tmp) { + if (nq->ifp == ifp) + return (nq->pn); + } + return (NULL); +} + +static int +linsysfs_net_addnic(if_t ifp, void *arg) +{ + char ifname[LINUX_IFNAMSIZ]; + struct ifp_nodes_queue *nq; + struct epoch_tracker et; + struct pfs_node *dir = arg; + struct pfs_node *nic = NULL; + int ret __diagused; + + NET_EPOCH_ENTER(et); + ret = ifname_bsd_to_linux_ifp(ifp, ifname, sizeof(ifname)); + NET_EPOCH_EXIT(et); + KASSERT(ret > 0, ("Interface (%s) is not converted", if_name(ifp))); + + nic = linsysfs_net_find_node(ifp); + MPASS(nic == NULL); + + nic = pfs_create_dir(dir, ifname, NULL, NULL, NULL, 0); + pfs_create_file(nic, "address", &linsysfs_ifnet_addr, + NULL, NULL, NULL, PFS_RD); + pfs_create_file(nic, "addr_len", &linsysfs_ifnet_addrlen, + NULL, NULL, NULL, PFS_RD); + pfs_create_file(nic, "flags", &linsysfs_ifnet_flags, + NULL, NULL, NULL, PFS_RD); + pfs_create_file(nic, "ifindex", &linsysfs_ifnet_ifindex, + NULL, NULL, NULL, PFS_RD); + pfs_create_file(nic, "mtu", &linsysfs_ifnet_mtu, + NULL, NULL, NULL, PFS_RD); + pfs_create_file(nic, "tx_queue_len", &linsysfs_ifnet_tx_queue_len, + NULL, NULL, NULL, PFS_RD); + pfs_create_file(nic, "type", &linsysfs_ifnet_type, + NULL, NULL, NULL, PFS_RD); + + nq = malloc(sizeof(*nq), M_LINSYSFS, M_WAITOK); + nq->pn = nic; + nq->ifp = ifp; + TAILQ_INSERT_TAIL(&ifp_nodes_q, nq, ifp_nodes_next); + return (0); +} + +static int +linsysfs_net_delnic(if_t ifp, void *arg) +{ + struct ifp_nodes_queue *nq, *nq_tmp; + + TAILQ_FOREACH_SAFE(nq, &ifp_nodes_q, ifp_nodes_next, nq_tmp) { + if (nq->ifp == ifp) { + TAILQ_REMOVE(&ifp_nodes_q, nq, ifp_nodes_next); + pfs_destroy(nq->pn); + free(nq, M_LINSYSFS); + return (0); + } + } + return (1); +} + +static void +linsysfs_net_listnics(struct pfs_node *dir) +{ + + CURVNET_SET(TD_TO_VNET(curthread)); + if_foreach_sleep(NULL, NULL, linsysfs_net_addnic, dir); + CURVNET_RESTORE(); +} + +static void +linsysfs_ifnet_arrival(void *arg __unused, struct ifnet *ifp) +{ + + linsysfs_net_latch_hold(); + linsysfs_net_addnic(ifp, net); + linsysfs_net_latch_rele(); +} + +static void +linsysfs_ifnet_departure(void *arg __unused, struct ifnet *ifp) +{ + + linsysfs_net_latch_hold(); + linsysfs_net_delnic(ifp, net); + linsysfs_net_latch_rele(); +} + +void +linsysfs_net_init(void) +{ + + MPASS(net != NULL); + TAILQ_INIT(&ifp_nodes_q); + if_arrival_tag = EVENTHANDLER_REGISTER(ifnet_arrival_event, + linsysfs_ifnet_arrival, NULL, EVENTHANDLER_PRI_ANY); + if_departure_tag = EVENTHANDLER_REGISTER(ifnet_departure_event, + linsysfs_ifnet_departure, NULL, EVENTHANDLER_PRI_ANY); + + linsysfs_net_latch_hold(); + linsysfs_net_listnics(net); + linsysfs_net_latch_rele(); +} + +void +linsysfs_net_uninit(void) +{ + struct ifp_nodes_queue *nq, *nq_tmp; + + EVENTHANDLER_DEREGISTER(ifnet_arrival_event, if_arrival_tag); + EVENTHANDLER_DEREGISTER(ifnet_departure_event, if_departure_tag); + + linsysfs_net_latch_hold(); + TAILQ_FOREACH_SAFE(nq, &ifp_nodes_q, ifp_nodes_next, nq_tmp) { + TAILQ_REMOVE(&ifp_nodes_q, nq, ifp_nodes_next); + free(nq, M_LINSYSFS); + } + linsysfs_net_latch_rele(); +} diff --git a/sys/modules/linsysfs/Makefile b/sys/modules/linsysfs/Makefile index 058fbbc521b1..8ec02da435e4 100644 --- a/sys/modules/linsysfs/Makefile +++ b/sys/modules/linsysfs/Makefile @@ -5,7 +5,7 @@ KMOD= linsysfs SRCS= vnode_if.h \ device_if.h bus_if.h pci_if.h \ - linsysfs.c + linsysfs.c linsysfs_net.c .if !defined(KERNBUILDDIR) .warning Building Linuxulator outside of a kernel does not make sense