mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-07-25 17:42:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'svn-trunk'

Browse Source
This commit is contained in:
Bart Van Assche
2017-11-12 21:50:50 -08:00
parent 6dac8571b6 4c05086b59
commit e02cddfde8
8 changed files with 140 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
iscsi-scst/kernel/nthread.c
+1 -3
View File
@@ -1372,9 +1372,7 @@ static int write_data(struct iscsi_conn *conn)
retry:
oldfs = get_fs();
set_fs(KERNEL_DS);
res = vfs_writev(file,
(struct iovec __force __user *)iop,
count, &off, 0);
res = scst_writev(file, iop, count, &off);
set_fs(oldfs);
TRACE_WRITE("sid %#Lx, cid %u, res %d, iov_len %zd",
(unsigned long long int)conn->session->sid,
scst/include/backport.h
+8 -21
View File
@@ -60,6 +60,14 @@ static inline struct bio_set *bioset_create_backport(unsigned int pool_size,
#define BIOSET_NEED_BVECS 0
#endif
/* See also commit 74d46992e0d9. */
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)
static inline void bio_set_dev(struct bio *bio, struct block_device *bdev)
{
bio->bi_bdev = bdev;
}
#endif
/* <linux/blkdev.h> */
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31)
@@ -239,27 +247,6 @@ static inline struct inode *file_inode(const struct file *f)
}
#endif
#if (!defined(CONFIG_SUSE_KERNEL) && \
LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0)) || \
LINUX_VERSION_CODE < KERNEL_VERSION(4, 4, 0)
static inline ssize_t vfs_readv_backport(struct file *file,
const struct iovec __user *vec,
unsigned long vlen, loff_t *pos,
int flags)
{
return vfs_readv(file, vec, vlen, pos);
}
static inline ssize_t vfs_writev_backport(struct file *file,
const struct iovec __user *vec,
unsigned long vlen, loff_t *pos,
int flags)
{
return vfs_writev(file, vec, vlen, pos);
}
#define vfs_readv vfs_readv_backport
#define vfs_writev vfs_writev_backport
#endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35)
static inline int vfs_fsync_backport(struct file *file, int datasync)
{
scst/include/scst.h
+7
View File
@@ -5708,6 +5708,13 @@ struct scst_data_descriptor {
uint64_t sdd_blocks;
};
ssize_t scst_read(struct file *file, void *buf, size_t count, loff_t *pos);
ssize_t scst_write(struct file *file, const void *buf, size_t count,
loff_t *pos);
ssize_t scst_readv(struct file *file, const struct iovec *vec,
unsigned long vlen, loff_t *pos);
ssize_t scst_writev(struct file *file, const struct iovec *vec,
unsigned long vlen, loff_t *pos);
void scst_write_same(struct scst_cmd *cmd, struct scst_data_descriptor *where);
int scst_scsi_execute(struct scsi_device *sdev, const unsigned char *cmd,
int data_direction, void *buffer, unsigned bufflen,
scst/src/dev_handlers/scst_vdisk.c
+9 -14
View File
@@ -2112,8 +2112,7 @@ static int vdisk_format_dif(struct scst_cmd *cmd, uint64_t start_lba,
full_len, (long long)loff);
/* WRITE */
err = vfs_writev(fd, (struct iovec __force __user *)iv,
iv_count, &loff, 0);
err = scst_writev(fd, iv, iv_count, &loff);
if (err < 0) {
PRINT_ERROR("Formatting DIF write() returned %lld from "
"%zd", err, full_len);
@@ -5962,8 +5961,7 @@ static int vdev_read_dif_tags(struct vdisk_cmd_params *p)
iv_count, full_len, (long long)loff);
/* READ */
err = vfs_readv(fd, (struct iovec __force __user *)iv, iv_count,
&loff, 0);
err = scst_readv(fd, iv, iv_count, &loff);
if ((err < 0) || (err < full_len)) {
unsigned long flags;
@@ -6091,8 +6089,7 @@ restart:
TRACE_DBG("Writing DIF: eiv_count %d, full_len %zd", eiv_count, full_len);
/* WRITE */
err = vfs_writev(fd, (struct iovec __force __user *)eiv,
eiv_count, &loff, 0);
err = scst_writev(fd, eiv, eiv_count, &loff);
if (err < 0) {
unsigned long flags;
@@ -6233,8 +6230,7 @@ static enum compl_status_e fileio_exec_read(struct vdisk_cmd_params *p)
TRACE_DBG("Reading iv_count %d, full_len %zd", iv_count, full_len);
/* READ */
err = vfs_readv(fd, (struct iovec __force __user *)iv, iv_count,
&loff, 0);
err = scst_readv(fd, iv, iv_count, &loff);
if ((err < 0) || (err < full_len)) {
PRINT_ERROR("readv() returned %lld from %zd",
(unsigned long long int)err,
@@ -6427,8 +6423,7 @@ restart:
TRACE_DBG("Writing: eiv_count %d, full_len %zd", eiv_count, full_len);
/* WRITE */
err = vfs_writev(fd, (struct iovec __force __user *)eiv,
eiv_count, &loff, 0);
err = scst_writev(fd, eiv, eiv_count, &loff);
if (err < 0) {
PRINT_ERROR("write() returned %lld from %zd",
(unsigned long long int)err,
@@ -6919,7 +6914,7 @@ static void blockio_exec_rw(struct vdisk_cmd_params *p, bool write, bool fua)
#else
bio->bi_sector = lba_start0 << (block_shift - 9);
#endif
bio->bi_bdev = bdev;
bio_set_dev(bio, bdev);
bio->bi_private = blockio_work;
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30)) && (LINUX_VERSION_CODE <= KERNEL_VERSION(3, 6, 0))
bio->bi_destructor = blockio_bio_destructor;
@@ -7103,7 +7098,7 @@ static int vdisk_blockio_flush(struct block_device *bdev, gfp_t gfp_mask,
}
bio->bi_end_io = vdev_flush_end_io;
bio->bi_private = cmd;
bio->bi_bdev = bdev;
bio_set_dev(bio, bdev);
#if (!defined(CONFIG_SUSE_KERNEL) && \
LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0)) || \
LINUX_VERSION_CODE < KERNEL_VERSION(4, 4, 0)
@@ -7262,7 +7257,7 @@ static ssize_t blockio_read_sync(struct scst_vdisk_dev *virt_dev, void *buf,
#else
bio_set_op_attrs(bio, REQ_OP_READ, REQ_SYNC);
#endif
bio->bi_bdev = bdev;
bio_set_dev(bio, bdev);
bio->bi_end_io = blockio_end_sync_io;
bio->bi_private = &s;
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30)) && (LINUX_VERSION_CODE <= KERNEL_VERSION(3, 6, 0))
@@ -7325,7 +7320,7 @@ static ssize_t fileio_read_sync(struct file *fd, void *buf, size_t len,
old_fs = get_fs();
set_fs(get_ds());
ret = vfs_read(fd, (char __force __user *)buf, len, loff);
ret = scst_read(fd, buf, len, loff);
set_fs(old_fs);
return ret;
scst/src/scst_dlm.c
+1 -1
View File
@@ -511,7 +511,7 @@ static int scst_read_file(const char *path, char *buf, int buf_len)
goto out;
}
pos = 0;
ret = vfs_read(f, (char __force __user *)buf, buf_len, &pos);
ret = scst_read(f, buf, buf_len, &pos);
if (ret >= 0)
buf[min(ret, buf_len - 1)] = '\0';
filp_close(f, NULL);
scst/src/scst_lib.c
+101 -6
View File
@@ -5964,6 +5964,101 @@ static void scst_complete_request_sense(struct scst_cmd *req_cmd)
return;
}
ssize_t scst_read(struct file *file, void *buf, size_t count, loff_t *pos)
{
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0)
struct iovec iov = {
.iov_base = (void __force __user *)buf,
.iov_len = count
};
return scst_readv(file, &iov, 1, pos);
#else
return vfs_read(file, (void __force __user *)buf, count, pos);
#endif
}
EXPORT_SYMBOL(scst_read);
ssize_t scst_write(struct file *file, const void *buf, size_t count,
loff_t *pos)
{
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0)
struct iovec iov = {
.iov_base = (void __force __user *)buf,
.iov_len = count
};
return scst_writev(file, &iov, 1, pos);
#else
return vfs_write(file, (void __force __user *)buf, count, pos);
#endif
}
EXPORT_SYMBOL(scst_write);
ssize_t scst_readv(struct file *file, const struct iovec *vec,
unsigned long vlen, loff_t *pos)
{
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0)
struct iovec iovstack[UIO_FASTIOV];
struct iovec *iov = iovstack;
struct iov_iter iter;
ssize_t ret;
ret = import_iovec(READ, (const struct iovec __force __user *)vec, vlen,
ARRAY_SIZE(iovstack), &iov, &iter);
if (ret < 0)
return ret;
ret = vfs_iter_read(file, &iter, pos, 0);
kfree(iov);
return ret;
#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0) || \
(defined(CONFIG_SUSE_KERNEL) && \
LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0))
return vfs_readv(file, (const struct iovec __user*)vec, vlen, pos, 0);
#else
return vfs_readv(file, (const struct iovec __user*)vec, vlen, pos);
#endif
}
EXPORT_SYMBOL(scst_readv);
/**
* scst_writev - write a buffer to a file
* @file: File to write to.
* @vec: Pointer to first element of struct iovec array.
* @vlen: Number of elements of the iovec array.
* @pos: Position in @file where to start writing.
*
* Note: although @vec->iov_base has type void __user*, it points at kernel
* data and not at data in user space.
*/
ssize_t scst_writev(struct file *file, const struct iovec *vec,
unsigned long vlen, loff_t *pos)
{
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0)
struct iovec iovstack[UIO_FASTIOV];
struct iovec *iov = iovstack;
struct iov_iter iter;
ssize_t ret;
ret = import_iovec(WRITE, (const struct iovec __force __user*)vec, vlen,
ARRAY_SIZE(iovstack), &iov, &iter);
if (ret < 0)
return ret;
file_start_write(file);
ret = vfs_iter_write(file, &iter, pos, 0);
file_end_write(file);
kfree(iov);
return ret;
#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0) || \
(defined(CONFIG_SUSE_KERNEL) && \
LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0))
return vfs_writev(file, (const struct iovec __user*)vec, vlen, pos, 0);
#else
return vfs_writev(file, (const struct iovec __user*)vec, vlen, pos);
#endif
}
EXPORT_SYMBOL(scst_writev);
struct scst_ws_sg_tail {
struct scatterlist *sg;
int sg_cnt;
@@ -14983,14 +15078,14 @@ int scst_copy_file(const char *src, const char *dest)
}
pos = 0;
res = vfs_read(file_src, (void __force __user *)buf, file_size, &pos);
res = scst_read(file_src, buf, file_size, &pos);
if (res != file_size) {
PRINT_ERROR("Unable to read file '%s' - error %d", src, res);
goto out_skip;
}
pos = 0;
res = vfs_write(file_dest, (void __force __user *)buf, file_size, &pos);
res = scst_write(file_dest, buf, file_size, &pos);
if (res != file_size) {
PRINT_ERROR("Unable to write to '%s' - error %d", dest, res);
goto out_skip;
@@ -15084,7 +15179,7 @@ int scst_write_file_transactional(const char *name, const char *name1,
pos = signature_len+1;
res = vfs_write(file, (void const __force __user *)buf, size, &pos);
res = scst_write(file, buf, size, &pos);
if (res != size)
goto write_error;
@@ -15095,11 +15190,11 @@ int scst_write_file_transactional(const char *name, const char *name1,
}
pos = 0;
res = vfs_write(file, (void const __force __user *)signature, signature_len, &pos);
res = scst_write(file, signature, signature_len, &pos);
if (res != signature_len)
goto write_error;
res = vfs_write(file, (void __force __user *)&n, sizeof(n), &pos);
res = scst_write(file, &n, sizeof(n), &pos);
if (res != sizeof(n))
goto write_error;
@@ -15181,7 +15276,7 @@ static int __scst_read_file_transactional(const char *file_name,
}
pos = 0;
res = vfs_read(file, (void __force __user *)buf, file_size, &pos);
res = scst_read(file, buf, file_size, &pos);
if (res != file_size) {
PRINT_ERROR("Unable to read file '%s' - error %d", file_name, res);
if (res > 0)
scst/src/scst_pres.c
+12 -12
View File
@@ -720,7 +720,7 @@ static int scst_pr_do_load_device_file(struct scst_device *dev,
}
pos = 0;
rc = vfs_read(file, (void __force __user *)buf, file_size, &pos);
rc = scst_read(file, buf, file_size, &pos);
if (rc != file_size) {
PRINT_ERROR("Unable to read file '%s' - error %d", file_name,
rc);
@@ -925,7 +925,7 @@ void scst_pr_sync_device_file(struct scst_device *dev)
*/
sign = 0;
pos = 0;
res = vfs_write(file, (void __force __user *)&sign, sizeof(sign), &pos);
res = scst_write(file, &sign, sizeof(sign), &pos);
if (res != sizeof(sign))
goto write_error;
@@ -933,7 +933,7 @@ void scst_pr_sync_device_file(struct scst_device *dev)
* version
*/
version = SCST_PR_FILE_VERSION;
res = vfs_write(file, (void __force __user *)&version, sizeof(version), &pos);
res = scst_write(file, &version, sizeof(version), &pos);
if (res != sizeof(version))
goto write_error;
@@ -941,7 +941,7 @@ void scst_pr_sync_device_file(struct scst_device *dev)
* APTPL
*/
aptpl = dev->pr_aptpl;
res = vfs_write(file, (void __force __user *)&aptpl, sizeof(aptpl), &pos);
res = scst_write(file, &aptpl, sizeof(aptpl), &pos);
if (res != sizeof(aptpl))
goto write_error;
@@ -949,15 +949,15 @@ void scst_pr_sync_device_file(struct scst_device *dev)
* reservation
*/
pr_is_set = dev->pr_is_set;
res = vfs_write(file, (void __force __user *)&pr_is_set, sizeof(pr_is_set), &pos);
res = scst_write(file, &pr_is_set, sizeof(pr_is_set), &pos);
if (res != sizeof(pr_is_set))
goto write_error;
res = vfs_write(file, (void __force __user *)&dev->pr_type, sizeof(dev->pr_type), &pos);
res = scst_write(file, &dev->pr_type, sizeof(dev->pr_type), &pos);
if (res != sizeof(dev->pr_type))
goto write_error;
res = vfs_write(file, (void __force __user *)&dev->pr_scope, sizeof(dev->pr_scope), &pos);
res = scst_write(file, &dev->pr_scope, sizeof(dev->pr_scope), &pos);
if (res != sizeof(dev->pr_scope))
goto write_error;
@@ -971,23 +971,23 @@ void scst_pr_sync_device_file(struct scst_device *dev)
is_holder = (dev->pr_holder == reg);
res = vfs_write(file, (void __force __user *)&is_holder,
res = scst_write(file, &is_holder,
sizeof(is_holder), &pos);
if (res != sizeof(is_holder))
goto write_error;
size = scst_tid_size(reg->transport_id);
res = vfs_write(file, (void __force __user *)reg->transport_id,
res = scst_write(file, reg->transport_id,
size, &pos);
if (res != size)
goto write_error;
res = vfs_write(file, (void __force __user *)&reg->key,
res = scst_write(file, &reg->key,
sizeof(reg->key), &pos);
if (res != sizeof(reg->key))
goto write_error;
res = vfs_write(file, (void __force __user *)&reg->rel_tgt_id,
res = scst_write(file, &reg->rel_tgt_id,
sizeof(reg->rel_tgt_id), &pos);
if (res != sizeof(reg->rel_tgt_id))
goto write_error;
@@ -1001,7 +1001,7 @@ void scst_pr_sync_device_file(struct scst_device *dev)
sign = SCST_PR_FILE_SIGN;
pos = 0;
res = vfs_write(file, (void __force __user *)&sign, sizeof(sign), &pos);
res = scst_write(file, &sign, sizeof(sign), &pos);
if (res != sizeof(sign))
goto write_error;
srpt/src/ib_srpt.c
+1 -6
View File
@@ -4477,12 +4477,7 @@ static void srpt_add_one(struct ib_device *device)
INIT_IB_EVENT_HANDLER(&sdev->event_handler, sdev->device,
srpt_event_handler);
ret = ib_register_event_handler(&sdev->event_handler);
if (ret) {
pr_err("ib_register_event_handler() failed: %d\n", ret);
goto err_cm;
}
ib_register_event_handler(&sdev->event_handler);
atomic_inc(&srpt_device_count);
out:
ib_set_client_data(device, &srpt_client, sdev);