Re: [PATCH] Fix virt_to_phys() warnings

[Andrew Morton]

On Thu, 2 Jul 2009 11:40:27 +0100 Ralf Baechle <ralf@xxxxxxxxxxxxxx> wrote:

> On Wed, Jul 01, 2009 at 10:46:27PM -0700, Andrew Morton wrote:
> 
> > > mm/page_alloc.c: In function 'alloc_pages_exact':
> > > mm/page_alloc.c:1986: warning: passing argument 1 of 'virt_to_phys' makes pointer from integer without a cast
> > > 
> > > drivers/usb/mon/mon_bin.c: In function 'mon_alloc_buff':
> > > drivers/usb/mon/mon_bin.c:1264: warning: passing argument 1 of 'virt_to_phys' makes pointer from integer without a cast
> > > 
> > > Signed-off-by: Kevin Cernekee <cernekee@xxxxxxxxx>
> > > ---
> > > diff --git a/drivers/usb/mon/mon_bin.c b/drivers/usb/mon/mon_bin.c
> > > index f8d9045..0f7a30b 100644
> > > --- a/drivers/usb/mon/mon_bin.c
> > > +++ b/drivers/usb/mon/mon_bin.c
> > > @@ -1261,7 +1261,7 @@ static int mon_alloc_buff(struct mon_pgmap *map, int npages)
> > >  			return -ENOMEM;
> > >  		}
> > >  		map[n].ptr = (unsigned char *) vaddr;
> > > -		map[n].pg = virt_to_page(vaddr);
> > > +		map[n].pg = virt_to_page((void *) vaddr);
> > >  	}
> > >  	return 0;
> > >  }
> > > diff --git a/mm/page_alloc.c b/mm/page_alloc.c
> > > index 5d714f8..f6180db 100644
> > > --- a/mm/page_alloc.c
> > > +++ b/mm/page_alloc.c
> > > @@ -1983,7 +1983,7 @@ void *alloc_pages_exact(size_t size, gfp_t gfp_mask)
> > >  		unsigned long alloc_end = addr + (PAGE_SIZE << order);
> > >  		unsigned long used = addr + PAGE_ALIGN(size);
> > >  
> > > -		split_page(virt_to_page(addr), order);
> > > +		split_page(virt_to_page((void *)addr), order);
> > >  		while (used < alloc_end) {
> > >  			free_page(used);
> > >  			used += PAGE_SIZE;
> > 
> > The virt_to_foo() functions were written back in the Linux dark ages and
> > they're horrid.  A byzantine mixture of macros and typecasts which make
> > it really hard to work out what type their argument actually should be.
> 
> No disagreement there.
> 
> > virt_to_page() takes an argument of type `unsigned long'.  (except for
> > the include/asm-generic/page.h version which takes any damn type at
> > all).
> 
> You meant it takes a pointer argument, for example:
> 
> mm/page_alloc.c:
> 	__free_pages(virt_to_page((void *)addr), order);
> mm/slob.c:
> static inline struct slob_page *slob_page(const void *addr)
> {
>         return (struct slob_page *)virt_to_page(addr);
> }
> 

lol.  I think you're right.  What a crock.

looky, they're popping up everywhere:

: static void perf_mmap_free_page(unsigned long addr)
: {
: 	struct page *page = virt_to_page(addr);
: 

And mm/nommu.c:

: int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
: 		     unsigned long start, int nr_pages, int flags,
:		     struct page **pages, struct vm_area_struct **vmas)
: {
: 	...
:                       pages[i] = virt_to_page(start);


: static void free_page_series(unsigned long from, unsigned long to)
: {
: 	for (; from < to; from += PAGE_SIZE) {
: 		struct page *page = virt_to_page(from);

Heaven knows how many more there are.  I guess we should drag x86's
virt_to_page()/virt_to_phys() into the 1980's by doing some
compile-time arg checking?

>
> ...
> 
> Anyway, since virt_to_page and virt_to_phys (imho :-) take the same
> argument times I'm in favor of Kevin's patch.

yup, I'll queue it.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/