From: Michal Suchanek <msuchanek@suse.de>
To: linux-scsi@vger.kernel.org, linux-block@vger.kernel.org
Cc: Michal Suchanek <msuchanek@suse.de>,
Jonathan Corbet <corbet@lwn.net>, Jens Axboe <axboe@kernel.dk>,
"James E.J. Bottomley" <jejb@linux.ibm.com>,
"Martin K. Petersen" <martin.petersen@oracle.com>,
Alexander Viro <viro@zeniv.linux.org.uk>,
Eric Biggers <ebiggers@google.com>,
"J. Bruce Fields" <bfields@redhat.com>,
Mauro Carvalho Chehab <mchehab+samsung@kernel.org>,
Benjamin Coddington <bcodding@redhat.com>,
Ming Lei <ming.lei@redhat.com>,
Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>,
Bart Van Assche <bvanassche@acm.org>,
Damien Le Moal <damien.lemoal@wdc.com>,
Hou Tao <houtao1@huawei.com>,
Pavel Begunkov <asml.silence@gmail.com>,
linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org,
Jan Kara <jack@suse.cz>, Hannes Reinecke <hare@suse.com>,
"Ewan D. Milne" <emilne@redhat.com>,
Christoph Hellwig <hch@infradead.org>,
Matthew Wilcox <willy@infradead.org>
Subject: [PATCH v4 rebase 04/10] cdrom: export autoclose logic as a separate function
Date: Tue, 26 Nov 2019 20:54:23 +0100 [thread overview]
Message-ID: <80d5a59f37de16b6157987122001bc03f040bac8.1574797504.git.msuchanek@suse.de> (raw)
In-Reply-To: <cover.1574797504.git.msuchanek@suse.de>
This allows the sr driver to call it without blocking other processes
accessing the device. This solves a issue with process waiting in open()
on broken drive to close the tray blocking out all access to the device,
including nonblocking access to determine drive status.
Signed-off-by: Michal Suchanek <msuchanek@suse.de>
---
v2: new patch
v3:
- change IOCTL to export
- fix the logic about reporting cdroms inability to close tray
v4:
- move the autoclose code to the open code, align debug messages with
the open code
---
drivers/cdrom/cdrom.c | 85 ++++++++++++++++++++++++++++++-------------
include/linux/cdrom.h | 1 +
2 files changed, 61 insertions(+), 25 deletions(-)
diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
index b2bc0c8f9a69..38e6db879de0 100644
--- a/drivers/cdrom/cdrom.c
+++ b/drivers/cdrom/cdrom.c
@@ -1067,6 +1067,56 @@ static int cdrom_tray_close(struct cdrom_device_info *cdi)
return cdrom_wait_for_status_change(cdi, &ret);
}
+int cdrom_autoclose(struct cdrom_device_info *cdi)
+{
+ int ret;
+ const struct cdrom_device_ops *cdo = cdi->ops;
+
+ cd_dbg(CD_OPEN, "entering cdrom_autoclose\n");
+ if (!cdo->drive_status)
+ return -EOPNOTSUPP;
+
+ ret = cdo->drive_status(cdi, CDSL_CURRENT);
+ cd_dbg(CD_OPEN, "drive_status=%d\n", ret);
+
+ if (ret == CDS_TRAY_OPEN) {
+ cd_dbg(CD_OPEN, "the tray is open...\n");
+ if (CDROM_CAN(CDC_CLOSE_TRAY)) {
+ if (!(cdi->options & CDO_AUTO_CLOSE))
+ return -ENOMEDIUM;
+ cd_dbg(CD_OPEN, "trying to close the tray\n");
+ ret = cdrom_tray_close(cdi);
+ if (ret == -ERESTARTSYS)
+ return ret;
+ if (ret) {
+ cd_dbg(CD_OPEN, "bummer. tried to close the tray but failed.\n");
+ return -ENOMEDIUM;
+ }
+ ret = cdo->drive_status(cdi, CDSL_CURRENT);
+ if (ret == CDS_NO_DISC)
+ cd_dbg(CD_OPEN, "tray might not contain a medium\n");
+ } else {
+ cd_dbg(CD_OPEN, "bummer. this drive can't close the tray.\n");
+ return -ENOMEDIUM;
+ }
+ }
+
+ if (ret == CDS_DRIVE_NOT_READY) {
+ int poll_res;
+
+ cd_dbg(CD_OPEN, "waiting for drive to become ready...\n");
+ poll_res = cdrom_wait_for_status_change(cdi, &ret);
+ if (poll_res == -ERESTARTSYS)
+ return poll_res;
+ }
+
+ if (ret != CDS_DISC_OK)
+ return -ENOMEDIUM;
+
+ return 0;
+}
+EXPORT_SYMBOL_GPL(cdrom_autoclose);
+
static int open_for_common(struct cdrom_device_info *cdi, tracktype *tracks)
{
int ret;
@@ -1080,35 +1130,20 @@ static int open_for_common(struct cdrom_device_info *cdi, tracktype *tracks)
cd_dbg(CD_OPEN, "drive_status=%d\n", ret);
if (ret == CDS_TRAY_OPEN) {
cd_dbg(CD_OPEN, "the tray is open...\n");
- if (CDROM_CAN(CDC_CLOSE_TRAY)) {
- if (!(cdi->options & CDO_AUTO_CLOSE))
- return -ENOMEDIUM;
- cd_dbg(CD_OPEN, "trying to close the tray\n");
- ret = cdrom_tray_close(cdi);
- if (ret == -ERESTARTSYS)
- return ret;
- if (ret) {
- cd_dbg(CD_OPEN, "bummer. tried to close the tray but failed.\n");
- return -ENOMEDIUM;
- }
- ret = cdo->drive_status(cdi, CDSL_CURRENT);
- if (ret == CDS_NO_DISC)
- cd_dbg(CD_OPEN, "tray might not contain a medium\n");
- } else {
- cd_dbg(CD_OPEN, "bummer. this drive can't close the tray.\n");
- return -ENOMEDIUM;
- }
+ return -ENOMEDIUM;
}
if (ret == CDS_DRIVE_NOT_READY) {
- int poll_res;
-
- cd_dbg(CD_OPEN, "waiting for drive to become ready...\n");
- poll_res = cdrom_wait_for_status_change(cdi, &ret);
- if (poll_res == -ERESTARTSYS)
- return poll_res;
+ cd_dbg(CD_OPEN, "the drive is not ready...\n");
+ return -ENOMEDIUM;
}
- if (ret != CDS_DISC_OK)
+ if (ret == CDS_NO_DISC) {
+ cd_dbg(CD_OPEN, "tray might not contain a medium...\n");
return -ENOMEDIUM;
+ }
+ if (ret != CDS_DISC_OK) {
+ cd_dbg(CD_OPEN, "drive returned status %i...\n", ret);
+ return -ENOMEDIUM;
+ }
}
cdrom_count_tracks(cdi, tracks);
if (tracks->error == CDS_NO_DISC) {
diff --git a/include/linux/cdrom.h b/include/linux/cdrom.h
index 528271c60018..ea0415ba9f9d 100644
--- a/include/linux/cdrom.h
+++ b/include/linux/cdrom.h
@@ -126,6 +126,7 @@ extern void init_cdrom_command(struct packet_command *cgc,
void *buffer, int len, int type);
extern int cdrom_dummy_generic_packet(struct cdrom_device_info *cdi,
struct packet_command *cgc);
+int cdrom_autoclose(struct cdrom_device_info *cdi);
/* The SCSI spec says there could be 256 slots. */
#define CDROM_MAX_SLOTS 256
--
2.23.0
next prev parent reply other threads:[~2019-11-26 19:54 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-26 19:54 [PATCH v4 rebase 00/10] Fix cdrom autoclose Michal Suchanek
2019-11-26 19:54 ` [PATCH v4 rebase 01/10] cdrom: add poll_event_interruptible Michal Suchanek
2019-11-26 19:54 ` [PATCH v4 rebase 02/10] cdrom: factor out common open_for_* code Michal Suchanek
2019-11-26 19:54 ` [PATCH v4 rebase 03/10] cdrom: wait for the tray to close Michal Suchanek
2019-11-26 19:54 ` Michal Suchanek [this message]
2019-11-26 19:54 ` [PATCH v4 rebase 05/10] cdrom: unify log messages Michal Suchanek
2019-11-26 19:54 ` [PATCH v4 rebase 06/10] bdev: reset first_open when looping in __blkget_dev Michal Suchanek
2019-11-26 19:54 ` [PATCH v4 rebase 07/10] bdev: separate parts of __blkdev_get as helper functions Michal Suchanek
2019-11-26 19:54 ` [PATCH v4 rebase 08/10] bdev: add open_finish Michal Suchanek
2019-11-26 19:54 ` [PATCH v4 rebase 09/10] scsi: blacklist: add VMware ESXi cdrom - broken tray emulation Michal Suchanek
2019-11-26 19:54 ` [PATCH v4 rebase 10/10] scsi: sr: wait for the medium to become ready Michal Suchanek
2019-11-26 20:01 ` [PATCH v4 rebase 00/10] Fix cdrom autoclose Jens Axboe
2019-11-26 20:21 ` Michal Suchánek
2019-11-26 23:13 ` Jens Axboe
2019-11-27 8:11 ` Michal Suchánek
2019-12-04 19:01 ` Michal Suchánek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=80d5a59f37de16b6157987122001bc03f040bac8.1574797504.git.msuchanek@suse.de \
--to=msuchanek@suse.de \
--cc=asml.silence@gmail.com \
--cc=axboe@kernel.dk \
--cc=bcodding@redhat.com \
--cc=bfields@redhat.com \
--cc=bvanassche@acm.org \
--cc=chaitanya.kulkarni@wdc.com \
--cc=corbet@lwn.net \
--cc=damien.lemoal@wdc.com \
--cc=ebiggers@google.com \
--cc=emilne@redhat.com \
--cc=hare@suse.com \
--cc=hch@infradead.org \
--cc=houtao1@huawei.com \
--cc=jack@suse.cz \
--cc=jejb@linux.ibm.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=mchehab+samsung@kernel.org \
--cc=ming.lei@redhat.com \
--cc=viro@zeniv.linux.org.uk \
--cc=willy@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).