diff options
| author | John Baldwin <jhb@FreeBSD.org> | 2020-11-25 00:10:54 +0000 |
|---|---|---|
| committer | John Baldwin <jhb@FreeBSD.org> | 2020-11-25 00:10:54 +0000 |
| commit | 688f8b822cea550753e7f3495339141cb6b565b7 (patch) | |
| tree | 3cd4ee29d26786fc5cae6115ca6dd069672d5456 /usr.bin | |
| parent | 908dca3ef4695fe0abf4001ea2b3f73e9247a540 (diff) | |
| download | src-test2-688f8b822cea550753e7f3495339141cb6b565b7.tar.gz src-test2-688f8b822cea550753e7f3495339141cb6b565b7.zip | |
Remove the cloned file descriptors for /dev/crypto.
Crypto file descriptors were added in the original OCF import as a way
to provide per-open data (specifically the list of symmetric
sessions). However, this gives a bit of a confusing API where one has
to open /dev/crypto and then invoke an ioctl to obtain a second file
descriptor. This also does not match the API used with /dev/crypto on
other BSDs or with Linux's /dev/crypto driver.
Character devices have gained support for per-open data via cdevpriv
since OCF was imported, so use cdevpriv to simplify the userland API
by permitting ioctls directly on /dev/crypto descriptors.
To provide backwards compatibility, CRIOGET now opens another
/dev/crypto descriptor via kern_openat() rather than dup'ing the
existing file descriptor. This preserves prior semantics in case
CRIOGET is invoked multiple times on a single file descriptor.
Reviewed by: markj
Relnotes: yes
Sponsored by: Chelsio Communications
Differential Revision: https://reviews.freebsd.org/D27302
Notes
Notes:
svn path=/head/; revision=368005
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/procstat/procstat.1 | 4 | ||||
| -rw-r--r-- | usr.bin/procstat/procstat_files.c | 5 |
2 files changed, 1 insertions, 8 deletions
diff --git a/usr.bin/procstat/procstat.1 b/usr.bin/procstat/procstat.1 index 8f05c730e55a..174f932a9dde 100644 --- a/usr.bin/procstat/procstat.1 +++ b/usr.bin/procstat/procstat.1 @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 5, 2020 +.Dd November 24, 2020 .Dt PROCSTAT 1 .Os .Sh NAME @@ -311,8 +311,6 @@ file path or socket addresses (if available) The following file descriptor types may be displayed: .Pp .Bl -tag -width X -compact -.It c -crypto .It e POSIX semaphore .It f diff --git a/usr.bin/procstat/procstat_files.c b/usr.bin/procstat/procstat_files.c index 660f421c31f1..74c6e48eab01 100644 --- a/usr.bin/procstat/procstat_files.c +++ b/usr.bin/procstat/procstat_files.c @@ -384,11 +384,6 @@ procstat_files(struct procstat *procstat, struct kinfo_proc *kipp) xo_emit("{eq:fd_type/kqueue}"); break; - case PS_FST_TYPE_CRYPTO: - str = "c"; - xo_emit("{eq:fd_type/crypto}"); - break; - case PS_FST_TYPE_MQUEUE: str = "m"; xo_emit("{eq:fd_type/mqueue}"); |