2000-12-13 19:53:37 +00:00
|
|
|
.\"-
|
2011-05-22 14:03:30 +00:00
|
|
|
.\" Copyright (c) 2000 Poul-Henning Kamp and Dag-Erling Coïdan Smørgrav
|
2000-12-13 19:53:37 +00:00
|
|
|
.\" All rights reserved.
|
|
|
|
.\"
|
|
|
|
.\" Redistribution and use in source and binary forms, with or without
|
|
|
|
.\" modification, are permitted provided that the following conditions
|
|
|
|
.\" are met:
|
|
|
|
.\" 1. Redistributions of source code must retain the above copyright
|
|
|
|
.\" notice, this list of conditions and the following disclaimer.
|
|
|
|
.\" 2. Redistributions in binary form must reproduce the above copyright
|
|
|
|
.\" notice, this list of conditions and the following disclaimer in the
|
|
|
|
.\" documentation and/or other materials provided with the distribution.
|
|
|
|
.\"
|
|
|
|
.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
|
|
|
.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
|
|
.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
|
|
.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
|
|
|
.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
|
|
.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
|
|
.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
|
|
.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
|
|
.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
|
|
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
|
|
.\" SUCH DAMAGE.
|
|
|
|
.\"
|
|
|
|
.\" $FreeBSD$
|
|
|
|
.\"
|
2017-04-06 02:03:35 +00:00
|
|
|
.Dd April 5, 2017
|
2001-04-18 08:25:26 +00:00
|
|
|
.Dt SBUF 9
|
2001-07-10 15:31:11 +00:00
|
|
|
.Os
|
2000-12-13 19:53:37 +00:00
|
|
|
.Sh NAME
|
2006-09-18 15:24:20 +00:00
|
|
|
.Nm sbuf ,
|
2000-12-13 19:53:37 +00:00
|
|
|
.Nm sbuf_new ,
|
2009-05-17 21:28:37 +00:00
|
|
|
.Nm sbuf_new_auto ,
|
2011-01-25 17:39:52 +00:00
|
|
|
.Nm sbuf_new_for_sysctl ,
|
2001-01-28 00:18:54 +00:00
|
|
|
.Nm sbuf_clear ,
|
2015-03-14 16:02:11 +00:00
|
|
|
.Nm sbuf_get_flags ,
|
|
|
|
.Nm sbuf_set_flags ,
|
|
|
|
.Nm sbuf_clear_flags ,
|
2000-12-13 19:53:37 +00:00
|
|
|
.Nm sbuf_setpos ,
|
2001-06-11 17:05:52 +00:00
|
|
|
.Nm sbuf_bcat ,
|
|
|
|
.Nm sbuf_bcopyin ,
|
|
|
|
.Nm sbuf_bcpy ,
|
2000-12-13 19:53:37 +00:00
|
|
|
.Nm sbuf_cat ,
|
2001-06-11 17:05:52 +00:00
|
|
|
.Nm sbuf_copyin ,
|
2000-12-13 19:53:37 +00:00
|
|
|
.Nm sbuf_cpy ,
|
|
|
|
.Nm sbuf_printf ,
|
2002-01-06 08:40:42 +00:00
|
|
|
.Nm sbuf_vprintf ,
|
2000-12-13 19:53:37 +00:00
|
|
|
.Nm sbuf_putc ,
|
2010-09-09 17:49:18 +00:00
|
|
|
.Nm sbuf_set_drain ,
|
2002-01-06 08:40:42 +00:00
|
|
|
.Nm sbuf_trim ,
|
2010-09-10 16:42:16 +00:00
|
|
|
.Nm sbuf_error ,
|
2000-12-13 19:53:37 +00:00
|
|
|
.Nm sbuf_finish ,
|
|
|
|
.Nm sbuf_data ,
|
|
|
|
.Nm sbuf_len ,
|
2002-10-04 09:58:17 +00:00
|
|
|
.Nm sbuf_done ,
|
2013-04-11 19:51:53 +00:00
|
|
|
.Nm sbuf_delete ,
|
|
|
|
.Nm sbuf_start_section ,
|
Add support for reading MAM attributes to camcontrol(8) and libcam(3).
MAM is Medium Auxiliary Memory and is most commonly found as flash
chips on tapes.
This includes support for reading attributes and decoding most
known attributes, but does not yet include support for writing
attributes or reporting attributes in XML format.
libsbuf/Makefile:
Add subr_prf.c for the new sbuf_hexdump() function. This
function is essentially the same function.
libsbuf/Symbol.map:
Add a new shared library minor version, and include the
sbuf_hexdump() function.
libsbuf/Version.def:
Add version 1.4 of the libsbuf library.
libutil/hexdump.3:
Document sbuf_hexdump() alongside hexdump(3), since it is
essentially the same function.
camcontrol/Makefile:
Add attrib.c.
camcontrol/attrib.c:
Implementation of READ ATTRIBUTE support for camcontrol(8).
camcontrol/camcontrol.8:
Document the new 'camcontrol attrib' subcommand.
camcontrol/camcontrol.c:
Add the new 'camcontrol attrib' subcommand.
camcontrol/camcontrol.h:
Add a function prototype for scsiattrib().
share/man/man9/sbuf.9:
Document the existence of sbuf_hexdump() and point users to
the hexdump(3) man page for more details.
sys/cam/scsi/scsi_all.c:
Add a table of known attributes, text descriptions and
handler functions.
Add a new scsi_attrib_sbuf() function along with a number
of other related functions that help decode attributes.
scsi_attrib_ascii_sbuf() decodes ASCII format attributes.
scsi_attrib_int_sbuf() decodes binary format attributes, and
will pass them off to scsi_attrib_hexdump_sbuf() if they're
bigger than 8 bytes.
scsi_attrib_vendser_sbuf() decodes the vendor and drive
serial number attribute.
scsi_attrib_volcoh_sbuf() decodes the Volume Coherency
Information attribute that LTFS writes out.
sys/cam/scsi/scsi_all.h:
Add a number of attribute-related structure definitions and
other defines.
Add function prototypes for all of the functions added in
scsi_all.c.
sys/kern/subr_prf.c:
Add a new function, sbuf_hexdump(). This is the same as
the existing hexdump(9) function, except that it puts the
result in an sbuf.
This also changes subr_prf.c so that it can be compiled in
userland for includsion in libsbuf.
We should work to change this so that the kernel hexdump
implementation is a wrapper around sbuf_hexdump() with a
statically allocated sbuf with a drain. That will require
a drain function that goes to the kernel printf() buffer
that can take a non-NUL terminated string as input.
That is because an sbuf isn't NUL-terminated until it is
finished, and we don't want to finish it while we're still
using it.
We should also work to consolidate the userland hexdump and
kernel hexdump implemenatations, which are currently
separate. This would also mean making applications that
currently link in libutil link in libsbuf.
sys/sys/sbuf.h:
Add the prototype for sbuf_hexdump(), and add another copy
of the hexdump flag values if they aren't already defined.
Ideally the flags should be defined in one place but the
implemenation makes it difficult to do properly. (See
above.)
Sponsored by: Spectra Logic Corporation
MFC after: 1 week
2015-06-09 21:39:38 +00:00
|
|
|
.Nm sbuf_end_section ,
|
2017-02-28 18:25:06 +00:00
|
|
|
.Nm sbuf_hexdump ,
|
|
|
|
.Nm sbuf_putbuf
|
2011-05-17 18:24:59 +00:00
|
|
|
.Nd safe string composition
|
2000-12-13 19:53:37 +00:00
|
|
|
.Sh SYNOPSIS
|
2001-10-01 16:09:29 +00:00
|
|
|
.In sys/types.h
|
|
|
|
.In sys/sbuf.h
|
2010-09-09 17:49:18 +00:00
|
|
|
.Ft typedef\ int ( sbuf_drain_func ) ( void\ *arg, const\ char\ *data, int\ len ) ;
|
|
|
|
.Pp
|
2001-10-04 09:01:15 +00:00
|
|
|
.Ft struct sbuf *
|
2001-01-28 00:18:54 +00:00
|
|
|
.Fn sbuf_new "struct sbuf *s" "char *buf" "int length" "int flags"
|
2009-05-17 21:28:37 +00:00
|
|
|
.Ft struct sbuf *
|
|
|
|
.Fn sbuf_new_auto
|
2001-01-28 00:18:54 +00:00
|
|
|
.Ft void
|
|
|
|
.Fn sbuf_clear "struct sbuf *s"
|
2000-12-13 19:53:37 +00:00
|
|
|
.Ft int
|
2015-03-14 16:02:11 +00:00
|
|
|
.Fn sbuf_get_flags "struct sbuf *s"
|
|
|
|
.Ft void
|
|
|
|
.Fn sbuf_set_flags "struct sbuf *s" "int flags"
|
|
|
|
.Ft void
|
|
|
|
.Fn sbuf_clear_flags "struct sbuf *s" "int flags"
|
|
|
|
.Ft int
|
2001-01-28 00:18:54 +00:00
|
|
|
.Fn sbuf_setpos "struct sbuf *s" "int pos"
|
2000-12-13 19:53:37 +00:00
|
|
|
.Ft int
|
2004-07-09 11:38:59 +00:00
|
|
|
.Fn sbuf_bcat "struct sbuf *s" "const void *buf" "size_t len"
|
2001-06-11 17:05:52 +00:00
|
|
|
.Ft int
|
|
|
|
.Fn sbuf_bcopyin "struct sbuf *s" "const void *uaddr" "size_t len"
|
|
|
|
.Ft int
|
2004-07-09 11:38:59 +00:00
|
|
|
.Fn sbuf_bcpy "struct sbuf *s" "const void *buf" "size_t len"
|
2001-06-11 17:05:52 +00:00
|
|
|
.Ft int
|
Rewrite of the CAM error recovery code.
Some of the major changes include:
- The SCSI error handling portion of cam_periph_error() has
been broken out into a number of subfunctions to better
modularize the code that handles the hierarchy of SCSI errors.
As a result, the code is now much easier to read.
- String handling and error printing has been significantly
revamped. We now use sbufs to do string formatting instead
of using printfs (for the kernel) and snprintf/strncat (for
userland) as before.
There is a new catchall error printing routine,
cam_error_print() and its string-based counterpart,
cam_error_string() that allow the kernel and userland
applications to pass in a CCB and have errors printed out
properly, whether or not they're SCSI errors. Among other
things, this helped eliminate a fair amount of duplicate code
in camcontrol.
We now print out more information than before, including
the CAM status and SCSI status and the error recovery action
taken to remedy the problem.
- sbufs are now available in userland, via libsbuf. This
change was necessary since most of the error printing code
is shared between libcam and the kernel.
- A new transfer settings interface is included in this checkin.
This code is #ifdef'ed out, and is primarily intended to aid
discussion with HBA driver authors on the final form the
interface should take. There is example code in the ahc(4)
driver that implements the HBA driver side of the new
interface. The new transfer settings code won't be enabled
until we're ready to switch all HBA drivers over to the new
interface.
src/Makefile.inc1,
lib/Makefile: Add libsbuf. It must be built before libcam,
since libcam uses sbuf routines.
libcam/Makefile: libcam now depends on libsbuf.
libsbuf/Makefile: Add a makefile for libsbuf. This pulls in the
sbuf sources from sys/kern.
bsd.libnames.mk: Add LIBSBUF.
camcontrol/Makefile: Add -lsbuf. Since camcontrol is statically
linked, we can't depend on the dynamic linker
to pull in libsbuf.
camcontrol.c: Use cam_error_print() instead of checking for
CAM_SCSI_STATUS_ERROR on every failed CCB.
sbuf.9: Change the prototypes for sbuf_cat() and
sbuf_cpy() so that the source string is now a
const char *. This is more in line wth the
standard system string functions, and helps
eliminate warnings when dealing with a const
source buffer.
Fix a typo.
cam.c: Add description strings for the various CAM
error status values, as well as routines to
look up those strings.
Add new cam_error_string() and
cam_error_print() routines for userland and
the kernel.
cam.h: Add a new CAM flag, CAM_RETRY_SELTO.
Add enumerated types for the various options
available with cam_error_print() and
cam_error_string().
cam_ccb.h: Add new transfer negotiation structures/types.
Change inq_len in the ccb_getdev structure to
be "reserved". This field has never been
filled in, and will be removed when we next
bump the CAM version.
cam_debug.h: Fix typo.
cam_periph.c: Modularize cam_periph_error(). The SCSI error
handling part of cam_periph_error() is now
in camperiphscsistatuserror() and
camperiphscsisenseerror().
In cam_periph_lock(), increase the reference
count on the periph while we wait for our lock
attempt to succeed so that the periph won't go
away while we're sleeping.
cam_xpt.c: Add new transfer negotiation code. (ifdefed
out)
Add a new function, xpt_path_string(). This
is a string/sbuf analog to xpt_print_path().
scsi_all.c: Revamp string handing and error printing code.
We now use sbufs for much of the string
formatting code. More of that code is shared
between userland the kernel.
scsi_all.h: Get rid of SS_TURSTART, it wasn't terribly
useful in the first place.
Add a new error action, SS_REQSENSE. (Send a
request sense and then retry the command.)
This is useful when the controller hasn't
performed autosense for some reason.
Change the default actions around a bit.
scsi_cd.c,
scsi_da.c,
scsi_pt.c,
scsi_ses.c: SF_RETRY_SELTO -> CAM_RETRY_SELTO. Selection
timeouts shouldn't be covered by a sense flag.
scsi_pass.[ch]: SF_RETRY_SELTO -> CAM_RETRY_SELTO.
Get rid of the last vestiges of a read/write
interface.
libkern/bsearch.c,
sys/libkern.h,
conf/files: Add bsearch.c, which is needed for some of the
new table lookup routines.
aic7xxx_freebsd.c: Define AHC_NEW_TRAN_SETTINGS if
CAM_NEW_TRAN_CODE is defined.
sbuf.h,
subr_sbuf.c: Add the appropriate #ifdefs so sbufs can
compile and run in userland.
Change sbuf_printf() to use vsnprintf()
instead of kvprintf(), which is only available
in the kernel.
Change the source string for sbuf_cpy() and
sbuf_cat() to be a const char *.
Add __BEGIN_DECLS and __END_DECLS around
function prototypes since they're now exported
to userland.
kdump/mkioctls: Include stdio.h before cam.h since cam.h now
includes a function with a FILE * argument.
Submitted by: gibbs (mostly)
Reviewed by: jdp, marcel (libsbuf makefile changes)
Reviewed by: des (sbuf changes)
Reviewed by: ken
2001-03-27 05:45:52 +00:00
|
|
|
.Fn sbuf_cat "struct sbuf *s" "const char *str"
|
2000-12-13 19:53:37 +00:00
|
|
|
.Ft int
|
2001-06-11 17:05:52 +00:00
|
|
|
.Fn sbuf_copyin "struct sbuf *s" "const void *uaddr" "size_t len"
|
|
|
|
.Ft int
|
Rewrite of the CAM error recovery code.
Some of the major changes include:
- The SCSI error handling portion of cam_periph_error() has
been broken out into a number of subfunctions to better
modularize the code that handles the hierarchy of SCSI errors.
As a result, the code is now much easier to read.
- String handling and error printing has been significantly
revamped. We now use sbufs to do string formatting instead
of using printfs (for the kernel) and snprintf/strncat (for
userland) as before.
There is a new catchall error printing routine,
cam_error_print() and its string-based counterpart,
cam_error_string() that allow the kernel and userland
applications to pass in a CCB and have errors printed out
properly, whether or not they're SCSI errors. Among other
things, this helped eliminate a fair amount of duplicate code
in camcontrol.
We now print out more information than before, including
the CAM status and SCSI status and the error recovery action
taken to remedy the problem.
- sbufs are now available in userland, via libsbuf. This
change was necessary since most of the error printing code
is shared between libcam and the kernel.
- A new transfer settings interface is included in this checkin.
This code is #ifdef'ed out, and is primarily intended to aid
discussion with HBA driver authors on the final form the
interface should take. There is example code in the ahc(4)
driver that implements the HBA driver side of the new
interface. The new transfer settings code won't be enabled
until we're ready to switch all HBA drivers over to the new
interface.
src/Makefile.inc1,
lib/Makefile: Add libsbuf. It must be built before libcam,
since libcam uses sbuf routines.
libcam/Makefile: libcam now depends on libsbuf.
libsbuf/Makefile: Add a makefile for libsbuf. This pulls in the
sbuf sources from sys/kern.
bsd.libnames.mk: Add LIBSBUF.
camcontrol/Makefile: Add -lsbuf. Since camcontrol is statically
linked, we can't depend on the dynamic linker
to pull in libsbuf.
camcontrol.c: Use cam_error_print() instead of checking for
CAM_SCSI_STATUS_ERROR on every failed CCB.
sbuf.9: Change the prototypes for sbuf_cat() and
sbuf_cpy() so that the source string is now a
const char *. This is more in line wth the
standard system string functions, and helps
eliminate warnings when dealing with a const
source buffer.
Fix a typo.
cam.c: Add description strings for the various CAM
error status values, as well as routines to
look up those strings.
Add new cam_error_string() and
cam_error_print() routines for userland and
the kernel.
cam.h: Add a new CAM flag, CAM_RETRY_SELTO.
Add enumerated types for the various options
available with cam_error_print() and
cam_error_string().
cam_ccb.h: Add new transfer negotiation structures/types.
Change inq_len in the ccb_getdev structure to
be "reserved". This field has never been
filled in, and will be removed when we next
bump the CAM version.
cam_debug.h: Fix typo.
cam_periph.c: Modularize cam_periph_error(). The SCSI error
handling part of cam_periph_error() is now
in camperiphscsistatuserror() and
camperiphscsisenseerror().
In cam_periph_lock(), increase the reference
count on the periph while we wait for our lock
attempt to succeed so that the periph won't go
away while we're sleeping.
cam_xpt.c: Add new transfer negotiation code. (ifdefed
out)
Add a new function, xpt_path_string(). This
is a string/sbuf analog to xpt_print_path().
scsi_all.c: Revamp string handing and error printing code.
We now use sbufs for much of the string
formatting code. More of that code is shared
between userland the kernel.
scsi_all.h: Get rid of SS_TURSTART, it wasn't terribly
useful in the first place.
Add a new error action, SS_REQSENSE. (Send a
request sense and then retry the command.)
This is useful when the controller hasn't
performed autosense for some reason.
Change the default actions around a bit.
scsi_cd.c,
scsi_da.c,
scsi_pt.c,
scsi_ses.c: SF_RETRY_SELTO -> CAM_RETRY_SELTO. Selection
timeouts shouldn't be covered by a sense flag.
scsi_pass.[ch]: SF_RETRY_SELTO -> CAM_RETRY_SELTO.
Get rid of the last vestiges of a read/write
interface.
libkern/bsearch.c,
sys/libkern.h,
conf/files: Add bsearch.c, which is needed for some of the
new table lookup routines.
aic7xxx_freebsd.c: Define AHC_NEW_TRAN_SETTINGS if
CAM_NEW_TRAN_CODE is defined.
sbuf.h,
subr_sbuf.c: Add the appropriate #ifdefs so sbufs can
compile and run in userland.
Change sbuf_printf() to use vsnprintf()
instead of kvprintf(), which is only available
in the kernel.
Change the source string for sbuf_cpy() and
sbuf_cat() to be a const char *.
Add __BEGIN_DECLS and __END_DECLS around
function prototypes since they're now exported
to userland.
kdump/mkioctls: Include stdio.h before cam.h since cam.h now
includes a function with a FILE * argument.
Submitted by: gibbs (mostly)
Reviewed by: jdp, marcel (libsbuf makefile changes)
Reviewed by: des (sbuf changes)
Reviewed by: ken
2001-03-27 05:45:52 +00:00
|
|
|
.Fn sbuf_cpy "struct sbuf *s" "const char *str"
|
2000-12-13 19:53:37 +00:00
|
|
|
.Ft int
|
2001-07-05 22:34:11 +00:00
|
|
|
.Fn sbuf_printf "struct sbuf *s" "const char *fmt" "..."
|
2000-12-13 19:53:37 +00:00
|
|
|
.Ft int
|
2002-01-06 08:40:42 +00:00
|
|
|
.Fn sbuf_vprintf "struct sbuf *s" "const char *fmt" "va_list ap"
|
|
|
|
.Ft int
|
2000-12-13 19:53:37 +00:00
|
|
|
.Fn sbuf_putc "struct sbuf *s" "int c"
|
2010-09-09 17:49:18 +00:00
|
|
|
.Ft void
|
|
|
|
.Fn sbuf_set_drain "struct sbuf *s" "sbuf_drain_func *func" "void *arg"
|
2000-12-13 19:53:37 +00:00
|
|
|
.Ft int
|
2002-01-06 08:40:42 +00:00
|
|
|
.Fn sbuf_trim "struct sbuf *s"
|
|
|
|
.Ft int
|
2010-09-10 16:42:16 +00:00
|
|
|
.Fn sbuf_error "struct sbuf *s"
|
2010-09-09 17:49:18 +00:00
|
|
|
.Ft int
|
2000-12-13 19:53:37 +00:00
|
|
|
.Fn sbuf_finish "struct sbuf *s"
|
|
|
|
.Ft char *
|
|
|
|
.Fn sbuf_data "struct sbuf *s"
|
2013-04-07 17:54:38 +00:00
|
|
|
.Ft ssize_t
|
2000-12-13 19:53:37 +00:00
|
|
|
.Fn sbuf_len "struct sbuf *s"
|
2002-10-04 09:58:17 +00:00
|
|
|
.Ft int
|
|
|
|
.Fn sbuf_done "struct sbuf *s"
|
2000-12-13 19:53:37 +00:00
|
|
|
.Ft void
|
|
|
|
.Fn sbuf_delete "struct sbuf *s"
|
2013-04-11 19:51:53 +00:00
|
|
|
.Ft void
|
|
|
|
.Fn sbuf_start_section "struct sbuf *s" "ssize_t *old_lenp"
|
|
|
|
.Ft ssize_t
|
|
|
|
.Fn sbuf_end_section "struct sbuf *s" "ssize_t old_len" "size_t pad" "int c"
|
Add support for reading MAM attributes to camcontrol(8) and libcam(3).
MAM is Medium Auxiliary Memory and is most commonly found as flash
chips on tapes.
This includes support for reading attributes and decoding most
known attributes, but does not yet include support for writing
attributes or reporting attributes in XML format.
libsbuf/Makefile:
Add subr_prf.c for the new sbuf_hexdump() function. This
function is essentially the same function.
libsbuf/Symbol.map:
Add a new shared library minor version, and include the
sbuf_hexdump() function.
libsbuf/Version.def:
Add version 1.4 of the libsbuf library.
libutil/hexdump.3:
Document sbuf_hexdump() alongside hexdump(3), since it is
essentially the same function.
camcontrol/Makefile:
Add attrib.c.
camcontrol/attrib.c:
Implementation of READ ATTRIBUTE support for camcontrol(8).
camcontrol/camcontrol.8:
Document the new 'camcontrol attrib' subcommand.
camcontrol/camcontrol.c:
Add the new 'camcontrol attrib' subcommand.
camcontrol/camcontrol.h:
Add a function prototype for scsiattrib().
share/man/man9/sbuf.9:
Document the existence of sbuf_hexdump() and point users to
the hexdump(3) man page for more details.
sys/cam/scsi/scsi_all.c:
Add a table of known attributes, text descriptions and
handler functions.
Add a new scsi_attrib_sbuf() function along with a number
of other related functions that help decode attributes.
scsi_attrib_ascii_sbuf() decodes ASCII format attributes.
scsi_attrib_int_sbuf() decodes binary format attributes, and
will pass them off to scsi_attrib_hexdump_sbuf() if they're
bigger than 8 bytes.
scsi_attrib_vendser_sbuf() decodes the vendor and drive
serial number attribute.
scsi_attrib_volcoh_sbuf() decodes the Volume Coherency
Information attribute that LTFS writes out.
sys/cam/scsi/scsi_all.h:
Add a number of attribute-related structure definitions and
other defines.
Add function prototypes for all of the functions added in
scsi_all.c.
sys/kern/subr_prf.c:
Add a new function, sbuf_hexdump(). This is the same as
the existing hexdump(9) function, except that it puts the
result in an sbuf.
This also changes subr_prf.c so that it can be compiled in
userland for includsion in libsbuf.
We should work to change this so that the kernel hexdump
implementation is a wrapper around sbuf_hexdump() with a
statically allocated sbuf with a drain. That will require
a drain function that goes to the kernel printf() buffer
that can take a non-NUL terminated string as input.
That is because an sbuf isn't NUL-terminated until it is
finished, and we don't want to finish it while we're still
using it.
We should also work to consolidate the userland hexdump and
kernel hexdump implemenatations, which are currently
separate. This would also mean making applications that
currently link in libutil link in libsbuf.
sys/sys/sbuf.h:
Add the prototype for sbuf_hexdump(), and add another copy
of the hexdump flag values if they aren't already defined.
Ideally the flags should be defined in one place but the
implemenation makes it difficult to do properly. (See
above.)
Sponsored by: Spectra Logic Corporation
MFC after: 1 week
2015-06-09 21:39:38 +00:00
|
|
|
.Ft void
|
2015-06-18 16:29:11 +00:00
|
|
|
.Fo sbuf_hexdump
|
Add support for reading MAM attributes to camcontrol(8) and libcam(3).
MAM is Medium Auxiliary Memory and is most commonly found as flash
chips on tapes.
This includes support for reading attributes and decoding most
known attributes, but does not yet include support for writing
attributes or reporting attributes in XML format.
libsbuf/Makefile:
Add subr_prf.c for the new sbuf_hexdump() function. This
function is essentially the same function.
libsbuf/Symbol.map:
Add a new shared library minor version, and include the
sbuf_hexdump() function.
libsbuf/Version.def:
Add version 1.4 of the libsbuf library.
libutil/hexdump.3:
Document sbuf_hexdump() alongside hexdump(3), since it is
essentially the same function.
camcontrol/Makefile:
Add attrib.c.
camcontrol/attrib.c:
Implementation of READ ATTRIBUTE support for camcontrol(8).
camcontrol/camcontrol.8:
Document the new 'camcontrol attrib' subcommand.
camcontrol/camcontrol.c:
Add the new 'camcontrol attrib' subcommand.
camcontrol/camcontrol.h:
Add a function prototype for scsiattrib().
share/man/man9/sbuf.9:
Document the existence of sbuf_hexdump() and point users to
the hexdump(3) man page for more details.
sys/cam/scsi/scsi_all.c:
Add a table of known attributes, text descriptions and
handler functions.
Add a new scsi_attrib_sbuf() function along with a number
of other related functions that help decode attributes.
scsi_attrib_ascii_sbuf() decodes ASCII format attributes.
scsi_attrib_int_sbuf() decodes binary format attributes, and
will pass them off to scsi_attrib_hexdump_sbuf() if they're
bigger than 8 bytes.
scsi_attrib_vendser_sbuf() decodes the vendor and drive
serial number attribute.
scsi_attrib_volcoh_sbuf() decodes the Volume Coherency
Information attribute that LTFS writes out.
sys/cam/scsi/scsi_all.h:
Add a number of attribute-related structure definitions and
other defines.
Add function prototypes for all of the functions added in
scsi_all.c.
sys/kern/subr_prf.c:
Add a new function, sbuf_hexdump(). This is the same as
the existing hexdump(9) function, except that it puts the
result in an sbuf.
This also changes subr_prf.c so that it can be compiled in
userland for includsion in libsbuf.
We should work to change this so that the kernel hexdump
implementation is a wrapper around sbuf_hexdump() with a
statically allocated sbuf with a drain. That will require
a drain function that goes to the kernel printf() buffer
that can take a non-NUL terminated string as input.
That is because an sbuf isn't NUL-terminated until it is
finished, and we don't want to finish it while we're still
using it.
We should also work to consolidate the userland hexdump and
kernel hexdump implemenatations, which are currently
separate. This would also mean making applications that
currently link in libutil link in libsbuf.
sys/sys/sbuf.h:
Add the prototype for sbuf_hexdump(), and add another copy
of the hexdump flag values if they aren't already defined.
Ideally the flags should be defined in one place but the
implemenation makes it difficult to do properly. (See
above.)
Sponsored by: Spectra Logic Corporation
MFC after: 1 week
2015-06-09 21:39:38 +00:00
|
|
|
.Fa "struct sbuf *sb"
|
|
|
|
.Fa "void *ptr"
|
|
|
|
.Fa "int length"
|
|
|
|
.Fa "const char *hdr"
|
|
|
|
.Fa "int flags"
|
|
|
|
.Fc
|
2017-02-28 18:25:06 +00:00
|
|
|
.Ft void
|
|
|
|
.Fn sbuf_putbuf "struct sbuf *s"
|
2011-01-25 17:39:52 +00:00
|
|
|
.In sys/sysctl.h
|
|
|
|
.Ft struct sbuf *
|
|
|
|
.Fn sbuf_new_for_sysctl "struct sbuf *s" "char *buf" "int length" "struct sysctl_req *req"
|
2000-12-13 19:53:37 +00:00
|
|
|
.Sh DESCRIPTION
|
|
|
|
The
|
2006-09-18 15:24:20 +00:00
|
|
|
.Nm
|
2011-05-17 18:24:59 +00:00
|
|
|
family of functions allows one to safely allocate, compose and
|
|
|
|
release strings in kernel or user space.
|
|
|
|
.Pp
|
2000-12-13 19:53:37 +00:00
|
|
|
Instead of arrays of characters, these functions operate on structures
|
|
|
|
called
|
|
|
|
.Fa sbufs ,
|
|
|
|
defined in
|
2003-09-08 19:57:22 +00:00
|
|
|
.In sys/sbuf.h .
|
2000-12-13 19:53:37 +00:00
|
|
|
.Pp
|
2011-05-17 18:24:59 +00:00
|
|
|
Any errors encountered during the allocation or composition of the
|
|
|
|
string will be latched in the data structure,
|
2011-12-09 13:15:19 +00:00
|
|
|
making a single error test at the end of the composition
|
2011-05-17 18:24:59 +00:00
|
|
|
sufficient to determine success or failure of the entire process.
|
|
|
|
.Pp
|
2000-12-13 19:53:37 +00:00
|
|
|
The
|
|
|
|
.Fn sbuf_new
|
|
|
|
function initializes the
|
|
|
|
.Fa sbuf
|
|
|
|
pointed to by its first argument.
|
2001-06-10 15:48:04 +00:00
|
|
|
If that pointer is
|
|
|
|
.Dv NULL ,
|
|
|
|
.Fn sbuf_new
|
|
|
|
allocates a
|
2001-07-04 15:37:13 +00:00
|
|
|
.Vt struct sbuf
|
2001-06-10 15:48:04 +00:00
|
|
|
using
|
|
|
|
.Xr malloc 9 .
|
2000-12-13 19:53:37 +00:00
|
|
|
The
|
|
|
|
.Fa buf
|
|
|
|
argument is a pointer to a buffer in which to store the actual string;
|
|
|
|
if it is
|
|
|
|
.Dv NULL ,
|
|
|
|
.Fn sbuf_new
|
|
|
|
will allocate one using
|
|
|
|
.Xr malloc 9 .
|
|
|
|
The
|
|
|
|
.Fa length
|
2002-01-06 08:40:42 +00:00
|
|
|
is the initial size of the storage buffer.
|
2000-12-13 19:53:37 +00:00
|
|
|
The fourth argument,
|
|
|
|
.Fa flags ,
|
2002-01-06 08:40:42 +00:00
|
|
|
may be comprised of the following flags:
|
2002-01-10 12:53:51 +00:00
|
|
|
.Bl -tag -width ".Dv SBUF_AUTOEXTEND"
|
2002-01-06 08:40:42 +00:00
|
|
|
.It Dv SBUF_FIXEDLEN
|
2002-01-10 12:53:51 +00:00
|
|
|
The storage buffer is fixed at its initial size.
|
2002-01-06 08:40:42 +00:00
|
|
|
Attempting to extend the sbuf beyond this size results in an overflow condition.
|
|
|
|
.It Dv SBUF_AUTOEXTEND
|
|
|
|
This indicates that the storage buffer may be extended as necessary, so long
|
|
|
|
as resources allow, to hold additional data.
|
2015-03-14 16:02:11 +00:00
|
|
|
.It Dv SBUF_INCLUDENUL
|
|
|
|
This causes the final nulterm byte to be counted in the length of the data.
|
2002-01-06 08:40:42 +00:00
|
|
|
.El
|
2000-12-13 19:53:37 +00:00
|
|
|
.Pp
|
|
|
|
Note that if
|
|
|
|
.Fa buf
|
|
|
|
is not
|
|
|
|
.Dv NULL ,
|
|
|
|
it must point to an array of at least
|
|
|
|
.Fa length
|
|
|
|
characters.
|
2004-01-09 21:16:31 +00:00
|
|
|
The result of accessing that array directly while it is in use by the
|
|
|
|
sbuf is undefined.
|
|
|
|
.Pp
|
|
|
|
The
|
2009-05-17 21:28:37 +00:00
|
|
|
.Fn sbuf_new_auto
|
|
|
|
function is a shortcut for creating a completely dynamic
|
|
|
|
.Nm .
|
|
|
|
It is the equivalent of calling
|
|
|
|
.Fn sbuf_new
|
|
|
|
with values
|
|
|
|
.Dv NULL ,
|
|
|
|
.Dv NULL ,
|
|
|
|
.Dv 0 ,
|
|
|
|
and
|
|
|
|
.Dv SBUF_AUTOEXTEND .
|
|
|
|
.Pp
|
|
|
|
The
|
2011-01-25 17:39:52 +00:00
|
|
|
.Fn sbuf_new_for_sysctl
|
|
|
|
function will set up an sbuf with a drain function to use
|
|
|
|
.Fn SYSCTL_OUT
|
|
|
|
when the internal buffer fills.
|
2011-01-27 00:34:12 +00:00
|
|
|
Note that if the various functions which append to an sbuf are used while
|
|
|
|
a non-sleepable lock is held, the user buffer should be wired using
|
|
|
|
.Fn sysctl_wire_old_buffer .
|
2011-01-25 17:39:52 +00:00
|
|
|
.Pp
|
|
|
|
The
|
2004-01-09 21:16:31 +00:00
|
|
|
.Fn sbuf_delete
|
|
|
|
function clears the
|
|
|
|
.Fa sbuf
|
|
|
|
and frees any memory allocated for it.
|
|
|
|
There must be a call to
|
|
|
|
.Fn sbuf_delete
|
|
|
|
for every call to
|
|
|
|
.Fn sbuf_new .
|
|
|
|
Any attempt to access the sbuf after it has been deleted will fail.
|
2000-12-13 19:53:37 +00:00
|
|
|
.Pp
|
|
|
|
The
|
2001-01-28 00:18:54 +00:00
|
|
|
.Fn sbuf_clear
|
|
|
|
function invalidates the contents of the
|
|
|
|
.Fa sbuf
|
|
|
|
and resets its position to zero.
|
|
|
|
.Pp
|
|
|
|
The
|
2015-03-14 16:02:11 +00:00
|
|
|
.Fn sbuf_get_flags
|
|
|
|
function returns the current user flags.
|
|
|
|
The
|
|
|
|
.Fn sbuf_set_flags
|
|
|
|
and
|
|
|
|
.Fn sbuf_get_flags
|
|
|
|
functions set or clear one or more user flags, respectively.
|
|
|
|
The user flags are described under the
|
|
|
|
.Fn sbuf_new
|
|
|
|
function.
|
|
|
|
.Pp
|
|
|
|
The
|
2000-12-13 19:53:37 +00:00
|
|
|
.Fn sbuf_setpos
|
|
|
|
function sets the
|
|
|
|
.Fa sbuf Ns 's
|
2002-01-06 08:40:42 +00:00
|
|
|
end position to
|
2000-12-13 19:53:37 +00:00
|
|
|
.Fa pos ,
|
|
|
|
which is a value between zero and one less than the size of the
|
|
|
|
storage buffer.
|
2002-01-06 08:40:42 +00:00
|
|
|
This effectively truncates the sbuf at the new position.
|
2000-12-13 19:53:37 +00:00
|
|
|
.Pp
|
|
|
|
The
|
2001-06-11 17:05:52 +00:00
|
|
|
.Fn sbuf_bcat
|
|
|
|
function appends the first
|
|
|
|
.Fa len
|
2004-07-09 11:38:59 +00:00
|
|
|
bytes from the buffer
|
|
|
|
.Fa buf
|
2001-06-11 17:05:52 +00:00
|
|
|
to the
|
|
|
|
.Fa sbuf .
|
|
|
|
.Pp
|
|
|
|
The
|
|
|
|
.Fn sbuf_bcopyin
|
|
|
|
function copies
|
|
|
|
.Fa len
|
|
|
|
bytes from the specified userland address into the
|
|
|
|
.Fa sbuf .
|
|
|
|
.Pp
|
|
|
|
The
|
|
|
|
.Fn sbuf_bcpy
|
|
|
|
function replaces the contents of the
|
|
|
|
.Fa sbuf
|
|
|
|
with the first
|
|
|
|
.Fa len
|
2004-07-09 11:38:59 +00:00
|
|
|
bytes from the buffer
|
|
|
|
.Fa buf .
|
2001-06-11 17:05:52 +00:00
|
|
|
.Pp
|
|
|
|
The
|
2000-12-13 19:53:37 +00:00
|
|
|
.Fn sbuf_cat
|
2001-06-11 17:05:52 +00:00
|
|
|
function appends the NUL-terminated string
|
2000-12-13 19:53:37 +00:00
|
|
|
.Fa str
|
|
|
|
to the
|
|
|
|
.Fa sbuf
|
|
|
|
at the current position.
|
|
|
|
.Pp
|
|
|
|
The
|
2010-09-09 17:49:18 +00:00
|
|
|
.Fn sbuf_set_drain
|
|
|
|
function sets a drain function
|
|
|
|
.Fa func
|
|
|
|
for the
|
|
|
|
.Fa sbuf ,
|
|
|
|
and records a pointer
|
|
|
|
.Fa arg
|
|
|
|
to be passed to the drain on callback.
|
|
|
|
The drain function cannot be changed while
|
|
|
|
.Fa sbuf_len
|
|
|
|
is non-zero.
|
|
|
|
.Pp
|
|
|
|
The registered drain function
|
|
|
|
.Vt sbuf_drain_func
|
|
|
|
will be called with the argument
|
|
|
|
.Fa arg
|
|
|
|
provided to
|
|
|
|
.Fn sbuf_set_drain ,
|
|
|
|
a pointer
|
|
|
|
.Fa data
|
|
|
|
to a byte string that is the contents of the sbuf, and the length
|
|
|
|
.Fa len
|
|
|
|
of the data.
|
|
|
|
If the drain function exists, it will be called when the sbuf internal
|
|
|
|
buffer is full, or on behalf of
|
|
|
|
.Fn sbuf_finish .
|
|
|
|
The drain function may drain some or all of the data, but must drain
|
|
|
|
at least 1 byte.
|
|
|
|
The return value from the drain function, if positive, indicates how
|
|
|
|
many bytes were drained.
|
|
|
|
If negative, the return value indicates the negative error code which
|
|
|
|
will be returned from this or a later call to
|
|
|
|
.Fn sbuf_finish .
|
|
|
|
The returned drained length cannot be zero.
|
|
|
|
To do unbuffered draining, initialize the sbuf with a two-byte buffer.
|
|
|
|
The drain will be called for every byte added to the sbuf.
|
|
|
|
The
|
|
|
|
.Fn sbuf_bcopyin ,
|
|
|
|
.Fn sbuf_copyin ,
|
|
|
|
.Fn sbuf_trim ,
|
|
|
|
and
|
|
|
|
.Fn sbuf_data
|
|
|
|
functions cannot be used on an sbuf with a drain.
|
|
|
|
.Pp
|
|
|
|
The
|
2001-06-11 17:05:52 +00:00
|
|
|
.Fn sbuf_copyin
|
|
|
|
function copies a NUL-terminated string from the specified userland
|
|
|
|
address into the
|
|
|
|
.Fa sbuf .
|
|
|
|
If the
|
|
|
|
.Fa len
|
|
|
|
argument is non-zero, no more than
|
|
|
|
.Fa len
|
|
|
|
characters (not counting the terminating NUL) are copied; otherwise
|
|
|
|
the entire string, or as much of it as can fit in the
|
|
|
|
.Fa sbuf ,
|
|
|
|
is copied.
|
|
|
|
.Pp
|
|
|
|
The
|
2000-12-13 19:53:37 +00:00
|
|
|
.Fn sbuf_cpy
|
|
|
|
function replaces the contents of the
|
|
|
|
.Fa sbuf
|
2001-06-11 17:05:52 +00:00
|
|
|
with those of the NUL-terminated string
|
2000-12-13 19:53:37 +00:00
|
|
|
.Fa str .
|
|
|
|
This is equivalent to calling
|
|
|
|
.Fn sbuf_cat
|
|
|
|
with a fresh
|
|
|
|
.Fa sbuf
|
|
|
|
or one which position has been reset to zero with
|
2001-01-28 00:18:54 +00:00
|
|
|
.Fn sbuf_clear
|
|
|
|
or
|
2000-12-13 19:53:37 +00:00
|
|
|
.Fn sbuf_setpos .
|
|
|
|
.Pp
|
|
|
|
The
|
|
|
|
.Fn sbuf_printf
|
|
|
|
function formats its arguments according to the format string pointed
|
|
|
|
to by
|
|
|
|
.Fa fmt
|
|
|
|
and appends the resulting string to the
|
|
|
|
.Fa sbuf
|
|
|
|
at the current position.
|
|
|
|
.Pp
|
|
|
|
The
|
2002-01-06 08:40:42 +00:00
|
|
|
.Fn sbuf_vprintf
|
|
|
|
function behaves the same as
|
|
|
|
.Fn sbuf_printf
|
|
|
|
except that the arguments are obtained from the variable-length argument list
|
|
|
|
.Fa ap .
|
|
|
|
.Pp
|
|
|
|
The
|
2000-12-13 19:53:37 +00:00
|
|
|
.Fn sbuf_putc
|
|
|
|
function appends the character
|
|
|
|
.Fa c
|
|
|
|
to the
|
|
|
|
.Fa sbuf
|
|
|
|
at the current position.
|
|
|
|
.Pp
|
|
|
|
The
|
2002-01-06 08:40:42 +00:00
|
|
|
.Fn sbuf_trim
|
|
|
|
function removes trailing whitespace from the
|
|
|
|
.Fa sbuf .
|
|
|
|
.Pp
|
|
|
|
The
|
2010-09-10 16:42:16 +00:00
|
|
|
.Fn sbuf_error
|
|
|
|
function returns any error value that the
|
|
|
|
.Fa sbuf
|
|
|
|
may have accumulated, either from the drain function, or ENOMEM if the
|
2001-01-28 00:18:54 +00:00
|
|
|
.Fa sbuf
|
|
|
|
overflowed.
|
2010-09-10 16:42:16 +00:00
|
|
|
This function is generally not needed and instead the error code from
|
|
|
|
.Fn sbuf_finish
|
|
|
|
is the preferred way to discover whether an sbuf had an error.
|
2001-01-28 00:18:54 +00:00
|
|
|
.Pp
|
|
|
|
The
|
2000-12-13 19:53:37 +00:00
|
|
|
.Fn sbuf_finish
|
2010-09-09 17:49:18 +00:00
|
|
|
function will call the attached drain function if one exists until all
|
|
|
|
the data in the
|
|
|
|
.Fa sbuf
|
|
|
|
is flushed.
|
|
|
|
If there is no attached drain,
|
|
|
|
.Fn sbuf_finish
|
|
|
|
NUL-terminates the
|
|
|
|
.Fa sbuf .
|
|
|
|
In either case it marks the
|
2000-12-13 19:53:37 +00:00
|
|
|
.Fa sbuf
|
2010-09-09 17:49:18 +00:00
|
|
|
as finished, which means that it may no longer be modified using
|
2000-12-13 19:53:37 +00:00
|
|
|
.Fn sbuf_setpos ,
|
|
|
|
.Fn sbuf_cat ,
|
Rewrite of the CAM error recovery code.
Some of the major changes include:
- The SCSI error handling portion of cam_periph_error() has
been broken out into a number of subfunctions to better
modularize the code that handles the hierarchy of SCSI errors.
As a result, the code is now much easier to read.
- String handling and error printing has been significantly
revamped. We now use sbufs to do string formatting instead
of using printfs (for the kernel) and snprintf/strncat (for
userland) as before.
There is a new catchall error printing routine,
cam_error_print() and its string-based counterpart,
cam_error_string() that allow the kernel and userland
applications to pass in a CCB and have errors printed out
properly, whether or not they're SCSI errors. Among other
things, this helped eliminate a fair amount of duplicate code
in camcontrol.
We now print out more information than before, including
the CAM status and SCSI status and the error recovery action
taken to remedy the problem.
- sbufs are now available in userland, via libsbuf. This
change was necessary since most of the error printing code
is shared between libcam and the kernel.
- A new transfer settings interface is included in this checkin.
This code is #ifdef'ed out, and is primarily intended to aid
discussion with HBA driver authors on the final form the
interface should take. There is example code in the ahc(4)
driver that implements the HBA driver side of the new
interface. The new transfer settings code won't be enabled
until we're ready to switch all HBA drivers over to the new
interface.
src/Makefile.inc1,
lib/Makefile: Add libsbuf. It must be built before libcam,
since libcam uses sbuf routines.
libcam/Makefile: libcam now depends on libsbuf.
libsbuf/Makefile: Add a makefile for libsbuf. This pulls in the
sbuf sources from sys/kern.
bsd.libnames.mk: Add LIBSBUF.
camcontrol/Makefile: Add -lsbuf. Since camcontrol is statically
linked, we can't depend on the dynamic linker
to pull in libsbuf.
camcontrol.c: Use cam_error_print() instead of checking for
CAM_SCSI_STATUS_ERROR on every failed CCB.
sbuf.9: Change the prototypes for sbuf_cat() and
sbuf_cpy() so that the source string is now a
const char *. This is more in line wth the
standard system string functions, and helps
eliminate warnings when dealing with a const
source buffer.
Fix a typo.
cam.c: Add description strings for the various CAM
error status values, as well as routines to
look up those strings.
Add new cam_error_string() and
cam_error_print() routines for userland and
the kernel.
cam.h: Add a new CAM flag, CAM_RETRY_SELTO.
Add enumerated types for the various options
available with cam_error_print() and
cam_error_string().
cam_ccb.h: Add new transfer negotiation structures/types.
Change inq_len in the ccb_getdev structure to
be "reserved". This field has never been
filled in, and will be removed when we next
bump the CAM version.
cam_debug.h: Fix typo.
cam_periph.c: Modularize cam_periph_error(). The SCSI error
handling part of cam_periph_error() is now
in camperiphscsistatuserror() and
camperiphscsisenseerror().
In cam_periph_lock(), increase the reference
count on the periph while we wait for our lock
attempt to succeed so that the periph won't go
away while we're sleeping.
cam_xpt.c: Add new transfer negotiation code. (ifdefed
out)
Add a new function, xpt_path_string(). This
is a string/sbuf analog to xpt_print_path().
scsi_all.c: Revamp string handing and error printing code.
We now use sbufs for much of the string
formatting code. More of that code is shared
between userland the kernel.
scsi_all.h: Get rid of SS_TURSTART, it wasn't terribly
useful in the first place.
Add a new error action, SS_REQSENSE. (Send a
request sense and then retry the command.)
This is useful when the controller hasn't
performed autosense for some reason.
Change the default actions around a bit.
scsi_cd.c,
scsi_da.c,
scsi_pt.c,
scsi_ses.c: SF_RETRY_SELTO -> CAM_RETRY_SELTO. Selection
timeouts shouldn't be covered by a sense flag.
scsi_pass.[ch]: SF_RETRY_SELTO -> CAM_RETRY_SELTO.
Get rid of the last vestiges of a read/write
interface.
libkern/bsearch.c,
sys/libkern.h,
conf/files: Add bsearch.c, which is needed for some of the
new table lookup routines.
aic7xxx_freebsd.c: Define AHC_NEW_TRAN_SETTINGS if
CAM_NEW_TRAN_CODE is defined.
sbuf.h,
subr_sbuf.c: Add the appropriate #ifdefs so sbufs can
compile and run in userland.
Change sbuf_printf() to use vsnprintf()
instead of kvprintf(), which is only available
in the kernel.
Change the source string for sbuf_cpy() and
sbuf_cat() to be a const char *.
Add __BEGIN_DECLS and __END_DECLS around
function prototypes since they're now exported
to userland.
kdump/mkioctls: Include stdio.h before cam.h since cam.h now
includes a function with a FILE * argument.
Submitted by: gibbs (mostly)
Reviewed by: jdp, marcel (libsbuf makefile changes)
Reviewed by: des (sbuf changes)
Reviewed by: ken
2001-03-27 05:45:52 +00:00
|
|
|
.Fn sbuf_cpy ,
|
2000-12-13 19:53:37 +00:00
|
|
|
.Fn sbuf_printf
|
|
|
|
or
|
2010-09-09 16:27:02 +00:00
|
|
|
.Fn sbuf_putc ,
|
|
|
|
until
|
|
|
|
.Fn sbuf_clear
|
|
|
|
is used to reset the sbuf.
|
2000-12-13 19:53:37 +00:00
|
|
|
.Pp
|
|
|
|
The
|
|
|
|
.Fn sbuf_data
|
2010-09-09 17:49:18 +00:00
|
|
|
function returns the actual string;
|
2001-01-28 00:18:54 +00:00
|
|
|
.Fn sbuf_data
|
|
|
|
only works on a finished
|
2000-12-13 19:53:37 +00:00
|
|
|
.Fa sbuf .
|
2010-09-09 17:49:18 +00:00
|
|
|
The
|
2011-12-09 13:15:19 +00:00
|
|
|
.Fn sbuf_len
|
|
|
|
function returns the length of the string.
|
2010-09-09 17:49:18 +00:00
|
|
|
For an
|
|
|
|
.Fa sbuf
|
|
|
|
with an attached drain,
|
|
|
|
.Fn sbuf_len
|
|
|
|
returns the length of the un-drained data.
|
|
|
|
.Fn sbuf_done
|
|
|
|
returns non-zero if the
|
|
|
|
.Fa sbuf
|
|
|
|
is finished.
|
2013-04-11 19:51:53 +00:00
|
|
|
.Pp
|
|
|
|
The
|
|
|
|
.Fn sbuf_start_section
|
|
|
|
and
|
|
|
|
.Fn sbuf_end_section
|
|
|
|
functions may be used for automatic section alignment.
|
|
|
|
The arguments
|
|
|
|
.Fa pad
|
|
|
|
and
|
|
|
|
.Fa c
|
|
|
|
specify the padding size and a character used for padding.
|
|
|
|
The arguments
|
|
|
|
.Fa old_lenp
|
|
|
|
and
|
|
|
|
.Fa old_len
|
|
|
|
are to save and restore the current section length when nested sections
|
|
|
|
are used.
|
|
|
|
For the top level section
|
|
|
|
.Dv NULL
|
|
|
|
and \-1 can be specified for
|
|
|
|
.Fa old_lenp
|
|
|
|
and
|
|
|
|
.Fa old_len
|
|
|
|
respectively.
|
Add support for reading MAM attributes to camcontrol(8) and libcam(3).
MAM is Medium Auxiliary Memory and is most commonly found as flash
chips on tapes.
This includes support for reading attributes and decoding most
known attributes, but does not yet include support for writing
attributes or reporting attributes in XML format.
libsbuf/Makefile:
Add subr_prf.c for the new sbuf_hexdump() function. This
function is essentially the same function.
libsbuf/Symbol.map:
Add a new shared library minor version, and include the
sbuf_hexdump() function.
libsbuf/Version.def:
Add version 1.4 of the libsbuf library.
libutil/hexdump.3:
Document sbuf_hexdump() alongside hexdump(3), since it is
essentially the same function.
camcontrol/Makefile:
Add attrib.c.
camcontrol/attrib.c:
Implementation of READ ATTRIBUTE support for camcontrol(8).
camcontrol/camcontrol.8:
Document the new 'camcontrol attrib' subcommand.
camcontrol/camcontrol.c:
Add the new 'camcontrol attrib' subcommand.
camcontrol/camcontrol.h:
Add a function prototype for scsiattrib().
share/man/man9/sbuf.9:
Document the existence of sbuf_hexdump() and point users to
the hexdump(3) man page for more details.
sys/cam/scsi/scsi_all.c:
Add a table of known attributes, text descriptions and
handler functions.
Add a new scsi_attrib_sbuf() function along with a number
of other related functions that help decode attributes.
scsi_attrib_ascii_sbuf() decodes ASCII format attributes.
scsi_attrib_int_sbuf() decodes binary format attributes, and
will pass them off to scsi_attrib_hexdump_sbuf() if they're
bigger than 8 bytes.
scsi_attrib_vendser_sbuf() decodes the vendor and drive
serial number attribute.
scsi_attrib_volcoh_sbuf() decodes the Volume Coherency
Information attribute that LTFS writes out.
sys/cam/scsi/scsi_all.h:
Add a number of attribute-related structure definitions and
other defines.
Add function prototypes for all of the functions added in
scsi_all.c.
sys/kern/subr_prf.c:
Add a new function, sbuf_hexdump(). This is the same as
the existing hexdump(9) function, except that it puts the
result in an sbuf.
This also changes subr_prf.c so that it can be compiled in
userland for includsion in libsbuf.
We should work to change this so that the kernel hexdump
implementation is a wrapper around sbuf_hexdump() with a
statically allocated sbuf with a drain. That will require
a drain function that goes to the kernel printf() buffer
that can take a non-NUL terminated string as input.
That is because an sbuf isn't NUL-terminated until it is
finished, and we don't want to finish it while we're still
using it.
We should also work to consolidate the userland hexdump and
kernel hexdump implemenatations, which are currently
separate. This would also mean making applications that
currently link in libutil link in libsbuf.
sys/sys/sbuf.h:
Add the prototype for sbuf_hexdump(), and add another copy
of the hexdump flag values if they aren't already defined.
Ideally the flags should be defined in one place but the
implemenation makes it difficult to do properly. (See
above.)
Sponsored by: Spectra Logic Corporation
MFC after: 1 week
2015-06-09 21:39:38 +00:00
|
|
|
.Pp
|
|
|
|
The
|
|
|
|
.Fn sbuf_hexdump
|
|
|
|
function prints an array of bytes to the supplied sbuf, along with an ASCII
|
|
|
|
representation of the bytes if possible.
|
|
|
|
See the
|
|
|
|
.Xr hexdump 3
|
|
|
|
man page for more details on the interface.
|
2017-02-28 18:25:06 +00:00
|
|
|
.Pp
|
|
|
|
The
|
|
|
|
.Fn sbuf_putbuf
|
|
|
|
function printfs the sbuf to stdout if in userland, and to the console
|
|
|
|
and log if in the kernel.
|
|
|
|
It does not drain the buffer or update any pointers.
|
2000-12-13 19:53:37 +00:00
|
|
|
.Sh NOTES
|
|
|
|
If an operation caused an
|
|
|
|
.Fa sbuf
|
2001-01-28 00:18:54 +00:00
|
|
|
to overflow, most subsequent operations on it will fail until the
|
|
|
|
.Fa sbuf
|
|
|
|
is finished using
|
|
|
|
.Fn sbuf_finish
|
|
|
|
or reset using
|
|
|
|
.Fn sbuf_clear ,
|
|
|
|
or its position is reset to a value between 0 and one less than the
|
|
|
|
size of its storage buffer using
|
2000-12-13 19:53:37 +00:00
|
|
|
.Fn sbuf_setpos ,
|
|
|
|
or it is reinitialized to a sufficiently short string using
|
|
|
|
.Fn sbuf_cpy .
|
2010-09-09 17:49:18 +00:00
|
|
|
.Pp
|
|
|
|
Drains in user-space will not always function as indicated.
|
|
|
|
While the drain function will be called immediately on overflow from
|
|
|
|
the
|
|
|
|
.Fa sbuf_putc ,
|
|
|
|
.Fa sbuf_bcat ,
|
|
|
|
.Fa sbuf_cat
|
|
|
|
functions,
|
|
|
|
.Fa sbuf_printf
|
|
|
|
and
|
|
|
|
.Fa sbuf_vprintf
|
|
|
|
currently have no way to determine whether there will be an overflow
|
|
|
|
until after it occurs, and cannot do a partial expansion of the format
|
|
|
|
string.
|
|
|
|
Thus when using libsbuf the buffer may be extended to allow completion
|
|
|
|
of a single printf call, even though a drain is attached.
|
2000-12-13 19:53:37 +00:00
|
|
|
.Sh RETURN VALUES
|
2006-09-18 15:24:20 +00:00
|
|
|
The
|
2000-12-13 19:53:37 +00:00
|
|
|
.Fn sbuf_new
|
2006-09-18 15:24:20 +00:00
|
|
|
function returns
|
2001-06-10 15:48:04 +00:00
|
|
|
.Dv NULL
|
|
|
|
if it failed to allocate a storage buffer, and a pointer to the new
|
|
|
|
.Fa sbuf
|
2000-12-13 19:53:37 +00:00
|
|
|
otherwise.
|
|
|
|
.Pp
|
2006-09-18 15:24:20 +00:00
|
|
|
The
|
2000-12-13 19:53:37 +00:00
|
|
|
.Fn sbuf_setpos
|
2006-09-18 15:24:20 +00:00
|
|
|
function returns \-1 if
|
2000-12-13 19:53:37 +00:00
|
|
|
.Fa pos
|
|
|
|
was invalid, and zero otherwise.
|
|
|
|
.Pp
|
2006-09-18 15:24:20 +00:00
|
|
|
The
|
2000-12-13 19:53:37 +00:00
|
|
|
.Fn sbuf_cat ,
|
|
|
|
.Fn sbuf_cpy ,
|
|
|
|
.Fn sbuf_printf ,
|
2002-01-06 08:40:42 +00:00
|
|
|
.Fn sbuf_putc ,
|
2000-12-13 19:53:37 +00:00
|
|
|
and
|
2002-01-06 08:40:42 +00:00
|
|
|
.Fn sbuf_trim
|
2006-09-18 15:24:20 +00:00
|
|
|
functions
|
2000-12-13 19:53:37 +00:00
|
|
|
all return \-1 if the buffer overflowed, and zero otherwise.
|
|
|
|
.Pp
|
2006-09-18 15:24:20 +00:00
|
|
|
The
|
2010-09-10 16:42:16 +00:00
|
|
|
.Fn sbuf_error
|
|
|
|
function returns a non-zero value if the buffer has an overflow or
|
|
|
|
drain error, and zero otherwise.
|
2001-01-28 00:18:54 +00:00
|
|
|
.Pp
|
2006-09-18 15:24:20 +00:00
|
|
|
The
|
2000-12-13 19:53:37 +00:00
|
|
|
.Fn sbuf_len
|
2011-12-09 13:28:41 +00:00
|
|
|
function returns \-1 if the buffer overflowed.
|
2005-12-23 11:49:53 +00:00
|
|
|
.Pp
|
2006-09-18 15:24:20 +00:00
|
|
|
The
|
2005-12-23 11:49:53 +00:00
|
|
|
.Fn sbuf_copyin
|
2006-09-18 15:24:20 +00:00
|
|
|
function
|
2005-12-23 11:49:53 +00:00
|
|
|
returns \-1 if copying string from userland failed, and number of bytes
|
|
|
|
copied otherwise.
|
2011-05-17 18:24:59 +00:00
|
|
|
.Pp
|
2010-09-09 17:49:18 +00:00
|
|
|
The
|
2013-04-11 19:51:53 +00:00
|
|
|
.Fn sbuf_end_section
|
|
|
|
function returns the section length or \-1 if the buffer has an error.
|
|
|
|
.Pp
|
|
|
|
The
|
2011-05-17 18:24:59 +00:00
|
|
|
.Fn sbuf_finish 9
|
|
|
|
function (the kernel version) returns ENOMEM if the sbuf overflowed before
|
|
|
|
being finished,
|
2010-09-09 17:49:18 +00:00
|
|
|
or returns the error code from the drain if one is attached.
|
2011-05-17 18:24:59 +00:00
|
|
|
.Pp
|
|
|
|
The
|
2011-12-09 13:15:19 +00:00
|
|
|
.Fn sbuf_finish 3
|
2011-05-17 18:24:59 +00:00
|
|
|
function (the userland version)
|
|
|
|
will return zero for success and \-1 and set errno on error.
|
|
|
|
.Sh EXAMPLES
|
|
|
|
.Bd -literal -compact
|
2017-04-06 02:03:35 +00:00
|
|
|
#include <sys/types.h>
|
2011-05-17 18:24:59 +00:00
|
|
|
#include <sys/sbuf.h>
|
|
|
|
|
|
|
|
struct sbuf *sb;
|
|
|
|
|
|
|
|
sb = sbuf_new_auto();
|
2011-05-19 13:42:19 +00:00
|
|
|
sbuf_cat(sb, "Customers found:\en");
|
2011-05-17 18:24:59 +00:00
|
|
|
TAILQ_FOREACH(foo, &foolist, list) {
|
2011-05-19 13:42:19 +00:00
|
|
|
sbuf_printf(sb, " %4d %s\en", foo->index, foo->name);
|
|
|
|
sbuf_printf(sb, " Address: %s\en", foo->address);
|
|
|
|
sbuf_printf(sb, " Zip: %s\en", foo->zipcode);
|
2011-05-17 18:24:59 +00:00
|
|
|
}
|
2011-12-21 17:03:30 +00:00
|
|
|
if (sbuf_finish(sb) != 0) /* Check for any and all errors */
|
|
|
|
err(1, "Could not generate message");
|
2011-05-17 18:24:59 +00:00
|
|
|
transmit_msg(sbuf_data(sb), sbuf_len(sb));
|
|
|
|
sbuf_delete(sb);
|
|
|
|
.Ed
|
2000-12-13 19:53:37 +00:00
|
|
|
.Sh SEE ALSO
|
Add support for reading MAM attributes to camcontrol(8) and libcam(3).
MAM is Medium Auxiliary Memory and is most commonly found as flash
chips on tapes.
This includes support for reading attributes and decoding most
known attributes, but does not yet include support for writing
attributes or reporting attributes in XML format.
libsbuf/Makefile:
Add subr_prf.c for the new sbuf_hexdump() function. This
function is essentially the same function.
libsbuf/Symbol.map:
Add a new shared library minor version, and include the
sbuf_hexdump() function.
libsbuf/Version.def:
Add version 1.4 of the libsbuf library.
libutil/hexdump.3:
Document sbuf_hexdump() alongside hexdump(3), since it is
essentially the same function.
camcontrol/Makefile:
Add attrib.c.
camcontrol/attrib.c:
Implementation of READ ATTRIBUTE support for camcontrol(8).
camcontrol/camcontrol.8:
Document the new 'camcontrol attrib' subcommand.
camcontrol/camcontrol.c:
Add the new 'camcontrol attrib' subcommand.
camcontrol/camcontrol.h:
Add a function prototype for scsiattrib().
share/man/man9/sbuf.9:
Document the existence of sbuf_hexdump() and point users to
the hexdump(3) man page for more details.
sys/cam/scsi/scsi_all.c:
Add a table of known attributes, text descriptions and
handler functions.
Add a new scsi_attrib_sbuf() function along with a number
of other related functions that help decode attributes.
scsi_attrib_ascii_sbuf() decodes ASCII format attributes.
scsi_attrib_int_sbuf() decodes binary format attributes, and
will pass them off to scsi_attrib_hexdump_sbuf() if they're
bigger than 8 bytes.
scsi_attrib_vendser_sbuf() decodes the vendor and drive
serial number attribute.
scsi_attrib_volcoh_sbuf() decodes the Volume Coherency
Information attribute that LTFS writes out.
sys/cam/scsi/scsi_all.h:
Add a number of attribute-related structure definitions and
other defines.
Add function prototypes for all of the functions added in
scsi_all.c.
sys/kern/subr_prf.c:
Add a new function, sbuf_hexdump(). This is the same as
the existing hexdump(9) function, except that it puts the
result in an sbuf.
This also changes subr_prf.c so that it can be compiled in
userland for includsion in libsbuf.
We should work to change this so that the kernel hexdump
implementation is a wrapper around sbuf_hexdump() with a
statically allocated sbuf with a drain. That will require
a drain function that goes to the kernel printf() buffer
that can take a non-NUL terminated string as input.
That is because an sbuf isn't NUL-terminated until it is
finished, and we don't want to finish it while we're still
using it.
We should also work to consolidate the userland hexdump and
kernel hexdump implemenatations, which are currently
separate. This would also mean making applications that
currently link in libutil link in libsbuf.
sys/sys/sbuf.h:
Add the prototype for sbuf_hexdump(), and add another copy
of the hexdump flag values if they aren't already defined.
Ideally the flags should be defined in one place but the
implemenation makes it difficult to do properly. (See
above.)
Sponsored by: Spectra Logic Corporation
MFC after: 1 week
2015-06-09 21:39:38 +00:00
|
|
|
.Xr hexdump 3 ,
|
2000-12-13 19:53:37 +00:00
|
|
|
.Xr printf 3 ,
|
|
|
|
.Xr strcat 3 ,
|
2001-07-04 15:37:13 +00:00
|
|
|
.Xr strcpy 3 ,
|
|
|
|
.Xr copyin 9 ,
|
2001-12-09 08:12:06 +00:00
|
|
|
.Xr copyinstr 9 ,
|
|
|
|
.Xr printf 9
|
2000-12-13 19:53:37 +00:00
|
|
|
.Sh HISTORY
|
|
|
|
The
|
2006-09-18 15:24:20 +00:00
|
|
|
.Nm
|
2000-12-13 19:53:37 +00:00
|
|
|
family of functions first appeared in
|
2001-07-19 09:07:51 +00:00
|
|
|
.Fx 4.4 .
|
2000-12-13 19:53:37 +00:00
|
|
|
.Sh AUTHORS
|
|
|
|
.An -nosplit
|
|
|
|
The
|
2006-09-18 15:24:20 +00:00
|
|
|
.Nm
|
2000-12-13 19:53:37 +00:00
|
|
|
family of functions was designed by
|
2014-06-26 21:44:30 +00:00
|
|
|
.An Poul-Henning Kamp Aq Mt phk@FreeBSD.org
|
2000-12-13 19:53:37 +00:00
|
|
|
and implemented by
|
2014-06-26 21:44:30 +00:00
|
|
|
.An Dag-Erling Sm\(/orgrav Aq Mt des@FreeBSD.org .
|
2001-01-28 00:18:54 +00:00
|
|
|
Additional improvements were suggested by
|
2014-06-26 21:44:30 +00:00
|
|
|
.An Justin T. Gibbs Aq Mt gibbs@FreeBSD.org .
|
2002-01-06 08:40:42 +00:00
|
|
|
Auto-extend support added by
|
2014-06-26 21:44:30 +00:00
|
|
|
.An Kelly Yancey Aq Mt kbyanc@FreeBSD.org .
|
2010-09-09 17:49:18 +00:00
|
|
|
Drain functionality added by
|
2014-06-26 21:44:30 +00:00
|
|
|
.An Matthew Fleming Aq Mt mdf@FreeBSD.org .
|
2000-12-13 19:53:37 +00:00
|
|
|
.Pp
|
|
|
|
This manual page was written by
|
2014-06-26 21:44:30 +00:00
|
|
|
.An Dag-Erling Sm\(/orgrav Aq Mt des@FreeBSD.org .
|