* [PATCH v3 0/4] scsi: cleanup ioctl headers and provide UAPI versions
@ 2015-09-25 9:27 Paolo Bonzini
2015-09-25 9:27 ` [PATCH v3 1/4] scsi: remove old-style type names from sg.h Paolo Bonzini
` (5 more replies)
0 siblings, 6 replies; 18+ messages in thread
From: Paolo Bonzini @ 2015-09-25 9:27 UTC (permalink / raw)
To: linux-kernel, kvm
Cc: bart.vanassche, James Bottomley, Christoph Hellwig, linux-scsi
This is v3 of the series to provide an "official" sg.h header (and
scsi_ioctl.h too, though it's basically obsolete) together with the other
userspace API definitions. The change from v2 to v3 is that defaults
for sg.c are not exported in include/uapi/linux/sg.c.
Paolo
2.5.0
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH v3 1/4] scsi: remove old-style type names from sg.h
2015-09-25 9:27 [PATCH v3 0/4] scsi: cleanup ioctl headers and provide UAPI versions Paolo Bonzini
@ 2015-09-25 9:27 ` Paolo Bonzini
2015-09-25 23:50 ` Hannes Reinecke
2015-09-28 6:47 ` Douglas Gilbert
2015-09-25 9:27 ` [PATCH v3 2/4] scsi: cleanup scsi/scsi_ioctl.h Paolo Bonzini
` (4 subsequent siblings)
5 siblings, 2 replies; 18+ messages in thread
From: Paolo Bonzini @ 2015-09-25 9:27 UTC (permalink / raw)
To: linux-kernel, kvm
Cc: bart.vanassche, James Bottomley, Christoph Hellwig, linux-scsi
These will not be exported by the new linux/sg.h header, and scsi/sg.h will
not have any user API after linux/sg.h is created. Since they have no
user in the kernel, they can be zapped.
Cc: James Bottomley <jbottomley@parallels.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: linux-scsi@vger.kernel.org
Reviewed-by: Bart Van Assche <bart.vanassche@sandisk.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
include/scsi/sg.h | 6 ------
1 file changed, 6 deletions(-)
diff --git a/include/scsi/sg.h b/include/scsi/sg.h
index 3afec7032448..370c78c37926 100644
--- a/include/scsi/sg.h
+++ b/include/scsi/sg.h
@@ -207,12 +207,6 @@ typedef struct sg_req_info { /* used by SG_GET_REQUEST_TABLE ioctl() */
#define SG_BIG_BUFF SG_DEF_RESERVED_SIZE /* for backward compatibility */
-/* Alternate style type names, "..._t" variants preferred */
-typedef struct sg_io_hdr Sg_io_hdr;
-typedef struct sg_io_vec Sg_io_vec;
-typedef struct sg_scsi_id Sg_scsi_id;
-typedef struct sg_req_info Sg_req_info;
-
/* vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv */
/* The older SG interface based on the 'sg_header' structure follows. */
--
2.5.0
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH v3 2/4] scsi: cleanup scsi/scsi_ioctl.h
2015-09-25 9:27 [PATCH v3 0/4] scsi: cleanup ioctl headers and provide UAPI versions Paolo Bonzini
2015-09-25 9:27 ` [PATCH v3 1/4] scsi: remove old-style type names from sg.h Paolo Bonzini
@ 2015-09-25 9:27 ` Paolo Bonzini
2015-09-25 23:51 ` Hannes Reinecke
2015-09-28 6:47 ` Douglas Gilbert
2015-09-25 9:27 ` [PATCH v3 3/4] scsi: move all obsolete ioctls to scsi_ioctl.h Paolo Bonzini
` (3 subsequent siblings)
5 siblings, 2 replies; 18+ messages in thread
From: Paolo Bonzini @ 2015-09-25 9:27 UTC (permalink / raw)
To: linux-kernel, kvm
Cc: bart.vanassche, James Bottomley, Christoph Hellwig, linux-scsi
SCSI_REMOVAL_* goes together with other SCSI command constants in
include/scsi/scsi.h. It is also used outside the implementation
of the ioctls (and it is not part of the user API).
scsi_fctargaddress/Scsi_FCTargAddress has had no in-tree use since
commit ca61f10ab2b8 ("[SCSI] remove broken driver cpqfc", 2005-10-29).
Remove it, just in time for the the tenth anniversary of its demise.
Cc: James Bottomley <jbottomley@parallels.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: linux-scsi@vger.kernel.org
Reviewed-by: Bart Van Assche <bart.vanassche@sandisk.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
include/scsi/scsi.h | 6 ++++++
include/scsi/scsi_ioctl.h | 8 --------
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/include/scsi/scsi.h b/include/scsi/scsi.h
index e0a3398b1547..5e2bafdbd96f 100644
--- a/include/scsi/scsi.h
+++ b/include/scsi/scsi.h
@@ -279,6 +279,12 @@ static inline int scsi_is_wlun(u64 lun)
#define SCSI_INQ_PQ_NOT_CON 0x01
#define SCSI_INQ_PQ_NOT_CAP 0x03
+/*
+ * PREVENT/ALLOW MEDIUM REMOVAL
+ */
+#define SCSI_REMOVAL_PREVENT 1
+#define SCSI_REMOVAL_ALLOW 0
+
/*
* Here are some scsi specific ioctl commands which are sometimes useful.
diff --git a/include/scsi/scsi_ioctl.h b/include/scsi/scsi_ioctl.h
index 8d19d1d233c3..c81962bef7a0 100644
--- a/include/scsi/scsi_ioctl.h
+++ b/include/scsi/scsi_ioctl.h
@@ -12,9 +12,6 @@
#define SCSI_IOCTL_DOORLOCK 0x5380 /* lock the eject mechanism */
#define SCSI_IOCTL_DOORUNLOCK 0x5381 /* unlock the mechanism */
-#define SCSI_REMOVAL_PREVENT 1
-#define SCSI_REMOVAL_ALLOW 0
-
#ifdef __KERNEL__
struct scsi_device;
@@ -34,11 +31,6 @@ typedef struct scsi_idlun {
__u32 host_unique_id;
} Scsi_Idlun;
-/* Fibre Channel WWN, port_id struct */
-typedef struct scsi_fctargaddress {
- __u32 host_port_id;
- unsigned char host_wwn[8]; // include NULL term.
-} Scsi_FCTargAddress;
int scsi_ioctl_block_when_processing_errors(struct scsi_device *sdev,
int cmd, bool ndelay);
--
2.5.0
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH v3 3/4] scsi: move all obsolete ioctls to scsi_ioctl.h
2015-09-25 9:27 [PATCH v3 0/4] scsi: cleanup ioctl headers and provide UAPI versions Paolo Bonzini
2015-09-25 9:27 ` [PATCH v3 1/4] scsi: remove old-style type names from sg.h Paolo Bonzini
2015-09-25 9:27 ` [PATCH v3 2/4] scsi: cleanup scsi/scsi_ioctl.h Paolo Bonzini
@ 2015-09-25 9:27 ` Paolo Bonzini
2015-09-25 23:52 ` Hannes Reinecke
2015-09-28 6:49 ` Douglas Gilbert
2015-09-25 9:27 ` [PATCH v3 4/4] scsi: provide UAPI version of scsi/sg.h and scsi/scsi_ioctl.h Paolo Bonzini
` (2 subsequent siblings)
5 siblings, 2 replies; 18+ messages in thread
From: Paolo Bonzini @ 2015-09-25 9:27 UTC (permalink / raw)
To: linux-kernel, kvm
Cc: bart.vanassche, James Bottomley, Christoph Hellwig, linux-scsi
Some are in scsi.h. Keep them together in preparation for exposing them
in UAPI headers.
Cc: James Bottomley <jbottomley@parallels.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: linux-scsi@vger.kernel.org
Reviewed-by: Bart Van Assche <bart.vanassche@sandisk.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
include/scsi/scsi.h | 20 --------------------
include/scsi/scsi_ioctl.h | 20 ++++++++++++++++++++
2 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/include/scsi/scsi.h b/include/scsi/scsi.h
index 5e2bafdbd96f..a96df31af89e 100644
--- a/include/scsi/scsi.h
+++ b/include/scsi/scsi.h
@@ -286,26 +286,6 @@ static inline int scsi_is_wlun(u64 lun)
#define SCSI_REMOVAL_ALLOW 0
-/*
- * Here are some scsi specific ioctl commands which are sometimes useful.
- *
- * Note that include/linux/cdrom.h also defines IOCTL 0x5300 - 0x5395
- */
-
-/* Used to obtain PUN and LUN info. Conflicts with CDROMAUDIOBUFSIZ */
-#define SCSI_IOCTL_GET_IDLUN 0x5382
-
-/* 0x5383 and 0x5384 were used for SCSI_IOCTL_TAGGED_{ENABLE,DISABLE} */
-
-/* Used to obtain the host number of a device. */
-#define SCSI_IOCTL_PROBE_HOST 0x5385
-
-/* Used to obtain the bus number for a device */
-#define SCSI_IOCTL_GET_BUS_NUMBER 0x5386
-
-/* Used to obtain the PCI location of a device */
-#define SCSI_IOCTL_GET_PCI 0x5387
-
/* Pull a u32 out of a SCSI message (using BE SCSI conventions) */
static inline __u32 scsi_to_u32(__u8 *ptr)
{
diff --git a/include/scsi/scsi_ioctl.h b/include/scsi/scsi_ioctl.h
index c81962bef7a0..2bd9d67c201a 100644
--- a/include/scsi/scsi_ioctl.h
+++ b/include/scsi/scsi_ioctl.h
@@ -12,6 +12,26 @@
#define SCSI_IOCTL_DOORLOCK 0x5380 /* lock the eject mechanism */
#define SCSI_IOCTL_DOORUNLOCK 0x5381 /* unlock the mechanism */
+/*
+ * Here are some obsolete SCSI-specific ioctl commands.
+ *
+ * Note that include/linux/cdrom.h also defines IOCTL 0x5300 - 0x5395
+ */
+
+/* Used to obtain PUN and LUN info. Conflicts with CDROMAUDIOBUFSIZ */
+#define SCSI_IOCTL_GET_IDLUN 0x5382
+
+/* 0x5383 and 0x5384 were used for SCSI_IOCTL_TAGGED_{ENABLE,DISABLE} */
+
+/* Used to obtain the host number of a device. */
+#define SCSI_IOCTL_PROBE_HOST 0x5385
+
+/* Used to obtain the bus number for a device */
+#define SCSI_IOCTL_GET_BUS_NUMBER 0x5386
+
+/* Used to obtain the PCI location of a device */
+#define SCSI_IOCTL_GET_PCI 0x5387
+
#ifdef __KERNEL__
struct scsi_device;
--
2.5.0
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH v3 4/4] scsi: provide UAPI version of scsi/sg.h and scsi/scsi_ioctl.h
2015-09-25 9:27 [PATCH v3 0/4] scsi: cleanup ioctl headers and provide UAPI versions Paolo Bonzini
` (2 preceding siblings ...)
2015-09-25 9:27 ` [PATCH v3 3/4] scsi: move all obsolete ioctls to scsi_ioctl.h Paolo Bonzini
@ 2015-09-25 9:27 ` Paolo Bonzini
2015-09-25 15:22 ` Bart Van Assche
` (3 more replies)
2015-09-25 15:17 ` [PATCH v3 0/4] scsi: cleanup ioctl headers and provide UAPI versions Christoph Hellwig
2015-12-28 23:27 ` Paolo Bonzini
5 siblings, 4 replies; 18+ messages in thread
From: Paolo Bonzini @ 2015-09-25 9:27 UTC (permalink / raw)
To: linux-kernel, kvm
Cc: bart.vanassche, James Bottomley, Christoph Hellwig, linux-scsi
Provide a UAPI version of the header in the kernel, making it easier
for interested projects to use an up-to-date version of the header.
The new headers are placed under uapi/linux/ so as not to conflict
with the glibc-provided headers in /usr/include/scsi.
/dev/sgN default values are implementation aspects, and are moved to
drivers/scsi/sg.c instead (together with e.g. SG_ALLOW_DIO_DEF).
However, SG_SCATTER_SZ is used by Wine so it is kept in linux/sg.h
SG_MAX_QUEUE could also be useful.
struct scsi_ioctl_command and struct scsi_idlun used to be under
"#ifdef __KERNEL__", but they are actually useful for userspace as
well. Add them to the new header.
Cc: James Bottomley <jbottomley@parallels.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: linux-scsi@vger.kernel.org
Cc: Bart Van Assche <bart.vanassche@sandisk.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
drivers/scsi/sg.c | 8 +-
include/scsi/scsi_ioctl.h | 50 +-----
include/scsi/sg.h | 261 +-----------------------------
include/uapi/linux/Kbuild | 2 +
include/{scsi => uapi/linux}/scsi_ioctl.h | 23 +--
include/{scsi => uapi/linux}/sg.h | 40 +----
6 files changed, 25 insertions(+), 359 deletions(-)
copy include/{scsi => uapi/linux}/scsi_ioctl.h (77%)
copy include/{scsi => uapi/linux}/sg.h (91%)
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index 9d7b7db75e4b..3410e50a37d0 100644
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -90,7 +90,14 @@ static void sg_proc_cleanup(void);
*/
#define MULDIV(X,MUL,DIV) ((((X % DIV) * MUL) / DIV) + ((X / DIV) * MUL))
+#define SG_DEFAULT_TIMEOUT_USER (60*USER_HZ) /* HZ == 'jiffies in 1 second' */
#define SG_DEFAULT_TIMEOUT MULDIV(SG_DEFAULT_TIMEOUT_USER, HZ, USER_HZ)
+#define SG_DEFAULT_RETRIES 0
+#define SG_DEF_FORCE_LOW_DMA 0
+#define SG_DEF_FORCE_PACK_ID 0
+#define SG_DEF_KEEP_ORPHAN 0
+#define SG_DEF_COMMAND_Q 0
+#define SG_DEF_RESERVED_SIZE SG_SCATTER_SZ
int sg_big_buff = SG_DEF_RESERVED_SIZE;
/* N.B. This variable is readable and writeable via
diff --git a/include/scsi/scsi_ioctl.h b/include/scsi/scsi_ioctl.h
index 2bd9d67c201a..d54f9db2e079 100644
--- a/include/scsi/scsi_ioctl.h
+++ b/include/scsi/scsi_ioctl.h
@@ -1,60 +1,12 @@
#ifndef _SCSI_IOCTL_H
#define _SCSI_IOCTL_H
-#define SCSI_IOCTL_SEND_COMMAND 1
-#define SCSI_IOCTL_TEST_UNIT_READY 2
-#define SCSI_IOCTL_BENCHMARK_COMMAND 3
-#define SCSI_IOCTL_SYNC 4 /* Request synchronous parameters */
-#define SCSI_IOCTL_START_UNIT 5
-#define SCSI_IOCTL_STOP_UNIT 6
-/* The door lock/unlock constants are compatible with Sun constants for
- the cdrom */
-#define SCSI_IOCTL_DOORLOCK 0x5380 /* lock the eject mechanism */
-#define SCSI_IOCTL_DOORUNLOCK 0x5381 /* unlock the mechanism */
-
-/*
- * Here are some obsolete SCSI-specific ioctl commands.
- *
- * Note that include/linux/cdrom.h also defines IOCTL 0x5300 - 0x5395
- */
-
-/* Used to obtain PUN and LUN info. Conflicts with CDROMAUDIOBUFSIZ */
-#define SCSI_IOCTL_GET_IDLUN 0x5382
-
-/* 0x5383 and 0x5384 were used for SCSI_IOCTL_TAGGED_{ENABLE,DISABLE} */
-
-/* Used to obtain the host number of a device. */
-#define SCSI_IOCTL_PROBE_HOST 0x5385
-
-/* Used to obtain the bus number for a device */
-#define SCSI_IOCTL_GET_BUS_NUMBER 0x5386
-
-/* Used to obtain the PCI location of a device */
-#define SCSI_IOCTL_GET_PCI 0x5387
-
-#ifdef __KERNEL__
+#include <uapi/linux/scsi_ioctl.h>
struct scsi_device;
-/*
- * Structures used for scsi_ioctl et al.
- */
-
-typedef struct scsi_ioctl_command {
- unsigned int inlen;
- unsigned int outlen;
- unsigned char data[0];
-} Scsi_Ioctl_Command;
-
-typedef struct scsi_idlun {
- __u32 dev_id;
- __u32 host_unique_id;
-} Scsi_Idlun;
-
-
int scsi_ioctl_block_when_processing_errors(struct scsi_device *sdev,
int cmd, bool ndelay);
extern int scsi_ioctl(struct scsi_device *, int, void __user *);
-#endif /* __KERNEL__ */
#endif /* _SCSI_IOCTL_H */
diff --git a/include/scsi/sg.h b/include/scsi/sg.h
index 370c78c37926..f9d3d1dace41 100644
--- a/include/scsi/sg.h
+++ b/include/scsi/sg.h
@@ -2,267 +2,8 @@
#define _SCSI_GENERIC_H
#include <linux/compiler.h>
+#include <uapi/linux/sg.h>
-/*
- * History:
- * Started: Aug 9 by Lawrence Foard (entropy@world.std.com), to allow user
- * process control of SCSI devices.
- * Development Sponsored by Killy Corp. NY NY
- *
- * Original driver (sg.h):
- * Copyright (C) 1992 Lawrence Foard
- * Version 2 and 3 extensions to driver:
- * Copyright (C) 1998 - 2014 Douglas Gilbert
- *
- * Version: 3.5.36 (20140603)
- * This version is for 2.6 and 3 series kernels.
- *
- * Documentation
- * =============
- * A web site for the SG device driver can be found at:
- * http://sg.danny.cz/sg [alternatively check the MAINTAINERS file]
- * The documentation for the sg version 3 driver can be found at:
- * http://sg.danny.cz/sg/p/sg_v3_ho.html
- * Also see: <kernel_source>/Documentation/scsi/scsi-generic.txt
- *
- * For utility and test programs see: http://sg.danny.cz/sg/sg3_utils.html
- */
-
-#ifdef __KERNEL__
extern int sg_big_buff; /* for sysctl */
-#endif
-
-
-typedef struct sg_iovec /* same structure as used by readv() Linux system */
-{ /* call. It defines one scatter-gather element. */
- void __user *iov_base; /* Starting address */
- size_t iov_len; /* Length in bytes */
-} sg_iovec_t;
-
-
-typedef struct sg_io_hdr
-{
- int interface_id; /* [i] 'S' for SCSI generic (required) */
- int dxfer_direction; /* [i] data transfer direction */
- unsigned char cmd_len; /* [i] SCSI command length */
- unsigned char mx_sb_len; /* [i] max length to write to sbp */
- unsigned short iovec_count; /* [i] 0 implies no scatter gather */
- unsigned int dxfer_len; /* [i] byte count of data transfer */
- void __user *dxferp; /* [i], [*io] points to data transfer memory
- or scatter gather list */
- unsigned char __user *cmdp; /* [i], [*i] points to command to perform */
- void __user *sbp; /* [i], [*o] points to sense_buffer memory */
- unsigned int timeout; /* [i] MAX_UINT->no timeout (unit: millisec) */
- unsigned int flags; /* [i] 0 -> default, see SG_FLAG... */
- int pack_id; /* [i->o] unused internally (normally) */
- void __user * usr_ptr; /* [i->o] unused internally */
- unsigned char status; /* [o] scsi status */
- unsigned char masked_status;/* [o] shifted, masked scsi status */
- unsigned char msg_status; /* [o] messaging level data (optional) */
- unsigned char sb_len_wr; /* [o] byte count actually written to sbp */
- unsigned short host_status; /* [o] errors from host adapter */
- unsigned short driver_status;/* [o] errors from software driver */
- int resid; /* [o] dxfer_len - actual_transferred */
- unsigned int duration; /* [o] time taken by cmd (unit: millisec) */
- unsigned int info; /* [o] auxiliary information */
-} sg_io_hdr_t; /* 64 bytes long (on i386) */
-
-#define SG_INTERFACE_ID_ORIG 'S'
-
-/* Use negative values to flag difference from original sg_header structure */
-#define SG_DXFER_NONE (-1) /* e.g. a SCSI Test Unit Ready command */
-#define SG_DXFER_TO_DEV (-2) /* e.g. a SCSI WRITE command */
-#define SG_DXFER_FROM_DEV (-3) /* e.g. a SCSI READ command */
-#define SG_DXFER_TO_FROM_DEV (-4) /* treated like SG_DXFER_FROM_DEV with the
- additional property than during indirect
- IO the user buffer is copied into the
- kernel buffers before the transfer */
-#define SG_DXFER_UNKNOWN (-5) /* Unknown data direction */
-
-/* following flag values can be "or"-ed together */
-#define SG_FLAG_DIRECT_IO 1 /* default is indirect IO */
-#define SG_FLAG_UNUSED_LUN_INHIBIT 2 /* default is overwrite lun in SCSI */
- /* command block (when <= SCSI_2) */
-#define SG_FLAG_MMAP_IO 4 /* request memory mapped IO */
-#define SG_FLAG_NO_DXFER 0x10000 /* no transfer of kernel buffers to/from */
- /* user space (debug indirect IO) */
-/* defaults:: for sg driver: Q_AT_HEAD; for block layer: Q_AT_TAIL */
-#define SG_FLAG_Q_AT_TAIL 0x10
-#define SG_FLAG_Q_AT_HEAD 0x20
-
-/* following 'info' values are "or"-ed together */
-#define SG_INFO_OK_MASK 0x1
-#define SG_INFO_OK 0x0 /* no sense, host nor driver "noise" */
-#define SG_INFO_CHECK 0x1 /* something abnormal happened */
-
-#define SG_INFO_DIRECT_IO_MASK 0x6
-#define SG_INFO_INDIRECT_IO 0x0 /* data xfer via kernel buffers (or no xfer) */
-#define SG_INFO_DIRECT_IO 0x2 /* direct IO requested and performed */
-#define SG_INFO_MIXED_IO 0x4 /* part direct, part indirect IO */
-
-
-typedef struct sg_scsi_id { /* used by SG_GET_SCSI_ID ioctl() */
- int host_no; /* as in "scsi<n>" where 'n' is one of 0, 1, 2 etc */
- int channel;
- int scsi_id; /* scsi id of target device */
- int lun;
- int scsi_type; /* TYPE_... defined in scsi/scsi.h */
- short h_cmd_per_lun;/* host (adapter) maximum commands per lun */
- short d_queue_depth;/* device (or adapter) maximum queue length */
- int unused[2]; /* probably find a good use, set 0 for now */
-} sg_scsi_id_t; /* 32 bytes long on i386 */
-
-typedef struct sg_req_info { /* used by SG_GET_REQUEST_TABLE ioctl() */
- char req_state; /* 0 -> not used, 1 -> written, 2 -> ready to read */
- char orphan; /* 0 -> normal request, 1 -> from interruped SG_IO */
- char sg_io_owned; /* 0 -> complete with read(), 1 -> owned by SG_IO */
- char problem; /* 0 -> no problem detected, 1 -> error to report */
- int pack_id; /* pack_id associated with request */
- void __user *usr_ptr; /* user provided pointer (in new interface) */
- unsigned int duration; /* millisecs elapsed since written (req_state==1)
- or request duration (req_state==2) */
- int unused;
-} sg_req_info_t; /* 20 bytes long on i386 */
-
-
-/* IOCTLs: Those ioctls that are relevant to the SG 3.x drivers follow.
- [Those that only apply to the SG 2.x drivers are at the end of the file.]
- (_GET_s yield result via 'int *' 3rd argument unless otherwise indicated) */
-
-#define SG_EMULATED_HOST 0x2203 /* true for emulated host adapter (ATAPI) */
-
-/* Used to configure SCSI command transformation layer for ATAPI devices */
-/* Only supported by the ide-scsi driver */
-#define SG_SET_TRANSFORM 0x2204 /* N.B. 3rd arg is not pointer but value: */
- /* 3rd arg = 0 to disable transform, 1 to enable it */
-#define SG_GET_TRANSFORM 0x2205
-
-#define SG_SET_RESERVED_SIZE 0x2275 /* request a new reserved buffer size */
-#define SG_GET_RESERVED_SIZE 0x2272 /* actual size of reserved buffer */
-
-/* The following ioctl has a 'sg_scsi_id_t *' object as its 3rd argument. */
-#define SG_GET_SCSI_ID 0x2276 /* Yields fd's bus, chan, dev, lun + type */
-/* SCSI id information can also be obtained from SCSI_IOCTL_GET_IDLUN */
-
-/* Override host setting and always DMA using low memory ( <16MB on i386) */
-#define SG_SET_FORCE_LOW_DMA 0x2279 /* 0-> use adapter setting, 1-> force */
-#define SG_GET_LOW_DMA 0x227a /* 0-> use all ram for dma; 1-> low dma ram */
-
-/* When SG_SET_FORCE_PACK_ID set to 1, pack_id is input to read() which
- tries to fetch a packet with a matching pack_id, waits, or returns EAGAIN.
- If pack_id is -1 then read oldest waiting. When ...FORCE_PACK_ID set to 0
- then pack_id ignored by read() and oldest readable fetched. */
-#define SG_SET_FORCE_PACK_ID 0x227b
-#define SG_GET_PACK_ID 0x227c /* Yields oldest readable pack_id (or -1) */
-
-#define SG_GET_NUM_WAITING 0x227d /* Number of commands awaiting read() */
-
-/* Yields max scatter gather tablesize allowed by current host adapter */
-#define SG_GET_SG_TABLESIZE 0x227F /* 0 implies can't do scatter gather */
-
-#define SG_GET_VERSION_NUM 0x2282 /* Example: version 2.1.34 yields 20134 */
-
-/* Returns -EBUSY if occupied. 3rd argument pointer to int (see next) */
-#define SG_SCSI_RESET 0x2284
-/* Associated values that can be given to SG_SCSI_RESET follow.
- * SG_SCSI_RESET_NO_ESCALATE may be OR-ed to the _DEVICE, _TARGET, _BUS
- * or _HOST reset value so only that action is attempted. */
-#define SG_SCSI_RESET_NOTHING 0
-#define SG_SCSI_RESET_DEVICE 1
-#define SG_SCSI_RESET_BUS 2
-#define SG_SCSI_RESET_HOST 3
-#define SG_SCSI_RESET_TARGET 4
-#define SG_SCSI_RESET_NO_ESCALATE 0x100
-
-/* synchronous SCSI command ioctl, (only in version 3 interface) */
-#define SG_IO 0x2285 /* similar effect as write() followed by read() */
-
-#define SG_GET_REQUEST_TABLE 0x2286 /* yields table of active requests */
-
-/* How to treat EINTR during SG_IO ioctl(), only in SG 3.x series */
-#define SG_SET_KEEP_ORPHAN 0x2287 /* 1 -> hold for read(), 0 -> drop (def) */
-#define SG_GET_KEEP_ORPHAN 0x2288
-
-/* yields scsi midlevel's access_count for this SCSI device */
-#define SG_GET_ACCESS_COUNT 0x2289
-
-
-#define SG_SCATTER_SZ (8 * 4096)
-/* Largest size (in bytes) a single scatter-gather list element can have.
- The value used by the driver is 'max(SG_SCATTER_SZ, PAGE_SIZE)'.
- This value should be a power of 2 (and may be rounded up internally).
- If scatter-gather is not supported by adapter then this value is the
- largest data block that can be read/written by a single scsi command. */
-
-#define SG_DEFAULT_RETRIES 0
-
-/* Defaults, commented if they differ from original sg driver */
-#define SG_DEF_FORCE_LOW_DMA 0 /* was 1 -> memory below 16MB on i386 */
-#define SG_DEF_FORCE_PACK_ID 0
-#define SG_DEF_KEEP_ORPHAN 0
-#define SG_DEF_RESERVED_SIZE SG_SCATTER_SZ /* load time option */
-
-/* maximum outstanding requests, write() yields EDOM if exceeded */
-#define SG_MAX_QUEUE 16
-
-#define SG_BIG_BUFF SG_DEF_RESERVED_SIZE /* for backward compatibility */
-
-
-/* vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv */
-/* The older SG interface based on the 'sg_header' structure follows. */
-/* ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ */
-
-#define SG_MAX_SENSE 16 /* this only applies to the sg_header interface */
-
-struct sg_header
-{
- int pack_len; /* [o] reply_len (ie useless), ignored as input */
- int reply_len; /* [i] max length of expected reply (inc. sg_header) */
- int pack_id; /* [io] id number of packet (use ints >= 0) */
- int result; /* [o] 0==ok, else (+ve) Unix errno (best ignored) */
- unsigned int twelve_byte:1;
- /* [i] Force 12 byte command length for group 6 & 7 commands */
- unsigned int target_status:5; /* [o] scsi status from target */
- unsigned int host_status:8; /* [o] host status (see "DID" codes) */
- unsigned int driver_status:8; /* [o] driver status+suggestion */
- unsigned int other_flags:10; /* unused */
- unsigned char sense_buffer[SG_MAX_SENSE]; /* [o] Output in 3 cases:
- when target_status is CHECK_CONDITION or
- when target_status is COMMAND_TERMINATED or
- when (driver_status & DRIVER_SENSE) is true. */
-}; /* This structure is 36 bytes long on i386 */
-
-
-/* IOCTLs: The following are not required (or ignored) when the sg_io_hdr_t
- interface is used. They are kept for backward compatibility with
- the original and version 2 drivers. */
-
-#define SG_SET_TIMEOUT 0x2201 /* unit: jiffies (10ms on i386) */
-#define SG_GET_TIMEOUT 0x2202 /* yield timeout as _return_ value */
-
-/* Get/set command queuing state per fd (default is SG_DEF_COMMAND_Q.
- Each time a sg_io_hdr_t object is seen on this file descriptor, this
- command queuing flag is set on (overriding the previous setting). */
-#define SG_GET_COMMAND_Q 0x2270 /* Yields 0 (queuing off) or 1 (on) */
-#define SG_SET_COMMAND_Q 0x2271 /* Change queuing state with 0 or 1 */
-
-/* Turn on/off error sense trace (1 and 0 respectively, default is off).
- Try using: "# cat /proc/scsi/sg/debug" instead in the v3 driver */
-#define SG_SET_DEBUG 0x227e /* 0 -> turn off debug */
-
-#define SG_NEXT_CMD_LEN 0x2283 /* override SCSI command length with given
- number on the next write() on this file descriptor */
-
-
-/* Defaults, commented if they differ from original sg driver */
-#ifdef __KERNEL__
-#define SG_DEFAULT_TIMEOUT_USER (60*USER_HZ) /* HZ == 'jiffies in 1 second' */
-#else
-#define SG_DEFAULT_TIMEOUT (60*HZ) /* HZ == 'jiffies in 1 second' */
-#endif
-
-#define SG_DEF_COMMAND_Q 0 /* command queuing is always on when
- the new interface is used */
-#define SG_DEF_UNDERRUN_FLAG 0
#endif
diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild
index 70ff1d9abf0d..61ad1c5a4aae 100644
--- a/include/uapi/linux/Kbuild
+++ b/include/uapi/linux/Kbuild
@@ -357,6 +357,7 @@ header-y += scc.h
header-y += sched.h
header-y += scif_ioctl.h
header-y += screen_info.h
+header-y += scsi_ioctl.h
header-y += sctp.h
header-y += sdla.h
header-y += seccomp.h
@@ -367,6 +368,7 @@ header-y += serial_core.h
header-y += serial.h
header-y += serial_reg.h
header-y += serio.h
+header-y += sg.h
header-y += shm.h
header-y += signalfd.h
header-y += signal.h
diff --git a/include/scsi/scsi_ioctl.h b/include/uapi/linux/scsi_ioctl.h
similarity index 77%
copy from include/scsi/scsi_ioctl.h
copy to include/uapi/linux/scsi_ioctl.h
index 2bd9d67c201a..14a3c374d918 100644
--- a/include/scsi/scsi_ioctl.h
+++ b/include/uapi/linux/scsi_ioctl.h
@@ -1,5 +1,9 @@
-#ifndef _SCSI_IOCTL_H
-#define _SCSI_IOCTL_H
+#ifndef _UAPI_LINUX_SCSI_IOCTL_H
+#define _UAPI_LINUX_SCSI_IOCTL_H
+
+/*
+ * These ioctls are obsolete. Use linux/sg.h instead.
+ */
#define SCSI_IOCTL_SEND_COMMAND 1
#define SCSI_IOCTL_TEST_UNIT_READY 2
@@ -7,14 +11,13 @@
#define SCSI_IOCTL_SYNC 4 /* Request synchronous parameters */
#define SCSI_IOCTL_START_UNIT 5
#define SCSI_IOCTL_STOP_UNIT 6
+
/* The door lock/unlock constants are compatible with Sun constants for
the cdrom */
#define SCSI_IOCTL_DOORLOCK 0x5380 /* lock the eject mechanism */
#define SCSI_IOCTL_DOORUNLOCK 0x5381 /* unlock the mechanism */
/*
- * Here are some obsolete SCSI-specific ioctl commands.
- *
* Note that include/linux/cdrom.h also defines IOCTL 0x5300 - 0x5395
*/
@@ -32,10 +35,6 @@
/* Used to obtain the PCI location of a device */
#define SCSI_IOCTL_GET_PCI 0x5387
-#ifdef __KERNEL__
-
-struct scsi_device;
-
/*
* Structures used for scsi_ioctl et al.
*/
@@ -51,10 +50,4 @@ typedef struct scsi_idlun {
__u32 host_unique_id;
} Scsi_Idlun;
-
-int scsi_ioctl_block_when_processing_errors(struct scsi_device *sdev,
- int cmd, bool ndelay);
-extern int scsi_ioctl(struct scsi_device *, int, void __user *);
-
-#endif /* __KERNEL__ */
-#endif /* _SCSI_IOCTL_H */
+#endif /* _UAPI_LINUX_SCSI_IOCTL_H */
diff --git a/include/scsi/sg.h b/include/uapi/linux/sg.h
similarity index 91%
copy from include/scsi/sg.h
copy to include/uapi/linux/sg.h
index 370c78c37926..1ffa5f85b26e 100644
--- a/include/scsi/sg.h
+++ b/include/uapi/linux/sg.h
@@ -1,7 +1,5 @@
-#ifndef _SCSI_GENERIC_H
-#define _SCSI_GENERIC_H
-
-#include <linux/compiler.h>
+#ifndef _UAPI_LINUX_SG_H
+#define _UAPI_LINUX_SG_H
/*
* History:
@@ -28,10 +26,6 @@
* For utility and test programs see: http://sg.danny.cz/sg/sg3_utils.html
*/
-#ifdef __KERNEL__
-extern int sg_big_buff; /* for sysctl */
-#endif
-
typedef struct sg_iovec /* same structure as used by readv() Linux system */
{ /* call. It defines one scatter-gather element. */
@@ -184,30 +178,19 @@ typedef struct sg_req_info { /* used by SG_GET_REQUEST_TABLE ioctl() */
#define SG_GET_KEEP_ORPHAN 0x2288
/* yields scsi midlevel's access_count for this SCSI device */
-#define SG_GET_ACCESS_COUNT 0x2289
+#define SG_GET_ACCESS_COUNT 0x2289
-#define SG_SCATTER_SZ (8 * 4096)
/* Largest size (in bytes) a single scatter-gather list element can have.
The value used by the driver is 'max(SG_SCATTER_SZ, PAGE_SIZE)'.
This value should be a power of 2 (and may be rounded up internally).
If scatter-gather is not supported by adapter then this value is the
largest data block that can be read/written by a single scsi command. */
-
-#define SG_DEFAULT_RETRIES 0
-
-/* Defaults, commented if they differ from original sg driver */
-#define SG_DEF_FORCE_LOW_DMA 0 /* was 1 -> memory below 16MB on i386 */
-#define SG_DEF_FORCE_PACK_ID 0
-#define SG_DEF_KEEP_ORPHAN 0
-#define SG_DEF_RESERVED_SIZE SG_SCATTER_SZ /* load time option */
+#define SG_SCATTER_SZ (8 * 4096)
/* maximum outstanding requests, write() yields EDOM if exceeded */
#define SG_MAX_QUEUE 16
-#define SG_BIG_BUFF SG_DEF_RESERVED_SIZE /* for backward compatibility */
-
-
/* vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv */
/* The older SG interface based on the 'sg_header' structure follows. */
/* ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ */
@@ -240,7 +223,7 @@ struct sg_header
#define SG_SET_TIMEOUT 0x2201 /* unit: jiffies (10ms on i386) */
#define SG_GET_TIMEOUT 0x2202 /* yield timeout as _return_ value */
-/* Get/set command queuing state per fd (default is SG_DEF_COMMAND_Q.
+/* Get/set command queuing state per fd.
Each time a sg_io_hdr_t object is seen on this file descriptor, this
command queuing flag is set on (overriding the previous setting). */
#define SG_GET_COMMAND_Q 0x2270 /* Yields 0 (queuing off) or 1 (on) */
@@ -254,15 +237,4 @@ struct sg_header
number on the next write() on this file descriptor */
-/* Defaults, commented if they differ from original sg driver */
-#ifdef __KERNEL__
-#define SG_DEFAULT_TIMEOUT_USER (60*USER_HZ) /* HZ == 'jiffies in 1 second' */
-#else
-#define SG_DEFAULT_TIMEOUT (60*HZ) /* HZ == 'jiffies in 1 second' */
-#endif
-
-#define SG_DEF_COMMAND_Q 0 /* command queuing is always on when
- the new interface is used */
-#define SG_DEF_UNDERRUN_FLAG 0
-
-#endif
+#endif /* _UAPI_LINUX_SG_H */
--
2.5.0
^ permalink raw reply related [flat|nested] 18+ messages in thread
* Re: [PATCH v3 0/4] scsi: cleanup ioctl headers and provide UAPI versions
2015-09-25 9:27 [PATCH v3 0/4] scsi: cleanup ioctl headers and provide UAPI versions Paolo Bonzini
` (3 preceding siblings ...)
2015-09-25 9:27 ` [PATCH v3 4/4] scsi: provide UAPI version of scsi/sg.h and scsi/scsi_ioctl.h Paolo Bonzini
@ 2015-09-25 15:17 ` Christoph Hellwig
2015-12-28 23:27 ` Paolo Bonzini
5 siblings, 0 replies; 18+ messages in thread
From: Christoph Hellwig @ 2015-09-25 15:17 UTC (permalink / raw)
To: Paolo Bonzini
Cc: linux-kernel, kvm, bart.vanassche, James Bottomley, linux-scsi
The whole series looks good to me. Thanks for picking this work up!
Reviewed-by: Christoph Hellwig <hch@lst.de>
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v3 4/4] scsi: provide UAPI version of scsi/sg.h and scsi/scsi_ioctl.h
2015-09-25 9:27 ` [PATCH v3 4/4] scsi: provide UAPI version of scsi/sg.h and scsi/scsi_ioctl.h Paolo Bonzini
@ 2015-09-25 15:22 ` Bart Van Assche
2015-09-25 23:55 ` Hannes Reinecke
` (2 subsequent siblings)
3 siblings, 0 replies; 18+ messages in thread
From: Bart Van Assche @ 2015-09-25 15:22 UTC (permalink / raw)
To: Paolo Bonzini, linux-kernel@vger.kernel.org, kvm@vger.kernel.org
Cc: James Bottomley, Christoph Hellwig, linux-scsi@vger.kernel.org
On 09/25/2015 02:28 AM, Paolo Bonzini wrote:
> Provide a UAPI version of the header in the kernel, making it easier
> for interested projects to use an up-to-date version of the header.
>
> The new headers are placed under uapi/linux/ so as not to conflict
> with the glibc-provided headers in /usr/include/scsi.
>
> /dev/sgN default values are implementation aspects, and are moved to
> drivers/scsi/sg.c instead (together with e.g. SG_ALLOW_DIO_DEF).
> However, SG_SCATTER_SZ is used by Wine so it is kept in linux/sg.h
> SG_MAX_QUEUE could also be useful.
>
> struct scsi_ioctl_command and struct scsi_idlun used to be under
> "#ifdef __KERNEL__", but they are actually useful for userspace as
> well. Add them to the new header.
>
> Cc: James Bottomley <jbottomley@parallels.com>
> Cc: Christoph Hellwig <hch@lst.de>
> Cc: linux-scsi@vger.kernel.org
> Cc: Bart Van Assche <bart.vanassche@sandisk.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Bart Van Assche <bart.vanassche@sandisk.com>
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v3 1/4] scsi: remove old-style type names from sg.h
2015-09-25 9:27 ` [PATCH v3 1/4] scsi: remove old-style type names from sg.h Paolo Bonzini
@ 2015-09-25 23:50 ` Hannes Reinecke
2015-09-28 6:47 ` Douglas Gilbert
1 sibling, 0 replies; 18+ messages in thread
From: Hannes Reinecke @ 2015-09-25 23:50 UTC (permalink / raw)
To: Paolo Bonzini, linux-kernel, kvm
Cc: bart.vanassche, James Bottomley, Christoph Hellwig, linux-scsi
On 09/25/2015 11:27 AM, Paolo Bonzini wrote:
> These will not be exported by the new linux/sg.h header, and scsi/sg.h will
> not have any user API after linux/sg.h is created. Since they have no
> user in the kernel, they can be zapped.
>
> Cc: James Bottomley <jbottomley@parallels.com>
> Cc: Christoph Hellwig <hch@lst.de>
> Cc: linux-scsi@vger.kernel.org
> Reviewed-by: Bart Van Assche <bart.vanassche@sandisk.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
> include/scsi/sg.h | 6 ------
> 1 file changed, 6 deletions(-)
>
> diff --git a/include/scsi/sg.h b/include/scsi/sg.h
> index 3afec7032448..370c78c37926 100644
> --- a/include/scsi/sg.h
> +++ b/include/scsi/sg.h
> @@ -207,12 +207,6 @@ typedef struct sg_req_info { /* used by SG_GET_REQUEST_TABLE ioctl() */
>
> #define SG_BIG_BUFF SG_DEF_RESERVED_SIZE /* for backward compatibility */
>
> -/* Alternate style type names, "..._t" variants preferred */
> -typedef struct sg_io_hdr Sg_io_hdr;
> -typedef struct sg_io_vec Sg_io_vec;
> -typedef struct sg_scsi_id Sg_scsi_id;
> -typedef struct sg_req_info Sg_req_info;
> -
>
> /* vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv */
> /* The older SG interface based on the 'sg_header' structure follows. */
>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Cheers,
Hannes
--
Dr. Hannes Reinecke zSeries & Storage
hare@suse.de +49 911 74053 688
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: J. Hawn, J. Guild, F. Imendörffer, HRB 16746 (AG Nürnberg)
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v3 2/4] scsi: cleanup scsi/scsi_ioctl.h
2015-09-25 9:27 ` [PATCH v3 2/4] scsi: cleanup scsi/scsi_ioctl.h Paolo Bonzini
@ 2015-09-25 23:51 ` Hannes Reinecke
2015-09-28 6:47 ` Douglas Gilbert
1 sibling, 0 replies; 18+ messages in thread
From: Hannes Reinecke @ 2015-09-25 23:51 UTC (permalink / raw)
To: Paolo Bonzini, linux-kernel, kvm
Cc: bart.vanassche, James Bottomley, Christoph Hellwig, linux-scsi
On 09/25/2015 11:27 AM, Paolo Bonzini wrote:
> SCSI_REMOVAL_* goes together with other SCSI command constants in
> include/scsi/scsi.h. It is also used outside the implementation
> of the ioctls (and it is not part of the user API).
>
> scsi_fctargaddress/Scsi_FCTargAddress has had no in-tree use since
> commit ca61f10ab2b8 ("[SCSI] remove broken driver cpqfc", 2005-10-29).
> Remove it, just in time for the the tenth anniversary of its demise.
>
> Cc: James Bottomley <jbottomley@parallels.com>
> Cc: Christoph Hellwig <hch@lst.de>
> Cc: linux-scsi@vger.kernel.org
> Reviewed-by: Bart Van Assche <bart.vanassche@sandisk.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
> include/scsi/scsi.h | 6 ++++++
> include/scsi/scsi_ioctl.h | 8 --------
> 2 files changed, 6 insertions(+), 8 deletions(-)
>
[ .. ]
Reviewed-by: Hannes Reinecke <hare@suse.com>
Cheers,
Hannes
--
Dr. Hannes Reinecke zSeries & Storage
hare@suse.de +49 911 74053 688
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: J. Hawn, J. Guild, F. Imendörffer, HRB 16746 (AG Nürnberg)
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v3 3/4] scsi: move all obsolete ioctls to scsi_ioctl.h
2015-09-25 9:27 ` [PATCH v3 3/4] scsi: move all obsolete ioctls to scsi_ioctl.h Paolo Bonzini
@ 2015-09-25 23:52 ` Hannes Reinecke
2015-09-28 6:49 ` Douglas Gilbert
1 sibling, 0 replies; 18+ messages in thread
From: Hannes Reinecke @ 2015-09-25 23:52 UTC (permalink / raw)
To: Paolo Bonzini, linux-kernel, kvm
Cc: bart.vanassche, James Bottomley, Christoph Hellwig, linux-scsi
On 09/25/2015 11:27 AM, Paolo Bonzini wrote:
> Some are in scsi.h. Keep them together in preparation for exposing them
> in UAPI headers.
>
> Cc: James Bottomley <jbottomley@parallels.com>
> Cc: Christoph Hellwig <hch@lst.de>
> Cc: linux-scsi@vger.kernel.org
> Reviewed-by: Bart Van Assche <bart.vanassche@sandisk.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
> include/scsi/scsi.h | 20 --------------------
> include/scsi/scsi_ioctl.h | 20 ++++++++++++++++++++
> 2 files changed, 20 insertions(+), 20 deletions(-)
>
[ .. ]
Reviewed-by: Hannes Reinecke <hare@suse.com>
Cheers,
Hannes
--
Dr. Hannes Reinecke zSeries & Storage
hare@suse.de +49 911 74053 688
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: J. Hawn, J. Guild, F. Imendörffer, HRB 16746 (AG Nürnberg)
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v3 4/4] scsi: provide UAPI version of scsi/sg.h and scsi/scsi_ioctl.h
2015-09-25 9:27 ` [PATCH v3 4/4] scsi: provide UAPI version of scsi/sg.h and scsi/scsi_ioctl.h Paolo Bonzini
2015-09-25 15:22 ` Bart Van Assche
@ 2015-09-25 23:55 ` Hannes Reinecke
2015-09-28 6:25 ` kbuild test robot
2015-09-28 6:49 ` Douglas Gilbert
3 siblings, 0 replies; 18+ messages in thread
From: Hannes Reinecke @ 2015-09-25 23:55 UTC (permalink / raw)
To: Paolo Bonzini, linux-kernel, kvm
Cc: bart.vanassche, James Bottomley, Christoph Hellwig, linux-scsi
On 09/25/2015 11:27 AM, Paolo Bonzini wrote:
> Provide a UAPI version of the header in the kernel, making it easier
> for interested projects to use an up-to-date version of the header.
>
> The new headers are placed under uapi/linux/ so as not to conflict
> with the glibc-provided headers in /usr/include/scsi.
>
> /dev/sgN default values are implementation aspects, and are moved to
> drivers/scsi/sg.c instead (together with e.g. SG_ALLOW_DIO_DEF).
> However, SG_SCATTER_SZ is used by Wine so it is kept in linux/sg.h
> SG_MAX_QUEUE could also be useful.
>
> struct scsi_ioctl_command and struct scsi_idlun used to be under
> "#ifdef __KERNEL__", but they are actually useful for userspace as
> well. Add them to the new header.
>
> Cc: James Bottomley <jbottomley@parallels.com>
> Cc: Christoph Hellwig <hch@lst.de>
> Cc: linux-scsi@vger.kernel.org
> Cc: Bart Van Assche <bart.vanassche@sandisk.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
[ .. ]
Reviewed-by: Hannes Reinecke <hare@suse.com>
Cheers,
Hannes
--
Dr. Hannes Reinecke zSeries & Storage
hare@suse.de +49 911 74053 688
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: J. Hawn, J. Guild, F. Imendörffer, HRB 16746 (AG Nürnberg)
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v3 4/4] scsi: provide UAPI version of scsi/sg.h and scsi/scsi_ioctl.h
2015-09-25 9:27 ` [PATCH v3 4/4] scsi: provide UAPI version of scsi/sg.h and scsi/scsi_ioctl.h Paolo Bonzini
2015-09-25 15:22 ` Bart Van Assche
2015-09-25 23:55 ` Hannes Reinecke
@ 2015-09-28 6:25 ` kbuild test robot
2015-09-28 6:49 ` Douglas Gilbert
3 siblings, 0 replies; 18+ messages in thread
From: kbuild test robot @ 2015-09-28 6:25 UTC (permalink / raw)
To: Paolo Bonzini
Cc: kbuild-all, linux-kernel, kvm, bart.vanassche, James Bottomley,
Christoph Hellwig, linux-scsi
[-- Attachment #1: Type: text/plain, Size: 592 bytes --]
Hi Paolo,
[auto build test results on v4.3-rc2 -- if it's inappropriate base, please ignore]
config: i386-randconfig-a0-201538 (attached as .config)
reproduce:
git checkout d88f2083643f6dfacba14b2e95217dc6e0a4be37
# save the attached .config to linux build tree
make ARCH=i386
All warnings (new ones prefixed by >>):
>> ./usr/include/linux/scsi_ioctl.h:49: found __[us]{8,16,32,64} type without #include <linux/types.h>
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
[-- Attachment #2: .config.gz --]
[-- Type: application/octet-stream, Size: 19216 bytes --]
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v3 1/4] scsi: remove old-style type names from sg.h
2015-09-25 9:27 ` [PATCH v3 1/4] scsi: remove old-style type names from sg.h Paolo Bonzini
2015-09-25 23:50 ` Hannes Reinecke
@ 2015-09-28 6:47 ` Douglas Gilbert
1 sibling, 0 replies; 18+ messages in thread
From: Douglas Gilbert @ 2015-09-28 6:47 UTC (permalink / raw)
To: Paolo Bonzini, linux-kernel, kvm
Cc: bart.vanassche, James Bottomley, Christoph Hellwig, linux-scsi
On 15-09-25 11:27 AM, Paolo Bonzini wrote:
> These will not be exported by the new linux/sg.h header, and scsi/sg.h will
> not have any user API after linux/sg.h is created. Since they have no
> user in the kernel, they can be zapped.
>
> Cc: James Bottomley <jbottomley@parallels.com>
> Cc: Christoph Hellwig <hch@lst.de>
> Cc: linux-scsi@vger.kernel.org
> Reviewed-by: Bart Van Assche <bart.vanassche@sandisk.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Acked-by: Douglas Gilbert <dgilbert@interlog.com>
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v3 2/4] scsi: cleanup scsi/scsi_ioctl.h
2015-09-25 9:27 ` [PATCH v3 2/4] scsi: cleanup scsi/scsi_ioctl.h Paolo Bonzini
2015-09-25 23:51 ` Hannes Reinecke
@ 2015-09-28 6:47 ` Douglas Gilbert
1 sibling, 0 replies; 18+ messages in thread
From: Douglas Gilbert @ 2015-09-28 6:47 UTC (permalink / raw)
To: Paolo Bonzini, linux-kernel, kvm
Cc: bart.vanassche, James Bottomley, Christoph Hellwig, linux-scsi
On 15-09-25 11:27 AM, Paolo Bonzini wrote:
> SCSI_REMOVAL_* goes together with other SCSI command constants in
> include/scsi/scsi.h. It is also used outside the implementation
> of the ioctls (and it is not part of the user API).
>
> scsi_fctargaddress/Scsi_FCTargAddress has had no in-tree use since
> commit ca61f10ab2b8 ("[SCSI] remove broken driver cpqfc", 2005-10-29).
> Remove it, just in time for the the tenth anniversary of its demise.
>
> Cc: James Bottomley <jbottomley@parallels.com>
> Cc: Christoph Hellwig <hch@lst.de>
> Cc: linux-scsi@vger.kernel.org
> Reviewed-by: Bart Van Assche <bart.vanassche@sandisk.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Acked-by: Douglas Gilbert <dgilbert@interlog.com>
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v3 3/4] scsi: move all obsolete ioctls to scsi_ioctl.h
2015-09-25 9:27 ` [PATCH v3 3/4] scsi: move all obsolete ioctls to scsi_ioctl.h Paolo Bonzini
2015-09-25 23:52 ` Hannes Reinecke
@ 2015-09-28 6:49 ` Douglas Gilbert
1 sibling, 0 replies; 18+ messages in thread
From: Douglas Gilbert @ 2015-09-28 6:49 UTC (permalink / raw)
To: Paolo Bonzini, linux-kernel, kvm
Cc: bart.vanassche, James Bottomley, Christoph Hellwig, linux-scsi
On 15-09-25 11:27 AM, Paolo Bonzini wrote:
> Some are in scsi.h. Keep them together in preparation for exposing them
> in UAPI headers.
>
> Cc: James Bottomley <jbottomley@parallels.com>
> Cc: Christoph Hellwig <hch@lst.de>
> Cc: linux-scsi@vger.kernel.org
> Reviewed-by: Bart Van Assche <bart.vanassche@sandisk.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Acked-by: Douglas Gilbert <dgilbert@interlog.com>
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v3 4/4] scsi: provide UAPI version of scsi/sg.h and scsi/scsi_ioctl.h
2015-09-25 9:27 ` [PATCH v3 4/4] scsi: provide UAPI version of scsi/sg.h and scsi/scsi_ioctl.h Paolo Bonzini
` (2 preceding siblings ...)
2015-09-28 6:25 ` kbuild test robot
@ 2015-09-28 6:49 ` Douglas Gilbert
3 siblings, 0 replies; 18+ messages in thread
From: Douglas Gilbert @ 2015-09-28 6:49 UTC (permalink / raw)
To: Paolo Bonzini, linux-kernel, kvm
Cc: bart.vanassche, James Bottomley, Christoph Hellwig, linux-scsi
On 15-09-25 11:27 AM, Paolo Bonzini wrote:
> Provide a UAPI version of the header in the kernel, making it easier
> for interested projects to use an up-to-date version of the header.
>
> The new headers are placed under uapi/linux/ so as not to conflict
> with the glibc-provided headers in /usr/include/scsi.
>
> /dev/sgN default values are implementation aspects, and are moved to
> drivers/scsi/sg.c instead (together with e.g. SG_ALLOW_DIO_DEF).
> However, SG_SCATTER_SZ is used by Wine so it is kept in linux/sg.h
> SG_MAX_QUEUE could also be useful.
>
> struct scsi_ioctl_command and struct scsi_idlun used to be under
> "#ifdef __KERNEL__", but they are actually useful for userspace as
> well. Add them to the new header.
>
> Cc: James Bottomley <jbottomley@parallels.com>
> Cc: Christoph Hellwig <hch@lst.de>
> Cc: linux-scsi@vger.kernel.org
> Cc: Bart Van Assche <bart.vanassche@sandisk.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Acked-by: Douglas Gilbert <dgilbert@interlog.com>
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v3 0/4] scsi: cleanup ioctl headers and provide UAPI versions
2015-09-25 9:27 [PATCH v3 0/4] scsi: cleanup ioctl headers and provide UAPI versions Paolo Bonzini
` (4 preceding siblings ...)
2015-09-25 15:17 ` [PATCH v3 0/4] scsi: cleanup ioctl headers and provide UAPI versions Christoph Hellwig
@ 2015-12-28 23:27 ` Paolo Bonzini
2016-01-06 21:00 ` Martin K. Petersen
5 siblings, 1 reply; 18+ messages in thread
From: Paolo Bonzini @ 2015-12-28 23:27 UTC (permalink / raw)
To: linux-kernel, kvm
Cc: bart.vanassche, James Bottomley, Christoph Hellwig, linux-scsi
On 25/09/2015 11:27, Paolo Bonzini wrote:
> This is v3 of the series to provide an "official" sg.h header (and
> scsi_ioctl.h too, though it's basically obsolete) together with the other
> userspace API definitions. The change from v2 to v3 is that defaults
> for sg.c are not exported in include/uapi/linux/sg.c.
>
> Paolo
>
> 2.5.0
>
What happened to these patches?...
Paolo
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v3 0/4] scsi: cleanup ioctl headers and provide UAPI versions
2015-12-28 23:27 ` Paolo Bonzini
@ 2016-01-06 21:00 ` Martin K. Petersen
0 siblings, 0 replies; 18+ messages in thread
From: Martin K. Petersen @ 2016-01-06 21:00 UTC (permalink / raw)
To: Paolo Bonzini
Cc: linux-kernel, kvm, bart.vanassche, James Bottomley,
Christoph Hellwig, linux-scsi
>>>>> "Paolo" == Paolo Bonzini <pbonzini@redhat.com> writes:
>> This is v3 of the series to provide an "official" sg.h header (and
>> scsi_ioctl.h too, though it's basically obsolete) together with the
>> other userspace API definitions. The change from v2 to v3 is that
>> defaults for sg.c are not exported in include/uapi/linux/sg.c.
Paolo> What happened to these patches?...
They predate me being patch monkey. Please repost with any review tags
or acks you may have received.
--
Martin K. Petersen Oracle Linux Engineering
^ permalink raw reply [flat|nested] 18+ messages in thread
end of thread, other threads:[~2016-01-06 21:00 UTC | newest]
Thread overview: 18+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-25 9:27 [PATCH v3 0/4] scsi: cleanup ioctl headers and provide UAPI versions Paolo Bonzini
2015-09-25 9:27 ` [PATCH v3 1/4] scsi: remove old-style type names from sg.h Paolo Bonzini
2015-09-25 23:50 ` Hannes Reinecke
2015-09-28 6:47 ` Douglas Gilbert
2015-09-25 9:27 ` [PATCH v3 2/4] scsi: cleanup scsi/scsi_ioctl.h Paolo Bonzini
2015-09-25 23:51 ` Hannes Reinecke
2015-09-28 6:47 ` Douglas Gilbert
2015-09-25 9:27 ` [PATCH v3 3/4] scsi: move all obsolete ioctls to scsi_ioctl.h Paolo Bonzini
2015-09-25 23:52 ` Hannes Reinecke
2015-09-28 6:49 ` Douglas Gilbert
2015-09-25 9:27 ` [PATCH v3 4/4] scsi: provide UAPI version of scsi/sg.h and scsi/scsi_ioctl.h Paolo Bonzini
2015-09-25 15:22 ` Bart Van Assche
2015-09-25 23:55 ` Hannes Reinecke
2015-09-28 6:25 ` kbuild test robot
2015-09-28 6:49 ` Douglas Gilbert
2015-09-25 15:17 ` [PATCH v3 0/4] scsi: cleanup ioctl headers and provide UAPI versions Christoph Hellwig
2015-12-28 23:27 ` Paolo Bonzini
2016-01-06 21:00 ` Martin K. Petersen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).