From patchwork Tue Jan 28 02:59:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arjun Roy X-Patchwork-Id: 11353507 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3369592A for ; Tue, 28 Jan 2020 03:00:26 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id EAE282173E for ; Tue, 28 Jan 2020 03:00:25 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Li6NLUzV" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EAE282173E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id A97C06B0010; Mon, 27 Jan 2020 22:00:24 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id A1E906B0266; Mon, 27 Jan 2020 22:00:24 -0500 (EST) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8BBBF6B0269; Mon, 27 Jan 2020 22:00:24 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0036.hostedemail.com [216.40.44.36]) by kanga.kvack.org (Postfix) with ESMTP id 732666B0010 for ; Mon, 27 Jan 2020 22:00:24 -0500 (EST) Received: from smtpin12.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with SMTP id 311CE8248047 for ; Tue, 28 Jan 2020 03:00:24 +0000 (UTC) X-FDA: 76425539568.12.cat53_3da7f2ba7114e X-Spam-Summary: 2,0,0,8598f65e7af384f0,d41d8cd98f00b204,arjunroy.kdev@gmail.com,:davem@davemloft.net:netdev@vger.kernel.org:akpm@linux-foundation.org::arjunroy@google.com:edumazet@google.com:soheil@google.com,RULES_HIT:41:355:379:541:800:960:973:988:989:1260:1311:1314:1345:1359:1431:1437:1515:1535:1544:1711:1730:1747:1777:1792:2393:2553:2559:2562:3138:3139:3140:3141:3142:3355:3369:3865:3866:3867:3870:3871:3872:4118:4250:4321:5007:6119:6120:6261:6653:7576:7875:7901:7903:9413:9592:10004:11026:11473:11658:11914:12043:12048:12109:12291:12296:12297:12438:12517:12519:12555:12679:12683:12895:12986:13146:13161:13229:13230:13255:13894:14181:14394:14687:14721:21080:21444:21451:21627:21666:21990:30003:30045:30054:30090,0,RBL:209.85.216.67:@gmail.com:.lbl8.mailshell.net-62.50.0.100 66.100.201.100,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fp,MSBL:0,DNSBL:neutral,Custom_rules:0:0:0,LFtime:24,LUA_SUMMARY:none X-HE-Tag: cat53_3da7f2ba7114e X-Filterd-Recvd-Size: 7139 Received: from mail-pj1-f67.google.com (mail-pj1-f67.google.com [209.85.216.67]) by imf02.hostedemail.com (Postfix) with ESMTP for ; Tue, 28 Jan 2020 03:00:23 +0000 (UTC) Received: by mail-pj1-f67.google.com with SMTP id d5so351348pjz.5 for ; Mon, 27 Jan 2020 19:00:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=va5ceMBcMHca5rjvI+EDSohv+EXPpRRFokLBFZz9T2A=; b=Li6NLUzVdFa03uhF/grzvDirq0uQuojXbvzYub/HWIORNwXnnHlhRZjkHVIQ+tU6L3 lAlrcES7e1W1qqCpYftPzQfxAWQnNnwsIYgvYZTVbNRgwgKpX/sYPTjxQHPzaNJtiXK3 PU4uPf3KV3JrZXGZkN25GnVw9x+0lcWgMi/Y49XqpYcWLeao84PMkZVox7olQm0JMYrH vUyBTw0Yfcq0AX5BnlX2g6eCQmy6NQfa6kcxY5tvXlHLzEHKt5TWPEhLx6AGjRvJKOT4 xFkAIVaurbhAceKnPWwsHROBQACe38O8A2O3Kchygy65TGeLzKxm5n9HQRIpjcjFI0Jm Ldkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=va5ceMBcMHca5rjvI+EDSohv+EXPpRRFokLBFZz9T2A=; b=Iew+lRsGuF5dUX194QpklQFh0IsVY4/XKR/QpiZcCJJHmkafc+AH2dssMMO6JmBqUV xc2FdHhWYAhyGXCvARwdBMuy8ZIJCgsOlXyzQdjMlgYAtymGLKCipnvcR85q7R1yG+v6 bfwMnnSnnfY908pia1uzWbPmA1iQx0NqgQj8xeWmfPMMwhN4pU28HCU+Jx8jZc68eUPt BYOOCf6mM7kog5scKJE0s6Y6nXRStnXYk8j8F6b631/pdmVH74bfI9plif9Vf5xBmADr lTYmbDrrpn69l07A0MY4aFr5SLbIiQebk8oTJ2S9is9VUWRw30ny94H2hQuam93L/FII OrTA== X-Gm-Message-State: APjAAAVbtd2QrMysYGAwe3dGZrAoIUbriwwLLnT6WxmjqzTE683fetVL CfWV7vgmqWgnmNvx3Ic51yg= X-Google-Smtp-Source: APXvYqxE4U/Yr9uMcJLTs7FMzjv+WkOIiTCx8pbWC5e7IjY95Sn57gW5PeYdkXHyY+vKApXsIToP7g== X-Received: by 2002:a17:90b:4382:: with SMTP id in2mr2137282pjb.29.1580180422682; Mon, 27 Jan 2020 19:00:22 -0800 (PST) Received: from phantasmagoria.svl.corp.google.com ([2620:15c:2c4:201:2b0a:8c1:6a84:1aa0]) by smtp.gmail.com with ESMTPSA id p5sm18184677pga.69.2020.01.27.19.00.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Jan 2020 19:00:22 -0800 (PST) From: Arjun Roy To: davem@davemloft.net, netdev@vger.kernel.org, akpm@linux-foundation.org, linux-mm@kvack.org Cc: arjunroy@google.com, Eric Dumazet , Soheil Hassas Yeganeh Subject: [PATCH resend mm,net-next 3/3] net-zerocopy: Use vm_insert_pages() for tcp rcv zerocopy. Date: Mon, 27 Jan 2020 18:59:58 -0800 Message-Id: <20200128025958.43490-3-arjunroy.kdev@gmail.com> X-Mailer: git-send-email 2.25.0.341.g760bfbb309-goog In-Reply-To: <20200128025958.43490-1-arjunroy.kdev@gmail.com> References: <20200128025958.43490-1-arjunroy.kdev@gmail.com> MIME-Version: 1.0 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: Arjun Roy Use vm_insert_pages() for tcp receive zerocopy. Spin lock cycles (as reported by perf) drop from a couple of percentage points to a fraction of a percent. This results in a roughly 6% increase in efficiency, measured roughly as zerocopy receive count divided by CPU utilization. The intention of this patch-set is to reduce atomic ops for tcp zerocopy receives, which normally hits the same spinlock multiple times consecutively. Signed-off-by: Arjun Roy Signed-off-by: Eric Dumazet Signed-off-by: Soheil Hassas Yeganeh Signed-off-by: Arjun Roy Signed-off-by: Eric Dumazet Signed-off-by: Soheil Hassas Yeganeh Signed-off-by: Andrew Morton --- net/ipv4/tcp.c | 67 +++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 61 insertions(+), 6 deletions(-) diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 34490d972758..52f96c3ceab3 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -1861,14 +1861,48 @@ int tcp_mmap(struct file *file, struct socket *sock, } EXPORT_SYMBOL(tcp_mmap); +static int tcp_zerocopy_vm_insert_batch(struct vm_area_struct *vma, + struct page **pages, + unsigned long pages_to_map, + unsigned long *insert_addr, + u32 *length_with_pending, + u32 *seq, + struct tcp_zerocopy_receive *zc) +{ + unsigned long pages_remaining = pages_to_map; + int bytes_mapped; + int ret; + + ret = vm_insert_pages(vma, *insert_addr, pages, &pages_remaining); + bytes_mapped = PAGE_SIZE * (pages_to_map - pages_remaining); + /* Even if vm_insert_pages fails, it may have partially succeeded in + * mapping (some but not all of the pages). + */ + *seq += bytes_mapped; + *insert_addr += bytes_mapped; + if (ret) { + /* But if vm_insert_pages did fail, we have to unroll some state + * we speculatively touched before. + */ + const int bytes_not_mapped = PAGE_SIZE * pages_remaining; + *length_with_pending -= bytes_not_mapped; + zc->recv_skip_hint += bytes_not_mapped; + } + return ret; +} + static int tcp_zerocopy_receive(struct sock *sk, struct tcp_zerocopy_receive *zc) { unsigned long address = (unsigned long)zc->address; u32 length = 0, seq, offset, zap_len; + #define PAGE_BATCH_SIZE 8 + struct page *pages[PAGE_BATCH_SIZE]; const skb_frag_t *frags = NULL; struct vm_area_struct *vma; struct sk_buff *skb = NULL; + unsigned long pg_idx = 0; + unsigned long curr_addr; struct tcp_sock *tp; int inq; int ret; @@ -1901,15 +1935,26 @@ static int tcp_zerocopy_receive(struct sock *sk, zc->recv_skip_hint = zc->length; } ret = 0; + curr_addr = address; while (length + PAGE_SIZE <= zc->length) { if (zc->recv_skip_hint < PAGE_SIZE) { + /* If we're here, finish the current batch. */ + if (pg_idx) { + ret = tcp_zerocopy_vm_insert_batch(vma, pages, + pg_idx, + &curr_addr, + &length, + &seq, zc); + if (ret) + goto out; + pg_idx = 0; + } if (skb) { skb = skb->next; offset = seq - TCP_SKB_CB(skb)->seq; } else { skb = tcp_recv_skb(sk, seq, &offset); } - zc->recv_skip_hint = skb->len - offset; offset -= skb_headlen(skb); if ((int)offset < 0 || skb_has_frag_list(skb)) @@ -1933,14 +1978,24 @@ static int tcp_zerocopy_receive(struct sock *sk, zc->recv_skip_hint -= remaining; break; } - ret = vm_insert_page(vma, address + length, - skb_frag_page(frags)); - if (ret) - break; + pages[pg_idx] = skb_frag_page(frags); + pg_idx++; length += PAGE_SIZE; - seq += PAGE_SIZE; zc->recv_skip_hint -= PAGE_SIZE; frags++; + if (pg_idx == PAGE_BATCH_SIZE) { + ret = tcp_zerocopy_vm_insert_batch(vma, pages, pg_idx, + &curr_addr, &length, + &seq, zc); + if (ret) + goto out; + pg_idx = 0; + } + } + if (pg_idx) { + ret = tcp_zerocopy_vm_insert_batch(vma, pages, pg_idx, + &curr_addr, &length, &seq, + zc); } out: up_read(¤t->mm->mmap_sem);