MCLALLOC must be called at splimp

[unix-history] / usr / src / sys / kern / uipc_usrreq.c

diff --git a/usr/src/sys/kern/uipc_usrreq.c b/usr/src/sys/kern/uipc_usrreq.c
index 8a32aaf..a0ac7f1 100644 (file)
--- a/usr/src/sys/kern/uipc_usrreq.c
+++ b/usr/src/sys/kern/uipc_usrreq.c
@@ -1,9 +1,9 @@
 /*
 /*

- * Copyright (c) 1982 Regents of the University of California.
+ * Copyright (c) 1982, 1986 Regents of the University of California.

  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *

- *     @(#)uipc_usrreq.c       6.16 (Berkeley) %G%
+ *     @(#)uipc_usrreq.c       7.1 (Berkeley) %G%

  */
 
 #include "param.h"
  */
 
 #include "param.h"


@@ -29,7 +29,7 @@
  *     need a proper out-of-band
  */
 struct sockaddr sun_noname = { AF_UNIX };
  *     need a proper out-of-band
  */
 struct sockaddr sun_noname = { AF_UNIX };

-ino_t  unp_ino;                                /* fake inode numbers */
+ino_t  unp_ino;                        /* prototype for fake inode numbers */

 
 /*ARGSUSED*/
 uipc_usrreq(so, req, m, nam, rights)
 
 /*ARGSUSED*/
 uipc_usrreq(so, req, m, nam, rights)


@@ -41,6 +41,8 @@ uipc_usrreq(so, req, m, nam, rights)
        register struct socket *so2;
        int error = 0;
 
        register struct socket *so2;
        int error = 0;
 

+       if (req == PRU_CONTROL)
+               return (EOPNOTSUPP);

        if (req != PRU_SEND && rights && rights->m_len) {
                error = EOPNOTSUPP;
                goto release;
        if (req != PRU_SEND && rights && rights->m_len) {
                error = EOPNOTSUPP;
                goto release;


@@ -77,8 +79,7 @@ uipc_usrreq(so, req, m, nam, rights)
                break;
 
        case PRU_CONNECT2:
                break;
 
        case PRU_CONNECT2:

-               error = unp_connect2(so, (struct mbuf *)0,
-                   (struct socket *)nam);
+               error = unp_connect2(so, (struct socket *)nam);

                break;
 
        case PRU_DISCONNECT:
                break;
 
        case PRU_DISCONNECT:


@@ -86,9 +87,19 @@ uipc_usrreq(so, req, m, nam, rights)
                break;
 
        case PRU_ACCEPT:
                break;
 
        case PRU_ACCEPT:

-               nam->m_len = unp->unp_remaddr->m_len;
-               bcopy(mtod(unp->unp_remaddr, caddr_t),
-                   mtod(nam, caddr_t), (unsigned)nam->m_len);
+               /*
+                * Pass back name of connected socket,
+                * if it was bound and we are still connected
+                * (our peer may have closed already!).
+                */
+               if (unp->unp_conn && unp->unp_conn->unp_addr) {
+                       nam->m_len = unp->unp_conn->unp_addr->m_len;
+                       bcopy(mtod(unp->unp_conn->unp_addr, caddr_t),
+                           mtod(nam, caddr_t), (unsigned)nam->m_len);
+               } else {
+                       nam->m_len = sizeof(sun_noname);
+                       *(mtod(nam, struct sockaddr *)) = sun_noname;
+               }

                break;
 
        case PRU_SHUTDOWN:
                break;
 
        case PRU_SHUTDOWN:


@@ -110,13 +121,13 @@ uipc_usrreq(so, req, m, nam, rights)
                                break;
                        so2 = unp->unp_conn->unp_socket;
                        /*
                                break;
                        so2 = unp->unp_conn->unp_socket;
                        /*

-                        * Transfer resources back to send port
+                        * Adjust backpressure on sender

                         * and wakeup any waiting to write.
                         */
                         * and wakeup any waiting to write.
                         */

-                       snd->sb_mbmax += rcv->sb_mbmax - rcv->sb_mbcnt;
-                       rcv->sb_mbmax = rcv->sb_mbcnt;
-                       snd->sb_hiwat += rcv->sb_hiwat - rcv->sb_cc;
-                       rcv->sb_hiwat = rcv->sb_cc;
+                       snd->sb_mbmax += unp->unp_mbcnt - rcv->sb_mbcnt;
+                       unp->unp_mbcnt = rcv->sb_mbcnt;
+                       snd->sb_hiwat += unp->unp_cc - rcv->sb_cc;
+                       unp->unp_cc = rcv->sb_cc;

                        sowwakeup(so2);
 #undef snd
 #undef rcv
                        sowwakeup(so2);
 #undef snd
 #undef rcv


@@ -128,9 +139,16 @@ uipc_usrreq(so, req, m, nam, rights)
                break;
 
        case PRU_SEND:
                break;
 
        case PRU_SEND:

+               if (rights) {
+                       error = unp_internalize(rights);
+                       if (error)
+                               break;
+               }

                switch (so->so_type) {
 
                switch (so->so_type) {
 

-               case SOCK_DGRAM:
+               case SOCK_DGRAM: {
+                       struct sockaddr *from;
+

                        if (nam) {
                                if (unp->unp_conn) {
                                        error = EISCONN;
                        if (nam) {
                                if (unp->unp_conn) {
                                        error = EISCONN;


@@ -146,36 +164,24 @@ uipc_usrreq(so, req, m, nam, rights)
                                }
                        }
                        so2 = unp->unp_conn->unp_socket;
                                }
                        }
                        so2 = unp->unp_conn->unp_socket;

-                       /* BEGIN XXX */
-                       if (rights) {
-                               error = unp_internalize(rights);
-                               if (error)
-                                       break;
-                       }
-                       if (sbspace(&so2->so_rcv) > 0) {
-                               /*
-                                * There's no record of source socket's
-                                * name, so send null name for the moment.
-                                */
-                               if (sbappendaddr(&so2->so_rcv,
-                                   &sun_noname, m, rights)) {
-                                       sorwakeup(so2);
-                                       m = 0;
-                               } else
-                                       error = ENOBUFS;
-                       }
-                       /* END XXX */
+                       if (unp->unp_addr)
+                               from = mtod(unp->unp_addr, struct sockaddr *);
+                       else
+                               from = &sun_noname;
+                       if (sbspace(&so2->so_rcv) > 0 &&
+                           sbappendaddr(&so2->so_rcv, from, m, rights)) {
+                               sorwakeup(so2);
+                               m = 0;
+                       } else
+                               error = ENOBUFS;

                        if (nam)
                                unp_disconnect(unp);
                        break;
                        if (nam)
                                unp_disconnect(unp);
                        break;

+               }

 
                case SOCK_STREAM:
 #define        rcv (&so2->so_rcv)
 #define        snd (&so->so_snd)
 
                case SOCK_STREAM:
 #define        rcv (&so2->so_rcv)
 #define        snd (&so->so_snd)

-                       if (rights && rights->m_len) {
-                               error = EOPNOTSUPP;
-                               break;
-                       }

                        if (so->so_state & SS_CANTSENDMORE) {
                                error = EPIPE;
                                break;
                        if (so->so_state & SS_CANTSENDMORE) {
                                error = EPIPE;
                                break;


@@ -184,15 +190,19 @@ uipc_usrreq(so, req, m, nam, rights)
                                panic("uipc 3");
                        so2 = unp->unp_conn->unp_socket;
                        /*
                                panic("uipc 3");
                        so2 = unp->unp_conn->unp_socket;
                        /*

-                        * Send to paired receive port, and then
-                        * give it enough resources to hold what it already has.
+                        * Send to paired receive port, and then reduce
+                        * send buffer hiwater marks to maintain backpressure.

                         * Wake up readers.
                         */
                         * Wake up readers.
                         */

-                       sbappend(rcv, m);
-                       snd->sb_mbmax -= rcv->sb_mbcnt - rcv->sb_mbmax;
-                       rcv->sb_mbmax = rcv->sb_mbcnt;
-                       snd->sb_hiwat -= rcv->sb_cc - rcv->sb_hiwat;
-                       rcv->sb_hiwat = rcv->sb_cc;
+                       if (rights)
+                               (void)sbappendrights(rcv, m, rights);
+                       else
+                               sbappend(rcv, m);
+                       snd->sb_mbmax -=
+                           rcv->sb_mbcnt - unp->unp_conn->unp_mbcnt;
+                       unp->unp_conn->unp_mbcnt = rcv->sb_mbcnt;
+                       snd->sb_hiwat -= rcv->sb_cc - unp->unp_conn->unp_cc;
+                       unp->unp_conn->unp_cc = rcv->sb_cc;

                        sorwakeup(so2);
                        m = 0;
 #undef snd
                        sorwakeup(so2);
                        m = 0;
 #undef snd


@@ -208,11 +218,6 @@ uipc_usrreq(so, req, m, nam, rights)
                unp_drop(unp, ECONNABORTED);
                break;
 
                unp_drop(unp, ECONNABORTED);
                break;
 

-/* SOME AS YET UNIMPLEMENTED HOOKS */
-       case PRU_CONTROL:
-               return (EOPNOTSUPP);
-
-/* END UNIMPLEMENTED HOOKS */

        case PRU_SENSE:
                ((struct stat *) m)->st_blksize = so->so_snd.sb_hiwat;
                if (so->so_type == SOCK_STREAM && unp->unp_conn != 0) {
        case PRU_SENSE:
                ((struct stat *) m)->st_blksize = so->so_snd.sb_hiwat;
                if (so->so_type == SOCK_STREAM && unp->unp_conn != 0) {


@@ -220,7 +225,9 @@ uipc_usrreq(so, req, m, nam, rights)
                        ((struct stat *) m)->st_blksize += so2->so_rcv.sb_cc;
                }
                ((struct stat *) m)->st_dev = NODEV;
                        ((struct stat *) m)->st_blksize += so2->so_rcv.sb_cc;
                }
                ((struct stat *) m)->st_dev = NODEV;

-               ((struct stat *) m)->st_ino = unp_ino++;
+               if (unp->unp_ino == 0)
+                       unp->unp_ino = unp_ino++;
+               ((struct stat *) m)->st_ino = unp->unp_ino;

                return (0);
 
        case PRU_RCVOOB:
                return (0);
 
        case PRU_RCVOOB:


@@ -234,6 +241,11 @@ uipc_usrreq(so, req, m, nam, rights)
                break;
 
        case PRU_PEERADDR:
                break;
 
        case PRU_PEERADDR:

+               if (unp->unp_conn && unp->unp_conn->unp_addr) {
+                       nam->m_len = unp->unp_conn->unp_addr->m_len;
+                       bcopy(mtod(unp->unp_conn->unp_addr, caddr_t),
+                           mtod(m, caddr_t), (unsigned)m->m_len);
+               }

                break;
 
        case PRU_SLOWTIMO:
                break;
 
        case PRU_SLOWTIMO:


@@ -249,18 +261,21 @@ release:
 }
 
 /*
 }
 
 /*

- * We assign all buffering for stream sockets to the source,
- * as that is where the flow control is implemented.
+ * Both send and receive buffers are allocated PIPSIZ bytes of buffering
+ * for stream sockets, although the total for sender and receiver is
+ * actually only PIPSIZ.

  * Datagram sockets really use the sendspace as the maximum datagram size,
  * and don't really want to reserve the sendspace.  Their recvspace should
  * be large enough for at least one max-size datagram plus address.
  */
 #define        PIPSIZ  4096
 int    unpst_sendspace = PIPSIZ;
  * Datagram sockets really use the sendspace as the maximum datagram size,
  * and don't really want to reserve the sendspace.  Their recvspace should
  * be large enough for at least one max-size datagram plus address.
  */
 #define        PIPSIZ  4096
 int    unpst_sendspace = PIPSIZ;

-int    unpst_recvspace = 0;
+int    unpst_recvspace = PIPSIZ;

 int    unpdg_sendspace = 2*1024;       /* really max datagram size */
 int    unpdg_recvspace = 4*1024;
 
 int    unpdg_sendspace = 2*1024;       /* really max datagram size */
 int    unpdg_recvspace = 4*1024;
 

+int    unp_rights;                     /* file descriptors in flight */
+

 unp_attach(so)
        struct socket *so;
 {
 unp_attach(so)
        struct socket *so;
 {


@@ -304,8 +319,10 @@ unp_detach(unp)
                unp_drop(unp->unp_refs, ECONNRESET);
        soisdisconnected(unp->unp_socket);
        unp->unp_socket->so_pcb = 0;
                unp_drop(unp->unp_refs, ECONNRESET);
        soisdisconnected(unp->unp_socket);
        unp->unp_socket->so_pcb = 0;

-       m_freem(unp->unp_remaddr);
+       m_freem(unp->unp_addr);

        (void) m_free(dtom(unp));
        (void) m_free(dtom(unp));

+       if (unp_rights)
+               unp_gc();

 }
 
 unp_bind(unp, nam)
 }
 
 unp_bind(unp, nam)


@@ -341,6 +358,7 @@ unp_bind(unp, nam)
        }
        ip->i_socket = unp->unp_socket;
        unp->unp_inode = ip;
        }
        ip->i_socket = unp->unp_socket;
        unp->unp_inode = ip;

+       unp->unp_addr = m_copy(nam, 0, (int)M_COPYALL);

        iunlock(ip);                    /* but keep reference */
        return (0);
 }
        iunlock(ip);                    /* but keep reference */
        return (0);
 }


@@ -391,15 +409,14 @@ unp_connect(so, nam)
                error = ECONNREFUSED;
                goto bad;
        }
                error = ECONNREFUSED;
                goto bad;
        }

-       error = unp_connect2(so, nam, so2);
+       error = unp_connect2(so, so2);

 bad:
        iput(ip);
        return (error);
 }
 
 bad:
        iput(ip);
        return (error);
 }
 

-unp_connect2(so, sonam, so2)
+unp_connect2(so, so2)

        register struct socket *so;
        register struct socket *so;

-       struct mbuf *sonam;

        register struct socket *so2;
 {
        register struct unpcb *unp = sotounpcb(so);
        register struct socket *so2;
 {
        register struct unpcb *unp = sotounpcb(so);


@@ -419,8 +436,6 @@ unp_connect2(so, sonam, so2)
 
        case SOCK_STREAM:
                unp2->unp_conn = unp;
 
        case SOCK_STREAM:
                unp2->unp_conn = unp;

-               if (sonam)
-                       unp2->unp_remaddr = m_copy(sonam, 0, (int)M_COPYALL);

                soisconnected(so2);
                soisconnected(so);
                break;
                soisconnected(so2);
                soisconnected(so);
                break;


@@ -493,7 +508,7 @@ unp_drop(unp, errno)
        unp_disconnect(unp);
        if (so->so_head) {
                so->so_pcb = (caddr_t) 0;
        unp_disconnect(unp);
        if (so->so_head) {
                so->so_pcb = (caddr_t) 0;

-               m_freem(unp->unp_remaddr);
+               m_freem(unp->unp_addr);

                (void) m_free(dtom(unp));
                sofree(so);
        }
                (void) m_free(dtom(unp));
                sofree(so);
        }


@@ -530,6 +545,7 @@ unp_externalize(rights)
                fp = *rp;
                u.u_ofile[f] = fp;
                fp->f_msgcount--;
                fp = *rp;
                u.u_ofile[f] = fp;
                fp->f_msgcount--;

+               unp_rights--;

                *(int *)rp++ = f;
        }
        return (0);
                *(int *)rp++ = f;
        }
        return (0);


@@ -553,6 +569,7 @@ unp_internalize(rights)
                *rp++ = fp;
                fp->f_count++;
                fp->f_msgcount++;
                *rp++ = fp;
                fp->f_count++;
                fp->f_msgcount++;

+               unp_rights++;

        }
        return (0);
 }
        }
        return (0);
 }


@@ -603,11 +620,9 @@ restart:
        for (fp = file; fp < fileNFILE; fp++) {
                if (fp->f_count == 0)
                        continue;
        for (fp = file; fp < fileNFILE; fp++) {
                if (fp->f_count == 0)
                        continue;

-               if (fp->f_count == fp->f_msgcount && (fp->f_flag&FMARK)==0) {
-                       if (fp->f_type != DTYPE_SOCKET)
-                               panic("unp_gc");
-                       (void) soshutdown((struct socket *)fp->f_data, 0);
-               }
+               if (fp->f_count == fp->f_msgcount && (fp->f_flag & FMARK) == 0)
+                       while (fp->f_msgcount)
+                               unp_discard(fp);

        }
        unp_gcing = 0;
 }
        }
        unp_gcing = 0;
 }


@@ -658,5 +673,6 @@ unp_discard(fp)
 {
 
        fp->f_msgcount--;
 {
 
        fp->f_msgcount--;

+       unp_rights--;

        closef(fp);
 }
        closef(fp);
 }