Skip to content

CAPI: Major rework, tons of bug fixes

Jan Kiszka lkml netdev 2 versions – Applied

Status from this message: I've applied your entire series to net-next-2.6

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest41 patches 5 repliesApplied
  2. v131 patches 11 repliesSuperseded

Patches in v2 Applied

#Subject and filesSizeRepliesApplied
1/41CAPI: Fix leaks in capifs_new_nccidrivers/isdn/capi/capifs.c+18 -70 replies
2/41CAPI: Sanitize capifs APIdrivers/isdn/capi/capi.c drivers/isdn/capi/capifs.c drivers/isdn/capi/capifs.h+54 -310 replies
3/41CAPI: Eliminate capifs_root variabledrivers/isdn/capi/capifs.c+10 -80 replies
4/41CAPI: Pin capifs instead of mounting itdrivers/isdn/capi/capifs.c+18 -90 replies
5/41CAPI: Reduce chattiness during module loading/removaldrivers/isdn/capi/capi.c drivers/isdn/capi/capidrv.c drivers/isdn/capi/capifs.c +1 more+9 -830 replies
6/41CAPI: Call a controller 'controller', not 'card'drivers/isdn/capi/kcapi.c drivers/isdn/capi/kcapi.h drivers/isdn/capi/kcapi_proc.c +1 more+178 -1690 replies
7/41CAPI: Convert capi drivers rwlock into mutexdrivers/isdn/capi/kcapi.c drivers/isdn/capi/kcapi.h drivers/isdn/capi/kcapi_proc.c+27 -320 replies
8/41CAPI: Rework capi_ctr_ready/downdrivers/isdn/capi/kcapi.c+50 -450 replies
9/41CAPI: Rework controller state notifierdrivers/isdn/capi/capidrv.c drivers/isdn/capi/kcapi.c include/linux/kernelcapi.h+72 -790 replies
10/41CAPI: Rework locking of controller data structuresdrivers/isdn/capi/kcapi.c drivers/isdn/capi/kcapi.h drivers/isdn/capi/kcapi_proc.c +1 more+217 -890 replies
11/41CAPI: Rework application lockingdrivers/isdn/capi/kcapi.c drivers/isdn/capi/kcapi_proc.c+29 -340 replies
12/41CAPI: Reduce #ifdef mess around CONFIG_ISDN_CAPI_MIDDLEWAREdrivers/isdn/capi/capi.c+83 -670 replies
13/41CAPI: Convert capidev_list_lock into a mutexdrivers/isdn/capi/capi.c+12 -120 replies
14/41CAPI: Clean up capi_open/releasedrivers/isdn/capi/capi.c+34 -590 replies
15/41CAPI: Rework locking of capidev membersdrivers/isdn/capi/capi.c+88 -930 replies
16/41CAPI: Use non-atomic allocation during NCCI setupdrivers/isdn/capi/capi.c+2 -20 replies
17/41CAPI: Fix racy capi_readdrivers/isdn/capi/capi.c+7 -120 replies
18/41CAPI: Switch NCCI list to standard doubly linked listdrivers/isdn/capi/capi.c+20 -320 replies
19/41CAPI: Switch capiminor list to arraydrivers/isdn/capi/capi.c+35 -400 replies
20/41CAPI: Clean up capinc_tty_init/exitdrivers/isdn/capi/capi.c+10 -100 replies
21/41CAPI: Dynamically register minor devicesdrivers/isdn/capi/capi.c+24 -110 replies
22/41CAPI: Use dynamic major for NCCI TTYs by defaultdrivers/isdn/capi/capi.c+4 -60 replies
23/41CAPI: Use kref on capiminordrivers/isdn/capi/capi.c+28 -90 replies
24/41CAPI: Establish install/cleanup handlers for capiminor TTYsdrivers/isdn/capi/capi.c+28 -140 replies
25/41CAPI: Use tty_port to keep track of capiminor's ttydrivers/isdn/capi/capi.c+62 -320 replies
26/41CAPI: Drop remaining NULL checks on tty->driver_datadrivers/isdn/capi/capi.c+31 -330 replies
27/41CAPI: Issue synchronous hangup on capincci_free_minordrivers/isdn/capi/capi.c+1 -10 replies
28/41CAPI: Drop obsolete nccip from capiminor structdrivers/isdn/capi/capi.c+1 -430 replies
29/41CAPI: Clean up capiminors_lockdrivers/isdn/capi/capi.c+9 -120 replies
30/41CAPI: Drop atomic ttyopencountdrivers/isdn/capi/capi.c+10 -200 replies
31/41CAPI: Drop handle_minor_recv from capinc_tty_writedrivers/isdn/capi/capi.c+0 -10 replies
32/41CAPI: Rework capiminor RX handlerdrivers/isdn/capi/capi.c+38 -220 replies
33/41CAPI: Rename datahandle_queue -> ackqueue_entrydrivers/isdn/capi/capi.c+4 -40 replies
34/41CAPI: Use atomics for capiminor's datahandle and msgiddrivers/isdn/capi/capi.c+7 -90 replies
35/41CAPI: Drop capiminor's unused inbytes counterdrivers/isdn/capi/capi.c+3 -70 replies
36/41CAPI: Fix locking around capiminor's output queue and drop workaround_lockdrivers/isdn/capi/capi.c+67 -590 replies
37/41CAPI: Clean up capiminor_*_ackdrivers/isdn/capi/capi.c+7 -120 replies
38/41CAPI: Drop return value of handle_minor_senddrivers/isdn/capi/capi.c+9 -130 replies
39/41CAPI: Drop special controller lookup from capi20_put_messagedrivers/isdn/capi/kcapi.c+2 -50 replies
40/41CAPI: Schedule capifs for removalDocumentation/feature-removal-schedule.txt drivers/isdn/capi/Kconfig+17 -60 replies
41/41CAPI: Remove experimental tag from middleware featuredrivers/isdn/capi/Kconfig+1 -20 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v2 yet.

Read the v2 thread

Cover letter [PATCH v2 00/41] CAPI: Major rework, tons of bug fixes

Here is the second take of my CAPI rework. I tried to address all feedback on v1, so this one comes with the following changes:

o rebased over net-next
o reworked locking of the NCCI TTY using latest and greatest tty_port features and kref, hopefully in the right way
o more fine-grained patch steps for the tricky TTY rework
o dynamic major for NCCI TTYs, ie. CAPI no longer claims 191
o dynamic TTY minor registrations, completely obsoleting capifs
o schedule capifs for removal
o some small additional cleanups

I kept my capifs fixes though this thing should die in the future. The work is done, and people may still use it due to their distro configuration (and the hard-wired loading by capiinit - needs fixing).

You can pull this series from

	git://git.kiszka.org/linux-2.6.git capi

Jan

Jan Kiszka (41):
CAPI: Fix leaks in capifs_new_ncci
CAPI: Sanitize capifs API
CAPI: Eliminate capifs_root variable
CAPI: Pin capifs instead of mounting it
CAPI: Reduce chattiness during module loading/removal
CAPI: Call a controller 'controller', not 'card'
CAPI: Convert capi drivers rwlock into mutex
CAPI: Rework capi_ctr_ready/down
CAPI: Rework controller state notifier
CAPI: Rework locking of controller data structures
CAPI: Rework application locking
CAPI: Reduce #ifdef mess around CONFIG_ISDN_CAPI_MIDDLEWARE
CAPI: Convert capidev_list_lock into a mutex
CAPI: Clean up capi_open/release
CAPI: Rework locking of capidev members
CAPI: Use non-atomic allocation during NCCI setup
CAPI: Fix racy capi_read
CAPI: Switch NCCI list to standard doubly linked list
CAPI: Switch capiminor list to array
CAPI: Clean up capinc_tty_init/exit
CAPI: Dynamically register minor devices
CAPI: Use dynamic major for NCCI TTYs by default
CAPI: Use kref on capiminor
CAPI: Establish install/cleanup handlers for capiminor TTYs
CAPI: Use tty_port to keep track of capiminor's tty
CAPI: Drop remaining NULL checks on tty->driver_data
CAPI: Issue synchronous hangup on capincci_free_minor
CAPI: Drop obsolete nccip from capiminor struct
CAPI: Clean up capiminors_lock
CAPI: Drop atomic ttyopencount
CAPI: Drop handle_minor_recv from capinc_tty_write
CAPI: Rework capiminor RX handler
CAPI: Rename datahandle_queue -> ackqueue_entry
CAPI: Use atomics for capiminor's datahandle and msgid
CAPI: Drop capiminor's unused inbytes counter
CAPI: Fix locking around capiminor's output queue and drop
workaround_lock
CAPI: Clean up capiminor_*_ack
CAPI: Drop return value of handle_minor_send
CAPI: Drop special controller lookup from capi20_put_message
CAPI: Schedule capifs for removal
CAPI: Remove experimental tag from middleware feature

 Documentation/feature-removal-schedule.txt |   10 +
 drivers/isdn/capi/Kconfig                  |   16 +-
 drivers/isdn/capi/capi.c                   | 1108 ++++++++++++++--------------
 drivers/isdn/capi/capidrv.c                |   48 +-
 drivers/isdn/capi/capifs.c                 |  126 ++--
 drivers/isdn/capi/capifs.h                 |   21 +-
 drivers/isdn/capi/kcapi.c                  |  805 +++++++++++---------
 drivers/isdn/capi/kcapi.h                  |   13 +-
 drivers/isdn/capi/kcapi_proc.c             |   41 +-
 include/linux/isdn/capilli.h               |    5 +-
 include/linux/kernelcapi.h                 |   17 +-
 11 files changed, 1151 insertions(+), 1059 deletions(-)