#
369621 |
|
16-Apr-2021 |
git2svn |
Make sbuf_drain safe for external use
While sbuf_drain was an internal function, two KASSERTS checked the sanity of it being called. However, an external caller may be ignorant if there is any data to drain, or if an error has already accumulated. Be nice and return immediately with the accumulated error.
MFC after: 2 weeks Reviewed By: tuexen, #transport Sponsored by: NetApp, Inc. Differential Revision: https://reviews.freebsd.org/D29544
(cherry picked from commit cad4fd0365a5e3235e715e072e6ee9dffaa7a3ab)
Git Hash: 2e96d6ef392e2280a8cb39d89932596c3524ddda Git Author: rscheff@FreeBSD.org
|
#
369620 |
|
16-Apr-2021 |
rscheff |
Export sbuf_drain to orchestrate lock and drain action
While exporting large amounts of data to a sysctl request, datastructures may need to be locked.
Exporting the sbuf_drain function allows the coordination between drain events and held locks, to avoid stalls.
PR: 254333 Reviewed By: jhb MFC after: 2 weeks Sponsored by: NetApp, Inc. Differential Revision: https://reviews.freebsd.org/D29481
(cherry picked from commit c804c8f2c58ba42d476de07fbceff9ac4dd95f0e)
Git Hash: 6ab67f3b20ac44e9e9741bd0bdf557c3aa118d32 Git Author: rscheff@FreeBSD.org
|
#
321110 |
|
18-Jul-2017 |
ngie |
MFC r321109:
Fix whitespace regression accidentally checked in via ^/head@r280149
|
#
302408 |
|
07-Jul-2016 |
gjb |
Copy head@r302406 to stable/11 as part of the 11.0-RELEASE cycle. Prune svn:mergeinfo from the new branch, as nothing has been merged here.
Additional commits post-branch will follow.
Approved by: re (implicit) Sponsored by: The FreeBSD Foundation |
#
288484 |
|
02-Oct-2015 |
phk |
Fail the sbuf if vsnprintf(3) fails.
|
#
288223 |
|
25-Sep-2015 |
cem |
sbuf: Process more than one char at a time
Revamp sbuf_put_byte() to sbuf_put_bytes() in the obvious fashion and fixup callers.
Add a thin shim around sbuf_put_bytes() with the old ABI to avoid ugly changes to some callers.
Reviewed by: jhb, markj Obtained from: Dan Sledz Sponsored by: EMC / Isilon Storage Division Differential Revision: https://reviews.freebsd.org/D3717
|
#
280193 |
|
17-Mar-2015 |
ian |
The minimum sbuf buffer size is 2 bytes (a byte plus a nulterm), assert that.
Values smaller than two lead to strange asserts that have nothing to do with the actual problem (in the case of size=0), or to writing beyond the end of the allocated buffer in sbuf_finish() (in the case of size=1).
|
#
280149 |
|
16-Mar-2015 |
ian |
Update an sbuf assertion to allow for the new SBUF_INCLUDENUL flag. If INCLUDENUL is set and sbuf_finish() has been called, the length has been incremented to count the nulterm byte, and in that case current length is allowed to be equal to buffer size, otherwise it must be less than.
Add a predicate macro to test for SBUF_INCLUDENUL, and use it in tests, to be consistant with the style in the rest of this file.
|
#
279992 |
|
14-Mar-2015 |
ian |
Add a new flag, SBUF_INCLUDENUL, and new get/set/clear functions for flags.
The SBUF_INCLUDENUL flag causes the nulterm byte at the end of the string to be counted in the length of the data. If copying the data using the sbuf_data() and sbuf_len() functions, or if writing it automatically with a drain function, the net effect is that the nulterm byte is copied along with the rest of the data.
|
#
269179 |
|
28-Jul-2014 |
gahr |
Unbreak the ABI by reverting r268494 until the compat shims are provided
|
#
268494 |
|
10-Jul-2014 |
gahr |
Implement Short/Small String Optimization in SBUF(9) and change lengths and positions in the API from ssize_t and int to size_t.
CR: D388 Approved by: des, bapt
|
#
255805 |
|
22-Sep-2013 |
des |
Always request zeroed memory, in case we're dumb enough to leak it later.
Approved by: re (gjb)
|
#
250706 |
|
16-May-2013 |
jh |
A library function shall not set errno to 0.
Reviewed by: mdf
|
#
249377 |
|
11-Apr-2013 |
trociny |
Add sbuf_start_section() and sbuf_end_section() functions, which can be used for automatic section alignment.
Discussed with: kib Reviewed by: kib MFC after: 1 month
|
#
224999 |
|
19-Aug-2011 |
rwatson |
r222015 introduced a new assertion that the size of a fixed-length sbuf buffer is greater than 1. This triggered panics in at least one spot in the kernel (the MAC Framework) which passes non-negative, rather than >1 buffer sizes based on the size of a user buffer passed into a system call. While 0-size buffers aren't particularly useful, they also aren't strictly incorrect, so loosen the assertion.
Discussed with: phk (fears I might be EDOOFUS but willing to go along) Spotted by: pho + stress2 Approved by: re (kib)
|
#
222015 |
|
17-May-2011 |
phk |
Use memset() instead of bzero() and memcpy() instead of bcopy(), there is no relevant difference for sbufs, and it increases portability of the source code.
Split the actual initialization of the sbuf into a separate local function, so that certain static code checkers can understand what sbuf_new() does, thus eliminating on silly annoyance of MISRA compliance testing.
Contributed by: An anonymous company in the last business I expected sbufs to invade.
|
#
222004 |
|
17-May-2011 |
phk |
Don't expect PAGE_SIZE to exist on all platforms (It is a pretty arbitrary choice of default size in the first place)
Reverse the order of arguments to the internal static sbuf_put_byte() function to match everything else in this file.
Move sbuf_putc_func() inside the kernel version of sbuf_vprintf where it belongs.
sbuf_putc() incorrectly used sbuf_putc_func() which supress NUL characters, it should use sbuf_put_byte().
Make sbuf_finish() return -1 on error.
Minor stylistic nits fixed.
|
#
221993 |
|
16-May-2011 |
phk |
Change the length quantities of sbufs to be ssize_t rather than int.
Constify a couple of arguments.
|
#
212750 |
|
16-Sep-2010 |
mdf |
Re-add r212370 now that the LOR in powerpc64 has been resolved:
Add a drain function for struct sysctl_req, and use it for a variety of handlers, some of which had to do awkward things to get a large enough SBUF_FIXEDLEN buffer.
Note that some sysctl handlers were explicitly outputting a trailing NUL byte. This behaviour was preserved, though it should not be necessary.
Reviewed by: phk (original patch)
|
#
212572 |
|
13-Sep-2010 |
mdf |
Revert r212370, as it causes a LOR on powerpc. powerpc does a few unexpected things in copyout(9) and so wiring the user buffer is not sufficient to perform a copyout(9) while holding a random mutex.
Requested by: nwhitehorn
|
#
212478 |
|
11-Sep-2010 |
kan |
Add missing pointer increment to sbuf_cat.
|
#
212425 |
|
10-Sep-2010 |
mdf |
Replace sbuf_overflowed() with sbuf_error(), which returns any error code associated with overflow or with the drain function. While this function is not expected to be used often, it produces more information in the form of an errno that sbuf_overflowed() did.
|
#
212370 |
|
09-Sep-2010 |
mdf |
Add a drain function for struct sysctl_req, and use it for a variety of handlers, some of which had to do awkward things to get a large enough FIXEDLEN buffer.
Note that some sysctl handlers were explicitly outputting a trailing NUL byte. This behaviour was preserved, though it should not be necessary.
Reviewed by: phk
|
#
212367 |
|
09-Sep-2010 |
mdf |
Add drain functionality to sbufs. The drain is a function that is called when the sbuf internal buffer is filled. For kernel sbufs with a drain, the internal buffer will never be expanded. For userland sbufs with a drain, the internal buffer may still be expanded by sbuf_[v]printf(3).
Sbufs now have three basic uses: 1) static string manipulation. Overflow is marked. 2) dynamic string manipulation. Overflow triggers string growth. 3) drained string manipulation. Overflow triggers draining.
In all cases the manipulation is 'safe' in that overflow is detected and managed.
Reviewed by: phk (the previous version)
|
#
212365 |
|
09-Sep-2010 |
mdf |
Refactor sbuf code so that most uses of sbuf_extend() are in a new sbuf_put_byte(). This makes it easier to add drain functionality when a buffer would overflow as there are fewer code points.
Reviewed by: phk
|
#
212184 |
|
03-Sep-2010 |
mdf |
Use a better #if guard.
Suggested by pluknet <pluknet at gmail dot com>.
|
#
212183 |
|
03-Sep-2010 |
mdf |
Style(9) fixes and eliminate the use of min().
|
#
212182 |
|
03-Sep-2010 |
mdf |
Fix user-space libsbuf build. Why isn't CTASSERT available to user-space?
|
#
212181 |
|
03-Sep-2010 |
mdf |
Fix brain fart when converting an if statement into a KASSERT.
|
#
212180 |
|
03-Sep-2010 |
mdf |
Use math rather than iteration when the desired sbuf size is larger than SBUF_MAXEXTENDSIZE.
|
#
181462 |
|
09-Aug-2008 |
des |
Switch to simplified BSD license (with phk's approval), plus whitespace and style(9) cleanup.
|
#
153678 |
|
23-Dec-2005 |
phk |
Make sbuf_copyin() return the number of bytes copied on success.
Submitted by: "Wojciech A. Koszek" <dunstan@freebsd.czest.pl>
|
#
141616 |
|
10-Feb-2005 |
phk |
Make a bunch of malloc types static.
Found by: src/tools/tools/kernxref
|
#
131869 |
|
09-Jul-2004 |
des |
Cosmetic adjustment to previous commit: name the second argument to sbuf_bcat() and sbuf_bcpy() "buf" rather than "data".
|
#
131868 |
|
09-Jul-2004 |
des |
Have sbuf_bcat() and sbuf_bcpy() take a const void * instead of a const char *, since callers are likely to pass in pointers to all kinds of structs and whatnot.
|
#
125937 |
|
17-Feb-2004 |
des |
Mechanical whistespace cleanup.
|
#
116182 |
|
10-Jun-2003 |
obrien |
Use __FBSDID().
|
#
115311 |
|
25-May-2003 |
peter |
Copy the va_list in sbuf_vprintf() before passing it to vsnprintf(), because we could fail due to a small buffer and loop and rerun. If this happens, then the vsnprintf() will have already taken the arguments off the va_list. For i386 and others, this doesn't matter because the va_list type is a passed as a copy. But on powerpc and amd64, this is fatal because the va_list is a reference to an external structure that keeps the vararg state due to the more complicated argument passing system. On amd64, arguments can be passed as follows: First 6 int/pointer type arguments go in registers, the rest go on the memory stack. Float and double are similar, except using SSE registers. long double (80 bit precision) are similar except using the x87 stack. Where the 'next argument' comes from depends on how many have been processed so far and what type it is. For amd64, gcc keeps this state somewhere that is referenced by the va_list.
I found a description that showed the va_copy was required here: http://mirrors.ccs.neu.edu/cgi-bin/unixhelp/man-cgi?va_end+9 The single unix spec doesn't mention va_copy() at all.
Anyway, the problem was that the sysctl kern.geom.conf* nodes would panic due to walking off the end of the va_arg lists in vsnprintf. A better fix would be to have sbuf_vprintf() use a single pass and call kvprintf() with a callback function that stored the results and grew the buffer as needed.
Approved by: re (scottl)
|
#
111119 |
|
19-Feb-2003 |
imp |
Back out M_* changes, per decision of the TRB.
Approved by: trb
|
#
109623 |
|
21-Jan-2003 |
alfred |
Remove M_TRYWAIT/M_WAITOK/M_WAIT. Callers should use 0. Merge M_NOWAIT/M_DONTWAIT into a single flag M_NOWAIT.
|
#
104449 |
|
04-Oct-2002 |
phk |
Add the new function "sbuf_done()" which returns non-zero if the sbuf is finished.
This allows sbufs to be used for request/response scenarioes without needing additional communication flags.
Sponsored by: DARPA & NAI Labs.
|
#
103404 |
|
16-Sep-2002 |
phk |
Add a cast to make this file compile in userland on sparc64 without warnings.
|
#
92664 |
|
19-Mar-2002 |
peter |
Fix warnings on gcc-3.1+ where __func__ is a const char * instead of a string.
|
#
89765 |
|
24-Jan-2002 |
phk |
Yet a bug with extensible sbufs being marked as OVERFLOWED. This time because of a signed/unsigned problem.
Approved by: DES
|
#
89646 |
|
22-Jan-2002 |
phk |
In certain cases sbuf_printf() and sbuf_vprintf() could mistakely make extendable sbufs as overflowed.
Approved by: des
|
#
89121 |
|
09-Jan-2002 |
kbyanc |
Replace spaces after #defines with tabs; this makes all #defines consistent in their adherence with style(9).
|
#
88950 |
|
06-Jan-2002 |
kbyanc |
* Implement SBUF_AUTOEXTEND flag; sbufs created with this flag are automatically extended to prevent overflow. * Added sbuf_vprintf(); sbuf_printf() is now just a wrapper around sbuf_vprintf(). * Include <stdio.h> and <string.h> when building libsbuf to silence WARNS=4 warnings.
Reviewed by: des
|
#
88219 |
|
19-Dec-2001 |
dillon |
Calculate whether the sbuf is dynamic *before* bzero()ing the structure. This fixes a serious memory leak in the sbuf code.
MFC after: 3 days
|
#
87594 |
|
10-Dec-2001 |
obrien |
Update to C99, s/__FUNCTION__/__func__/.
|
#
84097 |
|
28-Sep-2001 |
des |
Add a couple of API functions I need for my pseudofs WIP. Documentation will follow when I've decided whether to keep this API or ditch it in favor of something slightly more subtle.
|
#
79162 |
|
03-Jul-2001 |
des |
Constify the format string.
Submitted by: Mike Barcroft <mike@q9media.com>
|
#
78340 |
|
16-Jun-2001 |
jlemon |
Fix warnings: 112: warning: cast to pointer from integer of different size 125: warning: cast to pointer from integer of different size
|
#
78095 |
|
11-Jun-2001 |
des |
Blah, I cut out a tad too much in the previous commit. (thanks again, Jake!)
|
#
78092 |
|
11-Jun-2001 |
des |
copyin(9) doesn't return ENAMETOOLONG. (thanks, Jake!)
|
#
78077 |
|
11-Jun-2001 |
des |
Add sbuf_copyin(). Also add 'b' variants of sbuf_{cat,copyin,cpy}() which ignore NUL bytes in the source string.
|
#
77989 |
|
10-Jun-2001 |
des |
sbuf_new(9) now returns a struct sbuf * instead of an int. If the caller does not provide a struct sbuf, sbuf_new(9) will allocate one and return a pointer to it.
|
#
74840 |
|
27-Mar-2001 |
ken |
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
|
#
73891 |
|
06-Mar-2001 |
des |
Make the KASSERTs report the correct function names. Fix two off-by-one errors that would sometimes cause the final length of the sbuf to include the trailing zero.
|
#
71724 |
|
27-Jan-2001 |
des |
Remove an assertion I forgot to remove in the previous commit: sbuf_len() may now be called with an unfinished sbuf. For consistency, copy the related comment from sbuf_delete() to sbuf_clear() and sbuf_len().
|
#
71721 |
|
27-Jan-2001 |
des |
Add sbuf_clear() and sbuf_overflowed(). Move the helper macros from sbuf.h to sbuf.c Use ints instead of size_ts. Relax the requirements for sbuf_finish(): it is now possible to finish an overflowed buffer. Make sbuf_len() return -1 instead of 0 if the sbuf overflowed.
Requested by: gibbs
|
#
69990 |
|
13-Dec-2000 |
des |
String buffer API
|