Commit 9a6b201b authored by Joonas Lahtinen's avatar Joonas Lahtinen
Browse files

Merge remote-tracking branch 'tip/locking/wwmutex' into drm-intel-gt-next 

Needed by Maarten's series "drm/i915: Short-term pinning and async
eviction".

Link: https://lists.freedesktop.org/archives/intel-gfx/2021-September/277870.html


Signed-off-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
parents d0c56031 12235da8

drivers/gpu/drm/drm_modeset_lock.c

+1 −1
Original line number Diff line number Diff line
@@ -248,7 +248,7 @@ static inline int modeset_lock(struct drm_modeset_lock *lock, 
	if (ctx->trylock_only) {

		lockdep_assert_held(&ctx->ww_ctx);



		if (!ww_mutex_trylock(&lock->mutex))

		if (!ww_mutex_trylock(&lock->mutex, NULL))

			return -EBUSY;

		else

			return 0;

drivers/regulator/core.c

+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ static inline int regulator_lock_nested(struct regulator_dev *rdev, 


	mutex_lock(&regulator_nesting_mutex);



	if (ww_ctx || !ww_mutex_trylock(&rdev->mutex)) {

	if (!ww_mutex_trylock(&rdev->mutex, ww_ctx)) {

		if (rdev->mutex_owner == current)

			rdev->ref_cnt++;

		else

include/linux/dma-resv.h

+1 −1
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ static inline int dma_resv_lock_slow_interruptible(struct dma_resv *obj, 
 */

static inline bool __must_check dma_resv_trylock(struct dma_resv *obj)

{

	return ww_mutex_trylock(&obj->lock);

	return ww_mutex_trylock(&obj->lock, NULL);

}



/**

include/linux/ww_mutex.h

+2 −13
Original line number Diff line number Diff line
@@ -28,12 +28,10 @@ 
#ifndef CONFIG_PREEMPT_RT

#define WW_MUTEX_BASE			mutex

#define ww_mutex_base_init(l,n,k)	__mutex_init(l,n,k)

#define ww_mutex_base_trylock(l)	mutex_trylock(l)

#define ww_mutex_base_is_locked(b)	mutex_is_locked((b))

#else

#define WW_MUTEX_BASE			rt_mutex

#define ww_mutex_base_init(l,n,k)	__rt_mutex_init(l,n,k)

#define ww_mutex_base_trylock(l)	rt_mutex_trylock(l)

#define ww_mutex_base_is_locked(b)	rt_mutex_base_is_locked(&(b)->rtmutex)

#endif
@@ -339,17 +337,8 @@ ww_mutex_lock_slow_interruptible(struct ww_mutex *lock, 


extern void ww_mutex_unlock(struct ww_mutex *lock);



/**

 * ww_mutex_trylock - tries to acquire the w/w mutex without acquire context

 * @lock: mutex to lock

 *

 * Trylocks a mutex without acquire context, so no deadlock detection is

 * possible. Returns 1 if the mutex has been acquired successfully, 0 otherwise.

 */

static inline int __must_check ww_mutex_trylock(struct ww_mutex *lock)

{

	return ww_mutex_base_trylock(&lock->base);

}

extern int __must_check ww_mutex_trylock(struct ww_mutex *lock,

					 struct ww_acquire_ctx *ctx);



/***

 * ww_mutex_destroy - mark a w/w mutex unusable

kernel/locking/mutex.c

+41 −0
Original line number Diff line number Diff line
@@ -94,6 +94,9 @@ static inline unsigned long __owner_flags(unsigned long owner) 
	return owner & MUTEX_FLAGS;

}



/*

 * Returns: __mutex_owner(lock) on failure or NULL on success.

 */

static inline struct task_struct *__mutex_trylock_common(struct mutex *lock, bool handoff)

{

	unsigned long owner, curr = (unsigned long)current;
@@ -736,6 +739,44 @@ __ww_mutex_lock(struct mutex *lock, unsigned int state, unsigned int subclass, 
	return __mutex_lock_common(lock, state, subclass, NULL, ip, ww_ctx, true);

}



/**

 * ww_mutex_trylock - tries to acquire the w/w mutex with optional acquire context

 * @ww: mutex to lock

 * @ww_ctx: optional w/w acquire context

 *

 * Trylocks a mutex with the optional acquire context; no deadlock detection is

 * possible. Returns 1 if the mutex has been acquired successfully, 0 otherwise.

 *

 * Unlike ww_mutex_lock, no deadlock handling is performed. However, if a @ctx is

 * specified, -EALREADY handling may happen in calls to ww_mutex_trylock.

 *

 * A mutex acquired with this function must be released with ww_mutex_unlock.

 */

int ww_mutex_trylock(struct ww_mutex *ww, struct ww_acquire_ctx *ww_ctx)

{

	if (!ww_ctx)

		return mutex_trylock(&ww->base);



	MUTEX_WARN_ON(ww->base.magic != &ww->base);



	/*

	 * Reset the wounded flag after a kill. No other process can

	 * race and wound us here, since they can't have a valid owner

	 * pointer if we don't have any locks held.

	 */

	if (ww_ctx->acquired == 0)

		ww_ctx->wounded = 0;



	if (__mutex_trylock(&ww->base)) {

		ww_mutex_set_context_fastpath(ww, ww_ctx);

		mutex_acquire_nest(&ww->base.dep_map, 0, 1, &ww_ctx->dep_map, _RET_IP_);

		return 1;

	}



	return 0;

}

EXPORT_SYMBOL(ww_mutex_trylock);



#ifdef CONFIG_DEBUG_LOCK_ALLOC

void __sched

mutex_lock_nested(struct mutex *lock, unsigned int subclass)