From owner-svn-src-all@freebsd.org Sun Oct 13 18:17:10 2019 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 60ADB138E4F; Sun, 13 Oct 2019 18:17:10 +0000 (UTC) (envelope-from tuexen@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46rqfG1Vp0z4NCq; Sun, 13 Oct 2019 18:17:10 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 17CBA20C58; Sun, 13 Oct 2019 18:17:10 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x9DIH9Rc047804; Sun, 13 Oct 2019 18:17:09 GMT (envelope-from tuexen@FreeBSD.org) Received: (from tuexen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x9DIH9YQ047799; Sun, 13 Oct 2019 18:17:09 GMT (envelope-from tuexen@FreeBSD.org) Message-Id: <201910131817.x9DIH9YQ047799@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tuexen set sender to tuexen@FreeBSD.org using -f From: Michael Tuexen Date: Sun, 13 Oct 2019 18:17:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r353480 - in head/sys: net netinet sys X-SVN-Group: head X-SVN-Commit-Author: tuexen X-SVN-Commit-Paths: in head/sys: net netinet sys X-SVN-Commit-Revision: 353480 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Oct 2019 18:17:10 -0000 Author: tuexen Date: Sun Oct 13 18:17:08 2019 New Revision: 353480 URL: https://svnweb.freebsd.org/changeset/base/353480 Log: Use an event handler to notify the SCTP about IP address changes instead of calling an SCTP specific function from the IP code. This is a requirement of supporting SCTP as a kernel loadable module. This patch was developed by markj@, I tweaked a bit the SCTP related code. Submitted by: markj@ MFC after: 3 days Modified: head/sys/net/route.c head/sys/netinet/sctp_bsd_addr.c head/sys/netinet/sctp_bsd_addr.h head/sys/netinet/sctp_usrreq.c head/sys/sys/eventhandler.h Modified: head/sys/net/route.c ============================================================================== --- head/sys/net/route.c Sun Oct 13 18:03:23 2019 (r353479) +++ head/sys/net/route.c Sun Oct 13 18:17:08 2019 (r353480) @@ -38,10 +38,9 @@ #include "opt_inet.h" #include "opt_inet6.h" -#include "opt_route.h" -#include "opt_sctp.h" #include "opt_mrouting.h" #include "opt_mpath.h" +#include "opt_route.h" #include #include @@ -90,13 +89,6 @@ #define RT_NUMFIBS 1 #endif -#if defined(INET) || defined(INET6) -#ifdef SCTP -extern void sctp_addr_change(struct ifaddr *ifa, int cmd); -#endif /* SCTP */ -#endif - - /* This is read-only.. */ u_int rt_numfibs = RT_NUMFIBS; SYSCTL_UINT(_net, OID_AUTO, fibs, CTLFLAG_RDTUN, &rt_numfibs, 0, ""); @@ -140,6 +132,8 @@ VNET_DEFINE(int, rttrash); /* routes not in table but VNET_DEFINE_STATIC(uma_zone_t, rtzone); /* Routing table UMA zone. */ #define V_rtzone VNET(rtzone) +EVENTHANDLER_LIST_DEFINE(rt_addrmsg); + static int rtrequest1_fib_change(struct rib_head *, struct rt_addrinfo *, struct rtentry **, u_int); static void rt_setmetrics(const struct rt_addrinfo *, struct rtentry *); @@ -2224,20 +2218,10 @@ rt_addrmsg(int cmd, struct ifaddr *ifa, int fibnum) KASSERT(cmd == RTM_ADD || cmd == RTM_DELETE, ("unexpected cmd %d", cmd)); - KASSERT(fibnum == RT_ALL_FIBS || (fibnum >= 0 && fibnum < rt_numfibs), ("%s: fib out of range 0 <=%d<%d", __func__, fibnum, rt_numfibs)); -#if defined(INET) || defined(INET6) -#ifdef SCTP - /* - * notify the SCTP stack - * this will only get called when an address is added/deleted - * XXX pass the ifaddr struct instead if ifa->ifa_addr... - */ - sctp_addr_change(ifa, cmd); -#endif /* SCTP */ -#endif + EVENTHANDLER_DIRECT_INVOKE(rt_addrmsg, ifa, cmd); return (rtsock_addrmsg(cmd, ifa, fibnum)); } Modified: head/sys/netinet/sctp_bsd_addr.c ============================================================================== --- head/sys/netinet/sctp_bsd_addr.c Sun Oct 13 18:03:23 2019 (r353479) +++ head/sys/netinet/sctp_bsd_addr.c Sun Oct 13 18:17:08 2019 (r353480) @@ -358,6 +358,12 @@ sctp_addr_change(struct ifaddr *ifa, int cmd) } void +sctp_addr_change_event_handler(void *arg __unused, struct ifaddr *ifa, int cmd) +{ + sctp_addr_change(ifa, cmd); +} + +void sctp_add_or_del_interfaces(int (*pred) (struct ifnet *), int add){ struct ifnet *ifn; struct ifaddr *ifa; Modified: head/sys/netinet/sctp_bsd_addr.h ============================================================================== --- head/sys/netinet/sctp_bsd_addr.h Sun Oct 13 18:03:23 2019 (r353479) +++ head/sys/netinet/sctp_bsd_addr.h Sun Oct 13 18:17:08 2019 (r353480) @@ -61,6 +61,8 @@ int sctp_copy_out_packet_log(uint8_t *target, int leng void sctp_addr_change(struct ifaddr *ifa, int cmd); +void sctp_addr_change_event_handler(void *, struct ifaddr *, int); + void sctp_add_or_del_interfaces(int (*pred) (struct ifnet *), int add); #endif Modified: head/sys/netinet/sctp_usrreq.c ============================================================================== --- head/sys/netinet/sctp_usrreq.c Sun Oct 13 18:03:23 2019 (r353479) +++ head/sys/netinet/sctp_usrreq.c Sun Oct 13 18:17:08 2019 (r353480) @@ -53,6 +53,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include @@ -89,6 +90,8 @@ sctp_init(void) SCTP_BASE_VAR(packet_log_end) = 0; memset(&SCTP_BASE_VAR(packet_log_buffer), 0, SCTP_PACKET_LOG_SIZE); #endif + EVENTHANDLER_REGISTER(rt_addrmsg, sctp_addr_change_event_handler, + NULL, EVENTHANDLER_PRI_FIRST); } #ifdef VIMAGE Modified: head/sys/sys/eventhandler.h ============================================================================== --- head/sys/sys/eventhandler.h Sun Oct 13 18:03:23 2019 (r353479) +++ head/sys/sys/eventhandler.h Sun Oct 13 18:17:08 2019 (r353480) @@ -312,4 +312,9 @@ typedef void (*device_detach_fn)(void *, device_t, enu EVENTHANDLER_DECLARE(device_attach, device_attach_fn); EVENTHANDLER_DECLARE(device_detach, device_detach_fn); +/* Interface address addition and removal event */ +struct ifaddr; +typedef void (*rt_addrmsg_fn)(void *, struct ifaddr *, int); +EVENTHANDLER_DECLARE(rt_addrmsg, rt_addrmsg_fn); + #endif /* _SYS_EVENTHANDLER_H_ */