Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 17737d3b authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge branch 'for-3.17' of... 

Merge branch 'for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu into for-3.17/core

Merge the percpu_ref changes from Tejun, he says they are stable now.
parents 4c834452 2d722782

arch/x86/include/asm/percpu.h

+1 −2
Original line number Original line Diff line number Diff line
@@ -52,10 +52,9 @@ 
 * Compared to the generic __my_cpu_offset version, the following

 * Compared to the generic __my_cpu_offset version, the following

 * saves one instruction and avoids clobbering a temp register.

 * saves one instruction and avoids clobbering a temp register.

 */

 */

#define raw_cpu_ptr(ptr)				\

#define arch_raw_cpu_ptr(ptr)				\

({							\

({							\

	unsigned long tcp_ptr__;			\

	unsigned long tcp_ptr__;			\

	__verify_pcpu_ptr(ptr);				\

	asm volatile("add " __percpu_arg(1) ", %0"	\

	asm volatile("add " __percpu_arg(1) ", %0"	\

		     : "=r" (tcp_ptr__)			\

		     : "=r" (tcp_ptr__)			\

		     : "m" (this_cpu_off), "0" (ptr));	\

		     : "m" (this_cpu_off), "0" (ptr));	\

drivers/target/target_core_tpg.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -825,7 +825,7 @@ int core_tpg_add_lun( 




	ret = core_dev_export(dev, tpg, lun);

	ret = core_dev_export(dev, tpg, lun);

	if (ret < 0) {

	if (ret < 0) {

		percpu_ref_cancel_init(&lun->lun_ref);

		percpu_ref_exit(&lun->lun_ref);

		return ret;

		return ret;

	}

	}
@@ -880,5 +880,7 @@ int core_tpg_post_dellun( 
	lun->lun_status = TRANSPORT_LUN_STATUS_FREE;

	lun->lun_status = TRANSPORT_LUN_STATUS_FREE;

	spin_unlock(&tpg->tpg_lun_lock);

	spin_unlock(&tpg->tpg_lun_lock);





	percpu_ref_exit(&lun->lun_ref);



	return 0;

	return 0;

}
 
}

fs/aio.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -506,6 +506,8 @@ static void free_ioctx(struct work_struct *work) 




	aio_free_ring(ctx);

	aio_free_ring(ctx);

	free_percpu(ctx->cpu);

	free_percpu(ctx->cpu);

	percpu_ref_exit(&ctx->reqs);

	percpu_ref_exit(&ctx->users);

	kmem_cache_free(kioctx_cachep, ctx);

	kmem_cache_free(kioctx_cachep, ctx);

}

}
@@ -715,8 +717,8 @@ err_ctx: 
err:

err:

	mutex_unlock(&ctx->ring_lock);

	mutex_unlock(&ctx->ring_lock);

	free_percpu(ctx->cpu);

	free_percpu(ctx->cpu);

	free_percpu(ctx->reqs.pcpu_count);

	percpu_ref_exit(&ctx->reqs);

	free_percpu(ctx->users.pcpu_count);

	percpu_ref_exit(&ctx->users);

	kmem_cache_free(kioctx_cachep, ctx);

	kmem_cache_free(kioctx_cachep, ctx);

	pr_debug("error allocating ioctx %d\n", err);

	pr_debug("error allocating ioctx %d\n", err);

	return ERR_PTR(err);

	return ERR_PTR(err);

include/asm-generic/percpu.h

+351 −59
Original line number Original line Diff line number Diff line
@@ -36,93 +36,385 @@ extern unsigned long __per_cpu_offset[NR_CPUS]; 
#endif

#endif





/*

/*

 * Add a offset to a pointer but keep the pointer as is.

 * Arch may define arch_raw_cpu_ptr() to provide more efficient address

 *

 * translations for raw_cpu_ptr().

 * Only S390 provides its own means of moving the pointer.

 */

 */

#ifndef SHIFT_PERCPU_PTR

#ifndef arch_raw_cpu_ptr

/* Weird cast keeps both GCC and sparse happy. */

#define arch_raw_cpu_ptr(ptr) SHIFT_PERCPU_PTR(ptr, __my_cpu_offset)

#define SHIFT_PERCPU_PTR(__p, __offset)	({				\

	__verify_pcpu_ptr((__p));					\

	RELOC_HIDE((typeof(*(__p)) __kernel __force *)(__p), (__offset)); \

})

#endif

#endif





/*

#ifdef CONFIG_HAVE_SETUP_PER_CPU_AREA

 * A percpu variable may point to a discarded regions. The following are

extern void setup_per_cpu_areas(void);

 * established ways to produce a usable pointer from the percpu variable

 * offset.

 */

#define per_cpu(var, cpu) \

	(*SHIFT_PERCPU_PTR(&(var), per_cpu_offset(cpu)))



#ifndef raw_cpu_ptr

#define raw_cpu_ptr(ptr) SHIFT_PERCPU_PTR(ptr, __my_cpu_offset)

#endif

#endif

#ifdef CONFIG_DEBUG_PREEMPT



#define this_cpu_ptr(ptr) SHIFT_PERCPU_PTR(ptr, my_cpu_offset)

#endif	/* SMP */



#ifndef PER_CPU_BASE_SECTION

#ifdef CONFIG_SMP

#define PER_CPU_BASE_SECTION ".data..percpu"

#else

#else

#define this_cpu_ptr(ptr) raw_cpu_ptr(ptr)

#define PER_CPU_BASE_SECTION ".data"

#endif

#endif

#endif





#define __get_cpu_var(var) (*this_cpu_ptr(&(var)))

#ifndef PER_CPU_ATTRIBUTES

#define __raw_get_cpu_var(var) (*raw_cpu_ptr(&(var)))

#define PER_CPU_ATTRIBUTES

#endif





#ifdef CONFIG_HAVE_SETUP_PER_CPU_AREA

#ifndef PER_CPU_DEF_ATTRIBUTES

extern void setup_per_cpu_areas(void);

#define PER_CPU_DEF_ATTRIBUTES

#endif

#endif





#else /* ! SMP */

#define raw_cpu_generic_to_op(pcp, val, op)				\

do {									\

	*raw_cpu_ptr(&(pcp)) op val;					\

} while (0)





#define VERIFY_PERCPU_PTR(__p) ({			\

#define raw_cpu_generic_add_return(pcp, val)				\

	__verify_pcpu_ptr((__p));			\

({									\

	(typeof(*(__p)) __kernel __force *)(__p);	\

	raw_cpu_add(pcp, val);						\

	raw_cpu_read(pcp);						\

})

})





#define per_cpu(var, cpu)	(*((void)(cpu), VERIFY_PERCPU_PTR(&(var))))

#define raw_cpu_generic_xchg(pcp, nval)					\

#define __get_cpu_var(var)	(*VERIFY_PERCPU_PTR(&(var)))

({									\

#define __raw_get_cpu_var(var)	(*VERIFY_PERCPU_PTR(&(var)))

	typeof(pcp) __ret;						\

#define this_cpu_ptr(ptr)	per_cpu_ptr(ptr, 0)

	__ret = raw_cpu_read(pcp);					\

#define raw_cpu_ptr(ptr)	this_cpu_ptr(ptr)

	raw_cpu_write(pcp, nval);					\

	__ret;								\

})





#endif	/* SMP */

#define raw_cpu_generic_cmpxchg(pcp, oval, nval)			\

({									\

	typeof(pcp) __ret;						\

	__ret = raw_cpu_read(pcp);					\

	if (__ret == (oval))						\

		raw_cpu_write(pcp, nval);				\

	__ret;								\

})





#ifndef PER_CPU_BASE_SECTION

#define raw_cpu_generic_cmpxchg_double(pcp1, pcp2, oval1, oval2, nval1, nval2) \

#ifdef CONFIG_SMP

({									\

#define PER_CPU_BASE_SECTION ".data..percpu"

	int __ret = 0;							\

#else

	if (raw_cpu_read(pcp1) == (oval1) &&				\

#define PER_CPU_BASE_SECTION ".data"

			 raw_cpu_read(pcp2)  == (oval2)) {		\

		raw_cpu_write(pcp1, nval1);				\

		raw_cpu_write(pcp2, nval2);				\

		__ret = 1;						\

	}								\

	(__ret);							\

})



#define this_cpu_generic_read(pcp)					\

({									\

	typeof(pcp) __ret;						\

	preempt_disable();						\

	__ret = *this_cpu_ptr(&(pcp));					\

	preempt_enable();						\

	__ret;								\

})



#define this_cpu_generic_to_op(pcp, val, op)				\

do {									\

	unsigned long __flags;						\

	raw_local_irq_save(__flags);					\

	*raw_cpu_ptr(&(pcp)) op val;					\

	raw_local_irq_restore(__flags);					\

} while (0)



#define this_cpu_generic_add_return(pcp, val)				\

({									\

	typeof(pcp) __ret;						\

	unsigned long __flags;						\

	raw_local_irq_save(__flags);					\

	raw_cpu_add(pcp, val);						\

	__ret = raw_cpu_read(pcp);					\

	raw_local_irq_restore(__flags);					\

	__ret;								\

})



#define this_cpu_generic_xchg(pcp, nval)				\

({									\

	typeof(pcp) __ret;						\

	unsigned long __flags;						\

	raw_local_irq_save(__flags);					\

	__ret = raw_cpu_read(pcp);					\

	raw_cpu_write(pcp, nval);					\

	raw_local_irq_restore(__flags);					\

	__ret;								\

})



#define this_cpu_generic_cmpxchg(pcp, oval, nval)			\

({									\

	typeof(pcp) __ret;						\

	unsigned long __flags;						\

	raw_local_irq_save(__flags);					\

	__ret = raw_cpu_read(pcp);					\

	if (__ret == (oval))						\

		raw_cpu_write(pcp, nval);				\

	raw_local_irq_restore(__flags);					\

	__ret;								\

})



#define this_cpu_generic_cmpxchg_double(pcp1, pcp2, oval1, oval2, nval1, nval2)	\

({									\

	int __ret;							\

	unsigned long __flags;						\

	raw_local_irq_save(__flags);					\

	__ret = raw_cpu_generic_cmpxchg_double(pcp1, pcp2,		\

			oval1, oval2, nval1, nval2);			\

	raw_local_irq_restore(__flags);					\

	__ret;								\

})



#ifndef raw_cpu_read_1

#define raw_cpu_read_1(pcp)		(*raw_cpu_ptr(&(pcp)))

#endif

#endif

#ifndef raw_cpu_read_2

#define raw_cpu_read_2(pcp)		(*raw_cpu_ptr(&(pcp)))

#endif

#ifndef raw_cpu_read_4

#define raw_cpu_read_4(pcp)		(*raw_cpu_ptr(&(pcp)))

#endif

#ifndef raw_cpu_read_8

#define raw_cpu_read_8(pcp)		(*raw_cpu_ptr(&(pcp)))

#endif

#endif





#ifdef CONFIG_SMP

#ifndef raw_cpu_write_1

#define raw_cpu_write_1(pcp, val)	raw_cpu_generic_to_op(pcp, val, =)

#endif

#ifndef raw_cpu_write_2

#define raw_cpu_write_2(pcp, val)	raw_cpu_generic_to_op(pcp, val, =)

#endif

#ifndef raw_cpu_write_4

#define raw_cpu_write_4(pcp, val)	raw_cpu_generic_to_op(pcp, val, =)

#endif

#ifndef raw_cpu_write_8

#define raw_cpu_write_8(pcp, val)	raw_cpu_generic_to_op(pcp, val, =)

#endif





#ifdef MODULE

#ifndef raw_cpu_add_1

#define PER_CPU_SHARED_ALIGNED_SECTION ""

#define raw_cpu_add_1(pcp, val)		raw_cpu_generic_to_op(pcp, val, +=)

#define PER_CPU_ALIGNED_SECTION ""

#endif

#else

#ifndef raw_cpu_add_2

#define PER_CPU_SHARED_ALIGNED_SECTION "..shared_aligned"

#define raw_cpu_add_2(pcp, val)		raw_cpu_generic_to_op(pcp, val, +=)

#define PER_CPU_ALIGNED_SECTION "..shared_aligned"

#endif

#ifndef raw_cpu_add_4

#define raw_cpu_add_4(pcp, val)		raw_cpu_generic_to_op(pcp, val, +=)

#endif

#ifndef raw_cpu_add_8

#define raw_cpu_add_8(pcp, val)		raw_cpu_generic_to_op(pcp, val, +=)

#endif

#endif

#define PER_CPU_FIRST_SECTION "..first"





#else

#ifndef raw_cpu_and_1

#define raw_cpu_and_1(pcp, val)		raw_cpu_generic_to_op(pcp, val, &=)

#endif

#ifndef raw_cpu_and_2

#define raw_cpu_and_2(pcp, val)		raw_cpu_generic_to_op(pcp, val, &=)

#endif

#ifndef raw_cpu_and_4

#define raw_cpu_and_4(pcp, val)		raw_cpu_generic_to_op(pcp, val, &=)

#endif

#ifndef raw_cpu_and_8

#define raw_cpu_and_8(pcp, val)		raw_cpu_generic_to_op(pcp, val, &=)

#endif



#ifndef raw_cpu_or_1

#define raw_cpu_or_1(pcp, val)		raw_cpu_generic_to_op(pcp, val, |=)

#endif

#ifndef raw_cpu_or_2

#define raw_cpu_or_2(pcp, val)		raw_cpu_generic_to_op(pcp, val, |=)

#endif

#ifndef raw_cpu_or_4

#define raw_cpu_or_4(pcp, val)		raw_cpu_generic_to_op(pcp, val, |=)

#endif

#ifndef raw_cpu_or_8

#define raw_cpu_or_8(pcp, val)		raw_cpu_generic_to_op(pcp, val, |=)

#endif





#define PER_CPU_SHARED_ALIGNED_SECTION ""

#ifndef raw_cpu_add_return_1

#define PER_CPU_ALIGNED_SECTION "..shared_aligned"

#define raw_cpu_add_return_1(pcp, val)	raw_cpu_generic_add_return(pcp, val)

#define PER_CPU_FIRST_SECTION ""

#endif

#ifndef raw_cpu_add_return_2

#define raw_cpu_add_return_2(pcp, val)	raw_cpu_generic_add_return(pcp, val)

#endif

#ifndef raw_cpu_add_return_4

#define raw_cpu_add_return_4(pcp, val)	raw_cpu_generic_add_return(pcp, val)

#endif

#ifndef raw_cpu_add_return_8

#define raw_cpu_add_return_8(pcp, val)	raw_cpu_generic_add_return(pcp, val)

#endif





#ifndef raw_cpu_xchg_1

#define raw_cpu_xchg_1(pcp, nval)	raw_cpu_generic_xchg(pcp, nval)

#endif

#ifndef raw_cpu_xchg_2

#define raw_cpu_xchg_2(pcp, nval)	raw_cpu_generic_xchg(pcp, nval)

#endif

#ifndef raw_cpu_xchg_4

#define raw_cpu_xchg_4(pcp, nval)	raw_cpu_generic_xchg(pcp, nval)

#endif

#ifndef raw_cpu_xchg_8

#define raw_cpu_xchg_8(pcp, nval)	raw_cpu_generic_xchg(pcp, nval)

#endif

#endif





#ifndef PER_CPU_ATTRIBUTES

#ifndef raw_cpu_cmpxchg_1

#define PER_CPU_ATTRIBUTES

#define raw_cpu_cmpxchg_1(pcp, oval, nval) \

	raw_cpu_generic_cmpxchg(pcp, oval, nval)

#endif

#ifndef raw_cpu_cmpxchg_2

#define raw_cpu_cmpxchg_2(pcp, oval, nval) \

	raw_cpu_generic_cmpxchg(pcp, oval, nval)

#endif

#ifndef raw_cpu_cmpxchg_4

#define raw_cpu_cmpxchg_4(pcp, oval, nval) \

	raw_cpu_generic_cmpxchg(pcp, oval, nval)

#endif

#ifndef raw_cpu_cmpxchg_8

#define raw_cpu_cmpxchg_8(pcp, oval, nval) \

	raw_cpu_generic_cmpxchg(pcp, oval, nval)

#endif

#endif





#ifndef PER_CPU_DEF_ATTRIBUTES

#ifndef raw_cpu_cmpxchg_double_1

#define PER_CPU_DEF_ATTRIBUTES

#define raw_cpu_cmpxchg_double_1(pcp1, pcp2, oval1, oval2, nval1, nval2) \

	raw_cpu_generic_cmpxchg_double(pcp1, pcp2, oval1, oval2, nval1, nval2)

#endif

#ifndef raw_cpu_cmpxchg_double_2

#define raw_cpu_cmpxchg_double_2(pcp1, pcp2, oval1, oval2, nval1, nval2) \

	raw_cpu_generic_cmpxchg_double(pcp1, pcp2, oval1, oval2, nval1, nval2)

#endif

#ifndef raw_cpu_cmpxchg_double_4

#define raw_cpu_cmpxchg_double_4(pcp1, pcp2, oval1, oval2, nval1, nval2) \

	raw_cpu_generic_cmpxchg_double(pcp1, pcp2, oval1, oval2, nval1, nval2)

#endif

#ifndef raw_cpu_cmpxchg_double_8

#define raw_cpu_cmpxchg_double_8(pcp1, pcp2, oval1, oval2, nval1, nval2) \

	raw_cpu_generic_cmpxchg_double(pcp1, pcp2, oval1, oval2, nval1, nval2)

#endif



#ifndef this_cpu_read_1

#define this_cpu_read_1(pcp)		this_cpu_generic_read(pcp)

#endif

#ifndef this_cpu_read_2

#define this_cpu_read_2(pcp)		this_cpu_generic_read(pcp)

#endif

#ifndef this_cpu_read_4

#define this_cpu_read_4(pcp)		this_cpu_generic_read(pcp)

#endif

#ifndef this_cpu_read_8

#define this_cpu_read_8(pcp)		this_cpu_generic_read(pcp)

#endif

#endif





/* Keep until we have removed all uses of __this_cpu_ptr */

#ifndef this_cpu_write_1

#define __this_cpu_ptr raw_cpu_ptr

#define this_cpu_write_1(pcp, val)	this_cpu_generic_to_op(pcp, val, =)

#endif

#ifndef this_cpu_write_2

#define this_cpu_write_2(pcp, val)	this_cpu_generic_to_op(pcp, val, =)

#endif

#ifndef this_cpu_write_4

#define this_cpu_write_4(pcp, val)	this_cpu_generic_to_op(pcp, val, =)

#endif

#ifndef this_cpu_write_8

#define this_cpu_write_8(pcp, val)	this_cpu_generic_to_op(pcp, val, =)

#endif



#ifndef this_cpu_add_1

#define this_cpu_add_1(pcp, val)	this_cpu_generic_to_op(pcp, val, +=)

#endif

#ifndef this_cpu_add_2

#define this_cpu_add_2(pcp, val)	this_cpu_generic_to_op(pcp, val, +=)

#endif

#ifndef this_cpu_add_4

#define this_cpu_add_4(pcp, val)	this_cpu_generic_to_op(pcp, val, +=)

#endif

#ifndef this_cpu_add_8

#define this_cpu_add_8(pcp, val)	this_cpu_generic_to_op(pcp, val, +=)

#endif



#ifndef this_cpu_and_1

#define this_cpu_and_1(pcp, val)	this_cpu_generic_to_op(pcp, val, &=)

#endif

#ifndef this_cpu_and_2

#define this_cpu_and_2(pcp, val)	this_cpu_generic_to_op(pcp, val, &=)

#endif

#ifndef this_cpu_and_4

#define this_cpu_and_4(pcp, val)	this_cpu_generic_to_op(pcp, val, &=)

#endif

#ifndef this_cpu_and_8

#define this_cpu_and_8(pcp, val)	this_cpu_generic_to_op(pcp, val, &=)

#endif



#ifndef this_cpu_or_1

#define this_cpu_or_1(pcp, val)		this_cpu_generic_to_op(pcp, val, |=)

#endif

#ifndef this_cpu_or_2

#define this_cpu_or_2(pcp, val)		this_cpu_generic_to_op(pcp, val, |=)

#endif

#ifndef this_cpu_or_4

#define this_cpu_or_4(pcp, val)		this_cpu_generic_to_op(pcp, val, |=)

#endif

#ifndef this_cpu_or_8

#define this_cpu_or_8(pcp, val)		this_cpu_generic_to_op(pcp, val, |=)

#endif



#ifndef this_cpu_add_return_1

#define this_cpu_add_return_1(pcp, val)	this_cpu_generic_add_return(pcp, val)

#endif

#ifndef this_cpu_add_return_2

#define this_cpu_add_return_2(pcp, val)	this_cpu_generic_add_return(pcp, val)

#endif

#ifndef this_cpu_add_return_4

#define this_cpu_add_return_4(pcp, val)	this_cpu_generic_add_return(pcp, val)

#endif

#ifndef this_cpu_add_return_8

#define this_cpu_add_return_8(pcp, val)	this_cpu_generic_add_return(pcp, val)

#endif



#ifndef this_cpu_xchg_1

#define this_cpu_xchg_1(pcp, nval)	this_cpu_generic_xchg(pcp, nval)

#endif

#ifndef this_cpu_xchg_2

#define this_cpu_xchg_2(pcp, nval)	this_cpu_generic_xchg(pcp, nval)

#endif

#ifndef this_cpu_xchg_4

#define this_cpu_xchg_4(pcp, nval)	this_cpu_generic_xchg(pcp, nval)

#endif

#ifndef this_cpu_xchg_8

#define this_cpu_xchg_8(pcp, nval)	this_cpu_generic_xchg(pcp, nval)

#endif



#ifndef this_cpu_cmpxchg_1

#define this_cpu_cmpxchg_1(pcp, oval, nval) \

	this_cpu_generic_cmpxchg(pcp, oval, nval)

#endif

#ifndef this_cpu_cmpxchg_2

#define this_cpu_cmpxchg_2(pcp, oval, nval) \

	this_cpu_generic_cmpxchg(pcp, oval, nval)

#endif

#ifndef this_cpu_cmpxchg_4

#define this_cpu_cmpxchg_4(pcp, oval, nval) \

	this_cpu_generic_cmpxchg(pcp, oval, nval)

#endif

#ifndef this_cpu_cmpxchg_8

#define this_cpu_cmpxchg_8(pcp, oval, nval) \

	this_cpu_generic_cmpxchg(pcp, oval, nval)

#endif



#ifndef this_cpu_cmpxchg_double_1

#define this_cpu_cmpxchg_double_1(pcp1, pcp2, oval1, oval2, nval1, nval2) \

	this_cpu_generic_cmpxchg_double(pcp1, pcp2, oval1, oval2, nval1, nval2)

#endif

#ifndef this_cpu_cmpxchg_double_2

#define this_cpu_cmpxchg_double_2(pcp1, pcp2, oval1, oval2, nval1, nval2) \

	this_cpu_generic_cmpxchg_double(pcp1, pcp2, oval1, oval2, nval1, nval2)

#endif

#ifndef this_cpu_cmpxchg_double_4

#define this_cpu_cmpxchg_double_4(pcp1, pcp2, oval1, oval2, nval1, nval2) \

	this_cpu_generic_cmpxchg_double(pcp1, pcp2, oval1, oval2, nval1, nval2)

#endif

#ifndef this_cpu_cmpxchg_double_8

#define this_cpu_cmpxchg_double_8(pcp1, pcp2, oval1, oval2, nval1, nval2) \

	this_cpu_generic_cmpxchg_double(pcp1, pcp2, oval1, oval2, nval1, nval2)

#endif





#endif /* _ASM_GENERIC_PERCPU_H_ */
 
#endif /* _ASM_GENERIC_PERCPU_H_ */