The NetBSD Project

CVS log for src/sys/netinet6/in6_gif.c

[BACK] Up to [] / src / sys / netinet6

Request diff between arbitrary revisions

Default branch: MAIN
Current tag: MAIN

Revision 1.95 / (download) - annotate - [select for diffs], Wed Oct 30 03:45:59 2019 UTC (14 months, 3 weeks ago) by knakahara
Branch: MAIN
CVS Tags: thorpej-futex-base, thorpej-futex, phil-wifi-20200421, phil-wifi-20200411, phil-wifi-20200406, phil-wifi-20191119, is-mlppp-base, is-mlppp, bouyer-xenpvh-base2, bouyer-xenpvh-base1, bouyer-xenpvh-base, bouyer-xenpvh, ad-namecache-base3, ad-namecache-base2, ad-namecache-base1, ad-namecache-base, ad-namecache, HEAD
Changes since 1.94: +48 -5 lines
Diff to previous 1.94 (colored)

Add sysctl nodes to control fragmentation with IPv[46] over IPv6 gif(4).

New sysctl node "net.inet6.ip6.gifpmtu" means
    - 0 (default)
      Fragment by IPV6_MMTU. All packets reach the destination certainly,
      however the long packet performance is poor.
      This is same behavior as before.
    - 1
      Fragment by outer interface's MTU. The long packet performance would
      be good, however the packets may be dropped in some network paths
      whose path MTU less than the interface's MTU.
    - others
      undefined yet

New sysctl node "net.interfaces.gif*.pmtu" means
    - -1 (default)
      Use system default value (net.inet6.ip6.gifpmtu).
    - 0
      Fragment by IPV6_MMTU for this gif(4) tunnel.
    - 1
      Fragment by outer interface's MTU for this gif(4) tunnel.
    - others
      undefined yet

See RFC4459 for more information and other solutions.

Revision 1.94 / (download) - annotate - [select for diffs], Thu Sep 19 06:07:25 2019 UTC (16 months ago) by knakahara
Branch: MAIN
Changes since 1.93: +21 -25 lines
Diff to previous 1.93 (colored)

Avoid having a rtcache directly in a percpu storage for tunnel protocols.

percpu(9) has a certain memory storage for each CPU and provides it by the piece
to users.  If the storages went short, percpu(9) enlarges them by allocating new
larger memory areas, replacing old ones with them and destroying the old ones.
A percpu storage referenced by a pointer gotten via percpu_getref can be
destroyed by the mechanism after a running thread sleeps even if percpu_putref
has not been called.

Using rtcache, i.e., packet processing, typically involves sleepable operations
such as rwlock so we must avoid dereferencing a rtcache that is directly stored
in a percpu storage during packet processing.  Address this situation by having
just a pointer to a rtcache in a percpu storage instead.

Reviewed by ozaki-r@ and yamaguchi@

Revision 1.93 / (download) - annotate - [select for diffs], Tue May 1 07:21:39 2018 UTC (2 years, 8 months ago) by maxv
Branch: MAIN
CVS Tags: phil-wifi-base, phil-wifi-20190609, pgoyette-compat-20190127, pgoyette-compat-20190118, pgoyette-compat-1226, pgoyette-compat-1126, pgoyette-compat-1020, pgoyette-compat-0930, pgoyette-compat-0906, pgoyette-compat-0728, pgoyette-compat-0625, pgoyette-compat-0521, pgoyette-compat-0502, netbsd-9-base, isaki-audio2-base, isaki-audio2
Branch point for: phil-wifi, netbsd-9
Changes since 1.92: +2 -4 lines
Diff to previous 1.92 (colored)

Remove now unused net_osdep.h includes, the other BSDs did the same.

Revision 1.92 / (download) - annotate - [select for diffs], Fri Apr 27 09:55:28 2018 UTC (2 years, 8 months ago) by knakahara
Branch: MAIN
Changes since 1.91: +6 -6 lines
Diff to previous 1.91 (colored)

Fix LOCKDEBUG kernel panic when many(about 200) tunnel interfaces is created.

The tunnel interfaces are gif(4), l2tp(4), and ipsecif(4). They use mutex
itself in percpu area. When percpu_cpu_enlarge() run, the address of the
mutex in percpu area becomes different from the address which lockdebug
saved. That can cause "already initialized" false detection.

Revision 1.91 / (download) - annotate - [select for diffs], Wed Mar 14 07:56:32 2018 UTC (2 years, 10 months ago) by knakahara
Branch: MAIN
CVS Tags: pgoyette-compat-0422, pgoyette-compat-0415, pgoyette-compat-0407, pgoyette-compat-0330, pgoyette-compat-0322, pgoyette-compat-0315
Changes since 1.90: +6 -4 lines
Diff to previous 1.90 (colored)

Fix error checking in in6_gif_ctlinput().

if_gif.c:r1.133 introduces gif_update_variant() which ensure ifp->if_flags
is set IFF_RUNNING when gif_softc->gif_var->gv_{psrc,pdst} are not null.
So, in6_gif_ctlinput() is not required IFF_RUNNING checking. In contrast,
it is required gv_{psrc,pdst} NULL checking.

Revision 1.90 / (download) - annotate - [select for diffs], Wed Jan 10 11:13:26 2018 UTC (3 years ago) by knakahara
Branch: MAIN
CVS Tags: pgoyette-compat-base
Branch point for: pgoyette-compat
Changes since 1.89: +6 -8 lines
Diff to previous 1.89 (colored)

apply in{,6}_tunnel_validate() to gif(4).

Revision 1.89 / (download) - annotate - [select for diffs], Mon Nov 27 05:05:51 2017 UTC (3 years, 1 month ago) by knakahara
Branch: MAIN
CVS Tags: tls-maxphys-base-20171202
Changes since 1.88: +3 -3 lines
Diff to previous 1.88 (colored)

IFF_RUNNING checking in Rx and Tx processing is unnecessary now.

Because the configs of gif (members of gif_var) are protected by psref(9).

Revision 1.88 / (download) - annotate - [select for diffs], Mon Nov 27 05:02:22 2017 UTC (3 years, 1 month ago) by knakahara
Branch: MAIN
Changes since 1.87: +58 -48 lines
Diff to previous 1.87 (colored)

preserve gif(4) configs by psref(9) like vlan(4) and l2tp(4).

After Tx side does not use softint, gif(4) can use psref(9) for config
preservation like vlan(4) and l2tp(4).

update locking notes later.

Revision 1.87 / (download) - annotate - [select for diffs], Wed Nov 15 10:42:41 2017 UTC (3 years, 2 months ago) by knakahara
Branch: MAIN
Changes since 1.86: +7 -8 lines
Diff to previous 1.86 (colored)

Add argument to encapsw->pr_input() instead of m_tag.

Revision 1.86 / (download) - annotate - [select for diffs], Thu Sep 21 09:42:03 2017 UTC (3 years, 4 months ago) by knakahara
Branch: MAIN
Changes since 1.85: +9 -3 lines
Diff to previous 1.85 (colored)

add lock for percpu route like l2tp(4).

Revision 1.85 / (download) - annotate - [select for diffs], Mon Jan 16 15:44:47 2017 UTC (4 years ago) by christos
Branch: MAIN
CVS Tags: prg-localcount2-base3, prg-localcount2-base2, prg-localcount2-base1, prg-localcount2-base, prg-localcount2, pgoyette-localcount-20170426, pgoyette-localcount-20170320, perseant-stdc-iso10646-base, perseant-stdc-iso10646, nick-nhusb-base-20170825, nick-nhusb-base-20170204, netbsd-8-base, jdolecek-ncq-base, jdolecek-ncq, bouyer-socketcan-base1
Branch point for: netbsd-8
Changes since 1.84: +3 -3 lines
Diff to previous 1.84 (colored)

ip6_sprintf -> IN6_PRINT so that we pass the size.

Revision 1.84 / (download) - annotate - [select for diffs], Mon Jan 16 07:33:36 2017 UTC (4 years ago) by ryo
Branch: MAIN
Changes since 1.83: +4 -3 lines
Diff to previous 1.83 (colored)

Make ip6_sprintf(), in_fmtaddr(), lla_snprintf() and icmp6_redirect_diag() mpsafe.

Reviewed by ozaki-r@

Revision 1.83 / (download) - annotate - [select for diffs], Fri Jan 6 03:25:13 2017 UTC (4 years ago) by knakahara
Branch: MAIN
CVS Tags: pgoyette-localcount-20170107, bouyer-socketcan-base
Branch point for: bouyer-socketcan
Changes since 1.82: +3 -8 lines
Diff to previous 1.82 (colored)

remove unnecessary conversion.

gif_softc->gif_pdst is already valid sockaddr.

Revision 1.82 / (download) - annotate - [select for diffs], Wed Dec 14 11:19:15 2016 UTC (4 years, 1 month ago) by knakahara
Branch: MAIN
Changes since 1.81: +19 -12 lines
Diff to previous 1.81 (colored)

fix race of gif_softc->gif_ro when we send multiple flows over gif on NET_MPSAFE enabled kernel.

make gif_softc->gif_ro percpu as well as ipforward_rt to resolve this race.
and add future TODO comment for etherip(4).

Revision 1.81 / (download) - annotate - [select for diffs], Mon Dec 12 03:55:57 2016 UTC (4 years, 1 month ago) by ozaki-r
Branch: MAIN
Changes since 1.80: +4 -4 lines
Diff to previous 1.80 (colored)

Make the routing table and rtcaches MP-safe

See the following descriptions for details.

Proposed on tech-kern and tech-net


We protect the routing table with a rwock and protect
rtcaches with another rwlock. Each rtentry is protected
from being freed or updated via reference counting and psref.

Global rwlocks

There are two rwlocks; one for the routing table (rt_lock) and
the other for rtcaches (rtcache_lock). rtcache_lock covers
all existing rtcaches; there may have room for optimizations
(future work).

The locking order is rtcache_lock first and rt_lock is next.

rtentry references

References to an rtentry is managed with reference counting
and psref. Either of the two mechanisms is used depending on
where a rtentry is obtained. Reference counting is used when
we obtain a rtentry from the routing table directly via
rtalloc1 and rtrequest{,1} while psref is used when we obtain
a rtentry from a rtcache via rtcache_* APIs. In both cases,
a caller can sleep/block with holding an obtained rtentry.

The reasons why we use two different mechanisms are (i) only
using reference counting hurts the performance due to atomic
instructions (rtcache case) (ii) ease of implementation;
applying psref to APIs such rtaloc1 and rtrequest{,1} requires
additional works (adding a local variable and an argument).

We will finally migrate to use only psref but we can do it
when we have a lockless routing table alternative.

Reference counting for rtentry

rt_refcnt now doesn't count permanent references such as for
rt_timers and rtcaches, instead it is used only for temporal
references when obtaining a rtentry via rtalloc1 and rtrequest{,1}.
We can do so because destroying a rtentry always involves
removing references of rt_timers and rtcaches to the rtentry
and we don't need to track such references. This also makes
it easy to wait for readers to release references on deleting
or updating a rtentry, i.e., we can simply wait until the
reference counter is 0 or 1. (If there are permanent references
the counter can be arbitrary.)

rt_ref increments a reference counter of a rtentry and rt_unref
decrements it. rt_ref is called inside APIs (rtalloc1 and
rtrequest{,1} so users don't need to care about it while
users must call rt_unref to an obtained rtentry after using it.

rtfree is removed and we use rt_unref and rt_free instead.
rt_unref now just decrements the counter of a given rtentry
and rt_free just tries to destroy a given rtentry.

See the next section for destructions of rtentries by rt_free.

Destructions of rtentries

We destroy a rtentry only when we call rtrequst{,1}(RTM_DELETE);
the original implementation can destroy in any rtfree where it's
the last reference. If we use reference counting or psref, it's
easy to understand if the place that a rtentry is destroyed is

rt_free waits for references to a given rtentry to be released
before actually destroying the rtentry. rt_free uses a condition
variable (cv_wait) (and psref_target_destroy for psref) to wait.

Unfortunately rtrequst{,1}(RTM_DELETE) can be called in softint
that we cannot use cv_wait. In that case, we have to defer the
destruction to a workqueue.

rtentry#rt_cv, rtentry#rt_psref and global variables
(see rt_free_global) are added to conduct the procedure.

Updates of rtentries

One difficulty to use refcnt/psref instead of rwlock for rtentry
is updates of rtentries. We need an additional mechanism to
prevent readers from seeing inconsistency of a rtentry being

We introduce RTF_UPDATING flag to rtentries that are updating.
While the flag is set to a rtentry, users cannot acquire the
rtentry. By doing so, we avoid users to see inconsistent

There are two options when a user tries to acquire a rtentry
with the RTF_UPDATING flag; if a user runs in softint context
the user fails to acquire a rtentry (NULL is returned).
Otherwise a user waits until the update completes by waiting
on cv.

The procedure of a updater is simpler to destruction of
a rtentry. Wait on cv (and psref) and after all readers left,
proceed with the update.

Global variables (see rt_update_global) are added to conduct
the procedure.

Currently we apply the mechanism to only RTM_CHANGE in
rtsock.c. We would have to apply other codes. See
"Known issues" section.

psref for rtentry

When we obtain a rtentry from a rtcache via rtcache_* APIs,
psref is used to reference to the rtentry.

rtcache_ref acquires a reference to a rtentry with psref
and rtcache_unref releases the reference after using it.
rtcache_ref is called inside rtcache_* APIs and users don't
need to take care of it while users must call rtcache_unref
to release the reference.

struct psref and int bound that is needed for psref is
embedded into struct route. By doing so we don't need to
add local variables and additional argument to APIs.

However this adds another constraint to psref other than
reference counting one's; holding a reference of an rtentry
via a rtcache is allowed by just one caller at the same time.
So we must not acquire a rtentry via a rtcache twice and
avoid a recursive use of a rtcache. And also a rtcache must
be arranged to be used by a LWP/softint at the same time
somehow. For IP forwarding case, we have per-CPU rtcaches
used in softint so the constraint is guaranteed. For a h
rtcache of a PCB case, the constraint is guaranteed by the
solock of each PCB. Any other cases (pf, ipf, stf and ipsec)
are currently guaranteed by only the existence of the global
locks (softnet_lock and/or KERNEL_LOCK). If we've found the
cases that we cannot guarantee the constraint, we would need
to introduce other rtcache APIs that use simple reference

psref of rtcache is created with IPL_SOFTNET and so rtcache
shouldn't used at an IPL higher than IPL_SOFTNET.

Note that rtcache_free is used to invalidate a given rtcache.
We don't need another care by my change; just keep them as
they are.

Performance impact

When NET_MPSAFE is disabled the performance drop is 3% while
when it's enabled the drop is increased to 11%. The difference
comes from that currently we don't take any global locks and
don't use psref if NET_MPSAFE is disabled.

We can optimize the performance of the case of NET_MPSAFE
on by reducing lookups of rtcache that uses psref;
currently we do two lookups but we should be able to trim
one of two. This is a future work.

Known issues

There are two known issues to be solved; one is that
a caller of rtrequest(RTM_ADD) may change rtentry (see rtinit).
We need to prevent new references during the update. Or
we may be able to remove the code (perhaps, need more

The other is rtredirect that updates a rtentry. We need
to apply our update mechanism, however it's not easy because
rtredirect is called in softint and we cannot apply our
mechanism simply. One solution is to defer rtredirect to
a workqueue but it requires some code restructuring.

Revision 1.80 / (download) - annotate - [select for diffs], Thu Dec 8 05:16:34 2016 UTC (4 years, 1 month ago) by ozaki-r
Branch: MAIN
Changes since 1.79: +6 -3 lines
Diff to previous 1.79 (colored)

Add rtcache_unref to release points of rtentry stemming from rtcache

In the MP-safe world, a rtentry stemming from a rtcache can be freed at any
points. So we need to protect rtentries somehow say by reference couting or
passive references. Regardless of the method, we need to call some release
function of a rtentry after using it.

The change adds a new function rtcache_unref to release a rtentry. At this
point, this function does nothing because for now we don't add a reference
to a rtentry when we get one from a rtcache. We will add something useful
in a further commit.

This change is a part of changes for MP-safe routing table. It is separated
to avoid one big change that makes difficult to debug by bisecting.

Revision 1.79 / (download) - annotate - [select for diffs], Fri Jul 15 07:40:09 2016 UTC (4 years, 6 months ago) by ozaki-r
Branch: MAIN
CVS Tags: pgoyette-localcount-20161104, pgoyette-localcount-20160806, pgoyette-localcount-20160726, nick-nhusb-base-20161204, nick-nhusb-base-20161004, localcount-20160914
Changes since 1.78: +3 -3 lines
Diff to previous 1.78 (colored)

Use sin6tosa and sin6tocsa macros

No functional change.

Revision 1.78 / (download) - annotate - [select for diffs], Wed Jul 6 00:30:55 2016 UTC (4 years, 6 months ago) by ozaki-r
Branch: MAIN
CVS Tags: pgoyette-localcount-base, nick-nhusb-base-20160907
Branch point for: pgoyette-localcount
Changes since 1.77: +11 -5 lines
Diff to previous 1.77 (colored)

Apply m_get_rcvif_psref (kill m_get_rcvif_NOMPSAFE)

Revision 1.77 / (download) - annotate - [select for diffs], Mon Jul 4 04:22:47 2016 UTC (4 years, 6 months ago) by knakahara
Branch: MAIN
Changes since 1.76: +14 -4 lines
Diff to previous 1.76 (colored)

fix: gif(4) receive side race

A panic cause in rn_match() called by encap[46]_lookup(). The reason is that
gif(4) does not suspend receive packet processing in spite of suspending
transmit packet processing while anyone is doing gif(4) ioctl.

Revision 1.76 / (download) - annotate - [select for diffs], Mon Jul 4 04:14:47 2016 UTC (4 years, 6 months ago) by knakahara
Branch: MAIN
Changes since 1.75: +4 -3 lines
Diff to previous 1.75 (colored)

let gif(4) promise softint(9) contract (1/2) : gif(4) side

To prevent calling softint_schedule() after called softint_disestablish(),
the following modifications are added
    + ioctl (writing configuration) side
      - off IFF_RUNNING flag before changing configuration
      - wait softint handler completion before changing configuration
    + packet processing (reading configuraiotn) side
      - if IFF_RUNNING flag is on, do nothing
    + in whole
      - add gif_list_lock_{enter,exit} to prevent the same configuration is
        set to other gif(4) interfaces

Revision 1.75 / (download) - annotate - [select for diffs], Tue Jun 28 02:02:56 2016 UTC (4 years, 6 months ago) by ozaki-r
Branch: MAIN
Changes since 1.74: +3 -3 lines
Diff to previous 1.74 (colored)

Add missing NULL checks for m_get_rcvif_psref

Revision 1.74 / (download) - annotate - [select for diffs], Fri Jun 10 13:31:44 2016 UTC (4 years, 7 months ago) by ozaki-r
Branch: MAIN
Changes since 1.73: +8 -4 lines
Diff to previous 1.73 (colored)

Avoid storing a pointer of an interface in a mbuf

Having a pointer of an interface in a mbuf isn't safe if we remove big
kernel locks; an interface object (ifnet) can be destroyed anytime in any
packet processing and accessing such object via a pointer is racy. Instead
we have to get an object from the interface collection (ifindex2ifnet) via
an interface index (if_index) that is stored to a mbuf instead of an

The change provides two APIs: m_{get,put}_rcvif_psref that use psref(9)
for sleep-able critical sections and m_{get,put}_rcvif that use
pserialize(9) for other critical sections. The change also adds another
API called m_get_rcvif_NOMPSAFE, that is NOT MP-safe and for transition
moratorium, i.e., it is intended to be used for places where are not
planned to be MP-ified soon.

The change adds some overhead due to psref to performance sensitive paths,
however the overhead is not serious, 2% down at worst.

Proposed on tech-kern and tech-net.

Revision 1.73 / (download) - annotate - [select for diffs], Mon Feb 29 01:29:15 2016 UTC (4 years, 10 months ago) by knakahara
Branch: MAIN
CVS Tags: nick-nhusb-base-20160529, nick-nhusb-base-20160422, nick-nhusb-base-20160319
Changes since 1.72: +3 -3 lines
Diff to previous 1.72 (colored)

remove unnecessary declarations and fix KNF

Thanks to riastradh@

Revision 1.72 / (download) - annotate - [select for diffs], Fri Feb 26 07:35:17 2016 UTC (4 years, 10 months ago) by knakahara
Branch: MAIN
Changes since 1.71: +16 -25 lines
Diff to previous 1.71 (colored)

To eliminate gif_softc_list linear search, add extra argument to encapsw.pr_ctlinput().

Revision 1.71 / (download) - annotate - [select for diffs], Tue Jan 26 05:58:05 2016 UTC (4 years, 11 months ago) by knakahara
Branch: MAIN
Changes since 1.70: +11 -21 lines
Diff to previous 1.70 (colored)

implement encapsw instead of protosw and uniform prototype.

suggested and advised by riastradh@n.o, thanks.

BTW, It seems in_stf_input() had bugs...

Revision 1.70 / (download) - annotate - [select for diffs], Sat Jan 23 14:48:55 2016 UTC (5 years ago) by riastradh
Branch: MAIN
Changes since 1.69: +4 -13 lines
Diff to previous 1.69 (colored)

Those were local changes not meant to be part of the revert.  SORRY!

Revision 1.69 / (download) - annotate - [select for diffs], Sat Jan 23 14:03:04 2016 UTC (5 years ago) by christos
Branch: MAIN
Changes since 1.68: +4 -2 lines
Diff to previous 1.68 (colored)

make this compile again

Revision 1.68 / (download) - annotate - [select for diffs], Fri Jan 22 23:27:12 2016 UTC (5 years ago) by riastradh
Branch: MAIN
Changes since 1.67: +29 -11 lines
Diff to previous 1.67 (colored)

Back out previous change to introduce struct encapsw.

This change was intended, but Nakahara-san had already made a better
one locally!  So I'll let him commit that one, and I'll try not to
step on anyone's toes again.

Revision 1.67 / (download) - annotate - [select for diffs], Fri Jan 22 05:15:10 2016 UTC (5 years ago) by riastradh
Branch: MAIN
Changes since 1.66: +9 -20 lines
Diff to previous 1.66 (colored)

Don't abuse struct protosw for ip_encap -- introduce struct encapsw.

Mostly mechanical change to replace it, culling some now-needless
boilerplate around all the users.

This does not substantively change the ip_encap API or eliminate
abuse of sketchy pointer casts -- that will come later, and will be
easier now that it is not tangled up with struct protosw.

Revision 1.66 / (download) - annotate - [select for diffs], Wed Jan 20 21:44:00 2016 UTC (5 years ago) by riastradh
Branch: MAIN
Changes since 1.65: +2 -3 lines
Diff to previous 1.65 (colored)

Eliminate struct protosw::pr_output.

You can't use this unless you know what it is a priori: the formal
prototype is variadic, and the different instances (e.g., ip_output,
route_output) have different real prototypes.

Convert the only user of it, raw_send in net/raw_cb.c, to take an
explicit callback argument.  Convert the only instances of it,
route_output and key_output, to such explicit callbacks for raw_send.
Use assertions to make sure the conversion to explicit callbacks is

Discussed on tech-net with no objections:

Revision 1.65 / (download) - annotate - [select for diffs], Mon Jan 18 06:08:26 2016 UTC (5 years ago) by knakahara
Branch: MAIN
Changes since 1.64: +4 -4 lines
Diff to previous 1.64 (colored)

Refactor protosw codes in gif(4). No functional change.

    - remove unnecessary include
    - reduce scopes

Revision 1.64 / (download) - annotate - [select for diffs], Fri Dec 25 06:47:57 2015 UTC (5 years ago) by knakahara
Branch: MAIN
CVS Tags: nick-nhusb-base-20151226
Changes since 1.63: +6 -6 lines
Diff to previous 1.63 (colored)

use satosin{,6} macros instead of casts.

Revision 1.63 / (download) - annotate - [select for diffs], Fri Dec 11 07:59:14 2015 UTC (5 years, 1 month ago) by knakahara
Branch: MAIN
Changes since 1.62: +11 -3 lines
Diff to previous 1.62 (colored)

PR kern/50522: gif(4) ioctl causes panic while someone is using the gif(4) interface.

It is required to wait other CPU's softint completion before disestablishing
the softint handler.

Revision 1.62 / (download) - annotate - [select for diffs], Mon Aug 24 22:21:27 2015 UTC (5 years, 5 months ago) by pooka
Branch: MAIN
CVS Tags: nick-nhusb-base-20150921
Changes since 1.61: +4 -2 lines
Diff to previous 1.61 (colored)

sprinkle _KERNEL_OPT

Revision 1.61 / (download) - annotate - [select for diffs], Fri Apr 24 07:51:43 2015 UTC (5 years, 9 months ago) by ozaki-r
Branch: MAIN
CVS Tags: nick-nhusb-base-20150606
Changes since 1.60: +3 -2 lines
Diff to previous 1.60 (colored)

Add missing rtcache_free

It's the same as other similar code paths in in_gif and ip6_etherip.

Revision 1.60 / (download) - annotate - [select for diffs], Sun May 18 14:46:16 2014 UTC (6 years, 8 months ago) by rmind
Branch: MAIN
CVS Tags: tls-maxphys-base, tls-earlyentropy-base, rmind-smpnet-nbase, rmind-smpnet-base, nick-nhusb-base-20150406, nick-nhusb-base, netbsd-7-nhusb-base-20170116, netbsd-7-nhusb-base, netbsd-7-nhusb, netbsd-7-base, netbsd-7-2-RELEASE, netbsd-7-1-RELEASE, netbsd-7-1-RC2, netbsd-7-1-RC1, netbsd-7-1-2-RELEASE, netbsd-7-1-1-RELEASE, netbsd-7-1, netbsd-7-0-RELEASE, netbsd-7-0-RC3, netbsd-7-0-RC2, netbsd-7-0-RC1, netbsd-7-0-2-RELEASE, netbsd-7-0-1-RELEASE, netbsd-7-0, netbsd-7
Branch point for: nick-nhusb
Changes since 1.59: +13 -9 lines
Diff to previous 1.59 (colored)

Add struct pr_usrreqs with a pr_generic function and prepare for the
dismantling of pr_usrreq in the protocols; no functional change intended.
PRU_ATTACH/PRU_DETACH changes will follow soon.

Bump for struct protosw.  Welcome to 6.99.62!

Revision 1.59 / (download) - annotate - [select for diffs], Fri Mar 1 18:25:58 2013 UTC (7 years, 10 months ago) by joerg
Branch: MAIN
CVS Tags: yamt-pagecache-base9, riastradh-xf86-video-intel-2-7-1-pre-2-21-15, riastradh-drm2-base3, riastradh-drm2-base2, riastradh-drm2-base1, riastradh-drm2-base, riastradh-drm2, khorben-n900, agc-symver-base, agc-symver
Branch point for: tls-earlyentropy, rmind-smpnet
Changes since 1.58: +2 -14 lines
Diff to previous 1.58 (colored)

Retire OSI network stack. OK core@

Revision 1.58 / (download) - annotate - [select for diffs], Sat Mar 14 14:46:10 2009 UTC (11 years, 10 months ago) by dsl
Branch: MAIN
CVS Tags: yamt-pagecache-tag8, yamt-pagecache-base8, yamt-pagecache-base7, yamt-pagecache-base6, yamt-pagecache-base5, yamt-pagecache-base4, yamt-pagecache-base3, yamt-pagecache-base2, yamt-pagecache-base, yamt-nfs-mp-base9, yamt-nfs-mp-base8, yamt-nfs-mp-base7, yamt-nfs-mp-base6, yamt-nfs-mp-base5, yamt-nfs-mp-base4, yamt-nfs-mp-base3, yamt-nfs-mp-base11, yamt-nfs-mp-base10, uebayasi-xip-base4, uebayasi-xip-base3, uebayasi-xip-base2, uebayasi-xip-base1, uebayasi-xip-base, uebayasi-xip, rmind-uvmplock-nbase, rmind-uvmplock-base, rmind-uvmplock, nick-hppapmap-base4, nick-hppapmap-base3, nick-hppapmap-base, netbsd-6-base, netbsd-6-1-RELEASE, netbsd-6-1-RC4, netbsd-6-1-RC3, netbsd-6-1-RC2, netbsd-6-1-RC1, netbsd-6-1-5-RELEASE, netbsd-6-1-4-RELEASE, netbsd-6-1-3-RELEASE, netbsd-6-1-2-RELEASE, netbsd-6-1-1-RELEASE, netbsd-6-1, netbsd-6-0-RELEASE, netbsd-6-0-RC2, netbsd-6-0-RC1, netbsd-6-0-6-RELEASE, netbsd-6-0-5-RELEASE, netbsd-6-0-4-RELEASE, netbsd-6-0-3-RELEASE, netbsd-6-0-2-RELEASE, netbsd-6-0-1-RELEASE, netbsd-6-0, netbsd-6, matt-premerge-20091211, matt-nb6-plus-nbase, matt-nb6-plus-base, matt-nb6-plus, matt-mips64-premerge-20101231, jymxensuspend-base, jym-xensuspend-nbase, jym-xensuspend-base, jruoho-x86intr-base, jruoho-x86intr, jmcneill-usbmp-pre-base2, jmcneill-usbmp-base9, jmcneill-usbmp-base8, jmcneill-usbmp-base7, jmcneill-usbmp-base6, jmcneill-usbmp-base5, jmcneill-usbmp-base4, jmcneill-usbmp-base3, jmcneill-usbmp-base2, jmcneill-usbmp-base10, jmcneill-usbmp-base, jmcneill-usbmp, jmcneill-audiomp3-base, jmcneill-audiomp3, cherry-xenmp-base, cherry-xenmp, bouyer-quota2-nbase, bouyer-quota2-base, bouyer-quota2
Branch point for: yamt-pagecache, tls-maxphys
Changes since 1.57: +4 -4 lines
Diff to previous 1.57 (colored)

Remove all the __P() from sys (excluding sys/dist)
Diff checked with grep and MK1 eyeball.
i386 and amd64 GENERIC and sys still build.

Revision 1.57 / (download) - annotate - [select for diffs], Fri Nov 7 00:20:18 2008 UTC (12 years, 2 months ago) by dyoung
Branch: MAIN
CVS Tags: nick-hppapmap-base2, mjf-devfs2-base, haad-nbase2, haad-dm-base2, haad-dm-base, ad-audiomp2-base, ad-audiomp2
Branch point for: jym-xensuspend
Changes since 1.56: +19 -20 lines
Diff to previous 1.56 (colored)

*** Summary ***

When a link-layer address changes (e.g., ifconfig ex0 link
02:de:ad:be:ef:02 active), send a gratuitous ARP and/or a Neighbor
Advertisement to update the network-/link-layer address bindings
on our LAN peers.

Refuse a change of ethernet address to the address 00:00:00:00:00:00
or to any multicast/broadcast address.  (Thanks matt@.)

Reorder ifnet ioctl operations so that driver ioctls may inherit
the functions of their "class"---ether_ioctl(), fddi_ioctl(), et
cetera---and the class ioctls may inherit from the generic ioctl,
ifioctl_common(), but both driver- and class-ioctls may override
the generic behavior.  Make network drivers share more code.

Distinguish a "factory" link-layer address from others for the
purposes of both protecting that address from deletion and computing

Return consistent, appropriate error codes from network drivers.

Improve readability.  KNF.

*** Details ***

In if_attach(), always initialize the interface ioctl routine,
ifnet->if_ioctl, if the driver has not already initialized it.
Delete if_ioctl == NULL tests everywhere else, because it cannot

In the ioctl routines of network interfaces, inherit common ioctl
behaviors by calling either ifioctl_common() or whichever ioctl
routine is appropriate for the class of interface---e.g., ether_ioctl()
for ethernets.

Stop (ab)using SIOCSIFADDR and start to use SIOCINITIFADDR.  In
the user->kernel interface, SIOCSIFADDR's argument was an ifreq,
but on the protocol->ifnet interface, SIOCSIFADDR's argument was
an ifaddr.  That was confusing, and it would work against me as I
make it possible for a network interface to overload most ioctls.
On the protocol->ifnet interface, replace SIOCSIFADDR with
SIOCINITIFADDR.  In ifioctl(), return EPERM if userland tries to

In ifioctl(), give the interface the first shot at handling most
interface ioctls, and give the protocol the second shot, instead
of the other way around. Finally, let compatibility code (COMPAT_OSOCK)
take a shot.

Pull device initialization out of switch statements under
SIOCINITIFADDR.  For example, pull ..._init() out of any switch
statement that looks like this:

        switch (...->sa_family) {
        case ...:

Rewrite many if-else clauses that handle all permutations of IFF_UP
and IFF_RUNNING to use a switch statement,

        switch (x & (IFF_UP|IFF_RUNNING)) {
        case 0:
        case IFF_RUNNING:
        case IFF_UP:
        case IFF_UP|IFF_RUNNING:

unifdef lots of code containing #ifdef FreeBSD, #ifdef NetBSD, and
#ifdef SIOCSIFMTU, especially in fwip(4) and in ndis(4).

In ipw(4), remove an if_set_sadl() call that is out of place.

In nfe(4), reuse the jumbo MTU logic in ether_ioctl().

Let ethernets register a callback for setting h/w state such as
promiscuous mode and the multicast filter in accord with a change
in the if_flags: ether_set_ifflags_cb() registers a callback that
returns ENETRESET if the caller should reset the ethernet by calling
if_init(), 0 on success, != 0 on failure.  Pull common code from
ex(4), gem(4), nfe(4), sip(4), tlp(4), vge(4) into ether_ioctl(),
and register if_flags callbacks for those drivers.

Return ENOTTY instead of EINVAL for inappropriate ioctls.  In
zyd(4), use ENXIO instead of ENOTTY to indicate that the device is
not any longer attached.

Add to if_set_sadl() a boolean 'factory' argument that indicates
whether a link-layer address was assigned by the factory or some
other source.  In a comment, recommend using the factory address
for generating an EUI64, and update in6_get_hw_ifid() to prefer a
factory address to any other link-layer address.

Add a routing message, RTM_LLINFO_UPD, that tells protocols to
update the binding of network-layer addresses to link-layer addresses.
Implement this message in IPv4 and IPv6 by sending a gratuitous
ARP or a neighbor advertisement, respectively.  Generate RTM_LLINFO_UPD
messages on a change of an interface's link-layer address.

In ether_ioctl(), do not let SIOCALIFADDR set a link-layer address
that is broadcast/multicast or equal to 00:00:00:00:00:00.

Make ether_ioctl() call ifioctl_common() to handle ioctls that it
does not understand.

In gif(4), initialize if_softc and use it, instead of assuming that
the gif_softc and ifp overlap.

Let ifioctl_common() handle SIOCGIFADDR.

Sprinkle rtcache_invariants(), which checks on DIAGNOSTIC kernels
that certain invariants on a struct route are satisfied.

In agr(4), rewrite agr_ioctl_filter() to be a bit more explicit
about the ioctls that we do not allow on an agr(4) member interface.

bzero -> memset.  Delete unnecessary casts to void *.  Use
sockaddr_in_init() and sockaddr_in6_init().  Compare pointers with
NULL instead of "testing truth".  Replace some instances of (type
*)0 with NULL.  Change some K&R prototypes to ANSI C, and join

Revision 1.56 / (download) - annotate - [select for diffs], Thu Apr 24 11:38:38 2008 UTC (12 years, 9 months ago) by ad
Branch: MAIN
CVS Tags: yamt-pf42-base4, yamt-pf42-base3, yamt-pf42-base2, yamt-nfs-mp-base2, yamt-nfs-mp-base, wrstuden-revivesa-base-4, wrstuden-revivesa-base-3, wrstuden-revivesa-base-2, wrstuden-revivesa-base-1, wrstuden-revivesa-base, wrstuden-revivesa, simonb-wapbl-nbase, simonb-wapbl-base, simonb-wapbl, netbsd-5-base, netbsd-5-2-RELEASE, netbsd-5-2-RC1, netbsd-5-2-3-RELEASE, netbsd-5-2-2-RELEASE, netbsd-5-2-1-RELEASE, netbsd-5-2, netbsd-5-1-RELEASE, netbsd-5-1-RC4, netbsd-5-1-RC3, netbsd-5-1-RC2, netbsd-5-1-RC1, netbsd-5-1-5-RELEASE, netbsd-5-1-4-RELEASE, netbsd-5-1-3-RELEASE, netbsd-5-1-2-RELEASE, netbsd-5-1-1-RELEASE, netbsd-5-1, netbsd-5-0-RELEASE, netbsd-5-0-RC4, netbsd-5-0-RC3, netbsd-5-0-RC2, netbsd-5-0-RC1, netbsd-5-0-2-RELEASE, netbsd-5-0-1-RELEASE, netbsd-5-0, netbsd-5, matt-nb5-pq3-base, matt-nb5-pq3, matt-nb5-mips64-u2-k2-k4-k7-k8-k9, matt-nb5-mips64-u1-k1-k5, matt-nb5-mips64-premerge-20101231, matt-nb5-mips64-premerge-20091211, matt-nb5-mips64-k15, matt-nb5-mips64, matt-nb4-mips64-k7-u2a-k9b, matt-mips64-base2, hpcarm-cleanup-nbase, haad-dm-base1
Branch point for: yamt-nfs-mp, nick-hppapmap, haad-dm
Changes since 1.55: +27 -15 lines
Diff to previous 1.55 (colored)

Merge the socket locking patch:

- Socket layer becomes MP safe.
- Unix protocols become MP safe.
- Allows protocol processing interrupts to safely block on locks.
- Fixes a number of race conditions.

With much feedback from matt@ and plunky@.

Revision 1.55 / (download) - annotate - [select for diffs], Tue Apr 15 03:57:04 2008 UTC (12 years, 9 months ago) by thorpej
Branch: MAIN
CVS Tags: yamt-pf42-baseX, yamt-pf42-base
Branch point for: yamt-pf42
Changes since 1.54: +6 -5 lines
Diff to previous 1.54 (colored)

Make ip6 and icmp6 stats per-cpu.

Revision 1.54 / (download) - annotate - [select for diffs], Tue Apr 8 23:37:43 2008 UTC (12 years, 9 months ago) by thorpej
Branch: MAIN
Changes since 1.53: +5 -5 lines
Diff to previous 1.53 (colored)

Change IPv6 stats from a structure to an array of uint64_t's.

Note: This is ABI-compatible with the old ip6stat structure; old netstat
binaries will continue to work properly.

Revision 1.53 / (download) - annotate - [select for diffs], Thu Dec 20 19:53:33 2007 UTC (13 years, 1 month ago) by dyoung
Branch: MAIN
CVS Tags: yamt-lazymbuf-base15, yamt-lazymbuf-base14, vmlocking2-base3, nick-net80211-sync-base, nick-net80211-sync, mjf-devfs-base, matt-armv6-nbase, matt-armv6-base, keiichi-mipv6-nbase, keiichi-mipv6-base, keiichi-mipv6, hpcarm-cleanup-base, bouyer-xeni386-nbase, bouyer-xeni386-base, ad-socklock-base1
Branch point for: mjf-devfs2
Changes since 1.52: +5 -6 lines
Diff to previous 1.52 (colored)

Poison struct route->ro_rt uses in the kernel by changing the name
to _ro_rt.  Use rtcache_getrt() to access a route cache's struct
rtentry *.

Introduce struct ifnet->if_dl that always points at the interface
identifier/link-layer address.  Make code that treated the first
ifaddr on struct ifnet->if_addrlist as the interface address use
if_dl, instead.

Remove stale debugging code from net/route.c.  Move the rtflush()
code into rtcache_clear() and delete rtflush().  Delete rtalloc(),
because nothing uses it any more.

Make ND6_HINT an inline, lowercase subroutine, nd6_hint.

I've done my best to convert IP Filter, the ISO stack, and the
AppleTalk stack to rtcache_getrt().  They compile, but I have not
tested them.  I have given the changes to PF, GRE, IPv4 and IPv6
stacks a lot of exercise.

Revision 1.52 / (download) - annotate - [select for diffs], Wed May 23 17:15:01 2007 UTC (13 years, 8 months ago) by christos
Branch: MAIN
CVS Tags: yamt-x86pmap-base4, yamt-x86pmap-base3, yamt-x86pmap-base2, yamt-x86pmap-base, yamt-x86pmap, yamt-kmem-base3, yamt-kmem-base2, yamt-kmem-base, yamt-kmem, vmlocking2-base2, vmlocking2-base1, vmlocking-nbase, vmlocking-base, reinoud-bufcleanup-nbase, reinoud-bufcleanup-base, nick-csl-alignment-base5, nick-csl-alignment-base, nick-csl-alignment, mjf-ufs-trans-base, mjf-devfs, matt-mips64-base, matt-mips64, matt-armv6-prevmlocking, jmcneill-pm-base, jmcneill-pm, jmcneill-base, hpcarm-cleanup, cube-autoconf-base, cube-autoconf, bouyer-xenamd64-base2, bouyer-xenamd64-base, bouyer-xenamd64
Branch point for: vmlocking2, matt-armv6, bouyer-xeni386
Changes since 1.51: +13 -22 lines
Diff to previous 1.51 (colored)

Ansify + add a few comments, from Karl Sjödahl

Revision 1.51 / (download) - annotate - [select for diffs], Wed May 2 20:40:26 2007 UTC (13 years, 8 months ago) by dyoung
Branch: MAIN
CVS Tags: yamt-idlelwp-base8
Changes since 1.50: +19 -30 lines
Diff to previous 1.50 (colored)

Eliminate address family-specific route caches (struct route, struct
route_in6, struct route_iso), replacing all caches with a struct

The principle benefit of this change is that all of the protocol
families can benefit from route cache-invalidation, which is
necessary for correct routing.  Route-cache invalidation fixes an
ancient PR, kern/3508, at long last; it fixes various other PRs,

Discussions with and ideas from Joerg Sonnenberger influenced this
work tremendously.  Of course, all design oversights and bugs are


1 I added to each address family a pool of sockaddrs.  I have
  introduced routines for allocating, copying, and duplicating,
  and freeing sockaddrs:

        struct sockaddr *sockaddr_alloc(sa_family_t af, int flags);
        struct sockaddr *sockaddr_copy(struct sockaddr *dst,
                                       const struct sockaddr *src);
        struct sockaddr *sockaddr_dup(const struct sockaddr *src, int flags);
        void sockaddr_free(struct sockaddr *sa);

  sockaddr_alloc() returns either a sockaddr from the pool belonging
  to the specified family, or NULL if the pool is exhausted.  The
  returned sockaddr has the right size for that family; sa_family
  and sa_len fields are initialized to the family and sockaddr
  length---e.g., sa_family = AF_INET and sa_len = sizeof(struct
  sockaddr_in).  sockaddr_free() puts the given sockaddr back into
  its family's pool.

  sockaddr_dup() and sockaddr_copy() work analogously to strdup()
  and strcpy(), respectively.  sockaddr_copy() KASSERTs that the
  family of the destination and source sockaddrs are alike.

  The 'flags' argumet for sockaddr_alloc() and sockaddr_dup() is
  passed directly to pool_get(9).

2 I added routines for initializing sockaddrs in each address
  family, sockaddr_in_init(), sockaddr_in6_init(), sockaddr_iso_init(),
  etc.  They are fairly self-explanatory.

3 structs route_in6 and route_iso are no more.  All protocol families
  use struct route.  I have changed the route cache, 'struct route',
  so that it does not contain storage space for a sockaddr.  Instead,
  struct route points to a sockaddr coming from the pool the sockaddr
  belongs to.  I added a new method to struct route, rtcache_setdst(),
  for setting the cache destination:

        int rtcache_setdst(struct route *, const struct sockaddr *);

  rtcache_setdst() returns 0 on success, or ENOMEM if no memory is
  available to create the sockaddr storage.

  It is now possible for rtcache_getdst() to return NULL if, say,
  rtcache_setdst() failed.  I check the return value for NULL
  everywhere in the kernel.

4 Each routing domain (struct domain) has a list of live route
  caches, dom_rtcache.  rtflushall(sa_family_t af) looks up the
  domain indicated by 'af', walks the domain's list of route caches
  and invalidates each one.

Revision 1.50 / (download) - annotate - [select for diffs], Sun Mar 4 06:03:25 2007 UTC (13 years, 10 months ago) by christos
Branch: MAIN
CVS Tags: thorpej-atomic-base, thorpej-atomic, reinoud-bufcleanup
Branch point for: vmlocking, mjf-ufs-trans
Changes since 1.49: +3 -3 lines
Diff to previous 1.49 (colored)

Kill caddr_t; there will be some MI fallout, but it will be fixed shortly.

Revision 1.49 / (download) - annotate - [select for diffs], Sat Feb 17 22:34:13 2007 UTC (13 years, 11 months ago) by dyoung
Branch: MAIN
CVS Tags: ad-audiomp-base, ad-audiomp
Changes since 1.48: +15 -14 lines
Diff to previous 1.48 (colored)

KNF: de-__P, bzero -> memset, bcmp -> memcmp.  Remove extraneous
   parentheses in return statements.

Cosmetic: don't open-code TAILQ_FOREACH().

Cosmetic: change types of variables to avoid oodles of casts: in
   in6_src.c, avoid casts by changing several route_in6 pointers
   to struct route pointers.  Remove unnecessary casts to caddr_t

Pave the way for eliminating address family-specific route caches:
   soon, struct route will not embed a sockaddr, but it will hold
   a reference to an external sockaddr, instead.  We will set the
   destination sockaddr using rtcache_setdst().  (I created a stub
   for it, but it isn't used anywhere, yet.)  rtcache_free() will
   free the sockaddr.  I have extracted from rtcache_free() a helper
   subroutine, rtcache_clear().  rtcache_clear() will "forget" a
   cached route, but it will not forget the destination by releasing
   the sockaddr.  I use rtcache_clear() instead of rtcache_free()
   in rtcache_update(), because rtcache_update() is not supposed
   to forget the destination.


   1 Introduce const accessor for route->ro_dst, rtcache_getdst().

   2 Constify the 'dst' argument to ifnet->if_output().  This
     led me to constify a lot of code called by output routines.

   3 Constify the sockaddr argument to protosw->pr_ctlinput.  This
     led me to constify a lot of code called by ctlinput routines.

   4 Introduce const macros for converting from a generic sockaddr
     to family-specific sockaddrs, e.g., sockaddr_in: satocsin6,
     satocsin, et cetera.

Revision 1.48 / (download) - annotate - [select for diffs], Sat Feb 17 06:11:25 2007 UTC (13 years, 11 months ago) by dyoung
Branch: MAIN
Branch point for: yamt-idlelwp
Changes since 1.47: +3 -4 lines
Diff to previous 1.47 (colored)

Don't open-code LIST_FOREACH().

Revision 1.47 / (download) - annotate - [select for diffs], Fri Dec 15 21:18:54 2006 UTC (14 years, 1 month ago) by joerg
Branch: MAIN
CVS Tags: yamt-splraiseipl-base5, yamt-splraiseipl-base4, post-newlock2-merge, newlock2-nbase, newlock2-base
Changes since 1.46: +16 -18 lines
Diff to previous 1.46 (colored)

Introduce new helper functions to abstract the route caching.
rtcache_init and rtcache_init_noclone lookup ro_dst and store
the result in ro_rt, taking care of the reference counting and
calling the domain specific route cache.
rtcache_free checks if a route was cashed and frees the reference.
rtcache_copy copies ro_dst of the given struct route, checking that
enough space is available and incrementing the reference count of the
cached rtentry if necessary.
rtcache_check validates that the cached route is still up. If it isn't,
it tries to look it up again. Afterwards ro_rt is either a valid again
or NULL.
rtcache_copy is used internally.

Adjust to callers of rtalloc/rtflush in the tree to check the sanity of
ro_dst first (if necessary). If it doesn't fit the expectations, free
the cache, otherwise check if the cached route is still valid. After
that combination, a single check for ro_rt == NULL is enough to decide
whether a new lookup needs to be done with a different ro_dst.
Make the route checking in gre stricter by repeating the loop check
after revalidation.
Remove some unused RADIX_MPATH code in in6_src.c. The logic is slightly
changed here to first validate the route and check RTF_GATEWAY
afterwards. This is sementically equivalent though.
etherip doesn't need sc_route_expire similiar to the gif changes from
dyoung@ earlier.

Based on the earlier patch from dyoung@, reviewed and discussed with

Revision 1.46 / (download) - annotate - [select for diffs], Sat Dec 9 05:33:07 2006 UTC (14 years, 1 month ago) by dyoung
Branch: MAIN
CVS Tags: yamt-splraiseipl-base3
Changes since 1.45: +10 -20 lines
Diff to previous 1.45 (colored)

Here are various changes designed to protect against bad IPv4
routing caused by stale route caches (struct route).  Route caches
are sprinkled throughout PCBs, the IP fast-forwarding table, and
IP tunnel interfaces (gre, gif, stf).

Stale IPv6 and ISO route caches will be treated by separate patches.

Thank you to Christoph Badura for suggesting the general approach
to invalidating route caches that I take here.

Here are the details:

Add hooks to struct domain for tracking and for invalidating each
domain's route caches: dom_rtcache, dom_rtflush, and dom_rtflushall.

Introduce helper subroutines, rtflush(ro) for invalidating a route
cache, rtflushall(family) for invalidating all route caches in a
routing domain, and rtcache(ro) for notifying the domain of a new
cached route.

Chain together all IPv4 route caches where ro_rt != NULL.  Provide
in_rtcache() for adding a route to the chain.  Provide in_rtflush()
and in_rtflushall() for invalidating IPv4 route caches.  In
in_rtflush(), set ro_rt to NULL, and remove the route from the
chain.  In in_rtflushall(), walk the chain and remove every route

In rtrequest1(), call rtflushall() to invalidate route caches when
a route is added.

In gif(4), discard the workaround for stale caches that involves
expiring them every so often.

Replace the pattern 'RTFREE(ro->ro_rt); ro->ro_rt = NULL;' with a
call to rtflush(ro).

Update ipflow_fastforward() and all other users of route caches so
that they expect a cached route, ro->ro_rt, to turn to NULL.

Take care when moving a 'struct route' to rtflush() the source and
to rtcache() the destination.

In domain initializers, use .dom_xxx tags.

KNF here and there.

Revision 1.45 / (download) - annotate - [select for diffs], Wed Jun 7 22:34:03 2006 UTC (14 years, 7 months ago) by kardel
Branch: MAIN
CVS Tags: yamt-splraiseipl-base2, yamt-splraiseipl-base, yamt-pdpolicy-base9, yamt-pdpolicy-base8, yamt-pdpolicy-base7, yamt-pdpolicy-base6, wrstuden-fixsa-newbase, wrstuden-fixsa-base-1, wrstuden-fixsa-base, wrstuden-fixsa, rpaulo-netinet-merge-pcb-base, netbsd-4-base, netbsd-4-0-RELEASE, netbsd-4-0-RC5, netbsd-4-0-RC4, netbsd-4-0-RC3, netbsd-4-0-RC2, netbsd-4-0-RC1, netbsd-4-0-1-RELEASE, netbsd-4-0, netbsd-4, matt-nb4-arm-base, matt-nb4-arm, gdamore-uart-base, gdamore-uart, chap-midi-nbase, chap-midi-base, abandoned-netbsd-4-base, abandoned-netbsd-4
Branch point for: yamt-splraiseipl, newlock2
Changes since 1.44: +4 -4 lines
Diff to previous 1.44 (colored)

merge FreeBSD timecounters from branch simonb-timecounters
- struct timeval time is gone
  time.tv_sec -> time_second
- struct timeval mono_time is gone
  mono_time.tv_sec -> time_uptime
- access to time via
	get* versions are fast but less precise
- support NTP nanokernel implementation (NTP API 4)
- further reading:
  Timecounter Paper:
  NTP Nanokernel:

Revision 1.44 / (download) - annotate - [select for diffs], Sun Dec 11 12:25:02 2005 UTC (15 years, 1 month ago) by christos
Branch: MAIN
CVS Tags: yamt-uio_vmspace-base5, yamt-uio_vmspace, yamt-pdpolicy-base5, yamt-pdpolicy-base4, yamt-pdpolicy-base3, yamt-pdpolicy-base2, yamt-pdpolicy-base, simonb-timecounters-base, peter-altq-base, peter-altq, elad-kernelauth-base, elad-kernelauth
Branch point for: yamt-pdpolicy, simonb-timecounters, rpaulo-netinet-merge-pcb, chap-midi
Changes since 1.43: +2 -2 lines
Diff to previous 1.43 (colored)

merge ktrace-lwp.

Revision 1.43 / (download) - annotate - [select for diffs], Sun Jun 26 10:39:21 2005 UTC (15 years, 7 months ago) by mlelstv
Branch: MAIN
CVS Tags: yamt-vop-base3, yamt-vop-base2, yamt-vop-base, yamt-vop, yamt-readahead-pervnode, yamt-readahead-perfile, yamt-readahead-base3, yamt-readahead-base2, yamt-readahead-base, yamt-readahead, thorpej-vnode-attr-base, thorpej-vnode-attr, ktrace-lwp-base
Branch point for: yamt-lazymbuf
Changes since 1.42: +13 -3 lines
Diff to previous 1.42 (colored)

expire cached route. Fixes PR 22792.

Revision 1.42 / (download) - annotate - [select for diffs], Thu Jun 2 15:21:35 2005 UTC (15 years, 7 months ago) by tron
Branch: MAIN
Changes since 1.41: +3 -3 lines
Diff to previous 1.41 (colored)

Change the first argument of the encapsulation check function from
"const struct mbuf *" to "struct mbuf *". Without this change the
actual implementation cannot even use m_copydata() on the mbuf chain
which is broken.

Revision 1.41 / (download) - annotate - [select for diffs], Thu Jun 2 10:54:58 2005 UTC (15 years, 7 months ago) by tron
Branch: MAIN
Changes since 1.40: +3 -4 lines
Diff to previous 1.40 (colored)

Remove type casts and lint directives which are now longer necessary
because the first argument of m_copydata() is "const struct mbuf *" now.

Revision 1.40 / (download) - annotate - [select for diffs], Sun May 29 21:43:51 2005 UTC (15 years, 7 months ago) by christos
Branch: MAIN
Changes since 1.39: +9 -10 lines
Diff to previous 1.39 (colored)

- avoid shadowed variables
- sprinkle const.

Revision 1.39 / (download) - annotate - [select for diffs], Sat Feb 26 22:45:12 2005 UTC (15 years, 10 months ago) by perry
Branch: MAIN
CVS Tags: yamt-km-base4, yamt-km-base3, netbsd-3-base, netbsd-3-0-RELEASE, netbsd-3-0-RC6, netbsd-3-0-RC5, netbsd-3-0-RC4, netbsd-3-0-RC3, netbsd-3-0-RC2, netbsd-3-0-RC1, netbsd-3-0-3-RELEASE, netbsd-3-0-2-RELEASE, netbsd-3-0-1-RELEASE, netbsd-3-0, kent-audio2-base
Branch point for: netbsd-3
Changes since 1.38: +3 -3 lines
Diff to previous 1.38 (colored)

nuke trailing whitespace

Revision 1.38 / (download) - annotate - [select for diffs], Thu Apr 22 01:01:41 2004 UTC (16 years, 9 months ago) by matt
Branch: MAIN
CVS Tags: yamt-km-base2, yamt-km-base, kent-audio1-beforemerge, kent-audio1-base, kent-audio1
Branch point for: yamt-km, kent-audio2
Changes since 1.37: +3 -3 lines
Diff to previous 1.37 (colored)

Constify protosw arrays.  This can reduce the kernel .data section by
over 4K (if all the network protocols) are loaded.

Revision 1.37 / (download) - annotate - [select for diffs], Thu Oct 30 01:43:09 2003 UTC (17 years, 2 months ago) by simonb
Branch: MAIN
CVS Tags: netbsd-2-base, netbsd-2-1-RELEASE, netbsd-2-1-RC6, netbsd-2-1-RC5, netbsd-2-1-RC4, netbsd-2-1-RC3, netbsd-2-1-RC2, netbsd-2-1-RC1, netbsd-2-1, netbsd-2-0-base, netbsd-2-0-RELEASE, netbsd-2-0-RC5, netbsd-2-0-RC4, netbsd-2-0-RC3, netbsd-2-0-RC2, netbsd-2-0-RC1, netbsd-2-0-3-RELEASE, netbsd-2-0-2-RELEASE, netbsd-2-0-1-RELEASE, netbsd-2-0
Branch point for: netbsd-2
Changes since 1.36: +2 -13 lines
Diff to previous 1.36 (colored)

Remove some assigned-to but otherwise unused variables.

Revision 1.36 / (download) - annotate - [select for diffs], Fri Sep 5 23:20:50 2003 UTC (17 years, 4 months ago) by itojun
Branch: MAIN
Changes since 1.35: +5 -3 lines
Diff to previous 1.35 (colored)

u_short -> u_int16_t.  sync w/ kame.
don't set ip6_plen where unneeded (i.e. before calling ip6_output)

Revision 1.35 / (download) - annotate - [select for diffs], Fri Aug 22 21:53:08 2003 UTC (17 years, 5 months ago) by itojun
Branch: MAIN
Changes since 1.34: +4 -4 lines
Diff to previous 1.34 (colored)

change the additional arg to be passed to ip{,6}_output to struct socket *.

this fixes KAME policy lookup which was broken by the previous commit.

Revision 1.34 / (download) - annotate - [select for diffs], Fri Aug 22 20:20:09 2003 UTC (17 years, 5 months ago) by jonathan
Branch: MAIN
Changes since 1.33: +6 -4 lines
Diff to previous 1.33 (colored)

Replace the set_socket() method of passing an extra struct socket*
argument to ip6_output() with a new explicit struct in6pcb* argument.
(The underlying socket can be obtained via in6pcb->inp6_socket.)

In preparation for fast-ipsec.  Reviewed by itojun.

Revision 1.33 / (download) - annotate - [select for diffs], Mon Nov 25 02:04:23 2002 UTC (18 years, 2 months ago) by thorpej
Branch: MAIN
CVS Tags: nathanw_sa_before_merge, nathanw_sa_base, gmcgarry_ucred_base, gmcgarry_ucred, gmcgarry_ctxsw_base, gmcgarry_ctxsw, fvdl_fs64_base
Branch point for: ktrace-lwp
Changes since 1.32: +3 -3 lines
Diff to previous 1.32 (colored)

Avoid strict-alias warnings.

Revision 1.32 / (download) - annotate - [select for diffs], Mon Nov 11 18:35:28 2002 UTC (18 years, 2 months ago) by itojun
Branch: MAIN
Changes since 1.31: +6 -7 lines
Diff to previous 1.31 (colored)

make USE_ENCAPCHECK (in netinet*/*gif.c) to global option, GIF_ENCAPCHECK.
#ifdef out unneeded code when possible.
From: Krister Walfridsson <>

Revision 1.31 / (download) - annotate - [select for diffs], Tue Nov 5 16:58:12 2002 UTC (18 years, 2 months ago) by itojun
Branch: MAIN
Changes since 1.30: +3 -3 lines
Diff to previous 1.30 (colored)

improve gif lookup performance, when there are many of those,
by using radix tree for lookups.  tested by yshimizu@iij.

Revision 1.30 / (download) - annotate - [select for diffs], Wed Sep 11 02:46:45 2002 UTC (18 years, 4 months ago) by itojun
Branch: MAIN
CVS Tags: kqueue-beforemerge, kqueue-base, kqueue-aftermerge
Changes since 1.29: +3 -3 lines
Diff to previous 1.29 (colored)

KNF - return is not a function.  sync w/kame.

Revision 1.29 / (download) - annotate - [select for diffs], Sun Jun 9 14:43:12 2002 UTC (18 years, 7 months ago) by itojun
Branch: MAIN
CVS Tags: gehenna-devsw-base
Changes since 1.28: +5 -5 lines
Diff to previous 1.28 (colored)

whitespace cleanup

Revision 1.28 / (download) - annotate - [select for diffs], Sat Jun 8 20:06:44 2002 UTC (18 years, 7 months ago) by itojun
Branch: MAIN
Changes since 1.27: +3 -3 lines
Diff to previous 1.27 (colored)

whitespace cleanup

Revision 1.27 / (download) - annotate - [select for diffs], Fri Dec 21 06:30:44 2001 UTC (19 years, 1 month ago) by itojun
Branch: MAIN
CVS Tags: newlock-base, newlock, netbsd-1-6-base, netbsd-1-6-RELEASE, netbsd-1-6-RC3, netbsd-1-6-RC2, netbsd-1-6-RC1, netbsd-1-6-PATCH002-RELEASE, netbsd-1-6-PATCH002-RC4, netbsd-1-6-PATCH002-RC3, netbsd-1-6-PATCH002-RC2, netbsd-1-6-PATCH002-RC1, netbsd-1-6-PATCH002, netbsd-1-6-PATCH001-RELEASE, netbsd-1-6-PATCH001-RC3, netbsd-1-6-PATCH001-RC2, netbsd-1-6-PATCH001-RC1, netbsd-1-6-PATCH001, netbsd-1-6, ifpoll-base, eeh-devprop-base, eeh-devprop
Branch point for: gehenna-devsw
Changes since 1.26: +73 -3 lines
Diff to previous 1.26 (colored)

use radix table for inbound tunnel lookup (would increase performance
for machines with a lot of tunnels).
update route cache for IPvX-over-IPv6 tunnel on path MTU discovery.
snyc with kame

Revision 1.26 / (download) - annotate - [select for diffs], Fri Dec 21 03:58:15 2001 UTC (19 years, 1 month ago) by itojun
Branch: MAIN
Changes since 1.25: +4 -2 lines
Diff to previous 1.25 (colored)

move in6_gif_hlim decl to in6_gif.c.  sync with kame

Revision 1.25 / (download) - annotate - [select for diffs], Fri Dec 21 03:21:51 2001 UTC (19 years, 1 month ago) by itojun
Branch: MAIN
Changes since 1.24: +11 -3 lines
Diff to previous 1.24 (colored)

move protosw fragment for gif/stf to their own source code.
reduce #ifdef in stf code.  sync with kame

Revision 1.24 / (download) - annotate - [select for diffs], Thu Dec 20 07:26:37 2001 UTC (19 years, 1 month ago) by itojun
Branch: MAIN
Changes since 1.23: +7 -5 lines
Diff to previous 1.23 (colored)

centralize multicast group management (in6_join/leavegroup).
have a flag for ip6_output() to fragment to minimum MTU.
sync with kame

Revision 1.23 / (download) - annotate - [select for diffs], Tue Nov 13 00:56:59 2001 UTC (19 years, 2 months ago) by lukem
Branch: MAIN
Changes since 1.22: +4 -1 lines
Diff to previous 1.22 (colored)

add RCSIDs

Revision 1.22 / (download) - annotate - [select for diffs], Thu Aug 16 17:45:26 2001 UTC (19 years, 5 months ago) by itojun
Branch: MAIN
CVS Tags: thorpej-mips-cache-base, thorpej-mips-cache, thorpej-devvp-base3, thorpej-devvp-base2, thorpej-devvp-base, thorpej-devvp, pre-chs-ubcperf, post-chs-ubcperf
Changes since 1.21: +2 -3 lines
Diff to previous 1.21 (colored)

gif interface now uses generic software interrupt
(on archs that support it).  also, make gif ALTQ-capable on outgoing.
sync with kame, comments from thorpej.

Revision 1.21 / (download) - annotate - [select for diffs], Sun Jul 29 05:08:33 2001 UTC (19 years, 5 months ago) by itojun
Branch: MAIN
Changes since 1.20: +93 -39 lines
Diff to previous 1.20 (colored)

sync gif interface code with latest kame.
IFF_RUNNING is clearified.  attach/detach logic is more clearner.
the old code mistakenly set IFF_UP by itself, now the behavior is gone.

Revision 1.20 / (download) - annotate - [select for diffs], Mon May 14 13:35:21 2001 UTC (19 years, 8 months ago) by itojun
Branch: MAIN
Branch point for: kqueue
Changes since 1.19: +8 -29 lines
Diff to previous 1.19 (colored)

drop multi destination mode (IFF_LINK0).

Revision 1.19 / (download) - annotate - [select for diffs], Thu May 10 01:37:42 2001 UTC (19 years, 8 months ago) by itojun
Branch: MAIN
Changes since 1.18: +11 -6 lines
Diff to previous 1.18 (colored)

correct ecn consideration on tunnel encap/decap.  sync with kame.

Revision 1.18 / (download) - annotate - [select for diffs], Tue Feb 20 10:41:48 2001 UTC (19 years, 11 months ago) by itojun
Branch: MAIN
CVS Tags: thorpej_scsipi_nbase, thorpej_scsipi_beforemerge, thorpej_scsipi_base
Branch point for: nathanw_sa
Changes since 1.17: +7 -1 lines
Diff to previous 1.17 (colored)

add AF_ISO case to output.  from chopps.

Revision 1.17 / (download) - annotate - [select for diffs], Tue Feb 20 08:49:16 2001 UTC (19 years, 11 months ago) by itojun
Branch: MAIN
Changes since 1.16: +8 -6 lines
Diff to previous 1.16 (colored)

ISO over IPv4/v6 by EON encapsulation.  from chopps, sync with kame.

Revision 1.16 / (download) - annotate - [select for diffs], Sun Feb 11 05:24:21 2001 UTC (19 years, 11 months ago) by itojun
Branch: MAIN
Changes since 1.15: +1 -13 lines
Diff to previous 1.15 (colored)

remove #ifdef __FreeBSD__.

Revision 1.15 / (download) - annotate - [select for diffs], Mon Jan 22 07:51:02 2001 UTC (20 years ago) by itojun
Branch: MAIN
Changes since 1.14: +14 -7 lines
Diff to previous 1.14 (colored)

make it possible to turn off ingress filter on gif/stf tunnel egress,
by using IFF_LINK2.  (part of) PR 11163 from Ken Raeburn.

Revision 1.14 / (download) - annotate - [select for diffs], Wed Apr 19 06:30:56 2000 UTC (20 years, 9 months ago) by itojun
Branch: MAIN
CVS Tags: netbsd-1-5-base, netbsd-1-5-RELEASE, netbsd-1-5-BETA2, netbsd-1-5-BETA, netbsd-1-5-ALPHA2, minoura-xpg4dl-base, minoura-xpg4dl
Branch point for: netbsd-1-5
Changes since 1.13: +99 -30 lines
Diff to previous 1.13 (colored)

introduce sys/netinet/ip_encap.c, to dispatch inbound packets
to protocol handlers, based on src/dst (for ip proto #4/41).
see comment in ip_encap.c for details of the problem we have.
there are too many protocol specs for ip proto #4/41.
backward compatibility with MROUTING case is now provided in ip_encap.c.

fix ipip to work with gif (using ip_encap.c).  sorry for breakage.

gif now uses ip_encap.c.

introduce stf pseudo interface (implements 6to4, another IPv6-over-IPv4 code
with ip proto #41).

Revision 1.13 / (download) - annotate - [select for diffs], Wed Mar 1 12:49:45 2000 UTC (20 years, 10 months ago) by itojun
Branch: MAIN
Changes since 1.12: +1 -5 lines
Diff to previous 1.12 (colored)

introduce m->m_pkthdr.aux to hold random data which needs to be passed
between protocol handlers.

ipsec socket pointers, ipsec decryption/auth information, tunnel
decapsulation information are in my mind - there can be several other usage.
at this moment, we use this for ipsec socket pointer passing.  this will
avoid reuse of m->m_pkthdr.rcvif in ipsec code.

due to the change, MHLEN will be decreased by sizeof(void *) - for example,
for i386, MHLEN was 100 bytes, but is now 96 bytes.
we may want to increase MSIZE from 128 to 256 for some of our architectures.

take caution if you use it for keeping some data item for long period
of time - use extra caution on M_PREPEND() or m_adj(), as they may result
in loss of m->m_pkthdr.aux pointer (and mbuf leak).

this will bump kernel version.

(as discussed in tech-net, tested in kame tree)

Revision 1.12 / (download) - annotate - [select for diffs], Mon Feb 7 06:15:17 2000 UTC (20 years, 11 months ago) by itojun
Branch: MAIN
CVS Tags: chs-ubc2-newbase
Changes since 1.11: +2 -2 lines
Diff to previous 1.11 (colored)


Revision 1.11 / (download) - annotate - [select for diffs], Sun Feb 6 12:49:44 2000 UTC (20 years, 11 months ago) by itojun
Branch: MAIN
Changes since 1.10: +3 -4 lines
Diff to previous 1.10 (colored)

fix include pathname for better rfc2292 compliance.

Revision 1.10 / (download) - annotate - [select for diffs], Thu Jan 6 15:46:09 2000 UTC (21 years ago) by itojun
Branch: MAIN
Changes since 1.9: +1 -9 lines
Diff to previous 1.9 (colored)

remove extra portability #ifdef (like #ifdef __FreeBSD__) in KAME IPv6/IPsec
code, from netbsd-current repository.
#ifdef'ed version is always available from

XXX please do not make too many diff-unfriendly changes, we'll need to take
bunch of diffs on upgrade...

Revision 1.9 / (download) - annotate - [select for diffs], Wed Dec 15 06:28:44 1999 UTC (21 years, 1 month ago) by itojun
Branch: MAIN
CVS Tags: wrstuden-devbsize-base, wrstuden-devbsize-19991221
Changes since 1.8: +3 -2 lines
Diff to previous 1.8 (colored)

do not overwrite traffic class field when we write IPv6 version field.

Revision 1.8 / (download) - annotate - [select for diffs], Mon Dec 13 15:17:22 1999 UTC (21 years, 1 month ago) by itojun
Branch: MAIN
Changes since 1.7: +11 -3 lines
Diff to previous 1.7 (colored)

sync IPv6 part with latest KAME tree.   IPsec part is left unmodified
due to massive changes in KAME side.
- IPv6 output goes through nd6_output
- faith can capture IPv4 packets as well - you can run IPv4-to-IPv6 translator
  using heavily modified DNS servers
- per-interface statistics (required for IPv6 MIB)
- interface autoconfig is revisited
- udp input handling has a big change for mapped address support.
- introduce in4_cksum() for non-overwriting checksumming
- introduce m_pulldown()
- neighbor discovery cleanups/improvements
- netinet/in.h strictly conforms to RFC2553 (no extra defs visible to userland)
- IFA_STATS is fixed a bit (not tested)
- and more more more.

- cleanup os-independency #ifdef
- avoid rcvif dual use (for IPsec) to help ifdetach

(sorry for jumbo commit, I can't separate this any more...)

Revision 1.7 / (download) - annotate - [select for diffs], Fri Aug 20 10:07:41 1999 UTC (21 years, 5 months ago) by itojun
Branch: MAIN
CVS Tags: fvdl-softdep-base, fvdl-softdep, comdex-fall-1999-base, comdex-fall-1999
Branch point for: wrstuden-devbsize, thorpej_scsipi
Changes since 1.6: +3 -1 lines
Diff to previous 1.6 (colored)

do not capture packets by gif, when gif interface is down.

Revision 1.6 / (download) - annotate - [select for diffs], Sat Jul 31 18:41:16 1999 UTC (21 years, 5 months ago) by itojun
Branch: MAIN
CVS Tags: chs-ubc2-base
Changes since 1.5: +3 -1 lines
Diff to previous 1.5 (colored)

sync with recent KAME.
- loosen ipsec restriction on packet diredtion.
- revise icmp6 redirect handling on IsRouter bit.
- tcp/udp notification processing (link-local address case)
- cosmetic fixes (better code share across *BSD).

Revision 1.5 / (download) - annotate - [select for diffs], Fri Jul 30 10:35:36 1999 UTC (21 years, 5 months ago) by itojun
Branch: MAIN
Changes since 1.4: +1 -2 lines
Diff to previous 1.4 (colored)

remove reference to in6_systm.h (file itself will be removed afterwords)

Revision 1.4 / (download) - annotate - [select for diffs], Fri Jul 9 22:57:26 1999 UTC (21 years, 6 months ago) by thorpej
Branch: MAIN
Changes since 1.3: +2 -1 lines
Diff to previous 1.3 (colored)

defopt IPSEC and IPSEC_ESP (both into opt_ipsec.h).

Revision 1.3 / (download) - annotate - [select for diffs], Sat Jul 3 21:30:18 1999 UTC (21 years, 6 months ago) by thorpej
Branch: MAIN
Changes since 1.2: +2 -0 lines
Diff to previous 1.2 (colored)

RCS ID police.

Revision 1.2 / (download) - annotate - [select for diffs], Thu Jul 1 08:12:53 1999 UTC (21 years, 6 months ago) by itojun
Branch: MAIN
Branch point for: chs-ubc2
Changes since 1.1: +293 -0 lines
Diff to previous 1.1 (colored)

IPv6 kernel code, based on KAME/NetBSD 1.4, SNAP kit 19990628.
(Sorry for a big commit, I can't separate this into several pieces...)
Pls check sys/netinet6/TODO and sys/netinet6/IMPLEMENTATION for details.

- sys/kern: do not assume single mbuf, accept chained mbuf on passing
  data from userland to kernel (or other way round).
- "midway" ATM card: ATM PVC pseudo device support, like those done in ALTQ
  package (
- sys/netinet/tcp*: IPv4/v6 dual stack tcp support.
- sys/netinet/{ip6,icmp6}.h, sys/net/pfkeyv2.h: IETF document assumes those
  file to be there so we patch it up.
- sys/netinet: IPsec additions are here and there.
- sys/netinet6/*: most of IPv6 code sits here.
- sys/netkey: IPsec key management code
- dev/pci/pcidevs: regen

In my understanding no code here is subject to export control so it
should be safe.

Revision 1.1, Mon Jun 28 06:37:04 1999 UTC (21 years, 7 months ago) by itojun
Branch: MAIN
Branch point for: kame

file in6_gif.c was initially added on branch kame.

This form allows you to request diff's between any two revisions of a file. You may select a symbolic revision name using the selection box or you may type in a numeric name using the type-in text box.

CVSweb <>