Message ID | 20170804113613.12028-3-jgross@suse.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On 08/04/2017 07:36 AM, Juergen Gross wrote: > The function xen_set_domain_pte() is used nowhere in the kernel. > Remove it. > > Signed-off-by: Juergen Gross <jgross@suse.com> Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com> (+ Ingo and Steven who are maintainers of include/trace/events/xen.h) > --- > arch/x86/include/asm/xen/page.h | 2 -- > arch/x86/xen/mmu_pv.c | 20 -------------------- > include/trace/events/xen.h | 18 ------------------ > 3 files changed, 40 deletions(-) > > diff --git a/arch/x86/include/asm/xen/page.h b/arch/x86/include/asm/xen/page.h > index 497f7d28c1d6..07b6531813c4 100644 > --- a/arch/x86/include/asm/xen/page.h > +++ b/arch/x86/include/asm/xen/page.h > @@ -314,8 +314,6 @@ static inline pte_t __pte_ma(pteval_t x) > #define p4d_val_ma(x) ((x).p4d) > #endif > > -void xen_set_domain_pte(pte_t *ptep, pte_t pteval, unsigned domid); > - > xmaddr_t arbitrary_virt_to_machine(void *address); > unsigned long arbitrary_virt_to_mfn(void *vaddr); > void make_lowmem_page_readonly(void *vaddr); > diff --git a/arch/x86/xen/mmu_pv.c b/arch/x86/xen/mmu_pv.c > index cab28cf2cffb..0422ee7e70b3 100644 > --- a/arch/x86/xen/mmu_pv.c > +++ b/arch/x86/xen/mmu_pv.c > @@ -162,26 +162,6 @@ static bool xen_page_pinned(void *ptr) > return PagePinned(page); > } > > -void xen_set_domain_pte(pte_t *ptep, pte_t pteval, unsigned domid) > -{ > - struct multicall_space mcs; > - struct mmu_update *u; > - > - trace_xen_mmu_set_domain_pte(ptep, pteval, domid); > - > - mcs = xen_mc_entry(sizeof(*u)); > - u = mcs.args; > - > - /* ptep might be kmapped when using 32-bit HIGHPTE */ > - u->ptr = virt_to_machine(ptep).maddr; > - u->val = pte_val_ma(pteval); > - > - MULTI_mmu_update(mcs.mc, mcs.args, 1, NULL, domid); > - > - xen_mc_issue(PARAVIRT_LAZY_MMU); > -} > -EXPORT_SYMBOL_GPL(xen_set_domain_pte); > - > static void xen_extend_mmu_update(const struct mmu_update *update) > { > struct multicall_space mcs; > diff --git a/include/trace/events/xen.h b/include/trace/events/xen.h > index b70a38b7fa84..677e8ac2bb81 100644 > --- a/include/trace/events/xen.h > +++ b/include/trace/events/xen.h > @@ -149,24 +149,6 @@ DECLARE_EVENT_CLASS(xen_mmu__set_pte, > DEFINE_XEN_MMU_SET_PTE(xen_mmu_set_pte); > DEFINE_XEN_MMU_SET_PTE(xen_mmu_set_pte_atomic); > > -TRACE_EVENT(xen_mmu_set_domain_pte, > - TP_PROTO(pte_t *ptep, pte_t pteval, unsigned domid), > - TP_ARGS(ptep, pteval, domid), > - TP_STRUCT__entry( > - __field(pte_t *, ptep) > - __field(pteval_t, pteval) > - __field(unsigned, domid) > - ), > - TP_fast_assign(__entry->ptep = ptep; > - __entry->pteval = pteval.pte; > - __entry->domid = domid), > - TP_printk("ptep %p pteval %0*llx (raw %0*llx) domid %u", > - __entry->ptep, > - (int)sizeof(pteval_t) * 2, (unsigned long long)pte_val(native_make_pte(__entry->pteval)), > - (int)sizeof(pteval_t) * 2, (unsigned long long)__entry->pteval, > - __entry->domid) > - ); > - > TRACE_EVENT(xen_mmu_set_pte_at, > TP_PROTO(struct mm_struct *mm, unsigned long addr, > pte_t *ptep, pte_t pteval),
On Fri, 4 Aug 2017 15:20:30 -0400 Boris Ostrovsky <boris.ostrovsky@oracle.com> wrote: > On 08/04/2017 07:36 AM, Juergen Gross wrote: > > The function xen_set_domain_pte() is used nowhere in the kernel. > > Remove it. > > > > Signed-off-by: Juergen Gross <jgross@suse.com> > > Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com> > > (+ Ingo and Steven who are maintainers of include/trace/events/xen.h) But the maintainers of where the tracepoints are located have final say (in this case, the Xen maintainers). I like to be Cc'd to make sure that the events are efficient and don't waste cpu unnecessary CPU cycles or memory. -- Steve
diff --git a/arch/x86/include/asm/xen/page.h b/arch/x86/include/asm/xen/page.h index 497f7d28c1d6..07b6531813c4 100644 --- a/arch/x86/include/asm/xen/page.h +++ b/arch/x86/include/asm/xen/page.h @@ -314,8 +314,6 @@ static inline pte_t __pte_ma(pteval_t x) #define p4d_val_ma(x) ((x).p4d) #endif -void xen_set_domain_pte(pte_t *ptep, pte_t pteval, unsigned domid); - xmaddr_t arbitrary_virt_to_machine(void *address); unsigned long arbitrary_virt_to_mfn(void *vaddr); void make_lowmem_page_readonly(void *vaddr); diff --git a/arch/x86/xen/mmu_pv.c b/arch/x86/xen/mmu_pv.c index cab28cf2cffb..0422ee7e70b3 100644 --- a/arch/x86/xen/mmu_pv.c +++ b/arch/x86/xen/mmu_pv.c @@ -162,26 +162,6 @@ static bool xen_page_pinned(void *ptr) return PagePinned(page); } -void xen_set_domain_pte(pte_t *ptep, pte_t pteval, unsigned domid) -{ - struct multicall_space mcs; - struct mmu_update *u; - - trace_xen_mmu_set_domain_pte(ptep, pteval, domid); - - mcs = xen_mc_entry(sizeof(*u)); - u = mcs.args; - - /* ptep might be kmapped when using 32-bit HIGHPTE */ - u->ptr = virt_to_machine(ptep).maddr; - u->val = pte_val_ma(pteval); - - MULTI_mmu_update(mcs.mc, mcs.args, 1, NULL, domid); - - xen_mc_issue(PARAVIRT_LAZY_MMU); -} -EXPORT_SYMBOL_GPL(xen_set_domain_pte); - static void xen_extend_mmu_update(const struct mmu_update *update) { struct multicall_space mcs; diff --git a/include/trace/events/xen.h b/include/trace/events/xen.h index b70a38b7fa84..677e8ac2bb81 100644 --- a/include/trace/events/xen.h +++ b/include/trace/events/xen.h @@ -149,24 +149,6 @@ DECLARE_EVENT_CLASS(xen_mmu__set_pte, DEFINE_XEN_MMU_SET_PTE(xen_mmu_set_pte); DEFINE_XEN_MMU_SET_PTE(xen_mmu_set_pte_atomic); -TRACE_EVENT(xen_mmu_set_domain_pte, - TP_PROTO(pte_t *ptep, pte_t pteval, unsigned domid), - TP_ARGS(ptep, pteval, domid), - TP_STRUCT__entry( - __field(pte_t *, ptep) - __field(pteval_t, pteval) - __field(unsigned, domid) - ), - TP_fast_assign(__entry->ptep = ptep; - __entry->pteval = pteval.pte; - __entry->domid = domid), - TP_printk("ptep %p pteval %0*llx (raw %0*llx) domid %u", - __entry->ptep, - (int)sizeof(pteval_t) * 2, (unsigned long long)pte_val(native_make_pte(__entry->pteval)), - (int)sizeof(pteval_t) * 2, (unsigned long long)__entry->pteval, - __entry->domid) - ); - TRACE_EVENT(xen_mmu_set_pte_at, TP_PROTO(struct mm_struct *mm, unsigned long addr, pte_t *ptep, pte_t pteval),
The function xen_set_domain_pte() is used nowhere in the kernel. Remove it. Signed-off-by: Juergen Gross <jgross@suse.com> --- arch/x86/include/asm/xen/page.h | 2 -- arch/x86/xen/mmu_pv.c | 20 -------------------- include/trace/events/xen.h | 18 ------------------ 3 files changed, 40 deletions(-)