Page MenuHomeFreeBSD
Differential D22892

Deduplicate code between if_delgroup() and if_delgroups().
ClosedPublic
Actions

Authored by markj on Dec 20 2019, 5:15 PM.
Tags
None
Referenced Files
Unknown Object (File)
Wed, Apr 16, 3:18 AM
Unknown Object (File)
Sun, Apr 13, 3:16 PM
Unknown Object (File)
Fri, Apr 11, 7:16 PM
Unknown Object (File)
Fri, Apr 11, 1:40 AM
Unknown Object (File)
Mar 28 2025, 12:17 AM
Unknown Object (File)
Mar 22 2025, 7:59 PM
Unknown Object (File)
Mar 19 2025, 6:37 AM
Unknown Object (File)
Mar 12 2025, 4:13 PM
View All Files
Subscribers
ae
imp

Details

Reviewers
• hselasky
Group Reviewers
network
Commits
rS355942: Deduplicate code between if_delgroup() and if_delgroups().
Summary

Fix some style in if_addgroup(). No functional change intended.

Diff Detail

Repository
rS FreeBSD src repository - subversion
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

markj created this revision.Dec 20 2019, 5:15 PM
Herald added a subscriber: ae. · View Herald TranscriptDec 20 2019, 5:15 PM
Harbormaster completed remote builds in B28264: Diff 65862.Dec 20 2019, 5:15 PM
markj added reviewers: network, • hselasky.Dec 20 2019, 5:16 PM
• hselasky accepted this revision.Dec 20 2019, 5:22 PM
• hselasky added inline comments.
sys/net/if.c
1510 ↗(On Diff #65862)

Maybe call this function _if_delgroup_wlocked() because it is called locked?

This revision is now accepted and ready to land.Dec 20 2019, 5:22 PM
markj updated this revision to Diff 65863.Dec 20 2019, 5:28 PM

Give _if_delgroup() a slightly more descriptive name.

This revision now requires review to proceed.Dec 20 2019, 5:28 PM
Harbormaster completed remote builds in B28265: Diff 65863.Dec 20 2019, 5:28 PM
• hselasky accepted this revision.Dec 20 2019, 5:31 PM
• hselasky added inline comments.
sys/net/if.c
1582 ↗(On Diff #65863)

Technically this is the same like:
while ((ifgl = CK_STAILQ_FIRST(&ifp->if_groups)) != NULL) {

This revision is now accepted and ready to land.Dec 20 2019, 5:31 PM
markj updated this revision to Diff 65866.Dec 20 2019, 5:41 PM

Simplify the loop header in if_delgroups().

This revision now requires review to proceed.Dec 20 2019, 5:41 PM
Harbormaster completed remote builds in B28268: Diff 65866.Dec 20 2019, 5:41 PM
• hselasky accepted this revision.Dec 20 2019, 5:42 PM
This revision is now accepted and ready to land.Dec 20 2019, 5:42 PM
Closed by commit rS355942: Deduplicate code between if_delgroup() and if_delgroups(). (authored by markj). · Explain WhyDec 20 2019, 8:15 PM
This revision was automatically updated to reflect the committed changes.
markj added a commit: rS355942: Deduplicate code between if_delgroup() and if_delgroups()..
Herald added a subscriber: imp. · View Herald TranscriptDec 20 2019, 8:15 PM

Revision Contents
Changeset List

PathSize
head/
sys/
net/
110 lines

Diff 65869

View Options

head/sys/net/if.c

Show First 20 Lines • Show All 1,449 Lines • ▼ Show 20 Linesif_addgroup(struct ifnet *ifp, const char *groupname)
IFNET_WLOCK(); IFNET_WLOCK();
CK_STAILQ_FOREACH(ifgl, &ifp->if_groups, ifgl_next) CK_STAILQ_FOREACH(ifgl, &ifp->if_groups, ifgl_next)
if (!strcmp(ifgl->ifgl_group->ifg_group, groupname)) { if (!strcmp(ifgl->ifgl_group->ifg_group, groupname)) {
IFNET_WUNLOCK(); IFNET_WUNLOCK();
return (EEXIST); return (EEXIST);
} }
if ((ifgl = (struct ifg_list *)malloc(sizeof(struct ifg_list), M_TEMP, if ((ifgl = malloc(sizeof(*ifgl), M_TEMP, M_NOWAIT)) == NULL) {
M_NOWAIT)) == NULL) {
IFNET_WUNLOCK(); IFNET_WUNLOCK();
return (ENOMEM); return (ENOMEM);
} }
if ((ifgm = (struct ifg_member *)malloc(sizeof(struct ifg_member), if ((ifgm = malloc(sizeof(*ifgm), M_TEMP, M_NOWAIT)) == NULL) {
M_TEMP, M_NOWAIT)) == NULL) {
free(ifgl, M_TEMP); free(ifgl, M_TEMP);
IFNET_WUNLOCK(); IFNET_WUNLOCK();
return (ENOMEM); return (ENOMEM);
} }
CK_STAILQ_FOREACH(ifg, &V_ifg_head, ifg_next) CK_STAILQ_FOREACH(ifg, &V_ifg_head, ifg_next)
if (!strcmp(ifg->ifg_group, groupname)) if (!strcmp(ifg->ifg_group, groupname))
break; break;
if (ifg == NULL) { if (ifg == NULL) {
if ((ifg = (struct ifg_group *)malloc(sizeof(struct ifg_group), if ((ifg = malloc(sizeof(*ifg), M_TEMP, M_NOWAIT)) == NULL) {
M_TEMP, M_NOWAIT)) == NULL) {
free(ifgl, M_TEMP); free(ifgl, M_TEMP);
free(ifgm, M_TEMP); free(ifgm, M_TEMP);
IFNET_WUNLOCK(); IFNET_WUNLOCK();
return (ENOMEM); return (ENOMEM);
} }
strlcpy(ifg->ifg_group, groupname, sizeof(ifg->ifg_group)); strlcpy(ifg->ifg_group, groupname, sizeof(ifg->ifg_group));
ifg->ifg_refcnt = 0; ifg->ifg_refcnt = 0;
CK_STAILQ_INIT(&ifg->ifg_members); CK_STAILQ_INIT(&ifg->ifg_members);
Show All 15 Linesif_addgroup(struct ifnet *ifp, const char *groupname)
if (new) if (new)
EVENTHANDLER_INVOKE(group_attach_event, ifg); EVENTHANDLER_INVOKE(group_attach_event, ifg);
EVENTHANDLER_INVOKE(group_change_event, groupname); EVENTHANDLER_INVOKE(group_change_event, groupname);
return (0); return (0);
} }
/* /*
* Remove a group from an interface * Helper function to remove a group out of an interface. Expects the global
* ifnet lock to be write-locked, and drops it before returning.
*/ */
int static void
if_delgroup(struct ifnet *ifp, const char *groupname) _if_delgroup_locked(struct ifnet *ifp, struct ifg_list *ifgl,
const char *groupname)
{ {
struct ifg_list *ifgl;
struct ifg_member *ifgm; struct ifg_member *ifgm;
int freeifgl; bool freeifgl;
IFNET_WLOCK(); IFNET_WLOCK_ASSERT();
CK_STAILQ_FOREACH(ifgl, &ifp->if_groups, ifgl_next)
if (!strcmp(ifgl->ifgl_group->ifg_group, groupname))
break;
if (ifgl == NULL) {
IFNET_WUNLOCK();
return (ENOENT);
}
freeifgl = 0;
IF_ADDR_WLOCK(ifp); IF_ADDR_WLOCK(ifp);
CK_STAILQ_REMOVE(&ifp->if_groups, ifgl, ifg_list, ifgl_next); CK_STAILQ_REMOVE(&ifp->if_groups, ifgl, ifg_list, ifgl_next);
IF_ADDR_WUNLOCK(ifp); IF_ADDR_WUNLOCK(ifp);
CK_STAILQ_FOREACH(ifgm, &ifgl->ifgl_group->ifg_members, ifgm_next) CK_STAILQ_FOREACH(ifgm, &ifgl->ifgl_group->ifg_members, ifgm_next) {
if (ifgm->ifgm_ifp == ifp) if (ifgm->ifgm_ifp == ifp) {
CK_STAILQ_REMOVE(&ifgl->ifgl_group->ifg_members, ifgm,
ifg_member, ifgm_next);
break; break;
}
}
if (ifgm != NULL)
CK_STAILQ_REMOVE(&ifgl->ifgl_group->ifg_members, ifgm, ifg_member, ifgm_next);
if (--ifgl->ifgl_group->ifg_refcnt == 0) { if (--ifgl->ifgl_group->ifg_refcnt == 0) {
CK_STAILQ_REMOVE(&V_ifg_head, ifgl->ifgl_group, ifg_group, ifg_next); CK_STAILQ_REMOVE(&V_ifg_head, ifgl->ifgl_group, ifg_group,
freeifgl = 1; ifg_next);
freeifgl = true;
} else {
freeifgl = false;
} }
IFNET_WUNLOCK(); IFNET_WUNLOCK();
epoch_wait_preempt(net_epoch_preempt); epoch_wait_preempt(net_epoch_preempt);
if (freeifgl) { if (freeifgl) {
EVENTHANDLER_INVOKE(group_detach_event, ifgl->ifgl_group); EVENTHANDLER_INVOKE(group_detach_event, ifgl->ifgl_group);
free(ifgl->ifgl_group, M_TEMP); free(ifgl->ifgl_group, M_TEMP);
} }
free(ifgm, M_TEMP); free(ifgm, M_TEMP);
free(ifgl, M_TEMP); free(ifgl, M_TEMP);
EVENTHANDLER_INVOKE(group_change_event, groupname); EVENTHANDLER_INVOKE(group_change_event, groupname);
}
/*
* Remove a group from an interface
*/
int
if_delgroup(struct ifnet *ifp, const char *groupname)
{
struct ifg_list *ifgl;
IFNET_WLOCK();
CK_STAILQ_FOREACH(ifgl, &ifp->if_groups, ifgl_next)
if (strcmp(ifgl->ifgl_group->ifg_group, groupname) == 0)
break;
if (ifgl == NULL) {
IFNET_WUNLOCK();
return (ENOENT);
}
_if_delgroup_locked(ifp, ifgl, groupname);
return (0); return (0);
} }
/* /*
* Remove an interface from all groups * Remove an interface from all groups
*/ */
static void static void
if_delgroups(struct ifnet *ifp) if_delgroups(struct ifnet *ifp)
{ {
struct ifg_list *ifgl; struct ifg_list *ifgl;
struct ifg_member *ifgm;
char groupname[IFNAMSIZ]; char groupname[IFNAMSIZ];
int ifglfree;
IFNET_WLOCK(); IFNET_WLOCK();
while (!CK_STAILQ_EMPTY(&ifp->if_groups)) { while ((ifgl = CK_STAILQ_FIRST(&ifp->if_groups)) != NULL) {
ifgl = CK_STAILQ_FIRST(&ifp->if_groups);
strlcpy(groupname, ifgl->ifgl_group->ifg_group, IFNAMSIZ); strlcpy(groupname, ifgl->ifgl_group->ifg_group, IFNAMSIZ);
_if_delgroup_locked(ifp, ifgl, groupname);
IF_ADDR_WLOCK(ifp);
CK_STAILQ_REMOVE(&ifp->if_groups, ifgl, ifg_list, ifgl_next);
IF_ADDR_WUNLOCK(ifp);
CK_STAILQ_FOREACH(ifgm, &ifgl->ifgl_group->ifg_members, ifgm_next)
if (ifgm->ifgm_ifp == ifp)
break;
if (ifgm != NULL)
CK_STAILQ_REMOVE(&ifgl->ifgl_group->ifg_members, ifgm, ifg_member,
ifgm_next);
ifglfree = 0;
if (--ifgl->ifgl_group->ifg_refcnt == 0) {
CK_STAILQ_REMOVE(&V_ifg_head, ifgl->ifgl_group, ifg_group, ifg_next);
ifglfree = 1;
}
IFNET_WUNLOCK();
epoch_wait_preempt(net_epoch_preempt);
free(ifgm, M_TEMP);
if (ifglfree) {
EVENTHANDLER_INVOKE(group_detach_event,
ifgl->ifgl_group);
free(ifgl->ifgl_group, M_TEMP);
}
free(ifgl, M_TEMP);
EVENTHANDLER_INVOKE(group_change_event, groupname);
IFNET_WLOCK(); IFNET_WLOCK();
} }
IFNET_WUNLOCK(); IFNET_WUNLOCK();
} }
static char * static char *
ifgr_group_get(void *ifgrp) ifgr_group_get(void *ifgrp)
{ {
▲ Show 20 Lines • Show All 65 Lines • ▼ Show 20 Lines
{ {
struct ifg_group *ifg; struct ifg_group *ifg;
struct ifg_member *ifgm; struct ifg_member *ifgm;
struct ifg_req ifgrq, *ifgp; struct ifg_req ifgrq, *ifgp;
int len, error; int len, error;
IFNET_RLOCK(); IFNET_RLOCK();
CK_STAILQ_FOREACH(ifg, &V_ifg_head, ifg_next) CK_STAILQ_FOREACH(ifg, &V_ifg_head, ifg_next)
if (!strcmp(ifg->ifg_group, ifgr->ifgr_name)) if (strcmp(ifg->ifg_group, ifgr->ifgr_name) == 0)
break; break;
if (ifg == NULL) { if (ifg == NULL) {
IFNET_RUNLOCK(); IFNET_RUNLOCK();
return (ENOENT); return (ENOENT);
} }
if (ifgr->ifgr_len == 0) { if (ifgr->ifgr_len == 0) {
CK_STAILQ_FOREACH(ifgm, &ifg->ifg_members, ifgm_next) CK_STAILQ_FOREACH(ifgm, &ifg->ifg_members, ifgm_next)
▲ Show 20 Lines • Show All 2,874 Lines • Show Last 20 Lines