Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1272729 > unrolled thread
| Started by | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| First post | 2015-11-19 02:10 +0100 |
| Last post | 2015-11-19 21:20 +0100 |
| Articles | 4 — 3 participants |
Back to article view | Back to linux.kernel
linux-next: manual merge of the audit tree with Linus' tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-11-19 02:10 +0100
Re: linux-next: manual merge of the audit tree with Linus' tree Paul Moore <paul@paul-moore.com> - 2015-11-19 17:00 +0100
Re: linux-next: manual merge of the audit tree with Linus' tree Richard Guy Briggs <rgb@redhat.com> - 2015-11-19 19:40 +0100
Re: linux-next: manual merge of the audit tree with Linus' tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-11-19 21:20 +0100
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2015-11-19 02:10 +0100 |
| Subject | linux-next: manual merge of the audit tree with Linus' tree |
| Message-ID | <qwlTA-2sv-9@gated-at.bofh.it> |
Hi Paul,
Today's linux-next merge of the audit tree got a conflict in:
kernel/audit.c
between commit:
d0164adc89f6 ("mm, page_alloc: distinguish between being unable to sleep, unwilling to sleep and avoiding waking kswapd")
from Linus' tree and commit:
14eeba1d242e ("audit: include auditd's threads in audit_log_start() wait exception")
from the audit tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc kernel/audit.c
index bc2ff61bc1d6,ca1b9cda2766..000000000000
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@@ -1371,9 -1371,9 +1371,9 @@@ struct audit_buffer *audit_log_start(st
if (unlikely(audit_filter_type(type)))
return NULL;
- if (gfp_mask & __GFP_WAIT) {
+ if (gfp_mask & __GFP_DIRECT_RECLAIM) {
- if (audit_pid && audit_pid == current->pid)
+ if (audit_pid && audit_pid == current->tgid)
- gfp_mask &= ~__GFP_WAIT;
+ gfp_mask &= ~__GFP_DIRECT_RECLAIM;
else
reserve = 0;
}
--
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/
[toc] | [next] | [standalone]
| From | Paul Moore <paul@paul-moore.com> |
|---|---|
| Date | 2015-11-19 17:00 +0100 |
| Message-ID | <qwzMT-2PJ-37@gated-at.bofh.it> |
| In reply to | #1272729 |
On Wed, Nov 18, 2015 at 8:06 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Paul,
>
> Today's linux-next merge of the audit tree got a conflict in:
>
> kernel/audit.c
>
> between commit:
>
> d0164adc89f6 ("mm, page_alloc: distinguish between being unable to sleep, unwilling to sleep and avoiding waking kswapd")
>
> from Linus' tree and commit:
>
> 14eeba1d242e ("audit: include auditd's threads in audit_log_start() wait exception")
>
> from the audit tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Thanks Stephen, I found the same thing yesterday while doing some
testing; your patch looks good to me.
> diff --cc kernel/audit.c
> index bc2ff61bc1d6,ca1b9cda2766..000000000000
> --- a/kernel/audit.c
> +++ b/kernel/audit.c
> @@@ -1371,9 -1371,9 +1371,9 @@@ struct audit_buffer *audit_log_start(st
> if (unlikely(audit_filter_type(type)))
> return NULL;
>
> - if (gfp_mask & __GFP_WAIT) {
> + if (gfp_mask & __GFP_DIRECT_RECLAIM) {
> - if (audit_pid && audit_pid == current->pid)
> + if (audit_pid && audit_pid == current->tgid)
> - gfp_mask &= ~__GFP_WAIT;
> + gfp_mask &= ~__GFP_DIRECT_RECLAIM;
> else
> reserve = 0;
> }
--
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/
[toc] | [prev] | [next] | [standalone]
| From | Richard Guy Briggs <rgb@redhat.com> |
|---|---|
| Date | 2015-11-19 19:40 +0100 |
| Message-ID | <qwChI-4Cb-21@gated-at.bofh.it> |
| In reply to | #1273244 |
On 15/11/19, Paul Moore wrote:
> On Wed, Nov 18, 2015 at 8:06 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > Hi Paul,
> >
> > Today's linux-next merge of the audit tree got a conflict in:
> >
> > kernel/audit.c
> >
> > between commit:
> >
> > d0164adc89f6 ("mm, page_alloc: distinguish between being unable to sleep, unwilling to sleep and avoiding waking kswapd")
> >
> > from Linus' tree and commit:
> >
> > 14eeba1d242e ("audit: include auditd's threads in audit_log_start() wait exception")
> >
> > from the audit tree.
> >
> > I fixed it up (see below) and can carry the fix as necessary (no action
> > is required).
>
> Thanks Stephen, I found the same thing yesterday while doing some
> testing; your patch looks good to me.
Stephen, your patch looks fine to me. I had some minor concerns about
deeper issues as to whether the original intent of that part of the
audit subsystem was affected by this change, but that is WRT the
conflicting patch rather than your merge. After poking around a bit, I
don't have any outstanding concerns.
> > diff --cc kernel/audit.c
> > index bc2ff61bc1d6,ca1b9cda2766..000000000000
> > --- a/kernel/audit.c
> > +++ b/kernel/audit.c
> > @@@ -1371,9 -1371,9 +1371,9 @@@ struct audit_buffer *audit_log_start(st
> > if (unlikely(audit_filter_type(type)))
> > return NULL;
> >
> > - if (gfp_mask & __GFP_WAIT) {
> > + if (gfp_mask & __GFP_DIRECT_RECLAIM) {
> > - if (audit_pid && audit_pid == current->pid)
> > + if (audit_pid && audit_pid == current->tgid)
> > - gfp_mask &= ~__GFP_WAIT;
> > + gfp_mask &= ~__GFP_DIRECT_RECLAIM;
> > else
> > reserve = 0;
> > }
>
> paul moore
- RGB
--
Richard Guy Briggs <rbriggs@redhat.com>
Senior Software Engineer, Kernel Security, AMER ENG Base Operating Systems, Red Hat
Remote, Ottawa, Canada
Voice: +1.647.777.2635, Internal: (81) 32635, Alt: +1.613.693.0684x3545
--
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/
[toc] | [prev] | [next] | [standalone]
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2015-11-19 21:20 +0100 |
| Message-ID | <qwDQu-5IW-33@gated-at.bofh.it> |
| In reply to | #1273360 |
Hi Richard, On Thu, 19 Nov 2015 13:30:12 -0500 Richard Guy Briggs <rgb@redhat.com> wrote: > > Stephen, your patch looks fine to me. I had some minor concerns about > deeper issues as to whether the original intent of that part of the > audit subsystem was affected by this change, but that is WRT the > conflicting patch rather than your merge. After poking around a bit, I > don't have any outstanding concerns. Thanks for checking. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au -- 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/
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web