From patchwork Thu Jul 6 12:09:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Thumshirn X-Patchwork-Id: 9828083 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9E76B602BD for ; Thu, 6 Jul 2017 12:09:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8CDA12863D for ; Thu, 6 Jul 2017 12:09:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7DFB828643; Thu, 6 Jul 2017 12:09:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A710628618 for ; Thu, 6 Jul 2017 12:09:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752228AbdGFMJf (ORCPT ); Thu, 6 Jul 2017 08:09:35 -0400 Received: from mx2.suse.de ([195.135.220.15]:46982 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751927AbdGFMJe (ORCPT ); Thu, 6 Jul 2017 08:09:34 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 78EDFAAF2; Thu, 6 Jul 2017 12:09:32 +0000 (UTC) From: Johannes Thumshirn To: Omar Sandoval Cc: Linux Block Layer Mailinglist , Linux SCSI Mailinglist , Johannes Thumshirn Subject: [PATCH blktests] sg: add regression test for patch scsi: sg: fix SG_DXFER_FROM_DEV transfers Date: Thu, 6 Jul 2017 14:09:21 +0200 Message-Id: <20170706120921.14801-1-jthumshirn@suse.de> X-Mailer: git-send-email 2.12.3 Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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 +#include +#include +#include + +#include +#include +#include +#include + +#include + +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 +#include +#include +#include + +#include +#include +#include +#include + +#include + +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 . + +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