2015-08-19 13:25:52

by Murilo Opsfelder Araujo

Subject: [PATCH] xen/tmem: Pass page instead of pfn to xen_tmem_get_page()

The commit 091208a676dfdabb2b8fe86ee155c6fc80081b69 "xen/tmem: Use
xen_page_to_gfn rather than pfn_to_gfn" left behind a call to
xen_tmem_get_page() receiving pfn instead of page.

This change also fixes the following build warning:

drivers/xen/tmem.c: In function ‘tmem_cleancache_get_page’:
drivers/xen/tmem.c:194:47: warning: passing argument 4 of ‘xen_tmem_get_page’ makes pointer from integer without a cast
ret = xen_tmem_get_page((u32)pool, oid, ind, pfn);
^
drivers/xen/tmem.c:138:12: note: expected ‘struct page *’ but argument is of type ‘long unsigned int’
static int xen_tmem_get_page(u32 pool_id, struct tmem_oid oid,
^

Signed-off-by: Murilo Opsfelder Araujo <[email protected]>
---
drivers/xen/tmem.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/xen/tmem.c b/drivers/xen/tmem.c
index b0c895e..945fc43 100644
--- a/drivers/xen/tmem.c
+++ b/drivers/xen/tmem.c
@@ -183,7 +183,6 @@ static int tmem_cleancache_get_page(int pool, struct cleancache_filekey key,
{
u32 ind = (u32) index;
struct tmem_oid oid = *(struct tmem_oid *)&key;
- unsigned long pfn = page_to_pfn(page);
int ret;

/* translate return values to linux semantics */
@@ -191,7 +190,7 @@ static int tmem_cleancache_get_page(int pool, struct cleancache_filekey key,
return -1;
if (ind != index)
return -1;
- ret = xen_tmem_get_page((u32)pool, oid, ind, pfn);
+ ret = xen_tmem_get_page((u32)pool, oid, ind, page);
if (ret == 1)
return 0;
else
--
2.1.4

2015-08-20 00:24:37

by Julien Grall

Subject: Re: [PATCH] xen/tmem: Pass page instead of pfn to xen_tmem_get_page()

Hi,

On 19/08/2015 06:25, Murilo Opsfelder Araujo wrote:
> The commit 091208a676dfdabb2b8fe86ee155c6fc80081b69 "xen/tmem: Use
> xen_page_to_gfn rather than pfn_to_gfn" left behind a call to
> xen_tmem_get_page() receiving pfn instead of page.
>
> This change also fixes the following build warning:
>
> drivers/xen/tmem.c: In function ‘tmem_cleancache_get_page’:
> drivers/xen/tmem.c:194:47: warning: passing argument 4 of ‘xen_tmem_get_page’ makes pointer from integer without a cast
> ret = xen_tmem_get_page((u32)pool, oid, ind, pfn);
> ^
> drivers/xen/tmem.c:138:12: note: expected ‘struct page *’ but argument is of type ‘long unsigned int’
> static int xen_tmem_get_page(u32 pool_id, struct tmem_oid oid,
> ^
>
> Signed-off-by: Murilo Opsfelder Araujo <[email protected]>

Sorry for the breakage, I haven't spot it because CONFIG_CLEANCACHE is
not enabled on my config.

Reviewed-by: Julien Grall <[email protected]>

Regards,

--
Julien Grall

2015-08-20 11:27:15

by David Vrabel

Subject: Re: [PATCH] xen/tmem: Pass page instead of pfn to xen_tmem_get_page()

On 19/08/15 14:25, Murilo Opsfelder Araujo wrote:
> The commit 091208a676dfdabb2b8fe86ee155c6fc80081b69 "xen/tmem: Use
> xen_page_to_gfn rather than pfn_to_gfn" left behind a call to
> xen_tmem_get_page() receiving pfn instead of page.
>
> This change also fixes the following build warning:
>
> drivers/xen/tmem.c: In function ‘tmem_cleancache_get_page’:
> drivers/xen/tmem.c:194:47: warning: passing argument 4 of ‘xen_tmem_get_page’ makes pointer from integer without a cast
> ret = xen_tmem_get_page((u32)pool, oid, ind, pfn);
> ^
> drivers/xen/tmem.c:138:12: note: expected ‘struct page *’ but argument is of type ‘long unsigned int’
> static int xen_tmem_get_page(u32 pool_id, struct tmem_oid oid,

I've folded this in, thanks.

David

2015-08-22 14:52:07

by Murilo Opsfelder Araujo

Subject: Re: [PATCH] xen/tmem: Pass page instead of pfn to xen_tmem_get_page()

On Wed, Aug 19, 2015 at 9:23 PM, Julien Grall <[email protected]> wrote:
> Hi,
>
> On 19/08/2015 06:25, Murilo Opsfelder Araujo wrote:
>>
>> The commit 091208a676dfdabb2b8fe86ee155c6fc80081b69 "xen/tmem: Use
>> xen_page_to_gfn rather than pfn_to_gfn" left behind a call to
>> xen_tmem_get_page() receiving pfn instead of page.
>>
>> This change also fixes the following build warning:
>>
>> drivers/xen/tmem.c: In function ‘tmem_cleancache_get_page’:
>> drivers/xen/tmem.c:194:47: warning: passing argument 4 of
>> ‘xen_tmem_get_page’ makes pointer from integer without a cast
>> ret = xen_tmem_get_page((u32)pool, oid, ind, pfn);
>> ^
>> drivers/xen/tmem.c:138:12: note: expected ‘struct page *’ but argument is
>> of type ‘long unsigned int’
>> static int xen_tmem_get_page(u32 pool_id, struct tmem_oid oid,
>> ^
>>
>> Signed-off-by: Murilo Opsfelder Araujo <[email protected]>
>
>
> Sorry for the breakage, I haven't spot it because CONFIG_CLEANCACHE is not
> enabled on my config.
>
> Reviewed-by: Julien Grall <[email protected]>
>
> Regards,
>
> --
> Julien Grall

Hi, Julien.

No need to apologize, and thanks for reviewing that.

--
Murilo

2015-08-22 14:52:45

by Murilo Opsfelder Araujo

Subject: Re: [PATCH] xen/tmem: Pass page instead of pfn to xen_tmem_get_page()

On Thu, Aug 20, 2015 at 8:27 AM, David Vrabel <[email protected]> wrote:
> On 19/08/15 14:25, Murilo Opsfelder Araujo wrote:
>> The commit 091208a676dfdabb2b8fe86ee155c6fc80081b69 "xen/tmem: Use
>> xen_page_to_gfn rather than pfn_to_gfn" left behind a call to
>> xen_tmem_get_page() receiving pfn instead of page.
>>
>> This change also fixes the following build warning:
>>
>> drivers/xen/tmem.c: In function ‘tmem_cleancache_get_page’:
>> drivers/xen/tmem.c:194:47: warning: passing argument 4 of ‘xen_tmem_get_page’ makes pointer from integer without a cast
>> ret = xen_tmem_get_page((u32)pool, oid, ind, pfn);
>> ^
>> drivers/xen/tmem.c:138:12: note: expected ‘struct page *’ but argument is of type ‘long unsigned int’
>> static int xen_tmem_get_page(u32 pool_id, struct tmem_oid oid,
>
> I've folded this in, thanks.
>
> David

Thanks, David.

--
Murilo