Messages in this thread | | | From | Paul Moore <> | Subject | Re: [2/2] conditionally reschedule in hashtab_insert while loading selinux policy. | Date | Thu, 15 May 2014 17:15:29 -0400 |
| |
On Thursday, May 15, 2014 03:03:53 PM Dave Jones wrote: > After silencing the sleeping warning in mls_convert_context() I started > seeing similar traces from hashtab_insert. Do a cond_resched there too. > > Signed-off-by: Dave Jones <davej@redhat.com>
Merged to the SELinux #next branch, thanks.
> diff --git a/security/selinux/ss/hashtab.c b/security/selinux/ss/hashtab.c > index 933e735bb185..2cc496149842 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 security and virtualization @ redhat
| |