mirror of
https://github.com/torvalds/linux.git
synced 2024-12-14 23:25:54 +00:00
51a858817d
When replacing the Big Kernel Lock in commit 2a48fc0ab2 ("block:
autoconvert trivial BKL users to private mutex"), the lock was replaced
with a sr-wide lock.
This causes very poor performance when using multiple sr devices, as the sr
driver was not able to execute more than one command to one drive at any
given time, even when there were many CD drives available.
Replace the global mutex with per-sr-device mutex.
Someone tried this patch at the time, but it never made it upstream, due to
possible concerns with race conditions, but it's not clear the patch
actually caused those:
https://www.spinics.net/lists/linux-scsi/msg63706.html
https://www.spinics.net/lists/linux-scsi/msg63750.html
Also see
http://lists.xiph.org/pipermail/paranoia/2019-December/001647.html
Link: https://lore.kernel.org/r/20200218143918.30267-1-merlijn@archive.org
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Merlijn Wajer <merlijn@archive.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
85 lines
2.7 KiB
C
85 lines
2.7 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
/*
|
|
* sr.h by David Giller
|
|
* CD-ROM disk driver header file
|
|
*
|
|
* adapted from:
|
|
* sd.h Copyright (C) 1992 Drew Eckhardt
|
|
* SCSI disk driver header file by
|
|
* Drew Eckhardt
|
|
*
|
|
* <drew@colorado.edu>
|
|
*
|
|
* Modified by Eric Youngdale eric@andante.org to
|
|
* add scatter-gather, multiple outstanding request, and other
|
|
* enhancements.
|
|
*/
|
|
|
|
#ifndef _SR_H
|
|
#define _SR_H
|
|
|
|
#include <linux/genhd.h>
|
|
#include <linux/kref.h>
|
|
#include <linux/mutex.h>
|
|
|
|
#define MAX_RETRIES 3
|
|
#define SR_TIMEOUT (30 * HZ)
|
|
|
|
struct scsi_device;
|
|
|
|
/* The CDROM is fairly slow, so we need a little extra time */
|
|
/* In fact, it is very slow if it has to spin up first */
|
|
#define IOCTL_TIMEOUT 30*HZ
|
|
|
|
|
|
typedef struct scsi_cd {
|
|
struct scsi_driver *driver;
|
|
unsigned capacity; /* size in blocks */
|
|
struct scsi_device *device;
|
|
unsigned int vendor; /* vendor code, see sr_vendor.c */
|
|
unsigned long ms_offset; /* for reading multisession-CD's */
|
|
unsigned writeable : 1;
|
|
unsigned use:1; /* is this device still supportable */
|
|
unsigned xa_flag:1; /* CD has XA sectors ? */
|
|
unsigned readcd_known:1; /* drive supports READ_CD (0xbe) */
|
|
unsigned readcd_cdda:1; /* reading audio data using READ_CD */
|
|
unsigned media_present:1; /* media is present */
|
|
|
|
/* GET_EVENT spurious event handling, blk layer guarantees exclusion */
|
|
int tur_mismatch; /* nr of get_event TUR mismatches */
|
|
bool tur_changed:1; /* changed according to TUR */
|
|
bool get_event_changed:1; /* changed according to GET_EVENT */
|
|
bool ignore_get_event:1; /* GET_EVENT is unreliable, use TUR */
|
|
|
|
struct cdrom_device_info cdi;
|
|
struct mutex lock;
|
|
/* We hold gendisk and scsi_device references on probe and use
|
|
* the refs on this kref to decide when to release them */
|
|
struct kref kref;
|
|
struct gendisk *disk;
|
|
} Scsi_CD;
|
|
|
|
#define sr_printk(prefix, cd, fmt, a...) \
|
|
sdev_prefix_printk(prefix, (cd)->device, (cd)->cdi.name, fmt, ##a)
|
|
|
|
int sr_do_ioctl(Scsi_CD *, struct packet_command *);
|
|
|
|
int sr_lock_door(struct cdrom_device_info *, int);
|
|
int sr_tray_move(struct cdrom_device_info *, int);
|
|
int sr_drive_status(struct cdrom_device_info *, int);
|
|
int sr_disk_status(struct cdrom_device_info *);
|
|
int sr_get_last_session(struct cdrom_device_info *, struct cdrom_multisession *);
|
|
int sr_get_mcn(struct cdrom_device_info *, struct cdrom_mcn *);
|
|
int sr_reset(struct cdrom_device_info *);
|
|
int sr_select_speed(struct cdrom_device_info *cdi, int speed);
|
|
int sr_audio_ioctl(struct cdrom_device_info *, unsigned int, void *);
|
|
|
|
int sr_is_xa(Scsi_CD *);
|
|
|
|
/* sr_vendor.c */
|
|
void sr_vendor_init(Scsi_CD *);
|
|
int sr_cd_check(struct cdrom_device_info *);
|
|
int sr_set_blocklength(Scsi_CD *, int blocklength);
|
|
|
|
#endif
|