From: brendanhiggins at google.com (Brendan Higgins)
Subject: [RFC v3 08/19] arch: um: add shim to trap to allow installing a fault catcher for tests
Date: Mon, 3 Dec 2018 16:44:56 -0800 [thread overview]
Message-ID: <CAFd5g45p55GXuk-PcaknVHywJ25LsM+7N83L_g0ob6Q0FTwSrg@mail.gmail.com> (raw)
In-Reply-To: <20181203234628.GR28501@garbanzo.do-not-panic.com>
On Mon, Dec 3, 2018 at 3:46 PM Luis Chamberlain <mcgrof at kernel.org> wrote:
>
> On Mon, Dec 03, 2018 at 03:34:57PM -0800, Brendan Higgins wrote:
> > On Thu, Nov 29, 2018 at 7:34 PM Luis Chamberlain <mcgrof at kernel.org> wrote:
> > >
> > > On Wed, Nov 28, 2018 at 11:36:25AM -0800, Brendan Higgins wrote:
> > > > diff --git a/arch/um/kernel/trap.c b/arch/um/kernel/trap.c
> > > > index cced829460427..bf90e678b3d71 100644
> > > > --- a/arch/um/kernel/trap.c
> > > > +++ b/arch/um/kernel/trap.c
> > > > @@ -201,6 +201,12 @@ void segv_handler(int sig, struct siginfo *unused_si, struct uml_pt_regs *regs)
> > > > segv(*fi, UPT_IP(regs), UPT_IS_USER(regs), regs);
> > > > }
> > > >
> > > > +static void segv_run_catcher(jmp_buf *catcher, void *fault_addr)
> > > > +{
> > > > + current->thread.fault_addr = fault_addr;
> > > > + UML_LONGJMP(catcher, 1);
> > > > +}
> > > > +
> > > > /*
> > > > * We give a *copy* of the faultinfo in the regs to segv.
> > > > * This must be done, since nesting SEGVs could overwrite
> > > > @@ -219,7 +225,10 @@ unsigned long segv(struct faultinfo fi, unsigned long ip, int is_user,
> > > > if (!is_user && regs)
> > > > current->thread.segv_regs = container_of(regs, struct pt_regs, regs);
> > > >
> > > > - if (!is_user && (address >= start_vm) && (address < end_vm)) {
> > > > + catcher = current->thread.fault_catcher;
> > >
> > > This and..
> > >
> > > > + if (catcher && current->thread.is_running_test)
> > > > + segv_run_catcher(catcher, (void *) address);
> > > > + else if (!is_user && (address >= start_vm) && (address < end_vm)) {
> > > > flush_tlb_kernel_vm();
> > > > goto out;
> > > > }
> > >
> > > *not this*
> >
> > I don't understand. Are you saying the previous block of code is good
> > and this one is bad?
>
> No, I was saying that the above block of code is a functional change,
> but I was also pointing out other areas which were not and could be
> folded into a separate atomic patch where no functionality changes.
>
> > > > @@ -246,12 +255,10 @@ unsigned long segv(struct faultinfo fi, unsigned long ip, int is_user,
> > > > address = 0;
> > > > }
> > > >
> > > > - catcher = current->thread.fault_catcher;
> > > > if (!err)
> > > > goto out;
> > > > else if (catcher != NULL) {
> > > > - current->thread.fault_addr = (void *) address;
> > > > - UML_LONGJMP(catcher, 1);
> > > > + segv_run_catcher(catcher, (void *) address);
> > > > }
> > > > else if (current->thread.fault_addr != NULL)
> > > > panic("fault_addr set but no fault catcher");
> > >
> > > But with this seems one atomic change which should be submitted
> > > separately, its just a helper. Think it would make the actual
> > > change needed easier to review, ie, your needed changes would
> > > be smaller and clearer for what you need.
> >
> > Are you suggesting that I pull out the bits needed to implement abort
> > in the next patch and squash it into this one?
>
> No, I'm suggesting you can probably split this patch in 2, one which
> wraps things with no functional changes, and another which adds your
> changes.
>
That makes sense.
Thanks for the clarification!
WARNING: multiple messages have this Message-ID (diff)
From: brendanhiggins@google.com (Brendan Higgins)
Subject: [RFC v3 08/19] arch: um: add shim to trap to allow installing a fault catcher for tests
Date: Mon, 3 Dec 2018 16:44:56 -0800 [thread overview]
Message-ID: <CAFd5g45p55GXuk-PcaknVHywJ25LsM+7N83L_g0ob6Q0FTwSrg@mail.gmail.com> (raw)
Message-ID: <20181204004456.U1dhuA5fn_-LqdlPVgK8g6mZRZ7lLXDZU6W-Bhm21-8@z> (raw)
In-Reply-To: <20181203234628.GR28501@garbanzo.do-not-panic.com>
On Mon, Dec 3, 2018@3:46 PM Luis Chamberlain <mcgrof@kernel.org> wrote:
>
> On Mon, Dec 03, 2018@03:34:57PM -0800, Brendan Higgins wrote:
> > On Thu, Nov 29, 2018@7:34 PM Luis Chamberlain <mcgrof@kernel.org> wrote:
> > >
> > > On Wed, Nov 28, 2018@11:36:25AM -0800, Brendan Higgins wrote:
> > > > diff --git a/arch/um/kernel/trap.c b/arch/um/kernel/trap.c
> > > > index cced829460427..bf90e678b3d71 100644
> > > > --- a/arch/um/kernel/trap.c
> > > > +++ b/arch/um/kernel/trap.c
> > > > @@ -201,6 +201,12 @@ void segv_handler(int sig, struct siginfo *unused_si, struct uml_pt_regs *regs)
> > > > segv(*fi, UPT_IP(regs), UPT_IS_USER(regs), regs);
> > > > }
> > > >
> > > > +static void segv_run_catcher(jmp_buf *catcher, void *fault_addr)
> > > > +{
> > > > + current->thread.fault_addr = fault_addr;
> > > > + UML_LONGJMP(catcher, 1);
> > > > +}
> > > > +
> > > > /*
> > > > * We give a *copy* of the faultinfo in the regs to segv.
> > > > * This must be done, since nesting SEGVs could overwrite
> > > > @@ -219,7 +225,10 @@ unsigned long segv(struct faultinfo fi, unsigned long ip, int is_user,
> > > > if (!is_user && regs)
> > > > current->thread.segv_regs = container_of(regs, struct pt_regs, regs);
> > > >
> > > > - if (!is_user && (address >= start_vm) && (address < end_vm)) {
> > > > + catcher = current->thread.fault_catcher;
> > >
> > > This and..
> > >
> > > > + if (catcher && current->thread.is_running_test)
> > > > + segv_run_catcher(catcher, (void *) address);
> > > > + else if (!is_user && (address >= start_vm) && (address < end_vm)) {
> > > > flush_tlb_kernel_vm();
> > > > goto out;
> > > > }
> > >
> > > *not this*
> >
> > I don't understand. Are you saying the previous block of code is good
> > and this one is bad?
>
> No, I was saying that the above block of code is a functional change,
> but I was also pointing out other areas which were not and could be
> folded into a separate atomic patch where no functionality changes.
>
> > > > @@ -246,12 +255,10 @@ unsigned long segv(struct faultinfo fi, unsigned long ip, int is_user,
> > > > address = 0;
> > > > }
> > > >
> > > > - catcher = current->thread.fault_catcher;
> > > > if (!err)
> > > > goto out;
> > > > else if (catcher != NULL) {
> > > > - current->thread.fault_addr = (void *) address;
> > > > - UML_LONGJMP(catcher, 1);
> > > > + segv_run_catcher(catcher, (void *) address);
> > > > }
> > > > else if (current->thread.fault_addr != NULL)
> > > > panic("fault_addr set but no fault catcher");
> > >
> > > But with this seems one atomic change which should be submitted
> > > separately, its just a helper. Think it would make the actual
> > > change needed easier to review, ie, your needed changes would
> > > be smaller and clearer for what you need.
> >
> > Are you suggesting that I pull out the bits needed to implement abort
> > in the next patch and squash it into this one?
>
> No, I'm suggesting you can probably split this patch in 2, one which
> wraps things with no functional changes, and another which adds your
> changes.
>
That makes sense.
Thanks for the clarification!
next prev parent reply other threads:[~2018-12-04 0:44 UTC|newest]
Thread overview: 232+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-28 19:36 [RFC v3 00/19] kunit: introduce KUnit, the Linux kernel unit testing framework brendanhiggins
2018-11-28 19:36 ` Brendan Higgins
2018-11-28 19:36 ` [RFC v3 01/19] kunit: test: add KUnit test runner core brendanhiggins
2018-11-28 19:36 ` Brendan Higgins
2018-11-30 3:14 ` mcgrof
2018-11-30 3:14 ` Luis Chamberlain
2018-12-01 1:51 ` brendanhiggins
2018-12-01 1:51 ` Brendan Higgins
2018-12-01 2:57 ` mcgrof
2018-12-01 2:57 ` Luis Chamberlain
2018-12-05 13:15 ` anton.ivanov
2018-12-05 13:15 ` Anton Ivanov
2018-12-05 14:45 ` arnd
2018-12-05 14:45 ` Arnd Bergmann
2018-12-05 14:49 ` anton.ivanov
2018-12-05 14:49 ` Anton Ivanov
2018-11-30 3:28 ` mcgrof
2018-11-30 3:28 ` Luis Chamberlain
2018-12-01 2:08 ` brendanhiggins
2018-12-01 2:08 ` Brendan Higgins
2018-12-01 3:10 ` mcgrof
2018-12-01 3:10 ` Luis Chamberlain
2018-12-03 22:47 ` brendanhiggins
2018-12-03 22:47 ` Brendan Higgins
2018-12-01 3:02 ` mcgrof
2018-12-01 3:02 ` Luis Chamberlain
2018-11-28 19:36 ` [RFC v3 02/19] kunit: test: add test resource management API brendanhiggins
2018-11-28 19:36 ` Brendan Higgins
2018-11-28 19:36 ` [RFC v3 03/19] kunit: test: add string_stream a std::stream like string builder brendanhiggins
2018-11-28 19:36 ` Brendan Higgins
2018-11-30 3:29 ` mcgrof
2018-11-30 3:29 ` Luis Chamberlain
2018-12-01 2:14 ` brendanhiggins
2018-12-01 2:14 ` Brendan Higgins
2018-12-01 3:12 ` mcgrof
2018-12-01 3:12 ` Luis Chamberlain
2018-12-03 10:55 ` pmladek
2018-12-03 10:55 ` Petr Mladek
2018-12-04 0:35 ` brendanhiggins
2018-12-04 0:35 ` Brendan Higgins
2018-11-28 19:36 ` [RFC v3 04/19] kunit: test: add test_stream a std::stream like logger brendanhiggins
2018-11-28 19:36 ` Brendan Higgins
2018-11-28 19:36 ` [RFC v3 05/19] kunit: test: add the concept of expectations brendanhiggins
2018-11-28 19:36 ` Brendan Higgins
2018-11-28 19:36 ` [RFC v3 06/19] arch: um: enable running kunit from User Mode Linux brendanhiggins
2018-11-28 19:36 ` Brendan Higgins
2018-11-28 21:26 ` robh
2018-11-28 21:26 ` Rob Herring
2018-11-30 3:37 ` mcgrof
2018-11-30 3:37 ` Luis Chamberlain
2018-11-30 14:05 ` robh
2018-11-30 14:05 ` Rob Herring
2018-11-30 18:22 ` mcgrof
2018-11-30 18:22 ` Luis Chamberlain
2018-12-03 23:22 ` brendanhiggins
2018-12-03 23:22 ` Brendan Higgins
2018-11-30 3:30 ` mcgrof
2018-11-30 3:30 ` Luis Chamberlain
2018-11-28 19:36 ` [RFC v3 07/19] kunit: test: add initial tests brendanhiggins
2018-11-28 19:36 ` Brendan Higgins
2018-11-30 3:40 ` mcgrof
2018-11-30 3:40 ` Luis Chamberlain
2018-12-03 23:26 ` brendanhiggins
2018-12-03 23:26 ` Brendan Higgins
2018-12-03 23:43 ` mcgrof
2018-12-03 23:43 ` Luis Chamberlain
2018-11-28 19:36 ` [RFC v3 08/19] arch: um: add shim to trap to allow installing a fault catcher for tests brendanhiggins
2018-11-28 19:36 ` Brendan Higgins
2018-11-30 3:34 ` mcgrof
2018-11-30 3:34 ` Luis Chamberlain
2018-12-03 23:34 ` brendanhiggins
2018-12-03 23:34 ` Brendan Higgins
2018-12-03 23:46 ` mcgrof
2018-12-03 23:46 ` Luis Chamberlain
2018-12-04 0:44 ` brendanhiggins [this message]
2018-12-04 0:44 ` Brendan Higgins
2018-11-30 3:41 ` mcgrof
2018-11-30 3:41 ` Luis Chamberlain
2018-12-03 23:37 ` brendanhiggins
2018-12-03 23:37 ` Brendan Higgins
2018-11-28 19:36 ` [RFC v3 09/19] kunit: test: add the concept of assertions brendanhiggins
2018-11-28 19:36 ` Brendan Higgins
2018-11-28 19:36 ` [RFC v3 10/19] kunit: test: add test managed resource tests brendanhiggins
2018-11-28 19:36 ` Brendan Higgins
2018-11-28 19:36 ` [RFC v3 11/19] kunit: add Python libraries for handing KUnit config and kernel brendanhiggins
2018-11-28 19:36 ` Brendan Higgins
2018-11-29 13:54 ` kieran.bingham
2018-11-29 13:54 ` Kieran Bingham
2018-12-03 23:48 ` brendanhiggins
2018-12-03 23:48 ` Brendan Higgins
2018-12-04 20:47 ` mcgrof
2018-12-04 20:47 ` Luis Chamberlain
2018-12-06 12:32 ` kieran.bingham
2018-12-06 12:32 ` Kieran Bingham
2018-12-06 15:37 ` willy
2018-12-06 15:37 ` Matthew Wilcox
2018-12-07 11:30 ` kieran.bingham
2018-12-07 11:30 ` Kieran Bingham
2018-12-11 14:09 ` pmladek
2018-12-11 14:09 ` Petr Mladek
2018-12-11 14:41 ` rostedt
2018-12-11 14:41 ` Steven Rostedt
2018-12-11 17:01 ` anton.ivanov
2018-12-11 17:01 ` Anton Ivanov
2019-02-09 0:40 ` brendanhiggins
2019-02-09 0:40 ` Brendan Higgins
2018-12-07 1:05 ` mcgrof
2018-12-07 1:05 ` Luis Chamberlain
2018-12-07 18:35 ` kent.overstreet
2018-12-07 18:35 ` Kent Overstreet
2018-11-30 3:44 ` mcgrof
2018-11-30 3:44 ` Luis Chamberlain
2018-12-03 23:50 ` brendanhiggins
2018-12-03 23:50 ` Brendan Higgins
2018-12-04 20:48 ` mcgrof
2018-12-04 20:48 ` Luis Chamberlain
2018-11-28 19:36 ` [RFC v3 12/19] kunit: add KUnit wrapper script and simple output parser brendanhiggins
2018-11-28 19:36 ` Brendan Higgins
2018-11-28 19:36 ` [RFC v3 13/19] kunit: improve output from python wrapper brendanhiggins
2018-11-28 19:36 ` Brendan Higgins
2018-11-28 19:36 ` [RFC v3 14/19] Documentation: kunit: add documentation for KUnit brendanhiggins
2018-11-28 19:36 ` Brendan Higgins
2018-11-29 13:56 ` kieran.bingham
2018-11-29 13:56 ` Kieran Bingham
2018-11-30 3:45 ` mcgrof
2018-11-30 3:45 ` Luis Chamberlain
2018-12-03 23:53 ` brendanhiggins
2018-12-03 23:53 ` Brendan Higgins
2018-12-06 12:16 ` kieran.bingham
2018-12-06 12:16 ` Kieran Bingham
2019-02-09 0:56 ` brendanhiggins
2019-02-09 0:56 ` Brendan Higgins
2019-02-11 12:16 ` kieran.bingham
2019-02-11 12:16 ` Kieran Bingham
2019-02-12 22:10 ` brendanhiggins
2019-02-12 22:10 ` Brendan Higgins
2019-02-13 21:55 ` kieran.bingham
2019-02-13 21:55 ` Kieran Bingham
2019-02-14 0:17 ` brendanhiggins
2019-02-14 0:17 ` Brendan Higgins
2019-02-14 17:26 ` mcgrof
2019-02-14 17:26 ` Luis Chamberlain
2019-02-14 22:07 ` brendanhiggins
2019-02-14 22:07 ` Brendan Higgins
2018-11-28 19:36 ` [RFC v3 15/19] MAINTAINERS: add entry for KUnit the unit testing framework brendanhiggins
2018-11-28 19:36 ` Brendan Higgins
2018-11-28 19:36 ` [RFC v3 16/19] arch: um: make UML unflatten device tree when testing brendanhiggins
2018-11-28 19:36 ` Brendan Higgins
2018-11-28 21:16 ` robh
2018-11-28 21:16 ` Rob Herring
2018-12-04 0:00 ` brendanhiggins
2018-12-04 0:00 ` Brendan Higgins
2018-11-30 3:46 ` mcgrof
2018-11-30 3:46 ` Luis Chamberlain
2018-12-04 0:02 ` brendanhiggins
2018-12-04 0:02 ` Brendan Higgins
2018-11-28 19:36 ` [RFC v3 17/19] of: unittest: migrate tests to run on KUnit brendanhiggins
2018-11-28 19:36 ` Brendan Higgins
[not found] ` <CAL_Jsq+09Kx7yMBC_Jw45QGmk6U_fp4N6HOZDwYrM4tWw+_dOA@mail.gmail.com>
2018-11-30 0:39 ` rdunlap
2018-11-30 0:39 ` Randy Dunlap
2018-12-04 0:13 ` brendanhiggins
2018-12-04 0:13 ` Brendan Higgins
2018-12-04 13:40 ` robh
2018-12-04 13:40 ` Rob Herring
2018-12-05 23:42 ` brendanhiggins
2018-12-05 23:42 ` Brendan Higgins
2018-12-07 0:41 ` robh
2018-12-07 0:41 ` Rob Herring
2018-12-04 0:08 ` brendanhiggins
2018-12-04 0:08 ` Brendan Higgins
2019-02-13 1:44 ` brendanhiggins
2019-02-13 1:44 ` Brendan Higgins
2019-02-14 20:10 ` robh
2019-02-14 20:10 ` Rob Herring
2019-02-14 21:52 ` brendanhiggins
2019-02-14 21:52 ` Brendan Higgins
2019-02-18 22:56 ` frowand.list
2019-02-18 22:56 ` Frank Rowand
2019-02-28 0:29 ` brendanhiggins
2019-02-28 0:29 ` Brendan Higgins
2018-12-04 10:56 ` frowand.list
2018-12-04 10:56 ` Frank Rowand
2018-11-28 19:36 ` [RFC v3 18/19] of: unittest: split out a couple of test cases from unittest brendanhiggins
2018-11-28 19:36 ` Brendan Higgins
2018-12-04 10:58 ` frowand.list
2018-12-04 10:58 ` Frank Rowand
2018-12-05 23:54 ` brendanhiggins
2018-12-05 23:54 ` Brendan Higgins
2019-02-14 23:57 ` frowand.list
2019-02-14 23:57 ` Frank Rowand
2019-02-15 0:56 ` brendanhiggins
2019-02-15 0:56 ` Brendan Higgins
2019-02-15 2:05 ` frowand.list
2019-02-15 2:05 ` Frank Rowand
2019-02-15 10:56 ` brendanhiggins
2019-02-15 10:56 ` Brendan Higgins
2019-02-18 22:25 ` frowand.list
2019-02-18 22:25 ` Frank Rowand
2019-02-20 20:44 ` frowand.list
2019-02-20 20:44 ` Frank Rowand
2019-02-20 20:47 ` frowand.list
2019-02-20 20:47 ` Frank Rowand
2019-02-28 3:52 ` brendanhiggins
2019-02-28 3:52 ` Brendan Higgins
2019-03-22 0:22 ` frowand.list
2019-03-22 0:22 ` Frank Rowand
2019-03-22 1:30 ` brendanhiggins
2019-03-22 1:30 ` Brendan Higgins
2019-03-22 1:47 ` frowand.list
2019-03-22 1:47 ` Frank Rowand
2019-03-25 22:15 ` brendanhiggins
2019-03-25 22:15 ` Brendan Higgins
2019-09-20 16:57 ` Rob Herring
2019-09-21 23:57 ` Frank Rowand
2019-03-22 1:34 ` frowand.list
2019-03-22 1:34 ` Frank Rowand
2019-03-25 22:18 ` brendanhiggins
2019-03-25 22:18 ` Brendan Higgins
2018-11-28 19:36 ` [RFC v3 19/19] of: unittest: split up some super large test cases brendanhiggins
2018-11-28 19:36 ` Brendan Higgins
2018-12-04 10:52 ` [RFC v3 00/19] kunit: introduce KUnit, the Linux kernel unit testing framework frowand.list
2018-12-04 10:52 ` Frank Rowand
2018-12-04 11:40 ` frowand.list
2018-12-04 11:40 ` Frank Rowand
2018-12-04 13:49 ` robh
2018-12-04 13:49 ` Rob Herring
2018-12-05 23:10 ` brendanhiggins
2018-12-05 23:10 ` Brendan Higgins
2019-03-22 0:27 ` frowand.list
2019-03-22 0:27 ` Frank Rowand
2019-03-25 22:04 ` brendanhiggins
2019-03-25 22:04 ` Brendan Higgins
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=CAFd5g45p55GXuk-PcaknVHywJ25LsM+7N83L_g0ob6Q0FTwSrg@mail.gmail.com \
--to=linux-kselftest@vger.kernel.org \
/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 NNTP newsgroup(s).