[PATCH blktests] sg: add regression test for patch scsi: sg: fix SG_DXFER_FROM_DEV transfers

[PATCH blktests] sg: add regression test for patch scsi: sg: fix SG_DXFER_FROM_DEV transfers

[Johannes Thumshirn]

Add a regression test for the patch titled "scsi: sg: fix
SG_DXFER_FROM_DEV transfers" which reassembles the syscalls done by Nero
Burning ROM to discover CD and DVD burners.

Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
---
 common/sg               |  2 +-
 src/.gitignore          |  1 +
 src/Makefile            |  2 +-
 src/sg/dxfer-from-dev.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++
 src/sg/sg-dxfer.c       | 57 +++++++++++++++++++++++++++++++++++++++++++++++++
 tests/sg/002            | 38 +++++++++++++++++++++++++++++++++
 tests/sg/002.out        |  3 +++
 7 files changed, 158 insertions(+), 2 deletions(-)
 create mode 100644 src/sg/dxfer-from-dev.c
 create mode 100644 src/sg/sg-dxfer.c
 create mode 100755 tests/sg/002
 create mode 100644 tests/sg/002.out

diff --git a/common/sg b/common/sg
index c306af500350..19732ec6a541 100644
--- a/common/sg
+++ b/common/sg
@@ -30,5 +30,5 @@ _test_dev_is_scsi() {
 }
 
 _get_sg_from_blockdev() {
-	echo /sys/block/"$1"/device/scsi_generic/sg+([0-9])
+	echo ${TEST_DEV_SYSFS}/device/scsi_generic/sg* | grep -Eo "sg[0-9]+"
 }
diff --git a/src/.gitignore b/src/.gitignore
index 722c137c7fca..0fca08a74fb1 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -1 +1,2 @@
 /sg/syzkaller1
+/sg/dxfer-from-dev
diff --git a/src/Makefile b/src/Makefile
index 0e8d74688db4..57b6bb25793a 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,4 +1,4 @@
-TARGETS := sg/syzkaller1
+TARGETS := sg/syzkaller1 sg/dxfer-from-dev
 
 CFLAGS := -O2
 
diff --git a/src/sg/dxfer-from-dev.c b/src/sg/dxfer-from-dev.c
new file mode 100644
index 000000000000..ca52f30e23af
--- /dev/null
+++ b/src/sg/dxfer-from-dev.c
@@ -0,0 +1,57 @@
+#include <stdlib.h>
+#include <stdio.h>
+#include <errno.h>
+#include <unistd.h>
+
+#include <sys/ioctl.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
+#include <scsi/sg.h>
+
+int main(int argc, char **argv)
+{
+	int fd;
+	int rc;
+	int rsz = 131072;
+	int tout = 10800000;
+	char buf[42] = { 0 };
+
+	if (argc != 2) {
+		printf("usage: %s /dev/sgX\n", argv[0]);
+		return 1;
+	}
+
+	fd = open(argv[1], O_RDWR);
+	if (fd < 0) {
+		perror("open");
+		return 1;
+	}
+
+	rc = ioctl(fd, SG_SET_RESERVED_SIZE, &rsz);
+	if (rc < 0) {
+		perror("ioctl SG_SET_RESERVED_SIZE");
+		goto out_close;
+	}
+
+	rc = ioctl(fd, SG_SET_TIMEOUT, &tout);
+	if (rc < 0) {
+		perror("ioctl SG_SET_TIMEOUT");
+		goto out_close;
+	}
+
+	buf[4] = 'H';
+	rc = write(fd, &buf, sizeof(buf));
+	if (rc < 0) {
+		perror("write");
+		if (errno == EINVAL)
+			printf("FAIL\n");
+		goto out_close;
+	}
+
+	printf("PASS\n");
+
+out_close:
+	close(fd);
+}
diff --git a/src/sg/sg-dxfer.c b/src/sg/sg-dxfer.c
new file mode 100644
index 000000000000..ca52f30e23af
--- /dev/null
+++ b/src/sg/sg-dxfer.c
@@ -0,0 +1,57 @@
+#include <stdlib.h>
+#include <stdio.h>
+#include <errno.h>
+#include <unistd.h>
+
+#include <sys/ioctl.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
+#include <scsi/sg.h>
+
+int main(int argc, char **argv)
+{
+	int fd;
+	int rc;
+	int rsz = 131072;
+	int tout = 10800000;
+	char buf[42] = { 0 };
+
+	if (argc != 2) {
+		printf("usage: %s /dev/sgX\n", argv[0]);
+		return 1;
+	}
+
+	fd = open(argv[1], O_RDWR);
+	if (fd < 0) {
+		perror("open");
+		return 1;
+	}
+
+	rc = ioctl(fd, SG_SET_RESERVED_SIZE, &rsz);
+	if (rc < 0) {
+		perror("ioctl SG_SET_RESERVED_SIZE");
+		goto out_close;
+	}
+
+	rc = ioctl(fd, SG_SET_TIMEOUT, &tout);
+	if (rc < 0) {
+		perror("ioctl SG_SET_TIMEOUT");
+		goto out_close;
+	}
+
+	buf[4] = 'H';
+	rc = write(fd, &buf, sizeof(buf));
+	if (rc < 0) {
+		perror("write");
+		if (errno == EINVAL)
+			printf("FAIL\n");
+		goto out_close;
+	}
+
+	printf("PASS\n");
+
+out_close:
+	close(fd);
+}
diff --git a/tests/sg/002 b/tests/sg/002
new file mode 100755
index 000000000000..c8b39091f82a
--- /dev/null
+++ b/tests/sg/002
@@ -0,0 +1,38 @@
+#!/bin/bash
+#
+# TODO: provide a description of the test here, i.e., what it tests and how. If
+# this is a regression test for a patch, reference the patch title:
+#
+# Regression test for patch "scsi: sg: fix SG_DXFER_FROM_DEV transfers"
+#
+# Copyright (C) 2017 Johannes Thumshirn
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+DESCRIPTION="perfom a SG_DXFER_FROM_DEV from the /dev/sg read-write interface"
+QUICK=1
+
+requires() {
+	_have_src_program sg/dxfer-from-dev
+}
+
+
+test_device() {
+	echo "Running ${TEST_NAME}"
+
+	SG_DEV="/dev/$(_get_sg_from_blockdev "$TEST_DEV")"
+	"$SRCDIR"/sg/dxfer-from-dev "$SG_DEV"
+
+	echo "Test complete"
+}
diff --git a/tests/sg/002.out b/tests/sg/002.out
new file mode 100644
index 000000000000..77b4bc1672ab
--- /dev/null
+++ b/tests/sg/002.out
@@ -0,0 +1,3 @@
+Running sg/002
+PASS
+Test complete
-- 
2.12.3

Re: [PATCH blktests] sg: add regression test for patch scsi: sg: fix SG_DXFER_FROM_DEV transfers

[Johannes Thumshirn]

Omar, ping?
-- 
Johannes Thumshirn                                          Storage
jthumshirn@suse.de                                +49 911 74053 689
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: Felix Imendörffer, Jane Smithard, Graham Norton
HRB 21284 (AG Nürnberg)
Key fingerprint = EC38 9CAB C2C4 F25D 8600 D0D0 0393 969D 2D76 0850

Re: [PATCH blktests] sg: add regression test for patch scsi: sg: fix SG_DXFER_FROM_DEV transfers

[Omar Sandoval]

On Thu, Jul 06, 2017 at 02:09:21PM +0200, Johannes Thumshirn wrote:
> Add a regression test for the patch titled "scsi: sg: fix
> SG_DXFER_FROM_DEV transfers" which reassembles the syscalls done by Nero
> Burning ROM to discover CD and DVD burners.

Fixed up a few things below and applied, thanks!

> Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
> ---
>  common/sg               |  2 +-
>  src/.gitignore          |  1 +
>  src/Makefile            |  2 +-
>  src/sg/dxfer-from-dev.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++
>  src/sg/sg-dxfer.c       | 57 +++++++++++++++++++++++++++++++++++++++++++++++++
>  tests/sg/002            | 38 +++++++++++++++++++++++++++++++++
>  tests/sg/002.out        |  3 +++
>  7 files changed, 158 insertions(+), 2 deletions(-)
>  create mode 100644 src/sg/dxfer-from-dev.c
>  create mode 100644 src/sg/sg-dxfer.c
>  create mode 100755 tests/sg/002
>  create mode 100644 tests/sg/002.out
> 
> diff --git a/common/sg b/common/sg
> index c306af500350..19732ec6a541 100644
> --- a/common/sg
> +++ b/common/sg
> @@ -30,5 +30,5 @@ _test_dev_is_scsi() {
>  }
>  
>  _get_sg_from_blockdev() {
> -	echo /sys/block/"$1"/device/scsi_generic/sg+([0-9])
> +	echo ${TEST_DEV_SYSFS}/device/scsi_generic/sg* | grep -Eo "sg[0-9]+"
>  }

I renamed this to _get_test_dev_sg to reflect the new behavior.

> diff --git a/src/.gitignore b/src/.gitignore
> index 722c137c7fca..0fca08a74fb1 100644
> --- a/src/.gitignore
> +++ b/src/.gitignore
> @@ -1 +1,2 @@
>  /sg/syzkaller1
> +/sg/dxfer-from-dev
> diff --git a/src/Makefile b/src/Makefile
> index 0e8d74688db4..57b6bb25793a 100644
> --- a/src/Makefile
> +++ b/src/Makefile
> @@ -1,4 +1,4 @@
> -TARGETS := sg/syzkaller1
> +TARGETS := sg/syzkaller1 sg/dxfer-from-dev
>  
>  CFLAGS := -O2
>  
> diff --git a/src/sg/dxfer-from-dev.c b/src/sg/dxfer-from-dev.c
> new file mode 100644
> index 000000000000..ca52f30e23af
> --- /dev/null
> +++ b/src/sg/dxfer-from-dev.c
> @@ -0,0 +1,57 @@
> +#include <stdlib.h>
> +#include <stdio.h>
> +#include <errno.h>
> +#include <unistd.h>
> +
> +#include <sys/ioctl.h>
> +#include <sys/types.h>
> +#include <sys/stat.h>
> +#include <fcntl.h>
> +
> +#include <scsi/sg.h>
> +
> +int main(int argc, char **argv)
> +{
> +	int fd;
> +	int rc;
> +	int rsz = 131072;
> +	int tout = 10800000;
> +	char buf[42] = { 0 };
> +
> +	if (argc != 2) {
> +		printf("usage: %s /dev/sgX\n", argv[0]);
> +		return 1;
> +	}
> +
> +	fd = open(argv[1], O_RDWR);
> +	if (fd < 0) {
> +		perror("open");
> +		return 1;
> +	}
> +
> +	rc = ioctl(fd, SG_SET_RESERVED_SIZE, &rsz);
> +	if (rc < 0) {
> +		perror("ioctl SG_SET_RESERVED_SIZE");
> +		goto out_close;
> +	}
> +
> +	rc = ioctl(fd, SG_SET_TIMEOUT, &tout);
> +	if (rc < 0) {
> +		perror("ioctl SG_SET_TIMEOUT");
> +		goto out_close;
> +	}
> +
> +	buf[4] = 'H';
> +	rc = write(fd, &buf, sizeof(buf));
> +	if (rc < 0) {
> +		perror("write");
> +		if (errno == EINVAL)
> +			printf("FAIL\n");
> +		goto out_close;
> +	}
> +
> +	printf("PASS\n");
> +
> +out_close:
> +	close(fd);
> +}
> diff --git a/src/sg/sg-dxfer.c b/src/sg/sg-dxfer.c
> new file mode 100644
> index 000000000000..ca52f30e23af
> --- /dev/null
> +++ b/src/sg/sg-dxfer.c

This file looks like a copy of sg-dxfer-dev.c, removed it.

> diff --git a/tests/sg/002 b/tests/sg/002
> new file mode 100755
> index 000000000000..c8b39091f82a
> --- /dev/null
> +++ b/tests/sg/002
> @@ -0,0 +1,38 @@
> +#!/bin/bash
> +#
> +# TODO: provide a description of the test here, i.e., what it tests and how. If
> +# this is a regression test for a patch, reference the patch title:

You forgot to delete this part :)