mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-30 08:02:30 +00:00
33f0f88f1c
The API and code have been through various bits of initial review by
serial driver people but they definitely need to live somewhere for a
while so the unconverted drivers can get knocked into shape, existing
drivers that have been updated can be better tuned and bugs whacked out.
This replaces the tty flip buffers with kmalloc objects in rings. In the
normal situation for an IRQ driven serial port at typical speeds the
behaviour is pretty much the same, two buffers end up allocated and the
kernel cycles between them as before.
When there are delays or at high speed we now behave far better as the
buffer pool can grow a bit rather than lose characters. This also means
that we can operate at higher speeds reliably.
For drivers that receive characters in blocks (DMA based, USB and
especially virtualisation) the layer allows a lot of driver specific
code that works around the tty layer with private secondary queues to be
removed. The IBM folks need this sort of layer, the smart serial port
people do, the virtualisers do (because a virtualised tty typically
operates at infinite speed rather than emulating 9600 baud).
Finally many drivers had invalid and unsafe attempts to avoid buffer
overflows by directly invoking tty methods extracted out of the innards
of work queue structs. These are no longer needed and all go away. That
fixes various random hangs with serial ports on overflow.
The other change in here is to optimise the receive_room path that is
used by some callers. It turns out that only one ldisc uses receive room
except asa constant and it updates it far far less than the value is
read. We thus make it a variable not a function call.
I expect the code to contain bugs due to the size alone but I'll be
watching and squashing them and feeding out new patches as it goes.
Because the buffers now dynamically expand you should only run out of
buffering when the kernel runs out of memory for real. That means a lot of
the horrible hacks high performance drivers used to do just aren't needed any
more.
Description:
tty_insert_flip_char is an old API and continues to work as before, as does
tty_flip_buffer_push() [this is why many drivers dont need modification]. It
does now also return the number of chars inserted
There are also
tty_buffer_request_room(tty, len)
which asks for a buffer block of the length requested and returns the space
found. This improves efficiency with hardware that knows how much to
transfer.
and tty_insert_flip_string_flags(tty, str, flags, len)
to insert a string of characters and flags
For a smart interface the usual code is
len = tty_request_buffer_room(tty, amount_hardware_says);
tty_insert_flip_string(tty, buffer_from_card, len);
More description!
At the moment tty buffers are attached directly to the tty. This is causing a
lot of the problems related to tty layer locking, also problems at high speed
and also with bursty data (such as occurs in virtualised environments)
I'm working on ripping out the flip buffers and replacing them with a pool of
dynamically allocated buffers. This allows both for old style "byte I/O"
devices and also helps virtualisation and smart devices where large blocks of
data suddenely materialise and need storing.
So far so good. Lots of drivers reference tty->flip.*. Several of them also
call directly and unsafely into function pointers it provides. This will all
break. Most drivers can use tty_insert_flip_char which can be kept as an API
but others need more.
At the moment I've added the following interfaces, if people think more will
be needed now is a good time to say
int tty_buffer_request_room(tty, size)
Try and ensure at least size bytes are available, returns actual room (may be
zero). At the moment it just uses the flipbuf space but that will change.
Repeated calls without characters being added are not cumulative. (ie if you
call it with 1, 1, 1, and then 4 you'll have four characters of space. The
other functions will also try and grow buffers in future but this will be a
more efficient way when you know block sizes.
int tty_insert_flip_char(tty, ch, flag)
As before insert a character if there is room. Now returns 1 for success, 0
for failure.
int tty_insert_flip_string(tty, str, len)
Insert a block of non error characters. Returns the number inserted.
int tty_prepare_flip_string(tty, strptr, len)
Adjust the buffer to allow len characters to be added. Returns a buffer
pointer in strptr and the length available. This allows for hardware that
needs to use functions like insl or mencpy_fromio.
Signed-off-by: Alan Cox <alan@redhat.com>
Cc: Paul Fulghum <paulkf@microgate.com>
Signed-off-by: Hirokazu Takata <takata@linux-m32r.org>
Signed-off-by: Serge Hallyn <serue@us.ibm.com>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: John Hawkes <hawkes@sgi.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
145 lines
5.2 KiB
C
145 lines
5.2 KiB
C
#ifndef _LINUX_TTY_LDISC_H
|
|
#define _LINUX_TTY_LDISC_H
|
|
|
|
/*
|
|
* This structure defines the interface between the tty line discipline
|
|
* implementation and the tty routines. The following routines can be
|
|
* defined; unless noted otherwise, they are optional, and can be
|
|
* filled in with a null pointer.
|
|
*
|
|
* int (*open)(struct tty_struct *);
|
|
*
|
|
* This function is called when the line discipline is associated
|
|
* with the tty. The line discipline can use this as an
|
|
* opportunity to initialize any state needed by the ldisc routines.
|
|
*
|
|
* void (*close)(struct tty_struct *);
|
|
*
|
|
* This function is called when the line discipline is being
|
|
* shutdown, either because the tty is being closed or because
|
|
* the tty is being changed to use a new line discipline
|
|
*
|
|
* void (*flush_buffer)(struct tty_struct *tty);
|
|
*
|
|
* This function instructs the line discipline to clear its
|
|
* buffers of any input characters it may have queued to be
|
|
* delivered to the user mode process.
|
|
*
|
|
* ssize_t (*chars_in_buffer)(struct tty_struct *tty);
|
|
*
|
|
* This function returns the number of input characters the line
|
|
* discipline may have queued up to be delivered to the user mode
|
|
* process.
|
|
*
|
|
* ssize_t (*read)(struct tty_struct * tty, struct file * file,
|
|
* unsigned char * buf, size_t nr);
|
|
*
|
|
* This function is called when the user requests to read from
|
|
* the tty. The line discipline will return whatever characters
|
|
* it has buffered up for the user. If this function is not
|
|
* defined, the user will receive an EIO error.
|
|
*
|
|
* ssize_t (*write)(struct tty_struct * tty, struct file * file,
|
|
* const unsigned char * buf, size_t nr);
|
|
*
|
|
* This function is called when the user requests to write to the
|
|
* tty. The line discipline will deliver the characters to the
|
|
* low-level tty device for transmission, optionally performing
|
|
* some processing on the characters first. If this function is
|
|
* not defined, the user will receive an EIO error.
|
|
*
|
|
* int (*ioctl)(struct tty_struct * tty, struct file * file,
|
|
* unsigned int cmd, unsigned long arg);
|
|
*
|
|
* This function is called when the user requests an ioctl which
|
|
* is not handled by the tty layer or the low-level tty driver.
|
|
* It is intended for ioctls which affect line discpline
|
|
* operation. Note that the search order for ioctls is (1) tty
|
|
* layer, (2) tty low-level driver, (3) line discpline. So a
|
|
* low-level driver can "grab" an ioctl request before the line
|
|
* discpline has a chance to see it.
|
|
*
|
|
* void (*set_termios)(struct tty_struct *tty, struct termios * old);
|
|
*
|
|
* This function notifies the line discpline that a change has
|
|
* been made to the termios structure.
|
|
*
|
|
* int (*poll)(struct tty_struct * tty, struct file * file,
|
|
* poll_table *wait);
|
|
*
|
|
* This function is called when a user attempts to select/poll on a
|
|
* tty device. It is solely the responsibility of the line
|
|
* discipline to handle poll requests.
|
|
*
|
|
* void (*receive_buf)(struct tty_struct *, const unsigned char *cp,
|
|
* char *fp, int count);
|
|
*
|
|
* This function is called by the low-level tty driver to send
|
|
* characters received by the hardware to the line discpline for
|
|
* processing. <cp> is a pointer to the buffer of input
|
|
* character received by the device. <fp> is a pointer to a
|
|
* pointer of flag bytes which indicate whether a character was
|
|
* received with a parity error, etc.
|
|
*
|
|
* void (*write_wakeup)(struct tty_struct *);
|
|
*
|
|
* This function is called by the low-level tty driver to signal
|
|
* that line discpline should try to send more characters to the
|
|
* low-level driver for transmission. If the line discpline does
|
|
* not have any more data to send, it can just return.
|
|
*
|
|
* int (*hangup)(struct tty_struct *)
|
|
*
|
|
* Called on a hangup. Tells the discipline that it should
|
|
* cease I/O to the tty driver. Can sleep. The driver should
|
|
* seek to perform this action quickly but should wait until
|
|
* any pending driver I/O is completed.
|
|
*/
|
|
|
|
#include <linux/fs.h>
|
|
#include <linux/wait.h>
|
|
|
|
struct tty_ldisc {
|
|
int magic;
|
|
char *name;
|
|
int num;
|
|
int flags;
|
|
|
|
/*
|
|
* The following routines are called from above.
|
|
*/
|
|
int (*open)(struct tty_struct *);
|
|
void (*close)(struct tty_struct *);
|
|
void (*flush_buffer)(struct tty_struct *tty);
|
|
ssize_t (*chars_in_buffer)(struct tty_struct *tty);
|
|
ssize_t (*read)(struct tty_struct * tty, struct file * file,
|
|
unsigned char __user * buf, size_t nr);
|
|
ssize_t (*write)(struct tty_struct * tty, struct file * file,
|
|
const unsigned char * buf, size_t nr);
|
|
int (*ioctl)(struct tty_struct * tty, struct file * file,
|
|
unsigned int cmd, unsigned long arg);
|
|
void (*set_termios)(struct tty_struct *tty, struct termios * old);
|
|
unsigned int (*poll)(struct tty_struct *, struct file *,
|
|
struct poll_table_struct *);
|
|
int (*hangup)(struct tty_struct *tty);
|
|
|
|
/*
|
|
* The following routines are called from below.
|
|
*/
|
|
void (*receive_buf)(struct tty_struct *, const unsigned char *cp,
|
|
char *fp, int count);
|
|
void (*write_wakeup)(struct tty_struct *);
|
|
|
|
struct module *owner;
|
|
|
|
int refcount;
|
|
};
|
|
|
|
#define TTY_LDISC_MAGIC 0x5403
|
|
|
|
#define LDISC_FLAG_DEFINED 0x00000001
|
|
|
|
#define MODULE_ALIAS_LDISC(ldisc) \
|
|
MODULE_ALIAS("tty-ldisc-" __stringify(ldisc))
|
|
|
|
#endif /* _LINUX_TTY_LDISC_H */
|