remove the raw driver
authorChristoph Hellwig <hch@lst.de>
Mon, 31 May 2021 07:25:26 +0000 (10:25 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 4 Jun 2021 13:35:03 +0000 (15:35 +0200)
The raw driver used to provide direct unbuffered access to block devices
before O_DIRECT was invented.  It has been obsolete for more than a
decade.

Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Link: https://lore.kernel.org/lkml/Pine.LNX.4.64.0703180754060.6605@CPE00045a9c397f-CM001225dbafb6/
Signed-off-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20210531072526.97052-1-hch@lst.de
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/char/Kconfig
drivers/char/Makefile
drivers/char/mem.c
drivers/char/raw.c [deleted file]
fs/block_dev.c
include/linux/fs.h
include/uapi/linux/raw.h [deleted file]

index b151e0f..8e516aa 100644 (file)
@@ -357,27 +357,6 @@ config NVRAM
          To compile this driver as a module, choose M here: the
          module will be called nvram.
 
-config RAW_DRIVER
-       tristate "RAW driver (/dev/raw/rawN)"
-       depends on BLOCK
-       help
-         The raw driver permits block devices to be bound to /dev/raw/rawN.
-         Once bound, I/O against /dev/raw/rawN uses efficient zero-copy I/O.
-         See the raw(8) manpage for more details.
-
-         Applications should preferably open the device (eg /dev/hda1)
-         with the O_DIRECT flag.
-
-config MAX_RAW_DEVS
-       int "Maximum number of RAW devices to support (1-65536)"
-       depends on RAW_DRIVER
-       range 1 65536
-       default "256"
-       help
-         The maximum number of RAW devices that are supported.
-         Default is 256. Increase this number in case you need lots of
-         raw devices.
-
 config DEVPORT
        bool "/dev/port character device"
        depends on ISA || PCI
index c7e4fc7..264eb39 100644 (file)
@@ -8,7 +8,6 @@ obj-$(CONFIG_TTY_PRINTK)        += ttyprintk.o
 obj-y                          += misc.o
 obj-$(CONFIG_ATARI_DSP56K)     += dsp56k.o
 obj-$(CONFIG_VIRTIO_CONSOLE)   += virtio_console.o
-obj-$(CONFIG_RAW_DRIVER)       += raw.o
 obj-$(CONFIG_MSPEC)            += mspec.o
 obj-$(CONFIG_UV_MMTIMER)       += uv_mmtimer.o
 obj-$(CONFIG_IBM_BSR)          += bsr.o
index 15dc54f..1c596b5 100644 (file)
@@ -16,7 +16,6 @@
 #include <linux/mman.h>
 #include <linux/random.h>
 #include <linux/init.h>
-#include <linux/raw.h>
 #include <linux/tty.h>
 #include <linux/capability.h>
 #include <linux/ptrace.h>
diff --git a/drivers/char/raw.c b/drivers/char/raw.c
deleted file mode 100644 (file)
index 5d52a1f..0000000
+++ /dev/null
@@ -1,362 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- * linux/drivers/char/raw.c
- *
- * Front-end raw character devices.  These can be bound to any block
- * devices to provide genuine Unix raw character device semantics.
- *
- * We reserve minor number 0 for a control interface.  ioctl()s on this
- * device are used to bind the other minor numbers to block devices.
- */
-
-#include <linux/init.h>
-#include <linux/fs.h>
-#include <linux/major.h>
-#include <linux/blkdev.h>
-#include <linux/backing-dev.h>
-#include <linux/module.h>
-#include <linux/raw.h>
-#include <linux/capability.h>
-#include <linux/uio.h>
-#include <linux/cdev.h>
-#include <linux/device.h>
-#include <linux/mutex.h>
-#include <linux/gfp.h>
-#include <linux/compat.h>
-#include <linux/vmalloc.h>
-
-#include <linux/uaccess.h>
-
-struct raw_device_data {
-       dev_t binding;
-       struct block_device *bdev;
-       int inuse;
-};
-
-static struct class *raw_class;
-static struct raw_device_data *raw_devices;
-static DEFINE_MUTEX(raw_mutex);
-static const struct file_operations raw_ctl_fops; /* forward declaration */
-
-static int max_raw_minors = CONFIG_MAX_RAW_DEVS;
-
-module_param(max_raw_minors, int, 0);
-MODULE_PARM_DESC(max_raw_minors, "Maximum number of raw devices (1-65536)");
-
-/*
- * Open/close code for raw IO.
- *
- * We just rewrite the i_mapping for the /dev/raw/rawN file descriptor to
- * point at the blockdev's address_space and set the file handle to use
- * O_DIRECT.
- *
- * Set the device's soft blocksize to the minimum possible.  This gives the
- * finest possible alignment and has no adverse impact on performance.
- */
-static int raw_open(struct inode *inode, struct file *filp)
-{
-       const int minor = iminor(inode);
-       struct block_device *bdev;
-       int err;
-
-       if (minor == 0) {       /* It is the control device */
-               filp->f_op = &raw_ctl_fops;
-               return 0;
-       }
-
-       pr_warn_ratelimited(
-               "process %s (pid %d) is using the deprecated raw device\n"
-               "support will be removed in Linux 5.14.\n",
-               current->comm, current->pid);
-
-       mutex_lock(&raw_mutex);
-
-       /*
-        * All we need to do on open is check that the device is bound.
-        */
-       err = -ENODEV;
-       if (!raw_devices[minor].binding)
-               goto out;
-       bdev = blkdev_get_by_dev(raw_devices[minor].binding,
-                                filp->f_mode | FMODE_EXCL, raw_open);
-       if (IS_ERR(bdev)) {
-               err = PTR_ERR(bdev);
-               goto out;
-       }
-       err = set_blocksize(bdev, bdev_logical_block_size(bdev));
-       if (err)
-               goto out1;
-       filp->f_flags |= O_DIRECT;
-       filp->f_mapping = bdev->bd_inode->i_mapping;
-       if (++raw_devices[minor].inuse == 1)
-               file_inode(filp)->i_mapping =
-                       bdev->bd_inode->i_mapping;
-       filp->private_data = bdev;
-       raw_devices[minor].bdev = bdev;
-       mutex_unlock(&raw_mutex);
-       return 0;
-
-out1:
-       blkdev_put(bdev, filp->f_mode | FMODE_EXCL);
-out:
-       mutex_unlock(&raw_mutex);
-       return err;
-}
-
-/*
- * When the final fd which refers to this character-special node is closed, we
- * make its ->mapping point back at its own i_data.
- */
-static int raw_release(struct inode *inode, struct file *filp)
-{
-       const int minor= iminor(inode);
-       struct block_device *bdev;
-
-       mutex_lock(&raw_mutex);
-       bdev = raw_devices[minor].bdev;
-       if (--raw_devices[minor].inuse == 0)
-               /* Here  inode->i_mapping == bdev->bd_inode->i_mapping  */
-               inode->i_mapping = &inode->i_data;
-       mutex_unlock(&raw_mutex);
-
-       blkdev_put(bdev, filp->f_mode | FMODE_EXCL);
-       return 0;
-}
-
-/*
- * Forward ioctls to the underlying block device.
- */
-static long
-raw_ioctl(struct file *filp, unsigned int command, unsigned long arg)
-{
-       struct block_device *bdev = filp->private_data;
-       return blkdev_ioctl(bdev, 0, command, arg);
-}
-
-static int bind_set(int number, u64 major, u64 minor)
-{
-       dev_t dev = MKDEV(major, minor);
-       dev_t raw = MKDEV(RAW_MAJOR, number);
-       struct raw_device_data *rawdev;
-       int err = 0;
-
-       if (number <= 0 || number >= max_raw_minors)
-               return -EINVAL;
-
-       if (MAJOR(dev) != major || MINOR(dev) != minor)
-               return -EINVAL;
-
-       rawdev = &raw_devices[number];
-
-       /*
-        * This is like making block devices, so demand the
-        * same capability
-        */
-       if (!capable(CAP_SYS_ADMIN))
-               return -EPERM;
-
-       /*
-        * For now, we don't need to check that the underlying
-        * block device is present or not: we can do that when
-        * the raw device is opened.  Just check that the
-        * major/minor numbers make sense.
-        */
-
-       if (MAJOR(dev) == 0 && dev != 0)
-               return -EINVAL;
-
-       mutex_lock(&raw_mutex);
-       if (rawdev->inuse) {
-               mutex_unlock(&raw_mutex);
-               return -EBUSY;
-       }
-       if (rawdev->binding)
-               module_put(THIS_MODULE);
-
-       rawdev->binding = dev;
-       if (!dev) {
-               /* unbind */
-               device_destroy(raw_class, raw);
-       } else {
-               __module_get(THIS_MODULE);
-               device_destroy(raw_class, raw);
-               device_create(raw_class, NULL, raw, NULL, "raw%d", number);
-       }
-       mutex_unlock(&raw_mutex);
-       return err;
-}
-
-static int bind_get(int number, dev_t *dev)
-{
-       if (number <= 0 || number >= max_raw_minors)
-               return -EINVAL;
-       *dev = raw_devices[number].binding;
-       return 0;
-}
-
-/*
- * Deal with ioctls against the raw-device control interface, to bind
- * and unbind other raw devices.
- */
-static long raw_ctl_ioctl(struct file *filp, unsigned int command,
-                         unsigned long arg)
-{
-       struct raw_config_request rq;
-       dev_t dev;
-       int err;
-
-       switch (command) {
-       case RAW_SETBIND:
-               if (copy_from_user(&rq, (void __user *) arg, sizeof(rq)))
-                       return -EFAULT;
-
-               return bind_set(rq.raw_minor, rq.block_major, rq.block_minor);
-
-       case RAW_GETBIND:
-               if (copy_from_user(&rq, (void __user *) arg, sizeof(rq)))
-                       return -EFAULT;
-
-               err = bind_get(rq.raw_minor, &dev);
-               if (err)
-                       return err;
-
-               rq.block_major = MAJOR(dev);
-               rq.block_minor = MINOR(dev);
-
-               if (copy_to_user((void __user *)arg, &rq, sizeof(rq)))
-                       return -EFAULT;
-
-               return 0;
-       }
-
-       return -EINVAL;
-}
-
-#ifdef CONFIG_COMPAT
-struct raw32_config_request {
-       compat_int_t    raw_minor;
-       compat_u64      block_major;
-       compat_u64      block_minor;
-};
-
-static long raw_ctl_compat_ioctl(struct file *file, unsigned int cmd,
-                               unsigned long arg)
-{
-       struct raw32_config_request __user *user_req = compat_ptr(arg);
-       struct raw32_config_request rq;
-       dev_t dev;
-       int err = 0;
-
-       switch (cmd) {
-       case RAW_SETBIND:
-               if (copy_from_user(&rq, user_req, sizeof(rq)))
-                       return -EFAULT;
-
-               return bind_set(rq.raw_minor, rq.block_major, rq.block_minor);
-
-       case RAW_GETBIND:
-               if (copy_from_user(&rq, user_req, sizeof(rq)))
-                       return -EFAULT;
-
-               err = bind_get(rq.raw_minor, &dev);
-               if (err)
-                       return err;
-
-               rq.block_major = MAJOR(dev);
-               rq.block_minor = MINOR(dev);
-
-               if (copy_to_user(user_req, &rq, sizeof(rq)))
-                       return -EFAULT;
-
-               return 0;
-       }
-
-       return -EINVAL;
-}
-#endif
-
-static const struct file_operations raw_fops = {
-       .read_iter      = blkdev_read_iter,
-       .write_iter     = blkdev_write_iter,
-       .fsync          = blkdev_fsync,
-       .open           = raw_open,
-       .release        = raw_release,
-       .unlocked_ioctl = raw_ioctl,
-       .llseek         = default_llseek,
-       .owner          = THIS_MODULE,
-};
-
-static const struct file_operations raw_ctl_fops = {
-       .unlocked_ioctl = raw_ctl_ioctl,
-#ifdef CONFIG_COMPAT
-       .compat_ioctl   = raw_ctl_compat_ioctl,
-#endif
-       .open           = raw_open,
-       .owner          = THIS_MODULE,
-       .llseek         = noop_llseek,
-};
-
-static struct cdev raw_cdev;
-
-static char *raw_devnode(struct device *dev, umode_t *mode)
-{
-       return kasprintf(GFP_KERNEL, "raw/%s", dev_name(dev));
-}
-
-static int __init raw_init(void)
-{
-       dev_t dev = MKDEV(RAW_MAJOR, 0);
-       int ret;
-
-       if (max_raw_minors < 1 || max_raw_minors > 65536) {
-               pr_warn("raw: invalid max_raw_minors (must be between 1 and 65536), using %d\n",
-                       CONFIG_MAX_RAW_DEVS);
-               max_raw_minors = CONFIG_MAX_RAW_DEVS;
-       }
-
-       raw_devices = vzalloc(array_size(max_raw_minors,
-                                        sizeof(struct raw_device_data)));
-       if (!raw_devices) {
-               printk(KERN_ERR "Not enough memory for raw device structures\n");
-               ret = -ENOMEM;
-               goto error;
-       }
-
-       ret = register_chrdev_region(dev, max_raw_minors, "raw");
-       if (ret)
-               goto error;
-
-       cdev_init(&raw_cdev, &raw_fops);
-       ret = cdev_add(&raw_cdev, dev, max_raw_minors);
-       if (ret)
-               goto error_region;
-       raw_class = class_create(THIS_MODULE, "raw");
-       if (IS_ERR(raw_class)) {
-               printk(KERN_ERR "Error creating raw class.\n");
-               cdev_del(&raw_cdev);
-               ret = PTR_ERR(raw_class);
-               goto error_region;
-       }
-       raw_class->devnode = raw_devnode;
-       device_create(raw_class, NULL, MKDEV(RAW_MAJOR, 0), NULL, "rawctl");
-
-       return 0;
-
-error_region:
-       unregister_chrdev_region(dev, max_raw_minors);
-error:
-       vfree(raw_devices);
-       return ret;
-}
-
-static void __exit raw_exit(void)
-{
-       device_destroy(raw_class, MKDEV(RAW_MAJOR, 0));
-       class_destroy(raw_class);
-       cdev_del(&raw_cdev);
-       unregister_chrdev_region(MKDEV(RAW_MAJOR, 0), max_raw_minors);
-}
-
-module_init(raw_init);
-module_exit(raw_exit);
-MODULE_LICENSE("GPL");
index 6cc4d4c..15c448e 100644 (file)
@@ -1669,7 +1669,7 @@ static long block_ioctl(struct file *file, unsigned cmd, unsigned long arg)
  * Does not take i_mutex for the write and thus is not for general purpose
  * use.
  */
-ssize_t blkdev_write_iter(struct kiocb *iocb, struct iov_iter *from)
+static ssize_t blkdev_write_iter(struct kiocb *iocb, struct iov_iter *from)
 {
        struct file *file = iocb->ki_filp;
        struct inode *bd_inode = bdev_file_inode(file);
@@ -1707,9 +1707,8 @@ ssize_t blkdev_write_iter(struct kiocb *iocb, struct iov_iter *from)
        blk_finish_plug(&plug);
        return ret;
 }
-EXPORT_SYMBOL_GPL(blkdev_write_iter);
 
-ssize_t blkdev_read_iter(struct kiocb *iocb, struct iov_iter *to)
+static ssize_t blkdev_read_iter(struct kiocb *iocb, struct iov_iter *to)
 {
        struct file *file = iocb->ki_filp;
        struct inode *bd_inode = bdev_file_inode(file);
@@ -1731,7 +1730,6 @@ ssize_t blkdev_read_iter(struct kiocb *iocb, struct iov_iter *to)
        iov_iter_reexpand(to, iov_iter_count(to) + shorted);
        return ret;
 }
-EXPORT_SYMBOL_GPL(blkdev_read_iter);
 
 /*
  * Try to release a page associated with block device when the system
index c3c88fd..8652ed7 100644 (file)
@@ -3242,11 +3242,8 @@ ssize_t vfs_iocb_iter_write(struct file *file, struct kiocb *iocb,
                            struct iov_iter *iter);
 
 /* fs/block_dev.c */
-extern ssize_t blkdev_read_iter(struct kiocb *iocb, struct iov_iter *to);
-extern ssize_t blkdev_write_iter(struct kiocb *iocb, struct iov_iter *from);
 extern int blkdev_fsync(struct file *filp, loff_t start, loff_t end,
                        int datasync);
-extern void block_sync_page(struct page *page);
 
 /* fs/splice.c */
 extern ssize_t generic_file_splice_read(struct file *, loff_t *,
diff --git a/include/uapi/linux/raw.h b/include/uapi/linux/raw.h
deleted file mode 100644 (file)
index 4787491..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
-#ifndef __LINUX_RAW_H
-#define __LINUX_RAW_H
-
-#include <linux/types.h>
-
-#define RAW_SETBIND    _IO( 0xac, 0 )
-#define RAW_GETBIND    _IO( 0xac, 1 )
-
-struct raw_config_request 
-{
-       int     raw_minor;
-       __u64   block_major;
-       __u64   block_minor;
-};
-
-#endif /* __LINUX_RAW_H */