From 3abced87f950dd62d00360daeb83276e5d5a1d47 Mon Sep 17 00:00:00 2001 From: Nuno Antunes Date: Tue, 11 Sep 2012 11:49:51 +0100 Subject: [PATCH] netisr: rename cpu_portfn() to netisr_portfn(). No functional change. Searched and replaced with: find sys/ -type f -exec sed -i "" 's/cpu_portfn/netisr_portfn/g' '{}' \; --- sys/dev/acpica5/acpi_cpu_pstate.c | 10 +++--- sys/kern/dsched/fq/flow.txt | 2 +- sys/kern/kern_poll.c | 16 ++++----- sys/kern/uipc_socket.c | 2 +- sys/kern/uipc_socket2.c | 2 +- sys/net/bpf.c | 2 +- sys/net/bridge/if_bridgevar.h | 2 +- sys/net/dummynet/ip_dummynet.c | 6 ++-- sys/net/dummynet/ip_dummynet_glue.c | 8 ++--- sys/net/if_ethersubr.c | 6 ++-- sys/net/if_poll.c | 50 ++++++++++++++--------------- sys/net/ipfw/ip_fw2.h | 2 +- sys/net/netisr.c | 14 ++++---- sys/net/netisr.h | 2 +- sys/net/pf/pf.c | 2 +- sys/net/pfil.c | 2 +- sys/net/rtsock.c | 2 +- sys/net/vlan/if_vlan.c | 12 +++---- sys/netinet/if_ether.c | 2 +- sys/netinet/in.c | 2 +- sys/netinet/ip_carp.c | 24 +++++++------- sys/netinet/ip_demux.c | 10 +++--- sys/netinet/ip_divert.c | 4 +-- sys/netinet/ip_flow.c | 2 +- sys/netinet/ip_input.c | 2 +- sys/netinet/tcp_subr.c | 16 ++++----- sys/netinet/tcp_syncache.c | 2 +- sys/netinet/tcp_usrreq.c | 14 ++++---- sys/netinet/udp_usrreq.c | 26 +++++++-------- sys/netinet6/ip6_input.c | 2 +- sys/netinet6/udp6_usrreq.c | 2 +- 31 files changed, 125 insertions(+), 125 deletions(-) diff --git a/sys/dev/acpica5/acpi_cpu_pstate.c b/sys/dev/acpica5/acpi_cpu_pstate.c index a5dca3da43..bd540498ec 100644 --- a/sys/dev/acpica5/acpi_cpu_pstate.c +++ b/sys/dev/acpica5/acpi_cpu_pstate.c @@ -1029,7 +1029,7 @@ acpi_pst_check_csr(struct acpi_pst_softc *sc) msg.ctrl = &sc->pst_creg; msg.status = &sc->pst_sreg; - return lwkt_domsg(cpu_portfn(sc->pst_cpuid), &msg.base.lmsg, 0); + return lwkt_domsg(netisr_portfn(sc->pst_cpuid), &msg.base.lmsg, 0); } static void @@ -1052,7 +1052,7 @@ acpi_pst_check_pstates(struct acpi_pst_softc *sc) netmsg_init(&msg, NULL, &curthread->td_msgport, MSGF_PRIORITY, acpi_pst_check_pstates_handler); - return lwkt_domsg(cpu_portfn(sc->pst_cpuid), &msg.lmsg, 0); + return lwkt_domsg(netisr_portfn(sc->pst_cpuid), &msg.lmsg, 0); } static void @@ -1078,7 +1078,7 @@ acpi_pst_init(struct acpi_pst_softc *sc) msg.ctrl = &sc->pst_creg; msg.status = &sc->pst_sreg; - return lwkt_domsg(cpu_portfn(sc->pst_cpuid), &msg.base.lmsg, 0); + return lwkt_domsg(netisr_portfn(sc->pst_cpuid), &msg.base.lmsg, 0); } static void @@ -1105,7 +1105,7 @@ acpi_pst_set_pstate(struct acpi_pst_softc *sc, const struct acpi_pstate *pstate) msg.ctrl = &sc->pst_creg; msg.status = &sc->pst_sreg; - return lwkt_domsg(cpu_portfn(sc->pst_cpuid), &msg.base.lmsg, 0); + return lwkt_domsg(netisr_portfn(sc->pst_cpuid), &msg.base.lmsg, 0); } static void @@ -1132,7 +1132,7 @@ acpi_pst_get_pstate(struct acpi_pst_softc *sc) MSGF_PRIORITY, acpi_pst_get_pstate_handler); msg.status = &sc->pst_sreg; - lwkt_domsg(cpu_portfn(sc->pst_cpuid), &msg.base.lmsg, 0); + lwkt_domsg(netisr_portfn(sc->pst_cpuid), &msg.base.lmsg, 0); return msg.base.lmsg.u.ms_resultp; } diff --git a/sys/kern/dsched/fq/flow.txt b/sys/kern/dsched/fq/flow.txt index 4c1d91bb4f..affe8f2446 100644 --- a/sys/kern/dsched/fq/flow.txt +++ b/sys/kern/dsched/fq/flow.txt @@ -64,4 +64,4 @@ http://pcca.ath.cx/updatedb.php calculate budget in respective thread Andrew File System Benchmark -TPC-B database benchmark \ No newline at end of file +TPC-B database benchmark diff --git a/sys/kern/kern_poll.c b/sys/kern/kern_poll.c index 447640cbb2..972e4bac65 100644 --- a/sys/kern/kern_poll.c +++ b/sys/kern/kern_poll.c @@ -301,7 +301,7 @@ static void schedpoll_oncpu(netmsg_t msg) { if (msg->lmsg.ms_flags & MSGF_DONE) - lwkt_sendmsg(cpu_portfn(mycpuid), &msg->lmsg); + lwkt_sendmsg(netisr_portfn(mycpuid), &msg->lmsg); } static __inline void @@ -342,7 +342,7 @@ sysctl_pollhz(SYSCTL_HANDLER_ARGS) 0, poll_sysctl_pollhz); msg.lmsg.u.ms_result = phz; - port = cpu_portfn(pctx->poll_cpuid); + port = netisr_portfn(pctx->poll_cpuid); lwkt_domsg(port, &msg.lmsg, 0); return 0; } @@ -367,7 +367,7 @@ sysctl_polling(SYSCTL_HANDLER_ARGS) 0, poll_sysctl_polling); msg.lmsg.u.ms_result = enabled; - port = cpu_portfn(pctx->poll_cpuid); + port = netisr_portfn(pctx->poll_cpuid); lwkt_domsg(port, &msg.lmsg, 0); return 0; } @@ -390,7 +390,7 @@ sysctl_regfrac(SYSCTL_HANDLER_ARGS) 0, poll_sysctl_regfrac); msg.lmsg.u.ms_result = reg_frac; - port = cpu_portfn(pctx->poll_cpuid); + port = netisr_portfn(pctx->poll_cpuid); lwkt_domsg(port, &msg.lmsg, 0); return 0; } @@ -417,7 +417,7 @@ sysctl_burstmax(SYSCTL_HANDLER_ARGS) 0, poll_sysctl_burstmax); msg.lmsg.u.ms_result = burst_max; - port = cpu_portfn(pctx->poll_cpuid); + port = netisr_portfn(pctx->poll_cpuid); lwkt_domsg(port, &msg.lmsg, 0); return 0; } @@ -440,7 +440,7 @@ sysctl_eachburst(SYSCTL_HANDLER_ARGS) 0, poll_sysctl_eachburst); msg.lmsg.u.ms_result = each_burst; - port = cpu_portfn(pctx->poll_cpuid); + port = netisr_portfn(pctx->poll_cpuid); lwkt_domsg(port, &msg.lmsg, 0); return 0; } @@ -768,7 +768,7 @@ ether_pollcpu_register(struct ifnet *ifp, int cpuid) 0, poll_register); msg.lmsg.u.ms_resultp = ifp; - port = cpu_portfn(cpuid); + port = netisr_portfn(cpuid); lwkt_domsg(port, &msg.lmsg, 0); if (msg.lmsg.ms_error) { @@ -862,7 +862,7 @@ ether_poll_deregister(struct ifnet *ifp) 0, poll_deregister); msg.lmsg.u.ms_resultp = ifp; - port = cpu_portfn(cpuid); + port = netisr_portfn(cpuid); lwkt_domsg(port, &msg.lmsg, 0); if (!msg.lmsg.ms_error) { diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index 6d49d105b0..165c738cc1 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -239,7 +239,7 @@ socreate(int dom, struct socket **aso, int type, if (prp->pr_flags & PR_SYNC_PORT) so->so_port = &netisr_sync_port; else - so->so_port = cpu_portfn(0); + so->so_port = netisr_portfn(0); TAILQ_INIT(&so->so_incomp); TAILQ_INIT(&so->so_comp); diff --git a/sys/kern/uipc_socket2.c b/sys/kern/uipc_socket2.c index 21a3a210d1..75e6245551 100644 --- a/sys/kern/uipc_socket2.c +++ b/sys/kern/uipc_socket2.c @@ -347,7 +347,7 @@ sonewconn_faddr(struct socket *head, int connstatus, * which occur to our cpu allowing us to complete the attachment * without racing anything. */ - sosetport(so, cpu_portfn(mycpu->gd_cpuid)); + sosetport(so, netisr_portfn(mycpu->gd_cpuid)); if ((head->so_options & SO_ACCEPTFILTER) != 0) connstatus = 0; so->so_head = head; diff --git a/sys/net/bpf.c b/sys/net/bpf.c index 4e60169c19..1fb84c2dd9 100644 --- a/sys/net/bpf.c +++ b/sys/net/bpf.c @@ -591,7 +591,7 @@ bpfwrite(struct dev_write_args *ap) bmsg.nm_ifp = ifp; bmsg.nm_dst = &dst; - return lwkt_domsg(cpu_portfn(0), &bmsg.base.lmsg, 0); + return lwkt_domsg(netisr_portfn(0), &bmsg.base.lmsg, 0); } /* diff --git a/sys/net/bridge/if_bridgevar.h b/sys/net/bridge/if_bridgevar.h index fef519426d..0beb9ed2eb 100644 --- a/sys/net/bridge/if_bridgevar.h +++ b/sys/net/bridge/if_bridgevar.h @@ -379,7 +379,7 @@ struct bridge_softc { #define sc_if sc_arp.ac_if #define BRIDGE_CFGCPU 0 -#define BRIDGE_CFGPORT cpu_portfn(BRIDGE_CFGCPU) +#define BRIDGE_CFGPORT netisr_portfn(BRIDGE_CFGCPU) extern const uint8_t bstp_etheraddr[]; diff --git a/sys/net/dummynet/ip_dummynet.c b/sys/net/dummynet/ip_dummynet.c index 7fcf37bc5c..a72efd2186 100644 --- a/sys/net/dummynet/ip_dummynet.c +++ b/sys/net/dummynet/ip_dummynet.c @@ -1876,7 +1876,7 @@ dummynet_clock(systimer_t info __unused, int in_ipi __unused, crit_enter(); if (DUMMYNET_LOADED && (dn_netmsg.lmsg.ms_flags & MSGF_DONE)) - lwkt_sendmsg(cpu_portfn(mycpuid), &dn_netmsg.lmsg); + lwkt_sendmsg(netisr_portfn(mycpuid), &dn_netmsg.lmsg); crit_exit(); } @@ -1961,7 +1961,7 @@ ip_dn_init(void) netmsg_init(&smsg, NULL, &curthread->td_msgport, 0, ip_dn_init_dispatch); - lwkt_domsg(cpu_portfn(ip_dn_cpu), &smsg.lmsg, 0); + lwkt_domsg(netisr_portfn(ip_dn_cpu), &smsg.lmsg, 0); return smsg.lmsg.ms_error; } @@ -1991,7 +1991,7 @@ ip_dn_stop(void) netmsg_init(&smsg, NULL, &curthread->td_msgport, 0, ip_dn_stop_dispatch); - lwkt_domsg(cpu_portfn(ip_dn_cpu), &smsg.lmsg, 0); + lwkt_domsg(netisr_portfn(ip_dn_cpu), &smsg.lmsg, 0); netmsg_service_sync(); } diff --git a/sys/net/dummynet/ip_dummynet_glue.c b/sys/net/dummynet/ip_dummynet_glue.c index cf36954107..fd91e00faf 100644 --- a/sys/net/dummynet/ip_dummynet_glue.c +++ b/sys/net/dummynet/ip_dummynet_glue.c @@ -92,7 +92,7 @@ ip_dn_queue(struct mbuf *m) 0, ip_dn_dispatch); nmp->nm_packet = m; - port = cpu_portfn(ip_dn_cpu); + port = netisr_portfn(ip_dn_cpu); lwkt_sendmsg(port, &nmp->base.lmsg); } @@ -469,7 +469,7 @@ ip_dn_sockopt_flush(struct sockopt *sopt) netmsg_init(&smsg, NULL, &curthread->td_msgport, 0, ip_dn_sockopt_dispatch); smsg.lmsg.u.ms_resultp = &dn_sopt; - lwkt_domsg(cpu_portfn(ip_dn_cpu), &smsg.lmsg, 0); + lwkt_domsg(netisr_portfn(ip_dn_cpu), &smsg.lmsg, 0); return smsg.lmsg.ms_error; } @@ -487,7 +487,7 @@ ip_dn_sockopt_get(struct sockopt *sopt) netmsg_init(&smsg, NULL, &curthread->td_msgport, 0, ip_dn_sockopt_dispatch); smsg.lmsg.u.ms_resultp = &dn_sopt; - lwkt_domsg(cpu_portfn(ip_dn_cpu), &smsg.lmsg, 0); + lwkt_domsg(netisr_portfn(ip_dn_cpu), &smsg.lmsg, 0); error = smsg.lmsg.ms_error; if (error) { @@ -522,7 +522,7 @@ ip_dn_sockopt_config(struct sockopt *sopt) netmsg_init(&smsg, NULL, &curthread->td_msgport, 0, ip_dn_sockopt_dispatch); smsg.lmsg.u.ms_resultp = &dn_sopt; - lwkt_domsg(cpu_portfn(ip_dn_cpu), &smsg.lmsg, 0); + lwkt_domsg(netisr_portfn(ip_dn_cpu), &smsg.lmsg, 0); return smsg.lmsg.ms_error; } diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c index 4dbe21c799..b93d47b915 100644 --- a/sys/net/if_ethersubr.c +++ b/sys/net/if_ethersubr.c @@ -1168,7 +1168,7 @@ post_stats: } if (m->m_flags & M_HASH) { - if (&curthread->td_msgport == cpu_portfn(m->m_pkthdr.hash)) { + if (&curthread->td_msgport == netisr_portfn(m->m_pkthdr.hash)) { netisr_handle(isr, m); return; } else { @@ -1423,7 +1423,7 @@ ether_dispatch(int isr, struct mbuf *m) pmsg->base.lmsg.u.ms_result = isr; logether(disp_beg, NULL); - lwkt_sendmsg(cpu_portfn(m->m_pkthdr.hash), &pmsg->base.lmsg); + lwkt_sendmsg(netisr_portfn(m->m_pkthdr.hash), &pmsg->base.lmsg); logether(disp_end, NULL); } @@ -1629,7 +1629,7 @@ ether_demux(struct mbuf *m) pmsg->nm_packet = m; pmsg->base.lmsg.u.ms_result = isr; - lwkt_sendmsg(cpu_portfn(m->m_pkthdr.hash), &pmsg->base.lmsg); + lwkt_sendmsg(netisr_portfn(m->m_pkthdr.hash), &pmsg->base.lmsg); } boolean_t diff --git a/sys/net/if_poll.c b/sys/net/if_poll.c index 6b6ff775d4..3c2508f445 100644 --- a/sys/net/if_poll.c +++ b/sys/net/if_poll.c @@ -275,7 +275,7 @@ static __inline void ifpoll_sendmsg_oncpu(netmsg_t msg) { if (msg->lmsg.ms_flags & MSGF_DONE) - lwkt_sendmsg(cpu_portfn(mycpuid), &msg->lmsg); + lwkt_sendmsg(netisr_portfn(mycpuid), &msg->lmsg); } static __inline void @@ -378,7 +378,7 @@ ifpoll_register(struct ifnet *ifp) 0, ifpoll_register_handler); nmsg.lmsg.u.ms_resultp = &info; - error = lwkt_domsg(cpu_portfn(0), &nmsg.lmsg, 0); + error = lwkt_domsg(netisr_portfn(0), &nmsg.lmsg, 0); if (error) { if (!ifpoll_deregister(ifp)) { if_printf(ifp, "ifpoll_register: " @@ -411,7 +411,7 @@ ifpoll_deregister(struct ifnet *ifp) 0, ifpoll_deregister_handler); nmsg.lmsg.u.ms_resultp = ifp; - error = lwkt_domsg(cpu_portfn(0), &nmsg.lmsg, 0); + error = lwkt_domsg(netisr_portfn(0), &nmsg.lmsg, 0); if (!error) { ifnet_serialize_all(ifp); ifp->if_qpoll(ifp, NULL); @@ -428,7 +428,7 @@ ifpoll_register_handler(netmsg_t nmsg) int error; KKASSERT(cpuid < ifpoll_ncpus); - KKASSERT(&curthread->td_msgport == cpu_portfn(cpuid)); + KKASSERT(&curthread->td_msgport == netisr_portfn(cpuid)); if (cpuid == 0) { error = stpoll_register(info->ifpi_ifp, &info->ifpi_status); @@ -451,7 +451,7 @@ ifpoll_register_handler(netmsg_t nmsg) nextcpu = cpuid + 1; if (nextcpu < ifpoll_ncpus) - lwkt_forwardmsg(cpu_portfn(nextcpu), &nmsg->lmsg); + lwkt_forwardmsg(netisr_portfn(nextcpu), &nmsg->lmsg); else lwkt_replymsg(&nmsg->lmsg, 0); return; @@ -466,7 +466,7 @@ ifpoll_deregister_handler(netmsg_t nmsg) int cpuid = mycpuid, nextcpu; KKASSERT(cpuid < ifpoll_ncpus); - KKASSERT(&curthread->td_msgport == cpu_portfn(cpuid)); + KKASSERT(&curthread->td_msgport == netisr_portfn(cpuid)); /* Ignore errors */ if (cpuid == 0) @@ -479,7 +479,7 @@ ifpoll_deregister_handler(netmsg_t nmsg) nextcpu = cpuid + 1; if (nextcpu < ifpoll_ncpus) - lwkt_forwardmsg(cpu_portfn(nextcpu), &nmsg->lmsg); + lwkt_forwardmsg(netisr_portfn(nextcpu), &nmsg->lmsg); else lwkt_replymsg(&nmsg->lmsg, 0); } @@ -518,7 +518,7 @@ stpoll_handler(netmsg_t msg) struct thread *td = curthread; int i; - KKASSERT(&td->td_msgport == cpu_portfn(0)); + KKASSERT(&td->td_msgport == netisr_portfn(0)); crit_enter_quick(td); @@ -567,7 +567,7 @@ stpoll_register(struct ifnet *ifp, const struct ifpoll_status *st_rec) struct stpoll_ctx *st_ctx = &stpoll_context; int error; - KKASSERT(&curthread->td_msgport == cpu_portfn(0)); + KKASSERT(&curthread->td_msgport == netisr_portfn(0)); if (st_rec->status_func == NULL) return 0; @@ -610,7 +610,7 @@ stpoll_deregister(struct ifnet *ifp) struct stpoll_ctx *st_ctx = &stpoll_context; int i, error; - KKASSERT(&curthread->td_msgport == cpu_portfn(0)); + KKASSERT(&curthread->td_msgport == netisr_portfn(0)); for (i = 0; i < st_ctx->poll_handlers; ++i) { if (st_ctx->pr[i].ifp == ifp) /* Found it */ @@ -786,7 +786,7 @@ iopoll_handler(netmsg_t msg) int i, cycles; io_ctx = msg->lmsg.u.ms_resultp; - KKASSERT(&td->td_msgport == cpu_portfn(io_ctx->poll_cpuid)); + KKASSERT(&td->td_msgport == netisr_portfn(io_ctx->poll_cpuid)); crit_enter_quick(td); @@ -857,7 +857,7 @@ iopollmore_handler(netmsg_t msg) uint32_t pending_polls; io_ctx = msg->lmsg.u.ms_resultp; - KKASSERT(&td->td_msgport == cpu_portfn(io_ctx->poll_cpuid)); + KKASSERT(&td->td_msgport == netisr_portfn(io_ctx->poll_cpuid)); crit_enter_quick(td); @@ -973,7 +973,7 @@ sysctl_burstmax_handler(netmsg_t nmsg) struct iopoll_ctx *io_ctx; io_ctx = msg->ctx; - KKASSERT(&curthread->td_msgport == cpu_portfn(io_ctx->poll_cpuid)); + KKASSERT(&curthread->td_msgport == netisr_portfn(io_ctx->poll_cpuid)); io_ctx->poll_burst_max = nmsg->lmsg.u.ms_result; if (io_ctx->poll_each_burst > io_ctx->poll_burst_max) @@ -1008,7 +1008,7 @@ sysctl_burstmax(SYSCTL_HANDLER_ARGS) msg.base.lmsg.u.ms_result = burst_max; msg.ctx = io_ctx; - return lwkt_domsg(cpu_portfn(io_ctx->poll_cpuid), &msg.base.lmsg, 0); + return lwkt_domsg(netisr_portfn(io_ctx->poll_cpuid), &msg.base.lmsg, 0); } static void @@ -1019,7 +1019,7 @@ sysctl_eachburst_handler(netmsg_t nmsg) uint32_t each_burst; io_ctx = msg->ctx; - KKASSERT(&curthread->td_msgport == cpu_portfn(io_ctx->poll_cpuid)); + KKASSERT(&curthread->td_msgport == netisr_portfn(io_ctx->poll_cpuid)); each_burst = nmsg->lmsg.u.ms_result; if (each_burst > io_ctx->poll_burst_max) @@ -1049,7 +1049,7 @@ sysctl_eachburst(SYSCTL_HANDLER_ARGS) msg.base.lmsg.u.ms_result = each_burst; msg.ctx = io_ctx; - return lwkt_domsg(cpu_portfn(io_ctx->poll_cpuid), &msg.base.lmsg, 0); + return lwkt_domsg(netisr_portfn(io_ctx->poll_cpuid), &msg.base.lmsg, 0); } static int @@ -1058,7 +1058,7 @@ iopoll_register(struct ifnet *ifp, struct iopoll_ctx *io_ctx, { int error; - KKASSERT(&curthread->td_msgport == cpu_portfn(io_ctx->poll_cpuid)); + KKASSERT(&curthread->td_msgport == netisr_portfn(io_ctx->poll_cpuid)); if (io_rec->poll_func == NULL) return 0; @@ -1100,7 +1100,7 @@ iopoll_deregister(struct ifnet *ifp, struct iopoll_ctx *io_ctx) { int i, error; - KKASSERT(&curthread->td_msgport == cpu_portfn(io_ctx->poll_cpuid)); + KKASSERT(&curthread->td_msgport == netisr_portfn(io_ctx->poll_cpuid)); for (i = 0; i < io_ctx->poll_handlers; ++i) { if (io_ctx->pr[i].ifp == ifp) /* Found it */ @@ -1234,7 +1234,7 @@ poll_comm_adjust_pollhz(struct poll_comm *comm) uint32_t handlers; int pollhz = 1; - KKASSERT(&curthread->td_msgport == cpu_portfn(comm->poll_cpuid)); + KKASSERT(&curthread->td_msgport == netisr_portfn(comm->poll_cpuid)); /* * If there is no polling handler registered, set systimer @@ -1271,7 +1271,7 @@ sysctl_pollhz(SYSCTL_HANDLER_ARGS) 0, sysctl_pollhz_handler); nmsg.lmsg.u.ms_result = phz; - return lwkt_domsg(cpu_portfn(comm->poll_cpuid), &nmsg.lmsg, 0); + return lwkt_domsg(netisr_portfn(comm->poll_cpuid), &nmsg.lmsg, 0); } static void @@ -1279,7 +1279,7 @@ sysctl_pollhz_handler(netmsg_t nmsg) { struct poll_comm *comm = poll_common[mycpuid]; - KKASSERT(&curthread->td_msgport == cpu_portfn(comm->poll_cpuid)); + KKASSERT(&curthread->td_msgport == netisr_portfn(comm->poll_cpuid)); /* Save polling frequency */ comm->pollhz = nmsg->lmsg.u.ms_result; @@ -1321,7 +1321,7 @@ sysctl_stfrac(SYSCTL_HANDLER_ARGS) 0, sysctl_stfrac_handler); nmsg.lmsg.u.ms_result = stfrac; - return lwkt_domsg(cpu_portfn(comm->poll_cpuid), &nmsg.lmsg, 0); + return lwkt_domsg(netisr_portfn(comm->poll_cpuid), &nmsg.lmsg, 0); } static void @@ -1330,7 +1330,7 @@ sysctl_stfrac_handler(netmsg_t nmsg) struct poll_comm *comm = poll_common[mycpuid]; int stfrac = nmsg->lmsg.u.ms_result; - KKASSERT(&curthread->td_msgport == cpu_portfn(comm->poll_cpuid)); + KKASSERT(&curthread->td_msgport == netisr_portfn(comm->poll_cpuid)); crit_enter(); comm->poll_stfrac = stfrac; @@ -1359,7 +1359,7 @@ sysctl_txfrac(SYSCTL_HANDLER_ARGS) 0, sysctl_txfrac_handler); nmsg.lmsg.u.ms_result = txfrac; - return lwkt_domsg(cpu_portfn(comm->poll_cpuid), &nmsg.lmsg, 0); + return lwkt_domsg(netisr_portfn(comm->poll_cpuid), &nmsg.lmsg, 0); } static void @@ -1368,7 +1368,7 @@ sysctl_txfrac_handler(netmsg_t nmsg) struct poll_comm *comm = poll_common[mycpuid]; int txfrac = nmsg->lmsg.u.ms_result; - KKASSERT(&curthread->td_msgport == cpu_portfn(comm->poll_cpuid)); + KKASSERT(&curthread->td_msgport == netisr_portfn(comm->poll_cpuid)); crit_enter(); comm->poll_txfrac = txfrac; diff --git a/sys/net/ipfw/ip_fw2.h b/sys/net/ipfw/ip_fw2.h index a0299c518f..1d9caf722e 100644 --- a/sys/net/ipfw/ip_fw2.h +++ b/sys/net/ipfw/ip_fw2.h @@ -413,7 +413,7 @@ extern int ip_fw_loaded; #define IPFW_LOADED (ip_fw_loaded) #define IPFW_CFGCPUID 0 -#define IPFW_CFGPORT cpu_portfn(IPFW_CFGCPUID) +#define IPFW_CFGPORT netisr_portfn(IPFW_CFGCPUID) #define IPFW_ASSERT_CFGPORT(msgport) \ KASSERT((msgport) == IPFW_CFGPORT, ("not IPFW CFGPORT")) diff --git a/sys/net/netisr.c b/sys/net/netisr.c index 80d2513e26..0b4f7f9120 100644 --- a/sys/net/netisr.c +++ b/sys/net/netisr.c @@ -367,7 +367,7 @@ netisr_queue(int num, struct mbuf *m) * Get the protocol port based on the packet hash, initialize * the netmsg, and send it off. */ - port = cpu_portfn(m->m_pkthdr.hash); + port = netisr_portfn(m->m_pkthdr.hash); pmsg = &m->m_hdr.mh_netmsg; netmsg_init(&pmsg->base, NULL, &netisr_apanic_rport, 0, ni->ni_handler); @@ -394,7 +394,7 @@ netisr_handle(int num, struct mbuf *m) * Get the protocol port based on the packet hash */ KASSERT((m->m_flags & M_HASH), ("packet not characterized")); - port = cpu_portfn(m->m_pkthdr.hash); + port = netisr_portfn(m->m_pkthdr.hash); KASSERT(&curthread->td_msgport == port, ("wrong msgport")); KASSERT((num > 0 && num <= NELEM(netisrs)), ("bad isr %d", num)); @@ -515,7 +515,7 @@ netisr_register_rollup(netisr_ru_t ru_func) * thread for a particular cpu. */ lwkt_port_t -cpu_portfn(int cpu) +netisr_portfn(int cpu) { KKASSERT(cpu >= 0 && cpu < ncpus); return (&netisr_cpu[cpu].td_msgport); @@ -527,7 +527,7 @@ cpu_portfn(int cpu) lwkt_port_t cur_netport(void) { - return(cpu_portfn(mycpu->gd_cpuid)); + return(netisr_portfn(mycpu->gd_cpuid)); } /* @@ -651,7 +651,7 @@ netisr_barrier_set(struct netisr_barrier *br) volatile cpumask_t other_cpumask; int i, cur_cpuid; - KKASSERT(&curthread->td_msgport == cpu_portfn(0)); + KKASSERT(&curthread->td_msgport == netisr_portfn(0)); KKASSERT(!br->br_isset); other_cpumask = mycpu->gd_other_cpus & smp_active_mask; @@ -677,7 +677,7 @@ netisr_barrier_set(struct netisr_barrier *br) for (i = 0; i < ncpus; ++i) { if (i == cur_cpuid) continue; - lwkt_sendmsg(cpu_portfn(i), &br->br_msgs[i]->base.lmsg); + lwkt_sendmsg(netisr_portfn(i), &br->br_msgs[i]->base.lmsg); } while (other_cpumask != 0) { @@ -695,7 +695,7 @@ netisr_barrier_rem(struct netisr_barrier *br) #ifdef SMP int i, cur_cpuid; - KKASSERT(&curthread->td_msgport == cpu_portfn(0)); + KKASSERT(&curthread->td_msgport == netisr_portfn(0)); KKASSERT(br->br_isset); cur_cpuid = mycpuid; diff --git a/sys/net/netisr.h b/sys/net/netisr.h index 2c7548e47c..52aa96806b 100644 --- a/sys/net/netisr.h +++ b/sys/net/netisr.h @@ -165,7 +165,7 @@ extern lwkt_port netisr_afree_free_so_rport; extern lwkt_port netisr_apanic_rport; extern lwkt_port netisr_sync_port; -lwkt_port_t cpu_portfn(int cpu); +lwkt_port_t netisr_portfn(int cpu); lwkt_port_t cur_netport(void); void netisr_register(int, netisr_fn_t, netisr_cpufn_t); diff --git a/sys/net/pf/pf.c b/sys/net/pf/pf.c index 4bcaed3743..d09567621d 100644 --- a/sys/net/pf/pf.c +++ b/sys/net/pf/pf.c @@ -2974,7 +2974,7 @@ pf_socket_lookup(int direction, struct pf_pdesc *pd) case AF_INET: #ifdef SMP if (msg != NULL) { - lwkt_domsg(cpu_portfn(pi_cpu), + lwkt_domsg(netisr_portfn(pi_cpu), &msg->base.lmsg, 0); } else #endif /* SMP */ diff --git a/sys/net/pfil.c b/sys/net/pfil.c index d45b50538d..31d9c02a59 100644 --- a/sys/net/pfil.c +++ b/sys/net/pfil.c @@ -43,7 +43,7 @@ #include #include -#define PFIL_CFGPORT cpu_portfn(0) +#define PFIL_CFGPORT netisr_portfn(0) #define PFIL_GETMPLOCK(pfh) \ do { \ diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c index 8c854e3f43..cf171f998b 100644 --- a/sys/net/rtsock.c +++ b/sys/net/rtsock.c @@ -363,7 +363,7 @@ rts_input_skip(struct mbuf *m, sa_family_t family, struct rawcb *skip) M_ASSERTPKTHDR(m); - port = cpu_portfn(0); /* XXX same as for routing socket */ + port = netisr_portfn(0); /* XXX same as for routing socket */ pmsg = &m->m_hdr.mh_netmsg; netmsg_init(&pmsg->base, NULL, &netisr_apanic_rport, 0, rts_input_handler); diff --git a/sys/net/vlan/if_vlan.c b/sys/net/vlan/if_vlan.c index ccf2e3b345..6c647c690d 100644 --- a/sys/net/vlan/if_vlan.c +++ b/sys/net/vlan/if_vlan.c @@ -425,7 +425,7 @@ vlan_ifdetach(void *arg __unused, struct ifnet *ifp) 0, vlan_ifdetach_dispatch); vmsg.nv_ifp_p = ifp; - lwkt_domsg(cpu_portfn(0), &vmsg.base.lmsg, 0); + lwkt_domsg(netisr_portfn(0), &vmsg.base.lmsg, 0); } static int @@ -551,7 +551,7 @@ vlan_start(struct ifnet *ifp) nmp->nm_packet = m; nmp->base.lmsg.u.ms_resultp = ifp_p; - port = cpu_portfn(ifp_p->if_index % ncpus /* XXX */); + port = netisr_portfn(ifp_p->if_index % ncpus /* XXX */); lwkt_sendmsg(port, &nmp->base.lmsg); ifp->if_opackets++; } @@ -766,7 +766,7 @@ vlan_config(struct ifvlan *ifv, const char *parent_name, uint16_t vlantag) vmsg.nv_parent_name = parent_name; vmsg.nv_vlantag = vlantag; - return lwkt_domsg(cpu_portfn(0), &vmsg.base.lmsg, 0); + return lwkt_domsg(netisr_portfn(0), &vmsg.base.lmsg, 0); } static void @@ -904,7 +904,7 @@ vlan_unconfig(struct ifvlan *ifv) 0, vlan_unconfig_dispatch); vmsg.nv_ifv = ifv; - return lwkt_domsg(cpu_portfn(0), &vmsg.base.lmsg, 0); + return lwkt_domsg(netisr_portfn(0), &vmsg.base.lmsg, 0); } static int @@ -1046,7 +1046,7 @@ vlan_config_multi(struct ifvlan *ifv) 0, vlan_multi_dispatch); vmsg.nv_ifv = ifv; - return lwkt_domsg(cpu_portfn(0), &vmsg.base.lmsg, 0); + return lwkt_domsg(netisr_portfn(0), &vmsg.base.lmsg, 0); } static void @@ -1078,5 +1078,5 @@ vlan_config_flags(struct ifvlan *ifv) 0, vlan_flags_dispatch); vmsg.nv_ifv = ifv; - return lwkt_domsg(cpu_portfn(0), &vmsg.base.lmsg, 0); + return lwkt_domsg(netisr_portfn(0), &vmsg.base.lmsg, 0); } diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c index e712a25844..21b9047f92 100644 --- a/sys/netinet/if_ether.c +++ b/sys/netinet/if_ether.c @@ -461,7 +461,7 @@ arprequest_async(struct ifnet *ifp, const struct in_addr *sip, pmsg->nm_packet = m; pmsg->base.lmsg.u.ms_resultp = ifp; - lwkt_sendmsg(cpu_portfn(mycpuid), &pmsg->base.lmsg); + lwkt_sendmsg(netisr_portfn(mycpuid), &pmsg->base.lmsg); } /* diff --git a/sys/netinet/in.c b/sys/netinet/in.c index 08ed50cd47..8ef9cce282 100644 --- a/sys/netinet/in.c +++ b/sys/netinet/in.c @@ -243,7 +243,7 @@ in_control_redispatch(u_long cmd, caddr_t data, struct ifnet *ifp, msg.nm_data = data; msg.nm_ifp = ifp; msg.nm_td = td; - lwkt_domsg(cpu_portfn(0), &msg.base.lmsg, 0); + lwkt_domsg(netisr_portfn(0), &msg.base.lmsg, 0); error = msg.base.lmsg.ms_error; break; diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c index 46a60fde2a..71c549bd3c 100644 --- a/sys/netinet/ip_carp.c +++ b/sys/netinet/ip_carp.c @@ -693,7 +693,7 @@ carp_clone_destroy(struct ifnet *ifp) carp_clone_destroy_dispatch); cmsg.nc_softc = sc; - lwkt_domsg(cpu_portfn(0), &cmsg.base.lmsg, 0); + lwkt_domsg(netisr_portfn(0), &cmsg.base.lmsg, 0); lwkt_gettoken(&carp_listtok); LIST_REMOVE(sc, sc_next); @@ -898,7 +898,7 @@ carp_ifdetach(void *arg __unused, struct ifnet *ifp) carp_ifdetach_dispatch); cmsg.nc_carpdev = ifp; - lwkt_domsg(cpu_portfn(0), &cmsg.base.lmsg, 0); + lwkt_domsg(netisr_portfn(0), &cmsg.base.lmsg, 0); } /* @@ -1279,7 +1279,7 @@ carp_send_ad_timeout(void *xsc) crit_enter(); if (cmsg->base.lmsg.ms_flags & MSGF_DONE) - lwkt_sendmsg(cpu_portfn(0), &cmsg->base.lmsg); + lwkt_sendmsg(netisr_portfn(0), &cmsg->base.lmsg); crit_exit(); } @@ -1585,7 +1585,7 @@ carp_iamatch(const struct in_ifaddr *ia) { const struct carp_softc *sc = ia->ia_ifp->if_softc; - KASSERT(&curthread->td_msgport == cpu_portfn(0), + KASSERT(&curthread->td_msgport == netisr_portfn(0), ("not in netisr0")); #ifdef notyet @@ -1695,7 +1695,7 @@ carp_master_down_timeout(void *xsc) crit_enter(); if (cmsg->base.lmsg.ms_flags & MSGF_DONE) - lwkt_sendmsg(cpu_portfn(0), &cmsg->base.lmsg); + lwkt_sendmsg(netisr_portfn(0), &cmsg->base.lmsg); crit_exit(); } @@ -1927,7 +1927,7 @@ carp_ioctl_getvhaddr(struct carp_softc *sc, struct ifdrv *ifd) cmsg.nc_softc = sc; cmsg.nc_datalen = ifd->ifd_len; - error = lwkt_domsg(cpu_portfn(0), &cmsg.base.lmsg, 0); + error = lwkt_domsg(netisr_portfn(0), &cmsg.base.lmsg, 0); if (!error) { if (cmsg.nc_data != NULL) { @@ -2355,7 +2355,7 @@ carp_ioctl_stop(struct carp_softc *sc) carp_ioctl_stop_dispatch); cmsg.nc_softc = sc; - lwkt_domsg(cpu_portfn(0), &cmsg.base.lmsg, 0); + lwkt_domsg(netisr_portfn(0), &cmsg.base.lmsg, 0); ifnet_serialize_all(ifp); } @@ -2466,7 +2466,7 @@ carp_ioctl_setvh(struct carp_softc *sc, void *udata, struct ucred *cr) cmsg.nc_softc = sc; cmsg.nc_data = &carpr; - error = lwkt_domsg(cpu_portfn(0), &cmsg.base.lmsg, 0); + error = lwkt_domsg(netisr_portfn(0), &cmsg.base.lmsg, 0); back: ifnet_serialize_all(ifp); @@ -2506,7 +2506,7 @@ carp_ioctl_getvh(struct carp_softc *sc, void *udata, struct ucred *cr) cmsg.nc_softc = sc; cmsg.nc_data = &carpr; - lwkt_domsg(cpu_portfn(0), &cmsg.base.lmsg, 0); + lwkt_domsg(netisr_portfn(0), &cmsg.base.lmsg, 0); error = priv_check_cred(cr, PRIV_ROOT, NULL_CRED_OKAY); if (error) @@ -2553,7 +2553,7 @@ carp_ioctl_getdevname(struct carp_softc *sc, struct ifdrv *ifd) cmsg.nc_softc = sc; cmsg.nc_data = devname; - lwkt_domsg(cpu_portfn(0), &cmsg.base.lmsg, 0); + lwkt_domsg(netisr_portfn(0), &cmsg.base.lmsg, 0); error = copyout(devname, ifd->ifd_data, sizeof(devname)); @@ -2591,7 +2591,7 @@ carp_init(void *xsc) carp_init_dispatch); cmsg.nc_softc = sc; - lwkt_domsg(cpu_portfn(0), &cmsg.base.lmsg, 0); + lwkt_domsg(netisr_portfn(0), &cmsg.base.lmsg, 0); ifnet_serialize_all(ifp); } @@ -2971,7 +2971,7 @@ carp_ifaddr(void *arg __unused, struct ifnet *ifp, if (ifa->ifa_addr->sa_family != AF_INET) return; - KASSERT(&curthread->td_msgport == cpu_portfn(0), + KASSERT(&curthread->td_msgport == netisr_portfn(0), ("not in netisr0")); if (ifp->if_type == IFT_CARP) { diff --git a/sys/netinet/ip_demux.c b/sys/netinet/ip_demux.c index 6e081c6fa1..1eefcfd99d 100644 --- a/sys/netinet/ip_demux.c +++ b/sys/netinet/ip_demux.c @@ -412,25 +412,25 @@ tcp_ctlport(int cmd, struct sockaddr *sa, void *vip) cpu = tcp_addrcpu(faddr.s_addr, th->th_dport, ip->ip_src.s_addr, th->th_sport); } - return(cpu_portfn(cpu)); + return(netisr_portfn(cpu)); } lwkt_port_t tcp_addrport(in_addr_t faddr, in_port_t fport, in_addr_t laddr, in_port_t lport) { - return(cpu_portfn(tcp_addrcpu(faddr, fport, laddr, lport))); + return(netisr_portfn(tcp_addrcpu(faddr, fport, laddr, lport))); } lwkt_port_t tcp_addrport0(void) { - return(cpu_portfn(0)); + return(netisr_portfn(0)); } lwkt_port_t udp_addrport(in_addr_t faddr, in_port_t fport, in_addr_t laddr, in_port_t lport) { - return(cpu_portfn(udp_addrcpu(faddr, fport, laddr, lport))); + return(netisr_portfn(udp_addrcpu(faddr, fport, laddr, lport))); } /* @@ -467,5 +467,5 @@ udp_ctlport(int cmd, struct sockaddr *sa, void *vip) cpu = udp_addrcpu(faddr.s_addr, ip->ip_src.s_addr, uh->uh_dport, uh->uh_sport); } - return (cpu_portfn(cpu)); + return (netisr_portfn(cpu)); } diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c index c304c65660..c15f4678bb 100644 --- a/sys/netinet/ip_divert.c +++ b/sys/netinet/ip_divert.c @@ -314,7 +314,7 @@ divert_packet(struct mbuf *m, int incoming) else nmp->base.lmsg.u.ms_result32 |= DIV_OUTPUT; - lwkt_sendmsg(cpu_portfn(0), &nmp->base.lmsg); + lwkt_sendmsg(netisr_portfn(0), &nmp->base.lmsg); } else { div_packet(m, incoming, port); } @@ -410,7 +410,7 @@ div_attach(netmsg_t msg) if (error) goto out; lwkt_gettoken(&div_token); - sosetport(so, cpu_portfn(0)); + sosetport(so, netisr_portfn(0)); error = in_pcballoc(so, &divcbinfo); if (error) { lwkt_reltoken(&div_token); diff --git a/sys/netinet/ip_flow.c b/sys/netinet/ip_flow.c index 5b9861b2a0..110525451c 100644 --- a/sys/netinet/ip_flow.c +++ b/sys/netinet/ip_flow.c @@ -425,7 +425,7 @@ ipflow_timo_ipi(void *arg __unused) crit_enter(); if (msg->ms_flags & MSGF_DONE) - lwkt_sendmsg(cpu_portfn(mycpuid), msg); + lwkt_sendmsg(netisr_portfn(mycpuid), msg); crit_exit(); } diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c index 72d585cfae..b4569ba0a5 100644 --- a/sys/netinet/ip_input.c +++ b/sys/netinet/ip_input.c @@ -947,7 +947,7 @@ DPRINTF(("ip_input: no SP, packet discarded\n"));/*XXX*/ ip->ip_off = ntohs(ip->ip_off); KKASSERT(m->m_flags & M_HASH); } - port = cpu_portfn(m->m_pkthdr.hash); + port = netisr_portfn(m->m_pkthdr.hash); if (port != &curthread->td_msgport) { struct netmsg_packet *pmsg; diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index 7af28f9791..2cb88fc667 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -807,7 +807,7 @@ tcp_listen_detach_handler(netmsg_t msg) nextcpu = cpu + 1; if (nextcpu < ncpus2) - lwkt_forwardmsg(cpu_portfn(nextcpu), &nmsg->base.lmsg); + lwkt_forwardmsg(netisr_portfn(nextcpu), &nmsg->base.lmsg); else lwkt_replymsg(&nmsg->base.lmsg, 0); } @@ -857,14 +857,14 @@ tcp_close(struct tcpcb *tp) if (inp->inp_flags & INP_WILDCARD_MP) { struct netmsg_listen_detach nmsg; - KKASSERT(so->so_port == cpu_portfn(0)); - KKASSERT(&curthread->td_msgport == cpu_portfn(0)); + KKASSERT(so->so_port == netisr_portfn(0)); + KKASSERT(&curthread->td_msgport == netisr_portfn(0)); KKASSERT(inp->inp_pcbinfo == &tcbinfo[0]); netmsg_init(&nmsg.base, NULL, &curthread->td_msgport, MSGF_PRIORITY, tcp_listen_detach_handler); nmsg.nm_tp = tp; - lwkt_domsg(cpu_portfn(1), &nmsg.base.lmsg, 0); + lwkt_domsg(netisr_portfn(1), &nmsg.base.lmsg, 0); inp->inp_flags &= ~INP_WILDCARD_MP; } @@ -1109,7 +1109,7 @@ tcp_drain(void) netmsg_init(&nm->base, NULL, &netisr_afree_rport, 0, tcp_drain_handler); nm->nm_head = &tcbinfo[cpu].pcblisthead; - lwkt_sendmsg(cpu_portfn(cpu), &nm->base.lmsg); + lwkt_sendmsg(netisr_portfn(cpu), &nm->base.lmsg); } } #else @@ -1361,7 +1361,7 @@ tcp_notifyall_oncpu(netmsg_t msg) nextcpu = mycpuid + 1; if (nextcpu < ncpus2) - lwkt_forwardmsg(cpu_portfn(nextcpu), &nm->base.lmsg); + lwkt_forwardmsg(netisr_portfn(nextcpu), &nm->base.lmsg); else lwkt_replymsg(&nm->base.lmsg, 0); } @@ -1440,7 +1440,7 @@ tcp_ctlinput(netmsg_t msg) } else { struct netmsg_tcp_notify *nm; - KKASSERT(&curthread->td_msgport == cpu_portfn(0)); + KKASSERT(&curthread->td_msgport == netisr_portfn(0)); nm = kmalloc(sizeof(*nm), M_LWKTMSG, M_INTWAIT); netmsg_init(&nm->base, NULL, &netisr_afree_rport, 0, tcp_notifyall_oncpu); @@ -1448,7 +1448,7 @@ tcp_ctlinput(netmsg_t msg) nm->nm_arg = arg; nm->nm_notify = notify; - lwkt_sendmsg(cpu_portfn(0), &nm->base.lmsg); + lwkt_sendmsg(netisr_portfn(0), &nm->base.lmsg); } done: lwkt_replymsg(&msg->lmsg, 0); diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c index 5dbac2b35f..5834d0c34e 100644 --- a/sys/netinet/tcp_syncache.c +++ b/sys/netinet/tcp_syncache.c @@ -352,7 +352,7 @@ syncache_init(void) callout_init_mp(&syncache_percpu->tt_timerq[i]); syncache_percpu->mrec[i].slot = i; - syncache_percpu->mrec[i].port = cpu_portfn(cpu); + syncache_percpu->mrec[i].port = netisr_portfn(cpu); syncache_percpu->mrec[i].msg.nm_mrec = &syncache_percpu->mrec[i]; netmsg_init(&syncache_percpu->mrec[i].msg.base, diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index 76ef199a0e..1a7e448786 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -374,7 +374,7 @@ in_pcbinswildcardhash_handler(netmsg_t msg) nextcpu = cpu + 1; if (nextcpu < ncpus2) - lwkt_forwardmsg(cpu_portfn(nextcpu), &nm->base.lmsg); + lwkt_forwardmsg(netisr_portfn(nextcpu), &nm->base.lmsg); else lwkt_replymsg(&nm->base.lmsg, 0); } @@ -425,14 +425,14 @@ tcp_usr_listen(netmsg_t msg) ("already on MP wildcardhash")); inp->inp_flags |= INP_WILDCARD_MP; - KKASSERT(so->so_port == cpu_portfn(0)); - KKASSERT(&curthread->td_msgport == cpu_portfn(0)); + KKASSERT(so->so_port == netisr_portfn(0)); + KKASSERT(&curthread->td_msgport == netisr_portfn(0)); KKASSERT(inp->inp_pcbinfo == &tcbinfo[0]); netmsg_init(&nm.base, NULL, &curthread->td_msgport, MSGF_PRIORITY, in_pcbinswildcardhash_handler); nm.nm_inp = inp; - lwkt_domsg(cpu_portfn(1), &nm.base.lmsg, 0); + lwkt_domsg(netisr_portfn(1), &nm.base.lmsg, 0); } #endif in_pcbinswildcardhash(inp); @@ -486,14 +486,14 @@ tcp6_usr_listen(netmsg_t msg) ("already on MP wildcardhash")); inp->inp_flags |= INP_WILDCARD_MP; - KKASSERT(so->so_port == cpu_portfn(0)); - KKASSERT(&curthread->td_msgport == cpu_portfn(0)); + KKASSERT(so->so_port == netisr_portfn(0)); + KKASSERT(&curthread->td_msgport == netisr_portfn(0)); KKASSERT(inp->inp_pcbinfo == &tcbinfo[0]); netmsg_init(&nm.base, NULL, &curthread->td_msgport, MSGF_PRIORITY, in_pcbinswildcardhash_handler); nm.nm_inp = inp; - lwkt_domsg(cpu_portfn(1), &nm.base.lmsg, 0); + lwkt_domsg(netisr_portfn(1), &nm.base.lmsg, 0); } #endif in_pcbinswildcardhash(inp); diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c index 71609586fb..53c19e1ae7 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -637,7 +637,7 @@ udp_notifyall_oncpu(netmsg_t msg) /* XXX currently udp only runs on cpu 0 */ nextcpu = mycpuid + 1; if (nextcpu < ncpus2) - lwkt_forwardmsg(cpu_portfn(nextcpu), &nm->base.lmsg); + lwkt_forwardmsg(netisr_portfn(nextcpu), &nm->base.lmsg); else lwkt_replymsg(&nmsg->base.lmsg, 0); #endif @@ -672,7 +672,7 @@ udp_ctlinput(netmsg_t msg) struct in_addr faddr; struct inpcb *inp; - KKASSERT(&curthread->td_msgport == cpu_portfn(0)); + KKASSERT(&curthread->td_msgport == netisr_portfn(0)); faddr = ((struct sockaddr_in *)sa)->sin_addr; if (sa->sa_family != AF_INET || faddr.s_addr == INADDR_ANY) @@ -696,20 +696,20 @@ udp_ctlinput(netmsg_t msg) } else if (PRC_IS_REDIRECT(cmd)) { struct netmsg_udp_notify *nm; - KKASSERT(&curthread->td_msgport == cpu_portfn(0)); + KKASSERT(&curthread->td_msgport == netisr_portfn(0)); nm = kmalloc(sizeof(*nm), M_LWKTMSG, M_INTWAIT); netmsg_init(&nm->base, NULL, &netisr_afree_rport, 0, udp_notifyall_oncpu); nm->nm_faddr = faddr; nm->nm_arg = inetctlerrmap[cmd]; nm->nm_notify = notify; - lwkt_sendmsg(cpu_portfn(0), &nm->base.lmsg); + lwkt_sendmsg(netisr_portfn(0), &nm->base.lmsg); } else { /* * XXX We should forward msg upon PRC_HOSTHEAD and ip == NULL, * once UDP inpcbs are CPU localized */ - KKASSERT(&curthread->td_msgport == cpu_portfn(0)); + KKASSERT(&curthread->td_msgport == netisr_portfn(0)); in_pcbnotifyall(&udbinfo.pcblisthead, faddr, inetctlerrmap[cmd], notify); } @@ -962,7 +962,7 @@ udp_abort(netmsg_t msg) struct inpcb *inp; int error; - KKASSERT(&curthread->td_msgport == cpu_portfn(0)); + KKASSERT(&curthread->td_msgport == netisr_portfn(0)); inp = so->so_pcb; if (inp) { @@ -986,7 +986,7 @@ udp_attach(netmsg_t msg) struct inpcb *inp; int error; - KKASSERT(&curthread->td_msgport == cpu_portfn(0)); + KKASSERT(&curthread->td_msgport == netisr_portfn(0)); inp = so->so_pcb; if (inp != NULL) { @@ -1007,7 +1007,7 @@ udp_attach(netmsg_t msg) /* * Set default port for protocol processing prior to bind/connect. */ - sosetport(so, cpu_portfn(0)); + sosetport(so, netisr_portfn(0)); inp = (struct inpcb *)so->so_pcb; inp->inp_vflag |= INP_IPV4; @@ -1056,7 +1056,7 @@ udp_connect(netmsg_t msg) lwkt_port_t port; int error; - KKASSERT(&curthread->td_msgport == cpu_portfn(0)); + KKASSERT(&curthread->td_msgport == netisr_portfn(0)); inp = so->so_pcb; if (inp == NULL) { @@ -1186,7 +1186,7 @@ udp_detach(netmsg_t msg) struct inpcb *inp; int error; - KKASSERT(&curthread->td_msgport == cpu_portfn(0)); + KKASSERT(&curthread->td_msgport == netisr_portfn(0)); inp = so->so_pcb; if (inp) { @@ -1208,7 +1208,7 @@ udp_disconnect(netmsg_t msg) struct inpcb *inp; int error; - KKASSERT(&curthread->td_msgport == cpu_portfn(0)); + KKASSERT(&curthread->td_msgport == netisr_portfn(0)); inp = so->so_pcb; if (inp == NULL) { @@ -1248,7 +1248,7 @@ udp_send(netmsg_t msg) struct inpcb *inp; int error; - KKASSERT(&curthread->td_msgport == cpu_portfn(0)); + KKASSERT(&curthread->td_msgport == netisr_portfn(0)); KKASSERT(msg->send.nm_control == NULL); inp = so->so_pcb; @@ -1278,7 +1278,7 @@ udp_shutdown(netmsg_t msg) struct inpcb *inp; int error; - KKASSERT(&curthread->td_msgport == cpu_portfn(0)); + KKASSERT(&curthread->td_msgport == netisr_portfn(0)); inp = so->so_pcb; if (inp) { diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c index 1a10a0abe3..cb40406595 100644 --- a/sys/netinet6/ip6_input.c +++ b/sys/netinet6/ip6_input.c @@ -852,7 +852,7 @@ hbhcheck: struct netmsg_packet *pmsg; lwkt_port_t port; - port = cpu_portfn(0); /* XXX */ + port = netisr_portfn(0); /* XXX */ KKASSERT(port != NULL); pmsg = &m->m_hdr.mh_netmsg; netmsg_init(&pmsg->base, NULL, diff --git a/sys/netinet6/udp6_usrreq.c b/sys/netinet6/udp6_usrreq.c index c326bd364a..d7f741b5fe 100644 --- a/sys/netinet6/udp6_usrreq.c +++ b/sys/netinet6/udp6_usrreq.c @@ -594,7 +594,7 @@ udp6_attach(netmsg_t msg) if (error) goto out; - sosetport(so, cpu_portfn(0)); + sosetport(so, netisr_portfn(0)); inp = (struct inpcb *)so->so_pcb; inp->inp_vflag |= INP_IPV6; if (!ip6_v6only) -- 2.41.0