From patchwork Tue Jan 28 02:59:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arjun Roy X-Patchwork-Id: 11353503 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 9783113A4 for ; Tue, 28 Jan 2020 03:00:06 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 644152467F for ; Tue, 28 Jan 2020 03:00:06 +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="LiOCq7RX" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 644152467F 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 75CE66B000A; Mon, 27 Jan 2020 22:00:05 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 70E9C6B000C; Mon, 27 Jan 2020 22:00:05 -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 623826B000D; Mon, 27 Jan 2020 22:00:05 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0055.hostedemail.com [216.40.44.55]) by kanga.kvack.org (Postfix) with ESMTP id 4BD186B000A for ; Mon, 27 Jan 2020 22:00:05 -0500 (EST) Received: from smtpin23.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with SMTP id 00106824805A for ; Tue, 28 Jan 2020 03:00:04 +0000 (UTC) X-FDA: 76425538770.23.chin14_3ad801ab70025 X-Spam-Summary: 2,0,0,123d1ac695f7b20d,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:69:355:379:541:800:960:973:988:989:1260:1311:1314:1345:1431:1437:1515:1535:1542:1711:1730:1747:1777:1792:2393:2559:2562:3138:3139:3140:3141:3142:3353:3865:3866:3867:3871:4321:5007:6119:6261:6653:7576:8957:9413:9592:10004:11026:11658:11914:12043:12048:12291:12296:12297:12438:12517:12519:12555:12679:12683:12895:12986:13161:13229:13255:13894:14096:14181:14394:14687:14721:21080:21444:21451:21627:21666:21795:21990:30051:30054,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: chin14_3ad801ab70025 X-Filterd-Recvd-Size: 5406 Received: from mail-pj1-f67.google.com (mail-pj1-f67.google.com [209.85.216.67]) by imf35.hostedemail.com (Postfix) with ESMTP for ; Tue, 28 Jan 2020 03:00:03 +0000 (UTC) Received: by mail-pj1-f67.google.com with SMTP id m7so278159pjs.0 for ; Mon, 27 Jan 2020 19:00:03 -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:mime-version :content-transfer-encoding; bh=Zb3vaMlCnEIaKoKuEPxaWXPkDmU9sA/hlBePDwvbZxg=; b=LiOCq7RXddMvB8gqmSOf6SqFzuigpHoidXnqfx1tmw4gchYK7DyHGRfRRMRmeiQHa5 JKbTG4aY/Gr6SoFpadbwo62q0ywyr/n3o3LOMTlg76mA6a63mFuE5xmU2ZXO7uZumOi5 Ec4mciVce/7oP2Y+cfIVVW1kxwUFSxeUg4pH3SUXeYl4DyzslPuFRAB/+J9lGqn91bSw NDPQpuPhm/U3Co3DSk5D3hf1a8Wi4F2OIjUJYK6oDRB9CHUGrV2oQ4CykjitPHhMQwRI sgCs2Am8qmGS/sulZboX2fGRFlECoQ31PNVW3HfBi/6L1+mSoit81VWMFpIPqY8Sktiu bIaQ== 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:mime-version :content-transfer-encoding; bh=Zb3vaMlCnEIaKoKuEPxaWXPkDmU9sA/hlBePDwvbZxg=; b=H+IejMgG5bDNG9WyPNjZZ861TYcRzlCKDx6PucoH0E/hG/Cokm5LfDV/z8bs6KX+ji a2dbWTjIihGdRsBmgE3RbD9Zffk65QQ6v4MjPjao70Juu8GxYPS42XPgXEr52kOTLSl2 PAWZKrKv3BmzujViXF/DFSCsupCW0Kf+7k/fbjum8NSIxgnge1yCH+rZCQdcy1ACoKhV DS6dojyrjXFqufMJ/Yop/5Fx781z/T2j6KzaBOK4kCxRr8pNi1AdYSHgVD7ur5Vjuuog ZlBZhcjQ4800Yj5lCjuKiEfD6uT8BkDNGPJOX73ivzEiI4z80nl7QgFrNO5qiqBmLvUR EHaQ== X-Gm-Message-State: APjAAAUAlJPYBoZMPgclRHx8FGR+RnFJ9GftHcI24I93qErriTdgZdcT jqYk3gmOkWPcCpD6KCTpW40= X-Google-Smtp-Source: APXvYqxdehSUpRTXWeeWl84SjIcqzzB1FI5QVI5bMLYuYQHCyF2qDcEOjLEyJArRTHCaPCpAvV9H9w== X-Received: by 2002:a17:90a:858a:: with SMTP id m10mr2092329pjn.117.1580180402682; Mon, 27 Jan 2020 19:00:02 -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.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Jan 2020 19:00:02 -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 1/3] mm: Refactor insert_page to prepare for batched-lock insert. Date: Mon, 27 Jan 2020 18:59:56 -0800 Message-Id: <20200128025958.43490-1-arjunroy.kdev@gmail.com> X-Mailer: git-send-email 2.25.0.341.g760bfbb309-goog 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 Add helper methods for vm_insert_page()/insert_page() to prepare for vm_insert_pages(), which batch-inserts pages to reduce spinlock operations when inserting multiple consecutive pages into the user page table. 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 --- mm/memory.c | 41 ++++++++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/mm/memory.c b/mm/memory.c index 7c6e19bdc428..7e23a9275386 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -1693,6 +1693,27 @@ pte_t *__get_locked_pte(struct mm_struct *mm, unsigned long addr, return pte_alloc_map_lock(mm, pmd, addr, ptl); } +static int validate_page_before_insert(struct page *page) +{ + if (PageAnon(page) || PageSlab(page)) + return -EINVAL; + flush_dcache_page(page); + return 0; +} + +static int insert_page_into_pte_locked(struct mm_struct *mm, pte_t *pte, + unsigned long addr, struct page *page, pgprot_t prot) +{ + if (!pte_none(*pte)) + return -EBUSY; + /* Ok, finally just insert the thing.. */ + get_page(page); + inc_mm_counter_fast(mm, mm_counter_file(page)); + page_add_file_rmap(page, false); + set_pte_at(mm, addr, pte, mk_pte(page, prot)); + return 0; +} + /* * This is the old fallback for page remapping. * @@ -1708,28 +1729,14 @@ static int insert_page(struct vm_area_struct *vma, unsigned long addr, pte_t *pte; spinlock_t *ptl; - retval = -EINVAL; - if (PageAnon(page) || PageSlab(page)) + retval = validate_page_before_insert(page); + if (retval) goto out; retval = -ENOMEM; - flush_dcache_page(page); pte = get_locked_pte(mm, addr, &ptl); if (!pte) goto out; - retval = -EBUSY; - if (!pte_none(*pte)) - goto out_unlock; - - /* Ok, finally just insert the thing.. */ - get_page(page); - inc_mm_counter_fast(mm, mm_counter_file(page)); - page_add_file_rmap(page, false); - set_pte_at(mm, addr, pte, mk_pte(page, prot)); - - retval = 0; - pte_unmap_unlock(pte, ptl); - return retval; -out_unlock: + retval = insert_page_into_pte_locked(mm, pte, addr, page, prot); pte_unmap_unlock(pte, ptl); out: return retval; From patchwork Tue Jan 28 02:59:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arjun Roy X-Patchwork-Id: 11353505 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 ED75713A4 for ; Tue, 28 Jan 2020 03:00:23 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id B095E2173E for ; Tue, 28 Jan 2020 03:00:23 +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="ktck6rNz" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B095E2173E 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 ED7286B000D; Mon, 27 Jan 2020 22:00:22 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id E87B96B000E; Mon, 27 Jan 2020 22:00:22 -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 D9D4F6B0010; Mon, 27 Jan 2020 22:00:22 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0169.hostedemail.com [216.40.44.169]) by kanga.kvack.org (Postfix) with ESMTP id C5C536B000D for ; Mon, 27 Jan 2020 22:00:22 -0500 (EST) Received: from smtpin05.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with SMTP id 854643A9B for ; Tue, 28 Jan 2020 03:00:22 +0000 (UTC) X-FDA: 76425539484.05.shake43_3d66c3c34c058 X-Spam-Summary: 20,1.5,0,456a9cc443e50cc0,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:2:41:355:379:541:800:960:973:988:989:1260:1311:1314:1345:1359:1431:1437:1515:1535:1605:1606:1730:1747:1777:1792:2393:2553:2559:2562:2740:2890:3138:3139:3140:3141:3142:3865:3866:3867:3870:3871:3872:3874:4042:4119:4250:4321:4605:5007:6119:6261:6653:7576:7875:7903:8603:9413:10009:11026:11473:11658:11914:12043:12048:12291:12296:12297:12438:12517:12519:12555:12679:12683:12895:12986:13161:13229:13894:14096:14394:14687:21080:21324:21444:21450:21451:21627:21666:21795:21990:30001:30003:30034:30051:30054:30070:30090,0,RBL:209.85.214.195:@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:1:0,LFtime:24,LUA_SUMMARY:none X-HE-Tag: shake43_3d66c3c34c058 X-Filterd-Recvd-Size: 8776 Received: from mail-pl1-f195.google.com (mail-pl1-f195.google.com [209.85.214.195]) by imf32.hostedemail.com (Postfix) with ESMTP for ; Tue, 28 Jan 2020 03:00:21 +0000 (UTC) Received: by mail-pl1-f195.google.com with SMTP id t14so4508589plr.8 for ; Mon, 27 Jan 2020 19:00:21 -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=u9CzNOXIQWZlZqSBymnaz40dX76g7CidfQDhyQLunV0=; b=ktck6rNzKgV+z8cK9f5AxtP6c2b9DiRTFwa6YKfxS9smE9gMTMi4HF0CxjrWsUsfiD rftj6QKxMoIWFhuEnwheFZIr6nEddEjymzjrvNEhYQFnSOYjTXMGW8ztoSMqxwaMBWlq ZRkahb7/zhHkZBEqSJA2+ezqQLa8NnpHYjgs8rG5ya7T1H+whnhqmnd1hMbygGp2rNha tGCcujD3v9UJ+alQxIyuCJ75F1+e3a+hLmKq8xZeWR9B55pvUnUKUCyR3JklDlVqQJfe T4TDVBGlEHRm3BsN6lsWOUn8s8HlvrCii3ynoh6mLIm4SHd7GYVfD+27CX57I8Y4NXae B8YA== 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=u9CzNOXIQWZlZqSBymnaz40dX76g7CidfQDhyQLunV0=; b=nAP8C3UdKqC+ZJ5+SGNl7m6QfbeYlhyzCChPN+MNsV3zabeYcsOCf+yjbVDoB6pDVS sSpbC14tECImd9rxvvNVypdKhN8Jb267cFmGEvO0G4dbhqJldpJJrcs3UsFcpIonAr4i ygBVKrz+LlLBCulNX+E11NKBirnzFvcEZy7iXv9x9bEObjS/1KCMFPG4xzX9nMH8XI8Q KiRQbS8OukwQ9WLkyviQtO2TuCtR6jn783OusjPda0ZpXtvE3oH9UIEToNk2xhCec3pu lOcjOOZLZkyYtP35vrUWcDwWcEDZ4m1ECA5FyJcfXybIO2PY0KLFQ3g58vIOHyH5367l ZQSA== X-Gm-Message-State: APjAAAU59fp/vcDX63b/udf3qUqUu4zZksj3JbYBvCpxdmobLR4fcHr1 XgDVBrKwCh1KR1UhUVVTnaQ= X-Google-Smtp-Source: APXvYqw5WiiIVyo6WzOzJHmUPVYQBAJazgKKZP75PI8ASKBX8KGyUw7sj3mxbRWuC8No+dYA+u/BPg== X-Received: by 2002:a17:90a:d141:: with SMTP id t1mr2118751pjw.38.1580180420595; Mon, 27 Jan 2020 19:00:20 -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.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Jan 2020 19:00:20 -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 2/3] mm: Add vm_insert_pages(). Date: Mon, 27 Jan 2020 18:59:57 -0800 Message-Id: <20200128025958.43490-2-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 Add the ability to insert multiple pages at once to a user VM with lower PTE spinlock operations. 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 --- include/linux/mm.h | 2 + mm/memory.c | 111 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 111 insertions(+), 2 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index 29c928ba6b42..a3ac40fbe8fd 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2563,6 +2563,8 @@ struct vm_area_struct *find_extend_vma(struct mm_struct *, unsigned long addr); int remap_pfn_range(struct vm_area_struct *, unsigned long addr, unsigned long pfn, unsigned long size, pgprot_t); int vm_insert_page(struct vm_area_struct *, unsigned long addr, struct page *); +int vm_insert_pages(struct vm_area_struct *vma, unsigned long addr, + struct page **pages, unsigned long *num); int vm_insert_pfn(struct vm_area_struct *vma, unsigned long addr, unsigned long pfn); int vm_insert_pfn_prot(struct vm_area_struct *vma, unsigned long addr, diff --git a/mm/memory.c b/mm/memory.c index 7e23a9275386..1655c5feaf32 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -1670,8 +1670,7 @@ int zap_vma_ptes(struct vm_area_struct *vma, unsigned long address, } EXPORT_SYMBOL_GPL(zap_vma_ptes); -pte_t *__get_locked_pte(struct mm_struct *mm, unsigned long addr, - spinlock_t **ptl) +static pmd_t *walk_to_pmd(struct mm_struct *mm, unsigned long addr) { pgd_t *pgd; p4d_t *p4d; @@ -1690,6 +1689,16 @@ pte_t *__get_locked_pte(struct mm_struct *mm, unsigned long addr, return NULL; VM_BUG_ON(pmd_trans_huge(*pmd)); + return pmd; +} + +pte_t *__get_locked_pte(struct mm_struct *mm, unsigned long addr, + spinlock_t **ptl) +{ + pmd_t *pmd = walk_to_pmd(mm, addr); + + if (!pmd) + return NULL; return pte_alloc_map_lock(mm, pmd, addr, ptl); } @@ -1714,6 +1723,15 @@ static int insert_page_into_pte_locked(struct mm_struct *mm, pte_t *pte, return 0; } +static int insert_page_in_batch_locked(struct mm_struct *mm, pmd_t *pmd, + unsigned long addr, struct page *page, pgprot_t prot) +{ + const int err = validate_page_before_insert(page); + + return err ? err : insert_page_into_pte_locked( + mm, pte_offset_map(pmd, addr), addr, page, prot); +} + /* * This is the old fallback for page remapping. * @@ -1742,6 +1760,95 @@ static int insert_page(struct vm_area_struct *vma, unsigned long addr, return retval; } +/* insert_pages() amortizes the cost of spinlock operations + * when inserting pages in a loop. + */ +static int insert_pages(struct vm_area_struct *vma, unsigned long addr, + struct page **pages, unsigned long *num, pgprot_t prot) +{ + pmd_t *pmd = NULL; + spinlock_t *pte_lock = NULL; + struct mm_struct *const mm = vma->vm_mm; + unsigned long curr_page_idx = 0; + unsigned long remaining_pages_total = *num; + unsigned long pages_to_write_in_pmd; + int ret; +more: + ret = -EFAULT; + pmd = walk_to_pmd(mm, addr); + if (!pmd) + goto out; + + pages_to_write_in_pmd = min_t(unsigned long, + remaining_pages_total, PTRS_PER_PTE - pte_index(addr)); + + /* Allocate the PTE if necessary; takes PMD lock once only. */ + ret = -ENOMEM; + if (pte_alloc(mm, pmd, addr)) + goto out; + pte_lock = pte_lockptr(mm, pmd); + + while (pages_to_write_in_pmd) { + int pte_idx = 0; + const int batch_size = min_t(int, pages_to_write_in_pmd, 8); + + spin_lock(pte_lock); + for (; pte_idx < batch_size; ++pte_idx) { + int err = insert_page_in_batch_locked(mm, pmd, + addr, pages[curr_page_idx], prot); + if (unlikely(err)) { + spin_unlock(pte_lock); + ret = err; + remaining_pages_total -= pte_idx; + goto out; + } + addr += PAGE_SIZE; + ++curr_page_idx; + } + spin_unlock(pte_lock); + pages_to_write_in_pmd -= batch_size; + remaining_pages_total -= batch_size; + } + if (remaining_pages_total) + goto more; + ret = 0; +out: + *num = remaining_pages_total; + return ret; +} + +/** + * vm_insert_pages - insert multiple pages into user vma, batching the pmd lock. + * @vma: user vma to map to + * @addr: target start user address of these pages + * @pages: source kernel pages + * @num: in: number of pages to map. out: number of pages that were *not* + * mapped. (0 means all pages were successfully mapped). + * + * Preferred over vm_insert_page() when inserting multiple pages. + * + * In case of error, we may have mapped a subset of the provided + * pages. It is the caller's responsibility to account for this case. + * + * The same restrictions apply as in vm_insert_page(). + */ +int vm_insert_pages(struct vm_area_struct *vma, unsigned long addr, + struct page **pages, unsigned long *num) +{ + const unsigned long end_addr = addr + (*num * PAGE_SIZE) - 1; + + if (addr < vma->vm_start || end_addr >= vma->vm_end) + return -EFAULT; + if (!(vma->vm_flags & VM_MIXEDMAP)) { + BUG_ON(down_read_trylock(&vma->vm_mm->mmap_sem)); + BUG_ON(vma->vm_flags & VM_PFNMAP); + vma->vm_flags |= VM_MIXEDMAP; + } + /* Defer page refcount checking till we're about to map that page. */ + return insert_pages(vma, addr, pages, num, vma->vm_page_prot); +} +EXPORT_SYMBOL(vm_insert_pages); + /** * vm_insert_page - insert single page into user vma * @vma: user vma to map to 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);