af_iucv: New socket option for setting IUCV MSGLIMITs

The SO_MSGLIMIT socket option modifies the message limit for new
IUCV communication paths.

The message limit specifies the maximum number of outstanding messages
that are allowed for connections. This setting can be lowered by z/VM
when an IUCV connection is established.

Expects an integer value in the range of 1 to 65535.
The default value is 65535.

The message limit must be set before calling connect() or listen()
for sockets.

If sockets are already connected or in state listen, changing the message
limit is not supported.
For reading the message limit value, unconnected sockets return the limit
that has been set or the default limit. For connected sockets, the actual
message limit is returned. The actual message limit is assigned by z/VM
for each connection and it depends on IUCV MSGLIMIT authorizations
specified for the z/VM guest virtual machine.

Signed-off-by: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
Signed-off-by: Ursula Braun <ursula.braun@de.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/iucv/af_iucv.h b/include/net/iucv/af_iucv.h
index b57739e49dc1c4dc72724eeb6af2eaab537deac3..21ee49ffcbaf7d9980a52b4dd84cc2ff4f849c6f 100644 (file)
--- a/include/net/iucv/af_iucv.h
+++ b/include/net/iucv/af_iucv.h
@@ -74,10 +74,12 @@ struct iucv_sock {
        struct sock_msg_q       message_q;
        unsigned int            send_tag;
        u8                      flags;
+       u16                     msglimit;
 };
 
 /* iucv socket options (SOL_IUCV) */
 #define SO_IPRMDATA_MSG        0x0080          /* send/recv IPRM_DATA msgs */
+#define SO_MSGLIMIT    0x1000          /* get/set IUCV MSGLIMIT */
 
 /* iucv related control messages (scm) */
 #define SCM_IUCV_TRGCLS        0x0001          /* target class control message */

diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
index f0dea1b8ed4b197445438a0b30648b5d7d141c35..264c6b36931ce2e63e6a4d27e0c0e817e2e94e81 100644 (file)
--- a/net/iucv/af_iucv.c
+++ b/net/iucv/af_iucv.c
@@ -268,6 +268,7 @@ static struct sock *iucv_sock_alloc(struct socket *sock, int proto, gfp_t prio)
        skb_queue_head_init(&iucv_sk(sk)->backlog_skb_q);
        iucv_sk(sk)->send_tag = 0;
        iucv_sk(sk)->flags = 0;
+       iucv_sk(sk)->msglimit = IUCV_QUEUELEN_DEFAULT;
 
        sk->sk_destruct = iucv_sock_destruct;
        sk->sk_sndtimeo = IUCV_CONN_TIMEOUT;
@@ -536,7 +537,7 @@ static int iucv_sock_connect(struct socket *sock, struct sockaddr *addr,
 
        iucv = iucv_sk(sk);
        /* Create path. */
-       iucv->path = iucv_path_alloc(IUCV_QUEUELEN_DEFAULT,
+       iucv->path = iucv_path_alloc(iucv->msglimit,
                                     IUCV_IPRMDATA, GFP_KERNEL);
        if (!iucv->path) {
                err = -ENOMEM;
@@ -1219,6 +1220,20 @@ static int iucv_sock_setsockopt(struct socket *sock, int level, int optname,
                else
                        iucv->flags &= ~IUCV_IPRMDATA;
                break;
+       case SO_MSGLIMIT:
+               switch (sk->sk_state) {
+               case IUCV_OPEN:
+               case IUCV_BOUND:
+                       if (val < 1 || val > (u16)(~0))
+                               rc = -EINVAL;
+                       else
+                               iucv->msglimit = val;
+                       break;
+               default:
+                       rc = -EINVAL;
+                       break;
+               }
+               break;
        default:
                rc = -ENOPROTOOPT;
                break;
@@ -1250,6 +1265,12 @@ static int iucv_sock_getsockopt(struct socket *sock, int level, int optname,
        case SO_IPRMDATA_MSG:
                val = (iucv->flags & IUCV_IPRMDATA) ? 1 : 0;
                break;
+       case SO_MSGLIMIT:
+               lock_sock(sk);
+               val = (iucv->path != NULL) ? iucv->path->msglim /* connected */
+                                          : iucv->msglimit;    /* default */
+               release_sock(sk);
+               break;
        default:
                return -ENOPROTOOPT;
        }
@@ -1339,7 +1360,9 @@ static int iucv_callback_connreq(struct iucv_path *path,
        memcpy(nuser_data + 8, niucv->src_name, 8);
        ASCEBC(nuser_data + 8, 8);
 
-       path->msglim = IUCV_QUEUELEN_DEFAULT;
+       /* set message limit for path based on msglimit of accepting socket */
+       niucv->msglimit = iucv->msglimit;
+       path->msglim = iucv->msglimit;
        err = iucv_path_accept(path, &af_iucv_handler, nuser_data, nsk);
        if (err) {
                err = iucv_path_sever(path, user_data);