From: Damien Le Moal <dlemoal@kernel.org>
To: Bjorn Helgaas <bhelgaas@google.com>, linux-pci@vger.kernel.org
Cc: "Rick Wertenbroek" <rick.wertenbroek@gmail.com>,
"Lorenzo Pieralisi" <lpieralisi@kernel.org>,
"Krzysztof Wilczyński" <kw@linux.com>,
"Manivannan Sadhasivam" <mani@kernel.org>,
"Kishon Vijay Abraham I" <kishon@kernel.org>,
"Arnd Bergmann" <arnd@arndb.de>,
"Greg Kroah-Hartman" <gregkh@linuxfoundation.org>
Subject: [PATCH v5 09/17] PCI: epf-test: Improve handling of command and status registers
Date: Sat, 15 Apr 2023 11:35:34 +0900 [thread overview]
Message-ID: <20230415023542.77601-10-dlemoal@kernel.org> (raw)
In-Reply-To: <20230415023542.77601-1-dlemoal@kernel.org>
The pci-epf-test driver uses the test register BAR memory directly
to get and execute a test registers set by the RC side and defined
using a struct pci_epf_test_reg. This direct use relies on using the
register BAR address as a pointer to a struct pci_epf_test_reg to
execute the test case and to send back the test result through the
status field of struct pci_epf_test_reg. In practice, the status field
is always updated before an interrupt is raised in
pci_epf_test_raise_irq(), to ensure that the RC side sees the updated
status when receiving an interrupt.
However, such assignment direct access does not ensure that changes to
the status register make it to memory, and so visible to the host,
before an interrupt is raised, thus potentially resulting in the RC
host not seeing the correct status result for a test.
Avoid this potential problem by using READ_ONCE()/WRITE_ONCE() when
accessing the command and status fields of a pci_epf_test_reg structure.
This ensure that a test start (pci_epf_test_cmd_handler() function) and
completion (with the function pci_epf_test_raise_irq()) achieve a correct
synchronization with the MMIO register accesses on the RC host.
Signed-off-by: Damien Le Moal <dlemoal@kernel.org>
Reviewed-by: Manivannan Sadhasivam <mani@kernel.org>
---
drivers/pci/endpoint/functions/pci-epf-test.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/drivers/pci/endpoint/functions/pci-epf-test.c b/drivers/pci/endpoint/functions/pci-epf-test.c
index ee90ba3a957b..fa48e9b3c393 100644
--- a/drivers/pci/endpoint/functions/pci-epf-test.c
+++ b/drivers/pci/endpoint/functions/pci-epf-test.c
@@ -613,9 +613,14 @@ static void pci_epf_test_raise_irq(struct pci_epf_test *epf_test,
struct pci_epf *epf = epf_test->epf;
struct device *dev = &epf->dev;
struct pci_epc *epc = epf->epc;
+ u32 status = reg->status | STATUS_IRQ_RAISED;
int count;
- reg->status |= STATUS_IRQ_RAISED;
+ /*
+ * Set the status before raising the IRQ to ensure that the host sees
+ * the updated value when it gets the IRQ.
+ */
+ WRITE_ONCE(reg->status, status);
switch (reg->irq_type) {
case IRQ_TYPE_LEGACY:
@@ -659,12 +664,12 @@ static void pci_epf_test_cmd_handler(struct work_struct *work)
enum pci_barno test_reg_bar = epf_test->test_reg_bar;
struct pci_epf_test_reg *reg = epf_test->reg[test_reg_bar];
- command = reg->command;
+ command = READ_ONCE(reg->command);
if (!command)
goto reset_handler;
- reg->command = 0;
- reg->status = 0;
+ WRITE_ONCE(reg->command, 0);
+ WRITE_ONCE(reg->status, 0);
if (reg->irq_type > IRQ_TYPE_MSIX) {
dev_err(dev, "Failed to detect IRQ type\n");
--
2.39.2
next prev parent reply other threads:[~2023-04-15 2:36 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-15 2:35 [PATCH v5 00/17] PCI endpoint fixes and improvements Damien Le Moal
2023-04-15 2:35 ` [PATCH v5 01/17] PCI: endpoint: Automatically create a function specific attributes group Damien Le Moal
2023-04-15 2:35 ` [PATCH v5 02/17] PCI: endpoint: Move pci_epf_type_add_cfs() code Damien Le Moal
2023-04-15 2:35 ` [PATCH v5 03/17] PCI: epf-test: Fix DMA transfer completion initialization Damien Le Moal
2023-04-15 2:35 ` [PATCH v5 04/17] PCI: epf-test: Fix DMA transfer completion detection Damien Le Moal
2023-04-15 2:35 ` [PATCH v5 05/17] PCI: epf-test: Use dmaengine_submit() to initiate DMA transfer Damien Le Moal
2023-04-15 2:35 ` [PATCH v5 06/17] PCI: epf-test: Simplify read/write/copy test functions Damien Le Moal
2023-04-15 2:35 ` [PATCH v5 07/17] PCI: epf-test: Simplify pci_epf_test_raise_irq() Damien Le Moal
2023-04-15 2:35 ` [PATCH v5 08/17] PCI: epf-test: Simplify IRQ test commands execution Damien Le Moal
2023-04-15 2:35 ` Damien Le Moal [this message]
2023-04-15 2:35 ` [PATCH v5 10/17] PCI: epf-test: Cleanup pci_epf_test_cmd_handler() Damien Le Moal
2023-04-15 2:35 ` [PATCH v5 11/17] PCI: epf-test: Cleanup request result handling Damien Le Moal
2023-04-15 2:35 ` [PATCH v5 12/17] PCI: epf-test: Simplify DMA support checks Damien Le Moal
2023-04-15 2:35 ` [PATCH v5 13/17] PCI: epf-test: Simplify transfers result print Damien Le Moal
2023-04-15 2:35 ` [PATCH v5 14/17] misc: pci_endpoint_test: Free IRQs before removing the device Damien Le Moal
2023-04-15 2:35 ` [PATCH v5 15/17] misc: pci_endpoint_test: Re-init completion for every test Damien Le Moal
2023-04-15 2:35 ` [PATCH v5 16/17] misc: pci_endpoint_test: Do not write status in IRQ handler Damien Le Moal
2023-04-15 2:35 ` [PATCH v5 17/17] misc: pci_endpoint_test: Simplify pci_endpoint_test_msi_irq() Damien Le Moal
2023-04-21 10:10 ` [PATCH v5 00/17] PCI endpoint fixes and improvements Lorenzo Pieralisi
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=20230415023542.77601-10-dlemoal@kernel.org \
--to=dlemoal@kernel.org \
--cc=arnd@arndb.de \
--cc=bhelgaas@google.com \
--cc=gregkh@linuxfoundation.org \
--cc=kishon@kernel.org \
--cc=kw@linux.com \
--cc=linux-pci@vger.kernel.org \
--cc=lpieralisi@kernel.org \
--cc=mani@kernel.org \
--cc=rick.wertenbroek@gmail.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.