From: Keith Busch <keith.busch@intel.com>
To: Bjorn Helgaas <helgaas@kernel.org>
Cc: linux-pci@vger.kernel.org
Subject: Re: [PATCH 3/3] PCI/AER: Covertly inject errors with ftrace hooks
Date: Thu, 11 Oct 2018 11:45:16 -0600 [thread overview]
Message-ID: <20181011174516.GE11034@localhost.localdomain> (raw)
In-Reply-To: <20181011170826.GR5906@bhelgaas-glaptop.roam.corp.google.com>
On Thu, Oct 11, 2018 at 12:08:26PM -0500, Bjorn Helgaas wrote:
> On Thu, Oct 11, 2018 at 10:52:07AM -0600, Keith Busch wrote:
> > The aer_inject module had been intercepting config requests by overwriting
> > the config accessor operations in the pci_bus ops. This has several
> > issues.
> >
> > First, the module was tracking kernel objects unbeknownst to the drivers
> > that own them. The kernel may free those devices, leaving the AER inject
> > module holding stale references and no way to know that happened.
> >
> > Second, the PCI enumeration has child devices inherit pci_bus ops from
> > the parent bus. Since errors may lead to link resets that trigger
> > re-enumeration, the child devices would inherit operations that don't
> > know about the devices using them, causing kernel crashes.
> >
> > Finally, CONFIG_PCI_LOCKLESS_CONFIG doesn't block accessing the pci_bus
> > ops, so it's racing with potential in-flight config requests.
> >
> > This patch uses a different error injection approach leveraging ftrace
> > to thunk the config space functions. If the kernel and architecture
> > are capable, the ftrace hook will overwrite the processor's function
> > call address with the address of the error injecting function. This way
> > doesn't modify or track driver structures, fixing the issues with the
> > current method.
> >
> > If either the kernel config or platform arch do not support the necessary
> > ftrace capabilities, the aer_inject module will fallback to the older
> > way so that it may continue to be used as before.
> >
> > Signed-off-by: Keith Busch <keith.busch@intel.com>
> > ---
> > drivers/pci/pcie/aer_inject.c | 218 ++++++++++++++++++++++++++++++++++++------
> > 1 file changed, 189 insertions(+), 29 deletions(-)
> >
> > diff --git a/drivers/pci/pcie/aer_inject.c b/drivers/pci/pcie/aer_inject.c
> > index 726987f8d53c..4825fa465b60 100644
> > --- a/drivers/pci/pcie/aer_inject.c
> > +++ b/drivers/pci/pcie/aer_inject.c
>
> > +static int aer_inj_legacy_read(struct pci_bus *bus, unsigned int devfn,
> > + int where, int size, u32 *val)
> > +{
> > + struct pci_ops *ops, *my_ops;
> > + int rv;
> > +
> > + ops = __find_pci_bus_ops(bus);
> > + if (!ops)
> > + return -1;
> > +
> > + my_ops = bus->ops;
> > + bus->ops = ops;
> > + rv = ops->read(bus, devfn, where, size, val);
> > + bus->ops = my_ops;
> > +
> > + return rv;
> > +}
> > +
> > +static int aer_inj_legacy_write(struct pci_bus *bus, unsigned int devfn,
> > + int where, int size, u32 val)
> > +{
> > + struct pci_ops *ops, *my_ops;
> > + int rv;
> > +
> > + ops = __find_pci_bus_ops(bus);
> > + if (!ops)
> > + return -1;
> > +
> > + my_ops = bus->ops;
> > + bus->ops = ops;
> > + rv = ops->write(bus, devfn, where, size, val);
> > + bus->ops = my_ops;
> > +
> > + return rv;
> > +}
>
> Is there any chance you could split this into two (or more) patches?
>
> The part above looks like pretty straightforward code movement without
> any functional change. It would be nice to get that part out of the way,
> then have a smaller patch that adds the fancy ftrace stuff.
No problem, will do.
prev parent reply other threads:[~2018-10-11 17:49 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-11 16:52 [PATCH 0/3] aer inject updates Keith Busch
2018-10-11 16:52 ` [PATCH 1/3] PCI/AER: Reuse existing pcie_port_find_device() interface Keith Busch
2018-10-11 16:52 ` [PATCH 2/3] PCI/AER: Abstract AER interrupt handling Keith Busch
2018-10-11 16:52 ` [PATCH 3/3] PCI/AER: Covertly inject errors with ftrace hooks Keith Busch
2018-10-11 17:08 ` Bjorn Helgaas
2018-10-11 17:45 ` Keith Busch [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=20181011174516.GE11034@localhost.localdomain \
--to=keith.busch@intel.com \
--cc=helgaas@kernel.org \
--cc=linux-pci@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).