x2APIC emulation for kvm
v4 cover x2APIC emulation for kvm
This patch series implements x2APIC emulation for kvm. x2APIC is an MSR interface to a local apic with performance/scalability enhancements. It brings 32 bit apic ids (ids > 255 cannot be used without interrupt remapping since MSR/IOAPIC still support 8 bit destination IDs), 64bit ICR access, reading of ICR after IPI is no longer required.
Change from previous version:
Rebased on in_range() changes.
Ignore x2apic MSRs write when irqchip is in userspace.
--
Gleb.
PATCH v4 1/3 Add Directed EOI support to APIC emulation
Directed EOI is specified by x2APIC, but is available even when lapic is in xAPIC mode.
--- arch/x86/include/asm/apicdef.h | 2 ++ arch/x86/kvm/lapic.c | 38 ++++++++++++++++++++++++++++++-------- arch/x86/kvm/lapic.h | 1 + arch/x86/kvm/x86.c | 4 ++-- arch/x86/kvm/x86.h | 4 ++++ 5 files changed, 39 insertions(+), 10 deletions(-)
arch/x86/include/asm/apicdef.h +2 -0
@@ -14,6 +14,7 @@#define APIC_LVR 0x30#define APIC_LVR_MASK 0xFF00FF +#define APIC_LVR_DIRECTED_EOI (1 << 24)#define GET_APIC_VERSION (x) ((x) & 0xFFu)#define GET_APIC_MAXLVT (x) (((x) >> 16) & 0xFFu)#ifdef CONFIG_X86_32
@@ -40,6 +41,7 @@#define APIC_DFR_CLUSTER 0x0FFFFFFFul#define APIC_DFR_FLAT 0xFFFFFFFFul#define APIC_SPIV 0xF0 +#define APIC_SPIV_DIRECTED_EOI (1 << 12)#define APIC_SPIV_FOCUS_DISABLED (1 << 9)#define APIC_SPIV_APIC_ENABLED (1 << 8)#define APIC_ISR 0x100
arch/x86/kvm/lapic.c +30 -8
@@ -35,6 +35,7 @@#include "kvm_cache_regs.h" #include "irq.h" #include "trace.h" +#include "x86.h" #ifndef CONFIG_X86_64 #define mod_64 (x, y) ((x) - (y) * div64_u64(x, y))
@@ -142,6 +143,21 @@ static inline int apic_lvt_nmi_mode(u32 lvt_val)return (lvt_val & (APIC_MODE_MASK |APIC_LVT_MASKED )) ==APIC_DM_NMI ; } +void kvm_apic_set_version (struct kvm_vcpu *vcpu) +{ +struct kvm_lapic *apic = vcpu->arch.apic; +struct kvm_cpuid_entry2 *feat; +u32 v =APIC_VERSION ; + +if (!irqchip_in_kernel (vcpu->kvm)) +return ; + + feat =kvm_find_cpuid_entry (apic->vcpu,0x1 ,0 ); +if (feat && (feat->ecx & (1 << (X86_FEATURE_X2APIC &31 )))) + v |=APIC_LVR_DIRECTED_EOI ; +apic_set_reg (apic,APIC_LVR , v); +} +static unsigned int apic_lvt_mask[APIC_LVT_NUM ] = {LVT_MASK |APIC_LVT_TIMER_PERIODIC ,/* LVTT */ LVT_MASK |APIC_MODE_MASK ,/* LVTTHMR */
@@ -442,9 +458,11 @@ static void apic_set_eoi(struct kvm_lapic *apic) trigger_mode =IOAPIC_LEVEL_TRIG ; else trigger_mode =IOAPIC_EDGE_TRIG ; -mutex_lock (&apic->vcpu->kvm->irq_lock); -kvm_ioapic_update_eoi (apic->vcpu->kvm, vector, trigger_mode); -mutex_unlock (&apic->vcpu->kvm->irq_lock); +if (!(apic_get_reg (apic,APIC_SPIV ) &APIC_SPIV_DIRECTED_EOI )) { +mutex_lock (&apic->vcpu->kvm->irq_lock); +kvm_ioapic_update_eoi (apic->vcpu->kvm, vector, trigger_mode); +mutex_unlock (&apic->vcpu->kvm->irq_lock); + } }static void apic_send_ipi (struct kvm_lapic *apic)
@@ -694,8 +712,11 @@ static int apic_mmio_write(struct kvm_io_device *this,apic_set_reg (apic,APIC_DFR , val |0x0FFFFFFF );break ; -case APIC_SPIV : -apic_set_reg (apic,APIC_SPIV , val &0x3ff ); +case APIC_SPIV : { +u32 mask =0x3ff ; +if (apic_get_reg (apic,APIC_LVR ) &APIC_LVR_DIRECTED_EOI ) + mask |=APIC_SPIV_DIRECTED_EOI ; +apic_set_reg (apic,APIC_SPIV , val & mask);if (!(val &APIC_SPIV_APIC_ENABLED )) {int i;u32 lvt_val;
@@ -710,7 +731,7 @@ static int apic_mmio_write(struct kvm_io_device *this, }break ; - + }case APIC_ICR :/* No delay here, so we always clear the pending bit */ apic_set_reg (apic,APIC_ICR , val & ~(1 <<12 ));
@@ -837,7 +858,7 @@ void kvm_lapic_reset(struct kvm_vcpu *vcpu)hrtimer_cancel (&apic->lapic_timer.timer);apic_set_reg (apic,APIC_ID , vcpu->vcpu_id <<24 ); -apic_set_reg (apic,APIC_LVR ,APIC_VERSION ); +kvm_apic_set_version (apic->vcpu);for (i =0 ; i <APIC_LVT_NUM ; i++)apic_set_reg (apic,APIC_LVTT +0x10 * i,APIC_LVT_MASKED );
@@ -1041,7 +1062,8 @@ void kvm_apic_post_state_restore(struct kvm_vcpu *vcpu) apic->base_address = vcpu->arch.apic_base &MSR_IA32_APICBASE_BASE ; -apic_set_reg (apic,APIC_LVR ,APIC_VERSION ); +kvm_apic_set_version (vcpu); +apic_update_ppr (apic);hrtimer_cancel (&apic->lapic_timer.timer);update_divide_count (apic);
arch/x86/kvm/lapic.h +1 -0
@@ -29,6 +29,7 @@ u64 kvm_lapic_get_cr8(struct kvm_vcpu *vcpu);void kvm_lapic_set_tpr (struct kvm_vcpu *vcpu,unsigned long cr8);void kvm_lapic_set_base (struct kvm_vcpu *vcpu,u64 value);u64 kvm_lapic_get_base (struct kvm_vcpu *vcpu); +void kvm_apic_set_version (struct kvm_vcpu *vcpu);int kvm_apic_match_physical_addr (struct kvm_lapic *apic,u16 dest);int kvm_apic_match_logical_addr (struct kvm_lapic *apic,u8 mda);
arch/x86/kvm/x86.c +2 -2
@@ -79,8 +79,6 @@ static u64 __read_mostly efer_reserved_bits = 0xfffffffffffffffeULL;static int kvm_dev_ioctl_get_supported_cpuid (struct kvm_cpuid2 *cpuid,struct kvm_cpuid_entry2 __user *entries); -struct kvm_cpuid_entry2 *kvm_find_cpuid_entry (struct kvm_vcpu *vcpu, -u32 function,u32 index);struct kvm_x86_ops *kvm_x86_ops;EXPORT_SYMBOL_GPL (kvm_x86_ops);
@@ -1374,6 +1372,7 @@ static int kvm_vcpu_ioctl_set_cpuid(struct kvm_vcpu *vcpu, vcpu->arch.cpuid_nent = cpuid->nent;cpuid_fix_nx_cap (vcpu); r =0 ; +kvm_apic_set_version (vcpu); out_free:vfree (cpuid_entries);
@@ -1395,6 +1394,7 @@ static int kvm_vcpu_ioctl_set_cpuid2(struct kvm_vcpu *vcpu, cpuid->nent * sizeof(struct kvm_cpuid_entry2))) goto out; vcpu->arch.cpuid_nent = cpuid->nent; +kvm_apic_set_version (vcpu);return 0 ; out:
arch/x86/kvm/x86.h +4 -0
@@ -31,4 +31,8 @@ static inline bool kvm_exception_is_soft(unsigned int nr) {return (nr ==BP_VECTOR ) || (nr ==OF_VECTOR ); } + +struct kvm_cpuid_entry2 *kvm_find_cpuid_entry (struct kvm_vcpu *vcpu, +u32 function,u32 index); +#endif
Signature · 1 line
1.6.2.1
PATCH v4 2/3 x2apic interface to lapic
In reply to Gleb NatapovThis patch implements MSR interface to local apic as defines by x2apic Intel specification.
--- arch/x86/kvm/lapic.c | 220 +++++++++++++++++++++++++++++++++++++------------- arch/x86/kvm/lapic.h | 2 + arch/x86/kvm/x86.c | 7 ++- 3 files changed, 170 insertions(+), 59 deletions(-)
arch/x86/kvm/lapic.c +162 -58
@@ -32,6 +32,7 @@#include <asm/current.h> #include <asm/apicdef.h> #include <asm/atomic.h> +#include <asm/apicdef.h> #include "kvm_cache_regs.h" #include "irq.h" #include "trace.h"
@@ -158,6 +159,11 @@ void kvm_apic_set_version(struct kvm_vcpu *vcpu)apic_set_reg (apic,APIC_LVR , v); } +static inline int apic_x2apic_mode (struct kvm_lapic *apic) +{ +return apic->vcpu->arch.apic_base &X2APIC_ENABLE ; +} +static unsigned int apic_lvt_mask[APIC_LVT_NUM ] = {LVT_MASK |APIC_LVT_TIMER_PERIODIC ,/* LVTT */ LVT_MASK |APIC_MODE_MASK ,/* LVTTHMR */
@@ -284,7 +290,12 @@ int kvm_apic_match_physical_addr(struct kvm_lapic *apic, u16 dest)int kvm_apic_match_logical_addr (struct kvm_lapic *apic,u8 mda) {int result =0 ; -u8 logical_id; +u32 logical_id; + +if (apic_x2apic_mode (apic)) { + logical_id =apic_get_reg (apic,APIC_LDR ); +return logical_id & mda; + } logical_id =GET_APIC_LOGICAL_ID (apic_get_reg (apic,APIC_LDR ));
@@ -477,7 +488,10 @@ static void apic_send_ipi(struct kvm_lapic *apic) irq.level = icr_low &APIC_INT_ASSERT ; irq.trig_mode = icr_low &APIC_INT_LEVELTRIG ; irq.shorthand = icr_low &APIC_SHORT_MASK ; - irq.dest_id =GET_APIC_DEST_FIELD (icr_high); +if (apic_x2apic_mode (apic)) + irq.dest_id = icr_high; +else + irq.dest_id =GET_APIC_DEST_FIELD (icr_high);apic_debug ("icr_high 0x%x, icr_low 0x%x, " "short_hand 0x%x, dest 0x%x, trig_mode 0x%x, level 0x%x, "
@@ -538,6 +552,9 @@ static u32 __apic_read(struct kvm_lapic *apic, unsigned int offset)return 0 ;switch (offset) { +case APIC_ID : +apic_get_reg (apic, offset); +break ;case APIC_ARBPRI :printk (KERN_WARNING "Access APIC ARBPRI register " "which is for P6\n" );
@@ -564,28 +581,26 @@ static inline struct kvm_lapic *to_lapic(struct kvm_io_device *dev) return container_of(dev, struct kvm_lapic, dev); } -static int apic_mmio_in_range (struct kvm_lapic *apic,gpa_t addr) -{ -return apic_hw_enabled (apic) && - addr >= apic->base_address && - addr < apic->base_address +LAPIC_MMIO_LENGTH ; -} - -static int apic_mmio_read (struct kvm_io_device *this, -gpa_t address,int len,void *data) +static int apic_reg_read (struct kvm_lapic *apic,u32 offset,int len, +void *data) { -struct kvm_lapic *apic =to_lapic (this); -unsigned int offset = address - apic->base_address;unsigned char alignment = offset &0xf ;u32 result; -if (!apic_mmio_in_range (apic, address)) -return -EOPNOTSUPP ; +/* this bitmask has a bit cleared for each reserver register */ +static const u64 rmask =0x43ff01ffffffe70cULL ;if ((alignment + len) >4 ) { -printk (KERN_ERR "KVM_APIC_READ: alignment error %lx %d" , - (unsigned long )address, len); -return 0 ; +printk (KERN_ERR "KVM_APIC_READ: alignment error %x %d\n" , + offset, len); +return 1 ; + } + +if (offset >0x3f0 || !(rmask & (1ULL << (offset >>4 )))) { +printk (KERN_ERR "KVM_APIC_READ: read reserved register %x\n" , + offset); +return 1 ; } + result =__apic_read (apic, offset & ~0xf );trace_kvm_apic_read (offset, result);
@@ -604,6 +619,27 @@ static int apic_mmio_read(struct kvm_io_device *this,return 0 ; } +static int apic_mmio_in_range (struct kvm_lapic *apic,gpa_t addr) +{ +return apic_hw_enabled (apic) && + addr >= apic->base_address && + addr < apic->base_address +LAPIC_MMIO_LENGTH ; +} + +static int apic_mmio_read (struct kvm_io_device *this, +gpa_t address,int len,void *data) +{ +struct kvm_lapic *apic =to_lapic (this); +u32 offset = address - apic->base_address; + +if (!apic_mmio_in_range (apic, address)) +return -EOPNOTSUPP ; + +apic_reg_read (apic, offset, len, data); + +return 0 ; +} +static void update_divide_count (struct kvm_lapic *apic) {u32 tmp1, tmp2, tdcr;
@@ -657,42 +693,18 @@ static void apic_manage_nmi_watchdog(struct kvm_lapic *apic, u32 lvt0_val) apic->vcpu->kvm->arch.vapics_in_nmi_mode--; } -static int apic_mmio_write (struct kvm_io_device *this, -gpa_t address,int len,const void *data) +static int apic_reg_write (struct kvm_lapic *apic,u32 reg,u32 val) { -struct kvm_lapic *apic =to_lapic (this); -unsigned int offset = address - apic->base_address; -unsigned char alignment = offset &0xf ; -u32 val; -if (!apic_mmio_in_range (apic, address)) -return -EOPNOTSUPP ; +int ret =0 ; -/* -* APIC register must be aligned on 128-bits boundary. -* 32/64/128 bits registers must be accessed thru 32 bits. -* Refer SDM 8.4.1 -*/ -if (len !=4 || alignment) { -/* Don't shout loud, $infamous_os would cause only noise. */ -apic_debug ("apic write: bad size=%d %lx\n" , - len, (long )address); -return 0 ; - } +trace_kvm_apic_write (reg, val); - val = *(u32 *) data; - -/* too common printing */ -if (offset !=APIC_EOI ) -apic_debug ("%s: offset 0x%x with length 0x%x, and value is " -"0x%x\n" , __func__, offset, len, val); - - offset &=0xff0 ; - -trace_kvm_apic_write (offset, val); - -switch (offset) { +switch (reg) {case APIC_ID :/* Local APIC ID */ -apic_set_reg (apic,APIC_ID , val); +if (!apic_x2apic_mode (apic)) +apic_set_reg (apic,APIC_ID , val); +else + ret =1 ;break ;case APIC_TASKPRI :
@@ -705,11 +717,17 @@ static int apic_mmio_write(struct kvm_io_device *this,break ;case APIC_LDR : -apic_set_reg (apic,APIC_LDR , val &APIC_LDR_MASK ); +if (!apic_x2apic_mode (apic)) +apic_set_reg (apic,APIC_LDR , val &APIC_LDR_MASK ); +else + ret =1 ;break ;case APIC_DFR : -apic_set_reg (apic,APIC_DFR , val |0x0FFFFFFF ); +if (!apic_x2apic_mode (apic)) +apic_set_reg (apic,APIC_DFR , val |0x0FFFFFFF ); +else + ret =1 ;break ;case APIC_SPIV : {
@@ -739,7 +757,9 @@ static int apic_mmio_write(struct kvm_io_device *this,break ;case APIC_ICR2 : -apic_set_reg (apic,APIC_ICR2 , val &0xff000000 ); +if (!apic_x2apic_mode (apic)) + val &=0xff000000 ; +apic_set_reg (apic,APIC_ICR2 , val);break ;case APIC_LVT0 :
@@ -753,8 +773,8 @@ static int apic_mmio_write(struct kvm_io_device *this,if (!apic_sw_enabled (apic)) val |=APIC_LVT_MASKED ; - val &= apic_lvt_mask[(offset -APIC_LVTT ) >>4 ]; -apic_set_reg (apic, offset, val); + val &= apic_lvt_mask[(reg -APIC_LVTT ) >>4 ]; +apic_set_reg (apic, reg, val);break ;
@@ -762,7 +782,7 @@ static int apic_mmio_write(struct kvm_io_device *this,hrtimer_cancel (&apic->lapic_timer.timer);apic_set_reg (apic,APIC_TMICT , val);start_apic_timer (apic); -return 0 ; +break ;case APIC_TDCR :if (val &4 )
@@ -771,11 +791,58 @@ static int apic_mmio_write(struct kvm_io_device *this,update_divide_count (apic);break ; +case APIC_ESR : +if (apic_x2apic_mode (apic) && val !=0 ) { +printk (KERN_ERR "KVM_WRITE:ESR not zero %x\n" , val); + ret =1 ; + } +break ; + +case APIC_SELF_IPI : +if (apic_x2apic_mode (apic)) { +apic_reg_write (apic,APIC_ICR ,0x40000 | (val &0xff )); + }else + ret =1 ; +break ;default : -apic_debug ("Local APIC Write to read-only register %x\n" , - offset); + ret =1 ;break ; } +if (ret) +apic_debug ("Local APIC Write to read-only register %x\n" , reg); +return ret; +} + +static int apic_mmio_write (struct kvm_io_device *this, +gpa_t address,int len,const void *data) +{ +struct kvm_lapic *apic =to_lapic (this); +unsigned int offset = address - apic->base_address; +u32 val; + +if (!apic_mmio_in_range (apic, address)) +return -EOPNOTSUPP ; + +/* +* APIC register must be aligned on 128-bits boundary. +* 32/64/128 bits registers must be accessed thru 32 bits. +* Refer SDM 8.4.1 +*/ +if (len !=4 || (offset &0xf )) { +/* Don't shout loud, $infamous_os would cause only noise. */ +apic_debug ("apic write: bad size=%d %lx\n" , len, (long )address); +return ; + } + + val = *(u32 *)data; + +/* too common printing */ +if (offset !=APIC_EOI ) +apic_debug ("%s: offset 0x%x with length 0x%x, and value is " +"0x%x\n" , __func__, offset, len, val); + +apic_reg_write (apic, offset &0xff0 , val); +return 0 ; }
@@ -834,6 +901,11 @@ void kvm_lapic_set_base(struct kvm_vcpu *vcpu, u64 value) value &= ~MSR_IA32_APICBASE_BSP ; vcpu->arch.apic_base = value; +if (apic_x2apic_mode (apic)) { +u32 id =kvm_apic_id (apic); +u32 ldr = ((id & ~0xf ) <<16 ) | (1 << (id &0xf )); +apic_set_reg (apic,APIC_LDR , ldr); + } apic->base_address = apic->vcpu->arch.apic_base &MSR_IA32_APICBASE_BASE ;
@@ -1130,3 +1202,35 @@ void kvm_lapic_set_vapic_addr(struct kvm_vcpu *vcpu, gpa_t vapic_addr) vcpu->arch.apic->vapic_addr = vapic_addr; } + +int kvm_x2apic_msr_write (struct kvm_vcpu *vcpu,u32 msr,u64 data) +{ +struct kvm_lapic *apic = vcpu->arch.apic; +u32 reg = (msr -APIC_BASE_MSR ) <<4 ; + +if (!irqchip_in_kernel (vcpu->kvm) || !apic_x2apic_mode (apic)) +return 1 ; + +/* if this is ICR write vector before command */ +if (msr ==0x830 ) +apic_reg_write (apic,APIC_ICR2 , (u32)(data >>32 )); +return apic_reg_write (apic, reg, (u32 )data); +} + +int kvm_x2apic_msr_read (struct kvm_vcpu *vcpu,u32 msr,u64 *data) +{ +struct kvm_lapic *apic = vcpu->arch.apic; +u32 reg = (msr -APIC_BASE_MSR ) <<4 , low, high =0 ; + +if (!irqchip_in_kernel (vcpu->kvm) || !apic_x2apic_mode (apic)) +return 1 ; + +if (apic_reg_read (apic, reg,4 , &low)) +return 1 ; +if (msr ==0x830 ) +apic_reg_read (apic,APIC_ICR2 ,4 , &high); + + *data = (((u64 )high) <<32 ) | low; + +return 0 ; +}
arch/x86/kvm/lapic.h +2 -0
@@ -46,4 +46,6 @@ void kvm_lapic_set_vapic_addr(struct kvm_vcpu *vcpu, gpa_t vapic_addr);void kvm_lapic_sync_from_vapic (struct kvm_vcpu *vcpu);void kvm_lapic_sync_to_vapic (struct kvm_vcpu *vcpu); +int kvm_x2apic_msr_write (struct kvm_vcpu *vcpu,u32 msr,u64 data); +int kvm_x2apic_msr_read (struct kvm_vcpu *vcpu,u32 msr,u64 *data);#endif
arch/x86/kvm/x86.c +6 -1
@@ -867,6 +867,8 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, u32 msr, u64 data)case MSR_IA32_APICBASE :kvm_set_apic_base (vcpu, data);break ; + case APIC_BASE_MSR ... APIC_BASE_MSR + 0x3ff: +return kvm_x2apic_msr_write (vcpu, msr, data);case MSR_IA32_MISC_ENABLE : vcpu->arch.ia32_misc_enable_msr = data;break ;
@@ -1065,6 +1067,9 @@ int kvm_get_msr_common(struct kvm_vcpu *vcpu, u32 msr, u64 *pdata)case MSR_IA32_APICBASE : data =kvm_get_apic_base (vcpu);break ; + case APIC_BASE_MSR ... APIC_BASE_MSR + 0x3ff: +return kvm_x2apic_msr_read (vcpu, msr, pdata); +break ;case MSR_IA32_MISC_ENABLE : data = vcpu->arch.ia32_misc_enable_msr;break ;
@@ -1470,7 +1475,7 @@ static void do_cpuid_ent(struct kvm_cpuid_entry2 *entry, u32 function,0 /* TM2 */ |F (SSSE3 ) |0 /* CNXT-ID */ |0 /* Reserved */ |0 /* Reserved */ |F (CX16 ) |0 /* xTPR Update, PDCM */ |0 /* Reserved, DCA */ |F (XMM4_1 ) | -F (XMM4_2 ) |0 /* x2APIC */ |F (MOVBE ) |F (POPCNT ) | +F (XMM4_2 ) |F (X2APIC ) |F (MOVBE ) |F (POPCNT ) |0 /* Reserved, XSAVE, OSXSAVE */ ;/* cpuid 0x80000001.ecx */ const u32 kvm_supported_word6_x86_features =
Signature · 1 line
1.6.2.1
PATCH v4 3/3 Add X2APIC support.
In reply to Gleb NatapovAdd "x2apic" string to extended features name array to be recognizable by -cpu cputype,+x2apic command line option. If kvm kernel module does not support x2apic the option will be trimmed from cpuid.
--- target-i386/helper.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
target-i386/helper.c +1 -1
@@ -45,7 +45,7 @@ static const char *feature_name[] = {static const char *ext_feature_name[] = {"pni" /* Intel,AMD sse3 */ ,NULL ,NULL ,"monitor" ,"ds_cpl" ,"vmx" ,NULL /* Linux smx */ ,"est" ,"tm2" ,"ssse3" ,"cid" ,NULL ,NULL ,"cx16" ,"xtpr" ,NULL , -NULL ,NULL ,"dca" ,NULL ,NULL ,NULL ,NULL ,"popcnt" , +NULL ,NULL ,"dca" ,NULL ,NULL ,"x2apic" ,NULL ,"popcnt" ,NULL ,NULL ,NULL ,NULL ,NULL ,NULL ,NULL ,"hypervisor" , };static const char *ext2_feature_name[] = {
Signature · 1 line
1.6.2.1
Avi Kivity
AppliedQuoted 7 lines · Gleb Natapov
This patch series implements x2APIC emulation for kvm. x2APIC is an MSR interface to a local apic with performance/scalability enhancements. It brings 32 bit apic ids (ids> 255 cannot be used without interrupt remapping since MSR/IOAPIC still support 8 bit destination IDs), 64bit ICR access, reading of ICR after IPI is no longer required.
Applied, thanks.
Signature · 1 line
error compiling committee.c: too many arguments to function