diff options
author | jhb <jhb@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f> | 2020-10-29 22:18:56 +0000 |
---|---|---|
committer | jhb <jhb@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f> | 2020-10-29 22:18:56 +0000 |
commit | b933960dac38216b3ccc8adb54caae124bc6eca2 (patch) | |
tree | d3a4e5773a96b84be09995baf6f4f66b5e05b3c5 | |
parent | 14986cab9530dccadef63472b79b944685356fe1 (diff) | |
download | freebsd-b933960dac38216b3ccc8adb54caae124bc6eca2.tar.gz freebsd-b933960dac38216b3ccc8adb54caae124bc6eca2.tar.bz2 |
Call m_snd_tag_rele() to free send tags.
Send tags are refcounted and if_snd_tag_free() is called by
m_snd_tag_rele() when the last reference is dropped on a send tag.
Reviewed by: gallatin, hselasky
Sponsored by: Netflix
Differential Revision: https://reviews.freebsd.org/D26995
git-svn-id: http://svn.freebsd.org/base/head@367148 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
-rw-r--r-- | sys/netinet/in_pcb.c | 14 | ||||
-rw-r--r-- | sys/netinet/in_pcb.h | 2 | ||||
-rw-r--r-- | sys/netinet/tcp_ratelimit.c | 10 |
3 files changed, 6 insertions, 20 deletions
diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index 46f6d114b8b..a8255a04ae6 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -3347,20 +3347,10 @@ in_pcbattach_txrtlmt(struct inpcb *inp, struct ifnet *ifp, } void -in_pcbdetach_tag(struct ifnet *ifp, struct m_snd_tag *mst) +in_pcbdetach_tag(struct m_snd_tag *mst) { - if (ifp == NULL) - return; - - /* - * If the device was detached while we still had reference(s) - * on the ifp, we assume if_snd_tag_free() was replaced with - * stubs. - */ - ifp->if_snd_tag_free(mst); - /* release reference count on network interface */ - if_rele(ifp); + m_snd_tag_rele(mst); #ifdef INET counter_u64_add(rate_limit_active, -1); #endif diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h index 0a6ad1eaa9c..56e2204f905 100644 --- a/sys/netinet/in_pcb.h +++ b/sys/netinet/in_pcb.h @@ -884,7 +884,7 @@ in_pcboutput_txrtlmt_locked(struct inpcb *, struct ifnet *, int in_pcbattach_txrtlmt(struct inpcb *, struct ifnet *, uint32_t, uint32_t, uint32_t, struct m_snd_tag **); void in_pcbdetach_txrtlmt(struct inpcb *); -void in_pcbdetach_tag(struct ifnet *ifp, struct m_snd_tag *mst); +void in_pcbdetach_tag(struct m_snd_tag *); int in_pcbmodify_txrtlmt(struct inpcb *, uint32_t); int in_pcbquery_txrtlmt(struct inpcb *, uint32_t *); int in_pcbquery_txrlevel(struct inpcb *, uint32_t *); diff --git a/sys/netinet/tcp_ratelimit.c b/sys/netinet/tcp_ratelimit.c index b9bb00081d2..e7c4aaa5bd1 100644 --- a/sys/netinet/tcp_ratelimit.c +++ b/sys/netinet/tcp_ratelimit.c @@ -1028,7 +1028,7 @@ rt_find_real_interface(struct ifnet *ifp, struct inpcb *inp, int *error) return (NULL); } tifp = tag->ifp; - tifp->if_snd_tag_free(tag); + m_snd_tag_rele(tag); return (tifp); } @@ -1161,7 +1161,6 @@ static void tcp_rl_ifnet_departure(void *arg __unused, struct ifnet *ifp) { struct tcp_rate_set *rs, *nrs; - struct ifnet *tifp; int i; mtx_lock(&rs_mtx); @@ -1173,8 +1172,7 @@ tcp_rl_ifnet_departure(void *arg __unused, struct ifnet *ifp) rs->rs_flags |= RS_IS_DEAD; for (i = 0; i < rs->rs_rate_cnt; i++) { if (rs->rs_rlt[i].flags & HDWRPACE_TAGPRESENT) { - tifp = rs->rs_rlt[i].tag->ifp; - in_pcbdetach_tag(tifp, rs->rs_rlt[i].tag); + in_pcbdetach_tag(rs->rs_rlt[i].tag); rs->rs_rlt[i].tag = NULL; } rs->rs_rlt[i].flags = HDWRPACE_IFPDEPARTED; @@ -1191,7 +1189,6 @@ static void tcp_rl_shutdown(void *arg __unused, int howto __unused) { struct tcp_rate_set *rs, *nrs; - struct ifnet *tifp; int i; mtx_lock(&rs_mtx); @@ -1201,8 +1198,7 @@ tcp_rl_shutdown(void *arg __unused, int howto __unused) rs->rs_flags |= RS_IS_DEAD; for (i = 0; i < rs->rs_rate_cnt; i++) { if (rs->rs_rlt[i].flags & HDWRPACE_TAGPRESENT) { - tifp = rs->rs_rlt[i].tag->ifp; - in_pcbdetach_tag(tifp, rs->rs_rlt[i].tag); + in_pcbdetach_tag(rs->rs_rlt[i].tag); rs->rs_rlt[i].tag = NULL; } rs->rs_rlt[i].flags = HDWRPACE_IFPDEPARTED; |