svc_release_skb(rqstp);
+ svc_free_allpages(rqstp);
+ rqstp->rq_res.page_len = 0;
+ rqstp->rq_res.page_base = 0;
+
+
/* Reset response buffer and release
* the reservation.
* But first, check that enough space was reserved
* Generic sendto routine
*/
static int
-svc_sendto(struct svc_rqst *rqstp, struct iovec *iov, int nr)
+svc_sendto(struct svc_rqst *rqstp, struct xdr_buf *xdr)
{
mm_segment_t oldfs;
struct svc_sock *svsk = rqstp->rq_sock;
struct socket *sock = svsk->sk_sock;
struct msghdr msg;
- int i, buflen, len;
+ int slen;
+ int len = 0;
+ int result;
+ int size;
+ struct page **ppage = xdr->pages;
+ size_t base = xdr->page_base;
+ unsigned int pglen = xdr->page_len;
+ unsigned int flags = MSG_MORE;
- for (i = buflen = 0; i < nr; i++)
- buflen += iov[i].iov_len;
+ slen = xdr->len;
msg.msg_name = &rqstp->rq_addr;
msg.msg_namelen = sizeof(rqstp->rq_addr);
- msg.msg_iov = iov;
- msg.msg_iovlen = nr;
+ msg.msg_iov = NULL;
+ msg.msg_iovlen = 0;
msg.msg_control = NULL;
msg.msg_controllen = 0;
+ msg.msg_flags = MSG_MORE;
- /* This was MSG_DONTWAIT, but I now want it to wait.
- * The only thing that it would wait for is memory and
- * if we are fairly low on memory, then we aren't likely
- * to make much progress anyway.
- * sk->sndtimeo is set to 30seconds just in case.
- */
- msg.msg_flags = 0;
+ /* Grab svsk->sk_sem to serialize outgoing data. */
+ down(&svsk->sk_sem);
+ /* set the destination */
oldfs = get_fs(); set_fs(KERNEL_DS);
- len = sock_sendmsg(sock, &msg, buflen);
+ len = sock_sendmsg(sock, &msg, 0);
set_fs(oldfs);
+ if (len < 0)
+ goto out;
+
+ /* send head */
+ if (slen == xdr->head[0].iov_len)
+ flags = 0;
+ len = sock->ops->sendpage(sock, rqstp->rq_respages[0], 0, xdr->head[0].iov_len, flags);
+ if (len != xdr->head[0].iov_len)
+ goto out;
+ slen -= xdr->head[0].iov_len;
+ if (slen == 0)
+ goto out;
+
+ /* send page data */
+ size = PAGE_SIZE - base < pglen ? PAGE_SIZE - base : pglen;
+ while (pglen > 0) {
+ if (slen == size)
+ flags = 0;
+ result = sock->ops->sendpage(sock, *ppage, base, size, flags);
+ if (result > 0)
+ len += result;
+ if (result != size)
+ goto out;
+ slen -= size;
+ pglen -= size;
+ size = PAGE_SIZE < pglen ? PAGE_SIZE : pglen;
+ base = 0;
+ ppage++;
+ }
+ /* send tail */
+ if (xdr->tail[0].iov_len) {
+ /* The tail *will* be in respages[0]; */
+ result = sock->ops->sendpage(sock, rqstp->rq_respages[0],
+ ((unsigned long)xdr->tail[0].iov_base)& (PAGE_SIZE-1),
+ xdr->tail[0].iov_len, 0);
+
+ if (result > 0)
+ len += result;
+ }
+out:
+ up(&svsk->sk_sem);
- dprintk("svc: socket %p sendto([%p %Zu... ], %d, %d) = %d (addr %x)\n",
- rqstp->rq_sock, iov[0].iov_base, iov[0].iov_len, nr, buflen, len,
+ dprintk("svc: socket %p sendto([%p %Zu... ], %d) = %d (addr %x)\n",
+ rqstp->rq_sock, xdr->head[0].iov_base, xdr->head[0].iov_len, xdr->len, len,
rqstp->rq_addr.sin_addr.s_addr);
return len;
svc_udp_sendto(struct svc_rqst *rqstp)
{
int error;
- struct iovec vec[RPCSVC_MAXPAGES];
- int v;
- int base, len;
- /* Set up the first element of the reply iovec.
- * Any other iovecs that may be in use have been taken
- * care of by the server implementation itself.
- */
- vec[0] = rqstp->rq_res.head[0];
- v=1;
- base=rqstp->rq_res.page_base;
- len = rqstp->rq_res.page_len;
- while (len) {
- vec[v].iov_base = page_address(rqstp->rq_res.pages[v-1]) + base;
- vec[v].iov_len = PAGE_SIZE-base;
- if (len <= vec[v].iov_len)
- vec[v].iov_len = len;
- len -= vec[v].iov_len;
- base = 0;
- v++;
- }
- if (rqstp->rq_res.tail[0].iov_len) {
- vec[v] = rqstp->rq_res.tail[0];
- v++;
- }
- error = svc_sendto(rqstp, vec, v);
+ error = svc_sendto(rqstp, &rqstp->rq_res);
if (error == -ECONNREFUSED)
/* ICMP error on earlier request. */
- error = svc_sendto(rqstp, vec, v);
+ error = svc_sendto(rqstp, &rqstp->rq_res);
return error;
}
svc_tcp_sendto(struct svc_rqst *rqstp)
{
struct xdr_buf *xbufp = &rqstp->rq_res;
- struct iovec vec[RPCSVC_MAXPAGES];
- int v;
- int base, len;
int sent;
u32 reclen;
reclen = htonl(0x80000000|((xbufp->len ) - 4));
memcpy(xbufp->head[0].iov_base, &reclen, 4);
- vec[0] = rqstp->rq_res.head[0];
- v=1;
- base= xbufp->page_base;
- len = xbufp->page_len;
- while (len) {
- vec[v].iov_base = page_address(xbufp->pages[v-1]) + base;
- vec[v].iov_len = PAGE_SIZE-base;
- if (len <= vec[v].iov_len)
- vec[v].iov_len = len;
- len -= vec[v].iov_len;
- base = 0;
- v++;
- }
- if (xbufp->tail[0].iov_len) {
- vec[v] = xbufp->tail[0];
- v++;
- }
-
- sent = svc_sendto(rqstp, vec, v);
+ sent = svc_sendto(rqstp, &rqstp->rq_res);
if (sent != xbufp->len) {
printk(KERN_NOTICE "rpc-srv/tcp: %s: %s %d when sending %d bytes - shutting down socket\n",
rqstp->rq_sock->sk_server->sv_name,
/* Initialize the buffers */
/* first reclaim pages that were moved to response list */
- while (rqstp->rq_resused)
- rqstp->rq_argpages[rqstp->rq_arghi++] =
- rqstp->rq_respages[--rqstp->rq_resused];
+ svc_pushback_allpages(rqstp);
+
/* now allocate needed pages. If we get a failure, sleep briefly */
pages = 2 + (serv->sv_bufsz + PAGE_SIZE -1) / PAGE_SIZE;
while (rqstp->rq_arghi < pages) {
svsk->sk_server = serv;
svsk->sk_lastrecv = CURRENT_TIME;
INIT_LIST_HEAD(&svsk->sk_deferred);
+ sema_init(&svsk->sk_sem, 1);
/* Initialize the socket */
if (sock->type == SOCK_DGRAM)
projects / history.git / commitdiff