Author: ken
Date: Tue Mar 24 14:36:10 2015
New Revision: 280438
URL: https://svnweb.freebsd.org/changeset/base/280438
Log:
MFC sa(4) and mt(1) improvements.
This includes these changes: 279219, 279229, 279261, 279534, 279570,
280230, 280231.
In addition, bump __FreeBSD_version for the addition of the new
mtio(4) / sa(4) ioctls.
Thanks to Dan Langille, Harald Schmalzbauer and Rudolf Cejka for spending
a significant amount of time and effort testing these changes.
------------------------------------------------------------------------
r279219 | ken | 2015-02-23 14:59:30 -0700 (Mon, 23 Feb 2015) | 282 lines
Significant upgrades to sa(4) and mt(1).
The primary focus of these changes is to modernize FreeBSD's
tape infrastructure so that we can take advantage of some of the
features of modern tape drives and allow support for LTFS.
Significant changes and new features include:
o sa(4) driver status and parameter information is now exported via an
XML structure. This will allow for changes and improvements later
on that will not break userland applications. The old MTIOCGET
status ioctl remains, so applications using the existing interface
will not break.
o 'mt status' now reports drive-reported tape position information
as well as the previously available calculated tape position
information. These numbers will be different at times, because
the drive-reported block numbers are relative to BOP (Beginning
of Partition), but the block numbers calculated previously via
sa(4) (and still provided) are relative to the last filemark.
Both numbers are now provided. 'mt status' now also shows the
drive INQUIRY information, serial number and any position flags
(BOP, EOT, etc.) provided with the tape position information.
'mt status -v' adds information on the maximum possible I/O size,
and the underlying values used to calculate it.
o The extra sa(4) /dev entries (/dev/saN.[0-3]) have been removed.
The extra devices were originally added as place holders for
density-specific device nodes. Some OSes (NetBSD, NetApp's OnTap
and Solaris) have had device nodes that, when you write to them,
will automatically select a given density for particular tape drives.
This is a convenient way of switching densities, but it was never
implemented in FreeBSD. Only the device nodes were there, and that
sometimes confused users.
For modern tape devices, the density is generally not selectable
(e.g. with LTO) or defaults to the highest availble density when
the tape is rewritten from BOT (e.g. TS11X0). So, for most users,
density selection won't be necessary. If they do need to select
the density, it is easy enough to use 'mt density' to change it.
o Protection information is now supported. This is either a
Reed-Solomon CRC or CRC32 that is included at the end of each block
read and written. On write, the tape drive verifies the CRC, and
on read, the tape drive provides a CRC for the userland application
to verify.
o New, extensible tape driver parameter get/set interface.
o Density reporting information. For drives that support it,
'mt getdensity' will show detailed information on what formats the
tape drive supports, and what formats the tape drive supports.
o Some mt(1) functionality moved into a new mt(3) library so that
external applications can reuse the code.
o The new mt(3) library includes helper routines to aid in parsing
the XML output of the sa(4) driver, and build a tree of driver
metadata.
o Support for the MTLOAD (load a tape in the drive) and MTWEOFI
(write filemark immediate) ioctls needed by IBM's LTFS
implementation.
o Improve device departure behavior for the sa(4) driver. The previous
implementation led to hangs when the device was open.
o This has been tested on the following types of drives:
IBM TS1150
IBM TS1140
IBM LTO-6
IBM LTO-5
HP LTO-2
Seagate DDS-4
Quantum DLT-4000
Exabyte 8505
Sony DDS-2
contrib/groff/tmac/doc-syms,
share/mk/bsd.libnames.mk,
lib/Makefile,
Add libmt.
lib/libmt/Makefile,
lib/libmt/mt.3,
lib/libmt/mtlib.c,
lib/libmt/mtlib.h,
New mt(3) library that contains functions moved from mt(1) and
new functions needed to interact with the updated sa(4) driver.
This includes XML parser helper functions that application writers
can use when writing code to query tape parameters.
rescue/rescue/Makefile:
Add -lmt to CRUNCH_LIBS.
src/share/man/man4/mtio.4
Clarify this man page a bit, and since it contains what is
essentially the mtio.h header file, add new ioctls and structure
definitions from mtio.h.
src/share/man/man4/sa.4
Update BUGS and maintainer section.
sys/cam/scsi/scsi_all.c,
sys/cam/scsi/scsi_all.h:
Add SCSI SECURITY PROTOCOL IN/OUT CDB definitions and CDB building
functions.
sys/cam/scsi/scsi_sa.c
sys/cam/scsi/scsi_sa.h
Many tape driver changes, largely outlined above.
Increase the sa(4) driver read/write timeout from 4 to 32
minutes. This is based on the recommended values for IBM LTO
5/6 drives. This may also avoid timeouts for other tape
hardware that can take a long time to do retries and error
recovery. Longer term, a better way to handle this is to ask
the drive for recommended timeout values using the REPORT
SUPPORTED OPCODES command. Modern IBM and Oracle tape drives
at least support that command, and it would allow for more
accurate timeout values.
Add XML status generation. This is done with a series of
macros to eliminate as much duplicate code as possible. The
new XML-based status values are reported through the new
MTIOCEXTGET ioctl.
Add XML driver parameter reporting, using the new MTIOCPARAMGET
ioctl.
Add a new driver parameter setting interface, using the new
MTIOCPARAMSET and MTIOCSETLIST ioctls.
Add a new MTIOCRBLIM ioctl to get block limits information.
Add CCB/CDB building routines scsi_locate_16, scsi_locate_10,
and scsi_read_position_10().
scsi_locate_10 implements the LOCATE command, as does the
existing scsi_set_position() command. It just supports
additional arguments and features. If/when we figure out a
good way to provide backward compatibility for older
applications using the old function API, we can just revamp
scsi_set_position(). The same goes for
scsi_read_position_10() and the existing scsi_read_position()
function.
Revamp sasetpos() to take the new mtlocate structure as an
argument. It now will use either scsi_locate_10() or
scsi_locate_16(), depending upon the arguments the user
supplies. As before, once we change position we don't have a
clear idea of what the current logical position of the tape
drive is.
For tape drives that support long form position data, we
read the current position and store that for later reporting
after changing the position. This should help applications
like Bacula speed tape access under FreeBSD once they are
modified to support the new ioctls.
Add a new quirk, SA_QUIRK_NO_LONG_POS, that is set for all
drives that report SCSI-2 or older, as well as drives that
report an Illegal Request type error for READ POSITION with
the long format. So we should automatically detect drives
that don't support the long form and stop asking for it after
an initial try.
Add a partition number to the sa(4) softc.
Improve device departure handling. The previous implementation
led to hangs when the device was open.
If an application had the sa(4) driver open, and attempted to
close it after it went away, the cam_periph_release() call in
saclose() would cause the periph to get destroyed because that
was the last reference to it. Because destroy_dev() was
called from the sa(4) driver's cleanup routine (sacleanup()),
and would block waiting for the close to happen, a deadlock
would result.
So instead of calling destroy_dev() from the cleanup routine,
call destroy_dev_sched_cb() from saoninvalidate() and wait for
the callback.
Acquire a reference for devfs in saregister(), and release it
in the new sadevgonecb() routine when all devfs devices for
the particular sa(4) driver instance are gone.
Add a new function, sasetupdev(), to centralize setting
per-instance devfs device parameters instead of repeating the
code in saregister().
Add an open count to the softc, so we know how many
peripheral driver references are a result of open
sessions.
Add the D_TRACKCLOSE flag to the cdevsw flags so
that we get a 1:1 mapping of open to close calls
instead of a N:1 mapping.
This should be a no-op for everything except the
control device, since we don't allow more than one
open on non-control devices.
However, since we do allow multiple opens on the
control device, the combination of the open count
and the D_TRACKCLOSE flag should result in an
accurate peripheral driver reference count, and an
accurate open count.
The accurate open count allows us to release all
peripheral driver references that are the result
of open contexts once we get the callback from devfs.
sys/sys/mtio.h:
Add a number of new mt(4) ioctls and the requisite data
structures. None of the existing interfaces been removed
or changed.
This includes definitions for the following new ioctls:
MTIOCRBLIM /* get block limits */
MTIOCEXTLOCATE /* seek to position */
MTIOCEXTGET /* get tape status */
MTIOCPARAMGET /* get tape params */
MTIOCPARAMSET /* set tape params */
MTIOCSETLIST /* set N params */
usr.bin/mt/Makefile:
mt(1) now depends on libmt, libsbuf and libbsdxml.
usr.bin/mt/mt.1:
Document new mt(1) features and subcommands.
usr.bin/mt/mt.c:
Implement support for mt(1) subcommands that need to
use getopt(3) for their arguments.
Implement a new 'mt status' command to replace the old
'mt status' command. The old status command has been
renamed 'ostatus'.
The new status function uses the MTIOCEXTGET ioctl, and
therefore parses the XML data to determine drive status.
The -x argument to 'mt status' allows the user to dump out
the raw XML reported by the kernel.
The new status display is mostly the same as the old status
display, except that it doesn't print the redundant density
mode information, and it does print the current partition
number and position flags.
Add a new command, 'mt locate', that will supersede the
old 'mt setspos' and 'mt sethpos' commands. 'mt locate'
implements all of the functionality of the MTIOCEXTLOCATE
ioctl, and allows the user to change the logical position
of the tape drive in a number of ways. (Partition,
block number, file number, set mark number, end of data.)
The immediate bit and the explicit address bits are
implemented, but not documented in the man page.
Add a new 'mt weofi' command to use the new MTWEOFI ioctl.
This allows the user to ask the drive to write a filemark
without waiting around for the operation to complete.
Add a new 'mt getdensity' command that gets the XML-based
tape drive density report from the sa(4) driver and displays
it. This uses the SCSI REPORT DENSITY SUPPORT command
to get comprehensive information from the tape drive about
what formats it is able to read and write.
Add a new 'mt protect' command that allows getting and setting
tape drive protection information. The protection information
is a CRC tacked on to the end of every read/write from and to
the tape drive.
Sponsored by: Spectra Logic
MFC after: 1 month
------------------------------------------------------------------------
------------------------------------------------------------------------
r279229 | ken | 2015-02-23 22:43:16 -0700 (Mon, 23 Feb 2015) | 5 lines
Fix printf format warnings on sparc64 and mips.
Sponsored by: Spectra Logic
MFC after: 1 month
------------------------------------------------------------------------
------------------------------------------------------------------------
r279261 | ken | 2015-02-24 21:30:23 -0700 (Tue, 24 Feb 2015) | 23 lines
Fix several problems found by Coverity.
lib/libmt/mtlib.c:
In mt_start_element(), make sure we don't overflow the
cur_sb array. CID 1271325
usr.bin/mt/mt.c:
In main(), bzero the mt_com structure so that we aren't
using any uninitialized stack variables. CID 1271319
In mt_param(), only allow one -s and one -p argument. This
will prevent a memory leak caused by overwriting the
param_name and/or param_value variables. CID 1271320 and
CID 1271322
To make things simpler in mt_param(), make sure there
there is only one exit path for the function. Make sure
the arguments are explicitly freed.
Sponsored by: Spectra Logic
Pointed out by: emaste
MFC after: 1 month
------------------------------------------------------------------------
------------------------------------------------------------------------
r279534 | ken | 2015-03-02 11:09:49 -0700 (Mon, 02 Mar 2015) | 18 lines
Change the sa(4) driver to check for long position support on
SCSI-2 devices.
Some older tape devices claim to be SCSI-2, but actually do support
long position information. (Long position information includes
the current file mark.) For example, the COMPAQ SuperDLT1.
So we now only disable the check on SCSI-1 and older devices.
sys/cam/scsi/scsi_sa.c:
In saregister(), only disable fetching long position
information on SCSI-1 and older drives. Update the
comment to explain why.
Confirmed by: dvl
Sponsored by: Spectra Logic
MFC after: 3 weeks
------------------------------------------------------------------------
------------------------------------------------------------------------
r279570 | ken | 2015-03-03 15:49:07 -0700 (Tue, 03 Mar 2015) | 21 lines
Add density code for DAT-72, and notes on DAT-160.
As it turns out, the density code for DAT-160 (0x48) is the same
as for SDLT220. Since the SDLT values are already in the table,
we will leave them in place.
Thanks to Harald Schmalzbauer for confirming the DAT-72 density code.
lib/libmt/mtlib.c:
Add DAT-72 density code, and commented out DAT-160 density
code. Explain why DAT-160 is commented out. Add notes
explaining where the bpi values for these formats came from.
usr.bin/mt/mt.1:
Add DAT-72 density code, and add a note explaining that
the SDLTTapeI(110) density code (0x48) is the same as
DAT-160.
Sponsored by: Spectra Logic
MFC after: 3 weeks
------------------------------------------------------------------------
------------------------------------------------------------------------
r280230 | ken | 2015-03-18 14:52:34 -0600 (Wed, 18 Mar 2015) | 25 lines
Fix a couple of problems in the sa(4) media type reports.
The only drives I have discovered so far that support medium type
reports are newer HP LTO (LTO-5 and LTO-6) drives. IBM drives
only support the density reports.
sys/cam/scsi/scsi_sa.h:
The number of possible density codes in the medium type
report is 9, not 8. This caused problems parsing all of
the medium type report after this point in the structure.
usr.bin/mt/mt.c:
Run the density codes returned in the medium type report
through denstostring(), just like the primary and secondary
density codes in the density report. This will print the
density code in hex, and give a text description if it
is available.
Thanks to Rudolf Cejka for doing extensive testing with HP LTO drives
and Bacula and discovering these problems.
Tested by: Rudolf Cejka <cejkar at fit.vutbr.cz>
Sponsored by: Spectra Logic
MFC after: 4 days
------------------------------------------------------------------------
------------------------------------------------------------------------
r280231 | ken | 2015-03-18 14:54:54 -0600 (Wed, 18 Mar 2015) | 16 lines
Improve the mt(1) rblim display.
The granularity reported by READ BLOCK LIMITS is an exponent, not a
byte value. So a granularity of 0 means 2^0, or 1 byte. A
granularity of 1 means 2^1, or 2 bytes.
Print out the individual block limits on separate lines to improve
readability and avoid exceeding 80 columns.
usr.bin/mt/mt.c:
Fix and improve the 'mt rblim' output. Add a MT_PLURAL()
macro so we can print "byte" or "bytes" as appropriate.
Sponsored by: Spectra Logic
MFC after: 4 days
------------------------------------------------------------------------
Sponsored by: Spectra Logic
Added:
stable/10/lib/libmt/
- copied from r279219, head/lib/libmt/
Modified:
stable/10/contrib/groff/tmac/doc-syms
stable/10/lib/Makefile
stable/10/lib/libmt/mtlib.c
stable/10/rescue/rescue/Makefile
stable/10/share/man/man4/mtio.4
stable/10/share/man/man4/sa.4
stable/10/share/mk/bsd.libnames.mk
stable/10/sys/cam/scsi/scsi_all.c
stable/10/sys/cam/scsi/scsi_all.h
stable/10/sys/cam/scsi/scsi_sa.c
stable/10/sys/cam/scsi/scsi_sa.h
stable/10/sys/sys/mtio.h
stable/10/sys/sys/param.h
stable/10/usr.bin/mt/Makefile
stable/10/usr.bin/mt/mt.1
stable/10/usr.bin/mt/mt.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/contrib/groff/tmac/doc-syms
==============================================================================
--- stable/10/contrib/groff/tmac/doc-syms Tue Mar 24 14:22:58 2015
(r280437)
+++ stable/10/contrib/groff/tmac/doc-syms Tue Mar 24 14:36:10 2015
(r280438)
@@ -796,6 +796,7 @@
.ds doc-str-Lb-libmd Message Digest (MD4, MD5, etc.) Support Library
(libmd, \-lmd)
.ds doc-str-Lb-libmemstat Kernel Memory Allocator Statistics Library
(libmemstat, \-lmemstat)
.ds doc-str-Lb-libmenu Curses Menu Library (libmenu, \-lmenu)
+.ds doc-str-Lb-libmt Magnetic Tape Library (libmt, \-lmt)
.ds doc-str-Lb-libnetgraph Netgraph User Library (libnetgraph, \-lnetgraph)
.ds doc-str-Lb-libnetpgp Netpgp signing, verification, encryption and
decryption (libnetpgp, \-lnetpgp)
.ds doc-str-Lb-libossaudio OSS Audio Emulation Library (libossaudio,
\-lossaudio)
Modified: stable/10/lib/Makefile
==============================================================================
--- stable/10/lib/Makefile Tue Mar 24 14:22:58 2015 (r280437)
+++ stable/10/lib/Makefile Tue Mar 24 14:36:10 2015 (r280438)
@@ -65,6 +65,7 @@ SUBDIR= ${SUBDIR_ORDERED} \
libmd \
${_libmilter} \
${_libmp} \
+ libmt \
${_libnandfs} \
libnetbsd \
${_libnetgraph} \
Modified: stable/10/lib/libmt/mtlib.c
==============================================================================
--- head/lib/libmt/mtlib.c Mon Feb 23 21:59:30 2015 (r279219)
+++ stable/10/lib/libmt/mtlib.c Tue Mar 24 14:36:10 2015 (r280438)
@@ -68,7 +68,7 @@ mt_start_element(void *user_data, const
return;
mtinfo->level++;
- if ((u_int)mtinfo->level > (sizeof(mtinfo->cur_sb) /
+ if ((u_int)mtinfo->level >= (sizeof(mtinfo->cur_sb) /
sizeof(mtinfo->cur_sb[0]))) {
mtinfo->error = 1;
snprintf(mtinfo->error_str, sizeof(mtinfo->error_str),
@@ -568,6 +568,15 @@ static struct densities {
*
* IBM 3592 definitions obtained from second edition of the IBM
* System Storage Tape Drive 3592 SCSI Reference (May 25, 2012).
+ *
+ * DAT-72 and DAT-160 bpi values taken from "HP StorageWorks DAT160
+ * tape drive white paper", dated June 2007.
+ *
+ * DAT-160 / SDLT220 density code (0x48) conflict information
+ * found here:
+ *
+ *
http://h20564.www2.hp.com/hpsc/doc/public/display?docId=emr_na-c01065117&sp4ts.oid=429311
+ * (Document ID c01065117)
*/
/*Num. bpmm bpi Reference */
{ 0x1, 32, 800, "X3.22-1983" },
@@ -613,6 +622,14 @@ static struct densities {
{ 0x42, 7398, 187909, "LTO-2" },
{ 0x44, 9638, 244805, "LTO-3" },
{ 0x46, 12725, 323215, "LTO-4" },
+ { 0x47, 6417, 163000, "DAT-72" },
+ /*
+ * XXX KDM note that 0x48 is also the density code for DAT-160.
+ * For some reason they used overlapping density codes.
+ */
+#if 0
+ { 0x48, 6870, 174500, "DAT-160" },
+#endif
{ 0x48, 5236, 133000, "SDLTapeI(110)" },
{ 0x49, 7598, 193000, "SDLTapeI(160)" },
{ 0x4a, 0, 0, "T10000A" },
Modified: stable/10/rescue/rescue/Makefile
==============================================================================
--- stable/10/rescue/rescue/Makefile Tue Mar 24 14:22:58 2015
(r280437)
+++ stable/10/rescue/rescue/Makefile Tue Mar 24 14:36:10 2015
(r280438)
@@ -131,7 +131,7 @@ CRUNCH_LIBS+= -lgeom -lbsdxml -lkiconv
.if ${MK_OPENSSL} == "no"
CRUNCH_LIBS+= -lmd
.endif
-CRUNCH_LIBS+= -lsbuf -lufs -lz
+CRUNCH_LIBS+= -lmt -lsbuf -lufs -lz
.if ${MACHINE_CPUARCH} == "i386"
CRUNCH_PROGS_sbin+= bsdlabel sconfig fdisk
Modified: stable/10/share/man/man4/mtio.4
==============================================================================
--- stable/10/share/man/man4/mtio.4 Tue Mar 24 14:22:58 2015
(r280437)
+++ stable/10/share/man/man4/mtio.4 Tue Mar 24 14:36:10 2015
(r280438)
@@ -35,7 +35,7 @@
.\" @(#)mtio.4 8.1 (Berkeley) 6/5/93
.\" $FreeBSD$
.\"
-.Dd November 11, 2011
+.Dd February 12, 2015
.Dt MTIO 4
.Os
.Sh NAME
@@ -44,10 +44,10 @@
.Sh DESCRIPTION
The special files
named
-.Pa /dev/[n]sa*
+.Pa /dev/[en]sa*
refer to SCSI tape drives,
which may be attached to the system.
-.Pa /dev/[n]sa*.ctl
+.Pa /dev/sa*.ctl
are control devices that can be used to issue ioctls to the SCSI
tape driver to set parameters that are required to last beyond the
unmounting of a tape.
@@ -57,16 +57,19 @@ when the last requested read, write or s
has been reached.
The letter
.Ql n
-is usually prepended to
+is prepended to
the name of the no-rewind devices.
+The letter
+.Ql e
+is prepended to the name of the eject devices.
.Pp
Tapes can be written with either fixed length records or variable length
records.
See
.Xr sa 4
for more information.
-Two end-of-file markers mark the end of a tape, and
-one end-of-file marker marks the end of a tape file.
+Two filemarks mark the end of a tape, and
+one filemark marks the end of a tape file.
If the tape is not to be rewound it is positioned with the
head in between the two tape marks, where the next write
will over write the second end-of-file marker.
@@ -132,6 +135,8 @@ struct mtop {
#define MTWSS 16 /* write setmark(s) */
#define MTFSS 17 /* forward space setmark */
#define MTBSS 18 /* backward space setmark */
+#define MTLOAD 19 /* load tape in drive */
+#define MTWEOFI 20 /* write an end-of-file record without
waiting*/
#define MT_COMP_ENABLE 0xffffffff
#define MT_COMP_DISABLED 0xfffffffe
@@ -228,6 +233,112 @@ union mterrstat {
char _reserved_padding[256];
};
+struct mtrblim {
+ uint32_t granularity;
+ uint32_t min_block_length;
+ uint32_t max_block_length;
+};
+
+typedef enum {
+ MT_LOCATE_DEST_OBJECT = 0x00,
+ MT_LOCATE_DEST_FILE = 0x01,
+ MT_LOCATE_DEST_SET = 0x02,
+ MT_LOCATE_DEST_EOD = 0x03
+} mt_locate_dest_type;
+
+typedef enum {
+ MT_LOCATE_BAM_IMPLICIT = 0x00,
+ MT_LOCATE_BAM_EXPLICIT = 0x01
+} mt_locate_bam;
+
+typedef enum {
+ MT_LOCATE_FLAG_IMMED = 0x01,
+ MT_LOCATE_FLAG_CHANGE_PART = 0x02
+} mt_locate_flags;
+
+struct mtlocate {
+ mt_locate_flags flags;
+ mt_locate_dest_type dest_type;
+ mt_locate_bam block_address_mode;
+ int64_t partition;
+ uint64_t logical_id;
+ uint8_t reserved[64];
+};
+
+typedef enum {
+ MT_EXT_GET_NONE,
+ MT_EXT_GET_OK,
+ MT_EXT_GET_NEED_MORE_SPACE,
+ MT_EXT_GET_ERROR
+} mt_ext_get_status;
+
+struct mtextget {
+ uint32_t alloc_len;
+ char *status_xml;
+ uint32_t fill_len;
+ mt_ext_get_status status;
+ char error_str[128];
+ uint8_t reserved[64];
+};
+
+#define MT_EXT_GET_ROOT_NAME "mtextget"
+#define MT_DENSITY_ROOT_NAME "mtdensity"
+#define MT_MEDIA_DENSITY_NAME "media_density"
+#define MT_DENSITY_REPORT_NAME "density_report"
+#define MT_MEDIUM_TYPE_REPORT_NAME "medium_type_report"
+#define MT_MEDIA_REPORT_NAME "media_report"
+#define MT_DENSITY_ENTRY_NAME "density_entry"
+
+#define MT_DENS_WRITE_OK 0x80
+#define MT_DENS_DUP 0x40
+#define MT_DENS_DEFLT 0x20
+
+
+#define MT_PARAM_FIXED_STR_LEN 32
+union mt_param_value {
+ int64_t value_signed;
+ uint64_t value_unsigned;
+ char *value_var_str;
+ char value_fixed_str[MT_PARAM_FIXED_STR_LEN];
+ uint8_t reserved[64];
+};
+
+typedef enum {
+ MT_PARAM_SET_NONE,
+ MT_PARAM_SET_SIGNED,
+ MT_PARAM_SET_UNSIGNED,
+ MT_PARAM_SET_VAR_STR,
+ MT_PARAM_SET_FIXED_STR
+} mt_param_set_type;
+
+typedef enum {
+ MT_PARAM_STATUS_NONE,
+ MT_PARAM_STATUS_OK,
+ MT_PARAM_STATUS_ERROR
+} mt_param_set_status;
+
+#define MT_PARAM_VALUE_NAME_LEN 64
+struct mtparamset {
+ char value_name[MT_PARAM_VALUE_NAME_LEN];
+ mt_param_set_type value_type;
+ int value_len;
+ union mt_param_value value;
+ mt_param_set_status status;
+ char error_str[128];
+};
+
+#define MT_PARAM_ROOT_NAME "mtparamget"
+#define MT_PROTECTION_NAME "protection"
+
+/*
+ * Set a list of parameters.
+ */
+struct mtsetlist {
+ int num_params;
+ int param_len;
+ struct mtparamset *params;
+};
+
/*
* Constants for mt_type byte. These are the same
* for controllers compatible with the types listed.
@@ -277,6 +388,12 @@ union mterrstat {
#define MTIOCSETEOTMODEL _IOW('m', 8, uint32_t)
/* Get current EOT model */
#define MTIOCGETEOTMODEL _IOR('m', 8, uint32_t)
+#define MTIOCRBLIM _IOR('m', 9, struct mtrblim) /* get block
limits */
+#define MTIOCEXTLOCATE _IOW('m', 10, struct mtlocate) /* seek to
position */
+#define MTIOCEXTGET _IOWR('m', 11, struct mtextget) /* get tape
status */
+#define MTIOCPARAMGET _IOWR('m', 12, struct mtextget) /* get tape
params */
+#define MTIOCPARAMSET _IOWR('m', 13, struct mtparamset) /* set tape
params */
+#define MTIOCSETLIST _IOWR('m', 14, struct mtsetlist) /* set N
params */
#ifndef _KERNEL
#define DEFTAPE "/dev/nsa0"
@@ -285,13 +402,12 @@ union mterrstat {
#endif /* !_SYS_MTIO_H_ */
.Ed
.Sh FILES
-.Bl -tag -width /dev/[n]sa* -compact
-.It Pa /dev/[n]sa*
+.Bl -tag -width /dev/[en]sa* -compact
+.It Pa /dev/[en]sa*
.El
.Sh SEE ALSO
.Xr mt 1 ,
.Xr tar 1 ,
-.Xr ast 4 ,
.Xr sa 4
.Sh HISTORY
The
@@ -300,8 +416,3 @@ manual appeared in
.Bx 4.2 .
An i386 version first appeared in
.Fx 2.2 .
-.Sh BUGS
-The status should be returned in a device independent format.
-.Pp
-The special file naming should be redone in a more consistent and
-understandable manner.
Modified: stable/10/share/man/man4/sa.4
==============================================================================
--- stable/10/share/man/man4/sa.4 Tue Mar 24 14:22:58 2015
(r280437)
+++ stable/10/share/man/man4/sa.4 Tue Mar 24 14:36:10 2015
(r280438)
@@ -25,7 +25,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd August 23, 2013
+.Dd February 12, 2015
.Dt SA 4
.Os
.Sh NAME
@@ -285,10 +285,10 @@ device driver written and ported from
by
.An Julian Elischer .
.Pp
-The current owner of record is
-.An Matthew Jacob
-who has suffered too many
-years of breaking tape drivers.
+The owner of record for many years was
+.An Matthew Jacob .
+The current maintainer is
+.An Kenneth Merry
.Sh BUGS
This driver lacks many of the hacks required to deal with older devices.
Many older
@@ -305,7 +305,5 @@ for your device in order to read tapes w
.Fx
2.X.
.Pp
-Fine grained density and compression mode support that is bound to specific
-device names needs to be added.
-.Pp
-Support for fast indexing by use of partitions is missing.
+Partitions are only supported for status information and location.
+It would be nice to add support for creating and editing tape partitions.
Modified: stable/10/share/mk/bsd.libnames.mk
==============================================================================
--- stable/10/share/mk/bsd.libnames.mk Tue Mar 24 14:22:58 2015
(r280437)
+++ stable/10/share/mk/bsd.libnames.mk Tue Mar 24 14:36:10 2015
(r280438)
@@ -95,6 +95,7 @@ LIBMENU?= ${DESTDIR}${LIBDIR}/libmenu.a
LIBMILTER?= ${DESTDIR}${LIBDIR}/libmilter.a
.endif
LIBMP?= ${DESTDIR}${LIBDIR}/libmp.a
+LIBMT?= ${DESTDIR}${LIBDIR}/libmt.a
LIBNCURSES?= ${DESTDIR}${LIBDIR}/libncurses.a
LIBNCURSESW?= ${DESTDIR}${LIBDIR}/libncursesw.a
LIBNETGRAPH?= ${DESTDIR}${LIBDIR}/libnetgraph.a
Modified: stable/10/sys/cam/scsi/scsi_all.c
==============================================================================
--- stable/10/sys/cam/scsi/scsi_all.c Tue Mar 24 14:22:58 2015
(r280437)
+++ stable/10/sys/cam/scsi/scsi_all.c Tue Mar 24 14:36:10 2015
(r280438)
@@ -7443,6 +7443,71 @@ scsi_persistent_reserve_out(struct ccb_s
scsi_cmd->opcode = PERSISTENT_RES_OUT;
scsi_cmd->action = service_action;
scsi_cmd->scope_type = scope | res_type;
+
+ cam_fill_csio(csio,
+ retries,
+ cbfcnp,
+ /*flags*/CAM_DIR_OUT,
+ tag_action,
+ /*data_ptr*/data_ptr,
+ /*dxfer_len*/dxfer_len,
+ sense_len,
+ sizeof(*scsi_cmd),
+ timeout);
+}
+
+void
+scsi_security_protocol_in(struct ccb_scsiio *csio, uint32_t retries,
+ void (*cbfcnp)(struct cam_periph *, union ccb *),
+ uint8_t tag_action, uint32_t security_protocol,
+ uint32_t security_protocol_specific, int byte4,
+ uint8_t *data_ptr, uint32_t dxfer_len, int sense_len,
+ int timeout)
+{
+ struct scsi_security_protocol_in *scsi_cmd;
+
+ scsi_cmd = (struct scsi_security_protocol_in *)&csio->cdb_io.cdb_bytes;
+ bzero(scsi_cmd, sizeof(*scsi_cmd));
+
+ scsi_cmd->opcode = SECURITY_PROTOCOL_IN;
+
+ scsi_cmd->security_protocol = security_protocol;
+ scsi_ulto2b(security_protocol_specific,
+ scsi_cmd->security_protocol_specific);
+ scsi_cmd->byte4 = byte4;
+ scsi_ulto4b(dxfer_len, scsi_cmd->length);
+
+ cam_fill_csio(csio,
+ retries,
+ cbfcnp,
+ /*flags*/CAM_DIR_IN,
+ tag_action,
+ data_ptr,
+ dxfer_len,
+ sense_len,
+ sizeof(*scsi_cmd),
+ timeout);
+}
+
+void
+scsi_security_protocol_out(struct ccb_scsiio *csio, uint32_t retries,
+ void (*cbfcnp)(struct cam_periph *, union ccb *),
+ uint8_t tag_action, uint32_t security_protocol,
+ uint32_t security_protocol_specific, int byte4,
+ uint8_t *data_ptr, uint32_t dxfer_len, int sense_len,
+ int timeout)
+{
+ struct scsi_security_protocol_out *scsi_cmd;
+
+ scsi_cmd = (struct scsi_security_protocol_out *)&csio->cdb_io.cdb_bytes;
+ bzero(scsi_cmd, sizeof(*scsi_cmd));
+
+ scsi_cmd->opcode = SECURITY_PROTOCOL_OUT;
+
+ scsi_cmd->security_protocol = security_protocol;
+ scsi_ulto2b(security_protocol_specific,
+ scsi_cmd->security_protocol_specific);
+ scsi_cmd->byte4 = byte4;
scsi_ulto4b(dxfer_len, scsi_cmd->length);
cam_fill_csio(csio,
Modified: stable/10/sys/cam/scsi/scsi_all.h
==============================================================================
--- stable/10/sys/cam/scsi/scsi_all.h Tue Mar 24 14:22:58 2015
(r280437)
+++ stable/10/sys/cam/scsi/scsi_all.h Tue Mar 24 14:36:10 2015
(r280438)
@@ -1758,6 +1758,7 @@ struct ata_pass_16 {
#define SERVICE_ACTION_IN 0x9E
#define REPORT_LUNS 0xA0
#define ATA_PASS_12 0xA1
+#define SECURITY_PROTOCOL_IN 0xA2
#define MAINTENANCE_IN 0xA3
#define MAINTENANCE_OUT 0xA4
#define MOVE_MEDIUM 0xA5
@@ -1765,6 +1766,7 @@ struct ata_pass_16 {
#define WRITE_12 0xAA
#define WRITE_VERIFY_12 0xAE
#define VERIFY_12 0xAF
+#define SECURITY_PROTOCOL_OUT 0xB5
#define READ_ELEMENT_STATUS 0xB8
#define READ_CD 0xBE
@@ -2702,6 +2704,41 @@ struct scsi_target_group_data_extended {
struct scsi_target_port_group_descriptor groups[];
};
+struct scsi_security_protocol_in
+{
+ uint8_t opcode;
+ uint8_t security_protocol;
+#define SPI_PROT_INFORMATION 0x00
+#define SPI_PROT_CBCS 0x07
+#define SPI_PROT_TAPE_DATA_ENC 0x20
+#define SPI_PROT_DATA_ENC_CONFIG 0x21
+#define SPI_PROT_SA_CREATE_CAP 0x40
+#define SPI_PROT_IKEV2_SCSI 0x41
+#define SPI_PROT_JEDEC_UFS 0xEC
+#define SPI_PROT_SDCARD_TFSSS 0xED
+#define SPI_PROT_AUTH_HOST_TRANSIENT 0xEE
+#define SPI_PROT_ATA_DEVICE_PASSWORD 0xEF
+ uint8_t security_protocol_specific[2];
+ uint8_t byte4;
+#define SPI_INC_512 0x80
+ uint8_t reserved1;
+ uint8_t length[4];
+ uint8_t reserved2;
+ uint8_t control;
+};
+
+struct scsi_security_protocol_out
+{
+ uint8_t opcode;
+ uint8_t security_protocol;
+ uint8_t security_protocol_specific[2];
+ uint8_t byte4;
+#define SPO_INC_512 0x80
+ uint8_t reserved1;
+ uint8_t length[4];
+ uint8_t reserved2;
+ uint8_t control;
+};
typedef enum {
SSD_TYPE_NONE,
@@ -3623,6 +3660,20 @@ void scsi_start_stop(struct ccb_scsiio *
u_int8_t tag_action, int start, int load_eject,
int immediate, u_int8_t sense_len, u_int32_t timeout);
+void scsi_security_protocol_in(struct ccb_scsiio *csio, uint32_t retries,
+ void (*cbfcnp)(struct cam_periph *, union ccb *),
+ uint8_t tag_action, uint32_t security_protocol,
+ uint32_t security_protocol_specific, int byte4,
+ uint8_t *data_ptr, uint32_t dxfer_len,
+ int sense_len, int timeout);
+
+void scsi_security_protocol_out(struct ccb_scsiio *csio, uint32_t retries,
+ void (*cbfcnp)(struct cam_periph *,union ccb *),
+ uint8_t tag_action, uint32_t security_protocol,
+ uint32_t security_protocol_specific, int byte4,
+ uint8_t *data_ptr, uint32_t dxfer_len,
+ int sense_len, int timeout);
+
void scsi_persistent_reserve_in(struct ccb_scsiio *csio, uint32_t retries,
void (*cbfcnp)(struct cam_periph *,union ccb *),
uint8_t tag_action, int service_action,
Modified: stable/10/sys/cam/scsi/scsi_sa.c
==============================================================================
--- stable/10/sys/cam/scsi/scsi_sa.c Tue Mar 24 14:22:58 2015
(r280437)
+++ stable/10/sys/cam/scsi/scsi_sa.c Tue Mar 24 14:36:10 2015
(r280438)
@@ -2,6 +2,7 @@
* Implementation of SCSI Sequential Access Peripheral driver for CAM.
*
* Copyright (c) 1999, 2000 Matthew Jacob
+ * Copyright (c) 2013, 2014, 2015 Spectra Logic Corporation
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -43,6 +44,7 @@ __FBSDID("$FreeBSD$");
#include <sys/mtio.h>
#ifdef _KERNEL
#include <sys/conf.h>
+#include <sys/sbuf.h>
#include <sys/sysctl.h>
#include <sys/taskqueue.h>
#endif
@@ -69,7 +71,7 @@ __FBSDID("$FreeBSD$");
#include <opt_sa.h>
#ifndef SA_IO_TIMEOUT
-#define SA_IO_TIMEOUT 4
+#define SA_IO_TIMEOUT 32
#endif
#ifndef SA_SPACE_TIMEOUT
#define SA_SPACE_TIMEOUT 1 * 60
@@ -80,6 +82,9 @@ __FBSDID("$FreeBSD$");
#ifndef SA_ERASE_TIMEOUT
#define SA_ERASE_TIMEOUT 4 * 60
#endif
+#ifndef SA_REP_DENSITY_TIMEOUT
+#define SA_REP_DENSITY_TIMEOUT 90
+#endif
#define SCSIOP_TIMEOUT (60 * 1000) /* not an option */
@@ -87,6 +92,7 @@ __FBSDID("$FreeBSD$");
#define REWIND_TIMEOUT (SA_REWIND_TIMEOUT * 60 * 1000)
#define ERASE_TIMEOUT (SA_ERASE_TIMEOUT * 60 * 1000)
#define SPACE_TIMEOUT (SA_SPACE_TIMEOUT * 60 * 1000)
+#define REP_DENSITY_TIMEOUT (SA_REP_DENSITY_TIMEOUT * 60 * 1000)
/*
* Additional options that can be set for config: SA_1FM_AT_EOT
@@ -133,7 +139,12 @@ typedef enum {
SA_FLAG_COMP_ENABLED = 0x0400,
SA_FLAG_COMP_SUPP = 0x0800,
SA_FLAG_COMP_UNSUPP = 0x1000,
- SA_FLAG_TAPE_FROZEN = 0x2000
+ SA_FLAG_TAPE_FROZEN = 0x2000,
+ SA_FLAG_PROTECT_SUPP = 0x4000,
+
+ SA_FLAG_COMPRESSION = (SA_FLAG_COMP_SUPP|SA_FLAG_COMP_ENABLED|
+ SA_FLAG_COMP_UNSUPP),
+ SA_FLAG_SCTX_INIT = 0x8000
} sa_flags;
typedef enum {
@@ -143,27 +154,30 @@ typedef enum {
} sa_mode;
typedef enum {
- SA_PARAM_NONE = 0x00,
- SA_PARAM_BLOCKSIZE = 0x01,
- SA_PARAM_DENSITY = 0x02,
- SA_PARAM_COMPRESSION = 0x04,
- SA_PARAM_BUFF_MODE = 0x08,
- SA_PARAM_NUMBLOCKS = 0x10,
- SA_PARAM_WP = 0x20,
- SA_PARAM_SPEED = 0x40,
- SA_PARAM_ALL = 0x7f
+ SA_PARAM_NONE = 0x000,
+ SA_PARAM_BLOCKSIZE = 0x001,
+ SA_PARAM_DENSITY = 0x002,
+ SA_PARAM_COMPRESSION = 0x004,
+ SA_PARAM_BUFF_MODE = 0x008,
+ SA_PARAM_NUMBLOCKS = 0x010,
+ SA_PARAM_WP = 0x020,
+ SA_PARAM_SPEED = 0x040,
+ SA_PARAM_DENSITY_EXT = 0x080,
+ SA_PARAM_LBP = 0x100,
+ SA_PARAM_ALL = 0x1ff
} sa_params;
typedef enum {
- SA_QUIRK_NONE = 0x00,
- SA_QUIRK_NOCOMP = 0x01, /* Can't deal with compression at all */
- SA_QUIRK_FIXED = 0x02, /* Force fixed mode */
- SA_QUIRK_VARIABLE = 0x04, /* Force variable mode */
- SA_QUIRK_2FM = 0x08, /* Needs Two File Marks at EOD */
- SA_QUIRK_1FM = 0x10, /* No more than 1 File Mark at EOD */
- SA_QUIRK_NODREAD = 0x20, /* Don't try and dummy read density */
- SA_QUIRK_NO_MODESEL = 0x40, /* Don't do mode select at all */
- SA_QUIRK_NO_CPAGE = 0x80 /* Don't use DEVICE COMPRESSION page */
+ SA_QUIRK_NONE = 0x000,
+ SA_QUIRK_NOCOMP = 0x001, /* Can't deal with compression at all*/
+ SA_QUIRK_FIXED = 0x002, /* Force fixed mode */
+ SA_QUIRK_VARIABLE = 0x004, /* Force variable mode */
+ SA_QUIRK_2FM = 0x008, /* Needs Two File Marks at EOD */
+ SA_QUIRK_1FM = 0x010, /* No more than 1 File Mark at EOD */
+ SA_QUIRK_NODREAD = 0x020, /* Don't try and dummy read density */
+ SA_QUIRK_NO_MODESEL = 0x040, /* Don't do mode select at all */
+ SA_QUIRK_NO_CPAGE = 0x080, /* Don't use DEVICE COMPRESSION page */
+ SA_QUIRK_NO_LONG_POS = 0x100 /* No long position information */
} sa_quirks;
#define SA_QUIRK_BIT_STRING \
@@ -175,10 +189,10 @@ typedef enum {
"\0051FM" \
"\006NODREAD" \
"\007NO_MODESEL" \
- "\010NO_CPAGE"
+ "\010NO_CPAGE" \
+ "\011NO_LONG_POS"
#define SAMODE(z) (dev2unit(z) & 0x3)
-#define SADENSITY(z) ((dev2unit(z) >> 2) & 0x3)
#define SA_IS_CTRL(z) (dev2unit(z) & (1 << 4))
#define SA_NOT_CTLDEV 0
@@ -187,29 +201,134 @@ typedef enum {
#define SA_ATYPE_R 0
#define SA_ATYPE_NR 1
#define SA_ATYPE_ER 2
+#define SA_NUM_ATYPES 3
-#define SAMINOR(ctl, mode, access) \
- ((ctl << 4) | (mode << 2) | (access & 0x3))
+#define SAMINOR(ctl, access) \
+ ((ctl << 4) | (access & 0x3))
-#define SA_NUM_MODES 4
struct sa_devs {
struct cdev *ctl_dev;
- struct sa_mode_devs {
- struct cdev *r_dev;
- struct cdev *nr_dev;
- struct cdev *er_dev;
- } mode_devs[SA_NUM_MODES];
+ struct cdev *r_dev;
+ struct cdev *nr_dev;
+ struct cdev *er_dev;
+};
+
+#define SASBADDBASE(sb, indent, data, xfmt, name, type, xsize, desc)
\
+ sbuf_printf(sb, "%*s<%s type=\"%s\" size=\"%zd\" " \
+ "fmt=\"%s\" desc=\"%s\">" #xfmt "</%s>\n", indent, "", \
+ #name, #type, xsize, #xfmt, desc ? desc : "", data, #name);
+
+#define SASBADDINT(sb, indent, data, fmt, name)
\
+ SASBADDBASE(sb, indent, data, fmt, name, int, sizeof(data), \
+ NULL)
+
+#define SASBADDINTDESC(sb, indent, data, fmt, name, desc)
\
+ SASBADDBASE(sb, indent, data, fmt, name, int, sizeof(data), \
+ desc)
+
+#define SASBADDUINT(sb, indent, data, fmt, name)
\
+ SASBADDBASE(sb, indent, data, fmt, name, uint, sizeof(data), \
+ NULL)
+
+#define SASBADDUINTDESC(sb, indent, data, fmt, name, desc)
\
+ SASBADDBASE(sb, indent, data, fmt, name, uint, sizeof(data), \
+ desc)
+
+#define SASBADDFIXEDSTR(sb, indent, data, fmt, name)
\
+ SASBADDBASE(sb, indent, data, fmt, name, str, sizeof(data), \
+ NULL)
+
+#define SASBADDFIXEDSTRDESC(sb, indent, data, fmt, name, desc)
\
+ SASBADDBASE(sb, indent, data, fmt, name, str, sizeof(data), \
+ desc)
+
+#define SASBADDVARSTR(sb, indent, data, fmt, name, maxlen)
\
+ SASBADDBASE(sb, indent, data, fmt, name, str, maxlen, NULL)
+
+#define SASBADDVARSTRDESC(sb, indent, data, fmt, name, maxlen, desc)
\
+ SASBADDBASE(sb, indent, data, fmt, name, str, maxlen, desc)
+
+#define SASBADDNODE(sb, indent, name) {
\
+ sbuf_printf(sb, "%*s<%s type=\"%s\">\n", indent, "", #name, \
+ "node"); \
+ indent += 2; \
+}
+
+#define SASBADDNODENUM(sb, indent, name, num) {
\
+ sbuf_printf(sb, "%*s<%s type=\"%s\" num=\"%d\">\n", indent, "", \
+ #name, "node", num); \
+ indent += 2; \
+}
+
+#define SASBENDNODE(sb, indent, name) {
\
+ indent -= 2; \
+ sbuf_printf(sb, "%*s</%s>\n", indent, "", #name); \
+}
+
+#define SA_DENSITY_TYPES 4
+
+struct sa_prot_state {
+ int initialized;
+ uint32_t prot_method;
+ uint32_t pi_length;
+ uint32_t lbp_w;
+ uint32_t lbp_r;
+ uint32_t rbdp;
+};
+
+struct sa_prot_info {
+ struct sa_prot_state cur_prot_state;
+ struct sa_prot_state pending_prot_state;
+};
+
+/*
+ * A table mapping protection parameters to their types and values.
+ */
+struct sa_prot_map {
+ char *name;
+ mt_param_set_type param_type;
+ off_t offset;
+ uint32_t min_val;
+ uint32_t max_val;
+ uint32_t *value;
+} sa_prot_table[] = {
+ { "prot_method", MT_PARAM_SET_UNSIGNED,
+ __offsetof(struct sa_prot_state, prot_method),
+ /*min_val*/ 0, /*max_val*/ 255, NULL },
+ { "pi_length", MT_PARAM_SET_UNSIGNED,
+ __offsetof(struct sa_prot_state, pi_length),
+ /*min_val*/ 0, /*max_val*/ SA_CTRL_DP_PI_LENGTH_MASK, NULL },
+ { "lbp_w", MT_PARAM_SET_UNSIGNED,
+ __offsetof(struct sa_prot_state, lbp_w),
+ /*min_val*/ 0, /*max_val*/ 1, NULL },
+ { "lbp_r", MT_PARAM_SET_UNSIGNED,
+ __offsetof(struct sa_prot_state, lbp_r),
+ /*min_val*/ 0, /*max_val*/ 1, NULL },
+ { "rbdp", MT_PARAM_SET_UNSIGNED,
+ __offsetof(struct sa_prot_state, rbdp),
+ /*min_val*/ 0, /*max_val*/ 1, NULL }
};
+#define SA_NUM_PROT_ENTS sizeof(sa_prot_table)/sizeof(sa_prot_table[0])
+
+#define SA_PROT_ENABLED(softc) ((softc->flags & SA_FLAG_PROTECT_SUPP)
\
+ && (softc->prot_info.cur_prot_state.initialized != 0) \
+ && (softc->prot_info.cur_prot_state.prot_method != 0))
+
+#define SA_PROT_LEN(softc)
softc->prot_info.cur_prot_state.pi_length
+
struct sa_softc {
sa_state state;
sa_flags flags;
sa_quirks quirks;
u_int si_flags;
+ struct cam_periph *periph;
struct bio_queue_head bio_queue;
int queue_count;
struct devstat *device_stats;
struct sa_devs devs;
+ int open_count;
+ int num_devs_to_destroy;
int blk_gran;
int blk_mask;
int blk_shift;
@@ -231,12 +350,37 @@ struct sa_softc {
int filemarks;
union ccb saved_ccb;
int last_resid_was_io;
-
- /*
- * Relative to BOT Location.
- */
- daddr_t fileno;
- daddr_t blkno;
+ uint8_t density_type_bits[SA_DENSITY_TYPES];
+ int density_info_valid[SA_DENSITY_TYPES];
+ uint8_t density_info[SA_DENSITY_TYPES][SRDS_MAX_LENGTH];
+
+ struct sa_prot_info prot_info;
+
+ int sili;
+ int eot_warn;
+
+ /*
+ * Current position information. -1 means that the given value is
+ * unknown. fileno and blkno are always calculated. blkno is
+ * relative to the previous file mark. rep_fileno and rep_blkno
+ * are as reported by the drive, if it supports the long form
+ * report for the READ POSITION command. rep_blkno is relative to
+ * the beginning of the partition.
+ *
+ * bop means that the drive is at the beginning of the partition.
+ * eop means that the drive is between early warning and end of
+ * partition, inside the current partition.
+ * bpew means that the position is in a PEWZ (Programmable Early
+ * Warning Zone)
+ */
+ daddr_t partition; /* Absolute from BOT */
+ daddr_t fileno; /* Relative to beginning of partition */
+ daddr_t blkno; /* Relative to last file mark */
+ daddr_t rep_blkno; /* Relative to beginning of partition */
+ daddr_t rep_fileno; /* Relative to beginning of partition */
+ int bop; /* Beginning of Partition */
+ int eop; /* End of Partition */
+ int bpew; /* Beyond Programmable Early Warning */
/*
* Latched Error Info
@@ -403,16 +547,42 @@ static int sagetparams(struct cam_perip
u_int8_t *write_protect, u_int8_t *speed,
int *comp_supported, int *comp_enabled,
u_int32_t *comp_algorithm,
- sa_comp_t *comp_page);
+ sa_comp_t *comp_page,
+ struct scsi_control_data_prot_subpage
+ *prot_page, int dp_size,
+ int prot_changeable);
+static int sasetprot(struct cam_periph *periph,
+ struct sa_prot_state *new_prot);
static int sasetparams(struct cam_periph *periph,
sa_params params_to_set,
u_int32_t blocksize, u_int8_t density,
u_int32_t comp_algorithm,
u_int32_t sense_flags);
+static int sasetsili(struct cam_periph *periph,
+ struct mtparamset *ps, int num_params);
+static int saseteotwarn(struct cam_periph *periph,
+ struct mtparamset *ps, int num_params);
+static void safillprot(struct sa_softc *softc, int *indent,
+ struct sbuf *sb);
+static void sapopulateprots(struct sa_prot_state *cur_state,
+ struct sa_prot_map *new_table,
+ int table_ents);
+static struct sa_prot_map *safindprotent(char *name, struct sa_prot_map *table,
+ int table_ents);
+static int sasetprotents(struct cam_periph *periph,
+ struct mtparamset *ps, int num_params);
+static struct sa_param_ent *safindparament(struct mtparamset *ps);
+static int saparamsetlist(struct cam_periph *periph,
+ struct mtsetlist *list, int need_copy);
+static int saextget(struct cdev *dev, struct cam_periph *periph,
+ struct sbuf *sb, struct mtextget *g);
+static int saparamget(struct sa_softc *softc, struct sbuf *sb);
static void saprevent(struct cam_periph *periph, int action);
static int sarewind(struct cam_periph *periph);
static int saspace(struct cam_periph *periph, int count,
scsi_space_code code);
+static void sadevgonecb(void *arg);
+static void sasetupdev(struct sa_softc *softc, struct cdev *dev);
static int samount(struct cam_periph *, int, struct cdev *);
static int saretension(struct cam_periph *periph);
static int sareservereleaseunit(struct cam_periph *periph,
@@ -420,9 +590,16 @@ static int sareservereleaseunit(struct
static int saloadunload(struct cam_periph *periph, int load);
static int saerase(struct cam_periph *periph, int longerase);
static int sawritefilemarks(struct cam_periph *periph,
- int nmarks, int setmarks);
+ int nmarks, int setmarks, int immed);
+static int sagetpos(struct cam_periph *periph);
static int sardpos(struct cam_periph *periph, int, u_int32_t *);
-static int sasetpos(struct cam_periph *periph, int, u_int32_t *);
+static int sasetpos(struct cam_periph *periph, int,
+ struct mtlocate *);
+static void safilldenstypesb(struct sbuf *sb, int *indent,
+ uint8_t *buf, int buf_len,
+ int is_density);
+static void safilldensitysb(struct sa_softc *softc, int *indent,
+ struct sbuf *sb);
#ifndef SA_DEFAULT_IO_SPLIT
@@ -464,7 +641,7 @@ static struct cdevsw sa_cdevsw = {
.d_ioctl = saioctl,
.d_strategy = sastrategy,
.d_name = "sa",
- .d_flags = D_TAPE,
+ .d_flags = D_TAPE | D_TRACKCLOSE,
};
static int
@@ -488,6 +665,7 @@ saopen(struct cdev *dev, int flags, int
if (SA_IS_CTRL(dev)) {
softc->ctrl_mode = 1;
+ softc->open_count++;
cam_periph_unlock(periph);
return (0);
}
@@ -519,6 +697,7 @@ saopen(struct cdev *dev, int flags, int
if (error && (flags & O_NONBLOCK)) {
softc->flags |= SA_FLAG_OPEN;
softc->open_pending_mount = 1;
+ softc->open_count++;
cam_periph_unhold(periph);
cam_periph_unlock(periph);
return (0);
@@ -534,6 +713,7 @@ saopen(struct cdev *dev, int flags, int
saprevent(periph, PR_PREVENT);
softc->flags |= SA_FLAG_OPEN;
+ softc->open_count++;
cam_periph_unhold(periph);
cam_periph_unlock(periph);
@@ -545,7 +725,7 @@ saclose(struct cdev *dev, int flag, int
{
struct cam_periph *periph;
struct sa_softc *softc;
- int mode, error, writing, tmp;
+ int mode, error, writing, tmp, i;
int closedbits = SA_FLAG_OPEN;
mode = SAMODE(dev);
@@ -564,6 +744,7 @@ saclose(struct cdev *dev, int flag, int
softc->open_rdonly = 0;
if (SA_IS_CTRL(dev)) {
softc->ctrl_mode = 0;
+ softc->open_count--;
cam_periph_unlock(periph);
cam_periph_release(periph);
return (0);
@@ -572,6 +753,7 @@ saclose(struct cdev *dev, int flag, int
if (softc->open_pending_mount) {
softc->flags &= ~SA_FLAG_OPEN;
softc->open_pending_mount = 0;
+ softc->open_count--;
cam_periph_unlock(periph);
cam_periph_release(periph);
return (0);
@@ -676,6 +858,16 @@ saclose(struct cdev *dev, int flag, int
* And we are no longer open for business.
*/
softc->flags &= ~closedbits;
+ softc->open_count--;
+
+ /*
+ * Invalidate any density information that depends on having tape
+ * media in the drive.
+ */
+ for (i = 0; i < SA_DENSITY_TYPES; i++) {
+ if (softc->density_type_bits[i] & SRDS_MEDIA)
+ softc->density_info_valid[i] = 0;
+ }
/*
* Inform users if tape state if frozen....
@@ -824,6 +1016,480 @@ sastrategy(struct bio *bp)
return;
}
+static int
+sasetsili(struct cam_periph *periph, struct mtparamset *ps, int num_params)
+{
+ uint32_t sili_blocksize;
+ struct sa_softc *softc;
+ int error;
+
+ error = 0;
+ softc = (struct sa_softc *)periph->softc;
+
+ if (ps->value_type != MT_PARAM_SET_SIGNED) {
+ snprintf(ps->error_str, sizeof(ps->error_str),
+ "sili is a signed parameter");
+ goto bailout;
+ }
+ if ((ps->value.value_signed < 0)
+ || (ps->value.value_signed > 1)) {
+ snprintf(ps->error_str, sizeof(ps->error_str),
+ "invalid sili value %jd", (intmax_t)ps->value.value_signed);
+ goto bailout_error;
+ }
+ /*
+ * We only set the SILI flag in variable block
+ * mode. You'll get a check condition in fixed
+ * block mode if things don't line up in any case.
+ */
+ if (softc->flags & SA_FLAG_FIXED) {
+ snprintf(ps->error_str, sizeof(ps->error_str),
+ "can't set sili bit in fixed block mode");
+ goto bailout_error;
+ }
+ if (softc->sili == ps->value.value_signed)
+ goto bailout;
+
+ if (ps->value.value_signed == 1)
+ sili_blocksize = 4;
+ else
+ sili_blocksize = 0;
+
+ error = sasetparams(periph, SA_PARAM_BLOCKSIZE,
+ sili_blocksize, 0, 0, SF_QUIET_IR);
+ if (error != 0) {
+ snprintf(ps->error_str, sizeof(ps->error_str),
+ "sasetparams() returned error %d", error);
+ goto bailout_error;
+ }
+
+ softc->sili = ps->value.value_signed;
+
+bailout:
+ ps->status = MT_PARAM_STATUS_OK;
+ return (error);
+
+bailout_error:
+ ps->status = MT_PARAM_STATUS_ERROR;
+ if (error == 0)
+ error = EINVAL;
+
+ return (error);
+}
+
+static int
+saseteotwarn(struct cam_periph *periph, struct mtparamset *ps, int num_params)
+{
+ struct sa_softc *softc;
+ int error;
+
+ error = 0;
+ softc = (struct sa_softc *)periph->softc;
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
