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

hyperv/hn: Don't hold txdesc, if no BPFs are attached.

Browse Source 
MFC after:	1 week
Sponsored by:	Microsoft
Differential Revision:	https://reviews.freebsd.org/D8675
This commit is contained in:
sephe 2016-12-01 03:39:34 +00:00
parent 172ce32e5a
commit 95dbf6d04a
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sys/dev/hyperv/netvsc/if_hn.c
View File

@ -1924,17 +1924,20 @@ hn_encap(struct ifnet *ifp, struct hn_tx_ring *txr, struct hn_txdesc *txd,
static int
hn_txpkt(struct ifnet *ifp, struct hn_tx_ring *txr, struct hn_txdesc *txd)
{
int error, send_failed = 0;
int error, send_failed = 0, has_bpf;
again:
/*
* Make sure that this txd and any aggregated txds are not freed
* before ETHER_BPF_MTAP.
*/
hn_txdesc_hold(txd);
has_bpf = bpf_peers_present(ifp->if_bpf);
if (has_bpf) {
/*
* Make sure that this txd and any aggregated txds are not
* freed before ETHER_BPF_MTAP.
*/
hn_txdesc_hold(txd);
}
error = txr->hn_sendpkt(txr, txd);
if (!error) {
if (bpf_peers_present(ifp->if_bpf)) {
if (has_bpf) {
const struct hn_txdesc *tmp_txd;
ETHER_BPF_MTAP(ifp, txd->m);
@ -1957,7 +1960,8 @@ hn_txpkt(struct ifnet *ifp, struct hn_tx_ring *txr, struct hn_txdesc *txd)
txr->hn_pkts += txr->hn_stat_pkts;
txr->hn_sends++;
}
hn_txdesc_put(txr, txd);
if (has_bpf)
hn_txdesc_put(txr, txd);
if (__predict_false(error)) {
int freed;