Re: [linux-yocto] [linux_yocto_v5.0/standard/preempt-rt/base][PATCH] genirq: Prevent use-after-free and work list corruption on rt

2019-05-21 Thread Bruce Ashfield 
merged.

Bruce

On Sat, May 18, 2019 at 11:32 AM Hongxu Jia 
wrote:

> Since commit [70a44a0 genirq: Prevent use-after-free and work list
> corruption] applied, the patch makes it work on rt
>
> Signed-off-by: Hongxu Jia 
> ---
>  kernel/irq/manage.c | 4 
>  1 file changed, 4 insertions(+)
>
> diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
> index f72bd3a..143f87b 100644
> --- a/kernel/irq/manage.c
> +++ b/kernel/irq/manage.c
> @@ -385,7 +385,11 @@ irq_set_affinity_notifier(unsigned int irq, struct
> irq_affinity_notify *notify)
> raw_spin_unlock_irqrestore(>lock, flags);
>
> if (old_notify) {
> +#ifdef CONFIG_PREEMPT_RT_BASE
> +   kthread_cancel_work_sync(_notify->work);
> +#else
> cancel_work_sync(_notify->work);
> +#endif
> kref_put(_notify->kref, old_notify->release);
> }
>
> --
> 2.8.1
>
> --
> ___
> linux-yocto mailing list
> linux-yocto@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/linux-yocto
>


-- 
- Thou shalt not follow the NULL pointer, for chaos and madness await thee
at its end
- "Use the force Harry" - Gandalf, Star Trek II
-- 
___
linux-yocto mailing list
linux-yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/linux-yocto

Re: [linux-yocto] v4.18.x - stable updates comprising v4.18.38

2019-05-21 Thread Bruce Ashfield 
On Sun, May 19, 2019 at 10:51 AM Paul Gortmaker <
paul.gortma...@windriver.com> wrote:

> [Re: v4.18.x - stable updates comprising v4.18.38] On 16/05/2019 (Thu
> 16:47) Paul Gortmaker wrote:
>
> [...]
>
> > > The conflicts just look like one of the changes is already in my tree
> .. which
> > > IIRC is the case, but it would be great if you could check the latest
> branches
> > > and confirm the commit I should revert before merging this.
> >
> > OK -- I'll have a look at doing the merge locally and let you know.
>
> Your guess is correct, but it is three duplicates and not just one.
>
> So, if we look at 4.18/standard base and run:
>
>git log --oneline --no-merges  ^v4.18.37 HEAD  net/ipv4/
>
>ecf31c809599 ip: frags: fix crash in ip_do_fragment()
>02fc22c5eb30 ip: use rb trees for IP frag queue.
>7a9f904c49aa ip: discard IPv4 datagrams with overlapping segments.
>
> These are all part of the 4.18.38 content, but it appears that these
> earlier backports in Yocto were done w/o stacking the dependencies
> underneath so that they could be used as-is.  Apparently that meant
> git-merge wasn't able to recognize the duplicated content, leading to a
> needlessly complex merge.
>
> However, nothing is stacked on top of them, so a LIFO rewind as:
>
>git revert ecf31c809599
>git revert 02fc22c5eb30
>git revert 7a9f904c49aa
>
> ...then allows a "git merge v4.18.38" to be 100% conflict free.
>
>
Thanks Paul,

This fixed things up for me. I had a minor conflict in -rt, but I fixed it
up. If I did screw up the resolution, let me know.

This is now merged and pushed.

Bruce




> Paul.
>


-- 
- Thou shalt not follow the NULL pointer, for chaos and madness await thee
at its end
- "Use the force Harry" - Gandalf, Star Trek II
-- 
___
linux-yocto mailing list
linux-yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/linux-yocto