Page MenuHomeFreeBSD
Files F143104150

D54591.id170353.diff
No OneTemporary
Actions

D54591.id170353.diff
View Options

diff --git a/sys/compat/freebsd32/freebsd32.h b/sys/compat/freebsd32/freebsd32.h
--- a/sys/compat/freebsd32/freebsd32.h
+++ b/sys/compat/freebsd32/freebsd32.h
@@ -29,7 +29,10 @@
#ifndef _COMPAT_FREEBSD32_FREEBSD32_H_
#define _COMPAT_FREEBSD32_FREEBSD32_H_
+#include <sys/cdefs.h>
#include <sys/abi_compat.h>
+#include <sys/devicestat.h>
+#include <sys/mount.h>
#include <sys/procfs.h>
#include <sys/socket.h>
#include <sys/user.h>
@@ -540,4 +543,28 @@
uint32_t pscr_args;
};
+struct devstat32 {
+ u_int sequence0;
+ int allocated;
+ u_int start_count;
+ u_int end_count;
+ struct bintime32 busy_from;
+ struct { u_int32_t stqe_next; } dev_links;
+ u_int32_t device_number;
+ char device_name[DEVSTAT_NAME_LEN];
+ int unit_number;
+ freebsd32_uint64_t bytes[DEVSTAT_N_TRANS_FLAGS];
+ freebsd32_uint64_t operations[DEVSTAT_N_TRANS_FLAGS];
+ struct bintime32 duration[DEVSTAT_N_TRANS_FLAGS];
+ struct bintime32 busy_time;
+ struct bintime32 creation_time;
+ u_int32_t block_size;
+ freebsd32_uint64_t tag_types[3];
+ devstat_support_flags flags;
+ devstat_type_flags device_type;
+ devstat_priority priority;
+ u_int32_t id;
+ u_int sequence1;
+};
+
#endif /* !_COMPAT_FREEBSD32_FREEBSD32_H_ */
diff --git a/sys/kern/subr_devstat.c b/sys/kern/subr_devstat.c
--- a/sys/kern/subr_devstat.c
+++ b/sys/kern/subr_devstat.c
@@ -43,6 +43,10 @@
#include <vm/vm.h>
#include <vm/pmap.h>
+#ifdef COMPAT_FREEBSD32
+#include <compat/freebsd32/freebsd32.h>
+#endif
+
#include <machine/atomic.h>
SDT_PROVIDER_DEFINE(io);
@@ -398,25 +402,63 @@
*/
mygen = devstat_generation;
- error = SYSCTL_OUT(req, &mygen, sizeof(mygen));
-
- if (devstat_num_devs == 0)
- return(0);
+#ifdef COMPAT_FREEBSD32
+ if ((req->flags & SCTL_MASK32) != 0) {
+ int32_t mygen32 = (int32_t)mygen;
+ error = SYSCTL_OUT(req, &mygen32, sizeof(mygen32));
+ } else
+#endif /* COMPAT_FREEBSD32 */
+ error = SYSCTL_OUT(req, &mygen, sizeof(mygen));
if (error != 0)
return (error);
+ if (devstat_num_devs == 0)
+ return(0);
+
mtx_lock(&devstat_mutex);
nds = STAILQ_FIRST(&device_statq);
if (mygen != devstat_generation)
error = EBUSY;
mtx_unlock(&devstat_mutex);
-
if (error != 0)
return (error);
while (nds != NULL) {
- error = SYSCTL_OUT(req, nds, sizeof(struct devstat));
+#ifdef COMPAT_FREEBSD32
+ if ((req->flags & SCTL_MASK32) != 0) {
+ struct devstat32 ds32;
+ unsigned int i;
+
+ CP(*nds, ds32, sequence0);
+ CP(*nds, ds32, allocated);
+ CP(*nds, ds32, start_count);
+ CP(*nds, ds32, end_count);
+ BT_CP(*nds, ds32, busy_from);
+ PTROUT_CP(*nds, ds32, dev_links.stqe_next);
+ CP(*nds, ds32, device_number);
+ strcpy(ds32.device_name, nds->device_name);
+ CP(*nds, ds32, unit_number);
+ for (i = 0; i < DEVSTAT_N_TRANS_FLAGS; i++) {
+ FU64_CP(*nds, ds32, bytes[i]);
+ FU64_CP(*nds, ds32, operations[i]);
+ BT_CP(*nds, ds32, duration[i]);
+ }
+ BT_CP(*nds, ds32, busy_time);
+ BT_CP(*nds, ds32, creation_time);
+ CP(*nds, ds32, block_size);
+ for (i = 0; i < nitems(ds32.tag_types); i++) {
+ FU64_CP(*nds, ds32, tag_types[i]);
+ }
+ CP(*nds, ds32, flags);
+ CP(*nds, ds32, device_type);
+ CP(*nds, ds32, priority);
+ PTROUT_CP(*nds, ds32, id);
+ CP(*nds, ds32, sequence1);
+ error = SYSCTL_OUT(req, &ds32, sizeof(ds32));
+ } else
+#endif /* COMPAT_FREEBSD32 */
+ error = SYSCTL_OUT(req, nds, sizeof(*nds));
if (error != 0)
return (error);
mtx_lock(&devstat_mutex);
@@ -428,7 +470,7 @@
if (error != 0)
return (error);
}
- return(error);
+ return (error);
}
/*

File Metadata

Mime Type
text/plain
Expires
Tue, Jan 27, 12:58 AM (11 h, 46 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28047506
Default Alt Text
D54591.id170353.diff (3 KB)

Event Timeline