@@ -172,9 +172,9 @@ static void cpum_cf_free_root(void)
172172 cpu_cf_root .cfptr = NULL ;
173173 irq_subclass_unregister (IRQ_SUBCLASS_MEASUREMENT_ALERT );
174174 on_each_cpu (cpum_cf_reset_cpu , NULL , 1 );
175- debug_sprintf_event (cf_dbg , 4 , "%s2 root.refcnt %u cfptr %px \n" ,
175+ debug_sprintf_event (cf_dbg , 4 , "%s root.refcnt %u cfptr %d \n" ,
176176 __func__ , refcount_read (& cpu_cf_root .refcnt ),
177- cpu_cf_root .cfptr );
177+ ! cpu_cf_root .cfptr );
178178}
179179
180180/*
@@ -975,10 +975,6 @@ static int cfdiag_push_sample(struct perf_event *event,
975975 }
976976
977977 overflow = perf_event_overflow (event , & data , & regs );
978- debug_sprintf_event (cf_dbg , 3 ,
979- "%s event %#llx sample_type %#llx raw %d ov %d\n" ,
980- __func__ , event -> hw .config ,
981- event -> attr .sample_type , raw .size , overflow );
982978 if (overflow )
983979 event -> pmu -> stop (event , 0 );
984980
@@ -1105,10 +1101,6 @@ static int cpum_cf_online_cpu(unsigned int cpu)
11051101{
11061102 int rc = 0 ;
11071103
1108- debug_sprintf_event (cf_dbg , 4 , "%s cpu %d root.refcnt %d "
1109- "opencnt %d\n" , __func__ , cpu ,
1110- refcount_read (& cpu_cf_root .refcnt ),
1111- refcount_read (& cfset_opencnt ));
11121104 /*
11131105 * Ignore notification for perf_event_open().
11141106 * Handle only /dev/hwctr device sessions.
@@ -1127,9 +1119,6 @@ static int cfset_offline_cpu(unsigned int cpu);
11271119
11281120static int cpum_cf_offline_cpu (unsigned int cpu )
11291121{
1130- debug_sprintf_event (cf_dbg , 4 , "%s cpu %d root.refcnt %d opencnt %d\n" ,
1131- __func__ , cpu , refcount_read (& cpu_cf_root .refcnt ),
1132- refcount_read (& cfset_opencnt ));
11331122 /*
11341123 * During task exit processing of grouped perf events triggered by CPU
11351124 * hotplug processing, pmu_disable() is called as part of perf context
@@ -1337,8 +1326,6 @@ static void cfset_ioctl_off(void *parm)
13371326 cpuhw -> state , S390_HWCTR_DEVICE , rc );
13381327 if (!cpuhw -> dev_state )
13391328 cpuhw -> flags &= ~PMU_F_IN_USE ;
1340- debug_sprintf_event (cf_dbg , 4 , "%s rc %d state %#llx dev_state %#llx\n" ,
1341- __func__ , rc , cpuhw -> state , cpuhw -> dev_state );
13421329}
13431330
13441331/* Start counter sets on particular CPU */
@@ -1360,17 +1347,13 @@ static void cfset_ioctl_on(void *parm)
13601347 else
13611348 pr_err ("Counter set start %#llx of /dev/%s failed rc=%i\n" ,
13621349 cpuhw -> dev_state | cpuhw -> state , S390_HWCTR_DEVICE , rc );
1363- debug_sprintf_event (cf_dbg , 4 , "%s rc %d state %#llx dev_state %#llx\n" ,
1364- __func__ , rc , cpuhw -> state , cpuhw -> dev_state );
13651350}
13661351
13671352static void cfset_release_cpu (void * p )
13681353{
13691354 struct cpu_cf_events * cpuhw = this_cpu_cfhw ();
13701355 int rc ;
13711356
1372- debug_sprintf_event (cf_dbg , 4 , "%s state %#llx dev_state %#llx\n" ,
1373- __func__ , cpuhw -> state , cpuhw -> dev_state );
13741357 cpuhw -> dev_state = 0 ;
13751358 rc = lcctl (cpuhw -> state ); /* Keep perf_event_open counter sets */
13761359 if (rc )
@@ -1459,7 +1442,6 @@ static int cfset_all_start(struct cfset_request *req)
14591442 if (atomic_read (& p .cpus_ack ) != cpumask_weight (mask )) {
14601443 on_each_cpu_mask (mask , cfset_ioctl_off , & p , 1 );
14611444 rc = - EIO ;
1462- debug_sprintf_event (cf_dbg , 4 , "%s CPUs missing" , __func__ );
14631445 }
14641446 free_cpumask_var (mask );
14651447 return rc ;
@@ -1516,8 +1498,6 @@ static int cfset_all_copy(unsigned long arg, cpumask_t *mask)
15161498 if (put_user (cpus , & ctrset_read -> no_cpus ))
15171499 rc = - EFAULT ;
15181500out :
1519- debug_sprintf_event (cf_dbg , 4 , "%s rc %d copied %ld\n" , __func__ , rc ,
1520- uptr - (void __user * )ctrset_read -> data );
15211501 return rc ;
15221502}
15231503
@@ -1565,8 +1545,6 @@ static void cfset_cpu_read(void *parm)
15651545 cpuhw -> used += space ;
15661546 cpuhw -> sets += 1 ;
15671547 }
1568- debug_sprintf_event (cf_dbg , 4 , "%s sets %d used %zd\n" , __func__ ,
1569- cpuhw -> sets , cpuhw -> used );
15701548 }
15711549}
15721550
@@ -1661,8 +1639,6 @@ static long cfset_ioctl_start(unsigned long arg, struct file *file)
16611639 if (!ret ) {
16621640 cfset_session_add (preq );
16631641 file -> private_data = preq ;
1664- debug_sprintf_event (cf_dbg , 4 , "%s set %#lx need %ld ret %d\n" ,
1665- __func__ , preq -> ctrset , need , ret );
16661642 } else {
16671643 kfree (preq );
16681644 }
@@ -1761,8 +1737,6 @@ static int cfset_offline_cpu(unsigned int cpu)
17611737
17621738static void cfdiag_read (struct perf_event * event )
17631739{
1764- debug_sprintf_event (cf_dbg , 3 , "%s event %#llx count %ld\n" , __func__ ,
1765- event -> attr .config , local64_read (& event -> count ));
17661740}
17671741
17681742static int get_authctrsets (void )
@@ -1807,8 +1781,6 @@ static int cfdiag_event_init2(struct perf_event *event)
18071781 if (!event -> hw .config_base )
18081782 err = - EINVAL ;
18091783
1810- debug_sprintf_event (cf_dbg , 5 , "%s err %d config_base %#lx\n" ,
1811- __func__ , err , event -> hw .config_base );
18121784 return err ;
18131785}
18141786
0 commit comments