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

Commit 47a57bde authored by Dmitry Eremin's avatar Dmitry Eremin Committed by Greg Kroah-Hartman
Browse files

staging/lustre/clio: replace semaphore with mutex 

According https://www.kernel.org/doc/Documentation/mutex-design.txt

:
- the mutex subsystem is slightly faster and has better scalability
  for contended workloads. In terms of 'ops per CPU cycle', the
  semaphore kernel performed 551 ops/sec per 1% of CPU time used,
  while the mutex kernel performed 3825 ops/sec per 1% of CPU time
  used - it was 6.9 times more efficient.
- there are no fastpath tradeoffs, the mutex fastpath is just as
  tight as the semaphore fastpath. On x86, the locking fastpath is
  2 instructions.
- 'struct mutex' semantics are well-defined and are enforced if
  CONFIG_DEBUG_MUTEXES is turned on. Semaphores on the other hand
  have virtually no debugging code or instrumentation.

One more benefit of mutex is optimistic spinning. It try to spin for
acquisition when there are no pending waiters and the lock owner is
currently running on a (different) CPU. The rationale is that if the
lock owner is running, it is likely to release the lock soon.

This significantly reduce amount of context switches when locked
region is small and we have high contention.
Signed-off-by: default avatarDmitry Eremin <dmitry.eremin@intel.com>
Reviewed-on: http://review.whamcloud.com/9095
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-4257


Reviewed-by: default avatarAndreas Dilger <andreas.dilger@intel.com>
Reviewed-by: default avatarJames Simmons <uja.ornl@gmail.com>
Signed-off-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6246dab1

drivers/staging/lustre/lustre/llite/llite_internal.h

+4 −6
Original line number Original line Diff line number Diff line
@@ -211,8 +211,7 @@ struct ll_inode_info { 




		/* for non-directory */

		/* for non-directory */

		struct {

		struct {

			struct semaphore		f_size_sem;

			struct mutex			f_size_mutex;

			void				*f_size_sem_owner;

			char				*f_symlink_name;

			char				*f_symlink_name;

			__u64				f_maxbytes;

			__u64				f_maxbytes;

			/*

			/*
@@ -249,8 +248,7 @@ struct ll_inode_info { 
			char		     f_jobid[JOBSTATS_JOBID_SIZE];

			char		     f_jobid[JOBSTATS_JOBID_SIZE];

		} f;

		} f;





#define lli_size_sem	    u.f.f_size_sem

#define lli_size_mutex          u.f.f_size_mutex

#define lli_size_sem_owner      u.f.f_size_sem_owner

#define lli_symlink_name	u.f.f_symlink_name

#define lli_symlink_name	u.f.f_symlink_name

#define lli_maxbytes	    u.f.f_maxbytes

#define lli_maxbytes	    u.f.f_maxbytes

#define lli_trunc_sem	   u.f.f_trunc_sem

#define lli_trunc_sem	   u.f.f_trunc_sem
@@ -319,7 +317,7 @@ int ll_xattr_cache_get(struct inode *inode, 
 * Locking to guarantee consistency of non-atomic updates to long long i_size,

 * Locking to guarantee consistency of non-atomic updates to long long i_size,

 * consistency between file size and KMS.

 * consistency between file size and KMS.

 *

 *

 * Implemented by ->lli_size_sem and ->lsm_lock, nested in that order.

 * Implemented by ->lli_size_mutex and ->lsm_lock, nested in that order.

 */

 */





void ll_inode_size_lock(struct inode *inode);

void ll_inode_size_lock(struct inode *inode);
@@ -1448,7 +1446,7 @@ static inline void cl_isize_unlock(struct inode *inode) 




static inline void cl_isize_write_nolock(struct inode *inode, loff_t kms)

static inline void cl_isize_write_nolock(struct inode *inode, loff_t kms)

{

{

	LASSERT(down_trylock(&ll_i2info(inode)->lli_size_sem) != 0);

	LASSERT(mutex_is_locked(&ll_i2info(inode)->lli_size_mutex));

	i_size_write(inode, kms);

	i_size_write(inode, kms);

}

}

drivers/staging/lustre/lustre/llite/llite_lib.c

+3 −9
Original line number Original line Diff line number Diff line
@@ -982,8 +982,7 @@ void ll_lli_init(struct ll_inode_info *lli) 
		spin_lock_init(&lli->lli_sa_lock);

		spin_lock_init(&lli->lli_sa_lock);

		lli->lli_opendir_pid = 0;

		lli->lli_opendir_pid = 0;

	} else {

	} else {

		sema_init(&lli->lli_size_sem, 1);

		mutex_init(&lli->lli_size_mutex);

		lli->lli_size_sem_owner = NULL;

		lli->lli_symlink_name = NULL;

		lli->lli_symlink_name = NULL;

		init_rwsem(&lli->lli_trunc_sem);

		init_rwsem(&lli->lli_trunc_sem);

		mutex_init(&lli->lli_write_mutex);

		mutex_init(&lli->lli_write_mutex);
@@ -1700,10 +1699,7 @@ void ll_inode_size_lock(struct inode *inode) 
	LASSERT(!S_ISDIR(inode->i_mode));

	LASSERT(!S_ISDIR(inode->i_mode));





	lli = ll_i2info(inode);

	lli = ll_i2info(inode);

	LASSERT(lli->lli_size_sem_owner != current);

	mutex_lock(&lli->lli_size_mutex);

	down(&lli->lli_size_sem);

	LASSERT(lli->lli_size_sem_owner == NULL);

	lli->lli_size_sem_owner = current;

}

}





void ll_inode_size_unlock(struct inode *inode)

void ll_inode_size_unlock(struct inode *inode)
@@ -1711,9 +1707,7 @@ void ll_inode_size_unlock(struct inode *inode) 
	struct ll_inode_info *lli;

	struct ll_inode_info *lli;





	lli = ll_i2info(inode);

	lli = ll_i2info(inode);

	LASSERT(lli->lli_size_sem_owner == current);

	mutex_unlock(&lli->lli_size_mutex);

	lli->lli_size_sem_owner = NULL;

	up(&lli->lli_size_sem);

}

}





void ll_update_inode(struct inode *inode, struct lustre_md *md)

void ll_update_inode(struct inode *inode, struct lustre_md *md)