Page MenuHomeFreeBSD
Differential D46525

ifconfig: Add an allmulti verb
ClosedPublic
Actions

Authored by markj on Sep 3 2024, 5:00 PM.
Tags
None
Referenced Files
Unknown Object (File)
Wed, Mar 12, 3:22 PM
Unknown Object (File)
Tue, Mar 11, 7:35 AM
Unknown Object (File)
Fri, Mar 7, 9:35 AM
Unknown Object (File)
Tue, Feb 25, 6:48 AM
Unknown Object (File)
Feb 22 2025, 1:55 PM
Unknown Object (File)
Feb 20 2025, 11:52 AM
Unknown Object (File)
Feb 19 2025, 5:05 AM
Unknown Object (File)
Feb 17 2025, 9:52 PM
View All 87 Files
Subscribers
ae
glebius
imp
zlei

Details

Reviewers
glebius
zlei
Group Reviewers
network
Commits
rGf47e5a92edd6: ifconfig: Add an allmulti verb
rG00c9a6806c9c: ifconfig: Add an allmulti verb
Summary

Similar to "promisc", this allows the IFF_ALLMULTI flag to be toggled,
which can be useful for IPv6 neighbour discovery; see PR 233683.

Sponsored by: Klara, Inc.

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

markj created this revision.Sep 3 2024, 5:00 PM
Herald added a subscriber: imp. · View Herald TranscriptSep 3 2024, 5:00 PM
markj requested review of this revision.Sep 3 2024, 5:00 PM
Harbormaster completed remote builds in B59295: Diff 142824.Sep 3 2024, 5:00 PM
markj added a parent revision: D46524: ifnet: Add handling for toggling IFF_ALLMULTI in ifhwioctl().Sep 3 2024, 5:00 PM
glebius accepted this revision as: glebius.Sep 3 2024, 10:44 PM
glebius added a subscriber: glebius.
glebius added inline comments.
sbin/ifconfig/ifconfig.8
31

Needs to be bumped.

This revision is now accepted and ready to land.Sep 3 2024, 10:44 PM
zlei accepted this revision as: zlei.Sep 4 2024, 1:32 AM
zlei added a subscriber: zlei.

which can be useful for IPv6 neighbour discovery

@markj I guess you mean help debugging IPv6 ND function ;)

Looks good to me.

ae added a subscriber: ae.Sep 4 2024, 10:39 AM

I think you need to modify IFF_CANTCHANGE in sys/net/if.h

markj added a comment.Sep 4 2024, 12:48 PM
In D46525#1060565, @zlei wrote:

which can be useful for IPv6 neighbour discovery

@markj I guess you mean help debugging IPv6 ND function ;)

Looks good to me.

The use-case which motivated this is neighbour discover over netmap, where the kernel doesn't know which multicast addresses to subscribe to.

In D46525#1060625, @ae wrote:

I think you need to modify IFF_CANTCHANGE in sys/net/if.h

IMO that is not quite right, per the comments in D46524.

markj updated this revision to Diff 142972.Sep 5 2024, 2:22 PM

Toggle IFF_PALLMULTI instead of IFF_ALLMULTI, to match IFF_PROMISC handling.

This revision now requires review to proceed.Sep 5 2024, 2:22 PM
Harbormaster completed remote builds in B59315: Diff 142972.Sep 5 2024, 2:22 PM
zlei accepted this revision as: zlei.Sep 5 2024, 4:23 PM

I like this.

This revision is now accepted and ready to land.Sep 5 2024, 4:23 PM
zlei added a comment.Sep 5 2024, 4:42 PM
In D46525#1060648, @markj wrote:
In D46525#1060565, @zlei wrote:

which can be useful for IPv6 neighbour discovery

@markj I guess you mean help debugging IPv6 ND function ;)

Looks good to me.

The use-case which motivated this is neighbour discover over netmap, where the kernel doesn't know which multicast addresses to subscribe to.

I'd support if you can include that in the final commit message :)

In D46525#1060625, @ae wrote:

I think you need to modify IFF_CANTCHANGE in sys/net/if.h

IMO that is not quite right, per the comments in D46524.

markj added a comment.Sep 5 2024, 4:50 PM
In D46525#1061131, @zlei wrote:
In D46525#1060648, @markj wrote:
In D46525#1060565, @zlei wrote:

which can be useful for IPv6 neighbour discovery

@markj I guess you mean help debugging IPv6 ND function ;)

Looks good to me.

The use-case which motivated this is neighbour discover over netmap, where the kernel doesn't know which multicast addresses to subscribe to.

I'd support if you can include that in the final commit message :)

Thanks for taking a look. Certainly, my original description is basically useless. :(

Closed by commit rG00c9a6806c9c: ifconfig: Add an allmulti verb (authored by markj). · Explain WhySep 6 2024, 5:20 PM
This revision was automatically updated to reflect the committed changes.
markj added a commit: rG00c9a6806c9c: ifconfig: Add an allmulti verb.
markj added a commit: rGf47e5a92edd6: ifconfig: Add an allmulti verb.Sep 20 2024, 11:40 AM

Revision Contents
Changeset List

PathSize
sbin/
ifconfig/
4 lines
2 lines
2 lines

Diff 143045

View Options

sbin/ifconfig/ifconfig.8

Show First 20 Lines • Show All 45 Lines • ▼ Show 20 Lines
#include <sys/proc.h> #include <sys/proc.h>
#include <sys/kernel.h> #include <sys/kernel.h>
#include <sys/sched.h> #include <sys/sched.h>
#include <machine/clock.h> #include <machine/clock.h>
#include <machine/cpu.h> #include <machine/cpu.h>
#include <x86/init.h> #include <x86/init.h>
static u_int static void
get_tsc(__unused struct timecounter *tc) delay_tsc(int n)
{ {
uint64_t end, now;
return (rdtsc32()); /*
* Pin the current thread ensure correct behavior if the TSCs
* on different CPUs are not in sync.
*/
sched_pin();
now = rdtsc();
end = now + tsc_freq * n / 1000000;
do {
cpu_spinwait();
now = rdtsc();
} while (now < end);
sched_unpin();
} }
static int static int
delay_tc(int n) delay_tc(int n)
{ {
struct timecounter *tc; struct timecounter *tc;
timecounter_get_t *func; timecounter_get_t *func;
uint64_t end, freq, now; uint64_t end, freq, now;
u_int last, mask, u; u_int last, mask, u;
/*
* Only use the TSC if it is P-state invariant. If the TSC is
* not P-state invariant and the CPU is not running at the
* "full" P-state, then the TSC will increment at some rate
* less than tsc_freq and delay_tsc() will wait too long.
*/
if (tsc_is_invariant && tsc_freq != 0) {
delay_tsc(n);
return (1);
}
tc = timecounter; tc = timecounter;
freq = atomic_load_acq_64(&tsc_freq);
if (tsc_is_invariant && freq != 0) {
func = get_tsc;
mask = ~0u;
} else {
if (tc->tc_quality <= 0) if (tc->tc_quality <= 0)
return (0); return (0);
func = tc->tc_get_timecount; func = tc->tc_get_timecount;
mask = tc->tc_counter_mask; mask = tc->tc_counter_mask;
freq = tc->tc_frequency; freq = tc->tc_frequency;
}
now = 0; now = 0;
end = freq * n / 1000000; end = freq * n / 1000000;
if (func == get_tsc)
sched_pin();
last = func(tc) & mask; last = func(tc) & mask;
do { do {
cpu_spinwait(); cpu_spinwait();
u = func(tc) & mask; u = func(tc) & mask;
if (u < last) if (u < last)
now += mask - last + u + 1; now += mask - last + u + 1;
else else
now += u - last; now += u - last;
last = u; last = u;
} while (now < end); } while (now < end);
if (func == get_tsc)
sched_unpin();
return (1); return (1);
} }
void void
DELAY(int n) DELAY(int n)
{ {
TSENTER(); TSENTER();
if (delay_tc(n)) { if (delay_tc(n)) {
TSEXIT(); TSEXIT();
return; return;
} }
init_ops.early_delay(n); init_ops.early_delay(n);
TSEXIT(); TSEXIT();
} }
View Options

sbin/ifconfig/ifconfig.c

Show First 20 Lines • Show All 45 Lines • ▼ Show 20 Lines
#include <sys/proc.h> #include <sys/proc.h>
#include <sys/kernel.h> #include <sys/kernel.h>
#include <sys/sched.h> #include <sys/sched.h>
#include <machine/clock.h> #include <machine/clock.h>
#include <machine/cpu.h> #include <machine/cpu.h>
#include <x86/init.h> #include <x86/init.h>
static u_int static void
get_tsc(__unused struct timecounter *tc) delay_tsc(int n)
{ {
uint64_t end, now;
return (rdtsc32()); /*
* Pin the current thread ensure correct behavior if the TSCs
* on different CPUs are not in sync.
*/
sched_pin();
now = rdtsc();
end = now + tsc_freq * n / 1000000;
do {
cpu_spinwait();
now = rdtsc();
} while (now < end);
sched_unpin();
} }
static int static int
delay_tc(int n) delay_tc(int n)
{ {
struct timecounter *tc; struct timecounter *tc;
timecounter_get_t *func; timecounter_get_t *func;
uint64_t end, freq, now; uint64_t end, freq, now;
u_int last, mask, u; u_int last, mask, u;
/*
* Only use the TSC if it is P-state invariant. If the TSC is
* not P-state invariant and the CPU is not running at the
* "full" P-state, then the TSC will increment at some rate
* less than tsc_freq and delay_tsc() will wait too long.
*/
if (tsc_is_invariant && tsc_freq != 0) {
delay_tsc(n);
return (1);
}
tc = timecounter; tc = timecounter;
freq = atomic_load_acq_64(&tsc_freq);
if (tsc_is_invariant && freq != 0) {
func = get_tsc;
mask = ~0u;
} else {
if (tc->tc_quality <= 0) if (tc->tc_quality <= 0)
return (0); return (0);
func = tc->tc_get_timecount; func = tc->tc_get_timecount;
mask = tc->tc_counter_mask; mask = tc->tc_counter_mask;
freq = tc->tc_frequency; freq = tc->tc_frequency;
}
now = 0; now = 0;
end = freq * n / 1000000; end = freq * n / 1000000;
if (func == get_tsc)
sched_pin();
last = func(tc) & mask; last = func(tc) & mask;
do { do {
cpu_spinwait(); cpu_spinwait();
u = func(tc) & mask; u = func(tc) & mask;
if (u < last) if (u < last)
now += mask - last + u + 1; now += mask - last + u + 1;
else else
now += u - last; now += u - last;
last = u; last = u;
} while (now < end); } while (now < end);
if (func == get_tsc)
sched_unpin();
return (1); return (1);
} }
void void
DELAY(int n) DELAY(int n)
{ {
TSENTER(); TSENTER();
if (delay_tc(n)) { if (delay_tc(n)) {
TSEXIT(); TSEXIT();
return; return;
} }
init_ops.early_delay(n); init_ops.early_delay(n);
TSEXIT(); TSEXIT();
} }
View Options

sbin/ifconfig/ifconfig_netlink.c

Show First 20 Lines • Show All 45 Lines • ▼ Show 20 Lines
#include <sys/proc.h> #include <sys/proc.h>
#include <sys/kernel.h> #include <sys/kernel.h>
#include <sys/sched.h> #include <sys/sched.h>
#include <machine/clock.h> #include <machine/clock.h>
#include <machine/cpu.h> #include <machine/cpu.h>
#include <x86/init.h> #include <x86/init.h>
static u_int static void
get_tsc(__unused struct timecounter *tc) delay_tsc(int n)
{ {
uint64_t end, now;
return (rdtsc32()); /*
* Pin the current thread ensure correct behavior if the TSCs
* on different CPUs are not in sync.
*/
sched_pin();
now = rdtsc();
end = now + tsc_freq * n / 1000000;
do {
cpu_spinwait();
now = rdtsc();
} while (now < end);
sched_unpin();
} }
static int static int
delay_tc(int n) delay_tc(int n)
{ {
struct timecounter *tc; struct timecounter *tc;
timecounter_get_t *func; timecounter_get_t *func;
uint64_t end, freq, now; uint64_t end, freq, now;
u_int last, mask, u; u_int last, mask, u;
/*
* Only use the TSC if it is P-state invariant. If the TSC is
* not P-state invariant and the CPU is not running at the
* "full" P-state, then the TSC will increment at some rate
* less than tsc_freq and delay_tsc() will wait too long.
*/
if (tsc_is_invariant && tsc_freq != 0) {
delay_tsc(n);
return (1);
}
tc = timecounter; tc = timecounter;
freq = atomic_load_acq_64(&tsc_freq);
if (tsc_is_invariant && freq != 0) {
func = get_tsc;
mask = ~0u;
} else {
if (tc->tc_quality <= 0) if (tc->tc_quality <= 0)
return (0); return (0);
func = tc->tc_get_timecount; func = tc->tc_get_timecount;
mask = tc->tc_counter_mask; mask = tc->tc_counter_mask;
freq = tc->tc_frequency; freq = tc->tc_frequency;
}
now = 0; now = 0;
end = freq * n / 1000000; end = freq * n / 1000000;
if (func == get_tsc)
sched_pin();
last = func(tc) & mask; last = func(tc) & mask;
do { do {
cpu_spinwait(); cpu_spinwait();
u = func(tc) & mask; u = func(tc) & mask;
if (u < last) if (u < last)
now += mask - last + u + 1; now += mask - last + u + 1;
else else
now += u - last; now += u - last;
last = u; last = u;
} while (now < end); } while (now < end);
if (func == get_tsc)
sched_unpin();
return (1); return (1);
} }
void void
DELAY(int n) DELAY(int n)
{ {
TSENTER(); TSENTER();
if (delay_tc(n)) { if (delay_tc(n)) {
TSEXIT(); TSEXIT();
return; return;
} }
init_ops.early_delay(n); init_ops.early_delay(n);
TSEXIT(); TSEXIT();
} }