net/x25: netdev event handling
Subsystems (3)
Martin Schiller
maintainerv5 cover net/x25: netdev event handling
---
Changes to v4:
o also establish layer2 (LAPB) on NETDEV_UP events, if the carrier is already UP.
Changes to v3:
o another complete rework of the patch-set to split event handling for layer2 (LAPB) and layer3 (X.25)
Changes to v2:
o restructure complete patch-set
o keep netdev event handling in layer3 (X.25)
o add patch to fix lapb_connect_request() for DCE
o add patch to handle carrier loss correctly in lapb
o drop patch for x25_neighbour param handling
this may need fixes/cleanup and will be resubmitted later.
Changes to v1:
o fix 'subject_prefix' and 'checkpatch' warnings
---
Martin Schiller (5):
net/x25: handle additional netdev events net/lapb: support netdev events net/lapb: fix t1 timer handling for LAPB_STATE_0 net/x25: fix restart request/confirm handling net/x25: remove x25_kill_by_device()
net/lapb/lapb_iface.c | 94 +++++++++++++++++++++++++++++++++++++++++++ net/lapb/lapb_timer.c | 11 ++++- net/x25/af_x25.c | 38 ++++++++--------- net/x25/x25_link.c | 47 +++++++++++++++++----- net/x25/x25_route.c | 3 -- 5 files changed, 155 insertions(+), 38 deletions(-)
Signature · 1 line
2.20.1
Martin Schiller
maintainerPATCH v5 1/5 net/x25: handle additional netdev events
1. Add / remove x25_link_device by NETDEV_REGISTER/UNREGISTER and also by NETDEV_POST_TYPE_CHANGE/NETDEV_PRE_TYPE_CHANGE.
This change is needed so that the x25_neigh struct for an interface is already created when it shows up and is kept independently if the interface goes UP or DOWN.
This is used in an upcomming commit, where x25 params of an neighbour will get configurable through ioctls.
2. NETDEV_CHANGE event makes it possible to handle carrier loss and detection. If carrier is lost, clean up everything related to this neighbour by calling x25_link_terminated().
3. Also call x25_link_terminated() for NETDEV_DOWN events and remove the call to x25_clear_forward_by_dev() in x25_route_device_down(), as this is already called by x25_kill_by_neigh() which gets called by x25_link_terminated().
4. Do nothing for NETDEV_UP and NETDEV_GOING_DOWN events, as these will be handled in layer 2 (LAPB) and layer3 (X.25) will be informed by layer2 when layer2 link is established and layer3 link should be initiated.
--- net/x25/af_x25.c | 22 ++++++++++++++++------ net/x25/x25_link.c | 6 +++--- net/x25/x25_route.c | 3 --- 3 files changed, 19 insertions(+), 12 deletions(-)
net/x25/af_x25.c +16 -6
@@ -233,21 +233,31 @@ static int x25_device_event(struct notifier_block *this, unsigned long event,#endif ) {switch (event) { -case NETDEV_UP : +case NETDEV_REGISTER : +case NETDEV_POST_TYPE_CHANGE :x25_link_device_up (dev);break ; -case NETDEV_GOING_DOWN : +case NETDEV_DOWN : nb =x25_get_neigh (dev);if (nb) { -x25_terminate_link (nb); +x25_link_terminated (nb);x25_neigh_put (nb); } -break ; -case NETDEV_DOWN : -x25_kill_by_device (dev);x25_route_device_down (dev); +break ; +case NETDEV_PRE_TYPE_CHANGE : +case NETDEV_UNREGISTER :x25_link_device_down (dev);break ; +case NETDEV_CHANGE : +if (!netif_carrier_ok (dev)) { + nb =x25_get_neigh (dev); +if (nb) { +x25_link_terminated (nb); +x25_neigh_put (nb); + } + } +break ; } }
net/x25/x25_link.c +3 -3
@@ -232,6 +232,9 @@ void x25_link_established(struct x25_neigh *nb)void x25_link_terminated (struct x25_neigh *nb) { nb->state =X25_LINK_STATE_0 ; +skb_queue_purge (&nb->queue); +x25_stop_t20timer (nb); +/* Out of order: clear existing virtual calls (X.25 03/93 4.6.3) */ x25_kill_by_neigh (nb); }
@@ -277,9 +280,6 @@ void x25_link_device_up(struct net_device *dev)*/ static void __x25_remove_neigh (struct x25_neigh *nb) { -skb_queue_purge (&nb->queue); -x25_stop_t20timer (nb); -if (nb->node.next) {list_del (&nb->node);x25_neigh_put (nb);
net/x25/x25_route.c +0 -3
@@ -115,9 +115,6 @@ void x25_route_device_down(struct net_device *dev)__x25_remove_route (rt); }write_unlock_bh (&x25_route_list_lock); - -/* Remove any related forwarding */ -x25_clear_forward_by_dev (dev); }/*
Signature · 1 line
2.20.1
Martin Schiller
maintainerPATCH v5 2/5 net/lapb: support netdev events
In reply to Martin SchillerThis patch allows layer2 (LAPB) to react to netdev events itself and avoids the detour via layer3 (X.25).
1. Establish layer2 on NETDEV_UP events, if the carrier is already up.
2. Call lapb_disconnect_request() on NETDEV_GOING_DOWN events to signal the peer that the connection will go down.
(Only when the carrier is up.)
2. When a NETDEV_DOWN event occur, clear all queues, enter state LAPB_STATE_0 and stop all timers.
3. The NETDEV_CHANGE event makes it possible to handle carrier loss and detection.
In case of Carrier Loss, clear all queues, enter state LAPB_STATE_0 and stop all timers.
In case of Carrier Detection, we start timer t1 on a DCE interface, and on a DTE interface we change to state LAPB_STATE_1 and start sending SABM(E).
--- net/lapb/lapb_iface.c | 94 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 94 insertions(+)
net/lapb/lapb_iface.c +94 -0
@@ -418,14 +418,108 @@ int lapb_data_transmit(struct lapb_cb *lapb, struct sk_buff *skb)return used; } +/* Handle device status changes. */ +static int lapb_device_event (struct notifier_block *this,unsigned long event, +void *ptr) +{ +struct net_device *dev =netdev_notifier_info_to_dev (ptr); +struct lapb_cb *lapb; + +if (!net_eq (dev_net (dev), &init_net)) +return NOTIFY_DONE ; + +if (dev->type ==ARPHRD_X25 ) { +switch (event) { +case NETDEV_UP : +lapb_dbg (0 ,"(%p) Interface up: %s\n" , dev, + dev->name); + +if (netif_carrier_ok (dev)) { + lapb =lapb_devtostruct (dev); +if (!lapb) +break ; + +lapb_dbg (0 ,"(%p): Carrier is already up: %s\n" , + dev, dev->name); +if (lapb->mode &LAPB_DCE ) { +lapb_start_t1timer (lapb); + }else { +if (lapb->state ==LAPB_STATE_0 ) { + lapb->state =LAPB_STATE_1 ; +lapb_establish_data_link (lapb); + } + } + } +break ; +case NETDEV_GOING_DOWN : +if (netif_carrier_ok (dev)) +lapb_disconnect_request (dev); +break ; +case NETDEV_DOWN : + lapb =lapb_devtostruct (dev); +if (!lapb) +break ; + +lapb_dbg (0 ,"(%p) Interface down: %s\n" , dev, + dev->name); +lapb_dbg (0 ,"(%p) S%d -> S0\n" , dev, + lapb->state); +lapb_clear_queues (lapb); + lapb->state =LAPB_STATE_0 ; + lapb->n2count =0 ; +lapb_stop_t1timer (lapb); +lapb_stop_t2timer (lapb); +break ; +case NETDEV_CHANGE : + lapb =lapb_devtostruct (dev); +if (!lapb) +break ; + +if (netif_carrier_ok (dev)) { +lapb_dbg (0 ,"(%p): Carrier detected: %s\n" , + dev, dev->name); +if (lapb->mode &LAPB_DCE ) { +lapb_start_t1timer (lapb); + }else { +if (lapb->state ==LAPB_STATE_0 ) { + lapb->state =LAPB_STATE_1 ; +lapb_establish_data_link (lapb); + } + } + }else { +lapb_dbg (0 ,"(%p) Carrier lost: %s\n" , dev, + dev->name); +lapb_dbg (0 ,"(%p) S%d -> S0\n" , dev, + lapb->state); +lapb_clear_queues (lapb); + lapb->state =LAPB_STATE_0 ; + lapb->n2count =0 ; +lapb_stop_t1timer (lapb); +lapb_stop_t2timer (lapb); + } +break ; + } + } + +return NOTIFY_DONE ; +} + +static struct notifier_block lapb_dev_notifier = { + .notifier_call = lapb_device_event, +}; +static int __init lapb_init (void ) { +register_netdevice_notifier (&lapb_dev_notifier); +return 0 ; } static void __exit lapb_exit(void) {WARN_ON (!list_empty (&lapb_list)); + +unregister_netdevice_notifier (&lapb_dev_notifier); }MODULE_AUTHOR ("Jonathan Naylor <[email protected]>" );
Signature · 1 line
2.20.1
Martin Schiller
maintainerPATCH v5 3/5 net/lapb: fix t1 timer handling for LAPB_STATE_0
In reply to Martin Schiller1. DTE interface changes immediately to LAPB_STATE_1 and start sending SABM(E).
2. DCE interface sends N2-times DM and changes to LAPB_STATE_1 afterwards if there is no response in the meantime.
--- net/lapb/lapb_timer.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
net/lapb/lapb_timer.c +9 -2
@@ -85,11 +85,18 @@ static void lapb_t1timer_expiry(struct timer_list *t)switch (lapb->state) {/* -* If we are a DCE, keep going DM .. DM .. DM +* If we are a DCE, send DM up to N2 times, then switch to +* STATE_1 and send SABM(E). */ case LAPB_STATE_0 : -if (lapb->mode &LAPB_DCE ) +if (lapb->mode &LAPB_DCE && + lapb->n2count != lapb->n2) { + lapb->n2count++;lapb_send_control (lapb,LAPB_DM ,LAPB_POLLOFF ,LAPB_RESPONSE ); + }else { + lapb->state =LAPB_STATE_1 ; +lapb_establish_data_link (lapb); + }break ;/*
Signature · 1 line
2.20.1
Martin Schiller
maintainerPATCH v5 4/5 net/x25: fix restart request/confirm handling
In reply to Martin SchillerWe have to take the actual link state into account to handle restart requests/confirms well.
--- net/x25/x25_link.c | 41 +++++++++++++++++++++++++++++++++-------- 1 file changed, 33 insertions(+), 8 deletions(-)
net/x25/x25_link.c +33 -8
@@ -74,16 +74,43 @@ void x25_link_control(struct sk_buff *skb, struct x25_neigh *nb,switch (frametype) {case X25_RESTART_REQUEST : - confirm = !x25_t20timer_pending (nb); -x25_stop_t20timer (nb); - nb->state =X25_LINK_STATE_3 ; -if (confirm) +switch (nb->state) { +case X25_LINK_STATE_2 : + confirm = !x25_t20timer_pending (nb); +x25_stop_t20timer (nb); + nb->state =X25_LINK_STATE_3 ; +if (confirm) +x25_transmit_restart_confirmation (nb); +break ; +case X25_LINK_STATE_3 : +/* clear existing virtual calls */ +x25_kill_by_neigh (nb); +x25_transmit_restart_confirmation (nb); +break ; + }break ;case X25_RESTART_CONFIRMATION : -x25_stop_t20timer (nb); - nb->state =X25_LINK_STATE_3 ; +switch (nb->state) { +case X25_LINK_STATE_2 : +if (x25_t20timer_pending (nb)) { +x25_stop_t20timer (nb); + nb->state =X25_LINK_STATE_3 ; + }else { +x25_transmit_restart_request (nb); +x25_start_t20timer (nb); + } +break ; +case X25_LINK_STATE_3 : +/* clear existing virtual calls */ +x25_kill_by_neigh (nb); + +x25_transmit_restart_request (nb); + nb->state =X25_LINK_STATE_2 ; +x25_start_t20timer (nb); +break ; + }break ;case X25_DIAGNOSTIC :
@@ -214,8 +241,6 @@ void x25_link_established(struct x25_neigh *nb) {switch (nb->state) {case X25_LINK_STATE_0 : - nb->state =X25_LINK_STATE_2 ; -break ;case X25_LINK_STATE_1 :x25_transmit_restart_request (nb); nb->state =X25_LINK_STATE_2 ;
Signature · 1 line
2.20.1
Martin Schiller
maintainerPATCH v5 5/5 net/x25: remove x25_kill_by_device()
In reply to Martin SchillerRemove obsolete function x25_kill_by_device(). It's not used any more.
--- net/x25/af_x25.c | 16 ---------------- 1 file changed, 16 deletions(-)
net/x25/af_x25.c +0 -16
@@ -199,22 +199,6 @@ static void x25_remove_socket(struct sock *sk)write_unlock_bh (&x25_list_lock); } -/* -* Kill all bound sockets on a dropped device. -*/ -static void x25_kill_by_device (struct net_device *dev) -{ -struct sock *s; - -write_lock_bh (&x25_list_lock); - -sk_for_each (s, &x25_list) -if (x25_sk (s)->neighbour &&x25_sk (s)->neighbour->dev == dev) -x25_disconnect (s,ENETUNREACH ,0 ,0 ); - -write_unlock_bh (&x25_list_lock); -} -/* * Handle device status changes. */
Signature · 1 line
2.20.1
RE: [PATCH net-next v5 3/5] net/lapb: fix t1 timer handling for LAPB_STATE_0
In reply to Martin SchillerFrom: Martin Schiller
Quoted 7 lines
Sent: 24 November 2020 09:36
1. DTE interface changes immediately to
LAPB_STATE_1and start sending SABM(E).2. DCE interface sends N2-times DM and changes to
LAPB_STATE_1afterwards if there is no response in the meantime.
Seems reasonable.
It is 35 years since I wrote LAPB and I can't exactly remember what we did.
If I stole a copy of the code it's on a QIC-150 tape cartridge!
I really don't remember having a DTE/DCE option.
It is likely that LAPB came up sending DM (response without F) until level3 requested the link come up when it would send N2 SABM+P hoping to get a UA+F.
It would then send DM-F until a retry request was made.
We certainly had several different types of crossover connectors for DTE-DTE working.
David
Quoted 32 lines
Signed-off-by Martin Schiller <[email protected]>--- net/lapb/lapb_timer.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)net/lapb/lapb_timer.c +9
-3@@ -85,11 +85,18 @@ static void lapb_t1timer_expiry(struct timer_list *t)switch (lapb->state) {/* -* If we are a DCE, keep going DM .. DM .. DM +* If we are a DCE, send DM up to N2 times, then switch to +* STATE_1 and send SABM(E). */ case LAPB_STATE_0 : -if (lapb->mode &LAPB_DCE ) +if (lapb->mode &LAPB_DCE && + lapb->n2count != lapb->n2) { + lapb->n2count++;lapb_send_control (lapb,LAPB_DM ,LAPB_POLLOFF ,LAPB_RESPONSE ); + }else { + lapb->state =LAPB_STATE_1 ; +lapb_establish_data_link (lapb); + }break ;/* --
Quoted 1 line
2.20.1
-
Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK Registration No: 1397386 (Wales)
Martin Schiller
maintainerRe: [PATCH net-next v5 3/5] net/lapb: fix t1 timer handling for LAPB_STATE_0
Quoted 20 lines · David Laight
From: Martin Schiller
Quoted 7 lines
Sent: 24 November 2020 09:36
1. DTE interface changes immediately to
LAPB_STATE_1and start sending SABM(E).2. DCE interface sends N2-times DM and changes to
LAPB_STATE_1afterwards if there is no response in the meantime.Seems reasonable.
It is 35 years since I wrote LAPB and I can't exactly remember what we did.
If I stole a copy of the code it's on a QIC-150 tape cartridge!I really don't remember having a DTE/DCE option.
It is likely that LAPB came up sending DM (response without F) until level3 requested the link come up when it would send N2 SABM+P hoping to get a UA+F.
It would then send DM-F until a retry request was made.
Quoted 5 lines
We certainly had several different types of crossover connectors for DTE-DTE working.
David
The support for DTE/DCE was already in the LAPB code and I made it configurable from userspace (at least for hdlc interfaces) with this commit:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=f362e5fe0f1f
For Layer3 (X.25) I will add it with an addional patch (you already commented on that) on a next step.
The described behaviour above is my interpretation of point 2.4.4.1 of the "ITU-T Recommendation X.25 (10/96) aka "Blue Book" [1].
[1] https://www.itu.int/rec/T-REC-X.25-199610-I/
Quoted 39 lines
Quoted 31 lines
Signed-off-by Martin Schiller <[email protected]>--- net/lapb/lapb_timer.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)net/lapb/lapb_timer.c +9
-2@@ -85,11 +85,18 @@ static void lapb_t1timer_expiry(struct timer_list *t)switch (lapb->state) {/* -* If we are a DCE, keep going DM .. DM .. DM +* If we are a DCE, send DM up to N2 times, then switch to +* STATE_1 and send SABM(E). */ case LAPB_STATE_0 : -if (lapb->mode &LAPB_DCE ) +if (lapb->mode &LAPB_DCE && + lapb->n2count != lapb->n2) { + lapb->n2count++;lapb_send_control (lapb,LAPB_DM ,LAPB_POLLOFF ,LAPB_RESPONSE ); + }else { + lapb->state =LAPB_STATE_1 ; +lapb_establish_data_link (lapb); + }break ;Quoted 3 lines
/*
--
2.20.1-
Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK
Registration No: 1397386 (Wales)