From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935161AbcIETmV (ORCPT ); Mon, 5 Sep 2016 15:42:21 -0400 Received: from merlin.infradead.org ([205.233.59.134]:60646 "EHLO merlin.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755276AbcIETmK (ORCPT ); Mon, 5 Sep 2016 15:42:10 -0400 Message-Id: <20160905194127.317680404@infradead.org> User-Agent: quilt/0.61-1 Date: Mon, 05 Sep 2016 21:40:59 +0200 From: Peter Zijlstra To: oleg@redhat.com, paulmck@linux.vnet.ibm.com, tj@kernel.org, mingo@redhat.com, linux-kernel@vger.kernel.org, der.herr@hofr.at, peterz@infradead.org, dave@stgolabs.net, riel@redhat.com, viro@ZenIV.linux.org.uk, torvalds@linux-foundation.org, wagi@monom.org Subject: [PATCH 5/7] fs/locks: Use percpu_down_read_preempt_disable References: <20160905194054.369038779@infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline; filename=peterz-percpu-rwsem-preempt-api-use.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Avoid spurious preemption by using the percpu_{down,up}_preempt_{dis,en}able() APIs. This reduces things down to a single preemption point at the end of this sequence (in the normal case). Signed-off-by: Peter Zijlstra (Intel) --- fs/locks.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) --- a/fs/locks.c +++ b/fs/locks.c @@ -930,7 +930,7 @@ static int flock_lock_inode(struct inode return -ENOMEM; } - percpu_down_read(&file_rwsem); + percpu_down_read_preempt_disable(&file_rwsem); spin_lock(&ctx->flc_lock); if (request->fl_flags & FL_ACCESS) goto find_conflict; @@ -971,7 +971,7 @@ static int flock_lock_inode(struct inode out: spin_unlock(&ctx->flc_lock); - percpu_up_read(&file_rwsem); + percpu_up_read_preempt_enable(&file_rwsem); if (new_fl) locks_free_lock(new_fl); locks_dispose_list(&dispose); @@ -1008,7 +1008,7 @@ static int posix_lock_inode(struct inode new_fl2 = locks_alloc_lock(); } - percpu_down_read(&file_rwsem); + percpu_down_read_preempt_disable(&file_rwsem); spin_lock(&ctx->flc_lock); /* * New lock request. Walk all POSIX locks and look for conflicts. If @@ -1180,7 +1180,7 @@ static int posix_lock_inode(struct inode } out: spin_unlock(&ctx->flc_lock); - percpu_up_read(&file_rwsem); + percpu_up_read_preempt_enable(&file_rwsem); /* * Free any unused locks. */ @@ -1455,7 +1455,7 @@ int __break_lease(struct inode *inode, u return error; } - percpu_down_read(&file_rwsem); + percpu_down_read_preempt_disable(&file_rwsem); spin_lock(&ctx->flc_lock); time_out_leases(inode, &dispose); @@ -1507,13 +1507,13 @@ int __break_lease(struct inode *inode, u locks_insert_block(fl, new_fl); trace_break_lease_block(inode, new_fl); spin_unlock(&ctx->flc_lock); - percpu_up_read(&file_rwsem); + percpu_up_read_preempt_enable(&file_rwsem); locks_dispose_list(&dispose); error = wait_event_interruptible_timeout(new_fl->fl_wait, !new_fl->fl_next, break_time); - percpu_down_read(&file_rwsem); + percpu_down_read_preempt_disable(&file_rwsem); spin_lock(&ctx->flc_lock); trace_break_lease_unblock(inode, new_fl); locks_delete_block(new_fl); @@ -1530,7 +1530,7 @@ int __break_lease(struct inode *inode, u } out: spin_unlock(&ctx->flc_lock); - percpu_up_read(&file_rwsem); + percpu_up_read_preempt_enable(&file_rwsem); locks_dispose_list(&dispose); locks_free_lock(new_fl); return error; @@ -1685,7 +1685,7 @@ generic_add_lease(struct file *filp, lon return -EINVAL; } - percpu_down_read(&file_rwsem); + percpu_down_read_preempt_disable(&file_rwsem); spin_lock(&ctx->flc_lock); time_out_leases(inode, &dispose); error = check_conflicting_open(dentry, arg, lease->fl_flags); @@ -1756,7 +1756,7 @@ generic_add_lease(struct file *filp, lon lease->fl_lmops->lm_setup(lease, priv); out: spin_unlock(&ctx->flc_lock); - percpu_up_read(&file_rwsem); + percpu_up_read_preempt_enable(&file_rwsem); locks_dispose_list(&dispose); if (is_deleg) inode_unlock(inode); @@ -1779,7 +1779,7 @@ static int generic_delete_lease(struct f return error; } - percpu_down_read(&file_rwsem); + percpu_down_read_preempt_disable(&file_rwsem); spin_lock(&ctx->flc_lock); list_for_each_entry(fl, &ctx->flc_lease, fl_list) { if (fl->fl_file == filp && @@ -1792,7 +1792,7 @@ static int generic_delete_lease(struct f if (victim) error = fl->fl_lmops->lm_change(victim, F_UNLCK, &dispose); spin_unlock(&ctx->flc_lock); - percpu_up_read(&file_rwsem); + percpu_up_read_preempt_enable(&file_rwsem); locks_dispose_list(&dispose); return error; }