From nobody Tue Jan 24 07:35:05 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 4P1Jf16NmCz2v3dg; Tue, 24 Jan 2023 07:35:05 +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 4P1Jf15vK2z3DPS; Tue, 24 Jan 2023 07:35:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674545705; 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=9rL4yuVEWzYVf8dzUzS7e+y8sypFCGUq55PAO1P40do=; b=M9LAEvUeCU49og0gmOOwMwWt4XWI3OrGvVrI56WhCXkin9eRgFcZzlDcW/g37eK95Ts+wn cjH+6KILZZe96RASqx18+y5wAMrJp+3fF7I0kkwJ6ZuHQJuIY50JPbx2z2NN8adrr5K5a7 Ji5jApxp4yk9C0ZjLy0mRC4QIME0/vQhi8cgndm4q9KgTr/Nhxve/1Ji5+KdS/7rhsPw8T Fq0chk2X7SpVop776mhUcSoPqz3oSOhcJYp5ao/0vZhYyqbxjLeJ3+1EwNAgxLf0WQm6eO A3ZYXvs07ubENduX0XkMpkij11benXxSNsT0zBy5Ss+UtbplyMZpaevEpgdjaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674545705; 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=9rL4yuVEWzYVf8dzUzS7e+y8sypFCGUq55PAO1P40do=; b=RLyHPhLC3apSNga+9d2OEVPmwVtK2LMWusrU04jq7fmtJAhnfq94CdQK/e6enl3Ps9J0CI orJWKfU5dEAE3BA3g/L9JUtm8lW9x0JRVfT09hheYuxMhb7ZUdeJD00UyvA3JaiNRRq7iv yMO3XSRjbX8yhQxzd71u7iU7MFPCE2EoH3ZSYeDhe4KQPlecwFJhriuRP2uG7Nb6079IRZ 2KqnaxYM78iT7YfujPD/ZpNy0VMrCg8WQk9DBR7BHIPfRWyg6pqt6VJYRIRcxhZTMknCee E9SRbVLFXGItIBt0BJnkvelmzi578jOFFPFI+iX/o8oPWXHnEOQ/JDzttNVDyg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674545705; a=rsa-sha256; cv=none; b=rGxzvoOijc3oPykDwUb+r4Iet+T6pePZSS65dM740bjJTxmmBtuT/aU5lIiBAYk4uTaodf f3N2TJ4G/ADzd5jIyT5sSkB5QCIgUe+9U5onwvT2/8DwPTbi4YZE6pPiDRnBMzI+FczETo G5gNn/DbZNJxDOBriZGJPONzCy4ZIPntJlmV5JMAUc53Ni88Hqxp/Xi9xoLyWoZY/0s6tF H2g3E8jHtF4/Hp/OuEUo3yaT2wAsQShHPrBLFZqMk/2qBLY2aEyDWxmJPSO347VCD4dGdc 1BL2Mso1drIs1b/1cPz5dmAS/n4yXfOyt+e2k/N5Ab8gEL215niycQDZTy20tg== 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 4P1Jf14xcHz11mn; Tue, 24 Jan 2023 07:35:05 +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 30O7Z593020287; Tue, 24 Jan 2023 07:35:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30O7Z5mn020286; Tue, 24 Jan 2023 07:35:05 GMT (envelope-from git) Date: Tue, 24 Jan 2023 07:35:05 GMT Message-Id: <202301240735.30O7Z5mn020286@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: dab4775da308 - stable/13 - linprocfs: Add net/route. 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: dab4775da30809c65df81837c74a9d634375a704 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=dab4775da30809c65df81837c74a9d634375a704 commit dab4775da30809c65df81837c74a9d634375a704 Author: John Grafton AuthorDate: 2022-10-22 10:52:58 +0000 Commit: Dmitry Chagin CommitDate: 2023-01-24 07:34:29 +0000 linprocfs: Add net/route. PR: 266482 Reviewed by: melifaro, me Differential revision: https://reviews.freebsd.org/D36949 MFC after: 1 week (cherry picked from commit 4c9db9566e67779905c667c2719e5b1628c3af3d) --- sys/compat/linprocfs/linprocfs.c | 79 ++++++++++++++++++++++++++++++++++++++++ sys/modules/linprocfs/Makefile | 2 +- 2 files changed, 80 insertions(+), 1 deletion(-) diff --git a/sys/compat/linprocfs/linprocfs.c b/sys/compat/linprocfs/linprocfs.c index 6f6cd3f5f55f..a93f8a1dbb8b 100644 --- a/sys/compat/linprocfs/linprocfs.c +++ b/sys/compat/linprocfs/linprocfs.c @@ -41,6 +41,8 @@ * @(#)procfs_status.c 8.4 (Berkeley) 6/15/94 */ +#include "opt_inet.h" + #include __FBSDID("$FreeBSD$"); @@ -86,6 +88,10 @@ __FBSDID("$FreeBSD$"); #include #include +#include +#include +#include + #include #include #include @@ -1546,6 +1552,77 @@ linprocfs_donetdev(PFS_FILL_ARGS) return (0); } +struct walkarg { + struct sbuf *sb; +}; + +static int +linux_route_print(struct rtentry *rt, void *vw) +{ +#ifdef INET + struct walkarg *w = vw; + struct route_nhop_data rnd; + struct in_addr dst, mask; + struct nhop_object *nh; + char ifname[16]; + uint32_t scopeid = 0; + uint32_t gw = 0; + uint32_t linux_flags = 0; + + rt_get_inet_prefix_pmask(rt, &dst, &mask, &scopeid); + + rt_get_rnd(rt, &rnd); + + /* select only first route in case of multipath */ + nh = nhop_select_func(rnd.rnd_nhop, 0); + + linux_ifname(nh->nh_ifp, ifname, sizeof(ifname)); + + gw = (nh->nh_flags & NHF_GATEWAY) + ? nh->gw4_sa.sin_addr.s_addr : 0; + + linux_flags = RTF_UP | + (nhop_get_rtflags(nh) & (RTF_GATEWAY | RTF_HOST)); + + sbuf_printf(w->sb, + "%s\t" + "%08X\t%08X\t%04X\t" + "%d\t%u\t%d\t" + "%08X\t%d\t%u\t%u", + ifname, + dst.s_addr, gw, linux_flags, + 0, 0, rnd.rnd_weight, + mask.s_addr, nh->nh_mtu, 0, 0); + + sbuf_printf(w->sb, "\n\n"); +#endif + return (0); +} + +/* + * Filler function for proc/net/route + */ +static int +linprocfs_donetroute(PFS_FILL_ARGS) +{ + struct walkarg w = { + .sb = sb + }; + uint32_t fibnum = curthread->td_proc->p_fibnum; + + sbuf_printf(w.sb, "%-127s\n", "Iface\tDestination\tGateway " + "\tFlags\tRefCnt\tUse\tMetric\tMask\t\tMTU" + "\tWindow\tIRTT"); + + CURVNET_SET(TD_TO_VNET(curthread)); + IFNET_RLOCK(); + rib_walk(fibnum, AF_INET, false, linux_route_print, &w); + IFNET_RUNLOCK(); + CURVNET_RESTORE(); + + return (0); +} + /* * Filler function for proc/sys/kernel/osrelease */ @@ -2100,6 +2177,8 @@ linprocfs_init(PFS_INIT_ARGS) dir = pfs_create_dir(root, "net", NULL, NULL, NULL, 0); pfs_create_file(dir, "dev", &linprocfs_donetdev, NULL, NULL, NULL, PFS_RD); + pfs_create_file(dir, "route", &linprocfs_donetroute, + NULL, NULL, NULL, PFS_RD); /* /proc//... */ dir = pfs_create_dir(root, "pid", NULL, NULL, NULL, PFS_PROCDEP); diff --git a/sys/modules/linprocfs/Makefile b/sys/modules/linprocfs/Makefile index fa7ac8725d14..16f9f8c703be 100644 --- a/sys/modules/linprocfs/Makefile +++ b/sys/modules/linprocfs/Makefile @@ -4,7 +4,7 @@ KMOD= linprocfs SRCS= vnode_if.h \ - device_if.h bus_if.h \ + device_if.h bus_if.h opt_inet.h \ linprocfs.c .if !defined(KERNBUILDDIR)