Skip to contentSkip to conversation

wan: remove stale Kconfig entries

PATCH In review Arnd Bergmann 6 participants 12 messages Dec 9, 2019 – Dec 11, 2019

Subsystems (7)
lore
Share & tools
lore
#0 lore raw

PATCH 1/4 wan: remove stale Kconfig entries

The dscc4 driver was recently removed, but these
Kconfig entries remain, so remove them as well.

Fixes 28c9eb9042a9 ("net/wan: dscc4: remove broken dscc4 driver")
---
 drivers/net/wan/Kconfig | 24 ------------------------
 1 file changed, 24 deletions(-)
drivers/net/wan/Kconfig +0 -24
index bf2fe1d602ea..59b25d7e13e8 100644
@@ -289,30 +289,6 @@ config SLIC_DS26522
 	  To compile this driver as a module, choose M here: the
 	  module will be called slic_ds26522.
 
-config DSCC4_PCISYNC
-	bool "Etinc PCISYNC features"
-	depends on DSCC4
-	help
-	  Due to Etinc's design choice for its PCISYNC cards, some operations
-	  are only allowed on specific ports of the DSCC4. This option is the
-	  only way for the driver to know that it shouldn't return a success
-	  code for these operations.
-
-	  Please say Y if your card is an Etinc's PCISYNC.
-
-config DSCC4_PCI_RST
-	bool "Hard reset support"
-	depends on DSCC4
-	help
-	  Various DSCC4 bugs forbid any reliable software reset of the ASIC.
-	  As a replacement, some vendors provide a way to assert the PCI #RST
-	  pin of DSCC4 through the GPIO port of the card. If you choose Y,
-	  the driver will make use of this feature before module removal
-	  (i.e. rmmod). The feature is known to be available on Commtech's
-	  cards. Contact your manufacturer for details.
-
-	  Say Y if your card supports this feature.
-
 config IXP4XX_HSS
 	tristate "Intel IXP4xx HSS (synchronous serial port) support"
 	depends on HDLC && IXP4XX_NPE && IXP4XX_QMGR
Signature · 1 line
2.20.0
#1 lore raw

PATCH 2/4 wan: remove sbni/granch driver

The driver was merged in 1999 and has only ever seen treewide cleanups since then, with no indication whatsoever that anyone has actually had access to hardware for testing the patches.

From the information in the link below, it appears that the hardware is for some leased line system in Russia that has since been discontinued.

As the driver still feels like a Linux-2.2 era artifact today, it appears that the best way forward is to just delete it.

---
 .../admin-guide/kernel-parameters.txt         |    2 -
 drivers/net/Space.c                           |    4 -
 drivers/net/wan/Kconfig                       |   28 -
 drivers/net/wan/Makefile                      |    1 -
 drivers/net/wan/sbni.c                        | 1623 -----------------
 drivers/net/wan/sbni.h                        |  147 --
 include/net/Space.h                           |    3 -
 7 files changed, 1808 deletions(-)
 delete mode 100644 drivers/net/wan/sbni.c
 delete mode 100644 drivers/net/wan/sbni.h
Documentation/admin-guide/kernel-parameters.txt +0 -2
index a84a83f8881e..2161e4f93e17 100644
@@ -4264,8 +4264,6 @@
 	sa1100ir	[NET]
 			See drivers/net/irda/sa1100_ir.c.
 
-	sbni=		[NET] Granch SBNI12 leased line adapter
-
 	sched_debug	[KNL] Enables verbose scheduler debug messages.
 
 	schedstats=	[KNL,X86] Enable or disable scheduled statistics.
drivers/net/Space.c +0 -4
index 890c86e11bcc..7bb699d7c422 100644
@@ -133,10 +133,6 @@ static int __init net_olddevs_init(void)
 {
 	int num;
 
-#ifdef CONFIG_SBNI
-	for (num = 0; num < 8; ++num)
-		sbni_probe(num);
-#endif
 	for (num = 0; num < 8; ++num)
 		ethif_probe2(num);
 
drivers/net/wan/Kconfig +0 -28
index 59b25d7e13e8..e9ad63115144 100644
@@ -374,32 +374,4 @@ config X25_ASY
 
 	  If unsure, say N.
 
-config SBNI
-	tristate "Granch SBNI12 Leased Line adapter support"
-	depends on X86
-	---help---
-	  Driver for ISA SBNI12-xx cards which are low cost alternatives to
-	  leased line modems.
-
-	  You can find more information and last versions of drivers and
-	  utilities at <http://www.granch.ru/>. If you have any question you
-	  can send email to <[email protected]>.
-
-	  To compile this driver as a module, choose M here: the
-	  module will be called sbni.
-
-	  If unsure, say N.
-
-config SBNI_MULTILINE
-	bool "Multiple line feature support"
-	depends on SBNI
-	help
-	  Schedule traffic for some parallel lines, via SBNI12 adapters.
-
-	  If you have two computers connected with two parallel lines it's
-	  possible to increase transfer rate nearly twice. You should have
-	  a program named 'sbniconfig' to configure adapters.
-
-	  If unsure, say N.
-
 endif # WAN
drivers/net/wan/Makefile +0 -1
index 701f5d2fe3b6..3059b9a279b3 100644
@@ -25,7 +25,6 @@ obj-$(CONFIG_LANMEDIA)		+= lmc/
 obj-$(CONFIG_DLCI)		+= dlci.o 
 obj-$(CONFIG_SDLA)		+= sdla.o
 obj-$(CONFIG_LAPBETHER)		+= lapbether.o
-obj-$(CONFIG_SBNI)		+= sbni.o
 obj-$(CONFIG_N2)		+= n2.o
 obj-$(CONFIG_C101)		+= c101.o
 obj-$(CONFIG_WANXL)		+= wanxl.o
drivers/net/wan/sbni.c deleted +0 -1623

1,623 lines not on this page · raw message

drivers/net/wan/sbni.h deleted +0 -147

147 lines not on this page · raw message

include/net/Space.h +0 -3
index 9cce0d80d37a..475fe96574e5 100644
@@ -25,6 +25,3 @@ struct net_device *ltpc_probe(void);
 
 /* Fibre Channel adapters */
 int iph5526_probe(struct net_device *dev);
-
-/* SBNI adapters */
-int sbni_probe(int unit);
Signature · 1 line
2.20.0
#2 lore raw

PATCH 3/4 wan: remove old frame relay driver

In reply to Arnd Bergmann

The DLCI framework and SDLA driver are as obsolete as it gets, this is an ISA add-on card from the mid-1990s that has only seen sporadic cleanups.

The website listed for downloading the user space tools has dropped off the internet at some point around 2010, but Debian already dropped the packages ten years earlier when they no longer built correctly.

---
 Documentation/networking/framerelay.txt |   39 -
 MAINTAINERS                             |    6 -
 drivers/net/wan/Kconfig                 |   45 -
 drivers/net/wan/Makefile                |    2 -
 drivers/net/wan/dlci.c                  |  542 --------
 drivers/net/wan/sdla.c                  | 1655 -----------------------
 include/Kbuild                          |    1 -
 include/linux/if_frad.h                 |   92 --
 include/linux/sdla.h                    |  240 ----
 include/uapi/linux/if_frad.h            |  123 --
 include/uapi/linux/sdla.h               |  117 --
 net/socket.c                            |   25 -
 12 files changed, 2887 deletions(-)
 delete mode 100644 Documentation/networking/framerelay.txt
 delete mode 100644 drivers/net/wan/dlci.c
 delete mode 100644 drivers/net/wan/sdla.c
 delete mode 100644 include/linux/if_frad.h
 delete mode 100644 include/linux/sdla.h
 delete mode 100644 include/uapi/linux/if_frad.h
 delete mode 100644 include/uapi/linux/sdla.h
Documentation/networking/framerelay.txt deleted +0 -39
deleted file mode 100644
index 1a0b720440dd..000000000000
@@ -1,39 +0,0 @@
-Frame Relay (FR) support for linux is built into a two tiered system of device 
-drivers.  The upper layer implements RFC1490 FR specification, and uses the
-Data Link Connection Identifier (DLCI) as its hardware address.  Usually these
-are assigned by your network supplier, they give you the number/numbers of
-the Virtual Connections (VC) assigned to you.
-
-Each DLCI is a point-to-point link between your machine and a remote one.
-As such, a separate device is needed to accommodate the routing.  Within the
-net-tools archives is 'dlcicfg'.  This program will communicate with the
-base "DLCI" device, and create new net devices named 'dlci00', 'dlci01'... 
-The configuration script will ask you how many DLCIs you need, as well as
-how many DLCIs you want to assign to each Frame Relay Access Device (FRAD).
-
-The DLCI uses a number of function calls to communicate with the FRAD, all
-of which are stored in the FRAD's private data area.  assoc/deassoc, 
-activate/deactivate and dlci_config.  The DLCI supplies a receive function
-to the FRAD to accept incoming packets.
-
-With this initial offering, only 1 FRAD driver is available.  With many thanks
-to Sangoma Technologies, David Mandelstam & Gene Kozin, the S502A, S502E & 
-S508 are supported.  This driver is currently set up for only FR, but as 
-Sangoma makes more firmware modules available, it can be updated to provide
-them as well.
-
-Configuration of the FRAD makes use of another net-tools program, 'fradcfg'.
-This program makes use of a configuration file (which dlcicfg can also read)
-to specify the types of boards to be configured as FRADs, as well as perform
-any board specific configuration.  The Sangoma module of fradcfg loads the
-FR firmware into the card, sets the irq/port/memory information, and provides
-an initial configuration.
-
-Additional FRAD device drivers can be added as hardware is available.
-
-At this time, the dlcicfg and fradcfg programs have not been incorporated into
-the net-tools distribution.  They can be found at ftp.invlogic.com, in 
-/pub/linux.  Note that with OS/2 FTPD, you end up in /pub by default, so just
-use 'cd linux'.  v0.10 is for use on pre-2.0.3 and earlier, v0.15 is for 
-pre-2.0.4 and later.
-
MAINTAINERS +0 -6
index 0a996ac26047..32fab6fbd301 100644
@@ -6436,12 +6436,6 @@ W:	http://floatingpoint.sourceforge.net/emulator/index.html
 S:	Maintained
 F:	arch/x86/math-emu/
 
-FRAME RELAY DLCI/FRAD (Sangoma drivers too)
-L:	[email protected]
-S:	Orphan
-F:	drivers/net/wan/dlci.c
-F:	drivers/net/wan/sdla.c
-
 FRAMEBUFFER LAYER
 M:	Bartlomiej Zolnierkiewicz <[email protected]>
 L:	[email protected]
drivers/net/wan/Kconfig +0 -45

51 lines not on this page · raw message

drivers/net/wan/Makefile +0 -2
index 3059b9a279b3..4438a0c4a272 100644
@@ -22,8 +22,6 @@ obj-$(CONFIG_X25_ASY)		+= x25_asy.o
 
 obj-$(CONFIG_LANMEDIA)		+= lmc/
 
-obj-$(CONFIG_DLCI)		+= dlci.o 
-obj-$(CONFIG_SDLA)		+= sdla.o
 obj-$(CONFIG_LAPBETHER)		+= lapbether.o
 obj-$(CONFIG_N2)		+= n2.o
 obj-$(CONFIG_C101)		+= c101.o
drivers/net/wan/dlci.c deleted +0 -542

542 lines not on this page · raw message

drivers/net/wan/sdla.c deleted +0 -1655

1,655 lines not on this page · raw message

include/Kbuild +0 -1
index ffba79483cc5..64ab3aac7379 100644
@@ -205,7 +205,6 @@ header-test-			+= linux/i3c/master.h
 header-test-			+= linux/i8042.h
 header-test-			+= linux/ide.h
 header-test-			+= linux/idle_inject.h
-header-test-			+= linux/if_frad.h
 header-test-			+= linux/if_rmnet.h
 header-test-			+= linux/if_tap.h
 header-test-			+= linux/iio/accel/kxcjk_1013.h
include/linux/if_frad.h deleted +0 -92

92 lines not on this page · raw message

include/linux/sdla.h deleted +0 -240

240 lines not on this page · raw message

include/uapi/linux/if_frad.h deleted +0 -123

123 lines not on this page · raw message

include/uapi/linux/sdla.h deleted +0 -117

117 lines not on this page · raw message

net/socket.c +0 -25
index 250dda239a15..ac3ad20953c4 100644
@@ -64,7 +64,6 @@
 #include <linux/seq_file.h>
 #include <linux/mutex.h>
 #include <linux/if_bridge.h>
-#include <linux/if_frad.h>
 #include <linux/if_vlan.h>
 #include <linux/ptp_classify.h>
 #include <linux/init.h>
@@ -1019,17 +1018,6 @@ void vlan_ioctl_set(int (*hook) (struct net *, void __user *))
 }
 EXPORT_SYMBOL(vlan_ioctl_set);
 
-static DEFINE_MUTEX(dlci_ioctl_mutex);
-static int (*dlci_ioctl_hook) (unsigned int, void __user *);
-
-void dlci_ioctl_set(int (*hook) (unsigned int, void __user *))
-{
-	mutex_lock(&dlci_ioctl_mutex);
-	dlci_ioctl_hook = hook;
-	mutex_unlock(&dlci_ioctl_mutex);
-}
-EXPORT_SYMBOL(dlci_ioctl_set);
-
 static long sock_do_ioctl(struct net *net, struct socket *sock,
 			  unsigned int cmd, unsigned long arg)
 {
@@ -1148,17 +1136,6 @@ static long sock_ioctl(struct file *file, unsigned cmd, unsigned long arg)
 				err = vlan_ioctl_hook(net, argp);
 			mutex_unlock(&vlan_ioctl_mutex);
 			break;
-		case SIOCADDDLCI:
-		case SIOCDELDLCI:
-			err = -ENOPKG;
-			if (!dlci_ioctl_hook)
-				request_module("dlci");
-
-			mutex_lock(&dlci_ioctl_mutex);
-			if (dlci_ioctl_hook)
-				err = dlci_ioctl_hook(cmd, argp);
-			mutex_unlock(&dlci_ioctl_mutex);
-			break;
 		case SIOCGSKNS:
 			err = -EPERM;
 			if (!ns_capable(net->user_ns, CAP_NET_ADMIN))
@@ -3403,8 +3380,6 @@ static int compat_sock_ioctl_trans(struct file *file, struct socket *sock,
 	case SIOCBRDELBR:
 	case SIOCGIFVLAN:
 	case SIOCSIFVLAN:
-	case SIOCADDDLCI:
-	case SIOCDELDLCI:
 	case SIOCGSKNS:
 	case SIOCGSTAMP_NEW:
 	case SIOCGSTAMPNS_NEW:
Signature · 1 line
2.20.0
#3 lore raw

RFC PATCH 4/4 staging/net: move AF_X25 into drivers/staging

In reply to Arnd Bergmann

syzbot keeps finding issues in the X.25 implementation that nobody is interested in fixing. Given that all the x25 patches of the past years that are not global cleanups tend to fix user-triggered oopses, is it time to just retire the subsystem?

I looked a bit closer and found:

- we used to support x25 hardware in linux, but with WAN_ROUTER removed in linux-3.9 and isdn4linux removed in 5.3, there is only hdlc, ethernet and the N_X25 tty ldisc left. Out of these, only HDLC_X25 made it beyond the experimental stage, so this is probably what everyone uses if there are users at all.

- The most common hdlc hardware that people seem to be using are the "farsync" PCIe and USB adapters. Linux only has drivers for the older PCI devices from that series, but no hardware that works on modern systems.

- The manufacturer still updates their own kernel drivers and provides support, but ships that with a fork or rewrite of the subsystem code now. Kevin Curtis is also listed as maintainer, but appears to have given up in 2013 after [1].

- The most popular software implementation appears to be X25 over TCP (XOT), which is supported by Farsite and other out-of-tree stacks but never had an implementation in mainline.

- Most other supported HDLC hardware that we supoprt is for the ISA or PCI buses. There are newer PCIe or USB devices, but those all require a custom device driver and often a custom subsystem, none of which got submitted for mainline inclusion. This includes hardware from Microgate (SyncLink), Comtrol (RocketPort Express) and Sealevel (SeaMAC).

- The X.25 subsystem is listed as "odd fixes", but the last reply on the netdev mailing list from the maintainer was also in 2013[2].

- The HDLC subsystem itself is listed as maintained by Krzysztof Halasa, and there were new drivers merged for SoC based devices as late as 2016 by Zhao Qiang: Freescale/NXP QUICC Engine and Maxim ds26522. There has not been much work on HDLC or drivers/net/wan recently, but both developers are still responsive on the mailing list and work on other parts of the kernel.

Based on the above, I would conclude that X.25 can probably get moved to staging as keeping it in the kernel seems to do more harm than good, but HDLC below it should probably stay as there it seems there are still users of a small subset of the mainline drivers.

Move all of X.25 into drivers/staging for now, with a projected removal date set for Linux-5.8.

----

If anyone has different views or additional information, let us know.

If you agree with the above, please Ack.

---
 MAINTAINERS                                   |  8 +-
 drivers/net/wan/Kconfig                       | 43 --------
 drivers/net/wan/Makefile                      |  3 -
 drivers/staging/Kconfig                       |  2 +
 drivers/staging/Makefile                      |  2 +
 .../x25/Documentation}/lapb-module.txt        |  0
 .../staging/x25/Documentation}/x25-iface.txt  |  0
 .../staging/x25/Documentation}/x25.txt        |  0
 drivers/staging/x25/Kconfig                   | 97 +++++++++++++++++++
 {net => drivers/staging}/x25/Makefile         |  8 ++
 drivers/staging/x25/TODO                      | 15 +++
 {net => drivers/staging}/x25/af_x25.c         |  2 +-
 drivers/{net/wan => staging/x25}/hdlc_x25.c   |  2 +-
 {include/net => drivers/staging/x25}/lapb.h   |  2 +-
 .../lapb => drivers/staging/x25}/lapb_iface.c |  2 +-
 {net/lapb => drivers/staging/x25}/lapb_in.c   |  2 +-
 {net/lapb => drivers/staging/x25}/lapb_out.c  |  2 +-
 {net/lapb => drivers/staging/x25}/lapb_subr.c |  2 +-
 .../lapb => drivers/staging/x25}/lapb_timer.c |  2 +-
 drivers/{net/wan => staging/x25}/lapbether.c  |  2 +-
 .../staging/x25/linux-lapb.h                  |  0
 {net => drivers/staging}/x25/sysctl_net_x25.c |  2 +-
 .../x25.h => drivers/staging/x25/uapi-x25.h   |  0
 {include/net => drivers/staging/x25}/x25.h    |  2 +-
 drivers/{net/wan => staging/x25}/x25_asy.c    |  2 +-
 drivers/{net/wan => staging/x25}/x25_asy.h    |  0
 {net => drivers/staging}/x25/x25_dev.c        |  2 +-
 {net => drivers/staging}/x25/x25_facilities.c |  2 +-
 {net => drivers/staging}/x25/x25_forward.c    |  2 +-
 {net => drivers/staging}/x25/x25_in.c         |  2 +-
 {net => drivers/staging}/x25/x25_link.c       |  2 +-
 {net => drivers/staging}/x25/x25_out.c        |  2 +-
 {net => drivers/staging}/x25/x25_proc.c       |  2 +-
 {net => drivers/staging}/x25/x25_route.c      |  2 +-
 {net => drivers/staging}/x25/x25_subr.c       |  2 +-
 {net => drivers/staging}/x25/x25_timer.c      |  2 +-
 include/Kbuild                                |  2 -
 net/Kconfig                                   |  2 -
 net/Makefile                                  |  2 -
 net/lapb/Kconfig                              | 22 -----
 net/lapb/Makefile                             |  8 --
 net/x25/Kconfig                               | 34 -------
 42 files changed, 148 insertions(+), 144 deletions(-)
 rename {Documentation/networking => drivers/staging/x25/Documentation}/lapb-module.txt (100%)
 rename {Documentation/networking => drivers/staging/x25/Documentation}/x25-iface.txt (100%)
 rename {Documentation/networking => drivers/staging/x25/Documentation}/x25.txt (100%)
 create mode 100644 drivers/staging/x25/Kconfig
 rename {net => drivers/staging}/x25/Makefile (58%)
 create mode 100644 drivers/staging/x25/TODO
 rename {net => drivers/staging}/x25/af_x25.c (99%)
 rename drivers/{net/wan => staging/x25}/hdlc_x25.c (99%)
 rename {include/net => drivers/staging/x25}/lapb.h (99%)
 rename {net/lapb => drivers/staging/x25}/lapb_iface.c (99%)
 rename {net/lapb => drivers/staging/x25}/lapb_in.c (99%)
 rename {net/lapb => drivers/staging/x25}/lapb_out.c (99%)
 rename {net/lapb => drivers/staging/x25}/lapb_subr.c (99%)
 rename {net/lapb => drivers/staging/x25}/lapb_timer.c (99%)
 rename drivers/{net/wan => staging/x25}/lapbether.c (99%)
 rename include/linux/lapb.h => drivers/staging/x25/linux-lapb.h (100%)
 rename {net => drivers/staging}/x25/sysctl_net_x25.c (98%)
 rename include/uapi/linux/x25.h => drivers/staging/x25/uapi-x25.h (100%)
 rename {include/net => drivers/staging/x25}/x25.h (99%)
 rename drivers/{net/wan => staging/x25}/x25_asy.c (99%)
 rename drivers/{net/wan => staging/x25}/x25_asy.h (100%)
 rename {net => drivers/staging}/x25/x25_dev.c (99%)
 rename {net => drivers/staging}/x25/x25_facilities.c (99%)
 rename {net => drivers/staging}/x25/x25_forward.c (99%)
 rename {net => drivers/staging}/x25/x25_in.c (99%)
 rename {net => drivers/staging}/x25/x25_link.c (99%)
 rename {net => drivers/staging}/x25/x25_out.c (99%)
 rename {net => drivers/staging}/x25/x25_proc.c (99%)
 rename {net => drivers/staging}/x25/x25_route.c (99%)
 rename {net => drivers/staging}/x25/x25_subr.c (99%)
 rename {net => drivers/staging}/x25/x25_timer.c (99%)
 delete mode 100644 net/lapb/Kconfig
 delete mode 100644 net/lapb/Makefile
 delete mode 100644 net/x25/Kconfig
MAINTAINERS +2 -6
index 32fab6fbd301..5f0786bd8e22 100644
@@ -9155,9 +9155,7 @@ F:	drivers/soc/lantiq
 LAPB module
 L:	[email protected]
 S:	Orphan
-F:	Documentation/networking/lapb-module.txt
-F:	include/*/lapb.h
-F:	net/lapb/
+F:	drivers/staging/x25/
 
 LASI 53c700 driver for PARISC
 M:	"James E.J. Bottomley" <[email protected]>
@@ -17645,9 +17643,7 @@ X.25 NETWORK LAYER
 M:	Andrew Hendry <[email protected]>
 L:	[email protected]
 S:	Odd Fixes
-F:	Documentation/networking/x25*
-F:	include/net/x25*
-F:	net/x25/
+F:	drivers/staging/x25/
 
 X86 ARCHITECTURE (32-BIT AND 64-BIT)
 M:	Thomas Gleixner <[email protected]>
drivers/net/wan/Kconfig +0 -43

53 lines not on this page · raw message

drivers/net/wan/Makefile +0 -3
index 4438a0c4a272..1eb30941a445 100644
@@ -12,17 +12,14 @@ obj-$(CONFIG_HDLC_RAW_ETH)	+= hdlc_raw_eth.o
 obj-$(CONFIG_HDLC_CISCO)	+= hdlc_cisco.o
 obj-$(CONFIG_HDLC_FR)		+= hdlc_fr.o
 obj-$(CONFIG_HDLC_PPP)		+= hdlc_ppp.o
-obj-$(CONFIG_HDLC_X25)		+= hdlc_x25.o
 
 obj-$(CONFIG_HOSTESS_SV11)	+= z85230.o	hostess_sv11.o
 obj-$(CONFIG_SEALEVEL_4021)	+= z85230.o	sealevel.o
 obj-$(CONFIG_COSA)		+= cosa.o
 obj-$(CONFIG_FARSYNC)		+= farsync.o
-obj-$(CONFIG_X25_ASY)		+= x25_asy.o
 
 obj-$(CONFIG_LANMEDIA)		+= lmc/
 
-obj-$(CONFIG_LAPBETHER)		+= lapbether.o
 obj-$(CONFIG_N2)		+= n2.o
 obj-$(CONFIG_C101)		+= c101.o
 obj-$(CONFIG_WANXL)		+= wanxl.o
drivers/staging/Kconfig +2 -0
index ab83326f4b7e..e2edb29ccb42 100644
@@ -123,4 +123,6 @@ source "drivers/staging/exfat/Kconfig"
 
 source "drivers/staging/qlge/Kconfig"
 
+source "drivers/staging/x25/Kconfig"
+
 endif # STAGING
drivers/staging/Makefile +2 -0
index dfddb9864b2e..0576784f1f11 100644
@@ -52,3 +52,5 @@ obj-$(CONFIG_UWB)		+= uwb/
 obj-$(CONFIG_USB_WUSB)		+= wusbcore/
 obj-$(CONFIG_EXFAT_FS)		+= exfat/
 obj-$(CONFIG_QLGE)		+= qlge/
+obj-$(CONFIG_X25)		+= x25/
+obj-$(CONFIG_LAPB)		+= x25/
drivers/staging/x25/Documentation/lapb-module.txt renamed from Documentation/networking/lapb-module.txt +0 -0
similarity index 100%
rename from Documentation/networking/lapb-module.txt
rename to drivers/staging/x25/Documentation/lapb-module.txt
drivers/staging/x25/Documentation/x25-iface.txt renamed from Documentation/networking/x25-iface.txt +0 -0
similarity index 100%
rename from Documentation/networking/x25-iface.txt
rename to drivers/staging/x25/Documentation/x25-iface.txt
drivers/staging/x25/Documentation/x25.txt renamed from Documentation/networking/x25.txt +0 -0
similarity index 100%
rename from Documentation/networking/x25.txt
rename to drivers/staging/x25/Documentation/x25.txt
drivers/staging/x25/Kconfig new file +97 -0

97 lines not on this page · raw message

drivers/staging/x25/Makefile renamed from net/x25/Makefile +8 -0
similarity index 58%
rename from net/x25/Makefile
rename to drivers/staging/x25/Makefile
index 5dd544a231f2..d8235ac6b015 100644
@@ -9,3 +9,11 @@ x25-y			:= af_x25.o x25_dev.o x25_facilities.o x25_in.o \
 			   x25_link.o x25_out.o x25_route.o x25_subr.o \
 			   x25_timer.o x25_proc.o x25_forward.o
 x25-$(CONFIG_SYSCTL)	+= sysctl_net_x25.o
+
+obj-$(CONFIG_LAPB) += lapb.o
+
+lapb-y := lapb_in.o lapb_out.o lapb_subr.o lapb_timer.o lapb_iface.o
+
+obj-$(CONFIG_HDLC_X25)		+= hdlc_x25.o
+obj-$(CONFIG_X25_ASY)		+= x25_asy.o
+obj-$(CONFIG_LAPBETHER)		+= lapbether.o
drivers/staging/x25/TODO new file +15 -0
new file mode 100644
index 000000000000..bb42cf474ca1
@@ -0,0 +1,15 @@
+Staging out of X.25
+===================
+
+It appears that the X.25 socket family is not used any more with the
+mainline kernel, and the git log shows a series of user-triggerable
+Oopses.
+
+https://www.farsite.com/ still makes hardware that is being used in the
+field, but that uses a custom out of tree protocol stack in place of
+the kernel's AF_X25.
+
+If there are remaining users of this code that I missed, it can be moved
+out back out of staging, otherwise it will be removed in linux-5.8.
+
+    Arnd Bergmann <[email protected]>
drivers/staging/x25/af_x25.c renamed from net/x25/af_x25.c +1 -1
similarity index 99%
rename from net/x25/af_x25.c
rename to drivers/staging/x25/af_x25.c
index 6aee9f5e8e71..be950682209d 100644
@@ -54,7 +54,7 @@
 #include <linux/compat.h>
 #include <linux/ctype.h>
 
-#include <net/x25.h>
+#include "x25.h"
 #include <net/compat.h>
 
 int sysctl_x25_restart_request_timeout = X25_DEFAULT_T20;
drivers/staging/x25/hdlc_x25.c renamed from drivers/net/wan/hdlc_x25.c +1 -1
similarity index 99%
rename from drivers/net/wan/hdlc_x25.c
rename to drivers/staging/x25/hdlc_x25.c
index 5643675ff724..32ccf0c8e040 100644
@@ -13,7 +13,7 @@
 #include <linux/inetdevice.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
-#include <linux/lapb.h>
+#include "linux-lapb.h"
 #include <linux/module.h>
 #include <linux/pkt_sched.h>
 #include <linux/poll.h>
drivers/staging/x25/lapb.h renamed from include/net/lapb.h +1 -1
similarity index 99%
rename from include/net/lapb.h
rename to drivers/staging/x25/lapb.h
index ccc3d1f020b0..2abab6266caf 100644
@@ -1,8 +1,8 @@
 /* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LAPB_H
 #define _LAPB_H 
-#include <linux/lapb.h>
 #include <linux/refcount.h>
+#include "linux-lapb.h"
 
 #define	LAPB_HEADER_LEN	20		/* LAPB over Ethernet + a bit more */
 
drivers/staging/x25/lapb_iface.c renamed from net/lapb/lapb_iface.c +1 -1
similarity index 99%
rename from net/lapb/lapb_iface.c
rename to drivers/staging/x25/lapb_iface.c
index 3c03f6512c5f..1231ae28ec64 100644
@@ -34,7 +34,7 @@
 #include <linux/interrupt.h>
 #include <linux/stat.h>
 #include <linux/init.h>
-#include <net/lapb.h>
+#include "lapb.h"
 
 static LIST_HEAD(lapb_list);
 static DEFINE_RWLOCK(lapb_list_lock);
drivers/staging/x25/lapb_in.c renamed from net/lapb/lapb_in.c +1 -1
similarity index 99%
rename from net/lapb/lapb_in.c
rename to drivers/staging/x25/lapb_in.c
index 38ae23c09e83..210f8c743b39 100644
@@ -30,7 +30,7 @@
 #include <linux/fcntl.h>
 #include <linux/mm.h>
 #include <linux/interrupt.h>
-#include <net/lapb.h>
+#include "lapb.h"
 
 /*
  *	State machine for state 0, Disconnected State.
drivers/staging/x25/lapb_out.c renamed from net/lapb/lapb_out.c +1 -1
similarity index 99%
rename from net/lapb/lapb_out.c
rename to drivers/staging/x25/lapb_out.c
index 7a4d0715d1c3..d4ba7a5ebd33 100644
@@ -28,7 +28,7 @@
 #include <linux/fcntl.h>
 #include <linux/mm.h>
 #include <linux/interrupt.h>
-#include <net/lapb.h>
+#include "lapb.h"
 
 /*
  *  This procedure is passed a buffer descriptor for an iframe. It builds
drivers/staging/x25/lapb_subr.c renamed from net/lapb/lapb_subr.c +1 -1
similarity index 99%
rename from net/lapb/lapb_subr.c
rename to drivers/staging/x25/lapb_subr.c
index 592a22d86a97..f5ec7868c5a4 100644
@@ -27,7 +27,7 @@
 #include <linux/fcntl.h>
 #include <linux/mm.h>
 #include <linux/interrupt.h>
-#include <net/lapb.h>
+#include "lapb.h"
 
 /*
  *	This routine purges all the queues of frames.
drivers/staging/x25/lapb_timer.c renamed from net/lapb/lapb_timer.c +1 -1
similarity index 99%
rename from net/lapb/lapb_timer.c
rename to drivers/staging/x25/lapb_timer.c
index 8f5b17001a07..0b46163593e5 100644
@@ -28,7 +28,7 @@
 #include <linux/fcntl.h>
 #include <linux/mm.h>
 #include <linux/interrupt.h>
-#include <net/lapb.h>
+#include "lapb.h"
 
 static void lapb_t1timer_expiry(struct timer_list *);
 static void lapb_t2timer_expiry(struct timer_list *);
drivers/staging/x25/lapbether.c renamed from drivers/net/wan/lapbether.c +1 -1
similarity index 99%
rename from drivers/net/wan/lapbether.c
rename to drivers/staging/x25/lapbether.c
index 0f1217b506ad..6ff971705dca 100644
@@ -36,7 +36,7 @@
 #include <linux/notifier.h>
 #include <linux/stat.h>
 #include <linux/module.h>
-#include <linux/lapb.h>
+#include "linux-lapb.h"
 #include <linux/init.h>
 
 #include <net/x25device.h>
drivers/staging/x25/linux-lapb.h renamed from include/linux/lapb.h +0 -0
similarity index 100%
rename from include/linux/lapb.h
rename to drivers/staging/x25/linux-lapb.h
drivers/staging/x25/sysctl_net_x25.c renamed from net/x25/sysctl_net_x25.c +1 -1
similarity index 98%
rename from net/x25/sysctl_net_x25.c
rename to drivers/staging/x25/sysctl_net_x25.c
index e9802afa43d0..e8530a4e4856 100644
@@ -11,7 +11,7 @@
 #include <linux/socket.h>
 #include <linux/netdevice.h>
 #include <linux/init.h>
-#include <net/x25.h>
+#include "x25.h"
 
 static int min_timer[] = {   1 * HZ };
 static int max_timer[] = { 300 * HZ };
drivers/staging/x25/uapi-x25.h renamed from include/uapi/linux/x25.h +0 -0
similarity index 100%
rename from include/uapi/linux/x25.h
rename to drivers/staging/x25/uapi-x25.h
drivers/staging/x25/x25.h renamed from include/net/x25.h +1 -1
similarity index 99%
rename from include/net/x25.h
rename to drivers/staging/x25/x25.h
index ed1acc3044ac..dfbc0188e47d 100644
@@ -10,10 +10,10 @@
 
 #ifndef _X25_H
 #define _X25_H 
-#include <linux/x25.h>
 #include <linux/slab.h>
 #include <linux/refcount.h>
 #include <net/sock.h>
+#include "uapi-x25.h"
 
 #define	X25_ADDR_LEN			16
 
drivers/staging/x25/x25_asy.c renamed from drivers/net/wan/x25_asy.c +1 -1
similarity index 99%
rename from drivers/net/wan/x25_asy.c
rename to drivers/staging/x25/x25_asy.c
index 914be5847386..3986a1160fc1 100644
@@ -31,7 +31,7 @@
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
 #include <linux/if_arp.h>
-#include <linux/lapb.h>
+#include "linux-lapb.h"
 #include <linux/init.h>
 #include <linux/rtnetlink.h>
 #include <linux/slab.h>
drivers/staging/x25/x25_asy.h renamed from drivers/net/wan/x25_asy.h +0 -0
similarity index 100%
rename from drivers/net/wan/x25_asy.h
rename to drivers/staging/x25/x25_asy.h
drivers/staging/x25/x25_dev.c renamed from net/x25/x25_dev.c +1 -1
similarity index 99%
rename from net/x25/x25_dev.c
rename to drivers/staging/x25/x25_dev.c
index 00e782335cb0..dbdce9c62abd 100644
@@ -20,7 +20,7 @@
 #include <linux/slab.h>
 #include <net/sock.h>
 #include <linux/if_arp.h>
-#include <net/x25.h>
+#include "x25.h"
 #include <net/x25device.h>
 
 static int x25_receive_data(struct sk_buff *skb, struct x25_neigh *nb)
drivers/staging/x25/x25_facilities.c renamed from net/x25/x25_facilities.c +1 -1
similarity index 99%
rename from net/x25/x25_facilities.c
rename to drivers/staging/x25/x25_facilities.c
index 7fb327632272..17e41049cb2b 100644
@@ -22,7 +22,7 @@
 #include <linux/string.h>
 #include <linux/skbuff.h>
 #include <net/sock.h>
-#include <net/x25.h>
+#include "x25.h"
 
 /**
  * x25_parse_facilities - Parse facilities from skb into the facilities structs
drivers/staging/x25/x25_forward.c renamed from net/x25/x25_forward.c +1 -1
similarity index 99%
rename from net/x25/x25_forward.c
rename to drivers/staging/x25/x25_forward.c
index c82999941d3f..4328f0e31482 100644
@@ -9,7 +9,7 @@
 #include <linux/if_arp.h>
 #include <linux/init.h>
 #include <linux/slab.h>
-#include <net/x25.h>
+#include "x25.h"
 
 LIST_HEAD(x25_forward_list);
 DEFINE_RWLOCK(x25_forward_list_lock);
drivers/staging/x25/x25_in.c renamed from net/x25/x25_in.c +1 -1
similarity index 99%
rename from net/x25/x25_in.c
rename to drivers/staging/x25/x25_in.c
index f97c43344e95..e0c1f1484d8c 100644
@@ -27,7 +27,7 @@
 #include <linux/skbuff.h>
 #include <net/sock.h>
 #include <net/tcp_states.h>
-#include <net/x25.h>
+#include "x25.h"
 
 static int x25_queue_rx_frame(struct sock *sk, struct sk_buff *skb, int more)
 {
drivers/staging/x25/x25_link.c renamed from net/x25/x25_link.c +1 -1
similarity index 99%
rename from net/x25/x25_link.c
rename to drivers/staging/x25/x25_link.c
index 7d02532aad0d..5c07143e557d 100644
@@ -26,7 +26,7 @@
 #include <linux/skbuff.h>
 #include <linux/uaccess.h>
 #include <linux/init.h>
-#include <net/x25.h>
+#include "x25.h"
 
 LIST_HEAD(x25_neigh_list);
 DEFINE_RWLOCK(x25_neigh_list_lock);
drivers/staging/x25/x25_out.c renamed from net/x25/x25_out.c +1 -1
similarity index 99%
rename from net/x25/x25_out.c
rename to drivers/staging/x25/x25_out.c
index dbc0940bf35f..8f4d55e378ee 100644
@@ -23,7 +23,7 @@
 #include <linux/string.h>
 #include <linux/skbuff.h>
 #include <net/sock.h>
-#include <net/x25.h>
+#include "x25.h"
 
 static int x25_pacsize_to_bytes(unsigned int pacsize)
 {
drivers/staging/x25/x25_proc.c renamed from net/x25/x25_proc.c +1 -1
similarity index 99%
rename from net/x25/x25_proc.c
rename to drivers/staging/x25/x25_proc.c
index 3bddcbdf2e40..4c36e64a719a 100644
@@ -18,7 +18,7 @@
 #include <linux/export.h>
 #include <net/net_namespace.h>
 #include <net/sock.h>
-#include <net/x25.h>
+#include "x25.h"
 
 #ifdef CONFIG_PROC_FS
 
drivers/staging/x25/x25_route.c renamed from net/x25/x25_route.c +1 -1
similarity index 99%
rename from net/x25/x25_route.c
rename to drivers/staging/x25/x25_route.c
index b8e94d58d0f1..60f18964be0f 100644
@@ -15,7 +15,7 @@
 #include <linux/if_arp.h>
 #include <linux/init.h>
 #include <linux/slab.h>
-#include <net/x25.h>
+#include "x25.h"
 
 LIST_HEAD(x25_route_list);
 DEFINE_RWLOCK(x25_route_list_lock);
drivers/staging/x25/x25_subr.c renamed from net/x25/x25_subr.c +1 -1
similarity index 99%
rename from net/x25/x25_subr.c
rename to drivers/staging/x25/x25_subr.c
index 8aa415a38814..7004ee53a6b0 100644
@@ -26,7 +26,7 @@
 #include <linux/skbuff.h>
 #include <net/sock.h>
 #include <net/tcp_states.h>
-#include <net/x25.h>
+#include "x25.h"
 
 /*
  *	This routine purges all of the queues of frames.
drivers/staging/x25/x25_timer.c renamed from net/x25/x25_timer.c +1 -1
similarity index 99%
rename from net/x25/x25_timer.c
rename to drivers/staging/x25/x25_timer.c
index 9376365cdcc9..3edcae15f897 100644
@@ -19,7 +19,7 @@
 #include <linux/timer.h>
 #include <net/sock.h>
 #include <net/tcp_states.h>
-#include <net/x25.h>
+#include "x25.h"
 
 static void x25_heartbeat_expiry(struct timer_list *t);
 static void x25_timer_expiry(struct timer_list *t);
include/Kbuild +0 -2
index 64ab3aac7379..e26750d6ec96 100644
@@ -276,7 +276,6 @@ header-test-			+= linux/kvm_host.h
 header-test-			+= linux/kvm_irqfd.h
 header-test-			+= linux/kvm_para.h
 header-test-			+= linux/lantiq.h
-header-test-			+= linux/lapb.h
 header-test-			+= linux/latencytop.h
 header-test-			+= linux/led-lm3530.h
 header-test-			+= linux/leds-bd2802.h
@@ -835,7 +834,6 @@ header-test-			+= net/ipcomp.h
 header-test-			+= net/ipconfig.h
 header-test-			+= net/iucv/af_iucv.h
 header-test-			+= net/iucv/iucv.h
-header-test-			+= net/lapb.h
 header-test-			+= net/llc_c_ac.h
 header-test-			+= net/llc_c_st.h
 header-test-			+= net/llc_s_ac.h
net/Kconfig +0 -2
index 3101bfcbdd7a..50681046ec03 100644
@@ -220,8 +220,6 @@ source "net/8021q/Kconfig"
 source "net/decnet/Kconfig"
 source "net/llc/Kconfig"
 source "drivers/net/appletalk/Kconfig"
-source "net/x25/Kconfig"
-source "net/lapb/Kconfig"
 source "net/phonet/Kconfig"
 source "net/6lowpan/Kconfig"
 source "net/ieee802154/Kconfig"
net/Makefile +0 -2
index 449fc0b221f8..3473e68e7abe 100644
@@ -26,8 +26,6 @@ obj-$(CONFIG_NET_KEY)		+= key/
 obj-$(CONFIG_BRIDGE)		+= bridge/
 obj-$(CONFIG_NET_DSA)		+= dsa/
 obj-$(CONFIG_ATALK)		+= appletalk/
-obj-$(CONFIG_X25)		+= x25/
-obj-$(CONFIG_LAPB)		+= lapb/
 obj-$(CONFIG_NETROM)		+= netrom/
 obj-$(CONFIG_ROSE)		+= rose/
 obj-$(CONFIG_AX25)		+= ax25/
net/lapb/Kconfig deleted +0 -22
deleted file mode 100644
index 6acfc999c952..000000000000
@@ -1,22 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-only
-#
-# LAPB Data Link Drive
-#
-
-config LAPB
-	tristate "LAPB Data Link Driver"
-	---help---
-	  Link Access Procedure, Balanced (LAPB) is the data link layer (i.e.
-	  the lower) part of the X.25 protocol. It offers a reliable
-	  connection service to exchange data frames with one other host, and
-	  it is used to transport higher level protocols (mostly X.25 Packet
-	  Layer, the higher part of X.25, but others are possible as well).
-	  Usually, LAPB is used with specialized X.21 network cards, but Linux
-	  currently supports LAPB only over Ethernet connections. If you want
-	  to use LAPB connections over Ethernet, say Y here and to "LAPB over
-	  Ethernet driver" below. Read
-	  <file:Documentation/networking/lapb-module.txt> for technical
-	  details.
-
-	  To compile this driver as a module, choose M here: the
-	  module will be called lapb.  If unsure, say N.
net/lapb/Makefile deleted +0 -8
deleted file mode 100644
index 7be91b4c0ca0..000000000000
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-only
-#
-# Makefile for the Linux LAPB layer.
-#
-
-obj-$(CONFIG_LAPB) += lapb.o
-
-lapb-y := lapb_in.o lapb_out.o lapb_subr.o lapb_timer.o lapb_iface.o
net/x25/Kconfig deleted +0 -34
deleted file mode 100644
index 2ecb2e5e241e..000000000000
@@ -1,34 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-only
-#
-# CCITT X.25 Packet Layer
-#
-
-config X25
-	tristate "CCITT X.25 Packet Layer"
-	---help---
-	  X.25 is a set of standardized network protocols, similar in scope to
-	  frame relay; the one physical line from your box to the X.25 network
-	  entry point can carry several logical point-to-point connections
-	  (called "virtual circuits") to other computers connected to the X.25
-	  network. Governments, banks, and other organizations tend to use it
-	  to connect to each other or to form Wide Area Networks (WANs). Many
-	  countries have public X.25 networks. X.25 consists of two
-	  protocols: the higher level Packet Layer Protocol (PLP) (say Y here
-	  if you want that) and the lower level data link layer protocol LAPB
-	  (say Y to "LAPB Data Link Driver" below if you want that).
-
-	  You can read more about X.25 at <http://www.sangoma.com/tutorials/x25/> and
-	  <http://docwiki.cisco.com/wiki/X.25>.
-	  Information about X.25 for Linux is contained in the files
-	  <file:Documentation/networking/x25.txt> and
-	  <file:Documentation/networking/x25-iface.txt>.
-
-	  One connects to an X.25 network either with a dedicated network card
-	  using the X.21 protocol (not yet supported by Linux) or one can do
-	  X.25 over a standard telephone line using an ordinary modem (say Y
-	  to "X.25 async driver" below) or over Ethernet using an ordinary
-	  Ethernet card and the LAPB over Ethernet (say Y to "LAPB Data Link
-	  Driver" and "LAPB over Ethernet driver" below).
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called x25. If unsure, say N.
Signature · 1 line
2.20.0
maintainer Acked-by on v1 4/4
#4 lore raw

Re: [PATCH 4/4] [RFC] staging/net: move AF_X25 into drivers/staging

Quoted 62 lines · Arnd Bergmann

syzbot keeps finding issues in the X.25 implementation that nobody is interested in fixing. Given that all the x25 patches of the past years that are not global cleanups tend to fix user-triggered oopses, is it time to just retire the subsystem?

I looked a bit closer and found:

- we used to support x25 hardware in linux, but with WAN_ROUTER removed in linux-3.9 and isdn4linux removed in 5.3, there is only hdlc, ethernet and the N_X25 tty ldisc left. Out of these, only HDLC_X25 made it beyond the experimental stage, so this is probably what everyone uses if there are users at all.

- The most common hdlc hardware that people seem to be using are the "farsync" PCIe and USB adapters. Linux only has drivers for the older PCI devices from that series, but no hardware that works on modern systems.

- The manufacturer still updates their own kernel drivers and provides support, but ships that with a fork or rewrite of the subsystem code now. Kevin Curtis is also listed as maintainer, but appears to have given up in 2013 after [1].

- The most popular software implementation appears to be X25 over TCP (XOT), which is supported by Farsite and other out-of-tree stacks but never had an implementation in mainline.

- Most other supported HDLC hardware that we supoprt is for the ISA or PCI buses. There are newer PCIe or USB devices, but those all require a custom device driver and often a custom subsystem, none of which got submitted for mainline inclusion. This includes hardware from Microgate (SyncLink), Comtrol (RocketPort Express) and Sealevel (SeaMAC).

- The X.25 subsystem is listed as "odd fixes", but the last reply on the netdev mailing list from the maintainer was also in 2013[2].

- The HDLC subsystem itself is listed as maintained by Krzysztof Halasa, and there were new drivers merged for SoC based devices as late as 2016 by Zhao Qiang: Freescale/NXP QUICC Engine and Maxim ds26522. There has not been much work on HDLC or drivers/net/wan recently, but both developers are still responsive on the mailing list and work on other parts of the kernel.

Based on the above, I would conclude that X.25 can probably get moved to staging as keeping it in the kernel seems to do more harm than good, but HDLC below it should probably stay as there it seems there are still users of a small subset of the mainline drivers.

Move all of X.25 into drivers/staging for now, with a projected removal date set for Linux-5.8.

Quoted 5 lines

----

If anyone has different views or additional information, let us know.

If you agree with the above, please Ack.

ACK!

maintainer
#5 lore raw

Re: [PATCH 4/4] [RFC] staging/net: move AF_X25 into drivers/staging

In reply to Arnd Bergmann

From: Arnd Bergmann <[email protected]>
Date: Mon, 9 Dec 2019 16:12:56 +0100

Quoted 4 lines

syzbot keeps finding issues in the X.25 implementation that nobody is interested in fixing. Given that all the x25 patches of the past years that are not global cleanups tend to fix user-triggered oopses, is it time to just retire the subsystem?

I have a bug fix that I'm currently applying to 'net' right now actually:

	https://patchwork.ozlabs.org/patch/1205973/

So your proposal might be a bit premature.

#6 lore raw

Re: [PATCH 4/4] [RFC] staging/net: move AF_X25 into drivers/staging

Quoted 9 lines · David Miller

From: Arnd Bergmann <[email protected]>
Date: Mon, 9 Dec 2019 16:12:56 +0100

Quoted 4 lines

syzbot keeps finding issues in the X.25 implementation that nobody is interested in fixing. Given that all the x25 patches of the past years that are not global cleanups tend to fix user-triggered oopses, is it time to just retire the subsystem?

Quoted 5 lines

I have a bug fix that I'm currently applying to 'net' right now actually:

        https://patchwork.ozlabs.org/patch/1205973/

So your proposal might be a bit premature.

Ok, makes sense. Looking back in the history, I also see other bugfixes from the same author.

Adding Martin Schiller to Cc: for a few questions:

- What hardware are you using for X.25?
- Would you be available to be listed in the MAINTAINERS file as a contact for net/x25?
- Does your bug fix address the latest issue found by syzbot[1], or do you have an idea to fix it if not?

Arnd

[1] https://lore.kernel.org/netdev/CAK8P3a0LdF+aQ1hnZrVKkNBQaum0WqW1jyR7_Eb+JRiwyHWr6Q@mail.gmail.com/

maintainer
#7 lore raw

Re: [PATCH 4/4] [RFC] staging/net: move AF_X25 into drivers/staging

Quoted 14 lines · Arnd Bergmann
Quoted 13 lines · David Miller

From: Arnd Bergmann <[email protected]>
Date: Mon, 9 Dec 2019 16:12:56 +0100

Quoted 4 lines

syzbot keeps finding issues in the X.25 implementation that nobody is interested in fixing. Given that all the x25 patches of the past years that are not global cleanups tend to fix user-triggered oopses, is it time to just retire the subsystem?

I have a bug fix that I'm currently applying to 'net' right now actually:

        https://patchwork.ozlabs.org/patch/1205973/
Quoted 8 lines
Quoted 1 line

So your proposal might be a bit premature.

Ok, makes sense. Looking back in the history, I also see other bugfixes from the same author.

Adding Martin Schiller to Cc: for a few questions:

- What hardware are you using for X.25?

I would say that X.25 is (at least in Germany) not dead yet. For example, it is still used in the railway network of the Deutsche Bahn AG in many different areas. [1]

We deliver products for this and use the Linux X.25 stack with some bugfixes and extensions that I would like to get upstream.

As hardware/interfaces we use X.21bis/G.703 adapters, which are connected via HDLC_X25 and LAPB. Also for this there are extensions and bugfixes, which I would like to include in the kernel.

Quoted 2 lines

- Would you be available to be listed in the MAINTAINERS file as a contact for net/x25?

Yes, you can add me to the MAINTAINERS file.
I have only limited time, but I will try to follow all requests concerning this subsystem.

Quoted 2 lines

- Does your bug fix address the latest issue found by syzbot[1], or do you have an idea to fix it if not?

I don't have a direct solution for the concrete problem mentioned above, but at first sight I would say that the commit 95d6ebd53c79 ("net/x25: fix use-after-free in x25_device_event()") holds the wrong lock (&x25_list_lock). Shouldn't this be the lock &x25_neigh_list_lock as in x25_get_neigh(), where x25_neigh_hold() is called?

Quoted 5 lines

Arnd

[1]
https://lore.kernel.org/netdev/CAK8P3a0LdF+aQ1hnZrVKkNBQaum0WqW1jyR7_Eb+JRiwyHWr6Q@mail.gmail.com/

#8 lore raw

Re: [PATCH 4/4] [RFC] staging/net: move AF_X25 into drivers/staging

Quoted 24 lines · Martin Schiller
Quoted 23 lines · Arnd Bergmann
Quoted 9 lines · David Miller

From: Arnd Bergmann <[email protected]>
Date: Mon, 9 Dec 2019 16:12:56 +0100

Quoted 4 lines

syzbot keeps finding issues in the X.25 implementation that nobody is interested in fixing. Given that all the x25 patches of the past years that are not global cleanups tend to fix user-triggered oopses, is it time to just retire the subsystem?

Quoted 6 lines

I have a bug fix that I'm currently applying to 'net' right now actually:

        https://patchwork.ozlabs.org/patch/1205973/

So your proposal might be a bit premature.

Ok, makes sense. Looking back in the history, I also see other bugfixes from the same author.

Adding Martin Schiller to Cc: for a few questions:

Quoted 8 lines
Quoted 1 line

- What hardware are you using for X.25?

I would say that X.25 is (at least in Germany) not dead yet. For example, it is still used in the railway network of the Deutsche Bahn AG in many different areas. [1]

We deliver products for this and use the Linux X.25 stack with some bugfixes and extensions that I would like to get upstream.

Right, when I looked for possible users, I found several examples where X.25 is still relevant, my impression was just that none of those were using the mainline Linux network stack.

Thank you for clarifying that.

Quoted 11 lines

As hardware/interfaces we use X.21bis/G.703 adapters, which are connected via
HDLC_X25 and LAPB. Also for this there are extensions and bugfixes, which I would like to include in the kernel.

Quoted 2 lines

- Would you be available to be listed in the MAINTAINERS file as a contact for net/x25?

Yes, you can add me to the MAINTAINERS file.
I have only limited time, but I will try to follow all requests concerning this subsystem.

Great! I don't expect there to be a lot of work, but it definitely helps to have someone who can look at the occasional build failure or code cleanup patch.

If this works for everyone, I'd submit the following patch:

commit b63caa9a8d86a5bfc64052bf9aab9b22181120fd (HEAD)

Author: Arnd Bergmann <[email protected]>
Date:   Tue Dec 10 14:28:39 2019 +0100

MAINTAINERS: add new X.25 maintainer

Martin Schiller is using the Linux X.25 stack on top of HDLC and X.21 networks. He agreed to be listed as a maintainer to take care of odd fixes.

Add him as the primary contact for net/x25 and net/lapb, as well as a reviewer for drivers/net/wan, which contains the HDLC code.

MAINTAINERS +6 -7
index 8e58410a799a..00b624b96103 100644
@@ -6889,6 +6889,7 @@ F:        Documentation/i2c/muxes/i2c-mux-gpio.rst
 
 GENERIC HDLC (WAN) DRIVERS
 M:     Krzysztof Halasa <[email protected]>
+R:     Martin Schiller <[email protected]>
 W:     http://www.kernel.org/pub/linux/utils/net/hdlc/
 S:     Maintained
 F:     drivers/net/wan/c101.c
@@ -9255,13 +9256,6 @@ S:       Maintained
 F:     arch/mips/lantiq
 F:     drivers/soc/lantiq
 
-LAPB module
-L:     [email protected]
-S:     Orphan
-F:     Documentation/networking/lapb-module.txt
-F:     include/*/lapb.h
-F:     net/lapb/
-
 LASI 53c700 driver for PARISC
 M:     "James E.J. Bottomley" <[email protected]>
 L:     [email protected]
@@ -17911,11 +17905,16 @@ S:    Maintained
 N:     axp[128]
 
 X.25 NETWORK LAYER
+M:     Martin Schiller <[email protected]>
 M:     Andrew Hendry <[email protected]>
 L:     [email protected]
 S:     Odd Fixes
 F:     Documentation/networking/x25*
+F:     Documentation/networking/lapb-module.txt
+F:     include/linux/lapb.h
 F:     include/net/x25*
+F:     include/uapi/linux/x25.h
+F:     net/lapb/
 F:     net/x25/
 
 X86 ARCHITECTURE (32-BIT AND 64-BIT)

-----

Quoted 10 lines
Quoted 2 lines

- Does your bug fix address the latest issue found by syzbot[1], or do you have an idea to fix it if not?

I don't have a direct solution for the concrete problem mentioned above, but at
first sight I would say that the commit 95d6ebd53c79 ("net/x25: fix use-after-free in x25_device_event()") holds the wrong lock (&x25_list_lock).
Shouldn't this be the lock &x25_neigh_list_lock as in x25_get_neigh(), where x25_neigh_hold() is called?

After looking at it again, my best guess is something else:
x25_wait_for_connection_establishment() calls release_sock()/lock_sock() while waiting. At this point, a concurrent x25_connect() can overwrite the x25->neighbour variable, which needs to be checked again before calling x25_neigh_put().

Arnd

maintainer Acked-by
#9 lore raw

Re: [PATCH 4/4] [RFC] staging/net: move AF_X25 into drivers/staging

Quoted 71 lines · Arnd Bergmann
Quoted 24 lines · Martin Schiller
Quoted 23 lines · Arnd Bergmann
Quoted 9 lines · David Miller

From: Arnd Bergmann <[email protected]>
Date: Mon, 9 Dec 2019 16:12:56 +0100

Quoted 4 lines

syzbot keeps finding issues in the X.25 implementation that nobody is interested in fixing. Given that all the x25 patches of the past years that are not global cleanups tend to fix user-triggered oopses, is it time to just retire the subsystem?

Quoted 6 lines

I have a bug fix that I'm currently applying to 'net' right now actually:

        https://patchwork.ozlabs.org/patch/1205973/

So your proposal might be a bit premature.

Ok, makes sense. Looking back in the history, I also see other bugfixes from the same author.

Adding Martin Schiller to Cc: for a few questions:

Quoted 8 lines
Quoted 1 line

- What hardware are you using for X.25?

I would say that X.25 is (at least in Germany) not dead yet. For example, it is still used in the railway network of the Deutsche Bahn AG in many different areas. [1]

We deliver products for this and use the Linux X.25 stack with some bugfixes and extensions that I would like to get upstream.

Right, when I looked for possible users, I found several examples where X.25 is still relevant, my impression was just that none of those were using the mainline Linux network stack.

Thank you for clarifying that.

Quoted 11 lines

As hardware/interfaces we use X.21bis/G.703 adapters, which are connected via
HDLC_X25 and LAPB. Also for this there are extensions and bugfixes, which I would like to include in the kernel.

Quoted 2 lines

- Would you be available to be listed in the MAINTAINERS file as a contact for net/x25?

Yes, you can add me to the MAINTAINERS file.
I have only limited time, but I will try to follow all requests concerning this subsystem.

Great! I don't expect there to be a lot of work, but it definitely helps to have someone who can look at the occasional build failure or code cleanup patch.

If this works for everyone, I'd submit the following patch:

commit b63caa9a8d86a5bfc64052bf9aab9b22181120fd (HEAD)

Author: Arnd Bergmann <[email protected]>
Date:   Tue Dec 10 14:28:39 2019 +0100

MAINTAINERS: add new X.25 maintainer

Martin Schiller is using the Linux X.25 stack on top of HDLC and X.21 networks. He agreed to be listed as a maintainer to take care of odd fixes.

Add him as the primary contact for net/x25 and net/lapb, as well as a reviewer for drivers/net/wan, which contains the HDLC code.

Quoted 7 lines

Cc: Martin Schiller <[email protected]>
Cc: Andrew Hendry <[email protected]>
Cc: Krzysztof Halasa <[email protected]>
Link:
https://lore.kernel.org/netdev/[email protected]/

ACK!

Quoted 57 lines
MAINTAINERS +0 -0
index 8e58410a799a..00b624b96103 100644
@@ -6889,6 +6889,7 @@ F:        

Documentation/i2c/muxes/i2c-mux-gpio.rst

GENERIC HDLC (WAN) DRIVERS
M: Krzysztof Halasa <[email protected]>

MAINTAINERS +6 -8
+R:     Martin Schiller <[email protected]>
 W:     http://www.kernel.org/pub/linux/utils/net/hdlc/
 S:     Maintained
 F:     drivers/net/wan/c101.c
@@ -9255,13 +9256,6 @@ S:       Maintained
 F:     arch/mips/lantiq
 F:     drivers/soc/lantiq
 
-LAPB module
-L:     [email protected]
-S:     Orphan
-F:     Documentation/networking/lapb-module.txt
-F:     include/*/lapb.h
-F:     net/lapb/
-
 LASI 53c700 driver for PARISC
 M:     "James E.J. Bottomley" <[email protected]>
 L:     [email protected]
@@ -17911,11 +17905,16 @@ S:    Maintained
 N:     axp[128]
 
 X.25 NETWORK LAYER
+M:     Martin Schiller <[email protected]>
 M:     Andrew Hendry <[email protected]>
 L:     [email protected]
 S:     Odd Fixes
 F:     Documentation/networking/x25*
+F:     Documentation/networking/lapb-module.txt
+F:     include/linux/lapb.h
 F:     include/net/x25*
+F:     include/uapi/linux/x25.h
+F:     net/lapb/
 F:     net/x25/
 
 X86 ARCHITECTURE (32-BIT AND 64-BIT)
 
-----
Quoted 10 lines
Quoted 2 lines

- Does your bug fix address the latest issue found by syzbot[1], or do you have an idea to fix it if not?

I don't have a direct solution for the concrete problem mentioned above, but at
first sight I would say that the commit 95d6ebd53c79 ("net/x25: fix use-after-free in x25_device_event()") holds the wrong lock (&x25_list_lock).
Shouldn't this be the lock &x25_neigh_list_lock as in x25_get_neigh(), where x25_neigh_hold() is called?

Quoted 6 lines

After looking at it again, my best guess is something else:
x25_wait_for_connection_establishment() calls release_sock()/lock_sock() while waiting. At this point, a concurrent x25_connect() can overwrite the x25->neighbour variable, which needs to be checked again before calling x25_neigh_put().

That's a good point. I wonder why any further call to x25_connect() on the same socket isn't simply returning (EALREADY) as long as sock->state == SS_CONNECTING?

Martin

#10 lore raw

Re: [PATCH 4/4] [RFC] staging/net: move AF_X25 into drivers/staging

In reply to Arnd Bergmann

Arnd,

Quoted 2 lines · Arnd Bergmann

- Most other supported HDLC hardware that we supoprt is for the ISA or PCI buses.

I would be surprised if there is anybody left with ISA sync serial stuff, but the PCI hardware still has some users - these machines don't need to be upgraded yearly. Most people have migrated away, though.

Signature · 5 lines
Krzysztof Halasa

ŁUKASIEWICZ Research Network
Industrial Research Institute for Automation and Measurements PIAP
Al. Jerozolimskie 202, 02-486 Warsaw, Poland
#11 lore raw

Re: [PATCH 4/4] [RFC] staging/net: move AF_X25 into drivers/staging

Quoted 10 lines · Krzysztof HaÅ‚asa

Arnd,

Quoted 2 lines · Arnd Bergmann

- Most other supported HDLC hardware that we supoprt is for the ISA or PCI buses.

I would be surprised if there is anybody left with ISA sync serial stuff, but the PCI hardware still has some users - these machines don't need to be upgraded yearly. Most people have migrated away, though.

Hi Krzysztof, Arnd

I have a use case for hdlc_cisco and hdlc_raw_eth. But it uses a lot of out of tree code, the DAHDI driver framework for E1 cards, and an E1 card which is not part of DAHDI.

Given how much of this is out of tree, i would understand if you eventually decide to remove this HDLC code.

Andrew