Skip to content

Commit eb6a248

Browse files
Eric Dumazetdavem330
authored andcommitted
af_unix: reduce high order page allocations
unix_dgram_sendmsg() currently builds linear skbs, and this can stress page allocator with high order page allocations. When memory gets fragmented, this can eventually fail. We can try to use order-2 allocations for skb head (SKB_MAX_ALLOC) plus up to 16 page fragments to lower pressure on buddy allocator. This patch has no effect on messages of less than 16064 bytes. (on 64bit arches with PAGE_SIZE=4096) For bigger messages (from 16065 to 81600 bytes), this patch brings reliability at the expense of performance penalty because of extra pages allocations. netperf -t DG_STREAM -T 0,2 -- -m 16064 -s 200000 ->4086040 Messages / 10s netperf -t DG_STREAM -T 0,2 -- -m 16068 -s 200000 ->3901747 Messages / 10s Signed-off-by: Eric Dumazet <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent edbc0bb commit eb6a248

File tree

1 file changed

+12
-3
lines changed

1 file changed

+12
-3
lines changed

net/unix/af_unix.c

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1442,6 +1442,7 @@ static int unix_dgram_sendmsg(struct kiocb *kiocb, struct socket *sock,
14421442
long timeo;
14431443
struct scm_cookie tmp_scm;
14441444
int max_level;
1445+
int data_len = 0;
14451446

14461447
if (NULL == siocb->scm)
14471448
siocb->scm = &tmp_scm;
@@ -1475,7 +1476,13 @@ static int unix_dgram_sendmsg(struct kiocb *kiocb, struct socket *sock,
14751476
if (len > sk->sk_sndbuf - 32)
14761477
goto out;
14771478

1478-
skb = sock_alloc_send_skb(sk, len, msg->msg_flags&MSG_DONTWAIT, &err);
1479+
if (len > SKB_MAX_ALLOC)
1480+
data_len = min_t(size_t,
1481+
len - SKB_MAX_ALLOC,
1482+
MAX_SKB_FRAGS * PAGE_SIZE);
1483+
1484+
skb = sock_alloc_send_pskb(sk, len - data_len, data_len,
1485+
msg->msg_flags & MSG_DONTWAIT, &err);
14791486
if (skb == NULL)
14801487
goto out;
14811488

@@ -1485,8 +1492,10 @@ static int unix_dgram_sendmsg(struct kiocb *kiocb, struct socket *sock,
14851492
max_level = err + 1;
14861493
unix_get_secdata(siocb->scm, skb);
14871494

1488-
skb_reset_transport_header(skb);
1489-
err = memcpy_fromiovec(skb_put(skb, len), msg->msg_iov, len);
1495+
skb_put(skb, len - data_len);
1496+
skb->data_len = data_len;
1497+
skb->len = len;
1498+
err = skb_copy_datagram_from_iovec(skb, 0, msg->msg_iov, 0, len);
14901499
if (err)
14911500
goto out_free;
14921501

0 commit comments

Comments
 (0)