Skip to contentSkip to conversation

net/x25: netdev event handling

PATCH Applied Martin Schiller 3 participants 15 messages Nov 26, 2020 – Dec 10, 2020

Subsystems (3)
lore
Share & tools
lore

Martin Schiller

author maintainer
#0 lore raw

v7 cover net/x25: netdev event handling

---

Changes to v6:
o integrated some code styling suggestions by Jakub.

Changes to v5:
o fix numbering in commit message of patch 2/5.

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 | 82 ++++++++++++++++++++++++++++++++++++++++++-
 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, 142 insertions(+), 39 deletions(-)
Signature · 1 line
2.20.1
author maintainer
#1 lore raw

PATCH v7 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
index 046d3fee66a9..313a6222ded9 100644
@@ -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
index fdae054b7dc1..11e868aa625d 100644
@@ -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
index 00e46c9a5280..ec2a39e9b3e6 100644
@@ -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
author maintainer
#2 lore raw

PATCH v7 2/5 net/lapb: support netdev events

In reply to Martin Schiller

This 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.)

3. When a NETDEV_DOWN event occur, clear all queues, enter state LAPB_STATE_0 and stop all timers.

4. 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 | 82 ++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 81 insertions(+), 1 deletion(-)
net/lapb/lapb_iface.c +81 -1
index 3c03f6512c5f..213ea7abc9ab 100644
@@ -418,14 +418,94 @@ 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)
+		return NOTIFY_DONE;
+
+	lapb = lapb_devtostruct(dev);
+	if (!lapb)
+		return NOTIFY_DONE;
+
+	switch (event) {
+	case NETDEV_UP:
+		lapb_dbg(0, "(%p) Interface up: %s\n", dev, dev->name);
+
+		if (netif_carrier_ok(dev)) {
+			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_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:
+		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)
 {
-	return 0;
+	return register_netdevice_notifier(&lapb_dev_notifier);
 }
 
 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
author maintainer
#4 lore raw

PATCH v7 3/5 net/lapb: fix t1 timer handling for LAPB_STATE_0

In reply to Martin Schiller

1. 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
index 8f5b17001a07..baa247fe4ed0 100644
@@ -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
author maintainer
#5 lore raw

PATCH v7 4/5 net/x25: fix restart request/confirm handling

In reply to Martin Schiller

We 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
index 11e868aa625d..f92073f3cb11 100644
@@ -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
author maintainer
#13 lore raw

PATCH v7 5/5 net/x25: remove x25_kill_by_device()

In reply to Martin Schiller

Remove 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
index 313a6222ded9..1432a05805ab 100644
@@ -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
maintainer Applied
#14 lore raw
In reply to Martin Schiller
Quoted 22 lines · On Thu, 26 Nov 2020 07:35:52 +0100 Martin Schiller wrote:

Changes to v6:
o integrated some code styling suggestions by Jakub.

Changes to v5:
o fix numbering in commit message of patch 2/5.

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.

Quoted 2 lines

Changes to v1:
o fix 'subject_prefix' and 'checkpatch' warnings

Applied, thank you!

#6 lore raw

Re: [PATCH net-next v7 4/5] net/x25: fix restart request/confirm handling

In reply to Martin Schiller

net/x25/x25_link.c void x25_link_established(struct x25_neigh *nb) · line 246

Quoted 13 lines · Martin Schiller

We have to take the actual link state into account to handle restart requests/confirms well.

net/x25/x25_link.c +0 -2
@@ -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;

What is the reason for this change? Originally only the connecting side will transmit a Restart Request; the connected side will not and will only wait for the Restart Request to come. Now both sides will transmit Restart Requests at the same time. I think we should better avoid collision situations like this.

#7 lore raw

Re: [PATCH net-next v7 4/5] net/x25: fix restart request/confirm handling

Quoted 11 lines · Xie He

net/x25/x25_link.c void x25_link_established(struct x25_neigh *nb) · line 246

Quoted 8 lines · Martin Schiller
        switch (nb->state) {
        case X25_LINK_STATE_0:
net/x25/x25_link.c +0 -2
-               nb->state = X25_LINK_STATE_2;
-               break;
        case X25_LINK_STATE_1:
                x25_transmit_restart_request(nb);
                nb->state = X25_LINK_STATE_2;
Quoted 5 lines

What is the reason for this change? Originally only the connecting side will transmit a Restart Request; the connected side will not and will only wait for the Restart Request to come. Now both sides will transmit Restart Requests at the same time. I think we should better avoid collision situations like this.

Oh. I see. Because in other patches we are giving L2 the ability to connect by itself, both sides can now appear here to be the "connected" side. So we can't make the "connected" side wait as we did before.

author maintainer
#8 lore raw

Re: [PATCH net-next v7 4/5] net/x25: fix restart request/confirm handling

Quoted 18 lines · Xie He
Quoted 11 lines · Xie He

net/x25/x25_link.c void x25_link_established(struct x25_neigh *nb) · line 246

Quoted 8 lines · Martin Schiller
        switch (nb->state) {
        case X25_LINK_STATE_0:
net/x25/x25_link.c +0 -2
-               nb->state = X25_LINK_STATE_2;
-               break;
        case X25_LINK_STATE_1:
                x25_transmit_restart_request(nb);
                nb->state = X25_LINK_STATE_2;
Quoted 5 lines

What is the reason for this change? Originally only the connecting side will transmit a Restart Request; the connected side will not and will only wait for the Restart Request to come. Now both sides will transmit Restart Requests at the same time. I think we should better avoid collision situations like this.

Quoted 4 lines

Oh. I see. Because in other patches we are giving L2 the ability to connect by itself, both sides can now appear here to be the "connected" side. So we can't make the "connected" side wait as we did before.

Right.
By the way: A "Restart Collision" is in practice a very common event to establish the Layer 3.

#9 lore raw

Re: [PATCH net-next v7 4/5] net/x25: fix restart request/confirm handling

Quoted 4 lines · Martin Schiller

Right.
By the way: A "Restart Collision" is in practice a very common event to establish the Layer 3.

Oh, I see. Thanks!

#10 lore raw

Re: [PATCH net-next v7 4/5] net/x25: fix restart request/confirm handling

Quoted 8 lines · Xie He
Quoted 4 lines · Martin Schiller

Right.
By the way: A "Restart Collision" is in practice a very common event to establish the Layer 3.

Oh, I see. Thanks!

Hi Martin,

When you submit future patch series, can you try ensuring the code to be in a completely working state after each patch in the series? This makes reviewing the patches easier. After the patches get applied, this also makes tracing bugs (for example, with "git bisect") through the commit history easier.

author maintainer
#11 lore raw

Re: [PATCH net-next v7 4/5] net/x25: fix restart request/confirm handling

Quoted 10 lines · Xie He
Quoted 8 lines · Xie He
Quoted 4 lines · Martin Schiller

Right.
By the way: A "Restart Collision" is in practice a very common event to establish the Layer 3.

Oh, I see. Thanks!

Quoted 7 lines

Hi Martin,

When you submit future patch series, can you try ensuring the code to be in a completely working state after each patch in the series? This makes reviewing the patches easier. After the patches get applied, this also makes tracing bugs (for example, with "git bisect") through the commit history easier.

Well I thought that's what patch series are for:
Send patches that belong together and should be applied together.

Of course I will try to make each patch work on its own, but this is not always possible with major changes or ends up in monster patches. And nobody wants that.

Martin

#12 lore raw

Re: [PATCH net-next v7 4/5] net/x25: fix restart request/confirm handling

Quoted 9 lines · Martin Schiller
Quoted 8 lines

Hi Martin,

When you submit future patch series, can you try ensuring the code to be in a completely working state after each patch in the series? This makes reviewing the patches easier. After the patches get applied, this also makes tracing bugs (for example, with "git bisect") through the commit history easier.

Quoted 6 lines

Well I thought that's what patch series are for:
Send patches that belong together and should be applied together.

Of course I will try to make each patch work on its own, but this is not always possible with major changes or ends up in monster patches. And nobody wants that.

Thanks! I admit that this series is a big change and is not easy to split up properly. If I were you, I may end up sending a very big patch first, and then follow up with small patches for "restart request/confirm handling" and "add/remove x25_neigh on device-register/unregister instead of device-up/down". (The little change in x25_link_established should belong to the first big patch instead of "restart request/confirm handling".)

But making each patch work on its own is indeed preferable. I see
https://www.kernel.org/doc/html/latest/process/submitting-patches.html
says:
When dividing your change into a series of patches, take special care to ensure that the kernel builds and runs properly after each patch in the series. Developers using git bisect to track down a problem can end up splitting your patch series at any point; they will not thank you if you introduce bugs in the middle.