HV: treewide: enforce unsignedness of pcpu_id

In the hypervisor, physical cpu id is defined as "int" or "uint32_t"
type in the hypervisor. So there are some sign conversion issues
about  physical cpu id (pcpu_id) reported by static analysis tool.
Sign conversion violates the rules of MISRA C:2012.

In this patch, define physical cpu id as "uint16_t" type for all
modules in the hypervisor and change related codes. The valid
range of pcpu_id is 0~65534, INVALID_PCPU_ID is defined to the
invalid pcpu_id for error detection, BROADCAST_PCPU_ID is
broadcast pcpu_id used to notify all valid pcpu.

The type of pcpu_id in the struct vcpu and vcpu_id is "int" type,
this will be fixed in another patch.

V1-->V2:
    *  Change the type of pcpu_id from uint32_t to uint16_t;
    *  Define INVALID_PCPU_ID for error detection;
    *  Define BROADCAST_PCPU_ID to notify all valid pcpu.

V2-->V3:
    *  Update comments for INVALID_PCPU_ID and BROADCAST_PCPU_ID;
    *  Update addtional pcpu_id;
    *  Convert hexadecimals to unsigned to meet the type of pcpu_id;
    *  Clean up for MIN_PCPU_ID and MAX_PCPU_ID, they will be
       defined by configuration.
Note: fix bug in the init_lapic(), the pcpu_id shall be less than 8,
this is constraint by implement in the init_lapic().
Signed-off-by: Xiangyang Wu <xiangyang.wu@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
Xiangyang Wu
2018-06-20 15:42:52 +08:00
committed by lijinxia
parent 2922a657c9
commit 3027bfab10
37 changed files with 110 additions and 94 deletions

View File

@@ -506,7 +506,7 @@ static void ptdev_intr_handle_irq(struct vm *vm,
}
}
void ptdev_softirq(__unused int cpu)
void ptdev_softirq(__unused uint16_t cpu_id)
{
while (1) {
struct ptdev_remapping_info *entry = ptdev_dequeue_softirq();

View File

@@ -23,7 +23,7 @@ spinlock_t up_count_spinlock = {
};
struct per_cpu_region *per_cpu_data_base_ptr;
int phy_cpu_num = 0;
uint16_t phy_cpu_num = 0U;
unsigned long pcpu_sync = 0;
volatile uint32_t up_count = 0;
@@ -224,7 +224,7 @@ static int hardware_detect_support(void)
return 0;
}
static void alloc_phy_cpu_data(int pcpu_num)
static void alloc_phy_cpu_data(uint16_t pcpu_num)
{
phy_cpu_num = pcpu_num;
@@ -245,7 +245,8 @@ int __attribute__((weak)) parse_madt(uint8_t *lapic_id_base)
static int init_phy_cpu_storage(void)
{
int i, pcpu_num = 0;
int i;
uint16_t pcpu_num=0U;
int bsp_cpu_id;
uint8_t bsp_lapic_id = 0;
uint8_t *lapic_id_base;

View File

@@ -47,7 +47,7 @@ inline struct vcpu *vcpu_from_vid(struct vm *vm, int vcpu_id)
return NULL;
}
inline struct vcpu *vcpu_from_pid(struct vm *vm, int pcpu_id)
inline struct vcpu *vcpu_from_pid(struct vm *vm, uint16_t pcpu_id)
{
int i;
struct vcpu *vcpu;

View File

@@ -14,7 +14,7 @@ extern struct efi_ctx* efi_ctx;
vm_sw_loader_t vm_sw_loader;
struct vcpu *get_ever_run_vcpu(int pcpu_id)
struct vcpu *get_ever_run_vcpu(uint16_t pcpu_id)
{
return per_cpu(ever_run_vcpu, pcpu_id);
}
@@ -31,7 +31,7 @@ struct vcpu *get_ever_run_vcpu(int pcpu_id)
* for physical CPU 1 : vcpu->pcpu_id = 1, vcpu->vcpu_id = 1, vmid = 1;
*
***********************************************************************/
int create_vcpu(int cpu_id, struct vm *vm, struct vcpu **rtn_vcpu_handle)
int create_vcpu(uint16_t cpu_id, struct vm *vm, struct vcpu **rtn_vcpu_handle)
{
struct vcpu *vcpu;
@@ -284,7 +284,7 @@ void reset_vcpu(struct vcpu *vcpu)
void pause_vcpu(struct vcpu *vcpu, enum vcpu_state new_state)
{
int pcpu_id = get_cpu_id();
uint16_t pcpu_id = get_cpu_id();
pr_dbg("vcpu%d paused, new state: %d",
vcpu->vcpu_id, new_state);
@@ -334,7 +334,7 @@ void schedule_vcpu(struct vcpu *vcpu)
}
/* help function for vcpu create */
int prepare_vcpu(struct vm *vm, int pcpu_id)
int prepare_vcpu(struct vm *vm, uint16_t pcpu_id)
{
int ret = 0;
struct vcpu *vcpu = NULL;

View File

@@ -115,7 +115,7 @@ vm_lapic_from_vcpu_id(struct vm *vm, int vcpu_id)
}
struct vlapic *
vm_lapic_from_pcpuid(struct vm *vm, int pcpu_id)
vm_lapic_from_pcpuid(struct vm *vm, uint16_t pcpu_id)
{
struct vcpu *vcpu;
@@ -125,7 +125,7 @@ vm_lapic_from_pcpuid(struct vm *vm, int pcpu_id)
return vcpu->arch_vcpu.vlapic;
}
static int vm_apicid2vcpu_id(struct vm *vm, uint8_t lapicid)
static uint16_t vm_apicid2vcpu_id(struct vm *vm, uint8_t lapicid)
{
int i;
struct vcpu *vcpu;

View File

@@ -232,7 +232,7 @@ static void vpic_notify_intr(struct vpic *vpic)
ASSERT(vcpu != NULL, "vm%d, vcpu0", vpic->vm->attr.id);
vcpu_inject_extint(vcpu);
} else {
vlapic_set_local_intr(vpic->vm, -1, APIC_LVT_LINT0);
vlapic_set_local_intr(vpic->vm, BROADCAST_PCPU_ID, APIC_LVT_LINT0);
/* notify vioapic pin0 if existing
* For vPIC + vIOAPIC mode, vpic master irq connected
* to vioapic pin0 (irq2)

View File

@@ -211,11 +211,11 @@ int early_init_lapic(void)
return 0;
}
int init_lapic(uint32_t cpu_id)
int init_lapic(uint16_t cpu_id)
{
/* Set the Logical Destination Register */
write_lapic_reg32(LAPIC_LOGICAL_DESTINATION_REGISTER,
(1 << cpu_id) << 24);
((1U << cpu_id) << 24));
/* Set the Destination Format Register */
write_lapic_reg32(LAPIC_DESTINATION_FORMAT_REGISTER, 0xf << 28);
@@ -408,7 +408,7 @@ send_startup_ipi(enum intr_cpu_startup_shorthand cpu_startup_shorthand,
return status;
}
void send_single_ipi(uint32_t pcpu_id, uint32_t vector)
void send_single_ipi(uint16_t pcpu_id, uint32_t vector)
{
uint32_t dest_lapic_id, hi_32, lo_32;

View File

@@ -385,7 +385,7 @@ uint32_t dev_to_vector(struct dev_handler_node *node)
return node->desc->vector;
}
int init_default_irqs(unsigned int cpu_id)
int init_default_irqs(uint16_t cpu_id)
{
if (cpu_id > 0)
return 0;
@@ -692,7 +692,7 @@ pri_register_handler(uint32_t irq,
void get_cpu_interrupt_info(char *str, int str_max)
{
int pcpu_id;
uint16_t pcpu_id;
uint32_t irq, vector, len, size = str_max;
struct irq_desc *desc;

View File

@@ -42,7 +42,7 @@ static int request_notification_irq(dev_handler_t func, void *data,
void setup_notification(void)
{
int cpu;
uint16_t cpu;
char name[32] = {0};
cpu = get_cpu_id();

View File

@@ -6,19 +6,19 @@
#include <hypervisor.h>
void disable_softirq(int cpu_id)
void disable_softirq(uint16_t cpu_id)
{
bitmap_clear(SOFTIRQ_ATOMIC, &per_cpu(softirq_pending, cpu_id));
}
void enable_softirq(int cpu_id)
void enable_softirq(uint16_t cpu_id)
{
bitmap_set(SOFTIRQ_ATOMIC, &per_cpu(softirq_pending, cpu_id));
}
void init_softirq(void)
{
int cpu_id;
uint16_t cpu_id;
for (cpu_id = 0; cpu_id < phy_cpu_num; cpu_id++) {
per_cpu(softirq_pending, cpu_id) = 0;
@@ -28,7 +28,7 @@ void init_softirq(void)
void raise_softirq(int softirq_id)
{
int cpu_id = get_cpu_id();
uint16_t cpu_id = get_cpu_id();
uint64_t *bitmap = &per_cpu(softirq_pending, cpu_id);
if (cpu_id >= phy_cpu_num)
@@ -39,7 +39,7 @@ void raise_softirq(int softirq_id)
void exec_softirq(void)
{
int cpu_id = get_cpu_id();
uint16_t cpu_id = get_cpu_id();
volatile uint64_t *bitmap = &per_cpu(softirq_pending, cpu_id);
int softirq_id;

View File

@@ -70,7 +70,7 @@ static void __add_timer(struct per_cpu_timers *cpu_timer,
int add_timer(struct timer *timer)
{
struct per_cpu_timers *cpu_timer;
int pcpu_id;
uint16_t pcpu_id;
bool need_update;
if (timer == NULL || timer->func == NULL || timer->fire_tsc == 0)
@@ -99,7 +99,7 @@ void del_timer(struct timer *timer)
list_del_init(&timer->node);
}
static int request_timer_irq(int pcpu_id,
static int request_timer_irq(uint16_t pcpu_id,
dev_handler_t func, void *data,
const char *name)
{
@@ -125,7 +125,7 @@ static int request_timer_irq(int pcpu_id,
return 0;
}
static void init_percpu_timer(int pcpu_id)
static void init_percpu_timer(uint16_t pcpu_id)
{
struct per_cpu_timers *cpu_timer;
@@ -149,7 +149,7 @@ static void init_tsc_deadline_timer(void)
void timer_init(void)
{
char name[32] = {0};
int pcpu_id = get_cpu_id();
uint16_t pcpu_id = get_cpu_id();
snprintf(name, 32, "timer_tick[%d]", pcpu_id);
if (request_timer_irq(pcpu_id, tsc_deadline_handler, NULL, name) < 0) {
@@ -163,7 +163,7 @@ void timer_init(void)
void timer_cleanup(void)
{
int pcpu_id = get_cpu_id();
uint16_t pcpu_id = get_cpu_id();
if (per_cpu(timer_node, pcpu_id) != NULL)
unregister_handler_common(per_cpu(timer_node, pcpu_id));
@@ -171,7 +171,7 @@ void timer_cleanup(void)
per_cpu(timer_node, pcpu_id) = NULL;
}
void timer_softirq(int pcpu_id)
void timer_softirq(uint16_t pcpu_id)
{
struct per_cpu_timers *cpu_timer;
struct timer *timer;

View File

@@ -86,7 +86,7 @@ static inline int exec_vmxon(void *addr)
* It will be used again when we start a pcpu after the pcpu was down.
* S3 enter/exit will use it.
*/
int exec_vmxon_instr(uint32_t pcpu_id)
int exec_vmxon_instr(uint16_t pcpu_id)
{
uint64_t tmp64, vmcs_pa;
uint32_t tmp32;
@@ -128,7 +128,7 @@ int exec_vmxon_instr(uint32_t pcpu_id)
return ret;
}
int vmx_off(int pcpu_id)
int vmx_off(uint16_t pcpu_id)
{
int ret = 0;