Skip to contentSkip to conversation

xen: fix sparse warning in p2m.c

PATCH In review Juergen Gross 2 participants 2 messages Dec 5, 2014

Subsystems (2)
lore
Share & tools
lore

Juergen Gross

author maintainer
#0 lore raw

PATCH 1/1 xen: fix sparse warning in p2m.c

The patch "Speed up set_phys_to_machine() by using read-only mappings" introduced a sparse warning:

arch/x86/xen/p2m.c:628:13: sparse: incorrect type in argument 1
(different address spaces)

Avoid the warning.

---
 arch/x86/xen/p2m.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
arch/x86/xen/p2m.c +3 -1
index 8b5db51..2defca9 100644
@@ -615,6 +615,7 @@ bool __set_phys_to_machine(unsigned long pfn, unsigned long mfn)
 {
 	pte_t *ptep;
 	unsigned int level;
+	unsigned long __user *addr;
 
 	/* don't track P2M changes in autotranslate guests */
 	if (unlikely(xen_feature(XENFEAT_auto_translated_physmap)))
@@ -625,7 +626,8 @@ bool __set_phys_to_machine(unsigned long pfn, unsigned long mfn)
 		return true;
 	}
 
-	if (likely(!__put_user(mfn, xen_p2m_addr + pfn)))
+	addr = (unsigned long __user *)xen_p2m_addr + pfn;
+	if (likely(!__put_user(mfn, addr)))
 		return true;
 
 	ptep = lookup_address((unsigned long)(xen_p2m_addr + pfn), &level);
Signature · 1 line
2.1.2
#1 lore raw
Quoted 7 lines · Juergen Gross

The patch "Speed up set_phys_to_machine() by using read-only mappings" introduced a sparse warning:

arch/x86/xen/p2m.c:628:13: sparse: incorrect type in argument 1
(different address spaces)

Avoid the warning.

Thanks.

But can you add some helper functions instead? Perhaps:

static inline int xen_safe_write_ulong(unsigned long *addr,
unsigned long val)

{
    //...
}

static inline int xen_safe_read_ulong(unsigned long *addr,
unsigned long *val)

{
    //...
}

David