From: Damien Le Moal <damien.lemoal@opensource.wdc.com>
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 06/12] pci: epf-test: Simplify transfers result print
Date: Wed, 15 Feb 2023 12:21:49 +0900 [thread overview]
Message-ID: <20230215032155.74993-7-damien.lemoal@opensource.wdc.com> (raw)
In-Reply-To: <20230215032155.74993-1-damien.lemoal@opensource.wdc.com>
In pci_epf_test_print_rate(), instead of open coding a reduction loop to
allow for a disivision by a 32-bits ns value, simply use div64_u64() to
calculate the rate. To match the printed unit of KB/s, this calculation
divides the rate by 1000 instead of 1024 (that would be KiB/s unit).
The format of the results printed by pci_epf_test_print_rate() is also
changed to be more compact without the double new line. dev_info() is
used instead of pr_info().
Signed-off-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
---
drivers/pci/endpoint/functions/pci-epf-test.c | 42 ++++++++-----------
1 file changed, 17 insertions(+), 25 deletions(-)
diff --git a/drivers/pci/endpoint/functions/pci-epf-test.c b/drivers/pci/endpoint/functions/pci-epf-test.c
index e07868c99531..f630393e8208 100644
--- a/drivers/pci/endpoint/functions/pci-epf-test.c
+++ b/drivers/pci/endpoint/functions/pci-epf-test.c
@@ -297,34 +297,23 @@ static void pci_epf_test_clean_dma_chan(struct pci_epf_test *epf_test)
return;
}
-static void pci_epf_test_print_rate(const char *ops, u64 size,
+static void pci_epf_test_print_rate(struct pci_epf_test *epf_test,
+ const char *op, u64 size,
struct timespec64 *start,
struct timespec64 *end, bool dma)
{
- struct timespec64 ts;
- u64 rate, ns;
-
- ts = timespec64_sub(*end, *start);
-
- /* convert both size (stored in 'rate') and time in terms of 'ns' */
- ns = timespec64_to_ns(&ts);
- rate = size * NSEC_PER_SEC;
-
- /* Divide both size (stored in 'rate') and ns by a common factor */
- while (ns > UINT_MAX) {
- rate >>= 1;
- ns >>= 1;
- }
-
- if (!ns)
- return;
+ struct timespec64 ts = timespec64_sub(*end, *start);
+ u64 rate = 0, ns;
/* calculate the rate */
- do_div(rate, (uint32_t)ns);
+ ns = timespec64_to_ns(&ts);
+ if (ns)
+ rate = div64_u64(size * NSEC_PER_SEC, ns * 1000);
- pr_info("\n%s => Size: %llu bytes\t DMA: %s\t Time: %llu.%09u seconds\t"
- "Rate: %llu KB/s\n", ops, size, dma ? "YES" : "NO",
- (u64)ts.tv_sec, (u32)ts.tv_nsec, rate / 1024);
+ dev_info(&epf_test->epf->dev,
+ "%s => Size: %llu B, DMA: %s, Time: %llu.%09u s, Rate: %llu KB/s\n",
+ op, size, dma ? "YES" : "NO",
+ (u64)ts.tv_sec, (u32)ts.tv_nsec, rate);
}
static int pci_epf_test_copy(struct pci_epf_test *epf_test, bool use_dma)
@@ -400,7 +389,8 @@ static int pci_epf_test_copy(struct pci_epf_test *epf_test, bool use_dma)
kfree(buf);
}
ktime_get_ts64(&end);
- pci_epf_test_print_rate("COPY", reg->size, &start, &end, use_dma);
+ pci_epf_test_print_rate(epf_test, "COPY", reg->size, &start, &end,
+ use_dma);
err_map_addr:
pci_epc_unmap_addr(epc, epf->func_no, epf->vfunc_no, dst_phys_addr);
@@ -481,7 +471,8 @@ static int pci_epf_test_read(struct pci_epf_test *epf_test, bool use_dma)
ktime_get_ts64(&end);
}
- pci_epf_test_print_rate("READ", reg->size, &start, &end, use_dma);
+ pci_epf_test_print_rate(epf_test, "READ", reg->size, &start, &end,
+ use_dma);
crc32 = crc32_le(~0, buf, reg->size);
if (crc32 != reg->checksum)
@@ -567,7 +558,8 @@ static int pci_epf_test_write(struct pci_epf_test *epf_test, bool use_dma)
ktime_get_ts64(&end);
}
- pci_epf_test_print_rate("WRITE", reg->size, &start, &end, use_dma);
+ pci_epf_test_print_rate(epf_test, "WRITE", reg->size, &start, &end,
+ use_dma);
/*
* wait 1ms inorder for the write to complete. Without this delay L3
--
2.39.1
next prev parent reply other threads:[~2023-02-15 3:22 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-15 3:21 [PATCH 00/12] PCI endpoint fixes and improvements Damien Le Moal
2023-02-15 3:21 ` [PATCH 01/12] pci: endpoint: Automatically create a function type attributes group Damien Le Moal
2023-02-16 10:04 ` Manivannan Sadhasivam
2023-02-16 12:31 ` Damien Le Moal
2023-02-15 3:21 ` [PATCH 02/12] pci: endpoint: do not export pci_epf_type_add_cfs() Damien Le Moal
2023-02-16 10:15 ` Manivannan Sadhasivam
2023-02-16 12:33 ` Damien Le Moal
2023-02-15 3:21 ` [PATCH 03/12] pci: epf-test: Fix DMA transfer completion detection Damien Le Moal
2023-02-16 10:18 ` Manivannan Sadhasivam
2023-02-15 3:21 ` [PATCH 04/12] pci: epf-test: Use driver registers as volatile Damien Le Moal
2023-02-16 10:23 ` Manivannan Sadhasivam
2023-02-15 3:21 ` [PATCH 05/12] pci: epf-test: Simplify dma support checks Damien Le Moal
2023-02-16 10:27 ` Manivannan Sadhasivam
2023-02-15 3:21 ` Damien Le Moal [this message]
2023-02-16 10:39 ` [PATCH 06/12] pci: epf-test: Simplify transfers result print Manivannan Sadhasivam
2023-02-15 3:21 ` [PATCH 07/12] pci: epf-test: Add debug and error messages Damien Le Moal
2023-02-15 11:34 ` Greg Kroah-Hartman
2023-02-15 11:44 ` Damien Le Moal
2023-02-15 11:34 ` Greg Kroah-Hartman
2023-02-15 11:45 ` Damien Le Moal
2023-02-15 12:01 ` Greg Kroah-Hartman
2023-02-15 12:18 ` Damien Le Moal
2023-02-15 13:24 ` Greg Kroah-Hartman
2023-02-15 13:49 ` Arnd Bergmann
2023-02-15 22:55 ` Damien Le Moal
2023-02-15 3:21 ` [PATCH 08/12] misc: pci_endpoint_test: Free IRQs before removing the device Damien Le Moal
2023-02-16 10:46 ` Manivannan Sadhasivam
2023-02-15 3:21 ` [PATCH 09/12] misc: pci_endpoint_test: Do not write status in IRQ handler Damien Le Moal
2023-02-16 10:51 ` Manivannan Sadhasivam
2023-02-15 3:21 ` [PATCH 10/12] misc: pci_endpoint_test: Re-init completion for every test Damien Le Moal
2023-02-16 10:55 ` Manivannan Sadhasivam
2023-02-16 12:35 ` Damien Le Moal
2023-02-15 3:21 ` [PATCH 11/12] misc: pci_endpoint_test: Simplify pci_endpoint_test_msi_irq() Damien Le Moal
2023-02-16 10:57 ` Manivannan Sadhasivam
2023-02-15 3:21 ` [PATCH 12/12] misc: pci_endpoint_test: Add debug and error messages Damien Le Moal
2023-02-15 11:34 ` Greg Kroah-Hartman
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=20230215032155.74993-7-damien.lemoal@opensource.wdc.com \
--to=damien.lemoal@opensource.wdc.com \
--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 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).