From: Jan Kiszka <jan.kiszka@siemens.com>
To: Philippe Gerum <rpm@xenomai.org>
Cc: Florian Bezdeka <florian.bezdeka@siemens.com>,
Xenomai <xenomai@lists.linux.dev>
Subject: Re: v6.1.y-dovetail-rebase
Date: Tue, 22 Aug 2023 13:30:59 +0200 [thread overview]
Message-ID: <c4aececb-ba47-4e5b-aa2b-69860a2b421d@siemens.com> (raw)
In-Reply-To: <87wmxoo82k.fsf@xenomai.org>
On 21.08.23 15:09, Philippe Gerum wrote:
>
> Jan Kiszka <jan.kiszka@siemens.com> writes:
>
>> On 21.08.23 08:41, Philippe Gerum wrote:
>>>
>>> Jan Kiszka <jan.kiszka@siemens.com> writes:
>>>
>>>> On 15.08.23 12:18, Philippe Gerum wrote:
>>>>>
>>>>> Jan Kiszka <jan.kiszka@siemens.com> writes:
>>>>>
>>>>>> On 09.08.23 15:11, Philippe Gerum wrote:
>>>>>>>
>>>>>>> Jan Kiszka <jan.kiszka@siemens.com> writes:
>>>>>>>
>>>>>>>> On 09.08.23 07:52, Jan Kiszka wrote:
>>>>>>>>> On 01.08.23 15:26, Philippe Gerum wrote:
>>>>>>>>>>
>>>>>>>>>> Florian Bezdeka <florian.bezdeka@siemens.com> writes:
>>>>>>>>>>
>>>>>>>>>>> On Mon, 2023-07-10 at 08:59 +0200, Florian Bezdeka wrote:
>>>>>>>>>>>> On Thu, 2023-07-06 at 21:00 +0200, Philippe Gerum wrote:
>>>>>>>>>>>>> Hi,
>>>>>>>>>>>>>
>>>>>>>>>>>>> Jan Kiszka <jan.kiszka@siemens.com> writes:
>>>>>>>>>>>>>
>>>>>>>>>>>>>> Hi Philippe,
>>>>>>>>>>>>>>
>>>>>>>>>>>>>> quick feedback on latest rebasing:
>>>>>>>>>>>>>>
>>>>>>>>>>>>>> https://source.denx.de/Xenomai/linux-dovetail/-/commit/8f155631c8b51731dfc2ae5145d4dcc68f2ed7ed
>>>>>>>>>>>>>>
>>>>>>>>>>>>>> This was likely accidentally folded, right?
>>>>>>>>>>>>>>
>>>>>>>>>>>>>
>>>>>>>>>>>>> It looks so. This conditional statement appeared upstream during the
>>>>>>>>>>>>> v6.0 cycle it seems, and was unfortunately left unfixed in the dovetail
>>>>>>>>>>>>> patch for this entire series.
>>>>>>>>>>>>>
>>>>>>>>>>>>>> Furthermore, I will factor this change out into a separate commit in
>>>>>>>>>>>>>> merging v6.1.y-dovetail, for better traceability:
>>>>>>>>>>>>>>
>>>>>>>>>>>>>> diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
>>>>>>>>>>>>>> index ce8bdd804bc7..c843bf352999 100644
>>>>>>>>>>>>>> --- a/arch/x86/mm/fault.c
>>>>>>>>>>>>>> +++ b/arch/x86/mm/fault.c
>>>>>>>>>>>>>> @@ -1466,7 +1466,7 @@ void do_user_addr_fault(struct pt_regs *regs,
>>>>>>>>>>>>>>
>>>>>>>>>>>>>> /* The fault is fully completed (including releasing mmap lock) */
>>>>>>>>>>>>>> if (fault & VM_FAULT_COMPLETED)
>>>>>>>>>>>>>> - return;
>>>>>>>>>>>>>> + goto out;
>>>>>>>>>>>>>>
>>>>>>>>>>>>>> /*
>>>>>>>>>>>>>> * If we need to retry the mmap_lock has already been released,
>>>>>>>>>>>>>>
>>>>>>>>>>>>>> To my understanding, this was a dovetail fix that applied to previous
>>>>>>>>>>>>>> versions as well.
>>>>>>>>>>>>>
>>>>>>>>>>>>> Only to v6.0, however this series is not maintained dovetail-wise
>>>>>>>>>>>>> anymore, so this stayed under the radar.
>>>>>>>>>>>>
>>>>>>>>>>>> FYI: This change fixes a real issue here. The 6.1-rebase branch made it
>>>>>>>>>>>> through a 24h stress test while the "merge" branch failed. Happily
>>>>>>>>>>>> waiting for the next release...
>>>>>>>>>>>
>>>>>>>>>>> Do we have a idea / plan when the next 6.1 dovetail release will
>>>>>>>>>>> happen? My internal customer is waiting for that and I want to avoid
>>>>>>>>>>> backporting to 6.1.34.
>>>>>>>>>>>
>>>>>>>>>>
>>>>>>>>>> There is a brewing rebase to v6.1.42 pending tests here, no challenging
>>>>>>>>>> source conflict. I pushed the tree untagged to the v6.1.y-rebase branch
>>>>>>>>>> if you want to give it a try before Jan updates the stable branch.
>>>>>>>>>>
>>>>>>>>>
>>>>>>>>> We are testing against -rebase anyway (but that needs a trigger which I
>>>>>>>>> just provided). The merging branch is only updated once there is a
>>>>>>>>> release tagged.
>>>>>>>>>
>>>>>>>>
>>>>>>>> Passed with the Xenomai 3 tests:
>>>>>>>>
>>>>>>>> https://source.denx.de/Xenomai/xenomai-images/-/pipelines/17252
>>>>>>>>
>>>>>>>> But can we update to 6.1.44 directly? Florian mentioned that there are
>>>>>>>> Downfall-related fixes in that release.
>>>>>>>>
>>>>>>>> Jan
>>>>>>>
>>>>>>> yes, .44 is actually brewing here already.
>>>>>>>
>>>>>>
>>>>>> Now we are .45 even. Will this one be tagged? CI looks good so far.
>>>>>>
>>>>>
>>>>> Nope, .44 was broken due to [1]. .45 looks better with this fix in
>>>>> place. This issue triggered on kvm/arm64 w/ PROVE_LOCKING enabled.
>>>>>
>>>>> [1] https://source.denx.de/Xenomai/linux-dovetail/-/commit/60ae6e4ea6a074698be4d999e96e9c3697b18ea1
>>>>>
>>>>
>>>> Thanks for tagging v6.1.45-dovetail1 and v5.15.126-dovetail1, I've
>>>> updated the merging branches accordingly. How about 5.10?
>>>>
>>>
>>> Not done with testing yet.
>>>
>>
>> If you push to -rebase, we could join that effort.
>>
>
> This would help, thanks. Pushed now.
>
Tests went well:
https://source.denx.de/Xenomai/xenomai-images/-/jobs/681220
https://source.denx.de/Xenomai/xenomai-images/-/jobs/681219
https://source.denx.de/Xenomai/xenomai-images/-/jobs/681218
Jan
--
Siemens AG, Technology
Linux Expert Center
prev parent reply other threads:[~2023-08-22 11:31 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-06 10:14 v6.1.y-dovetail-rebase Jan Kiszka
2023-07-06 19:00 ` v6.1.y-dovetail-rebase Philippe Gerum
2023-07-10 6:59 ` v6.1.y-dovetail-rebase Florian Bezdeka
2023-08-01 11:27 ` v6.1.y-dovetail-rebase Florian Bezdeka
2023-08-01 13:26 ` v6.1.y-dovetail-rebase Philippe Gerum
2023-08-09 5:52 ` v6.1.y-dovetail-rebase Jan Kiszka
2023-08-09 11:44 ` v6.1.y-dovetail-rebase Jan Kiszka
2023-08-09 13:11 ` v6.1.y-dovetail-rebase Philippe Gerum
2023-08-14 17:25 ` v6.1.y-dovetail-rebase Jan Kiszka
2023-08-15 10:18 ` v6.1.y-dovetail-rebase Philippe Gerum
2023-08-20 15:30 ` v6.1.y-dovetail-rebase Jan Kiszka
2023-08-21 6:41 ` v6.1.y-dovetail-rebase Philippe Gerum
2023-08-21 11:45 ` v6.1.y-dovetail-rebase Jan Kiszka
2023-08-21 13:09 ` v6.1.y-dovetail-rebase Philippe Gerum
2023-08-22 11:30 ` Jan Kiszka [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c4aececb-ba47-4e5b-aa2b-69860a2b421d@siemens.com \
--to=jan.kiszka@siemens.com \
--cc=florian.bezdeka@siemens.com \
--cc=rpm@xenomai.org \
--cc=xenomai@lists.linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).