[PATCH 2.6.24-rc1] fix sg_phys to use dma_addr_t

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: Jens Axboe <jens.axboe@...>
Cc: <linux-kernel@...>
Date: Wednesday, October 24, 2007 - 3:01 pm

x86_32 CONFIG_HIGHMEM64G with 5GB RAM hung when booting, after issuing
some "request_module: runaway loop modprobe binfmt-0000" messages in
trying to exec /sbin/init.

The binprm buf doesn't see the right ".ELF" header because sg_phys()
is providing the wrong physical addresses for high pages: a 32-bit
unsigned long is too small in this case, we need to use dma_addr_t.

Signed-off-by: Hugh Dickins <hugh@veritas.com>
---
Whether this is a complete patch, suitable for all architectures,
I'm not sure: it builds, boots and runs correctly on the x86_32 box
in question, but you'll be a lot wiser than me about using dma_addr_t
for everyone.  (Seems a bit of a shame to include <asm/types.h> here,
when I think all arches already get to include it one way or another,
typically via asm/scatterlist.h; but I guess it's safest to repeat it.)

 include/linux/scatterlist.h |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- 2.6.24-rc1/include/linux/scatterlist.h	2007-10-24 12:42:16.000000000 +0100
+++ linux/include/linux/scatterlist.h	2007-10-24 19:17:13.000000000 +0100
@@ -1,6 +1,7 @@
 #ifndef _LINUX_SCATTERLIST_H
 #define _LINUX_SCATTERLIST_H
 
+#include <asm/types.h>
 #include <asm/scatterlist.h>
 #include <linux/mm.h>
 #include <linux/string.h>
@@ -237,7 +238,7 @@ static inline void sg_init_table(struct 
  *   on the sg page.
  *
  **/
-static inline unsigned long sg_phys(struct scatterlist *sg)
+static inline dma_addr_t sg_phys(struct scatterlist *sg)
 {
 	return page_to_phys(sg_page(sg)) + sg->offset;
 }
-
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH 2.6.24-rc1] fix sg_phys to use dma_addr_t, Hugh Dickins, (Wed Oct 24, 3:01 pm)
Re: [PATCH 2.6.24-rc1] fix sg_phys to use dma_addr_t, Arjan van de Ven, (Wed Oct 24, 10:29 pm)
Re: [PATCH 2.6.24-rc1] fix sg_phys to use dma_addr_t, Rolf Eike Beer, (Thu Oct 25, 4:51 am)
Re: [PATCH 2.6.24-rc1] fix sg_phys to use dma_addr_t, Jens Axboe, (Thu Oct 25, 4:52 am)
Re: [PATCH 2.6.24-rc1] fix sg_phys to use dma_addr_t, Rolf Eike Beer, (Thu Oct 25, 5:00 am)
Re: [PATCH 2.6.24-rc1] fix sg_phys to use dma_addr_t, Jens Axboe, (Thu Oct 25, 5:06 am)
Re: [PATCH 2.6.24-rc1] fix sg_phys to use dma_addr_t, Rolf Eike Beer, (Thu Oct 25, 7:24 am)
Re: [PATCH 2.6.24-rc1] fix sg_phys to use dma_addr_t, Jens Axboe, (Thu Oct 25, 7:30 am)
Re: [PATCH 2.6.24-rc1] fix sg_phys to use dma_addr_t, Hugh Dickins, (Thu Oct 25, 2:40 am)
Re: [PATCH 2.6.24-rc1] fix sg_phys to use dma_addr_t, Jens Axboe, (Thu Oct 25, 3:54 am)