Merge branch 'origin'
This commit is contained in:
commit
6684e323a2
|
@ -3267,6 +3267,7 @@ W: http://tpmdd.sourceforge.net
|
|||
P: Marcel Selhorst
|
||||
M: tpm@selhorst.net
|
||||
W: http://www.prosec.rub.de/tpm/
|
||||
L: tpmdd-devel@lists.sourceforge.net
|
||||
S: Maintained
|
||||
|
||||
Telecom Clock Driver for MCPL0010
|
||||
|
|
|
@ -19,6 +19,7 @@ obj-$(CONFIG_X86_CPUID) += cpuid.o
|
|||
obj-$(CONFIG_MICROCODE) += microcode.o
|
||||
obj-$(CONFIG_APM) += apm.o
|
||||
obj-$(CONFIG_X86_SMP) += smp.o smpboot.o tsc_sync.o
|
||||
obj-$(CONFIG_SMP) += smpcommon.o
|
||||
obj-$(CONFIG_X86_TRAMPOLINE) += trampoline.o
|
||||
obj-$(CONFIG_X86_MPPARSE) += mpparse.o
|
||||
obj-$(CONFIG_X86_LOCAL_APIC) += apic.o nmi.o
|
||||
|
|
|
@ -341,15 +341,17 @@ static int powernow_acpi_init(void)
|
|||
pc.val = (unsigned long) acpi_processor_perf->states[0].control;
|
||||
for (i = 0; i < number_scales; i++) {
|
||||
u8 fid, vid;
|
||||
unsigned int speed;
|
||||
struct acpi_processor_px *state =
|
||||
&acpi_processor_perf->states[i];
|
||||
unsigned int speed, speed_mhz;
|
||||
|
||||
pc.val = (unsigned long) acpi_processor_perf->states[i].control;
|
||||
pc.val = (unsigned long) state->control;
|
||||
dprintk ("acpi: P%d: %d MHz %d mW %d uS control %08x SGTC %d\n",
|
||||
i,
|
||||
(u32) acpi_processor_perf->states[i].core_frequency,
|
||||
(u32) acpi_processor_perf->states[i].power,
|
||||
(u32) acpi_processor_perf->states[i].transition_latency,
|
||||
(u32) acpi_processor_perf->states[i].control,
|
||||
(u32) state->core_frequency,
|
||||
(u32) state->power,
|
||||
(u32) state->transition_latency,
|
||||
(u32) state->control,
|
||||
pc.bits.sgtc);
|
||||
|
||||
vid = pc.bits.vid;
|
||||
|
@ -360,6 +362,18 @@ static int powernow_acpi_init(void)
|
|||
powernow_table[i].index |= (vid << 8); /* upper 8 bits */
|
||||
|
||||
speed = powernow_table[i].frequency;
|
||||
speed_mhz = speed / 1000;
|
||||
|
||||
/* processor_perflib will multiply the MHz value by 1000 to
|
||||
* get a KHz value (e.g. 1266000). However, powernow-k7 works
|
||||
* with true KHz values (e.g. 1266768). To ensure that all
|
||||
* powernow frequencies are available, we must ensure that
|
||||
* ACPI doesn't restrict them, so we round up the MHz value
|
||||
* to ensure that perflib's computed KHz value is greater than
|
||||
* or equal to powernow's KHz value.
|
||||
*/
|
||||
if (speed % 1000 > 0)
|
||||
speed_mhz++;
|
||||
|
||||
if ((fid_codes[fid] % 10)==5) {
|
||||
if (have_a0 == 1)
|
||||
|
@ -368,10 +382,16 @@ static int powernow_acpi_init(void)
|
|||
|
||||
dprintk (" FID: 0x%x (%d.%dx [%dMHz]) "
|
||||
"VID: 0x%x (%d.%03dV)\n", fid, fid_codes[fid] / 10,
|
||||
fid_codes[fid] % 10, speed/1000, vid,
|
||||
fid_codes[fid] % 10, speed_mhz, vid,
|
||||
mobile_vid_table[vid]/1000,
|
||||
mobile_vid_table[vid]%1000);
|
||||
|
||||
if (state->core_frequency != speed_mhz) {
|
||||
state->core_frequency = speed_mhz;
|
||||
dprintk(" Corrected ACPI frequency to %d\n",
|
||||
speed_mhz);
|
||||
}
|
||||
|
||||
if (latency < pc.bits.sgtc)
|
||||
latency = pc.bits.sgtc;
|
||||
|
||||
|
@ -602,7 +622,7 @@ static int __init powernow_cpu_init (struct cpufreq_policy *policy)
|
|||
result = powernow_acpi_init();
|
||||
if (result) {
|
||||
printk (KERN_INFO PFX "ACPI and legacy methods failed\n");
|
||||
printk (KERN_INFO PFX "See http://www.codemonkey.org.uk/projects/cpufreq/powernow-k7.shtml\n");
|
||||
printk (KERN_INFO PFX "See http://www.codemonkey.org.uk/projects/cpufreq/powernow-k7.html\n");
|
||||
}
|
||||
} else {
|
||||
/* SGTC use the bus clock as timer */
|
||||
|
|
|
@ -521,7 +521,7 @@ static int check_supported_cpu(unsigned int cpu)
|
|||
|
||||
if ((eax & CPUID_XFAM) == CPUID_XFAM_K8) {
|
||||
if (((eax & CPUID_USE_XFAM_XMOD) != CPUID_USE_XFAM_XMOD) ||
|
||||
((eax & CPUID_XMOD) > CPUID_XMOD_REV_G)) {
|
||||
((eax & CPUID_XMOD) > CPUID_XMOD_REV_MASK)) {
|
||||
printk(KERN_INFO PFX "Processor cpuid %x not supported\n", eax);
|
||||
goto out;
|
||||
}
|
||||
|
|
|
@ -46,8 +46,8 @@ struct powernow_k8_data {
|
|||
#define CPUID_XFAM 0x0ff00000 /* extended family */
|
||||
#define CPUID_XFAM_K8 0
|
||||
#define CPUID_XMOD 0x000f0000 /* extended model */
|
||||
#define CPUID_XMOD_REV_G 0x00060000
|
||||
#define CPUID_XFAM_10H 0x00100000 /* family 0x10 */
|
||||
#define CPUID_XMOD_REV_MASK 0x00080000
|
||||
#define CPUID_XFAM_10H 0x00100000 /* family 0x10 */
|
||||
#define CPUID_USE_XFAM_XMOD 0x00000f00
|
||||
#define CPUID_GET_MAX_CAPABILITIES 0x80000000
|
||||
#define CPUID_FREQ_VOLT_CAPABILITIES 0x80000007
|
||||
|
|
|
@ -467,7 +467,7 @@ void flush_tlb_all(void)
|
|||
* it goes straight through and wastes no time serializing
|
||||
* anything. Worst case is that we lose a reschedule ...
|
||||
*/
|
||||
void native_smp_send_reschedule(int cpu)
|
||||
static void native_smp_send_reschedule(int cpu)
|
||||
{
|
||||
WARN_ON(cpu_is_offline(cpu));
|
||||
send_IPI_mask(cpumask_of_cpu(cpu), RESCHEDULE_VECTOR);
|
||||
|
@ -546,9 +546,10 @@ static void __smp_call_function(void (*func) (void *info), void *info,
|
|||
* You must not call this function with disabled interrupts or from a
|
||||
* hardware interrupt handler or from a bottom half handler.
|
||||
*/
|
||||
int native_smp_call_function_mask(cpumask_t mask,
|
||||
void (*func)(void *), void *info,
|
||||
int wait)
|
||||
static int
|
||||
native_smp_call_function_mask(cpumask_t mask,
|
||||
void (*func)(void *), void *info,
|
||||
int wait)
|
||||
{
|
||||
struct call_data_struct data;
|
||||
cpumask_t allbutself;
|
||||
|
@ -599,60 +600,6 @@ int native_smp_call_function_mask(cpumask_t mask,
|
|||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* smp_call_function(): Run a function on all other CPUs.
|
||||
* @func: The function to run. This must be fast and non-blocking.
|
||||
* @info: An arbitrary pointer to pass to the function.
|
||||
* @nonatomic: Unused.
|
||||
* @wait: If true, wait (atomically) until function has completed on other CPUs.
|
||||
*
|
||||
* Returns 0 on success, else a negative status code.
|
||||
*
|
||||
* If @wait is true, then returns once @func has returned; otherwise
|
||||
* it returns just before the target cpu calls @func.
|
||||
*
|
||||
* You must not call this function with disabled interrupts or from a
|
||||
* hardware interrupt handler or from a bottom half handler.
|
||||
*/
|
||||
int smp_call_function(void (*func) (void *info), void *info, int nonatomic,
|
||||
int wait)
|
||||
{
|
||||
return smp_call_function_mask(cpu_online_map, func, info, wait);
|
||||
}
|
||||
EXPORT_SYMBOL(smp_call_function);
|
||||
|
||||
/**
|
||||
* smp_call_function_single - Run a function on another CPU
|
||||
* @cpu: The target CPU. Cannot be the calling CPU.
|
||||
* @func: The function to run. This must be fast and non-blocking.
|
||||
* @info: An arbitrary pointer to pass to the function.
|
||||
* @nonatomic: Unused.
|
||||
* @wait: If true, wait until function has completed on other CPUs.
|
||||
*
|
||||
* Returns 0 on success, else a negative status code.
|
||||
*
|
||||
* If @wait is true, then returns once @func has returned; otherwise
|
||||
* it returns just before the target cpu calls @func.
|
||||
*/
|
||||
int smp_call_function_single(int cpu, void (*func) (void *info), void *info,
|
||||
int nonatomic, int wait)
|
||||
{
|
||||
/* prevent preemption and reschedule on another processor */
|
||||
int ret;
|
||||
int me = get_cpu();
|
||||
if (cpu == me) {
|
||||
WARN_ON(1);
|
||||
put_cpu();
|
||||
return -EBUSY;
|
||||
}
|
||||
|
||||
ret = smp_call_function_mask(cpumask_of_cpu(cpu), func, info, wait);
|
||||
|
||||
put_cpu();
|
||||
return ret;
|
||||
}
|
||||
EXPORT_SYMBOL(smp_call_function_single);
|
||||
|
||||
static void stop_this_cpu (void * dummy)
|
||||
{
|
||||
local_irq_disable();
|
||||
|
@ -670,7 +617,7 @@ static void stop_this_cpu (void * dummy)
|
|||
* this function calls the 'stop' function on all other CPUs in the system.
|
||||
*/
|
||||
|
||||
void native_smp_send_stop(void)
|
||||
static void native_smp_send_stop(void)
|
||||
{
|
||||
/* Don't deadlock on the call lock in panic */
|
||||
int nolock = !spin_trylock(&call_lock);
|
||||
|
|
|
@ -98,9 +98,6 @@ EXPORT_SYMBOL(x86_cpu_to_apicid);
|
|||
|
||||
u8 apicid_2_node[MAX_APICID];
|
||||
|
||||
DEFINE_PER_CPU(unsigned long, this_cpu_off);
|
||||
EXPORT_PER_CPU_SYMBOL(this_cpu_off);
|
||||
|
||||
/*
|
||||
* Trampoline 80x86 program as an array.
|
||||
*/
|
||||
|
@ -763,25 +760,6 @@ static inline struct task_struct * alloc_idle_task(int cpu)
|
|||
#define alloc_idle_task(cpu) fork_idle(cpu)
|
||||
#endif
|
||||
|
||||
/* Initialize the CPU's GDT. This is either the boot CPU doing itself
|
||||
(still using the master per-cpu area), or a CPU doing it for a
|
||||
secondary which will soon come up. */
|
||||
static __cpuinit void init_gdt(int cpu)
|
||||
{
|
||||
struct desc_struct *gdt = get_cpu_gdt_table(cpu);
|
||||
|
||||
pack_descriptor((u32 *)&gdt[GDT_ENTRY_PERCPU].a,
|
||||
(u32 *)&gdt[GDT_ENTRY_PERCPU].b,
|
||||
__per_cpu_offset[cpu], 0xFFFFF,
|
||||
0x80 | DESCTYPE_S | 0x2, 0x8);
|
||||
|
||||
per_cpu(this_cpu_off, cpu) = __per_cpu_offset[cpu];
|
||||
per_cpu(cpu_number, cpu) = cpu;
|
||||
}
|
||||
|
||||
/* Defined in head.S */
|
||||
extern struct Xgt_desc_struct early_gdt_descr;
|
||||
|
||||
static int __cpuinit do_boot_cpu(int apicid, int cpu)
|
||||
/*
|
||||
* NOTE - on most systems this is a PHYSICAL apic ID, but on multiquad
|
||||
|
|
79
arch/i386/kernel/smpcommon.c
Normal file
79
arch/i386/kernel/smpcommon.c
Normal file
|
@ -0,0 +1,79 @@
|
|||
/*
|
||||
* SMP stuff which is common to all sub-architectures.
|
||||
*/
|
||||
#include <linux/module.h>
|
||||
#include <asm/smp.h>
|
||||
|
||||
DEFINE_PER_CPU(unsigned long, this_cpu_off);
|
||||
EXPORT_PER_CPU_SYMBOL(this_cpu_off);
|
||||
|
||||
/* Initialize the CPU's GDT. This is either the boot CPU doing itself
|
||||
(still using the master per-cpu area), or a CPU doing it for a
|
||||
secondary which will soon come up. */
|
||||
__cpuinit void init_gdt(int cpu)
|
||||
{
|
||||
struct desc_struct *gdt = get_cpu_gdt_table(cpu);
|
||||
|
||||
pack_descriptor((u32 *)&gdt[GDT_ENTRY_PERCPU].a,
|
||||
(u32 *)&gdt[GDT_ENTRY_PERCPU].b,
|
||||
__per_cpu_offset[cpu], 0xFFFFF,
|
||||
0x80 | DESCTYPE_S | 0x2, 0x8);
|
||||
|
||||
per_cpu(this_cpu_off, cpu) = __per_cpu_offset[cpu];
|
||||
per_cpu(cpu_number, cpu) = cpu;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* smp_call_function(): Run a function on all other CPUs.
|
||||
* @func: The function to run. This must be fast and non-blocking.
|
||||
* @info: An arbitrary pointer to pass to the function.
|
||||
* @nonatomic: Unused.
|
||||
* @wait: If true, wait (atomically) until function has completed on other CPUs.
|
||||
*
|
||||
* Returns 0 on success, else a negative status code.
|
||||
*
|
||||
* If @wait is true, then returns once @func has returned; otherwise
|
||||
* it returns just before the target cpu calls @func.
|
||||
*
|
||||
* You must not call this function with disabled interrupts or from a
|
||||
* hardware interrupt handler or from a bottom half handler.
|
||||
*/
|
||||
int smp_call_function(void (*func) (void *info), void *info, int nonatomic,
|
||||
int wait)
|
||||
{
|
||||
return smp_call_function_mask(cpu_online_map, func, info, wait);
|
||||
}
|
||||
EXPORT_SYMBOL(smp_call_function);
|
||||
|
||||
/**
|
||||
* smp_call_function_single - Run a function on another CPU
|
||||
* @cpu: The target CPU. Cannot be the calling CPU.
|
||||
* @func: The function to run. This must be fast and non-blocking.
|
||||
* @info: An arbitrary pointer to pass to the function.
|
||||
* @nonatomic: Unused.
|
||||
* @wait: If true, wait until function has completed on other CPUs.
|
||||
*
|
||||
* Returns 0 on success, else a negative status code.
|
||||
*
|
||||
* If @wait is true, then returns once @func has returned; otherwise
|
||||
* it returns just before the target cpu calls @func.
|
||||
*/
|
||||
int smp_call_function_single(int cpu, void (*func) (void *info), void *info,
|
||||
int nonatomic, int wait)
|
||||
{
|
||||
/* prevent preemption and reschedule on another processor */
|
||||
int ret;
|
||||
int me = get_cpu();
|
||||
if (cpu == me) {
|
||||
WARN_ON(1);
|
||||
put_cpu();
|
||||
return -EBUSY;
|
||||
}
|
||||
|
||||
ret = smp_call_function_mask(cpumask_of_cpu(cpu), func, info, wait);
|
||||
|
||||
put_cpu();
|
||||
return ret;
|
||||
}
|
||||
EXPORT_SYMBOL(smp_call_function_single);
|
|
@ -27,7 +27,6 @@
|
|||
#include <asm/pgalloc.h>
|
||||
#include <asm/tlbflush.h>
|
||||
#include <asm/arch_hooks.h>
|
||||
#include <asm/pda.h>
|
||||
|
||||
/* TLB state -- visible externally, indexed physically */
|
||||
DEFINE_PER_CPU(struct tlb_state, cpu_tlbstate) ____cacheline_aligned = { &init_mm, 0 };
|
||||
|
@ -422,7 +421,7 @@ find_smp_config(void)
|
|||
VOYAGER_SUS_IN_CONTROL_PORT);
|
||||
|
||||
current_thread_info()->cpu = boot_cpu_id;
|
||||
write_pda(cpu_number, boot_cpu_id);
|
||||
x86_write_percpu(cpu_number, boot_cpu_id);
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -435,7 +434,7 @@ smp_store_cpu_info(int id)
|
|||
|
||||
*c = boot_cpu_data;
|
||||
|
||||
identify_cpu(c);
|
||||
identify_secondary_cpu(c);
|
||||
}
|
||||
|
||||
/* set up the trampoline and return the physical address of the code */
|
||||
|
@ -459,7 +458,7 @@ start_secondary(void *unused)
|
|||
/* external functions not defined in the headers */
|
||||
extern void calibrate_delay(void);
|
||||
|
||||
secondary_cpu_init();
|
||||
cpu_init();
|
||||
|
||||
/* OK, we're in the routine */
|
||||
ack_CPI(VIC_CPU_BOOT_CPI);
|
||||
|
@ -572,7 +571,9 @@ do_boot_cpu(__u8 cpu)
|
|||
/* init_tasks (in sched.c) is indexed logically */
|
||||
stack_start.esp = (void *) idle->thread.esp;
|
||||
|
||||
init_gdt(cpu, idle);
|
||||
init_gdt(cpu);
|
||||
per_cpu(current_task, cpu) = idle;
|
||||
early_gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu);
|
||||
irq_ctx_init(cpu);
|
||||
|
||||
/* Note: Don't modify initial ss override */
|
||||
|
@ -859,8 +860,8 @@ smp_invalidate_interrupt(void)
|
|||
|
||||
/* This routine is called with a physical cpu mask */
|
||||
static void
|
||||
flush_tlb_others (unsigned long cpumask, struct mm_struct *mm,
|
||||
unsigned long va)
|
||||
voyager_flush_tlb_others (unsigned long cpumask, struct mm_struct *mm,
|
||||
unsigned long va)
|
||||
{
|
||||
int stuck = 50000;
|
||||
|
||||
|
@ -912,7 +913,7 @@ flush_tlb_current_task(void)
|
|||
cpu_mask = cpus_addr(mm->cpu_vm_mask)[0] & ~(1 << smp_processor_id());
|
||||
local_flush_tlb();
|
||||
if (cpu_mask)
|
||||
flush_tlb_others(cpu_mask, mm, FLUSH_ALL);
|
||||
voyager_flush_tlb_others(cpu_mask, mm, FLUSH_ALL);
|
||||
|
||||
preempt_enable();
|
||||
}
|
||||
|
@ -934,7 +935,7 @@ flush_tlb_mm (struct mm_struct * mm)
|
|||
leave_mm(smp_processor_id());
|
||||
}
|
||||
if (cpu_mask)
|
||||
flush_tlb_others(cpu_mask, mm, FLUSH_ALL);
|
||||
voyager_flush_tlb_others(cpu_mask, mm, FLUSH_ALL);
|
||||
|
||||
preempt_enable();
|
||||
}
|
||||
|
@ -955,7 +956,7 @@ void flush_tlb_page(struct vm_area_struct * vma, unsigned long va)
|
|||
}
|
||||
|
||||
if (cpu_mask)
|
||||
flush_tlb_others(cpu_mask, mm, va);
|
||||
voyager_flush_tlb_others(cpu_mask, mm, va);
|
||||
|
||||
preempt_enable();
|
||||
}
|
||||
|
@ -1044,10 +1045,12 @@ smp_call_function_interrupt(void)
|
|||
}
|
||||
|
||||
static int
|
||||
__smp_call_function_mask (void (*func) (void *info), void *info, int retry,
|
||||
int wait, __u32 mask)
|
||||
voyager_smp_call_function_mask (cpumask_t cpumask,
|
||||
void (*func) (void *info), void *info,
|
||||
int wait)
|
||||
{
|
||||
struct call_data_struct data;
|
||||
u32 mask = cpus_addr(cpumask)[0];
|
||||
|
||||
mask &= ~(1<<smp_processor_id());
|
||||
|
||||
|
@ -1083,47 +1086,6 @@ __smp_call_function_mask (void (*func) (void *info), void *info, int retry,
|
|||
return 0;
|
||||
}
|
||||
|
||||
/* Call this function on all CPUs using the function_interrupt above
|
||||
<func> The function to run. This must be fast and non-blocking.
|
||||
<info> An arbitrary pointer to pass to the function.
|
||||
<retry> If true, keep retrying until ready.
|
||||
<wait> If true, wait until function has completed on other CPUs.
|
||||
[RETURNS] 0 on success, else a negative status code. Does not return until
|
||||
remote CPUs are nearly ready to execute <<func>> or are or have executed.
|
||||
*/
|
||||
int
|
||||
smp_call_function(void (*func) (void *info), void *info, int retry,
|
||||
int wait)
|
||||
{
|
||||
__u32 mask = cpus_addr(cpu_online_map)[0];
|
||||
|
||||
return __smp_call_function_mask(func, info, retry, wait, mask);
|
||||
}
|
||||
EXPORT_SYMBOL(smp_call_function);
|
||||
|
||||
/*
|
||||
* smp_call_function_single - Run a function on another CPU
|
||||
* @func: The function to run. This must be fast and non-blocking.
|
||||
* @info: An arbitrary pointer to pass to the function.
|
||||
* @nonatomic: Currently unused.
|
||||
* @wait: If true, wait until function has completed on other CPUs.
|
||||
*
|
||||
* Retrurns 0 on success, else a negative status code.
|
||||
*
|
||||
* Does not return until the remote CPU is nearly ready to execute <func>
|
||||
* or is or has executed.
|
||||
*/
|
||||
|
||||
int
|
||||
smp_call_function_single(int cpu, void (*func) (void *info), void *info,
|
||||
int nonatomic, int wait)
|
||||
{
|
||||
__u32 mask = 1 << cpu;
|
||||
|
||||
return __smp_call_function_mask(func, info, nonatomic, wait, mask);
|
||||
}
|
||||
EXPORT_SYMBOL(smp_call_function_single);
|
||||
|
||||
/* Sorry about the name. In an APIC based system, the APICs
|
||||
* themselves are programmed to send a timer interrupt. This is used
|
||||
* by linux to reschedule the processor. Voyager doesn't have this,
|
||||
|
@ -1237,8 +1199,8 @@ smp_alloc_memory(void)
|
|||
}
|
||||
|
||||
/* send a reschedule CPI to one CPU by physical CPU number*/
|
||||
void
|
||||
smp_send_reschedule(int cpu)
|
||||
static void
|
||||
voyager_smp_send_reschedule(int cpu)
|
||||
{
|
||||
send_one_CPI(cpu, VIC_RESCHEDULE_CPI);
|
||||
}
|
||||
|
@ -1267,8 +1229,8 @@ safe_smp_processor_id(void)
|
|||
}
|
||||
|
||||
/* broadcast a halt to all other CPUs */
|
||||
void
|
||||
smp_send_stop(void)
|
||||
static void
|
||||
voyager_smp_send_stop(void)
|
||||
{
|
||||
smp_call_function(smp_stop_cpu_function, NULL, 1, 1);
|
||||
}
|
||||
|
@ -1930,23 +1892,26 @@ smp_voyager_power_off(void *dummy)
|
|||
smp_stop_cpu_function(NULL);
|
||||
}
|
||||
|
||||
void __init
|
||||
smp_prepare_cpus(unsigned int max_cpus)
|
||||
static void __init
|
||||
voyager_smp_prepare_cpus(unsigned int max_cpus)
|
||||
{
|
||||
/* FIXME: ignore max_cpus for now */
|
||||
smp_boot_cpus();
|
||||
}
|
||||
|
||||
void __devinit smp_prepare_boot_cpu(void)
|
||||
static void __devinit voyager_smp_prepare_boot_cpu(void)
|
||||
{
|
||||
init_gdt(smp_processor_id());
|
||||
switch_to_new_gdt();
|
||||
|
||||
cpu_set(smp_processor_id(), cpu_online_map);
|
||||
cpu_set(smp_processor_id(), cpu_callout_map);
|
||||
cpu_set(smp_processor_id(), cpu_possible_map);
|
||||
cpu_set(smp_processor_id(), cpu_present_map);
|
||||
}
|
||||
|
||||
int __devinit
|
||||
__cpu_up(unsigned int cpu)
|
||||
static int __devinit
|
||||
voyager_cpu_up(unsigned int cpu)
|
||||
{
|
||||
/* This only works at boot for x86. See "rewrite" above. */
|
||||
if (cpu_isset(cpu, smp_commenced_mask))
|
||||
|
@ -1962,8 +1927,8 @@ __cpu_up(unsigned int cpu)
|
|||
return 0;
|
||||
}
|
||||
|
||||
void __init
|
||||
smp_cpus_done(unsigned int max_cpus)
|
||||
static void __init
|
||||
voyager_smp_cpus_done(unsigned int max_cpus)
|
||||
{
|
||||
zap_low_mappings();
|
||||
}
|
||||
|
@ -1972,5 +1937,16 @@ void __init
|
|||
smp_setup_processor_id(void)
|
||||
{
|
||||
current_thread_info()->cpu = hard_smp_processor_id();
|
||||
write_pda(cpu_number, hard_smp_processor_id());
|
||||
x86_write_percpu(cpu_number, hard_smp_processor_id());
|
||||
}
|
||||
|
||||
struct smp_ops smp_ops = {
|
||||
.smp_prepare_boot_cpu = voyager_smp_prepare_boot_cpu,
|
||||
.smp_prepare_cpus = voyager_smp_prepare_cpus,
|
||||
.cpu_up = voyager_cpu_up,
|
||||
.smp_cpus_done = voyager_smp_cpus_done,
|
||||
|
||||
.smp_send_stop = voyager_smp_send_stop,
|
||||
.smp_send_reschedule = voyager_smp_send_reschedule,
|
||||
.smp_call_function_mask = voyager_smp_call_function_mask,
|
||||
};
|
||||
|
|
|
@ -181,7 +181,7 @@ EXPORT_SYMBOL(strnlen_user);
|
|||
* Zero Userspace
|
||||
*/
|
||||
|
||||
unsigned long clear_user(void __user *to, unsigned long n)
|
||||
unsigned long __clear_user(void __user *to, unsigned long n)
|
||||
{
|
||||
unsigned long res;
|
||||
|
||||
|
@ -219,4 +219,4 @@ unsigned long clear_user(void __user *to, unsigned long n)
|
|||
|
||||
return res;
|
||||
}
|
||||
EXPORT_SYMBOL(clear_user);
|
||||
EXPORT_SYMBOL(__clear_user);
|
||||
|
|
|
@ -3802,7 +3802,6 @@ static struct io_context *current_io_context(gfp_t gfp_flags, int node)
|
|||
|
||||
return ret;
|
||||
}
|
||||
EXPORT_SYMBOL(current_io_context);
|
||||
|
||||
/*
|
||||
* If the current task has no IO context then create one and initialise it.
|
||||
|
|
|
@ -384,9 +384,9 @@ static struct agp_device_ids via_agp_device_ids[] __devinitdata =
|
|||
.device_id = PCI_DEVICE_ID_VIA_P4M800CE,
|
||||
.chipset_name = "VT3314",
|
||||
},
|
||||
/* CX700 */
|
||||
/* VT3324 / CX700 */
|
||||
{
|
||||
.device_id = PCI_DEVICE_ID_VIA_CX700,
|
||||
.device_id = PCI_DEVICE_ID_VIA_VT3324,
|
||||
.chipset_name = "CX700",
|
||||
},
|
||||
/* VT3336 */
|
||||
|
@ -540,7 +540,7 @@ static const struct pci_device_id agp_via_pci_table[] = {
|
|||
ID(PCI_DEVICE_ID_VIA_83_87XX_1),
|
||||
ID(PCI_DEVICE_ID_VIA_3296_0),
|
||||
ID(PCI_DEVICE_ID_VIA_P4M800CE),
|
||||
ID(PCI_DEVICE_ID_VIA_CX700),
|
||||
ID(PCI_DEVICE_ID_VIA_VT3324),
|
||||
ID(PCI_DEVICE_ID_VIA_VT3336),
|
||||
ID(PCI_DEVICE_ID_VIA_P4M890),
|
||||
{ }
|
||||
|
|
|
@ -346,12 +346,33 @@ static void cma_deref_id(struct rdma_id_private *id_priv)
|
|||
complete(&id_priv->comp);
|
||||
}
|
||||
|
||||
static void cma_release_remove(struct rdma_id_private *id_priv)
|
||||
static int cma_disable_remove(struct rdma_id_private *id_priv,
|
||||
enum cma_state state)
|
||||
{
|
||||
unsigned long flags;
|
||||
int ret;
|
||||
|
||||
spin_lock_irqsave(&id_priv->lock, flags);
|
||||
if (id_priv->state == state) {
|
||||
atomic_inc(&id_priv->dev_remove);
|
||||
ret = 0;
|
||||
} else
|
||||
ret = -EINVAL;
|
||||
spin_unlock_irqrestore(&id_priv->lock, flags);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static void cma_enable_remove(struct rdma_id_private *id_priv)
|
||||
{
|
||||
if (atomic_dec_and_test(&id_priv->dev_remove))
|
||||
wake_up(&id_priv->wait_remove);
|
||||
}
|
||||
|
||||
static int cma_has_cm_dev(struct rdma_id_private *id_priv)
|
||||
{
|
||||
return (id_priv->id.device && id_priv->cm_id.ib);
|
||||
}
|
||||
|
||||
struct rdma_cm_id *rdma_create_id(rdma_cm_event_handler event_handler,
|
||||
void *context, enum rdma_port_space ps)
|
||||
{
|
||||
|
@ -884,9 +905,8 @@ static int cma_ib_handler(struct ib_cm_id *cm_id, struct ib_cm_event *ib_event)
|
|||
struct rdma_cm_event event;
|
||||
int ret = 0;
|
||||
|
||||
atomic_inc(&id_priv->dev_remove);
|
||||
if (!cma_comp(id_priv, CMA_CONNECT))
|
||||
goto out;
|
||||
if (cma_disable_remove(id_priv, CMA_CONNECT))
|
||||
return 0;
|
||||
|
||||
memset(&event, 0, sizeof event);
|
||||
switch (ib_event->event) {
|
||||
|
@ -942,12 +962,12 @@ static int cma_ib_handler(struct ib_cm_id *cm_id, struct ib_cm_event *ib_event)
|
|||
/* Destroy the CM ID by returning a non-zero value. */
|
||||
id_priv->cm_id.ib = NULL;
|
||||
cma_exch(id_priv, CMA_DESTROYING);
|
||||
cma_release_remove(id_priv);
|
||||
cma_enable_remove(id_priv);
|
||||
rdma_destroy_id(&id_priv->id);
|
||||
return ret;
|
||||
}
|
||||
out:
|
||||
cma_release_remove(id_priv);
|
||||
cma_enable_remove(id_priv);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
@ -1057,11 +1077,8 @@ static int cma_req_handler(struct ib_cm_id *cm_id, struct ib_cm_event *ib_event)
|
|||
int offset, ret;
|
||||
|
||||
listen_id = cm_id->context;
|
||||
atomic_inc(&listen_id->dev_remove);
|
||||
if (!cma_comp(listen_id, CMA_LISTEN)) {
|
||||
ret = -ECONNABORTED;
|
||||
goto out;
|
||||
}
|
||||
if (cma_disable_remove(listen_id, CMA_LISTEN))
|
||||
return -ECONNABORTED;
|
||||
|
||||
memset(&event, 0, sizeof event);
|
||||
offset = cma_user_data_offset(listen_id->id.ps);
|
||||
|
@ -1101,11 +1118,11 @@ static int cma_req_handler(struct ib_cm_id *cm_id, struct ib_cm_event *ib_event)
|
|||
|
||||
release_conn_id:
|
||||
cma_exch(conn_id, CMA_DESTROYING);
|
||||
cma_release_remove(conn_id);
|
||||
cma_enable_remove(conn_id);
|
||||
rdma_destroy_id(&conn_id->id);
|
||||
|
||||
out:
|
||||
cma_release_remove(listen_id);
|
||||
cma_enable_remove(listen_id);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
@ -1171,9 +1188,10 @@ static int cma_iw_handler(struct iw_cm_id *iw_id, struct iw_cm_event *iw_event)
|
|||
struct sockaddr_in *sin;
|
||||
int ret = 0;
|
||||
|
||||
memset(&event, 0, sizeof event);
|
||||
atomic_inc(&id_priv->dev_remove);
|
||||
if (cma_disable_remove(id_priv, CMA_CONNECT))
|
||||
return 0;
|
||||
|
||||
memset(&event, 0, sizeof event);
|
||||
switch (iw_event->event) {
|
||||
case IW_CM_EVENT_CLOSE:
|
||||
event.event = RDMA_CM_EVENT_DISCONNECTED;
|
||||
|
@ -1214,12 +1232,12 @@ static int cma_iw_handler(struct iw_cm_id *iw_id, struct iw_cm_event *iw_event)
|
|||
/* Destroy the CM ID by returning a non-zero value. */
|
||||
id_priv->cm_id.iw = NULL;
|
||||
cma_exch(id_priv, CMA_DESTROYING);
|
||||
cma_release_remove(id_priv);
|
||||
cma_enable_remove(id_priv);
|
||||
rdma_destroy_id(&id_priv->id);
|
||||
return ret;
|
||||
}
|
||||
|
||||
cma_release_remove(id_priv);
|
||||
cma_enable_remove(id_priv);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
@ -1234,11 +1252,8 @@ static int iw_conn_req_handler(struct iw_cm_id *cm_id,
|
|||
int ret;
|
||||
|
||||
listen_id = cm_id->context;
|
||||
atomic_inc(&listen_id->dev_remove);
|
||||
if (!cma_comp(listen_id, CMA_LISTEN)) {
|
||||
ret = -ECONNABORTED;
|
||||
goto out;
|
||||
}
|
||||
if (cma_disable_remove(listen_id, CMA_LISTEN))
|
||||
return -ECONNABORTED;
|
||||
|
||||
/* Create a new RDMA id for the new IW CM ID */
|
||||
new_cm_id = rdma_create_id(listen_id->id.event_handler,
|
||||
|
@ -1255,13 +1270,13 @@ static int iw_conn_req_handler(struct iw_cm_id *cm_id,
|
|||
dev = ip_dev_find(iw_event->local_addr.sin_addr.s_addr);
|
||||
if (!dev) {
|
||||
ret = -EADDRNOTAVAIL;
|
||||
cma_release_remove(conn_id);
|
||||
cma_enable_remove(conn_id);
|
||||
rdma_destroy_id(new_cm_id);
|
||||
goto out;
|
||||
}
|
||||
ret = rdma_copy_addr(&conn_id->id.route.addr.dev_addr, dev, NULL);
|
||||
if (ret) {
|
||||
cma_release_remove(conn_id);
|
||||
cma_enable_remove(conn_id);
|
||||
rdma_destroy_id(new_cm_id);
|
||||
goto out;
|
||||
}
|
||||
|
@ -1270,7 +1285,7 @@ static int iw_conn_req_handler(struct iw_cm_id *cm_id,
|
|||
ret = cma_acquire_dev(conn_id);
|
||||
mutex_unlock(&lock);
|
||||
if (ret) {
|
||||
cma_release_remove(conn_id);
|
||||
cma_enable_remove(conn_id);
|
||||
rdma_destroy_id(new_cm_id);
|
||||
goto out;
|
||||
}
|
||||
|
@ -1293,14 +1308,14 @@ static int iw_conn_req_handler(struct iw_cm_id *cm_id,
|
|||
/* User wants to destroy the CM ID */
|
||||
conn_id->cm_id.iw = NULL;
|
||||
cma_exch(conn_id, CMA_DESTROYING);
|
||||
cma_release_remove(conn_id);
|
||||
cma_enable_remove(conn_id);
|
||||
rdma_destroy_id(&conn_id->id);
|
||||
}
|
||||
|
||||
out:
|
||||
if (dev)
|
||||
dev_put(dev);
|
||||
cma_release_remove(listen_id);
|
||||
cma_enable_remove(listen_id);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
@ -1519,7 +1534,7 @@ static void cma_work_handler(struct work_struct *_work)
|
|||
destroy = 1;
|
||||
}
|
||||
out:
|
||||
cma_release_remove(id_priv);
|
||||
cma_enable_remove(id_priv);
|
||||
cma_deref_id(id_priv);
|
||||
if (destroy)
|
||||
rdma_destroy_id(&id_priv->id);
|
||||
|
@ -1711,13 +1726,13 @@ static void addr_handler(int status, struct sockaddr *src_addr,
|
|||
|
||||
if (id_priv->id.event_handler(&id_priv->id, &event)) {
|
||||
cma_exch(id_priv, CMA_DESTROYING);
|
||||
cma_release_remove(id_priv);
|
||||
cma_enable_remove(id_priv);
|
||||
cma_deref_id(id_priv);
|
||||
rdma_destroy_id(&id_priv->id);
|
||||
return;
|
||||
}
|
||||
out:
|
||||
cma_release_remove(id_priv);
|
||||
cma_enable_remove(id_priv);
|
||||
cma_deref_id(id_priv);
|
||||
}
|
||||
|
||||
|
@ -2042,11 +2057,10 @@ static int cma_sidr_rep_handler(struct ib_cm_id *cm_id,
|
|||
struct ib_cm_sidr_rep_event_param *rep = &ib_event->param.sidr_rep_rcvd;
|
||||
int ret = 0;
|
||||
|
||||
memset(&event, 0, sizeof event);
|
||||
atomic_inc(&id_priv->dev_remove);
|
||||
if (!cma_comp(id_priv, CMA_CONNECT))
|
||||
goto out;
|
||||
if (cma_disable_remove(id_priv, CMA_CONNECT))
|
||||
return 0;
|
||||
|
||||
memset(&event, 0, sizeof event);
|
||||
switch (ib_event->event) {
|
||||
case IB_CM_SIDR_REQ_ERROR:
|
||||
event.event = RDMA_CM_EVENT_UNREACHABLE;
|
||||
|
@ -2084,12 +2098,12 @@ static int cma_sidr_rep_handler(struct ib_cm_id *cm_id,
|
|||
/* Destroy the CM ID by returning a non-zero value. */
|
||||
id_priv->cm_id.ib = NULL;
|
||||
cma_exch(id_priv, CMA_DESTROYING);
|
||||
cma_release_remove(id_priv);
|
||||
cma_enable_remove(id_priv);
|
||||
rdma_destroy_id(&id_priv->id);
|
||||
return ret;
|
||||
}
|
||||
out:
|
||||
cma_release_remove(id_priv);
|
||||
cma_enable_remove(id_priv);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
@ -2413,7 +2427,7 @@ int rdma_notify(struct rdma_cm_id *id, enum ib_event_type event)
|
|||
int ret;
|
||||
|
||||
id_priv = container_of(id, struct rdma_id_private, id);
|
||||
if (!cma_comp(id_priv, CMA_CONNECT))
|
||||
if (!cma_has_cm_dev(id_priv))
|
||||
return -EINVAL;
|
||||
|
||||
switch (id->device->node_type) {
|
||||
|
@ -2435,7 +2449,7 @@ int rdma_reject(struct rdma_cm_id *id, const void *private_data,
|
|||
int ret;
|
||||
|
||||
id_priv = container_of(id, struct rdma_id_private, id);
|
||||
if (!cma_comp(id_priv, CMA_CONNECT))
|
||||
if (!cma_has_cm_dev(id_priv))
|
||||
return -EINVAL;
|
||||
|
||||
switch (rdma_node_get_transport(id->device->node_type)) {
|
||||
|
@ -2466,8 +2480,7 @@ int rdma_disconnect(struct rdma_cm_id *id)
|
|||
int ret;
|
||||
|
||||
id_priv = container_of(id, struct rdma_id_private, id);
|
||||
if (!cma_comp(id_priv, CMA_CONNECT) &&
|
||||
!cma_comp(id_priv, CMA_DISCONNECT))
|
||||
if (!cma_has_cm_dev(id_priv))
|
||||
return -EINVAL;
|
||||
|
||||
switch (rdma_node_get_transport(id->device->node_type)) {
|
||||
|
@ -2499,10 +2512,9 @@ static int cma_ib_mc_handler(int status, struct ib_sa_multicast *multicast)
|
|||
int ret;
|
||||
|
||||
id_priv = mc->id_priv;
|
||||
atomic_inc(&id_priv->dev_remove);
|
||||
if (!cma_comp(id_priv, CMA_ADDR_BOUND) &&
|
||||
!cma_comp(id_priv, CMA_ADDR_RESOLVED))
|
||||
goto out;
|
||||
if (cma_disable_remove(id_priv, CMA_ADDR_BOUND) &&
|
||||
cma_disable_remove(id_priv, CMA_ADDR_RESOLVED))
|
||||
return 0;
|
||||
|
||||
if (!status && id_priv->id.qp)
|
||||
status = ib_attach_mcast(id_priv->id.qp, &multicast->rec.mgid,
|
||||
|
@ -2524,12 +2536,12 @@ static int cma_ib_mc_handler(int status, struct ib_sa_multicast *multicast)
|
|||
ret = id_priv->id.event_handler(&id_priv->id, &event);
|
||||
if (ret) {
|
||||
cma_exch(id_priv, CMA_DESTROYING);
|
||||
cma_release_remove(id_priv);
|
||||
cma_enable_remove(id_priv);
|
||||
rdma_destroy_id(&id_priv->id);
|
||||
return 0;
|
||||
}
|
||||
out:
|
||||
cma_release_remove(id_priv);
|
||||
|
||||
cma_enable_remove(id_priv);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
@ -277,6 +277,7 @@ void ehca_cleanup_mrmw_cache(void);
|
|||
|
||||
extern spinlock_t ehca_qp_idr_lock;
|
||||
extern spinlock_t ehca_cq_idr_lock;
|
||||
extern spinlock_t hcall_lock;
|
||||
extern struct idr ehca_qp_idr;
|
||||
extern struct idr ehca_cq_idr;
|
||||
|
||||
|
|
|
@ -517,12 +517,11 @@ void ehca_process_eq(struct ehca_shca *shca, int is_irq)
|
|||
else {
|
||||
struct ehca_cq *cq = eq->eqe_cache[i].cq;
|
||||
comp_event_callback(cq);
|
||||
spin_lock_irqsave(&ehca_cq_idr_lock, flags);
|
||||
spin_lock(&ehca_cq_idr_lock);
|
||||
cq->nr_events--;
|
||||
if (!cq->nr_events)
|
||||
wake_up(&cq->wait_completion);
|
||||
spin_unlock_irqrestore(&ehca_cq_idr_lock,
|
||||
flags);
|
||||
spin_unlock(&ehca_cq_idr_lock);
|
||||
}
|
||||
} else {
|
||||
ehca_dbg(&shca->ib_device, "Got non completion event");
|
||||
|
@ -711,6 +710,7 @@ static void destroy_comp_task(struct ehca_comp_pool *pool,
|
|||
kthread_stop(task);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_HOTPLUG_CPU
|
||||
static void take_over_work(struct ehca_comp_pool *pool,
|
||||
int cpu)
|
||||
{
|
||||
|
@ -735,7 +735,6 @@ static void take_over_work(struct ehca_comp_pool *pool,
|
|||
|
||||
}
|
||||
|
||||
#ifdef CONFIG_HOTPLUG_CPU
|
||||
static int comp_pool_callback(struct notifier_block *nfb,
|
||||
unsigned long action,
|
||||
void *hcpu)
|
||||
|
|
|
@ -52,7 +52,7 @@
|
|||
MODULE_LICENSE("Dual BSD/GPL");
|
||||
MODULE_AUTHOR("Christoph Raisch <raisch@de.ibm.com>");
|
||||
MODULE_DESCRIPTION("IBM eServer HCA InfiniBand Device Driver");
|
||||
MODULE_VERSION("SVNEHCA_0022");
|
||||
MODULE_VERSION("SVNEHCA_0023");
|
||||
|
||||
int ehca_open_aqp1 = 0;
|
||||
int ehca_debug_level = 0;
|
||||
|
@ -62,7 +62,7 @@ int ehca_use_hp_mr = 0;
|
|||
int ehca_port_act_time = 30;
|
||||
int ehca_poll_all_eqs = 1;
|
||||
int ehca_static_rate = -1;
|
||||
int ehca_scaling_code = 1;
|
||||
int ehca_scaling_code = 0;
|
||||
|
||||
module_param_named(open_aqp1, ehca_open_aqp1, int, 0);
|
||||
module_param_named(debug_level, ehca_debug_level, int, 0);
|
||||
|
@ -98,6 +98,7 @@ MODULE_PARM_DESC(scaling_code,
|
|||
|
||||
spinlock_t ehca_qp_idr_lock;
|
||||
spinlock_t ehca_cq_idr_lock;
|
||||
spinlock_t hcall_lock;
|
||||
DEFINE_IDR(ehca_qp_idr);
|
||||
DEFINE_IDR(ehca_cq_idr);
|
||||
|
||||
|
@ -453,15 +454,14 @@ static ssize_t ehca_store_debug_level(struct device_driver *ddp,
|
|||
DRIVER_ATTR(debug_level, S_IRUSR | S_IWUSR,
|
||||
ehca_show_debug_level, ehca_store_debug_level);
|
||||
|
||||
void ehca_create_driver_sysfs(struct ibmebus_driver *drv)
|
||||
{
|
||||
driver_create_file(&drv->driver, &driver_attr_debug_level);
|
||||
}
|
||||
static struct attribute *ehca_drv_attrs[] = {
|
||||
&driver_attr_debug_level.attr,
|
||||
NULL
|
||||
};
|
||||
|
||||
void ehca_remove_driver_sysfs(struct ibmebus_driver *drv)
|
||||
{
|
||||
driver_remove_file(&drv->driver, &driver_attr_debug_level);
|
||||
}
|
||||
static struct attribute_group ehca_drv_attr_grp = {
|
||||
.attrs = ehca_drv_attrs
|
||||
};
|
||||
|
||||
#define EHCA_RESOURCE_ATTR(name) \
|
||||
static ssize_t ehca_show_##name(struct device *dev, \
|
||||
|
@ -523,44 +523,28 @@ static ssize_t ehca_show_adapter_handle(struct device *dev,
|
|||
}
|
||||
static DEVICE_ATTR(adapter_handle, S_IRUGO, ehca_show_adapter_handle, NULL);
|
||||
|
||||
static struct attribute *ehca_dev_attrs[] = {
|
||||
&dev_attr_adapter_handle.attr,
|
||||
&dev_attr_num_ports.attr,
|
||||
&dev_attr_hw_ver.attr,
|
||||
&dev_attr_max_eq.attr,
|
||||
&dev_attr_cur_eq.attr,
|
||||
&dev_attr_max_cq.attr,
|
||||
&dev_attr_cur_cq.attr,
|
||||
&dev_attr_max_qp.attr,
|
||||
&dev_attr_cur_qp.attr,
|
||||
&dev_attr_max_mr.attr,
|
||||
&dev_attr_cur_mr.attr,
|
||||
&dev_attr_max_mw.attr,
|
||||
&dev_attr_cur_mw.attr,
|
||||
&dev_attr_max_pd.attr,
|
||||
&dev_attr_max_ah.attr,
|
||||
NULL
|
||||
};
|
||||
|
||||
void ehca_create_device_sysfs(struct ibmebus_dev *dev)
|
||||
{
|
||||
device_create_file(&dev->ofdev.dev, &dev_attr_adapter_handle);
|
||||
device_create_file(&dev->ofdev.dev, &dev_attr_num_ports);
|
||||
device_create_file(&dev->ofdev.dev, &dev_attr_hw_ver);
|
||||
device_create_file(&dev->ofdev.dev, &dev_attr_max_eq);
|
||||
device_create_file(&dev->ofdev.dev, &dev_attr_cur_eq);
|
||||
device_create_file(&dev->ofdev.dev, &dev_attr_max_cq);
|
||||
device_create_file(&dev->ofdev.dev, &dev_attr_cur_cq);
|
||||
device_create_file(&dev->ofdev.dev, &dev_attr_max_qp);
|
||||
device_create_file(&dev->ofdev.dev, &dev_attr_cur_qp);
|
||||
device_create_file(&dev->ofdev.dev, &dev_attr_max_mr);
|
||||
device_create_file(&dev->ofdev.dev, &dev_attr_cur_mr);
|
||||
device_create_file(&dev->ofdev.dev, &dev_attr_max_mw);
|
||||
device_create_file(&dev->ofdev.dev, &dev_attr_cur_mw);
|
||||
device_create_file(&dev->ofdev.dev, &dev_attr_max_pd);
|
||||
device_create_file(&dev->ofdev.dev, &dev_attr_max_ah);
|
||||
}
|
||||
|
||||
void ehca_remove_device_sysfs(struct ibmebus_dev *dev)
|
||||
{
|
||||
device_remove_file(&dev->ofdev.dev, &dev_attr_adapter_handle);
|
||||
device_remove_file(&dev->ofdev.dev, &dev_attr_num_ports);
|
||||
device_remove_file(&dev->ofdev.dev, &dev_attr_hw_ver);
|
||||
device_remove_file(&dev->ofdev.dev, &dev_attr_max_eq);
|
||||
device_remove_file(&dev->ofdev.dev, &dev_attr_cur_eq);
|
||||
device_remove_file(&dev->ofdev.dev, &dev_attr_max_cq);
|
||||
device_remove_file(&dev->ofdev.dev, &dev_attr_cur_cq);
|
||||
device_remove_file(&dev->ofdev.dev, &dev_attr_max_qp);
|
||||
device_remove_file(&dev->ofdev.dev, &dev_attr_cur_qp);
|
||||
device_remove_file(&dev->ofdev.dev, &dev_attr_max_mr);
|
||||
device_remove_file(&dev->ofdev.dev, &dev_attr_cur_mr);
|
||||
device_remove_file(&dev->ofdev.dev, &dev_attr_max_mw);
|
||||
device_remove_file(&dev->ofdev.dev, &dev_attr_cur_mw);
|
||||
device_remove_file(&dev->ofdev.dev, &dev_attr_max_pd);
|
||||
device_remove_file(&dev->ofdev.dev, &dev_attr_max_ah);
|
||||
}
|
||||
static struct attribute_group ehca_dev_attr_grp = {
|
||||
.attrs = ehca_dev_attrs
|
||||
};
|
||||
|
||||
static int __devinit ehca_probe(struct ibmebus_dev *dev,
|
||||
const struct of_device_id *id)
|
||||
|
@ -668,7 +652,10 @@ static int __devinit ehca_probe(struct ibmebus_dev *dev,
|
|||
}
|
||||
}
|
||||
|
||||
ehca_create_device_sysfs(dev);
|
||||
ret = sysfs_create_group(&dev->ofdev.dev.kobj, &ehca_dev_attr_grp);
|
||||
if (ret) /* only complain; we can live without attributes */
|
||||
ehca_err(&shca->ib_device,
|
||||
"Cannot create device attributes ret=%d", ret);
|
||||
|
||||
spin_lock(&shca_list_lock);
|
||||
list_add(&shca->shca_list, &shca_list);
|
||||
|
@ -720,7 +707,7 @@ static int __devexit ehca_remove(struct ibmebus_dev *dev)
|
|||
struct ehca_shca *shca = dev->ofdev.dev.driver_data;
|
||||
int ret;
|
||||
|
||||
ehca_remove_device_sysfs(dev);
|
||||
sysfs_remove_group(&dev->ofdev.dev.kobj, &ehca_dev_attr_grp);
|
||||
|
||||
if (ehca_open_aqp1 == 1) {
|
||||
int i;
|
||||
|
@ -812,11 +799,12 @@ int __init ehca_module_init(void)
|
|||
int ret;
|
||||
|
||||
printk(KERN_INFO "eHCA Infiniband Device Driver "
|
||||
"(Rel.: SVNEHCA_0022)\n");
|
||||
"(Rel.: SVNEHCA_0023)\n");
|
||||
idr_init(&ehca_qp_idr);
|
||||
idr_init(&ehca_cq_idr);
|
||||
spin_lock_init(&ehca_qp_idr_lock);
|
||||
spin_lock_init(&ehca_cq_idr_lock);
|
||||
spin_lock_init(&hcall_lock);
|
||||
|
||||
INIT_LIST_HEAD(&shca_list);
|
||||
spin_lock_init(&shca_list_lock);
|
||||
|
@ -838,7 +826,9 @@ int __init ehca_module_init(void)
|
|||
goto module_init2;
|
||||
}
|
||||
|
||||
ehca_create_driver_sysfs(&ehca_driver);
|
||||
ret = sysfs_create_group(&ehca_driver.driver.kobj, &ehca_drv_attr_grp);
|
||||
if (ret) /* only complain; we can live without attributes */
|
||||
ehca_gen_err("Cannot create driver attributes ret=%d", ret);
|
||||
|
||||
if (ehca_poll_all_eqs != 1) {
|
||||
ehca_gen_err("WARNING!!!");
|
||||
|
@ -865,7 +855,7 @@ void __exit ehca_module_exit(void)
|
|||
if (ehca_poll_all_eqs == 1)
|
||||
del_timer_sync(&poll_eqs_timer);
|
||||
|
||||
ehca_remove_driver_sysfs(&ehca_driver);
|
||||
sysfs_remove_group(&ehca_driver.driver.kobj, &ehca_drv_attr_grp);
|
||||
ibmebus_unregister_driver(&ehca_driver);
|
||||
|
||||
ehca_destroy_slab_caches();
|
||||
|
|
|
@ -523,6 +523,8 @@ struct ib_qp *ehca_create_qp(struct ib_pd *pd,
|
|||
goto create_qp_exit1;
|
||||
}
|
||||
|
||||
my_qp->ib_qp.qp_num = my_qp->real_qp_num;
|
||||
|
||||
switch (init_attr->qp_type) {
|
||||
case IB_QPT_RC:
|
||||
if (isdaqp == 0) {
|
||||
|
@ -568,7 +570,7 @@ struct ib_qp *ehca_create_qp(struct ib_pd *pd,
|
|||
parms.act_nr_recv_wqes = init_attr->cap.max_recv_wr;
|
||||
parms.act_nr_send_sges = init_attr->cap.max_send_sge;
|
||||
parms.act_nr_recv_sges = init_attr->cap.max_recv_sge;
|
||||
my_qp->real_qp_num =
|
||||
my_qp->ib_qp.qp_num =
|
||||
(init_attr->qp_type == IB_QPT_SMI) ? 0 : 1;
|
||||
}
|
||||
|
||||
|
@ -595,7 +597,6 @@ struct ib_qp *ehca_create_qp(struct ib_pd *pd,
|
|||
my_qp->ib_qp.recv_cq = init_attr->recv_cq;
|
||||
my_qp->ib_qp.send_cq = init_attr->send_cq;
|
||||
|
||||
my_qp->ib_qp.qp_num = my_qp->real_qp_num;
|
||||
my_qp->ib_qp.qp_type = init_attr->qp_type;
|
||||
|
||||
my_qp->qp_type = init_attr->qp_type;
|
||||
|
@ -968,17 +969,21 @@ static int internal_modify_qp(struct ib_qp *ibqp,
|
|||
((ehca_mult - 1) / ah_mult) : 0;
|
||||
else
|
||||
mqpcb->max_static_rate = 0;
|
||||
|
||||
update_mask |= EHCA_BMASK_SET(MQPCB_MASK_MAX_STATIC_RATE, 1);
|
||||
|
||||
/*
|
||||
* Always supply the GRH flag, even if it's zero, to give the
|
||||
* hypervisor a clear "yes" or "no" instead of a "perhaps"
|
||||
*/
|
||||
update_mask |= EHCA_BMASK_SET(MQPCB_MASK_SEND_GRH_FLAG, 1);
|
||||
|
||||
/*
|
||||
* only if GRH is TRUE we might consider SOURCE_GID_IDX
|
||||
* and DEST_GID otherwise phype will return H_ATTR_PARM!!!
|
||||
*/
|
||||
if (attr->ah_attr.ah_flags == IB_AH_GRH) {
|
||||
mqpcb->send_grh_flag = 1 << 31;
|
||||
update_mask |=
|
||||
EHCA_BMASK_SET(MQPCB_MASK_SEND_GRH_FLAG, 1);
|
||||
mqpcb->send_grh_flag = 1;
|
||||
|
||||
mqpcb->source_gid_idx = attr->ah_attr.grh.sgid_index;
|
||||
update_mask |=
|
||||
EHCA_BMASK_SET(MQPCB_MASK_SOURCE_GID_IDX, 1);
|
||||
|
|
|
@ -154,7 +154,8 @@ static long ehca_plpar_hcall9(unsigned long opcode,
|
|||
unsigned long arg9)
|
||||
{
|
||||
long ret;
|
||||
int i, sleep_msecs;
|
||||
int i, sleep_msecs, lock_is_set = 0;
|
||||
unsigned long flags;
|
||||
|
||||
ehca_gen_dbg("opcode=%lx arg1=%lx arg2=%lx arg3=%lx arg4=%lx "
|
||||
"arg5=%lx arg6=%lx arg7=%lx arg8=%lx arg9=%lx",
|
||||
|
@ -162,10 +163,18 @@ static long ehca_plpar_hcall9(unsigned long opcode,
|
|||
arg8, arg9);
|
||||
|
||||
for (i = 0; i < 5; i++) {
|
||||
if ((opcode == H_ALLOC_RESOURCE) && (arg2 == 5)) {
|
||||
spin_lock_irqsave(&hcall_lock, flags);
|
||||
lock_is_set = 1;
|
||||
}
|
||||
|
||||
ret = plpar_hcall9(opcode, outs,
|
||||
arg1, arg2, arg3, arg4, arg5,
|
||||
arg6, arg7, arg8, arg9);
|
||||
|
||||
if (lock_is_set)
|
||||
spin_unlock_irqrestore(&hcall_lock, flags);
|
||||
|
||||
if (H_IS_LONG_BUSY(ret)) {
|
||||
sleep_msecs = get_longbusy_msecs(ret);
|
||||
msleep_interruptible(sleep_msecs);
|
||||
|
@ -193,11 +202,11 @@ static long ehca_plpar_hcall9(unsigned long opcode,
|
|||
opcode, ret, outs[0], outs[1], outs[2], outs[3],
|
||||
outs[4], outs[5], outs[6], outs[7], outs[8]);
|
||||
return ret;
|
||||
|
||||
}
|
||||
|
||||
return H_BUSY;
|
||||
}
|
||||
|
||||
u64 hipz_h_alloc_resource_eq(const struct ipz_adapter_handle adapter_handle,
|
||||
struct ehca_pfeq *pfeq,
|
||||
const u32 neq_control,
|
||||
|
|
|
@ -747,7 +747,6 @@ static void ipath_pe_quiet_serdes(struct ipath_devdata *dd)
|
|||
|
||||
static int ipath_pe_intconfig(struct ipath_devdata *dd)
|
||||
{
|
||||
u64 val;
|
||||
u32 chiprev;
|
||||
|
||||
/*
|
||||
|
@ -760,9 +759,9 @@ static int ipath_pe_intconfig(struct ipath_devdata *dd)
|
|||
if ((chiprev & INFINIPATH_R_CHIPREVMINOR_MASK) > 1) {
|
||||
/* Rev2+ reports extra errors via internal GPIO pins */
|
||||
dd->ipath_flags |= IPATH_GPIO_ERRINTRS;
|
||||
val = ipath_read_kreg64(dd, dd->ipath_kregs->kr_gpio_mask);
|
||||
val |= IPATH_GPIO_ERRINTR_MASK;
|
||||
ipath_write_kreg( dd, dd->ipath_kregs->kr_gpio_mask, val);
|
||||
dd->ipath_gpio_mask |= IPATH_GPIO_ERRINTR_MASK;
|
||||
ipath_write_kreg(dd, dd->ipath_kregs->kr_gpio_mask,
|
||||
dd->ipath_gpio_mask);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -1056,7 +1056,7 @@ irqreturn_t ipath_intr(int irq, void *data)
|
|||
gpiostatus &= ~(1 << IPATH_GPIO_PORT0_BIT);
|
||||
chk0rcv = 1;
|
||||
}
|
||||
if (unlikely(gpiostatus)) {
|
||||
if (gpiostatus) {
|
||||
/*
|
||||
* Some unexpected bits remain. If they could have
|
||||
* caused the interrupt, complain and clear.
|
||||
|
@ -1065,9 +1065,8 @@ irqreturn_t ipath_intr(int irq, void *data)
|
|||
* GPIO interrupts, possibly on a "three strikes"
|
||||
* basis.
|
||||
*/
|
||||
u32 mask;
|
||||
mask = ipath_read_kreg32(
|
||||
dd, dd->ipath_kregs->kr_gpio_mask);
|
||||
const u32 mask = (u32) dd->ipath_gpio_mask;
|
||||
|
||||
if (mask & gpiostatus) {
|
||||
ipath_dbg("Unexpected GPIO IRQ bits %x\n",
|
||||
gpiostatus & mask);
|
||||
|
|
|
@ -397,6 +397,8 @@ struct ipath_devdata {
|
|||
unsigned long ipath_pioavailshadow[8];
|
||||
/* shadow of kr_gpio_out, for rmw ops */
|
||||
u64 ipath_gpio_out;
|
||||
/* shadow the gpio mask register */
|
||||
u64 ipath_gpio_mask;
|
||||
/* kr_revision shadow */
|
||||
u64 ipath_revision;
|
||||
/*
|
||||
|
|
|
@ -1387,13 +1387,12 @@ static int enable_timer(struct ipath_devdata *dd)
|
|||
* processing.
|
||||
*/
|
||||
if (dd->ipath_flags & IPATH_GPIO_INTR) {
|
||||
u64 val;
|
||||
ipath_write_kreg(dd, dd->ipath_kregs->kr_debugportselect,
|
||||
0x2074076542310ULL);
|
||||
/* Enable GPIO bit 2 interrupt */
|
||||
val = ipath_read_kreg64(dd, dd->ipath_kregs->kr_gpio_mask);
|
||||
val |= (u64) (1 << IPATH_GPIO_PORT0_BIT);
|
||||
ipath_write_kreg( dd, dd->ipath_kregs->kr_gpio_mask, val);
|
||||
dd->ipath_gpio_mask |= (u64) (1 << IPATH_GPIO_PORT0_BIT);
|
||||
ipath_write_kreg(dd, dd->ipath_kregs->kr_gpio_mask,
|
||||
dd->ipath_gpio_mask);
|
||||
}
|
||||
|
||||
init_timer(&dd->verbs_timer);
|
||||
|
@ -1412,8 +1411,9 @@ static int disable_timer(struct ipath_devdata *dd)
|
|||
u64 val;
|
||||
/* Disable GPIO bit 2 interrupt */
|
||||
val = ipath_read_kreg64(dd, dd->ipath_kregs->kr_gpio_mask);
|
||||
val &= ~((u64) (1 << IPATH_GPIO_PORT0_BIT));
|
||||
ipath_write_kreg( dd, dd->ipath_kregs->kr_gpio_mask, val);
|
||||
dd->ipath_gpio_mask &= ~((u64) (1 << IPATH_GPIO_PORT0_BIT));
|
||||
ipath_write_kreg(dd, dd->ipath_kregs->kr_gpio_mask,
|
||||
dd->ipath_gpio_mask);
|
||||
/*
|
||||
* We might want to undo changes to debugportselect,
|
||||
* but how?
|
||||
|
|
|
@ -489,6 +489,7 @@ static void *mlx4_ib_add(struct mlx4_dev *dev)
|
|||
ibdev->uar_map = ioremap(ibdev->priv_uar.pfn << PAGE_SHIFT, PAGE_SIZE);
|
||||
if (!ibdev->uar_map)
|
||||
goto err_uar;
|
||||
MLX4_INIT_DOORBELL_LOCK(&ibdev->uar_lock);
|
||||
|
||||
INIT_LIST_HEAD(&ibdev->pgdir_list);
|
||||
mutex_init(&ibdev->pgdir_mutex);
|
||||
|
|
|
@ -284,7 +284,7 @@ void mthca_cq_clean(struct mthca_dev *dev, struct mthca_cq *cq, u32 qpn,
|
|||
{
|
||||
struct mthca_cqe *cqe;
|
||||
u32 prod_index;
|
||||
int nfreed = 0;
|
||||
int i, nfreed = 0;
|
||||
|
||||
spin_lock_irq(&cq->lock);
|
||||
|
||||
|
@ -321,6 +321,8 @@ void mthca_cq_clean(struct mthca_dev *dev, struct mthca_cq *cq, u32 qpn,
|
|||
}
|
||||
|
||||
if (nfreed) {
|
||||
for (i = 0; i < nfreed; ++i)
|
||||
set_cqe_hw(get_cqe(cq, (cq->cons_index + i) & cq->ibcq.cqe));
|
||||
wmb();
|
||||
cq->cons_index += nfreed;
|
||||
update_cons_index(dev, cq, nfreed);
|
||||
|
|
|
@ -1862,6 +1862,7 @@ int mthca_tavor_post_receive(struct ib_qp *ibqp, struct ib_recv_wr *wr,
|
|||
dev->kar + MTHCA_RECEIVE_DOORBELL,
|
||||
MTHCA_GET_DOORBELL_LOCK(&dev->doorbell_lock));
|
||||
|
||||
qp->rq.next_ind = ind;
|
||||
qp->rq.head += MTHCA_TAVOR_MAX_WQES_PER_RECV_DB;
|
||||
size0 = 0;
|
||||
}
|
||||
|
|
|
@ -257,10 +257,11 @@ static int ipoib_cm_req_handler(struct ib_cm_id *cm_id, struct ib_cm_event *even
|
|||
cm_id->context = p;
|
||||
p->jiffies = jiffies;
|
||||
spin_lock_irq(&priv->lock);
|
||||
if (list_empty(&priv->cm.passive_ids))
|
||||
queue_delayed_work(ipoib_workqueue,
|
||||
&priv->cm.stale_task, IPOIB_CM_RX_DELAY);
|
||||
list_add(&p->list, &priv->cm.passive_ids);
|
||||
spin_unlock_irq(&priv->lock);
|
||||
queue_delayed_work(ipoib_workqueue,
|
||||
&priv->cm.stale_task, IPOIB_CM_RX_DELAY);
|
||||
return 0;
|
||||
|
||||
err_rep:
|
||||
|
@ -378,8 +379,6 @@ void ipoib_cm_handle_rx_wc(struct net_device *dev, struct ib_wc *wc)
|
|||
if (!list_empty(&p->list))
|
||||
list_move(&p->list, &priv->cm.passive_ids);
|
||||
spin_unlock_irqrestore(&priv->lock, flags);
|
||||
queue_delayed_work(ipoib_workqueue,
|
||||
&priv->cm.stale_task, IPOIB_CM_RX_DELAY);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1100,6 +1099,10 @@ static void ipoib_cm_stale_task(struct work_struct *work)
|
|||
kfree(p);
|
||||
spin_lock_irq(&priv->lock);
|
||||
}
|
||||
|
||||
if (!list_empty(&priv->cm.passive_ids))
|
||||
queue_delayed_work(ipoib_workqueue,
|
||||
&priv->cm.stale_task, IPOIB_CM_RX_DELAY);
|
||||
spin_unlock_irq(&priv->lock);
|
||||
}
|
||||
|
||||
|
|
|
@ -2508,6 +2508,7 @@ config MLX4_CORE
|
|||
|
||||
config MLX4_DEBUG
|
||||
bool "Verbose debugging output" if (MLX4_CORE && EMBEDDED)
|
||||
depends on MLX4_CORE
|
||||
default y
|
||||
---help---
|
||||
This option causes debugging code to be compiled into the
|
||||
|
|
|
@ -542,8 +542,6 @@ static int __devinit mlx4_setup_hca(struct mlx4_dev *dev)
|
|||
struct mlx4_priv *priv = mlx4_priv(dev);
|
||||
int err;
|
||||
|
||||
MLX4_INIT_DOORBELL_LOCK(&priv->doorbell_lock);
|
||||
|
||||
err = mlx4_init_uar_table(dev);
|
||||
if (err) {
|
||||
mlx4_err(dev, "Failed to initialize "
|
||||
|
|
|
@ -275,7 +275,6 @@ struct mlx4_priv {
|
|||
|
||||
struct mlx4_uar driver_uar;
|
||||
void __iomem *kar;
|
||||
MLX4_DECLARE_DOORBELL_LOCK(doorbell_lock)
|
||||
|
||||
u32 rev_id;
|
||||
char board_id[MLX4_BOARD_ID_LEN];
|
||||
|
|
559
fs/eventpoll.c
559
fs/eventpoll.c
|
@ -1,6 +1,6 @@
|
|||
/*
|
||||
* fs/eventpoll.c ( Efficent event polling implementation )
|
||||
* Copyright (C) 2001,...,2006 Davide Libenzi
|
||||
* fs/eventpoll.c (Efficent event polling implementation)
|
||||
* Copyright (C) 2001,...,2007 Davide Libenzi
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
@ -26,7 +26,6 @@
|
|||
#include <linux/hash.h>
|
||||
#include <linux/spinlock.h>
|
||||
#include <linux/syscalls.h>
|
||||
#include <linux/rwsem.h>
|
||||
#include <linux/rbtree.h>
|
||||
#include <linux/wait.h>
|
||||
#include <linux/eventpoll.h>
|
||||
|
@ -39,15 +38,14 @@
|
|||
#include <asm/io.h>
|
||||
#include <asm/mman.h>
|
||||
#include <asm/atomic.h>
|
||||
#include <asm/semaphore.h>
|
||||
|
||||
/*
|
||||
* LOCKING:
|
||||
* There are three level of locking required by epoll :
|
||||
*
|
||||
* 1) epmutex (mutex)
|
||||
* 2) ep->sem (rw_semaphore)
|
||||
* 3) ep->lock (rw_lock)
|
||||
* 2) ep->mtx (mutex)
|
||||
* 3) ep->lock (spinlock)
|
||||
*
|
||||
* The acquire order is the one listed above, from 1 to 3.
|
||||
* We need a spinlock (ep->lock) because we manipulate objects
|
||||
|
@ -57,20 +55,20 @@
|
|||
* a spinlock. During the event transfer loop (from kernel to
|
||||
* user space) we could end up sleeping due a copy_to_user(), so
|
||||
* we need a lock that will allow us to sleep. This lock is a
|
||||
* read-write semaphore (ep->sem). It is acquired on read during
|
||||
* the event transfer loop and in write during epoll_ctl(EPOLL_CTL_DEL)
|
||||
* and during eventpoll_release_file(). Then we also need a global
|
||||
* semaphore to serialize eventpoll_release_file() and ep_free().
|
||||
* This semaphore is acquired by ep_free() during the epoll file
|
||||
* mutex (ep->mtx). It is acquired during the event transfer loop,
|
||||
* during epoll_ctl(EPOLL_CTL_DEL) and during eventpoll_release_file().
|
||||
* Then we also need a global mutex to serialize eventpoll_release_file()
|
||||
* and ep_free().
|
||||
* This mutex is acquired by ep_free() during the epoll file
|
||||
* cleanup path and it is also acquired by eventpoll_release_file()
|
||||
* if a file has been pushed inside an epoll set and it is then
|
||||
* close()d without a previous call toepoll_ctl(EPOLL_CTL_DEL).
|
||||
* It is possible to drop the "ep->sem" and to use the global
|
||||
* semaphore "epmutex" (together with "ep->lock") to have it working,
|
||||
* but having "ep->sem" will make the interface more scalable.
|
||||
* It is possible to drop the "ep->mtx" and to use the global
|
||||
* mutex "epmutex" (together with "ep->lock") to have it working,
|
||||
* but having "ep->mtx" will make the interface more scalable.
|
||||
* Events that require holding "epmutex" are very rare, while for
|
||||
* normal operations the epoll private "ep->sem" will guarantee
|
||||
* a greater scalability.
|
||||
* normal operations the epoll private "ep->mtx" will guarantee
|
||||
* a better scalability.
|
||||
*/
|
||||
|
||||
#define DEBUG_EPOLL 0
|
||||
|
@ -102,6 +100,8 @@
|
|||
|
||||
#define EP_MAX_EVENTS (INT_MAX / sizeof(struct epoll_event))
|
||||
|
||||
#define EP_UNACTIVE_PTR ((void *) -1L)
|
||||
|
||||
struct epoll_filefd {
|
||||
struct file *file;
|
||||
int fd;
|
||||
|
@ -111,7 +111,7 @@ struct epoll_filefd {
|
|||
* Node that is linked into the "wake_task_list" member of the "struct poll_safewake".
|
||||
* It is used to keep track on all tasks that are currently inside the wake_up() code
|
||||
* to 1) short-circuit the one coming from the same task and same wait queue head
|
||||
* ( loop ) 2) allow a maximum number of epoll descriptors inclusion nesting
|
||||
* (loop) 2) allow a maximum number of epoll descriptors inclusion nesting
|
||||
* 3) let go the ones coming from other tasks.
|
||||
*/
|
||||
struct wake_task_node {
|
||||
|
@ -129,6 +129,42 @@ struct poll_safewake {
|
|||
spinlock_t lock;
|
||||
};
|
||||
|
||||
/*
|
||||
* Each file descriptor added to the eventpoll interface will
|
||||
* have an entry of this type linked to the "rbr" RB tree.
|
||||
*/
|
||||
struct epitem {
|
||||
/* RB tree node used to link this structure to the eventpoll RB tree */
|
||||
struct rb_node rbn;
|
||||
|
||||
/* List header used to link this structure to the eventpoll ready list */
|
||||
struct list_head rdllink;
|
||||
|
||||
/*
|
||||
* Works together "struct eventpoll"->ovflist in keeping the
|
||||
* single linked chain of items.
|
||||
*/
|
||||
struct epitem *next;
|
||||
|
||||
/* The file descriptor information this item refers to */
|
||||
struct epoll_filefd ffd;
|
||||
|
||||
/* Number of active wait queue attached to poll operations */
|
||||
int nwait;
|
||||
|
||||
/* List containing poll wait queues */
|
||||
struct list_head pwqlist;
|
||||
|
||||
/* The "container" of this item */
|
||||
struct eventpoll *ep;
|
||||
|
||||
/* List header used to link this item to the "struct file" items list */
|
||||
struct list_head fllink;
|
||||
|
||||
/* The structure that describe the interested events and the source fd */
|
||||
struct epoll_event event;
|
||||
};
|
||||
|
||||
/*
|
||||
* This structure is stored inside the "private_data" member of the file
|
||||
* structure and rapresent the main data sructure for the eventpoll
|
||||
|
@ -136,15 +172,15 @@ struct poll_safewake {
|
|||
*/
|
||||
struct eventpoll {
|
||||
/* Protect the this structure access */
|
||||
rwlock_t lock;
|
||||
spinlock_t lock;
|
||||
|
||||
/*
|
||||
* This semaphore is used to ensure that files are not removed
|
||||
* while epoll is using them. This is read-held during the event
|
||||
* collection loop and it is write-held during the file cleanup
|
||||
* path, the epoll file exit code and the ctl operations.
|
||||
* This mutex is used to ensure that files are not removed
|
||||
* while epoll is using them. This is held during the event
|
||||
* collection loop, the file cleanup path, the epoll file exit
|
||||
* code and the ctl operations.
|
||||
*/
|
||||
struct rw_semaphore sem;
|
||||
struct mutex mtx;
|
||||
|
||||
/* Wait queue used by sys_epoll_wait() */
|
||||
wait_queue_head_t wq;
|
||||
|
@ -155,8 +191,15 @@ struct eventpoll {
|
|||
/* List of ready file descriptors */
|
||||
struct list_head rdllist;
|
||||
|
||||
/* RB-Tree root used to store monitored fd structs */
|
||||
/* RB tree root used to store monitored fd structs */
|
||||
struct rb_root rbr;
|
||||
|
||||
/*
|
||||
* This is a single linked list that chains all the "struct epitem" that
|
||||
* happened while transfering ready events to userspace w/out
|
||||
* holding ->lock.
|
||||
*/
|
||||
struct epitem *ovflist;
|
||||
};
|
||||
|
||||
/* Wait structure used by the poll hooks */
|
||||
|
@ -177,42 +220,6 @@ struct eppoll_entry {
|
|||
wait_queue_head_t *whead;
|
||||
};
|
||||
|
||||
/*
|
||||
* Each file descriptor added to the eventpoll interface will
|
||||
* have an entry of this type linked to the "rbr" RB tree.
|
||||
*/
|
||||
struct epitem {
|
||||
/* RB-Tree node used to link this structure to the eventpoll rb-tree */
|
||||
struct rb_node rbn;
|
||||
|
||||
/* List header used to link this structure to the eventpoll ready list */
|
||||
struct list_head rdllink;
|
||||
|
||||
/* The file descriptor information this item refers to */
|
||||
struct epoll_filefd ffd;
|
||||
|
||||
/* Number of active wait queue attached to poll operations */
|
||||
int nwait;
|
||||
|
||||
/* List containing poll wait queues */
|
||||
struct list_head pwqlist;
|
||||
|
||||
/* The "container" of this item */
|
||||
struct eventpoll *ep;
|
||||
|
||||
/* The structure that describe the interested events and the source fd */
|
||||
struct epoll_event event;
|
||||
|
||||
/*
|
||||
* Used to keep track of the usage count of the structure. This avoids
|
||||
* that the structure will desappear from underneath our processing.
|
||||
*/
|
||||
atomic_t usecnt;
|
||||
|
||||
/* List header used to link this item to the "struct file" items list */
|
||||
struct list_head fllink;
|
||||
};
|
||||
|
||||
/* Wrapper struct used by poll queueing */
|
||||
struct ep_pqueue {
|
||||
poll_table pt;
|
||||
|
@ -220,7 +227,7 @@ struct ep_pqueue {
|
|||
};
|
||||
|
||||
/*
|
||||
* This semaphore is used to serialize ep_free() and eventpoll_release_file().
|
||||
* This mutex is used to serialize ep_free() and eventpoll_release_file().
|
||||
*/
|
||||
static struct mutex epmutex;
|
||||
|
||||
|
@ -234,7 +241,7 @@ static struct kmem_cache *epi_cache __read_mostly;
|
|||
static struct kmem_cache *pwq_cache __read_mostly;
|
||||
|
||||
|
||||
/* Setup the structure that is used as key for the rb-tree */
|
||||
/* Setup the structure that is used as key for the RB tree */
|
||||
static inline void ep_set_ffd(struct epoll_filefd *ffd,
|
||||
struct file *file, int fd)
|
||||
{
|
||||
|
@ -242,7 +249,7 @@ static inline void ep_set_ffd(struct epoll_filefd *ffd,
|
|||
ffd->fd = fd;
|
||||
}
|
||||
|
||||
/* Compare rb-tree keys */
|
||||
/* Compare RB tree keys */
|
||||
static inline int ep_cmp_ffd(struct epoll_filefd *p1,
|
||||
struct epoll_filefd *p2)
|
||||
{
|
||||
|
@ -250,20 +257,20 @@ static inline int ep_cmp_ffd(struct epoll_filefd *p1,
|
|||
(p1->file < p2->file ? -1 : p1->fd - p2->fd));
|
||||
}
|
||||
|
||||
/* Special initialization for the rb-tree node to detect linkage */
|
||||
/* Special initialization for the RB tree node to detect linkage */
|
||||
static inline void ep_rb_initnode(struct rb_node *n)
|
||||
{
|
||||
rb_set_parent(n, n);
|
||||
}
|
||||
|
||||
/* Removes a node from the rb-tree and marks it for a fast is-linked check */
|
||||
/* Removes a node from the RB tree and marks it for a fast is-linked check */
|
||||
static inline void ep_rb_erase(struct rb_node *n, struct rb_root *r)
|
||||
{
|
||||
rb_erase(n, r);
|
||||
rb_set_parent(n, n);
|
||||
}
|
||||
|
||||
/* Fast check to verify that the item is linked to the main rb-tree */
|
||||
/* Fast check to verify that the item is linked to the main RB tree */
|
||||
static inline int ep_rb_linked(struct rb_node *n)
|
||||
{
|
||||
return rb_parent(n) != n;
|
||||
|
@ -380,79 +387,12 @@ static void ep_unregister_pollwait(struct eventpoll *ep, struct epitem *epi)
|
|||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Unlink the "struct epitem" from all places it might have been hooked up.
|
||||
* This function must be called with write IRQ lock on "ep->lock".
|
||||
*/
|
||||
static int ep_unlink(struct eventpoll *ep, struct epitem *epi)
|
||||
{
|
||||
int error;
|
||||
|
||||
/*
|
||||
* It can happen that this one is called for an item already unlinked.
|
||||
* The check protect us from doing a double unlink ( crash ).
|
||||
*/
|
||||
error = -ENOENT;
|
||||
if (!ep_rb_linked(&epi->rbn))
|
||||
goto error_return;
|
||||
|
||||
/*
|
||||
* Clear the event mask for the unlinked item. This will avoid item
|
||||
* notifications to be sent after the unlink operation from inside
|
||||
* the kernel->userspace event transfer loop.
|
||||
*/
|
||||
epi->event.events = 0;
|
||||
|
||||
/*
|
||||
* At this point is safe to do the job, unlink the item from our rb-tree.
|
||||
* This operation togheter with the above check closes the door to
|
||||
* double unlinks.
|
||||
*/
|
||||
ep_rb_erase(&epi->rbn, &ep->rbr);
|
||||
|
||||
/*
|
||||
* If the item we are going to remove is inside the ready file descriptors
|
||||
* we want to remove it from this list to avoid stale events.
|
||||
*/
|
||||
if (ep_is_linked(&epi->rdllink))
|
||||
list_del_init(&epi->rdllink);
|
||||
|
||||
error = 0;
|
||||
error_return:
|
||||
|
||||
DNPRINTK(3, (KERN_INFO "[%p] eventpoll: ep_unlink(%p, %p) = %d\n",
|
||||
current, ep, epi->ffd.file, error));
|
||||
|
||||
return error;
|
||||
}
|
||||
|
||||
/*
|
||||
* Increment the usage count of the "struct epitem" making it sure
|
||||
* that the user will have a valid pointer to reference.
|
||||
*/
|
||||
static void ep_use_epitem(struct epitem *epi)
|
||||
{
|
||||
atomic_inc(&epi->usecnt);
|
||||
}
|
||||
|
||||
/*
|
||||
* Decrement ( release ) the usage count by signaling that the user
|
||||
* has finished using the structure. It might lead to freeing the
|
||||
* structure itself if the count goes to zero.
|
||||
*/
|
||||
static void ep_release_epitem(struct epitem *epi)
|
||||
{
|
||||
if (atomic_dec_and_test(&epi->usecnt))
|
||||
kmem_cache_free(epi_cache, epi);
|
||||
}
|
||||
|
||||
/*
|
||||
* Removes a "struct epitem" from the eventpoll RB tree and deallocates
|
||||
* all the associated resources.
|
||||
* all the associated resources. Must be called with "mtx" held.
|
||||
*/
|
||||
static int ep_remove(struct eventpoll *ep, struct epitem *epi)
|
||||
{
|
||||
int error;
|
||||
unsigned long flags;
|
||||
struct file *file = epi->ffd.file;
|
||||
|
||||
|
@ -472,26 +412,21 @@ static int ep_remove(struct eventpoll *ep, struct epitem *epi)
|
|||
list_del_init(&epi->fllink);
|
||||
spin_unlock(&file->f_ep_lock);
|
||||
|
||||
/* We need to acquire the write IRQ lock before calling ep_unlink() */
|
||||
write_lock_irqsave(&ep->lock, flags);
|
||||
if (ep_rb_linked(&epi->rbn))
|
||||
ep_rb_erase(&epi->rbn, &ep->rbr);
|
||||
|
||||
/* Really unlink the item from the RB tree */
|
||||
error = ep_unlink(ep, epi);
|
||||
|
||||
write_unlock_irqrestore(&ep->lock, flags);
|
||||
|
||||
if (error)
|
||||
goto error_return;
|
||||
spin_lock_irqsave(&ep->lock, flags);
|
||||
if (ep_is_linked(&epi->rdllink))
|
||||
list_del_init(&epi->rdllink);
|
||||
spin_unlock_irqrestore(&ep->lock, flags);
|
||||
|
||||
/* At this point it is safe to free the eventpoll item */
|
||||
ep_release_epitem(epi);
|
||||
kmem_cache_free(epi_cache, epi);
|
||||
|
||||
error = 0;
|
||||
error_return:
|
||||
DNPRINTK(3, (KERN_INFO "[%p] eventpoll: ep_remove(%p, %p) = %d\n",
|
||||
current, ep, file, error));
|
||||
DNPRINTK(3, (KERN_INFO "[%p] eventpoll: ep_remove(%p, %p)\n",
|
||||
current, ep, file));
|
||||
|
||||
return error;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void ep_free(struct eventpoll *ep)
|
||||
|
@ -506,7 +441,7 @@ static void ep_free(struct eventpoll *ep)
|
|||
/*
|
||||
* We need to lock this because we could be hit by
|
||||
* eventpoll_release_file() while we're freeing the "struct eventpoll".
|
||||
* We do not need to hold "ep->sem" here because the epoll file
|
||||
* We do not need to hold "ep->mtx" here because the epoll file
|
||||
* is on the way to be removed and no one has references to it
|
||||
* anymore. The only hit might come from eventpoll_release_file() but
|
||||
* holding "epmutex" is sufficent here.
|
||||
|
@ -525,7 +460,7 @@ static void ep_free(struct eventpoll *ep)
|
|||
/*
|
||||
* Walks through the whole tree by freeing each "struct epitem". At this
|
||||
* point we are sure no poll callbacks will be lingering around, and also by
|
||||
* write-holding "sem" we can be sure that no file cleanup code will hit
|
||||
* holding "epmutex" we can be sure that no file cleanup code will hit
|
||||
* us during this operation. So we can avoid the lock on "ep->lock".
|
||||
*/
|
||||
while ((rbp = rb_first(&ep->rbr)) != 0) {
|
||||
|
@ -534,16 +469,16 @@ static void ep_free(struct eventpoll *ep)
|
|||
}
|
||||
|
||||
mutex_unlock(&epmutex);
|
||||
mutex_destroy(&ep->mtx);
|
||||
kfree(ep);
|
||||
}
|
||||
|
||||
static int ep_eventpoll_release(struct inode *inode, struct file *file)
|
||||
{
|
||||
struct eventpoll *ep = file->private_data;
|
||||
|
||||
if (ep) {
|
||||
if (ep)
|
||||
ep_free(ep);
|
||||
kfree(ep);
|
||||
}
|
||||
|
||||
DNPRINTK(3, (KERN_INFO "[%p] eventpoll: close() ep=%p\n", current, ep));
|
||||
return 0;
|
||||
|
@ -559,10 +494,10 @@ static unsigned int ep_eventpoll_poll(struct file *file, poll_table *wait)
|
|||
poll_wait(file, &ep->poll_wait, wait);
|
||||
|
||||
/* Check our condition */
|
||||
read_lock_irqsave(&ep->lock, flags);
|
||||
spin_lock_irqsave(&ep->lock, flags);
|
||||
if (!list_empty(&ep->rdllist))
|
||||
pollflags = POLLIN | POLLRDNORM;
|
||||
read_unlock_irqrestore(&ep->lock, flags);
|
||||
spin_unlock_irqrestore(&ep->lock, flags);
|
||||
|
||||
return pollflags;
|
||||
}
|
||||
|
@ -594,9 +529,11 @@ void eventpoll_release_file(struct file *file)
|
|||
* We don't want to get "file->f_ep_lock" because it is not
|
||||
* necessary. It is not necessary because we're in the "struct file"
|
||||
* cleanup path, and this means that noone is using this file anymore.
|
||||
* The only hit might come from ep_free() but by holding the semaphore
|
||||
* So, for example, epoll_ctl() cannot hit here sicne if we reach this
|
||||
* point, the file counter already went to zero and fget() would fail.
|
||||
* The only hit might come from ep_free() but by holding the mutex
|
||||
* will correctly serialize the operation. We do need to acquire
|
||||
* "ep->sem" after "epmutex" because ep_remove() requires it when called
|
||||
* "ep->mtx" after "epmutex" because ep_remove() requires it when called
|
||||
* from anywhere but ep_free().
|
||||
*/
|
||||
mutex_lock(&epmutex);
|
||||
|
@ -606,9 +543,9 @@ void eventpoll_release_file(struct file *file)
|
|||
|
||||
ep = epi->ep;
|
||||
list_del_init(&epi->fllink);
|
||||
down_write(&ep->sem);
|
||||
mutex_lock(&ep->mtx);
|
||||
ep_remove(ep, epi);
|
||||
up_write(&ep->sem);
|
||||
mutex_unlock(&ep->mtx);
|
||||
}
|
||||
|
||||
mutex_unlock(&epmutex);
|
||||
|
@ -621,12 +558,13 @@ static int ep_alloc(struct eventpoll **pep)
|
|||
if (!ep)
|
||||
return -ENOMEM;
|
||||
|
||||
rwlock_init(&ep->lock);
|
||||
init_rwsem(&ep->sem);
|
||||
spin_lock_init(&ep->lock);
|
||||
mutex_init(&ep->mtx);
|
||||
init_waitqueue_head(&ep->wq);
|
||||
init_waitqueue_head(&ep->poll_wait);
|
||||
INIT_LIST_HEAD(&ep->rdllist);
|
||||
ep->rbr = RB_ROOT;
|
||||
ep->ovflist = EP_UNACTIVE_PTR;
|
||||
|
||||
*pep = ep;
|
||||
|
||||
|
@ -636,20 +574,18 @@ static int ep_alloc(struct eventpoll **pep)
|
|||
}
|
||||
|
||||
/*
|
||||
* Search the file inside the eventpoll tree. It add usage count to
|
||||
* the returned item, so the caller must call ep_release_epitem()
|
||||
* after finished using the "struct epitem".
|
||||
* Search the file inside the eventpoll tree. The RB tree operations
|
||||
* are protected by the "mtx" mutex, and ep_find() must be called with
|
||||
* "mtx" held.
|
||||
*/
|
||||
static struct epitem *ep_find(struct eventpoll *ep, struct file *file, int fd)
|
||||
{
|
||||
int kcmp;
|
||||
unsigned long flags;
|
||||
struct rb_node *rbp;
|
||||
struct epitem *epi, *epir = NULL;
|
||||
struct epoll_filefd ffd;
|
||||
|
||||
ep_set_ffd(&ffd, file, fd);
|
||||
read_lock_irqsave(&ep->lock, flags);
|
||||
for (rbp = ep->rbr.rb_node; rbp; ) {
|
||||
epi = rb_entry(rbp, struct epitem, rbn);
|
||||
kcmp = ep_cmp_ffd(&ffd, &epi->ffd);
|
||||
|
@ -658,12 +594,10 @@ static struct epitem *ep_find(struct eventpoll *ep, struct file *file, int fd)
|
|||
else if (kcmp < 0)
|
||||
rbp = rbp->rb_left;
|
||||
else {
|
||||
ep_use_epitem(epi);
|
||||
epir = epi;
|
||||
break;
|
||||
}
|
||||
}
|
||||
read_unlock_irqrestore(&ep->lock, flags);
|
||||
|
||||
DNPRINTK(3, (KERN_INFO "[%p] eventpoll: ep_find(%p) -> %p\n",
|
||||
current, file, epir));
|
||||
|
@ -686,7 +620,7 @@ static int ep_poll_callback(wait_queue_t *wait, unsigned mode, int sync, void *k
|
|||
DNPRINTK(3, (KERN_INFO "[%p] eventpoll: poll_callback(%p) epi=%p ep=%p\n",
|
||||
current, epi->ffd.file, epi, ep));
|
||||
|
||||
write_lock_irqsave(&ep->lock, flags);
|
||||
spin_lock_irqsave(&ep->lock, flags);
|
||||
|
||||
/*
|
||||
* If the event mask does not contain any poll(2) event, we consider the
|
||||
|
@ -695,7 +629,21 @@ static int ep_poll_callback(wait_queue_t *wait, unsigned mode, int sync, void *k
|
|||
* until the next EPOLL_CTL_MOD will be issued.
|
||||
*/
|
||||
if (!(epi->event.events & ~EP_PRIVATE_BITS))
|
||||
goto is_disabled;
|
||||
goto out_unlock;
|
||||
|
||||
/*
|
||||
* If we are trasfering events to userspace, we can hold no locks
|
||||
* (because we're accessing user memory, and because of linux f_op->poll()
|
||||
* semantics). All the events that happens during that period of time are
|
||||
* chained in ep->ovflist and requeued later on.
|
||||
*/
|
||||
if (unlikely(ep->ovflist != EP_UNACTIVE_PTR)) {
|
||||
if (epi->next == EP_UNACTIVE_PTR) {
|
||||
epi->next = ep->ovflist;
|
||||
ep->ovflist = epi;
|
||||
}
|
||||
goto out_unlock;
|
||||
}
|
||||
|
||||
/* If this file is already in the ready list we exit soon */
|
||||
if (ep_is_linked(&epi->rdllink))
|
||||
|
@ -714,8 +662,8 @@ is_linked:
|
|||
if (waitqueue_active(&ep->poll_wait))
|
||||
pwake++;
|
||||
|
||||
is_disabled:
|
||||
write_unlock_irqrestore(&ep->lock, flags);
|
||||
out_unlock:
|
||||
spin_unlock_irqrestore(&ep->lock, flags);
|
||||
|
||||
/* We have to call this outside the lock */
|
||||
if (pwake)
|
||||
|
@ -766,6 +714,9 @@ static void ep_rbtree_insert(struct eventpoll *ep, struct epitem *epi)
|
|||
rb_insert_color(&epi->rbn, &ep->rbr);
|
||||
}
|
||||
|
||||
/*
|
||||
* Must be called with "mtx" held.
|
||||
*/
|
||||
static int ep_insert(struct eventpoll *ep, struct epoll_event *event,
|
||||
struct file *tfile, int fd)
|
||||
{
|
||||
|
@ -786,8 +737,8 @@ static int ep_insert(struct eventpoll *ep, struct epoll_event *event,
|
|||
epi->ep = ep;
|
||||
ep_set_ffd(&epi->ffd, tfile, fd);
|
||||
epi->event = *event;
|
||||
atomic_set(&epi->usecnt, 1);
|
||||
epi->nwait = 0;
|
||||
epi->next = EP_UNACTIVE_PTR;
|
||||
|
||||
/* Initialize the poll table using the queue callback */
|
||||
epq.epi = epi;
|
||||
|
@ -796,7 +747,9 @@ static int ep_insert(struct eventpoll *ep, struct epoll_event *event,
|
|||
/*
|
||||
* Attach the item to the poll hooks and get current event bits.
|
||||
* We can safely use the file* here because its usage count has
|
||||
* been increased by the caller of this function.
|
||||
* been increased by the caller of this function. Note that after
|
||||
* this operation completes, the poll callback can start hitting
|
||||
* the new item.
|
||||
*/
|
||||
revents = tfile->f_op->poll(tfile, &epq.pt);
|
||||
|
||||
|
@ -813,12 +766,15 @@ static int ep_insert(struct eventpoll *ep, struct epoll_event *event,
|
|||
list_add_tail(&epi->fllink, &tfile->f_ep_links);
|
||||
spin_unlock(&tfile->f_ep_lock);
|
||||
|
||||
/* We have to drop the new item inside our item list to keep track of it */
|
||||
write_lock_irqsave(&ep->lock, flags);
|
||||
|
||||
/* Add the current item to the rb-tree */
|
||||
/*
|
||||
* Add the current item to the RB tree. All RB tree operations are
|
||||
* protected by "mtx", and ep_insert() is called with "mtx" held.
|
||||
*/
|
||||
ep_rbtree_insert(ep, epi);
|
||||
|
||||
/* We have to drop the new item inside our item list to keep track of it */
|
||||
spin_lock_irqsave(&ep->lock, flags);
|
||||
|
||||
/* If the file is already "ready" we drop it inside the ready list */
|
||||
if ((revents & event->events) && !ep_is_linked(&epi->rdllink)) {
|
||||
list_add_tail(&epi->rdllink, &ep->rdllist);
|
||||
|
@ -830,7 +786,7 @@ static int ep_insert(struct eventpoll *ep, struct epoll_event *event,
|
|||
pwake++;
|
||||
}
|
||||
|
||||
write_unlock_irqrestore(&ep->lock, flags);
|
||||
spin_unlock_irqrestore(&ep->lock, flags);
|
||||
|
||||
/* We have to call this outside the lock */
|
||||
if (pwake)
|
||||
|
@ -846,12 +802,14 @@ error_unregister:
|
|||
|
||||
/*
|
||||
* We need to do this because an event could have been arrived on some
|
||||
* allocated wait queue.
|
||||
* allocated wait queue. Note that we don't care about the ep->ovflist
|
||||
* list, since that is used/cleaned only inside a section bound by "mtx".
|
||||
* And ep_insert() is called with "mtx" held.
|
||||
*/
|
||||
write_lock_irqsave(&ep->lock, flags);
|
||||
spin_lock_irqsave(&ep->lock, flags);
|
||||
if (ep_is_linked(&epi->rdllink))
|
||||
list_del_init(&epi->rdllink);
|
||||
write_unlock_irqrestore(&ep->lock, flags);
|
||||
spin_unlock_irqrestore(&ep->lock, flags);
|
||||
|
||||
kmem_cache_free(epi_cache, epi);
|
||||
error_return:
|
||||
|
@ -860,7 +818,7 @@ error_return:
|
|||
|
||||
/*
|
||||
* Modify the interest event mask by dropping an event if the new mask
|
||||
* has a match in the current file status.
|
||||
* has a match in the current file status. Must be called with "mtx" held.
|
||||
*/
|
||||
static int ep_modify(struct eventpoll *ep, struct epitem *epi, struct epoll_event *event)
|
||||
{
|
||||
|
@ -882,36 +840,28 @@ static int ep_modify(struct eventpoll *ep, struct epitem *epi, struct epoll_even
|
|||
*/
|
||||
revents = epi->ffd.file->f_op->poll(epi->ffd.file, NULL);
|
||||
|
||||
write_lock_irqsave(&ep->lock, flags);
|
||||
spin_lock_irqsave(&ep->lock, flags);
|
||||
|
||||
/* Copy the data member from inside the lock */
|
||||
epi->event.data = event->data;
|
||||
|
||||
/*
|
||||
* If the item is not linked to the RB tree it means that it's on its
|
||||
* way toward the removal. Do nothing in this case.
|
||||
* If the item is "hot" and it is not registered inside the ready
|
||||
* list, push it inside.
|
||||
*/
|
||||
if (ep_rb_linked(&epi->rbn)) {
|
||||
/*
|
||||
* If the item is "hot" and it is not registered inside the ready
|
||||
* list, push it inside. If the item is not "hot" and it is currently
|
||||
* registered inside the ready list, unlink it.
|
||||
*/
|
||||
if (revents & event->events) {
|
||||
if (!ep_is_linked(&epi->rdllink)) {
|
||||
list_add_tail(&epi->rdllink, &ep->rdllist);
|
||||
if (revents & event->events) {
|
||||
if (!ep_is_linked(&epi->rdllink)) {
|
||||
list_add_tail(&epi->rdllink, &ep->rdllist);
|
||||
|
||||
/* Notify waiting tasks that events are available */
|
||||
if (waitqueue_active(&ep->wq))
|
||||
__wake_up_locked(&ep->wq, TASK_UNINTERRUPTIBLE |
|
||||
TASK_INTERRUPTIBLE);
|
||||
if (waitqueue_active(&ep->poll_wait))
|
||||
pwake++;
|
||||
}
|
||||
/* Notify waiting tasks that events are available */
|
||||
if (waitqueue_active(&ep->wq))
|
||||
__wake_up_locked(&ep->wq, TASK_UNINTERRUPTIBLE |
|
||||
TASK_INTERRUPTIBLE);
|
||||
if (waitqueue_active(&ep->poll_wait))
|
||||
pwake++;
|
||||
}
|
||||
}
|
||||
|
||||
write_unlock_irqrestore(&ep->lock, flags);
|
||||
spin_unlock_irqrestore(&ep->lock, flags);
|
||||
|
||||
/* We have to call this outside the lock */
|
||||
if (pwake)
|
||||
|
@ -920,36 +870,50 @@ static int ep_modify(struct eventpoll *ep, struct epitem *epi, struct epoll_even
|
|||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* This function is called without holding the "ep->lock" since the call to
|
||||
* __copy_to_user() might sleep, and also f_op->poll() might reenable the IRQ
|
||||
* because of the way poll() is traditionally implemented in Linux.
|
||||
*/
|
||||
static int ep_send_events(struct eventpoll *ep, struct list_head *txlist,
|
||||
struct epoll_event __user *events, int maxevents)
|
||||
static int ep_send_events(struct eventpoll *ep, struct epoll_event __user *events,
|
||||
int maxevents)
|
||||
{
|
||||
int eventcnt, error = -EFAULT, pwake = 0;
|
||||
unsigned int revents;
|
||||
unsigned long flags;
|
||||
struct epitem *epi;
|
||||
struct list_head injlist;
|
||||
struct epitem *epi, *nepi;
|
||||
struct list_head txlist;
|
||||
|
||||
INIT_LIST_HEAD(&injlist);
|
||||
INIT_LIST_HEAD(&txlist);
|
||||
|
||||
/*
|
||||
* We need to lock this because we could be hit by
|
||||
* eventpoll_release_file() and epoll_ctl(EPOLL_CTL_DEL).
|
||||
*/
|
||||
mutex_lock(&ep->mtx);
|
||||
|
||||
/*
|
||||
* Steal the ready list, and re-init the original one to the
|
||||
* empty list. Also, set ep->ovflist to NULL so that events
|
||||
* happening while looping w/out locks, are not lost. We cannot
|
||||
* have the poll callback to queue directly on ep->rdllist,
|
||||
* because we are doing it in the loop below, in a lockless way.
|
||||
*/
|
||||
spin_lock_irqsave(&ep->lock, flags);
|
||||
list_splice(&ep->rdllist, &txlist);
|
||||
INIT_LIST_HEAD(&ep->rdllist);
|
||||
ep->ovflist = NULL;
|
||||
spin_unlock_irqrestore(&ep->lock, flags);
|
||||
|
||||
/*
|
||||
* We can loop without lock because this is a task private list.
|
||||
* We just splice'd out the ep->rdllist in ep_collect_ready_items().
|
||||
* Items cannot vanish during the loop because we are holding "sem" in
|
||||
* read.
|
||||
* Items cannot vanish during the loop because we are holding "mtx".
|
||||
*/
|
||||
for (eventcnt = 0; !list_empty(txlist) && eventcnt < maxevents;) {
|
||||
epi = list_first_entry(txlist, struct epitem, rdllink);
|
||||
prefetch(epi->rdllink.next);
|
||||
for (eventcnt = 0; !list_empty(&txlist) && eventcnt < maxevents;) {
|
||||
epi = list_first_entry(&txlist, struct epitem, rdllink);
|
||||
|
||||
list_del_init(&epi->rdllink);
|
||||
|
||||
/*
|
||||
* Get the ready file event set. We can safely use the file
|
||||
* because we are holding the "sem" in read and this will
|
||||
* guarantee that both the file and the item will not vanish.
|
||||
* because we are holding the "mtx" and this will guarantee
|
||||
* that both the file and the item will not vanish.
|
||||
*/
|
||||
revents = epi->ffd.file->f_op->poll(epi->ffd.file, NULL);
|
||||
revents &= epi->event.events;
|
||||
|
@ -957,8 +921,8 @@ static int ep_send_events(struct eventpoll *ep, struct list_head *txlist,
|
|||
/*
|
||||
* Is the event mask intersect the caller-requested one,
|
||||
* deliver the event to userspace. Again, we are holding
|
||||
* "sem" in read, so no operations coming from userspace
|
||||
* can change the item.
|
||||
* "mtx", so no operations coming from userspace can change
|
||||
* the item.
|
||||
*/
|
||||
if (revents) {
|
||||
if (__put_user(revents,
|
||||
|
@ -970,59 +934,59 @@ static int ep_send_events(struct eventpoll *ep, struct list_head *txlist,
|
|||
epi->event.events &= EP_PRIVATE_BITS;
|
||||
eventcnt++;
|
||||
}
|
||||
|
||||
/*
|
||||
* This is tricky. We are holding the "sem" in read, and this
|
||||
* means that the operations that can change the "linked" status
|
||||
* of the epoll item (epi->rbn and epi->rdllink), cannot touch
|
||||
* them. Also, since we are "linked" from a epi->rdllink POV
|
||||
* (the item is linked to our transmission list we just
|
||||
* spliced), the ep_poll_callback() cannot touch us either,
|
||||
* because of the check present in there. Another parallel
|
||||
* epoll_wait() will not get the same result set, since we
|
||||
* spliced the ready list before. Note that list_del() still
|
||||
* shows the item as linked to the test in ep_poll_callback().
|
||||
* At this point, noone can insert into ep->rdllist besides
|
||||
* us. The epoll_ctl() callers are locked out by us holding
|
||||
* "mtx" and the poll callback will queue them in ep->ovflist.
|
||||
*/
|
||||
list_del(&epi->rdllink);
|
||||
if (!(epi->event.events & EPOLLET) &&
|
||||
(revents & epi->event.events))
|
||||
list_add_tail(&epi->rdllink, &injlist);
|
||||
else {
|
||||
/*
|
||||
* Be sure the item is totally detached before re-init
|
||||
* the list_head. After INIT_LIST_HEAD() is committed,
|
||||
* the ep_poll_callback() can requeue the item again,
|
||||
* but we don't care since we are already past it.
|
||||
*/
|
||||
smp_mb();
|
||||
INIT_LIST_HEAD(&epi->rdllink);
|
||||
}
|
||||
(revents & epi->event.events))
|
||||
list_add_tail(&epi->rdllink, &ep->rdllist);
|
||||
}
|
||||
error = 0;
|
||||
|
||||
errxit:
|
||||
errxit:
|
||||
|
||||
spin_lock_irqsave(&ep->lock, flags);
|
||||
/*
|
||||
* During the time we spent in the loop above, some other events
|
||||
* might have been queued by the poll callback. We re-insert them
|
||||
* here (in case they are not already queued, or they're one-shot).
|
||||
*/
|
||||
for (nepi = ep->ovflist; (epi = nepi) != NULL;
|
||||
nepi = epi->next, epi->next = EP_UNACTIVE_PTR) {
|
||||
if (!ep_is_linked(&epi->rdllink) &&
|
||||
(epi->event.events & ~EP_PRIVATE_BITS))
|
||||
list_add_tail(&epi->rdllink, &ep->rdllist);
|
||||
}
|
||||
/*
|
||||
* We need to set back ep->ovflist to EP_UNACTIVE_PTR, so that after
|
||||
* releasing the lock, events will be queued in the normal way inside
|
||||
* ep->rdllist.
|
||||
*/
|
||||
ep->ovflist = EP_UNACTIVE_PTR;
|
||||
|
||||
/*
|
||||
* If the re-injection list or the txlist are not empty, re-splice
|
||||
* them to the ready list and do proper wakeups.
|
||||
* In case of error in the event-send loop, or in case the number of
|
||||
* ready events exceeds the userspace limit, we need to splice the
|
||||
* "txlist" back inside ep->rdllist.
|
||||
*/
|
||||
if (!list_empty(&injlist) || !list_empty(txlist)) {
|
||||
write_lock_irqsave(&ep->lock, flags);
|
||||
list_splice(&txlist, &ep->rdllist);
|
||||
|
||||
list_splice(txlist, &ep->rdllist);
|
||||
list_splice(&injlist, &ep->rdllist);
|
||||
if (!list_empty(&ep->rdllist)) {
|
||||
/*
|
||||
* Wake up ( if active ) both the eventpoll wait list and the ->poll()
|
||||
* wait list.
|
||||
* Wake up (if active) both the eventpoll wait list and the ->poll()
|
||||
* wait list (delayed after we release the lock).
|
||||
*/
|
||||
if (waitqueue_active(&ep->wq))
|
||||
__wake_up_locked(&ep->wq, TASK_UNINTERRUPTIBLE |
|
||||
TASK_INTERRUPTIBLE);
|
||||
if (waitqueue_active(&ep->poll_wait))
|
||||
pwake++;
|
||||
|
||||
write_unlock_irqrestore(&ep->lock, flags);
|
||||
}
|
||||
spin_unlock_irqrestore(&ep->lock, flags);
|
||||
|
||||
mutex_unlock(&ep->mtx);
|
||||
|
||||
/* We have to call this outside the lock */
|
||||
if (pwake)
|
||||
|
@ -1031,41 +995,6 @@ static int ep_send_events(struct eventpoll *ep, struct list_head *txlist,
|
|||
return eventcnt == 0 ? error: eventcnt;
|
||||
}
|
||||
|
||||
/*
|
||||
* Perform the transfer of events to user space.
|
||||
*/
|
||||
static int ep_events_transfer(struct eventpoll *ep,
|
||||
struct epoll_event __user *events, int maxevents)
|
||||
{
|
||||
int eventcnt;
|
||||
unsigned long flags;
|
||||
struct list_head txlist;
|
||||
|
||||
INIT_LIST_HEAD(&txlist);
|
||||
|
||||
/*
|
||||
* We need to lock this because we could be hit by
|
||||
* eventpoll_release_file() and epoll_ctl(EPOLL_CTL_DEL).
|
||||
*/
|
||||
down_read(&ep->sem);
|
||||
|
||||
/*
|
||||
* Steal the ready list, and re-init the original one to the
|
||||
* empty list.
|
||||
*/
|
||||
write_lock_irqsave(&ep->lock, flags);
|
||||
list_splice(&ep->rdllist, &txlist);
|
||||
INIT_LIST_HEAD(&ep->rdllist);
|
||||
write_unlock_irqrestore(&ep->lock, flags);
|
||||
|
||||
/* Build result set in userspace */
|
||||
eventcnt = ep_send_events(ep, &txlist, events, maxevents);
|
||||
|
||||
up_read(&ep->sem);
|
||||
|
||||
return eventcnt;
|
||||
}
|
||||
|
||||
static int ep_poll(struct eventpoll *ep, struct epoll_event __user *events,
|
||||
int maxevents, long timeout)
|
||||
{
|
||||
|
@ -1083,7 +1012,7 @@ static int ep_poll(struct eventpoll *ep, struct epoll_event __user *events,
|
|||
MAX_SCHEDULE_TIMEOUT : (timeout * HZ + 999) / 1000;
|
||||
|
||||
retry:
|
||||
write_lock_irqsave(&ep->lock, flags);
|
||||
spin_lock_irqsave(&ep->lock, flags);
|
||||
|
||||
res = 0;
|
||||
if (list_empty(&ep->rdllist)) {
|
||||
|
@ -1093,6 +1022,7 @@ retry:
|
|||
* ep_poll_callback() when events will become available.
|
||||
*/
|
||||
init_waitqueue_entry(&wait, current);
|
||||
wait.flags |= WQ_FLAG_EXCLUSIVE;
|
||||
__add_wait_queue(&ep->wq, &wait);
|
||||
|
||||
for (;;) {
|
||||
|
@ -1109,9 +1039,9 @@ retry:
|
|||
break;
|
||||
}
|
||||
|
||||
write_unlock_irqrestore(&ep->lock, flags);
|
||||
spin_unlock_irqrestore(&ep->lock, flags);
|
||||
jtimeout = schedule_timeout(jtimeout);
|
||||
write_lock_irqsave(&ep->lock, flags);
|
||||
spin_lock_irqsave(&ep->lock, flags);
|
||||
}
|
||||
__remove_wait_queue(&ep->wq, &wait);
|
||||
|
||||
|
@ -1121,7 +1051,7 @@ retry:
|
|||
/* Is it worth to try to dig for events ? */
|
||||
eavail = !list_empty(&ep->rdllist);
|
||||
|
||||
write_unlock_irqrestore(&ep->lock, flags);
|
||||
spin_unlock_irqrestore(&ep->lock, flags);
|
||||
|
||||
/*
|
||||
* Try to transfer events to user space. In case we get 0 events and
|
||||
|
@ -1129,18 +1059,17 @@ retry:
|
|||
* more luck.
|
||||
*/
|
||||
if (!res && eavail &&
|
||||
!(res = ep_events_transfer(ep, events, maxevents)) && jtimeout)
|
||||
!(res = ep_send_events(ep, events, maxevents)) && jtimeout)
|
||||
goto retry;
|
||||
|
||||
return res;
|
||||
}
|
||||
|
||||
/*
|
||||
* It opens an eventpoll file descriptor by suggesting a storage of "size"
|
||||
* file descriptors. The size parameter is just an hint about how to size
|
||||
* data structures. It won't prevent the user to store more than "size"
|
||||
* file descriptors inside the epoll interface. It is the kernel part of
|
||||
* the userspace epoll_create(2).
|
||||
* It opens an eventpoll file descriptor. The "size" parameter is there
|
||||
* for historical reasons, when epoll was using an hash instead of an
|
||||
* RB tree. With the current implementation, the "size" parameter is ignored
|
||||
* (besides sanity checks).
|
||||
*/
|
||||
asmlinkage long sys_epoll_create(int size)
|
||||
{
|
||||
|
@ -1176,7 +1105,6 @@ asmlinkage long sys_epoll_create(int size)
|
|||
|
||||
error_free:
|
||||
ep_free(ep);
|
||||
kfree(ep);
|
||||
error_return:
|
||||
DNPRINTK(3, (KERN_INFO "[%p] eventpoll: sys_epoll_create(%d) = %d\n",
|
||||
current, size, error));
|
||||
|
@ -1186,8 +1114,7 @@ error_return:
|
|||
/*
|
||||
* The following function implements the controller interface for
|
||||
* the eventpoll file that enables the insertion/removal/change of
|
||||
* file descriptors inside the interest set. It represents
|
||||
* the kernel part of the user space epoll_ctl(2).
|
||||
* file descriptors inside the interest set.
|
||||
*/
|
||||
asmlinkage long sys_epoll_ctl(int epfd, int op, int fd,
|
||||
struct epoll_event __user *event)
|
||||
|
@ -1237,9 +1164,13 @@ asmlinkage long sys_epoll_ctl(int epfd, int op, int fd,
|
|||
*/
|
||||
ep = file->private_data;
|
||||
|
||||
down_write(&ep->sem);
|
||||
mutex_lock(&ep->mtx);
|
||||
|
||||
/* Try to lookup the file inside our RB tree */
|
||||
/*
|
||||
* Try to lookup the file inside our RB tree, Since we grabbed "mtx"
|
||||
* above, we can be sure to be able to use the item looked up by
|
||||
* ep_find() till we release the mutex.
|
||||
*/
|
||||
epi = ep_find(ep, tfile, fd);
|
||||
|
||||
error = -EINVAL;
|
||||
|
@ -1266,13 +1197,7 @@ asmlinkage long sys_epoll_ctl(int epfd, int op, int fd,
|
|||
error = -ENOENT;
|
||||
break;
|
||||
}
|
||||
/*
|
||||
* The function ep_find() increments the usage count of the structure
|
||||
* so, if this is not NULL, we need to release it.
|
||||
*/
|
||||
if (epi)
|
||||
ep_release_epitem(epi);
|
||||
up_write(&ep->sem);
|
||||
mutex_unlock(&ep->mtx);
|
||||
|
||||
error_tgt_fput:
|
||||
fput(tfile);
|
||||
|
@ -1378,7 +1303,7 @@ asmlinkage long sys_epoll_pwait(int epfd, struct epoll_event __user *events,
|
|||
if (sigmask) {
|
||||
if (error == -EINTR) {
|
||||
memcpy(¤t->saved_sigmask, &sigsaved,
|
||||
sizeof(sigsaved));
|
||||
sizeof(sigsaved));
|
||||
set_thread_flag(TIF_RESTORE_SIGMASK);
|
||||
} else
|
||||
sigprocmask(SIG_SETMASK, &sigsaved, NULL);
|
||||
|
|
|
@ -85,8 +85,8 @@ __reload_thread(struct pcb_struct *pcb)
|
|||
* +-------------+----------------+--------------+
|
||||
*/
|
||||
|
||||
#ifdef CONFIG_SMP
|
||||
#include <asm/smp.h>
|
||||
#ifdef CONFIG_SMP
|
||||
#define cpu_last_asn(cpuid) (cpu_data[cpuid].last_asn)
|
||||
#else
|
||||
extern unsigned long last_asn;
|
||||
|
|
|
@ -37,6 +37,7 @@ static __inline__ int atomic_sub_return(int i, atomic_t *v)
|
|||
}
|
||||
|
||||
#define atomic_sub(i, v) atomic_sub_return(i, v)
|
||||
#define atomic_sub_and_test(i,v) (atomic_sub_return(i, v) == 0)
|
||||
|
||||
static __inline__ int atomic_inc_return(atomic_t *v)
|
||||
{
|
||||
|
|
|
@ -749,9 +749,13 @@ extern unsigned long boot_option_idle_override;
|
|||
extern void enable_sep_cpu(void);
|
||||
extern int sysenter_setup(void);
|
||||
|
||||
/* Defined in head.S */
|
||||
extern struct Xgt_desc_struct early_gdt_descr;
|
||||
|
||||
extern void cpu_set_gdt(int);
|
||||
extern void switch_to_new_gdt(void);
|
||||
extern void cpu_init(void);
|
||||
extern void init_gdt(int cpu);
|
||||
|
||||
extern int force_mwait;
|
||||
|
||||
|
|
|
@ -361,7 +361,9 @@ __constant_copy_to_user(void __user *to, const void *from, unsigned long n)
|
|||
|
||||
long strncpy_from_user(char *dst, const char __user *src, long count);
|
||||
long strnlen_user(const char __user *src, long n);
|
||||
unsigned long clear_user(void __user *to, unsigned long n);
|
||||
unsigned long __clear_user(void __user *to, unsigned long n);
|
||||
|
||||
#define clear_user __clear_user
|
||||
|
||||
#define strlen_user(str) strnlen_user(str, 32767)
|
||||
|
||||
|
|
|
@ -52,14 +52,9 @@
|
|||
#endif
|
||||
|
||||
/* For assembly routines */
|
||||
#ifdef CONFIG_HOTPLUG_CPU
|
||||
#define __INIT .section ".text","ax"
|
||||
#define __INITDATA .section ".data","aw"
|
||||
#else
|
||||
#define __INIT .section ".init.text","ax"
|
||||
#define __INITDATA .section ".init.data","aw"
|
||||
#endif
|
||||
#define __FINIT .previous
|
||||
#define __INITDATA .section ".init.data","aw"
|
||||
|
||||
#ifndef __ASSEMBLY__
|
||||
/*
|
||||
|
|
|
@ -27,8 +27,16 @@ struct device;
|
|||
void __iowrite32_copy(void __iomem *to, const void *from, size_t count);
|
||||
void __iowrite64_copy(void __iomem *to, const void *from, size_t count);
|
||||
|
||||
#ifdef CONFIG_MMU
|
||||
int ioremap_page_range(unsigned long addr, unsigned long end,
|
||||
unsigned long phys_addr, pgprot_t prot);
|
||||
#else
|
||||
static inline int ioremap_page_range(unsigned long addr, unsigned long end,
|
||||
unsigned long phys_addr, pgprot_t prot)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Managed iomap interface
|
||||
|
|
|
@ -1288,6 +1288,7 @@
|
|||
#define PCI_DEVICE_ID_VIA_8363_0 0x0305
|
||||
#define PCI_DEVICE_ID_VIA_P4M800CE 0x0314
|
||||
#define PCI_DEVICE_ID_VIA_P4M890 0x0327
|
||||
#define PCI_DEVICE_ID_VIA_VT3324 0x0324
|
||||
#define PCI_DEVICE_ID_VIA_VT3336 0x0336
|
||||
#define PCI_DEVICE_ID_VIA_8371_0 0x0391
|
||||
#define PCI_DEVICE_ID_VIA_8501_0 0x0501
|
||||
|
|
|
@ -60,7 +60,8 @@ struct kmem_cache {
|
|||
#define KMALLOC_SHIFT_LOW 3
|
||||
|
||||
#ifdef CONFIG_LARGE_ALLOCS
|
||||
#define KMALLOC_SHIFT_HIGH 25
|
||||
#define KMALLOC_SHIFT_HIGH ((MAX_ORDER + PAGE_SHIFT) =< 25 ? \
|
||||
(MAX_ORDER + PAGE_SHIFT - 1) : 25)
|
||||
#else
|
||||
#if !defined(CONFIG_MMU) || NR_CPUS > 512 || MAX_NUMNODES > 256
|
||||
#define KMALLOC_SHIFT_HIGH 20
|
||||
|
@ -87,6 +88,9 @@ static inline int kmalloc_index(int size)
|
|||
*/
|
||||
WARN_ON_ONCE(size == 0);
|
||||
|
||||
if (size >= (1 << KMALLOC_SHIFT_HIGH))
|
||||
return -1;
|
||||
|
||||
if (size > 64 && size <= 96)
|
||||
return 1;
|
||||
if (size > 128 && size <= 192)
|
||||
|
|
|
@ -74,7 +74,7 @@ static struct clocksource *watchdog;
|
|||
static struct timer_list watchdog_timer;
|
||||
static DEFINE_SPINLOCK(watchdog_lock);
|
||||
static cycle_t watchdog_last;
|
||||
static int watchdog_resumed;
|
||||
static unsigned long watchdog_resumed;
|
||||
|
||||
/*
|
||||
* Interval: 0.5sec Threshold: 0.0625s
|
||||
|
@ -104,9 +104,7 @@ static void clocksource_watchdog(unsigned long data)
|
|||
|
||||
spin_lock(&watchdog_lock);
|
||||
|
||||
resumed = watchdog_resumed;
|
||||
if (unlikely(resumed))
|
||||
watchdog_resumed = 0;
|
||||
resumed = test_and_clear_bit(0, &watchdog_resumed);
|
||||
|
||||
wdnow = watchdog->read();
|
||||
wd_nsec = cyc2ns(watchdog, (wdnow - watchdog_last) & watchdog->mask);
|
||||
|
@ -151,9 +149,7 @@ static void clocksource_watchdog(unsigned long data)
|
|||
}
|
||||
static void clocksource_resume_watchdog(void)
|
||||
{
|
||||
spin_lock(&watchdog_lock);
|
||||
watchdog_resumed = 1;
|
||||
spin_unlock(&watchdog_lock);
|
||||
set_bit(0, &watchdog_resumed);
|
||||
}
|
||||
|
||||
static void clocksource_check_watchdog(struct clocksource *cs)
|
||||
|
|
Loading…
Reference in a new issue