From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752409AbbFPMLz (ORCPT ); Tue, 16 Jun 2015 08:11:55 -0400 Received: from emvm-gh1-uea09.nsa.gov ([63.239.67.10]:63202 "EHLO emvm-gh1-uea09.nsa.gov" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752821AbbFPMLp (ORCPT ); Tue, 16 Jun 2015 08:11:45 -0400 X-TM-IMSS-Message-ID: <9e41a66b00000270@nsa.gov> Message-ID: <557F08E0.4040007@tycho.nsa.gov> Date: Mon, 15 Jun 2015 13:18:24 -0400 From: Stephen Smalley Organization: National Security Agency User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Waiman Long , Paul Moore , Eric Paris , James Morris , "Serge E. Hallyn" , selinux@tycho.nsa.gov CC: linux-kernel@vger.kernel.org, linux-security-module@vger.kernel.org, Raghavendra K T , Yury , Scott J Norton , Douglas Hatch Subject: Re: [PATCH v3] selinux: reduce locking overhead in inode_free_security() References: <1434388419-14850-1-git-send-email-Waiman.Long@hp.com> In-Reply-To: <1434388419-14850-1-git-send-email-Waiman.Long@hp.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 06/15/2015 01:13 PM, Waiman Long wrote: > The inode_free_security() function just took the superblock's isec_lock > before checking and trying to remove the inode security struct from the > linked list. In many cases, the list was empty and so the lock taking > is wasteful as no useful work is done. On multi-socket systems with > a large number of CPUs, there can also be a fair amount of spinlock > contention on the isec_lock if many tasks are exiting at the same time. > > This patch changes the code to check the state of the list first before > taking the lock and attempting to dequeue it. The list_del_init() > can be called more than once on the same list with no harm as long > as they are properly serialized. It should not be possible to have > inode_free_security() called concurrently with list_add(). For better > safety, however, we use list_empty_careful() here even though it is > still not completely safe in case that happens. > > Signed-off-by: Waiman Long Acked-by: Stephen Smalley > --- > security/selinux/hooks.c | 17 ++++++++++++++--- > 1 files changed, 14 insertions(+), 3 deletions(-) > > v1->v2: > - Take out the second list_empty() test inside the lock. > > v2->v3: > - Fix incorrent comment and commit log message. > > diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c > index 7dade28..2a99804 100644 > --- a/security/selinux/hooks.c > +++ b/security/selinux/hooks.c > @@ -254,10 +254,21 @@ static void inode_free_security(struct inode *inode) > struct inode_security_struct *isec = inode->i_security; > struct superblock_security_struct *sbsec = inode->i_sb->s_security; > > - spin_lock(&sbsec->isec_lock); > - if (!list_empty(&isec->list)) > + /* > + * As not all inode security structures are in a list, we check for > + * empty list outside of the lock to make sure that we won't waste > + * time taking a lock doing nothing. > + * > + * The list_del_init() function can be safely called more than once. > + * It should not be possible for this function to be called with > + * concurrent list_add(), but for better safety against future changes > + * in the code, we use list_empty_careful() here. > + */ > + if (!list_empty_careful(&isec->list)) { > + spin_lock(&sbsec->isec_lock); > list_del_init(&isec->list); > - spin_unlock(&sbsec->isec_lock); > + spin_unlock(&sbsec->isec_lock); > + } > > /* > * The inode may still be referenced in a path walk and > From mboxrd@z Thu Jan 1 00:00:00 1970 Message-ID: <557F08E0.4040007@tycho.nsa.gov> Date: Mon, 15 Jun 2015 13:18:24 -0400 From: Stephen Smalley MIME-Version: 1.0 To: Waiman Long , Paul Moore , Eric Paris , James Morris , "Serge E. Hallyn" , selinux@tycho.nsa.gov Subject: Re: [PATCH v3] selinux: reduce locking overhead in inode_free_security() References: <1434388419-14850-1-git-send-email-Waiman.Long@hp.com> In-Reply-To: <1434388419-14850-1-git-send-email-Waiman.Long@hp.com> Content-Type: text/plain; charset=windows-1252 Cc: Yury , Scott J Norton , Raghavendra K T , linux-kernel@vger.kernel.org, linux-security-module@vger.kernel.org, Douglas Hatch List-Id: "Security-Enhanced Linux \(SELinux\) mailing list" List-Post: List-Help: On 06/15/2015 01:13 PM, Waiman Long wrote: > The inode_free_security() function just took the superblock's isec_lock > before checking and trying to remove the inode security struct from the > linked list. In many cases, the list was empty and so the lock taking > is wasteful as no useful work is done. On multi-socket systems with > a large number of CPUs, there can also be a fair amount of spinlock > contention on the isec_lock if many tasks are exiting at the same time. > > This patch changes the code to check the state of the list first before > taking the lock and attempting to dequeue it. The list_del_init() > can be called more than once on the same list with no harm as long > as they are properly serialized. It should not be possible to have > inode_free_security() called concurrently with list_add(). For better > safety, however, we use list_empty_careful() here even though it is > still not completely safe in case that happens. > > Signed-off-by: Waiman Long Acked-by: Stephen Smalley > --- > security/selinux/hooks.c | 17 ++++++++++++++--- > 1 files changed, 14 insertions(+), 3 deletions(-) > > v1->v2: > - Take out the second list_empty() test inside the lock. > > v2->v3: > - Fix incorrent comment and commit log message. > > diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c > index 7dade28..2a99804 100644 > --- a/security/selinux/hooks.c > +++ b/security/selinux/hooks.c > @@ -254,10 +254,21 @@ static void inode_free_security(struct inode *inode) > struct inode_security_struct *isec = inode->i_security; > struct superblock_security_struct *sbsec = inode->i_sb->s_security; > > - spin_lock(&sbsec->isec_lock); > - if (!list_empty(&isec->list)) > + /* > + * As not all inode security structures are in a list, we check for > + * empty list outside of the lock to make sure that we won't waste > + * time taking a lock doing nothing. > + * > + * The list_del_init() function can be safely called more than once. > + * It should not be possible for this function to be called with > + * concurrent list_add(), but for better safety against future changes > + * in the code, we use list_empty_careful() here. > + */ > + if (!list_empty_careful(&isec->list)) { > + spin_lock(&sbsec->isec_lock); > list_del_init(&isec->list); > - spin_unlock(&sbsec->isec_lock); > + spin_unlock(&sbsec->isec_lock); > + } > > /* > * The inode may still be referenced in a path walk and >