0a7992c908
The ACPI_PREEMPTION_POINT() logic was introduced in commit8bd108d(ACPICA: add preemption point after each opcode parse). The follow up commitsabe1dfab6,138d15692,c084ca70tried to fix the preemption logic back and forth, but nobody noticed that the usage of in_atomic_preempt_off() in that context is wrong. The check which guards the call of cond_resched() is: if (!in_atomic_preempt_off() && !irqs_disabled()) in_atomic_preempt_off() is not intended for general use as the comment above the macro definition clearly says: * Check whether we were atomic before we did preempt_disable(): * (used by the scheduler, *after* releasing the kernel lock) On a CONFIG_PREEMPT=n kernel the usage of in_atomic_preempt_off() works by accident, but with CONFIG_PREEMPT=y it's just broken. The whole purpose of the ACPI_PREEMPTION_POINT() is to reduce the latency on a CONFIG_PREEMPT=n kernel, so make ACPI_PREEMPTION_POINT() depend on CONFIG_PREEMPT=n and remove the in_atomic_preempt_off() check. Addresses https://bugzilla.kernel.org/show_bug.cgi?id=16210 [akpm@linux-foundation.org: fix build] Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Len Brown <lenb@kernel.org> Cc: Francois Valenduc <francois.valenduc@tvcablenet.be> Cc: Lin Ming <ming.m.lin@intel.com> Cc: <stable@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
165 lines
5 KiB
C
165 lines
5 KiB
C
/******************************************************************************
|
|
*
|
|
* Name: aclinux.h - OS specific defines, etc. for Linux
|
|
*
|
|
*****************************************************************************/
|
|
|
|
/*
|
|
* Copyright (C) 2000 - 2010, Intel Corp.
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions, and the following disclaimer,
|
|
* without modification.
|
|
* 2. Redistributions in binary form must reproduce at minimum a disclaimer
|
|
* substantially similar to the "NO WARRANTY" disclaimer below
|
|
* ("Disclaimer") and any redistribution must be conditioned upon
|
|
* including a substantially similar Disclaimer requirement for further
|
|
* binary redistribution.
|
|
* 3. Neither the names of the above-listed copyright holders nor the names
|
|
* of any contributors may be used to endorse or promote products derived
|
|
* from this software without specific prior written permission.
|
|
*
|
|
* Alternatively, this software may be distributed under the terms of the
|
|
* GNU General Public License ("GPL") version 2 as published by the Free
|
|
* Software Foundation.
|
|
*
|
|
* NO WARRANTY
|
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
|
|
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
|
* HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
|
|
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
|
|
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
|
* POSSIBILITY OF SUCH DAMAGES.
|
|
*/
|
|
|
|
#ifndef __ACLINUX_H__
|
|
#define __ACLINUX_H__
|
|
|
|
/* Common (in-kernel/user-space) ACPICA configuration */
|
|
|
|
#define ACPI_USE_SYSTEM_CLIBRARY
|
|
#define ACPI_USE_DO_WHILE_0
|
|
#define ACPI_MUTEX_TYPE ACPI_BINARY_SEMAPHORE
|
|
|
|
|
|
#ifdef __KERNEL__
|
|
|
|
#include <linux/string.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/module.h>
|
|
#include <linux/ctype.h>
|
|
#include <linux/sched.h>
|
|
#include <asm/system.h>
|
|
#include <asm/atomic.h>
|
|
#include <asm/div64.h>
|
|
#include <asm/acpi.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/spinlock_types.h>
|
|
#include <asm/current.h>
|
|
|
|
/* Host-dependent types and defines for in-kernel ACPICA */
|
|
|
|
#define ACPI_MACHINE_WIDTH BITS_PER_LONG
|
|
#define ACPI_EXPORT_SYMBOL(symbol) EXPORT_SYMBOL(symbol);
|
|
#define strtoul simple_strtoul
|
|
|
|
#define acpi_cache_t struct kmem_cache
|
|
#define acpi_spinlock spinlock_t *
|
|
#define acpi_cpu_flags unsigned long
|
|
#define acpi_thread_id struct task_struct *
|
|
|
|
#else /* !__KERNEL__ */
|
|
|
|
#include <stdarg.h>
|
|
#include <string.h>
|
|
#include <stdlib.h>
|
|
#include <ctype.h>
|
|
#include <unistd.h>
|
|
|
|
/* Host-dependent types and defines for user-space ACPICA */
|
|
|
|
#define ACPI_FLUSH_CPU_CACHE()
|
|
#define acpi_thread_id pthread_t
|
|
|
|
#if defined(__ia64__) || defined(__x86_64__)
|
|
#define ACPI_MACHINE_WIDTH 64
|
|
#define COMPILER_DEPENDENT_INT64 long
|
|
#define COMPILER_DEPENDENT_UINT64 unsigned long
|
|
#else
|
|
#define ACPI_MACHINE_WIDTH 32
|
|
#define COMPILER_DEPENDENT_INT64 long long
|
|
#define COMPILER_DEPENDENT_UINT64 unsigned long long
|
|
#define ACPI_USE_NATIVE_DIVIDE
|
|
#endif
|
|
|
|
#ifndef __cdecl
|
|
#define __cdecl
|
|
#endif
|
|
|
|
#endif /* __KERNEL__ */
|
|
|
|
/* Linux uses GCC */
|
|
|
|
#include "acgcc.h"
|
|
|
|
|
|
#ifdef __KERNEL__
|
|
/*
|
|
* Overrides for in-kernel ACPICA
|
|
*/
|
|
static inline acpi_thread_id acpi_os_get_thread_id(void)
|
|
{
|
|
return current;
|
|
}
|
|
|
|
/*
|
|
* The irqs_disabled() check is for resume from RAM.
|
|
* Interrupts are off during resume, just like they are for boot.
|
|
* However, boot has (system_state != SYSTEM_RUNNING)
|
|
* to quiet __might_sleep() in kmalloc() and resume does not.
|
|
*/
|
|
#include <acpi/actypes.h>
|
|
static inline void *acpi_os_allocate(acpi_size size)
|
|
{
|
|
return kmalloc(size, irqs_disabled() ? GFP_ATOMIC : GFP_KERNEL);
|
|
}
|
|
|
|
static inline void *acpi_os_allocate_zeroed(acpi_size size)
|
|
{
|
|
return kzalloc(size, irqs_disabled() ? GFP_ATOMIC : GFP_KERNEL);
|
|
}
|
|
|
|
static inline void *acpi_os_acquire_object(acpi_cache_t * cache)
|
|
{
|
|
return kmem_cache_zalloc(cache,
|
|
irqs_disabled() ? GFP_ATOMIC : GFP_KERNEL);
|
|
}
|
|
|
|
#define ACPI_ALLOCATE(a) acpi_os_allocate(a)
|
|
#define ACPI_ALLOCATE_ZEROED(a) acpi_os_allocate_zeroed(a)
|
|
#define ACPI_FREE(a) kfree(a)
|
|
|
|
#ifndef CONFIG_PREEMPT
|
|
/*
|
|
* Used within ACPICA to show where it is safe to preempt execution
|
|
* when CONFIG_PREEMPT=n
|
|
*/
|
|
#define ACPI_PREEMPTION_POINT() \
|
|
do { \
|
|
if (!irqs_disabled()) \
|
|
cond_resched(); \
|
|
} while (0)
|
|
#endif
|
|
|
|
#endif /* __KERNEL__ */
|
|
|
|
#endif /* __ACLINUX_H__ */
|