Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1755477Ab3JCUgR (ORCPT <rfc822;w@1wt.eu>);
	Thu, 3 Oct 2013 16:36:17 -0400
Received: from mail-qa0-f54.google.com ([209.85.216.54]:47012 "EHLO
	mail-qa0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1755332Ab3JCUgP (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Thu, 3 Oct 2013 16:36:15 -0400
From: Paul Moore <paul@paul-moore.com>
To: Dave Jones <davej@redhat.com>
Cc: Stephen Smalley <sds@tycho.nsa.gov>,
        Linux Kernel <linux-kernel@vger.kernel.org>, eparis@redhat.com,
        james.l.morris@oracle.com, selinux@tycho.nsa.gov
Subject: Re: [PATCH] conditionally reschedule while loading selinux policy.
Date: Thu, 03 Oct 2013 16:36:10 -0400
Message-ID: <2297933.rECKfqAcWT@sifl>
User-Agent: KMail/4.11.1 (Linux/3.10.13-gentoo; KDE/4.11.1; x86_64; ; )
In-Reply-To: <20130930211342.GA24001@redhat.com>
References: <20130916173036.GA17950@redhat.com> <5249B6F1.4050507@tycho.nsa.gov> <20130930211342.GA24001@redhat.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 7Bit
Content-Type: text/plain; charset="us-ascii"
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Content-Length: 2617
Lines: 69

On Monday, September 30, 2013 05:13:42 PM Dave Jones wrote:
> On Mon, Sep 30, 2013 at 01:37:53PM -0400, Stephen Smalley wrote:
>  > > With that patch applied, the problem seems to have moved elsewhere..
>  > > 
>  > > BUG: soft lockup - CPU#3 stuck for 22s! [load_policy:8119]
>  > > 
>  > >  irq event stamp: 1590886
>  > >  hardirqs last  enabled at (1590885): [<ffffffff8152c3dd>]
>  > >  __slab_alloc.constprop.78+0x4c0/0x4d7 hardirqs last disabled at
>  > >  (1590886): [<ffffffff8153e06a>] apic_timer_interrupt+0x6a/0x80
>  > >  softirqs last  enabled at (1590336): [<ffffffff810480d9>]
>  > >  __do_softirq+0x169/0x200 softirqs last disabled at (1590331):
>  > >  [<ffffffff8104839d>] irq_exit+0x11d/0x140 RIP:
>  > >  0010:[<ffffffff81223182>]  [<ffffffff81223182>]
>  > >  hashtab_insert+0x62/0x110 > > 
>  > > Call Trace:
>  > >  [<ffffffff812283b5>] policydb_read+0xc25/0x1200
>  > 
>  > ...
>  > 
>  > > We're holding a bunch of locks here, so we can't just cond_resched. 
>  > > Thoughts ?
>  >
>  > Sorry, what locks are we holding there?  You ought to be able to do a
>  > cond_resched() anywhere during policydb_read() AFAIK; it is loading the
>  > policy into a new structure that isn't being accessed by anything else
>  > yet and the policy_rwlock is only held by security_load_policy after
>  > calling policydb_read and only to switch it into place as the active
>  > policydb.
> 
> Hmm, I thought I had tried this already, and got a lot of spew, but it turns
> out for some reason I had previously patched hashtab_search instead.
> 
> I'll try running with this for a while..

Hi Dave,

Just checking to see if this patch solved your problem ... ?

> diff --git a/security/selinux/ss/hashtab.c b/security/selinux/ss/hashtab.c
> index 933e735..2cc4961 100644
> --- a/security/selinux/ss/hashtab.c
> +++ b/security/selinux/ss/hashtab.c
> @@ -6,6 +6,7 @@
>  #include <linux/kernel.h>
>  #include <linux/slab.h>
>  #include <linux/errno.h>
> +#include <linux/sched.h>
>  #include "hashtab.h"
> 
>  struct hashtab *hashtab_create(u32 (*hash_value)(struct hashtab *h, const
> void *key), @@ -40,6 +41,8 @@ int hashtab_insert(struct hashtab *h, void
> *key, void *datum) u32 hvalue;
>  	struct hashtab_node *prev, *cur, *newnode;
> 
> +	cond_resched();
> +
>  	if (!h || h->nel == HASHTAB_MAX_NODES)
>  		return -EINVAL;

-- 
paul moore
www.paul-moore.com

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/