Skip to content

Keep lock while releasing interface #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: 00335cd4-atl
Choose a base branch
from
Open

Keep lock while releasing interface #19

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions sys/dev/netmap/netmap_vale.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,9 +407,7 @@ netmap_vale_vp_dtor(struct netmap_adapter *na)
NM_DETACH_NA(na->ifp);
if (vpna->autodelete) {
nm_prdis("releasing %s", na->ifp->if_xname);
NMG_UNLOCK();
nm_os_vi_detach(na->ifp);
NMG_LOCK();
}
}
}
Expand Down Expand Up @@ -1376,8 +1374,6 @@ nm_vi_destroy(const char *name)
goto err;
}

NMG_UNLOCK();

if (netmap_verbose)
nm_prinf("destroying a persistent vale interface %s", ifp->if_xname);
/* Linux requires all the references are released
Expand All @@ -1386,11 +1382,12 @@ nm_vi_destroy(const char *name)
netmap_detach(ifp);
if_rele(ifp);
nm_os_vi_detach(ifp);
NMG_UNLOCK();
return 0;

err:
NMG_UNLOCK();
if_rele(ifp);
NMG_UNLOCK();
return error;
}

Expand Down Expand Up @@ -1486,8 +1483,8 @@ netmap_vi_create(struct nmreq_header *hdr, int autodelete)
err_1:
if (nmd)
netmap_mem_put(nmd);
NMG_UNLOCK();
nm_os_vi_detach(ifp);
NMG_UNLOCK();

return error;
}
Expand Down