[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1383876946-2396-91-git-send-email-kamal@canonical.com>
Date: Thu, 7 Nov 2013 18:15:45 -0800
From: Kamal Mostafa <kamal@...onical.com>
To: linux-kernel@...r.kernel.org, stable@...r.kernel.org,
kernel-team@...ts.ubuntu.com
Cc: Ming Lei <ming.lei@...onical.com>,
Russell King - ARM Linux <linux@....linux.org.uk>,
Will Deacon <will.deacon@....com>,
Aaro Koskinen <aaro.koskinen@....fi>,
FUJITA Tomonori <fujita.tomonori@....ntt.co.jp>,
Tejun Heo <tj@...nel.org>,
"James E.J. Bottomley" <JBottomley@...allels.com>,
Jens Axboe <axboe@...nel.dk>,
Andrew Morton <akpm@...ux-foundation.org>,
Linus Torvalds <torvalds@...ux-foundation.org>,
Kamal Mostafa <kamal@...onical.com>
Subject: [PATCH 3.8 90/91] lib/scatterlist.c: don't flush_kernel_dcache_page on slab page
3.8.13.13 -stable review patch. If anyone has any objections, please let me know.
------------------
From: Ming Lei <ming.lei@...onical.com>
commit 3d77b50c5874b7e923be946ba793644f82336b75 upstream.
Commit b1adaf65ba03 ("[SCSI] block: add sg buffer copy helper
functions") introduces two sg buffer copy helpers, and calls
flush_kernel_dcache_page() on pages in SG list after these pages are
written to.
Unfortunately, the commit may introduce a potential bug:
- Before sending some SCSI commands, kmalloc() buffer may be passed to
block layper, so flush_kernel_dcache_page() can see a slab page
finally
- According to cachetlb.txt, flush_kernel_dcache_page() is only called
on "a user page", which surely can't be a slab page.
- ARCH's implementation of flush_kernel_dcache_page() may use page
mapping information to do optimization so page_mapping() will see the
slab page, then VM_BUG_ON() is triggered.
Aaro Koskinen reported the bug on ARM/kirkwood when DEBUG_VM is enabled,
and this patch fixes the bug by adding test of '!PageSlab(miter->page)'
before calling flush_kernel_dcache_page().
Signed-off-by: Ming Lei <ming.lei@...onical.com>
Reported-by: Aaro Koskinen <aaro.koskinen@....fi>
Tested-by: Simon Baatz <gmbnomis@...il.com>
Cc: Russell King - ARM Linux <linux@....linux.org.uk>
Cc: Will Deacon <will.deacon@....com>
Cc: Aaro Koskinen <aaro.koskinen@....fi>
Acked-by: Catalin Marinas <catalin.marinas@....com>
Cc: FUJITA Tomonori <fujita.tomonori@....ntt.co.jp>
Cc: Tejun Heo <tj@...nel.org>
Cc: "James E.J. Bottomley" <JBottomley@...allels.com>
Cc: Jens Axboe <axboe@...nel.dk>
Signed-off-by: Andrew Morton <akpm@...ux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@...ux-foundation.org>
Signed-off-by: Kamal Mostafa <kamal@...onical.com>
---
lib/scatterlist.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lib/scatterlist.c b/lib/scatterlist.c
index 7874b01..bd86887 100644
--- a/lib/scatterlist.c
+++ b/lib/scatterlist.c
@@ -495,7 +495,8 @@ void sg_miter_stop(struct sg_mapping_iter *miter)
if (miter->addr) {
miter->__offset += miter->consumed;
- if (miter->__flags & SG_MITER_TO_SG)
+ if ((miter->__flags & SG_MITER_TO_SG) &&
+ !PageSlab(miter->page))
flush_kernel_dcache_page(miter->page);
if (miter->__flags & SG_MITER_ATOMIC) {
--
1.8.1.2
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists