korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-28 22:54:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

net/af_iucv: remove GFP_DMA restriction for HiperTransport

Browse Source 
af_iucv sockets over z/VM IUCV require that their skbs are allocated
in DMA memory. This restriction doesn't apply to connections over
HiperSockets. So only set this limit for z/VM IUCV sockets, thereby
increasing the likelihood that the large (and linear!) allocations for
HiperTransport messages succeed.

Fixes: 3881ac441f ("af_iucv: add HiperSockets transport")
Signed-off-by: Julian Wiedmann <jwi@linux.ibm.com>
Reviewed-by: Ursula Braun <ubraun@linux.ibm.com>
Reviewed-by: Hendrik Brueckner <brueckner@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Julian Wiedmann 2019-06-18 20:42:59 +02:00 committed by David S. Miller
parent 48620e3416
commit fdbf632691
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/iucv/af_iucv.c
View File

@ -588,7 +588,6 @@ static struct sock *iucv_sock_alloc(struct socket *sock, int proto, gfp_t prio,
sk->sk_destruct = iucv_sock_destruct; sk->sk_destruct = iucv_sock_destruct;
sk->sk_sndtimeo = IUCV_CONN_TIMEOUT; sk->sk_sndtimeo = IUCV_CONN_TIMEOUT;
sk->sk_allocation = GFP_DMA;
sock_reset_flag(sk, SOCK_ZAPPED); sock_reset_flag(sk, SOCK_ZAPPED);
@ -782,6 +781,7 @@ vm_bind:
memcpy(iucv->src_user_id, iucv_userid, 8); memcpy(iucv->src_user_id, iucv_userid, 8);
sk->sk_state = IUCV_BOUND; sk->sk_state = IUCV_BOUND;
iucv->transport = AF_IUCV_TRANS_IUCV; iucv->transport = AF_IUCV_TRANS_IUCV;
sk->sk_allocation |= GFP_DMA;
if (!iucv->msglimit) if (!iucv->msglimit)
iucv->msglimit = IUCV_QUEUELEN_DEFAULT; iucv->msglimit = IUCV_QUEUELEN_DEFAULT;
goto done_unlock; goto done_unlock;
@ -806,6 +806,8 @@ static int iucv_sock_autobind(struct sock *sk)
return -EPROTO; return -EPROTO;
memcpy(iucv->src_user_id, iucv_userid, 8); memcpy(iucv->src_user_id, iucv_userid, 8);
iucv->transport = AF_IUCV_TRANS_IUCV;
sk->sk_allocation |= GFP_DMA;
write_lock_bh(&iucv_sk_list.lock); write_lock_bh(&iucv_sk_list.lock);
__iucv_auto_name(iucv); __iucv_auto_name(iucv);
@ -1781,6 +1783,8 @@ static int iucv_callback_connreq(struct iucv_path *path,
niucv = iucv_sk(nsk); niucv = iucv_sk(nsk);
iucv_sock_init(nsk, sk); iucv_sock_init(nsk, sk);
niucv->transport = AF_IUCV_TRANS_IUCV;
nsk->sk_allocation |= GFP_DMA;
/* Set the new iucv_sock */ /* Set the new iucv_sock */
memcpy(niucv->dst_name, ipuser + 8, 8); memcpy(niucv->dst_name, ipuser + 8, 8);