d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cxgbe(4): Do not leak the filters in the hashfilter table on module

Browse Source 
unload.

MFC after:	1 week
Sponsored by:	Chelsio Communications
This commit is contained in:
Navdeep Parhar 2018-06-27 01:51:17 +00:00
parent 48c7315619
commit af8854fdc1
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=335684
3 changed files with 45 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sys/dev/cxgbe/adapter.h
View File

@ -1260,6 +1260,7 @@ int t4_filter_rpl(struct sge_iq *, const struct rss_header *, struct mbuf *);
int t4_hashfilter_ao_rpl(struct sge_iq *, const struct rss_header *, struct mbuf *);
int t4_hashfilter_tcb_rpl(struct sge_iq *, const struct rss_header *, struct mbuf *);
int t4_del_hashfilter_rpl(struct sge_iq *, const struct rss_header *, struct mbuf *);
void free_hftid_tab(struct tid_info *);
static inline struct wrqe *
alloc_wrqe(int wr_len, struct sge_wrq *wrq)

49
sys/dev/cxgbe/t4_filter.c
View File

@ -70,6 +70,46 @@ static int set_hashfilter(struct adapter *, struct t4_filter *, uint64_t,
static int del_hashfilter(struct adapter *, struct t4_filter *);
static int configure_hashfilter_tcb(struct adapter *, struct filter_entry *);
static int
alloc_hftid_tab(struct tid_info *t, int flags)
{
MPASS(t->ntids > 0);
MPASS(t->hftid_tab == NULL);
t->hftid_tab = malloc(sizeof(*t->hftid_tab) * t->ntids, M_CXGBE,
M_ZERO | flags);
if (t->hftid_tab == NULL)
return (ENOMEM);
mtx_init(&t->hftid_lock, "T4 hashfilters", 0, MTX_DEF);
cv_init(&t->hftid_cv, "t4hfcv");
return (0);
}
void
free_hftid_tab(struct tid_info *t)
{
int i;
if (t->hftid_tab != NULL) {
MPASS(t->ntids > 0);
for (i = 0; t->tids_in_use > 0 && i < t->ntids; i++) {
if (t->hftid_tab[i] == NULL)
continue;
free(t->hftid_tab[i], M_CXGBE);
t->tids_in_use--;
}
free(t->hftid_tab, M_CXGBE);
t->hftid_tab = NULL;
}
if (mtx_initialized(&t->hftid_lock)) {
mtx_destroy(&t->hftid_lock);
cv_destroy(&t->hftid_cv);
}
}
static void
insert_hftid(struct adapter *sc, int tid, void *ctx, int ntids)
{
@ -653,14 +693,9 @@ set_filter(struct adapter *sc, struct t4_filter *t)
}
if (t->fs.hash) {
if (__predict_false(ti->hftid_tab == NULL)) {
ti->hftid_tab = malloc(sizeof(*ti->hftid_tab) * ti->ntids,
M_CXGBE, M_NOWAIT | M_ZERO);
if (ti->hftid_tab == NULL) {
rc = ENOMEM;
rc = alloc_hftid_tab(&sc->tids, M_NOWAIT);
if (rc != 0)
goto done;
}
mtx_init(&ti->hftid_lock, "T4 hashfilters", 0, MTX_DEF);
cv_init(&ti->hftid_cv, "t4hfcv");
}
if (__predict_false(sc->tids.atid_tab == NULL)) {
rc = alloc_atid_tab(&sc->tids, M_NOWAIT);

7
sys/dev/cxgbe/t4_main.c
View File

@ -1403,7 +1403,8 @@ t4_detach_common(device_t dev)
free(sc->sge.iqmap, M_CXGBE);
free(sc->sge.eqmap, M_CXGBE);
free(sc->tids.ftid_tab, M_CXGBE);
free(sc->tids.hftid_tab, M_CXGBE);
if (sc->tids.hftid_tab)
free_hftid_tab(&sc->tids);
free(sc->tids.atid_tab, M_CXGBE);
free(sc->tids.tid_tab, M_CXGBE);
free(sc->tt.tls_rx_ports, M_CXGBE);
@ -1420,10 +1421,6 @@ t4_detach_common(device_t dev)
mtx_destroy(&sc->tids.ftid_lock);
cv_destroy(&sc->tids.ftid_cv);
}
if (mtx_initialized(&sc->tids.hftid_lock)) {
mtx_destroy(&sc->tids.hftid_lock);
cv_destroy(&sc->tids.hftid_cv);
}
if (mtx_initialized(&sc->tids.atid_lock))
mtx_destroy(&sc->tids.atid_lock);
if (mtx_initialized(&sc->sfl_lock))