Page MenuHomeFreeBSD
Files F147444663

D6911.diff
No OneTemporary
Actions

D6911.diff
View Options

Index: head/sys/dev/cxgbe/tom/t4_ddp.c
===================================================================
--- head/sys/dev/cxgbe/tom/t4_ddp.c
+++ head/sys/dev/cxgbe/tom/t4_ddp.c
@@ -360,6 +360,8 @@
placed = n;
if (placed > job->uaiocb.aio_nbytes - copied)
placed = job->uaiocb.aio_nbytes - copied;
+ if (placed > 0)
+ job->msgrcv = 1;
if (!aio_clear_cancel_function(job)) {
/*
* Update the copied length for when
@@ -602,6 +604,7 @@
toep->rx_credits += len;
#endif
+ job->msgrcv = 1;
if (db->cancel_pending) {
/*
* Update the job's length but defer completion to the
@@ -756,6 +759,8 @@
placed = len;
if (placed > job->uaiocb.aio_nbytes - copied)
placed = job->uaiocb.aio_nbytes - copied;
+ if (placed > 0)
+ job->msgrcv = 1;
if (!aio_clear_cancel_function(job)) {
/*
* Update the copied length for when
@@ -1458,6 +1463,7 @@
if (copied != 0) {
sbdrop_locked(sb, copied);
job->aio_received += copied;
+ job->msgrcv = 1;
copied = job->aio_received;
inp = sotoinpcb(so);
if (!INP_TRY_WLOCK(inp)) {
Index: head/sys/kern/sys_socket.c
===================================================================
--- head/sys/kern/sys_socket.c
+++ head/sys/kern/sys_socket.c
@@ -563,6 +563,7 @@
struct uio uio;
struct iovec iov;
size_t cnt, done;
+ long ru_before;
int error, flags;
SOCKBUF_UNLOCK(sb);
@@ -585,23 +586,33 @@
uio.uio_td = td;
flags = MSG_NBIO;
- /* TODO: Charge ru_msg* to job. */
+ /*
+ * For resource usage accounting, only count a completed request
+ * as a single message to avoid counting multiple calls to
+ * sosend/soreceive on a blocking socket.
+ */
if (sb == &so->so_rcv) {
uio.uio_rw = UIO_READ;
+ ru_before = td->td_ru.ru_msgrcv;
#ifdef MAC
error = mac_socket_check_receive(fp->f_cred, so);
if (error == 0)
#endif
error = soreceive(so, NULL, &uio, NULL, NULL, &flags);
+ if (td->td_ru.ru_msgrcv != ru_before)
+ job->msgrcv = 1;
} else {
uio.uio_rw = UIO_WRITE;
+ ru_before = td->td_ru.ru_msgsnd;
#ifdef MAC
error = mac_socket_check_send(fp->f_cred, so);
if (error == 0)
#endif
error = sosend(so, NULL, &uio, NULL, NULL, flags, td);
+ if (td->td_ru.ru_msgsnd != ru_before)
+ job->msgsnd = 1;
if (error == EPIPE && (so->so_options & SO_NOSIGPIPE) == 0) {
PROC_LOCK(job->userproc);
kern_psignal(job->userproc, SIGPIPE);
Index: head/sys/kern/vfs_aio.c
===================================================================
--- head/sys/kern/vfs_aio.c
+++ head/sys/kern/vfs_aio.c
@@ -743,9 +743,11 @@
struct uio auio;
struct iovec aiov;
ssize_t cnt;
+ long msgsnd_st, msgsnd_end;
+ long msgrcv_st, msgrcv_end;
+ long oublock_st, oublock_end;
+ long inblock_st, inblock_end;
int error;
- int oublock_st, oublock_end;
- int inblock_st, inblock_end;
KASSERT(job->uaiocb.aio_lio_opcode == LIO_READ ||
job->uaiocb.aio_lio_opcode == LIO_WRITE,
@@ -769,8 +771,11 @@
auio.uio_segflg = UIO_USERSPACE;
auio.uio_td = td;
+ msgrcv_st = td->td_ru.ru_msgrcv;
+ msgsnd_st = td->td_ru.ru_msgsnd;
inblock_st = td->td_ru.ru_inblock;
oublock_st = td->td_ru.ru_oublock;
+
/*
* aio_aqueue() acquires a reference to the file that is
* released in aio_free_entry().
@@ -787,11 +792,15 @@
auio.uio_rw = UIO_WRITE;
error = fo_write(fp, &auio, fp->f_cred, FOF_OFFSET, td);
}
+ msgrcv_end = td->td_ru.ru_msgrcv;
+ msgsnd_end = td->td_ru.ru_msgsnd;
inblock_end = td->td_ru.ru_inblock;
oublock_end = td->td_ru.ru_oublock;
- job->inputcharge = inblock_end - inblock_st;
- job->outputcharge = oublock_end - oublock_st;
+ job->msgrcv = msgrcv_end - msgrcv_st;
+ job->msgsnd = msgsnd_end - msgsnd_st;
+ job->inblock = inblock_end - inblock_st;
+ job->outblock = oublock_end - oublock_st;
if ((error) && (auio.uio_resid != cnt)) {
if (error == ERESTART || error == EINTR || error == EWOULDBLOCK)
@@ -1805,13 +1814,10 @@
status = job->uaiocb._aiocb_private.status;
error = job->uaiocb._aiocb_private.error;
td->td_retval[0] = status;
- if (job->uaiocb.aio_lio_opcode == LIO_WRITE) {
- td->td_ru.ru_oublock += job->outputcharge;
- job->outputcharge = 0;
- } else if (job->uaiocb.aio_lio_opcode == LIO_READ) {
- td->td_ru.ru_inblock += job->inputcharge;
- job->inputcharge = 0;
- }
+ td->td_ru.ru_oublock += job->outblock;
+ td->td_ru.ru_inblock += job->inblock;
+ td->td_ru.ru_msgsnd += job->msgsnd;
+ td->td_ru.ru_msgrcv += job->msgrcv;
aio_free_entry(job);
AIO_UNLOCK(ki);
ops->store_error(ujob, error);
@@ -2327,9 +2333,9 @@
error = bp->bio_error;
nblks = btodb(nbytes);
if (job->uaiocb.aio_lio_opcode == LIO_WRITE)
- job->outputcharge += nblks;
+ job->outblock += nblks;
else
- job->inputcharge += nblks;
+ job->inblock += nblks;
if (error)
aio_complete(job, -1, error);
@@ -2395,13 +2401,10 @@
status = job->uaiocb._aiocb_private.status;
error = job->uaiocb._aiocb_private.error;
td->td_retval[0] = status;
- if (job->uaiocb.aio_lio_opcode == LIO_WRITE) {
- td->td_ru.ru_oublock += job->outputcharge;
- job->outputcharge = 0;
- } else if (job->uaiocb.aio_lio_opcode == LIO_READ) {
- td->td_ru.ru_inblock += job->inputcharge;
- job->inputcharge = 0;
- }
+ td->td_ru.ru_oublock += job->outblock;
+ td->td_ru.ru_inblock += job->inblock;
+ td->td_ru.ru_msgsnd += job->msgsnd;
+ td->td_ru.ru_msgrcv += job->msgrcv;
aio_free_entry(job);
AIO_UNLOCK(ki);
ops->store_aiocb(ujobp, ujob);
Index: head/sys/sys/aio.h
===================================================================
--- head/sys/sys/aio.h
+++ head/sys/sys/aio.h
@@ -119,8 +119,10 @@
TAILQ_ENTRY(kaiocb) plist; /* (a) lists of pending / done jobs */
TAILQ_ENTRY(kaiocb) allist; /* (a) list of all jobs in proc */
int jobflags; /* (a) job flags */
- int inputcharge; /* (*) input blocks */
- int outputcharge; /* (*) output blocks */
+ int inblock; /* (*) input blocks */
+ int outblock; /* (*) output blocks */
+ int msgsnd; /* (*) messages sent */
+ int msgrcv; /* (*) messages received */
struct proc *userproc; /* (*) user process */
struct ucred *cred; /* (*) active credential when created */
struct file *fd_file; /* (*) pointer to file structure */
Index: head/tests/sys/aio/aio_test.c
===================================================================
--- head/tests/sys/aio/aio_test.c
+++ head/tests/sys/aio/aio_test.c
@@ -40,6 +40,7 @@
#include <sys/param.h>
#include <sys/module.h>
+#include <sys/resource.h>
#include <sys/socket.h>
#include <sys/stat.h>
#include <sys/mdioctl.h>
@@ -455,6 +456,7 @@
{
struct aio_unix_socketpair_arg arg;
struct aio_context ac;
+ struct rusage ru_before, ru_after;
int sockets[2];
ATF_REQUIRE_KERNEL_MODULE("aio");
@@ -467,8 +469,17 @@
aio_context_init(&ac, sockets[0],
sockets[1], UNIX_SOCKETPAIR_LEN, UNIX_SOCKETPAIR_TIMEOUT,
aio_unix_socketpair_cleanup, &arg);
+ ATF_REQUIRE_MSG(getrusage(RUSAGE_SELF, &ru_before) != -1,
+ "getrusage failed: %s", strerror(errno));
aio_write_test(&ac);
+ ATF_REQUIRE_MSG(getrusage(RUSAGE_SELF, &ru_after) != -1,
+ "getrusage failed: %s", strerror(errno));
+ ATF_REQUIRE(ru_after.ru_msgsnd == ru_before.ru_msgsnd + 1);
+ ru_before = ru_after;
aio_read_test(&ac);
+ ATF_REQUIRE_MSG(getrusage(RUSAGE_SELF, &ru_after) != -1,
+ "getrusage failed: %s", strerror(errno));
+ ATF_REQUIRE(ru_after.ru_msgrcv == ru_before.ru_msgrcv + 1);
aio_unix_socketpair_cleanup(&arg);
}

File Metadata

Mime Type
text/plain
Expires
Thu, Mar 12, 1:58 AM (9 h, 16 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29560167
Default Alt Text
D6911.diff (7 KB)

Event Timeline