From: Arjun Roy <arjunroy.kdev@gmail.com>
To: davem@davemloft.net, netdev@vger.kernel.org,
akpm@linux-foundation.org, linux-mm@kvack.org
Cc: arjunroy@google.com, soheil@google.com, edumazet@google.com
Subject: [PATCH mm, next-next] Add missing page_count() check to vm_insert_pages().
Date: Thu, 13 Feb 2020 16:59:29 -0800 [thread overview]
Message-ID: <20200214005929.104481-1-arjunroy.kdev@gmail.com> (raw)
From: Arjun Roy <arjunroy@google.com>
Add missing page_count() check to vm_insert_pages(), specifically
inside insert_page_in_batch_locked(). This was accidentally forgotten
in the original patchset.
See: https://marc.info/?l=linux-mm&m=158156166403807&w=2
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 <arjunroy@google.com>
---
mm/memory.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/mm/memory.c b/mm/memory.c
index f1d5f2264aef..3b4007a6ef7f 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -1463,8 +1463,11 @@ static int insert_page_into_pte_locked(struct mm_struct *mm, pte_t *pte,
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);
+ int err;
+ if (!page_count(page))
+ return -EINVAL;
+ err = validate_page_before_insert(page);
return err ? err : insert_page_into_pte_locked(
mm, pte_offset_map(pmd, addr), addr, page, prot);
}
--
2.25.0.265.gbab2e86ba0-goog
reply other threads:[~2020-02-14 0:59 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200214005929.104481-1-arjunroy.kdev@gmail.com \
--to=arjunroy.kdev@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=arjunroy@google.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=linux-mm@kvack.org \
--cc=netdev@vger.kernel.org \
--cc=soheil@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.