From: akpm@linux-foundation.org
To: bigeasy@linutronix.de, jack@suse.cz, mgorman@suse.de,
mhocko@suse.com, mm-commits@vger.kernel.org,
naresh.kamboju@linaro.org, shy828301@gmail.com,
songliubraving@fb.com, willy@infradead.org, ziy@nvidia.com
Subject: [folded-merged] mm-support-thps-in-zero_user_segments-fix.patch removed from -mm tree
Date: Mon, 14 Dec 2020 18:19:35 -0800 [thread overview]
Message-ID: <20201215021935.tolZbwJRf%akpm@linux-foundation.org> (raw)
The patch titled
Subject: mm-support-thps-in-zero_user_segments-fix
has been removed from the -mm tree. Its filename was
mm-support-thps-in-zero_user_segments-fix.patch
This patch was dropped because it was folded into mm-support-thps-in-zero_user_segments.patch
------------------------------------------------------
From: Matthew Wilcox <willy@infradead.org>
Subject: mm-support-thps-in-zero_user_segments-fix
I didn't realise start1 was allowed to be less than start2.
Reported-by: Naresh Kamboju <naresh.kamboju@linaro.org>
Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Cc: Yang Shi <shy828301@gmail.com>
Cc: Jan Kara <jack@suse.cz>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Zi Yan <ziy@nvidia.com>
Cc: Song Liu <songliubraving@fb.com>
Cc: Mel Gorman <mgorman@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
mm/highmem.c | 39 ++++++++++++++++-----------------------
1 file changed, 16 insertions(+), 23 deletions(-)
--- a/mm/highmem.c~mm-support-thps-in-zero_user_segments-fix
+++ a/mm/highmem.c
@@ -379,46 +379,39 @@ void zero_user_segments(struct page *pag
BUG_ON(end1 > page_size(page) || end2 > page_size(page));
for (i = 0; i < compound_nr(page); i++) {
- void *kaddr;
- unsigned this_end;
+ void *kaddr = NULL;
- if (end1 == 0 && start2 >= PAGE_SIZE) {
- start2 -= PAGE_SIZE;
- end2 -= PAGE_SIZE;
- continue;
- }
+ if (start1 < PAGE_SIZE || start2 < PAGE_SIZE)
+ kaddr = kmap_atomic(page + i);
if (start1 >= PAGE_SIZE) {
start1 -= PAGE_SIZE;
end1 -= PAGE_SIZE;
- if (start2) {
- start2 -= PAGE_SIZE;
- end2 -= PAGE_SIZE;
- }
- continue;
- }
-
- kaddr = kmap_atomic(page + i);
+ } else {
+ unsigned this_end = min_t(unsigned, end1, PAGE_SIZE);
- this_end = min_t(unsigned, end1, PAGE_SIZE);
- if (end1 > start1)
- memset(kaddr + start1, 0, this_end - start1);
- end1 -= this_end;
- start1 = 0;
+ if (end1 > start1)
+ memset(kaddr + start1, 0, this_end - start1);
+ end1 -= this_end;
+ start1 = 0;
+ }
if (start2 >= PAGE_SIZE) {
start2 -= PAGE_SIZE;
end2 -= PAGE_SIZE;
} else {
- this_end = min_t(unsigned, end2, PAGE_SIZE);
+ unsigned this_end = min_t(unsigned, end2, PAGE_SIZE);
+
if (end2 > start2)
memset(kaddr + start2, 0, this_end - start2);
end2 -= this_end;
start2 = 0;
}
- kunmap_atomic(kaddr);
- flush_dcache_page(page + i);
+ if (kaddr) {
+ kunmap_atomic(kaddr);
+ flush_dcache_page(page + i);
+ }
if (!end1 && !end2)
break;
_
Patches currently in -mm which might be from willy@infradead.org are
sparc-fix-handling-of-page-table-constructor-failure.patch
mm-move-free_unref_page-to-mm-internalh.patch
mm-page-flags-fix-comment.patch
mm-page_alloc-add-__free_pages-documentation.patch
mm-support-thps-in-zero_user_segments.patch
mm-make-pagecache-tagged-lookups-return-only-head-pages.patch
mm-shmem-use-pagevec_lookup-in-shmem_unlock_mapping.patch
mm-swap-optimise-get_shadow_from_swap_cache.patch
mm-add-fgp_entry.patch
mm-filemap-rename-find_get_entry-to-mapping_get_entry.patch
mm-filemap-add-helper-for-finding-pages.patch
mm-filemap-add-helper-for-finding-pages-fix.patch
mm-filemap-add-mapping_seek_hole_data.patch
mm-filemap-add-mapping_seek_hole_data-fix.patch
iomap-use-mapping_seek_hole_data.patch
mm-add-and-use-find_lock_entries.patch
mm-add-and-use-find_lock_entries-fix.patch
mm-add-an-end-parameter-to-find_get_entries.patch
mm-add-an-end-parameter-to-pagevec_lookup_entries.patch
mm-remove-nr_entries-parameter-from-pagevec_lookup_entries.patch
mm-pass-pvec-directly-to-find_get_entries.patch
mm-remove-pagevec_lookup_entries.patch
reply other threads:[~2020-12-15 2:20 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=20201215021935.tolZbwJRf%akpm@linux-foundation.org \
--to=akpm@linux-foundation.org \
--cc=bigeasy@linutronix.de \
--cc=jack@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=mgorman@suse.de \
--cc=mhocko@suse.com \
--cc=mm-commits@vger.kernel.org \
--cc=naresh.kamboju@linaro.org \
--cc=shy828301@gmail.com \
--cc=songliubraving@fb.com \
--cc=willy@infradead.org \
--cc=ziy@nvidia.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.