[PATCH v2 00/15] NTB: Add full multi-port API support to the test drivers

[PATCH v2 00/15] NTB: Add full multi-port API support to the test drivers

[Serge Semin]

The multi-port NTB API was introduced in kernel 4.13 as well as the
first driver for the true multi-port devices of IDT PCIe-switches
series. But the test drivers still were left almost unchanged. Yes,
they didn't fail being used with new NTB API, but they only worked
with two-ports NTB devices. This patchset is intended to fix the
issue, by amending the NTB test drivers and script so they would be
fully compatible with multi-port NTB API.

Additionally I found a few NTB subsystem issues while developing the
submitted patches. So they are also fixed in this patchset.

Serge Semin (15):
  NTB: Rename NTB messaging API methods
  NTB: Set dma mask and dma coherent mask to NTB devices
  NTB: Fix UB/bug in ntb_mw_get_align()
  NTB: ntb_pp: Add full multi-port NTB API support
  NTB: ntb_tool: Add full multi-port NTB API support
  NTB: ntb_perf: Add full multi-port NTB API support
  NTB: ntb_test: Safely use paths with whitespace
  NTB: ntb_test: Add ntb_tool port tests
  NTB: ntb_test: Update ntb_tool link tests
  NTB: ntb_test: Update ntb_tool DB tests
  NTB: ntb_test: Update ntb_tool Scratchpad tests
  NTB: ntb_test: Add ntb_tool Message tests
  NTB: ntb_test: Update ntb_tool MW tests
  NTB: ntb_test: Update ntb_perf tests
  NTB: ntb_hw_idt: Set NTB_TOPO_SWITCH topology

 drivers/ntb/hw/amd/ntb_hw_amd.c         |    4 +
 drivers/ntb/hw/idt/ntb_hw_idt.c         |   37 +-
 drivers/ntb/hw/intel/ntb_hw_intel.c     |    4 +
 drivers/ntb/ntb.c                       |    1 -
 drivers/ntb/test/ntb_perf.c             | 1826 +++++++++++++++++++++----------
 drivers/ntb/test/ntb_pingpong.c         |  450 +++++---
 drivers/ntb/test/ntb_tool.c             | 1805 ++++++++++++++++++++----------
 include/linux/ntb.h                     |   36 +-
 tools/testing/selftests/ntb/ntb_test.sh |  307 ++++--
 9 files changed, 3013 insertions(+), 1457 deletions(-)

-- 
2.12.0

[PATCH v2 01/15] NTB: Rename NTB messaging API methods

[Serge Semin]

There is a common methods signature form used over all the NTB API
like functions naming scheme, arguments names and order, etc.
Recently added NTB messaging API IO callbacks were named a bit
different so should be renamed to be in compliance with the rest
of the API. The changes are made in a way so the developers won't
be able to compile their code without being informed by the compiler.

Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
---
 drivers/ntb/hw/idt/ntb_hw_idt.c | 27 ++++++++++++---------------
 include/linux/ntb.h             | 34 ++++++++++++++++------------------
 2 files changed, 28 insertions(+), 33 deletions(-)

diff --git a/drivers/ntb/hw/idt/ntb_hw_idt.c b/drivers/ntb/hw/idt/ntb_hw_idt.c
index 0cd79f367f7c..6fb87c0f0d97 100644
--- a/drivers/ntb/hw/idt/ntb_hw_idt.c
+++ b/drivers/ntb/hw/idt/ntb_hw_idt.c
@@ -1744,20 +1744,19 @@ static int idt_ntb_msg_clear_mask(struct ntb_dev *ntb, u64 mask_bits)
  * idt_ntb_msg_read() - read message register with specified index
  *			(NTB API callback)
  * @ntb:	NTB device context.
- * @midx:	Message register index
  * @pidx:	OUT - Port index of peer device a message retrieved from
- * @msg:	OUT - Data
+ * @midx:	Message register index
  *
  * Read data from the specified message register and source register.
  *
- * Return: zero on success, negative error if invalid argument passed.
+ * Return: inbound message register value.
  */
-static int idt_ntb_msg_read(struct ntb_dev *ntb, int midx, int *pidx, u32 *msg)
+static u32 idt_ntb_msg_read(struct ntb_dev *ntb, int *pidx, int midx)
 {
 	struct idt_ntb_dev *ndev = to_ndev_ntb(ntb);
 
 	if (midx < 0 || IDT_MSG_CNT <= midx)
-		return -EINVAL;
+		return (u32)-1;
 
 	/* Retrieve source port index of the message */
 	if (pidx != NULL) {
@@ -1772,18 +1771,15 @@ static int idt_ntb_msg_read(struct ntb_dev *ntb, int midx, int *pidx, u32 *msg)
 	}
 
 	/* Retrieve data of the corresponding message register */
-	if (msg != NULL)
-		*msg = idt_nt_read(ndev, ntdata_tbl.msgs[midx].in);
-
-	return 0;
+	return idt_nt_read(ndev, ntdata_tbl.msgs[midx].in);
 }
 
 /*
- * idt_ntb_msg_write() - write data to the specified message register
- *			 (NTB API callback)
+ * idt_ntb_peer_msg_write() - write data to the specified message register
+ *			      (NTB API callback)
  * @ntb:	NTB device context.
- * @midx:	Message register index
  * @pidx:	Port index of peer device a message being sent to
+ * @midx:	Message register index
  * @msg:	Data to send
  *
  * Just try to send data to a peer. Message status register should be
@@ -1791,7 +1787,8 @@ static int idt_ntb_msg_read(struct ntb_dev *ntb, int midx, int *pidx, u32 *msg)
  *
  * Return: zero on success, negative error if invalid argument passed.
  */
-static int idt_ntb_msg_write(struct ntb_dev *ntb, int midx, int pidx, u32 msg)
+static int idt_ntb_peer_msg_write(struct ntb_dev *ntb, int pidx, int midx,
+				  u32 msg)
 {
 	struct idt_ntb_dev *ndev = to_ndev_ntb(ntb);
 	unsigned long irqflags;
@@ -2058,7 +2055,7 @@ static const struct ntb_dev_ops idt_ntb_ops = {
 	.msg_set_mask		= idt_ntb_msg_set_mask,
 	.msg_clear_mask		= idt_ntb_msg_clear_mask,
 	.msg_read		= idt_ntb_msg_read,
-	.msg_write		= idt_ntb_msg_write
+	.peer_msg_write		= idt_ntb_peer_msg_write
 };
 
 /*
@@ -2269,7 +2266,7 @@ static ssize_t idt_dbgfs_info_read(struct file *filp, char __user *ubuf,
 		 "Message data:\n");
 	for (idx = 0; idx < IDT_MSG_CNT; idx++) {
 		int src;
-		(void)idt_ntb_msg_read(&ndev->ntb, idx, &src, &data);
+		data = idt_ntb_msg_read(&ndev->ntb, &src, idx);
 		off += scnprintf(strbuf + off, size - off,
 			"\t%hhu. 0x%08x from peer %hhu (Port %hhu)\n",
 			idx, data, src, ndev->peers[src].port);
diff --git a/include/linux/ntb.h b/include/linux/ntb.h
index c308964777eb..c1646f2c6344 100644
--- a/include/linux/ntb.h
+++ b/include/linux/ntb.h
@@ -250,7 +250,7 @@ static inline int ntb_ctx_ops_is_valid(const struct ntb_ctx_ops *ops)
  * @msg_set_mask:	See ntb_msg_set_mask().
  * @msg_clear_mask:	See ntb_msg_clear_mask().
  * @msg_read:		See ntb_msg_read().
- * @msg_write:		See ntb_msg_write().
+ * @peer_msg_write:	See ntb_peer_msg_write().
  */
 struct ntb_dev_ops {
 	int (*port_number)(struct ntb_dev *ntb);
@@ -321,8 +321,8 @@ struct ntb_dev_ops {
 	int (*msg_clear_sts)(struct ntb_dev *ntb, u64 sts_bits);
 	int (*msg_set_mask)(struct ntb_dev *ntb, u64 mask_bits);
 	int (*msg_clear_mask)(struct ntb_dev *ntb, u64 mask_bits);
-	int (*msg_read)(struct ntb_dev *ntb, int midx, int *pidx, u32 *msg);
-	int (*msg_write)(struct ntb_dev *ntb, int midx, int pidx, u32 msg);
+	u32 (*msg_read)(struct ntb_dev *ntb, int *pidx, int midx);
+	int (*peer_msg_write)(struct ntb_dev *ntb, int pidx, int midx, u32 msg);
 };
 
 static inline int ntb_dev_ops_is_valid(const struct ntb_dev_ops *ops)
@@ -384,7 +384,7 @@ static inline int ntb_dev_ops_is_valid(const struct ntb_dev_ops *ops)
 		/* !ops->msg_set_mask == !ops->msg_count	&& */
 		/* !ops->msg_clear_mask == !ops->msg_count	&& */
 		!ops->msg_read == !ops->msg_count		&&
-		!ops->msg_write == !ops->msg_count		&&
+		!ops->peer_msg_write == !ops->msg_count		&&
 		1;
 }
 
@@ -1459,31 +1459,29 @@ static inline int ntb_msg_clear_mask(struct ntb_dev *ntb, u64 mask_bits)
 }
 
 /**
- * ntb_msg_read() - read message register with specified index
+ * ntb_msg_read() - read inbound message register with specified index
  * @ntb:	NTB device context.
- * @midx:	Message register index
  * @pidx:	OUT - Port index of peer device a message retrieved from
- * @msg:	OUT - Data
+ * @midx:	Message register index
  *
  * Read data from the specified message register. Source port index of a
  * message is retrieved as well.
  *
- * Return: Zero on success, otherwise a negative error number.
+ * Return: The value of the inbound message register.
  */
-static inline int ntb_msg_read(struct ntb_dev *ntb, int midx, int *pidx,
-			       u32 *msg)
+static inline u32 ntb_msg_read(struct ntb_dev *ntb, int *pidx, int midx)
 {
 	if (!ntb->ops->msg_read)
-		return -EINVAL;
+		return ~(u32)0;
 
-	return ntb->ops->msg_read(ntb, midx, pidx, msg);
+	return ntb->ops->msg_read(ntb, pidx, midx);
 }
 
 /**
- * ntb_msg_write() - write data to the specified message register
+ * ntb_peer_msg_write() - write data to the specified peer message register
  * @ntb:	NTB device context.
- * @midx:	Message register index
  * @pidx:	Port index of peer device a message being sent to
+ * @midx:	Message register index
  * @msg:	Data to send
  *
  * Send data to a specified peer device using the defined message register.
@@ -1492,13 +1490,13 @@ static inline int ntb_msg_read(struct ntb_dev *ntb, int midx, int *pidx,
  *
  * Return: Zero on success, otherwise a negative error number.
  */
-static inline int ntb_msg_write(struct ntb_dev *ntb, int midx, int pidx,
-				u32 msg)
+static inline int ntb_peer_msg_write(struct ntb_dev *ntb, int pidx, int midx,
+				     u32 msg)
 {
-	if (!ntb->ops->msg_write)
+	if (!ntb->ops->peer_msg_write)
 		return -EINVAL;
 
-	return ntb->ops->msg_write(ntb, midx, pidx, msg);
+	return ntb->ops->peer_msg_write(ntb, pidx, midx, msg);
 }
 
 #endif
-- 
2.12.0

Re: [PATCH v2 01/15] NTB: Rename NTB messaging API methods

[Jon Mason]

On Sun, Dec 3, 2017 at 2:17 PM, Serge Semin <fancer.lancer@gmail.com> wrote:
> There is a common methods signature form used over all the NTB API
> like functions naming scheme, arguments names and order, etc.
> Recently added NTB messaging API IO callbacks were named a bit
> different so should be renamed to be in compliance with the rest
> of the API. The changes are made in a way so the developers won't
> be able to compile their code without being informed by the compiler.
>
> Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
> ---
>  drivers/ntb/hw/idt/ntb_hw_idt.c | 27 ++++++++++++---------------
>  include/linux/ntb.h             | 34 ++++++++++++++++------------------
>  2 files changed, 28 insertions(+), 33 deletions(-)
>
> diff --git a/drivers/ntb/hw/idt/ntb_hw_idt.c b/drivers/ntb/hw/idt/ntb_hw_idt.c
> index 0cd79f367f7c..6fb87c0f0d97 100644
> --- a/drivers/ntb/hw/idt/ntb_hw_idt.c
> +++ b/drivers/ntb/hw/idt/ntb_hw_idt.c
> @@ -1744,20 +1744,19 @@ static int idt_ntb_msg_clear_mask(struct ntb_dev *ntb, u64 mask_bits)
>   * idt_ntb_msg_read() - read message register with specified index
>   *                     (NTB API callback)
>   * @ntb:       NTB device context.
> - * @midx:      Message register index
>   * @pidx:      OUT - Port index of peer device a message retrieved from
> - * @msg:       OUT - Data
> + * @midx:      Message register index
>   *
>   * Read data from the specified message register and source register.
>   *
> - * Return: zero on success, negative error if invalid argument passed.
> + * Return: inbound message register value.
>   */
> -static int idt_ntb_msg_read(struct ntb_dev *ntb, int midx, int *pidx, u32 *msg)
> +static u32 idt_ntb_msg_read(struct ntb_dev *ntb, int *pidx, int midx)
>  {
>         struct idt_ntb_dev *ndev = to_ndev_ntb(ntb);
>
>         if (midx < 0 || IDT_MSG_CNT <= midx)
> -               return -EINVAL;
> +               return (u32)-1;

Please don't do this.  If this is an error return standard error
number.  And why are we casting to an unsigned int now?

>
>         /* Retrieve source port index of the message */
>         if (pidx != NULL) {
> @@ -1772,18 +1771,15 @@ static int idt_ntb_msg_read(struct ntb_dev *ntb, int midx, int *pidx, u32 *msg)
>         }
>
>         /* Retrieve data of the corresponding message register */
> -       if (msg != NULL)
> -               *msg = idt_nt_read(ndev, ntdata_tbl.msgs[midx].in);
> -
> -       return 0;
> +       return idt_nt_read(ndev, ntdata_tbl.msgs[midx].in);
>  }
>
>  /*
> - * idt_ntb_msg_write() - write data to the specified message register
> - *                      (NTB API callback)
> + * idt_ntb_peer_msg_write() - write data to the specified message register
> + *                           (NTB API callback)
>   * @ntb:       NTB device context.
> - * @midx:      Message register index
>   * @pidx:      Port index of peer device a message being sent to
> + * @midx:      Message register index
>   * @msg:       Data to send
>   *
>   * Just try to send data to a peer. Message status register should be
> @@ -1791,7 +1787,8 @@ static int idt_ntb_msg_read(struct ntb_dev *ntb, int midx, int *pidx, u32 *msg)
>   *
>   * Return: zero on success, negative error if invalid argument passed.
>   */
> -static int idt_ntb_msg_write(struct ntb_dev *ntb, int midx, int pidx, u32 msg)
> +static int idt_ntb_peer_msg_write(struct ntb_dev *ntb, int pidx, int midx,
> +                                 u32 msg)
>  {
>         struct idt_ntb_dev *ndev = to_ndev_ntb(ntb);
>         unsigned long irqflags;
> @@ -2058,7 +2055,7 @@ static const struct ntb_dev_ops idt_ntb_ops = {
>         .msg_set_mask           = idt_ntb_msg_set_mask,
>         .msg_clear_mask         = idt_ntb_msg_clear_mask,
>         .msg_read               = idt_ntb_msg_read,
> -       .msg_write              = idt_ntb_msg_write
> +       .peer_msg_write         = idt_ntb_peer_msg_write
>  };
>
>  /*
> @@ -2269,7 +2266,7 @@ static ssize_t idt_dbgfs_info_read(struct file *filp, char __user *ubuf,
>                  "Message data:\n");
>         for (idx = 0; idx < IDT_MSG_CNT; idx++) {
>                 int src;
> -               (void)idt_ntb_msg_read(&ndev->ntb, idx, &src, &data);
> +               data = idt_ntb_msg_read(&ndev->ntb, &src, idx);
>                 off += scnprintf(strbuf + off, size - off,
>                         "\t%hhu. 0x%08x from peer %hhu (Port %hhu)\n",
>                         idx, data, src, ndev->peers[src].port);
> diff --git a/include/linux/ntb.h b/include/linux/ntb.h
> index c308964777eb..c1646f2c6344 100644
> --- a/include/linux/ntb.h
> +++ b/include/linux/ntb.h
> @@ -250,7 +250,7 @@ static inline int ntb_ctx_ops_is_valid(const struct ntb_ctx_ops *ops)
>   * @msg_set_mask:      See ntb_msg_set_mask().
>   * @msg_clear_mask:    See ntb_msg_clear_mask().
>   * @msg_read:          See ntb_msg_read().
> - * @msg_write:         See ntb_msg_write().
> + * @peer_msg_write:    See ntb_peer_msg_write().
>   */
>  struct ntb_dev_ops {
>         int (*port_number)(struct ntb_dev *ntb);
> @@ -321,8 +321,8 @@ struct ntb_dev_ops {
>         int (*msg_clear_sts)(struct ntb_dev *ntb, u64 sts_bits);
>         int (*msg_set_mask)(struct ntb_dev *ntb, u64 mask_bits);
>         int (*msg_clear_mask)(struct ntb_dev *ntb, u64 mask_bits);
> -       int (*msg_read)(struct ntb_dev *ntb, int midx, int *pidx, u32 *msg);
> -       int (*msg_write)(struct ntb_dev *ntb, int midx, int pidx, u32 msg);
> +       u32 (*msg_read)(struct ntb_dev *ntb, int *pidx, int midx);
> +       int (*peer_msg_write)(struct ntb_dev *ntb, int pidx, int midx, u32 msg);
>  };
>
>  static inline int ntb_dev_ops_is_valid(const struct ntb_dev_ops *ops)
> @@ -384,7 +384,7 @@ static inline int ntb_dev_ops_is_valid(const struct ntb_dev_ops *ops)
>                 /* !ops->msg_set_mask == !ops->msg_count        && */
>                 /* !ops->msg_clear_mask == !ops->msg_count      && */
>                 !ops->msg_read == !ops->msg_count               &&
> -               !ops->msg_write == !ops->msg_count              &&
> +               !ops->peer_msg_write == !ops->msg_count         &&
>                 1;
>  }
>
> @@ -1459,31 +1459,29 @@ static inline int ntb_msg_clear_mask(struct ntb_dev *ntb, u64 mask_bits)
>  }
>
>  /**
> - * ntb_msg_read() - read message register with specified index
> + * ntb_msg_read() - read inbound message register with specified index
>   * @ntb:       NTB device context.
> - * @midx:      Message register index
>   * @pidx:      OUT - Port index of peer device a message retrieved from
> - * @msg:       OUT - Data
> + * @midx:      Message register index
>   *
>   * Read data from the specified message register. Source port index of a
>   * message is retrieved as well.
>   *
> - * Return: Zero on success, otherwise a negative error number.
> + * Return: The value of the inbound message register.
>   */
> -static inline int ntb_msg_read(struct ntb_dev *ntb, int midx, int *pidx,
> -                              u32 *msg)
> +static inline u32 ntb_msg_read(struct ntb_dev *ntb, int *pidx, int midx)
>  {
>         if (!ntb->ops->msg_read)
> -               return -EINVAL;
> +               return ~(u32)0;

Same here but in a different way.  Please revert this.

>
> -       return ntb->ops->msg_read(ntb, midx, pidx, msg);
> +       return ntb->ops->msg_read(ntb, pidx, midx);
>  }
>
>  /**
> - * ntb_msg_write() - write data to the specified message register
> + * ntb_peer_msg_write() - write data to the specified peer message register
>   * @ntb:       NTB device context.
> - * @midx:      Message register index
>   * @pidx:      Port index of peer device a message being sent to
> + * @midx:      Message register index
>   * @msg:       Data to send
>   *
>   * Send data to a specified peer device using the defined message register.
> @@ -1492,13 +1490,13 @@ static inline int ntb_msg_read(struct ntb_dev *ntb, int midx, int *pidx,
>   *
>   * Return: Zero on success, otherwise a negative error number.
>   */
> -static inline int ntb_msg_write(struct ntb_dev *ntb, int midx, int pidx,
> -                               u32 msg)
> +static inline int ntb_peer_msg_write(struct ntb_dev *ntb, int pidx, int midx,
> +                                    u32 msg)
>  {
> -       if (!ntb->ops->msg_write)
> +       if (!ntb->ops->peer_msg_write)
>                 return -EINVAL;
>
> -       return ntb->ops->msg_write(ntb, midx, pidx, msg);
> +       return ntb->ops->peer_msg_write(ntb, pidx, midx, msg);
>  }
>
>  #endif
> --
> 2.12.0
>

Re: [PATCH v2 01/15] NTB: Rename NTB messaging API methods

[Serge Semin]

On Tue, Dec 05, 2017 at 11:49:10AM -0500, Jon Mason <jdmason@kudzu.us> wrote:
> On Sun, Dec 3, 2017 at 2:17 PM, Serge Semin <fancer.lancer@gmail.com> wrote:
> > There is a common methods signature form used over all the NTB API
> > like functions naming scheme, arguments names and order, etc.
> > Recently added NTB messaging API IO callbacks were named a bit
> > different so should be renamed to be in compliance with the rest
> > of the API. The changes are made in a way so the developers won't
> > be able to compile their code without being informed by the compiler.
> >
> > Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
> > ---
> >  drivers/ntb/hw/idt/ntb_hw_idt.c | 27 ++++++++++++---------------
> >  include/linux/ntb.h             | 34 ++++++++++++++++------------------
> >  2 files changed, 28 insertions(+), 33 deletions(-)
> >
> > diff --git a/drivers/ntb/hw/idt/ntb_hw_idt.c b/drivers/ntb/hw/idt/ntb_hw_idt.c
> > index 0cd79f367f7c..6fb87c0f0d97 100644
> > --- a/drivers/ntb/hw/idt/ntb_hw_idt.c
> > +++ b/drivers/ntb/hw/idt/ntb_hw_idt.c
> > @@ -1744,20 +1744,19 @@ static int idt_ntb_msg_clear_mask(struct ntb_dev *ntb, u64 mask_bits)
> >   * idt_ntb_msg_read() - read message register with specified index
> >   *                     (NTB API callback)
> >   * @ntb:       NTB device context.
> > - * @midx:      Message register index
> >   * @pidx:      OUT - Port index of peer device a message retrieved from
> > - * @msg:       OUT - Data
> > + * @midx:      Message register index
> >   *
> >   * Read data from the specified message register and source register.
> >   *
> > - * Return: zero on success, negative error if invalid argument passed.
> > + * Return: inbound message register value.
> >   */
> > -static int idt_ntb_msg_read(struct ntb_dev *ntb, int midx, int *pidx, u32 *msg)
> > +static u32 idt_ntb_msg_read(struct ntb_dev *ntb, int *pidx, int midx)
> >  {
> >         struct idt_ntb_dev *ndev = to_ndev_ntb(ntb);
> >
> >         if (midx < 0 || IDT_MSG_CNT <= midx)
> > -               return -EINVAL;
> > +               return (u32)-1;
> 
> Please don't do this.  If this is an error return standard error
> number.  And why are we casting to an unsigned int now?
> 

We discussed these changes on the v1 series. Additionally I asked similar
question sometime ago even before the patchset was introduced.
This patch is made to provide the Message interface similar to the Scratchpad
one. I didn't introduce anything new or unjustified. As you can see the
spad_read/peer_spad_read methods return u32 type too. As well as the
Intel/AMD callbacks. The functions are intentionally made to return FFs
in case if some of the passed arguments get out from the allowed limits.
In such circumstances the return value emulates a situation like if user would
reference an invalid PCIe MMIO address. Since the 32-bits register can in general
have any value including -errno ones, then returning an error within the NTB API
would be incorrect. I remember Allen described it this way.
Nobody argued about it last time. If you think it's incorrect, then it should be
changed in both Scratchpad and Message register interfaces.

> >
> >         /* Retrieve source port index of the message */
> >         if (pidx != NULL) {
> > @@ -1772,18 +1771,15 @@ static int idt_ntb_msg_read(struct ntb_dev *ntb, int midx, int *pidx, u32 *msg)
> >         }
> >
> >         /* Retrieve data of the corresponding message register */
> > -       if (msg != NULL)
> > -               *msg = idt_nt_read(ndev, ntdata_tbl.msgs[midx].in);
> > -
> > -       return 0;
> > +       return idt_nt_read(ndev, ntdata_tbl.msgs[midx].in);
> >  }
> >
> >  /*
> > - * idt_ntb_msg_write() - write data to the specified message register
> > - *                      (NTB API callback)
> > + * idt_ntb_peer_msg_write() - write data to the specified message register
> > + *                           (NTB API callback)
> >   * @ntb:       NTB device context.
> > - * @midx:      Message register index
> >   * @pidx:      Port index of peer device a message being sent to
> > + * @midx:      Message register index
> >   * @msg:       Data to send
> >   *
> >   * Just try to send data to a peer. Message status register should be
> > @@ -1791,7 +1787,8 @@ static int idt_ntb_msg_read(struct ntb_dev *ntb, int midx, int *pidx, u32 *msg)
> >   *
> >   * Return: zero on success, negative error if invalid argument passed.
> >   */
> > -static int idt_ntb_msg_write(struct ntb_dev *ntb, int midx, int pidx, u32 msg)
> > +static int idt_ntb_peer_msg_write(struct ntb_dev *ntb, int pidx, int midx,
> > +                                 u32 msg)
> >  {
> >         struct idt_ntb_dev *ndev = to_ndev_ntb(ntb);
> >         unsigned long irqflags;
> > @@ -2058,7 +2055,7 @@ static const struct ntb_dev_ops idt_ntb_ops = {
> >         .msg_set_mask           = idt_ntb_msg_set_mask,
> >         .msg_clear_mask         = idt_ntb_msg_clear_mask,
> >         .msg_read               = idt_ntb_msg_read,
> > -       .msg_write              = idt_ntb_msg_write
> > +       .peer_msg_write         = idt_ntb_peer_msg_write
> >  };
> >
> >  /*
> > @@ -2269,7 +2266,7 @@ static ssize_t idt_dbgfs_info_read(struct file *filp, char __user *ubuf,
> >                  "Message data:\n");
> >         for (idx = 0; idx < IDT_MSG_CNT; idx++) {
> >                 int src;
> > -               (void)idt_ntb_msg_read(&ndev->ntb, idx, &src, &data);
> > +               data = idt_ntb_msg_read(&ndev->ntb, &src, idx);
> >                 off += scnprintf(strbuf + off, size - off,
> >                         "\t%hhu. 0x%08x from peer %hhu (Port %hhu)\n",
> >                         idx, data, src, ndev->peers[src].port);
> > diff --git a/include/linux/ntb.h b/include/linux/ntb.h
> > index c308964777eb..c1646f2c6344 100644
> > --- a/include/linux/ntb.h
> > +++ b/include/linux/ntb.h
> > @@ -250,7 +250,7 @@ static inline int ntb_ctx_ops_is_valid(const struct ntb_ctx_ops *ops)
> >   * @msg_set_mask:      See ntb_msg_set_mask().
> >   * @msg_clear_mask:    See ntb_msg_clear_mask().
> >   * @msg_read:          See ntb_msg_read().
> > - * @msg_write:         See ntb_msg_write().
> > + * @peer_msg_write:    See ntb_peer_msg_write().
> >   */
> >  struct ntb_dev_ops {
> >         int (*port_number)(struct ntb_dev *ntb);
> > @@ -321,8 +321,8 @@ struct ntb_dev_ops {
> >         int (*msg_clear_sts)(struct ntb_dev *ntb, u64 sts_bits);
> >         int (*msg_set_mask)(struct ntb_dev *ntb, u64 mask_bits);
> >         int (*msg_clear_mask)(struct ntb_dev *ntb, u64 mask_bits);
> > -       int (*msg_read)(struct ntb_dev *ntb, int midx, int *pidx, u32 *msg);
> > -       int (*msg_write)(struct ntb_dev *ntb, int midx, int pidx, u32 msg);
> > +       u32 (*msg_read)(struct ntb_dev *ntb, int *pidx, int midx);
> > +       int (*peer_msg_write)(struct ntb_dev *ntb, int pidx, int midx, u32 msg);
> >  };
> >
> >  static inline int ntb_dev_ops_is_valid(const struct ntb_dev_ops *ops)
> > @@ -384,7 +384,7 @@ static inline int ntb_dev_ops_is_valid(const struct ntb_dev_ops *ops)
> >                 /* !ops->msg_set_mask == !ops->msg_count        && */
> >                 /* !ops->msg_clear_mask == !ops->msg_count      && */
> >                 !ops->msg_read == !ops->msg_count               &&
> > -               !ops->msg_write == !ops->msg_count              &&
> > +               !ops->peer_msg_write == !ops->msg_count         &&
> >                 1;
> >  }
> >
> > @@ -1459,31 +1459,29 @@ static inline int ntb_msg_clear_mask(struct ntb_dev *ntb, u64 mask_bits)
> >  }
> >
> >  /**
> > - * ntb_msg_read() - read message register with specified index
> > + * ntb_msg_read() - read inbound message register with specified index
> >   * @ntb:       NTB device context.
> > - * @midx:      Message register index
> >   * @pidx:      OUT - Port index of peer device a message retrieved from
> > - * @msg:       OUT - Data
> > + * @midx:      Message register index
> >   *
> >   * Read data from the specified message register. Source port index of a
> >   * message is retrieved as well.
> >   *
> > - * Return: Zero on success, otherwise a negative error number.
> > + * Return: The value of the inbound message register.
> >   */
> > -static inline int ntb_msg_read(struct ntb_dev *ntb, int midx, int *pidx,
> > -                              u32 *msg)
> > +static inline u32 ntb_msg_read(struct ntb_dev *ntb, int *pidx, int midx)
> >  {
> >         if (!ntb->ops->msg_read)
> > -               return -EINVAL;
> > +               return ~(u32)0;
> 
> Same here but in a different way.  Please revert this.
> 

Please see the comment above.

> >
> > -       return ntb->ops->msg_read(ntb, midx, pidx, msg);
> > +       return ntb->ops->msg_read(ntb, pidx, midx);
> >  }
> >
> >  /**
> > - * ntb_msg_write() - write data to the specified message register
> > + * ntb_peer_msg_write() - write data to the specified peer message register
> >   * @ntb:       NTB device context.
> > - * @midx:      Message register index
> >   * @pidx:      Port index of peer device a message being sent to
> > + * @midx:      Message register index
> >   * @msg:       Data to send
> >   *
> >   * Send data to a specified peer device using the defined message register.
> > @@ -1492,13 +1490,13 @@ static inline int ntb_msg_read(struct ntb_dev *ntb, int midx, int *pidx,
> >   *
> >   * Return: Zero on success, otherwise a negative error number.
> >   */
> > -static inline int ntb_msg_write(struct ntb_dev *ntb, int midx, int pidx,
> > -                               u32 msg)
> > +static inline int ntb_peer_msg_write(struct ntb_dev *ntb, int pidx, int midx,
> > +                                    u32 msg)
> >  {
> > -       if (!ntb->ops->msg_write)
> > +       if (!ntb->ops->peer_msg_write)
> >                 return -EINVAL;
> >
> > -       return ntb->ops->msg_write(ntb, midx, pidx, msg);
> > +       return ntb->ops->peer_msg_write(ntb, pidx, midx, msg);
> >  }
> >
> >  #endif
> > --
> > 2.12.0
> >
> 
> -- 
> You received this message because you are subscribed to the Google Groups "linux-ntb" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to linux-ntb+unsubscribe@googlegroups.com.
> To post to this group, send email to linux-ntb@googlegroups.com.
> To view this discussion on the web visit https://groups.google.com/d/msgid/linux-ntb/CAPoiz9xTRToABuuop77j7GcsLaZjYWD1Ght9kGc-Bo9A0w5ddw%40mail.gmail.com.
> For more options, visit https://groups.google.com/d/optout.

Re: [PATCH v2 01/15] NTB: Rename NTB messaging API methods

[Jon Mason]

On Tue, Dec 5, 2017 at 12:31 PM, Serge Semin <fancer.lancer@gmail.com> wrote:
> On Tue, Dec 05, 2017 at 11:49:10AM -0500, Jon Mason <jdmason@kudzu.us> wrote:
>> On Sun, Dec 3, 2017 at 2:17 PM, Serge Semin <fancer.lancer@gmail.com> wrote:
>> > There is a common methods signature form used over all the NTB API
>> > like functions naming scheme, arguments names and order, etc.
>> > Recently added NTB messaging API IO callbacks were named a bit
>> > different so should be renamed to be in compliance with the rest
>> > of the API. The changes are made in a way so the developers won't
>> > be able to compile their code without being informed by the compiler.
>> >
>> > Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
>> > ---
>> >  drivers/ntb/hw/idt/ntb_hw_idt.c | 27 ++++++++++++---------------
>> >  include/linux/ntb.h             | 34 ++++++++++++++++------------------
>> >  2 files changed, 28 insertions(+), 33 deletions(-)
>> >
>> > diff --git a/drivers/ntb/hw/idt/ntb_hw_idt.c b/drivers/ntb/hw/idt/ntb_hw_idt.c
>> > index 0cd79f367f7c..6fb87c0f0d97 100644
>> > --- a/drivers/ntb/hw/idt/ntb_hw_idt.c
>> > +++ b/drivers/ntb/hw/idt/ntb_hw_idt.c
>> > @@ -1744,20 +1744,19 @@ static int idt_ntb_msg_clear_mask(struct ntb_dev *ntb, u64 mask_bits)
>> >   * idt_ntb_msg_read() - read message register with specified index
>> >   *                     (NTB API callback)
>> >   * @ntb:       NTB device context.
>> > - * @midx:      Message register index
>> >   * @pidx:      OUT - Port index of peer device a message retrieved from
>> > - * @msg:       OUT - Data
>> > + * @midx:      Message register index
>> >   *
>> >   * Read data from the specified message register and source register.
>> >   *
>> > - * Return: zero on success, negative error if invalid argument passed.
>> > + * Return: inbound message register value.
>> >   */
>> > -static int idt_ntb_msg_read(struct ntb_dev *ntb, int midx, int *pidx, u32 *msg)
>> > +static u32 idt_ntb_msg_read(struct ntb_dev *ntb, int *pidx, int midx)
>> >  {
>> >         struct idt_ntb_dev *ndev = to_ndev_ntb(ntb);
>> >
>> >         if (midx < 0 || IDT_MSG_CNT <= midx)
>> > -               return -EINVAL;
>> > +               return (u32)-1;
>>
>> Please don't do this.  If this is an error return standard error
>> number.  And why are we casting to an unsigned int now?
>>
>
> We discussed these changes on the v1 series. Additionally I asked similar
> question sometime ago even before the patchset was introduced.
> This patch is made to provide the Message interface similar to the Scratchpad
> one. I didn't introduce anything new or unjustified. As you can see the
> spad_read/peer_spad_read methods return u32 type too. As well as the
> Intel/AMD callbacks. The functions are intentionally made to return FFs
> in case if some of the passed arguments get out from the allowed limits.
> In such circumstances the return value emulates a situation like if user would
> reference an invalid PCIe MMIO address. Since the 32-bits register can in general
> have any value including -errno ones, then returning an error within the NTB API
> would be incorrect. I remember Allen described it this way.
> Nobody argued about it last time. If you think it's incorrect, then it should be
> changed in both Scratchpad and Message register interfaces.

Just because no one said anything before, doesn't mean it's
acceptable.  I think that is the official Linux code review mantra ;-)

Okay, if we are going to do it this way, then return ~0 instead.  At
least that way there is no ugly cast.

>
>> >
>> >         /* Retrieve source port index of the message */
>> >         if (pidx != NULL) {
>> > @@ -1772,18 +1771,15 @@ static int idt_ntb_msg_read(struct ntb_dev *ntb, int midx, int *pidx, u32 *msg)
>> >         }
>> >
>> >         /* Retrieve data of the corresponding message register */
>> > -       if (msg != NULL)
>> > -               *msg = idt_nt_read(ndev, ntdata_tbl.msgs[midx].in);
>> > -
>> > -       return 0;
>> > +       return idt_nt_read(ndev, ntdata_tbl.msgs[midx].in);
>> >  }
>> >
>> >  /*
>> > - * idt_ntb_msg_write() - write data to the specified message register
>> > - *                      (NTB API callback)
>> > + * idt_ntb_peer_msg_write() - write data to the specified message register
>> > + *                           (NTB API callback)
>> >   * @ntb:       NTB device context.
>> > - * @midx:      Message register index
>> >   * @pidx:      Port index of peer device a message being sent to
>> > + * @midx:      Message register index
>> >   * @msg:       Data to send
>> >   *
>> >   * Just try to send data to a peer. Message status register should be
>> > @@ -1791,7 +1787,8 @@ static int idt_ntb_msg_read(struct ntb_dev *ntb, int midx, int *pidx, u32 *msg)
>> >   *
>> >   * Return: zero on success, negative error if invalid argument passed.
>> >   */
>> > -static int idt_ntb_msg_write(struct ntb_dev *ntb, int midx, int pidx, u32 msg)
>> > +static int idt_ntb_peer_msg_write(struct ntb_dev *ntb, int pidx, int midx,
>> > +                                 u32 msg)
>> >  {
>> >         struct idt_ntb_dev *ndev = to_ndev_ntb(ntb);
>> >         unsigned long irqflags;
>> > @@ -2058,7 +2055,7 @@ static const struct ntb_dev_ops idt_ntb_ops = {
>> >         .msg_set_mask           = idt_ntb_msg_set_mask,
>> >         .msg_clear_mask         = idt_ntb_msg_clear_mask,
>> >         .msg_read               = idt_ntb_msg_read,
>> > -       .msg_write              = idt_ntb_msg_write
>> > +       .peer_msg_write         = idt_ntb_peer_msg_write
>> >  };
>> >
>> >  /*
>> > @@ -2269,7 +2266,7 @@ static ssize_t idt_dbgfs_info_read(struct file *filp, char __user *ubuf,
>> >                  "Message data:\n");
>> >         for (idx = 0; idx < IDT_MSG_CNT; idx++) {
>> >                 int src;
>> > -               (void)idt_ntb_msg_read(&ndev->ntb, idx, &src, &data);
>> > +               data = idt_ntb_msg_read(&ndev->ntb, &src, idx);
>> >                 off += scnprintf(strbuf + off, size - off,
>> >                         "\t%hhu. 0x%08x from peer %hhu (Port %hhu)\n",
>> >                         idx, data, src, ndev->peers[src].port);
>> > diff --git a/include/linux/ntb.h b/include/linux/ntb.h
>> > index c308964777eb..c1646f2c6344 100644
>> > --- a/include/linux/ntb.h
>> > +++ b/include/linux/ntb.h
>> > @@ -250,7 +250,7 @@ static inline int ntb_ctx_ops_is_valid(const struct ntb_ctx_ops *ops)
>> >   * @msg_set_mask:      See ntb_msg_set_mask().
>> >   * @msg_clear_mask:    See ntb_msg_clear_mask().
>> >   * @msg_read:          See ntb_msg_read().
>> > - * @msg_write:         See ntb_msg_write().
>> > + * @peer_msg_write:    See ntb_peer_msg_write().
>> >   */
>> >  struct ntb_dev_ops {
>> >         int (*port_number)(struct ntb_dev *ntb);
>> > @@ -321,8 +321,8 @@ struct ntb_dev_ops {
>> >         int (*msg_clear_sts)(struct ntb_dev *ntb, u64 sts_bits);
>> >         int (*msg_set_mask)(struct ntb_dev *ntb, u64 mask_bits);
>> >         int (*msg_clear_mask)(struct ntb_dev *ntb, u64 mask_bits);
>> > -       int (*msg_read)(struct ntb_dev *ntb, int midx, int *pidx, u32 *msg);
>> > -       int (*msg_write)(struct ntb_dev *ntb, int midx, int pidx, u32 msg);
>> > +       u32 (*msg_read)(struct ntb_dev *ntb, int *pidx, int midx);
>> > +       int (*peer_msg_write)(struct ntb_dev *ntb, int pidx, int midx, u32 msg);
>> >  };
>> >
>> >  static inline int ntb_dev_ops_is_valid(const struct ntb_dev_ops *ops)
>> > @@ -384,7 +384,7 @@ static inline int ntb_dev_ops_is_valid(const struct ntb_dev_ops *ops)
>> >                 /* !ops->msg_set_mask == !ops->msg_count        && */
>> >                 /* !ops->msg_clear_mask == !ops->msg_count      && */
>> >                 !ops->msg_read == !ops->msg_count               &&
>> > -               !ops->msg_write == !ops->msg_count              &&
>> > +               !ops->peer_msg_write == !ops->msg_count         &&
>> >                 1;
>> >  }
>> >
>> > @@ -1459,31 +1459,29 @@ static inline int ntb_msg_clear_mask(struct ntb_dev *ntb, u64 mask_bits)
>> >  }
>> >
>> >  /**
>> > - * ntb_msg_read() - read message register with specified index
>> > + * ntb_msg_read() - read inbound message register with specified index
>> >   * @ntb:       NTB device context.
>> > - * @midx:      Message register index
>> >   * @pidx:      OUT - Port index of peer device a message retrieved from
>> > - * @msg:       OUT - Data
>> > + * @midx:      Message register index
>> >   *
>> >   * Read data from the specified message register. Source port index of a
>> >   * message is retrieved as well.
>> >   *
>> > - * Return: Zero on success, otherwise a negative error number.
>> > + * Return: The value of the inbound message register.
>> >   */
>> > -static inline int ntb_msg_read(struct ntb_dev *ntb, int midx, int *pidx,
>> > -                              u32 *msg)
>> > +static inline u32 ntb_msg_read(struct ntb_dev *ntb, int *pidx, int midx)
>> >  {
>> >         if (!ntb->ops->msg_read)
>> > -               return -EINVAL;
>> > +               return ~(u32)0;
>>
>> Same here but in a different way.  Please revert this.
>>
>
> Please see the comment above.
>
>> >
>> > -       return ntb->ops->msg_read(ntb, midx, pidx, msg);
>> > +       return ntb->ops->msg_read(ntb, pidx, midx);
>> >  }
>> >
>> >  /**
>> > - * ntb_msg_write() - write data to the specified message register
>> > + * ntb_peer_msg_write() - write data to the specified peer message register
>> >   * @ntb:       NTB device context.
>> > - * @midx:      Message register index
>> >   * @pidx:      Port index of peer device a message being sent to
>> > + * @midx:      Message register index
>> >   * @msg:       Data to send
>> >   *
>> >   * Send data to a specified peer device using the defined message register.
>> > @@ -1492,13 +1490,13 @@ static inline int ntb_msg_read(struct ntb_dev *ntb, int midx, int *pidx,
>> >   *
>> >   * Return: Zero on success, otherwise a negative error number.
>> >   */
>> > -static inline int ntb_msg_write(struct ntb_dev *ntb, int midx, int pidx,
>> > -                               u32 msg)
>> > +static inline int ntb_peer_msg_write(struct ntb_dev *ntb, int pidx, int midx,
>> > +                                    u32 msg)
>> >  {
>> > -       if (!ntb->ops->msg_write)
>> > +       if (!ntb->ops->peer_msg_write)
>> >                 return -EINVAL;
>> >
>> > -       return ntb->ops->msg_write(ntb, midx, pidx, msg);
>> > +       return ntb->ops->peer_msg_write(ntb, pidx, midx, msg);
>> >  }
>> >
>> >  #endif
>> > --
>> > 2.12.0
>> >
>>
>> --
>> You received this message because you are subscribed to the Google Groups "linux-ntb" group.
>> To unsubscribe from this group and stop receiving emails from it, send an email to linux-ntb+unsubscribe@googlegroups.com.
>> To post to this group, send email to linux-ntb@googlegroups.com.
>> To view this discussion on the web visit https://groups.google.com/d/msgid/linux-ntb/CAPoiz9xTRToABuuop77j7GcsLaZjYWD1Ght9kGc-Bo9A0w5ddw%40mail.gmail.com.
>> For more options, visit https://groups.google.com/d/optout.

Re: [PATCH v2 01/15] NTB: Rename NTB messaging API methods

[Serge Semin]

On Tue, Dec 05, 2017 at 01:07:26PM -0500, Jon Mason <jdmason@kudzu.us> wrote:
> On Tue, Dec 5, 2017 at 12:31 PM, Serge Semin <fancer.lancer@gmail.com> wrote:
> > On Tue, Dec 05, 2017 at 11:49:10AM -0500, Jon Mason <jdmason@kudzu.us> wrote:
> >> On Sun, Dec 3, 2017 at 2:17 PM, Serge Semin <fancer.lancer@gmail.com> wrote:
> >> > There is a common methods signature form used over all the NTB API
> >> > like functions naming scheme, arguments names and order, etc.
> >> > Recently added NTB messaging API IO callbacks were named a bit
> >> > different so should be renamed to be in compliance with the rest
> >> > of the API. The changes are made in a way so the developers won't
> >> > be able to compile their code without being informed by the compiler.
> >> >
> >> > Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
> >> > ---
> >> >  drivers/ntb/hw/idt/ntb_hw_idt.c | 27 ++++++++++++---------------
> >> >  include/linux/ntb.h             | 34 ++++++++++++++++------------------
> >> >  2 files changed, 28 insertions(+), 33 deletions(-)
> >> >
> >> > diff --git a/drivers/ntb/hw/idt/ntb_hw_idt.c b/drivers/ntb/hw/idt/ntb_hw_idt.c
> >> > index 0cd79f367f7c..6fb87c0f0d97 100644
> >> > --- a/drivers/ntb/hw/idt/ntb_hw_idt.c
> >> > +++ b/drivers/ntb/hw/idt/ntb_hw_idt.c
> >> > @@ -1744,20 +1744,19 @@ static int idt_ntb_msg_clear_mask(struct ntb_dev *ntb, u64 mask_bits)
> >> >   * idt_ntb_msg_read() - read message register with specified index
> >> >   *                     (NTB API callback)
> >> >   * @ntb:       NTB device context.
> >> > - * @midx:      Message register index
> >> >   * @pidx:      OUT - Port index of peer device a message retrieved from
> >> > - * @msg:       OUT - Data
> >> > + * @midx:      Message register index
> >> >   *
> >> >   * Read data from the specified message register and source register.
> >> >   *
> >> > - * Return: zero on success, negative error if invalid argument passed.
> >> > + * Return: inbound message register value.
> >> >   */
> >> > -static int idt_ntb_msg_read(struct ntb_dev *ntb, int midx, int *pidx, u32 *msg)
> >> > +static u32 idt_ntb_msg_read(struct ntb_dev *ntb, int *pidx, int midx)
> >> >  {
> >> >         struct idt_ntb_dev *ndev = to_ndev_ntb(ntb);
> >> >
> >> >         if (midx < 0 || IDT_MSG_CNT <= midx)
> >> > -               return -EINVAL;
> >> > +               return (u32)-1;
> >>
> >> Please don't do this.  If this is an error return standard error
> >> number.  And why are we casting to an unsigned int now?
> >>
> >
> > We discussed these changes on the v1 series. Additionally I asked similar
> > question sometime ago even before the patchset was introduced.
> > This patch is made to provide the Message interface similar to the Scratchpad
> > one. I didn't introduce anything new or unjustified. As you can see the
> > spad_read/peer_spad_read methods return u32 type too. As well as the
> > Intel/AMD callbacks. The functions are intentionally made to return FFs
> > in case if some of the passed arguments get out from the allowed limits.
> > In such circumstances the return value emulates a situation like if user would
> > reference an invalid PCIe MMIO address. Since the 32-bits register can in general
> > have any value including -errno ones, then returning an error within the NTB API
> > would be incorrect. I remember Allen described it this way.
> > Nobody argued about it last time. If you think it's incorrect, then it should be
> > changed in both Scratchpad and Message register interfaces.
> 
> Just because no one said anything before, doesn't mean it's
> acceptable.  I think that is the official Linux code review mantra ;-)
> 
> Okay, if we are going to do it this way, then return ~0 instead.  At
> least that way there is no ugly cast.
> 

Ok. I'll replace it with ~(u32)0.

> >
> >> >
> >> >         /* Retrieve source port index of the message */
> >> >         if (pidx != NULL) {
> >> > @@ -1772,18 +1771,15 @@ static int idt_ntb_msg_read(struct ntb_dev *ntb, int midx, int *pidx, u32 *msg)
> >> >         }
> >> >
> >> >         /* Retrieve data of the corresponding message register */
> >> > -       if (msg != NULL)
> >> > -               *msg = idt_nt_read(ndev, ntdata_tbl.msgs[midx].in);
> >> > -
> >> > -       return 0;
> >> > +       return idt_nt_read(ndev, ntdata_tbl.msgs[midx].in);
> >> >  }
> >> >
> >> >  /*
> >> > - * idt_ntb_msg_write() - write data to the specified message register
> >> > - *                      (NTB API callback)
> >> > + * idt_ntb_peer_msg_write() - write data to the specified message register
> >> > + *                           (NTB API callback)
> >> >   * @ntb:       NTB device context.
> >> > - * @midx:      Message register index
> >> >   * @pidx:      Port index of peer device a message being sent to
> >> > + * @midx:      Message register index
> >> >   * @msg:       Data to send
> >> >   *
> >> >   * Just try to send data to a peer. Message status register should be
> >> > @@ -1791,7 +1787,8 @@ static int idt_ntb_msg_read(struct ntb_dev *ntb, int midx, int *pidx, u32 *msg)
> >> >   *
> >> >   * Return: zero on success, negative error if invalid argument passed.
> >> >   */
> >> > -static int idt_ntb_msg_write(struct ntb_dev *ntb, int midx, int pidx, u32 msg)
> >> > +static int idt_ntb_peer_msg_write(struct ntb_dev *ntb, int pidx, int midx,
> >> > +                                 u32 msg)
> >> >  {
> >> >         struct idt_ntb_dev *ndev = to_ndev_ntb(ntb);
> >> >         unsigned long irqflags;
> >> > @@ -2058,7 +2055,7 @@ static const struct ntb_dev_ops idt_ntb_ops = {
> >> >         .msg_set_mask           = idt_ntb_msg_set_mask,
> >> >         .msg_clear_mask         = idt_ntb_msg_clear_mask,
> >> >         .msg_read               = idt_ntb_msg_read,
> >> > -       .msg_write              = idt_ntb_msg_write
> >> > +       .peer_msg_write         = idt_ntb_peer_msg_write
> >> >  };
> >> >
> >> >  /*
> >> > @@ -2269,7 +2266,7 @@ static ssize_t idt_dbgfs_info_read(struct file *filp, char __user *ubuf,
> >> >                  "Message data:\n");
> >> >         for (idx = 0; idx < IDT_MSG_CNT; idx++) {
> >> >                 int src;
> >> > -               (void)idt_ntb_msg_read(&ndev->ntb, idx, &src, &data);
> >> > +               data = idt_ntb_msg_read(&ndev->ntb, &src, idx);
> >> >                 off += scnprintf(strbuf + off, size - off,
> >> >                         "\t%hhu. 0x%08x from peer %hhu (Port %hhu)\n",
> >> >                         idx, data, src, ndev->peers[src].port);
> >> > diff --git a/include/linux/ntb.h b/include/linux/ntb.h
> >> > index c308964777eb..c1646f2c6344 100644
> >> > --- a/include/linux/ntb.h
> >> > +++ b/include/linux/ntb.h
> >> > @@ -250,7 +250,7 @@ static inline int ntb_ctx_ops_is_valid(const struct ntb_ctx_ops *ops)
> >> >   * @msg_set_mask:      See ntb_msg_set_mask().
> >> >   * @msg_clear_mask:    See ntb_msg_clear_mask().
> >> >   * @msg_read:          See ntb_msg_read().
> >> > - * @msg_write:         See ntb_msg_write().
> >> > + * @peer_msg_write:    See ntb_peer_msg_write().
> >> >   */
> >> >  struct ntb_dev_ops {
> >> >         int (*port_number)(struct ntb_dev *ntb);
> >> > @@ -321,8 +321,8 @@ struct ntb_dev_ops {
> >> >         int (*msg_clear_sts)(struct ntb_dev *ntb, u64 sts_bits);
> >> >         int (*msg_set_mask)(struct ntb_dev *ntb, u64 mask_bits);
> >> >         int (*msg_clear_mask)(struct ntb_dev *ntb, u64 mask_bits);
> >> > -       int (*msg_read)(struct ntb_dev *ntb, int midx, int *pidx, u32 *msg);
> >> > -       int (*msg_write)(struct ntb_dev *ntb, int midx, int pidx, u32 msg);
> >> > +       u32 (*msg_read)(struct ntb_dev *ntb, int *pidx, int midx);
> >> > +       int (*peer_msg_write)(struct ntb_dev *ntb, int pidx, int midx, u32 msg);
> >> >  };
> >> >
> >> >  static inline int ntb_dev_ops_is_valid(const struct ntb_dev_ops *ops)
> >> > @@ -384,7 +384,7 @@ static inline int ntb_dev_ops_is_valid(const struct ntb_dev_ops *ops)
> >> >                 /* !ops->msg_set_mask == !ops->msg_count        && */
> >> >                 /* !ops->msg_clear_mask == !ops->msg_count      && */
> >> >                 !ops->msg_read == !ops->msg_count               &&
> >> > -               !ops->msg_write == !ops->msg_count              &&
> >> > +               !ops->peer_msg_write == !ops->msg_count         &&
> >> >                 1;
> >> >  }
> >> >
> >> > @@ -1459,31 +1459,29 @@ static inline int ntb_msg_clear_mask(struct ntb_dev *ntb, u64 mask_bits)
> >> >  }
> >> >
> >> >  /**
> >> > - * ntb_msg_read() - read message register with specified index
> >> > + * ntb_msg_read() - read inbound message register with specified index
> >> >   * @ntb:       NTB device context.
> >> > - * @midx:      Message register index
> >> >   * @pidx:      OUT - Port index of peer device a message retrieved from
> >> > - * @msg:       OUT - Data
> >> > + * @midx:      Message register index
> >> >   *
> >> >   * Read data from the specified message register. Source port index of a
> >> >   * message is retrieved as well.
> >> >   *
> >> > - * Return: Zero on success, otherwise a negative error number.
> >> > + * Return: The value of the inbound message register.
> >> >   */
> >> > -static inline int ntb_msg_read(struct ntb_dev *ntb, int midx, int *pidx,
> >> > -                              u32 *msg)
> >> > +static inline u32 ntb_msg_read(struct ntb_dev *ntb, int *pidx, int midx)
> >> >  {
> >> >         if (!ntb->ops->msg_read)
> >> > -               return -EINVAL;
> >> > +               return ~(u32)0;
> >>
> >> Same here but in a different way.  Please revert this.
> >>
> >
> > Please see the comment above.
> >
> >> >
> >> > -       return ntb->ops->msg_read(ntb, midx, pidx, msg);
> >> > +       return ntb->ops->msg_read(ntb, pidx, midx);
> >> >  }
> >> >
> >> >  /**
> >> > - * ntb_msg_write() - write data to the specified message register
> >> > + * ntb_peer_msg_write() - write data to the specified peer message register
> >> >   * @ntb:       NTB device context.
> >> > - * @midx:      Message register index
> >> >   * @pidx:      Port index of peer device a message being sent to
> >> > + * @midx:      Message register index
> >> >   * @msg:       Data to send
> >> >   *
> >> >   * Send data to a specified peer device using the defined message register.
> >> > @@ -1492,13 +1490,13 @@ static inline int ntb_msg_read(struct ntb_dev *ntb, int midx, int *pidx,
> >> >   *
> >> >   * Return: Zero on success, otherwise a negative error number.
> >> >   */
> >> > -static inline int ntb_msg_write(struct ntb_dev *ntb, int midx, int pidx,
> >> > -                               u32 msg)
> >> > +static inline int ntb_peer_msg_write(struct ntb_dev *ntb, int pidx, int midx,
> >> > +                                    u32 msg)
> >> >  {
> >> > -       if (!ntb->ops->msg_write)
> >> > +       if (!ntb->ops->peer_msg_write)
> >> >                 return -EINVAL;
> >> >
> >> > -       return ntb->ops->msg_write(ntb, midx, pidx, msg);
> >> > +       return ntb->ops->peer_msg_write(ntb, pidx, midx, msg);
> >> >  }
> >> >
> >> >  #endif
> >> > --
> >> > 2.12.0
> >> >
> >>
> >> --
> >> You received this message because you are subscribed to the Google Groups "linux-ntb" group.
> >> To unsubscribe from this group and stop receiving emails from it, send an email to linux-ntb+unsubscribe@googlegroups.com.
> >> To post to this group, send email to linux-ntb@googlegroups.com.
> >> To view this discussion on the web visit https://groups.google.com/d/msgid/linux-ntb/CAPoiz9xTRToABuuop77j7GcsLaZjYWD1Ght9kGc-Bo9A0w5ddw%40mail.gmail.com.
> >> For more options, visit https://groups.google.com/d/optout.

Re: [PATCH v2 01/15] NTB: Rename NTB messaging API methods

[Logan Gunthorpe]

On 05/12/17 01:54 PM, Serge Semin wrote:

>> Just because no one said anything before, doesn't mean it's
>> acceptable.  I think that is the official Linux code review mantra ;-)
>>
>> Okay, if we are going to do it this way, then return ~0 instead.  At
>> least that way there is no ugly cast.
>>
> 
> Ok. I'll replace it with ~(u32)0.

That's exactly the same just more confusing. I'm still in favor of 
leaving it the way it was.

Logan

Re: [PATCH v2 01/15] NTB: Rename NTB messaging API methods

[Logan Gunthorpe]

On 05/12/17 10:31 AM, Serge Semin wrote:
>>> -static int idt_ntb_msg_read(struct ntb_dev *ntb, int midx, int *pidx, u32 *msg)
>>> +static u32 idt_ntb_msg_read(struct ntb_dev *ntb, int *pidx, int midx)
>>>   {
>>>          struct idt_ntb_dev *ndev = to_ndev_ntb(ntb);
>>>
>>>          if (midx < 0 || IDT_MSG_CNT <= midx)
>>> -               return -EINVAL;
>>> +               return (u32)-1;
>>
>> Please don't do this.  If this is an error return standard error
>> number.  And why are we casting to an unsigned int now?
>>
> 
> We discussed these changes on the v1 series. Additionally I asked similar
> question sometime ago even before the patchset was introduced.
> This patch is made to provide the Message interface similar to the Scratchpad
> one. I didn't introduce anything new or unjustified. As you can see the
> spad_read/peer_spad_read methods return u32 type too. As well as the
> Intel/AMD callbacks. The functions are intentionally made to return FFs
> in case if some of the passed arguments get out from the allowed limits.
> In such circumstances the return value emulates a situation like if user would
> reference an invalid PCIe MMIO address. Since the 32-bits register can in general
> have any value including -errno ones, then returning an error within the NTB API
> would be incorrect. I remember Allen described it this way.
> Nobody argued about it last time. If you think it's incorrect, then it should be
> changed in both Scratchpad and Message register interfaces.

I agree with Jon to not make this change. The original interface is 
better. Making the interface similar to spad_read() has no value 
especially seeing it makes it less correct. As you mention, *msg can be 
any value (even -1) so this restricts the values possible message values 
(making future potential hidden bugs) and removes error information 
(making debugging more difficult).

I haven't really looked into it but, if anything, it would make sense to 
make the spad_read function more like this one.

Logan

[PATCH v2 02/15] NTB: Set dma mask and dma coherent mask to NTB devices

[Serge Semin]

The dma_mask and dma_coherent_mask fields of the NTB struct device
weren't initialized in hardware drivers. In fact it should be done
instead of PCIe interface usage, since NTB clients are supposed to
use NTB API only and left unaware of real hardware implementation.
In addition to that ntb_device_register() method shouldn't clear
the passed ntb_dev structure, since it dma_mask is initialized
by hardware drivers.

Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
---
 drivers/ntb/hw/amd/ntb_hw_amd.c     | 4 ++++
 drivers/ntb/hw/idt/ntb_hw_idt.c     | 8 +++++++-
 drivers/ntb/hw/intel/ntb_hw_intel.c | 4 ++++
 drivers/ntb/ntb.c                   | 1 -
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/drivers/ntb/hw/amd/ntb_hw_amd.c b/drivers/ntb/hw/amd/ntb_hw_amd.c
index f0788aae05c9..3cfa46876239 100644
--- a/drivers/ntb/hw/amd/ntb_hw_amd.c
+++ b/drivers/ntb/hw/amd/ntb_hw_amd.c
@@ -1020,6 +1020,10 @@ static int amd_ntb_init_pci(struct amd_ntb_dev *ndev,
 			goto err_dma_mask;
 		dev_warn(&pdev->dev, "Cannot DMA consistent highmem\n");
 	}
+	rc = dma_coerce_mask_and_coherent(&ndev->ntb.dev,
+					  dma_get_mask(&pdev->dev));
+	if (rc)
+		goto err_dma_mask;
 
 	ndev->self_mmio = pci_iomap(pdev, 0, 0);
 	if (!ndev->self_mmio) {
diff --git a/drivers/ntb/hw/idt/ntb_hw_idt.c b/drivers/ntb/hw/idt/ntb_hw_idt.c
index 6fb87c0f0d97..d87dbd4bc82c 100644
--- a/drivers/ntb/hw/idt/ntb_hw_idt.c
+++ b/drivers/ntb/hw/idt/ntb_hw_idt.c
@@ -2426,7 +2426,7 @@ static int idt_init_pci(struct idt_ntb_dev *ndev)
 	struct pci_dev *pdev = ndev->ntb.pdev;
 	int ret;
 
-	/* Initialize the bit mask of DMA */
+	/* Initialize the bit mask of PCI/NTB DMA */
 	ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(64));
 	if (ret != 0) {
 		ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
@@ -2447,6 +2447,12 @@ static int idt_init_pci(struct idt_ntb_dev *ndev)
 		dev_warn(&pdev->dev,
 			"Cannot set consistent DMA highmem bit mask\n");
 	}
+	ret = dma_coerce_mask_and_coherent(&ndev->ntb.dev,
+					   dma_get_mask(&pdev->dev));
+	if (ret != 0) {
+		dev_err(&pdev->dev, "Failed to set NTB device DMA bit mask\n");
+		return ret;
+	}
 
 	/*
 	 * Enable the device advanced error reporting. It's not critical to
diff --git a/drivers/ntb/hw/intel/ntb_hw_intel.c b/drivers/ntb/hw/intel/ntb_hw_intel.c
index 4de074a86073..ea6c82f8655f 100644
--- a/drivers/ntb/hw/intel/ntb_hw_intel.c
+++ b/drivers/ntb/hw/intel/ntb_hw_intel.c
@@ -2586,6 +2586,10 @@ static int intel_ntb_init_pci(struct intel_ntb_dev *ndev, struct pci_dev *pdev)
 			goto err_dma_mask;
 		dev_warn(&pdev->dev, "Cannot DMA consistent highmem\n");
 	}
+	rc = dma_coerce_mask_and_coherent(&ndev->ntb.dev,
+					  dma_get_mask(&pdev->dev));
+	if (rc)
+		goto err_dma_mask;
 
 	ndev->self_mmio = pci_iomap(pdev, 0, 0);
 	if (!ndev->self_mmio) {
diff --git a/drivers/ntb/ntb.c b/drivers/ntb/ntb.c
index 03b80d89b980..79e50a5f8902 100644
--- a/drivers/ntb/ntb.c
+++ b/drivers/ntb/ntb.c
@@ -112,7 +112,6 @@ int ntb_register_device(struct ntb_dev *ntb)
 
 	init_completion(&ntb->released);
 
-	memset(&ntb->dev, 0, sizeof(ntb->dev));
 	ntb->dev.bus = &ntb_bus;
 	ntb->dev.parent = &ntb->pdev->dev;
 	ntb->dev.release = ntb_dev_release;
-- 
2.12.0

Re: [PATCH v2 02/15] NTB: Set dma mask and dma coherent mask to NTB devices

[Jon Mason]

On Sun, Dec 3, 2017 at 2:17 PM, Serge Semin <fancer.lancer@gmail.com> wrote:
> The dma_mask and dma_coherent_mask fields of the NTB struct device
> weren't initialized in hardware drivers. In fact it should be done
> instead of PCIe interface usage, since NTB clients are supposed to
> use NTB API only and left unaware of real hardware implementation.
> In addition to that ntb_device_register() method shouldn't clear
> the passed ntb_dev structure, since it dma_mask is initialized
> by hardware drivers.

This seems like a bug fix.  Should this be broken out of this patch or
is it not noticed without your changes?

Thanks,
Jon

> Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
> ---
>  drivers/ntb/hw/amd/ntb_hw_amd.c     | 4 ++++
>  drivers/ntb/hw/idt/ntb_hw_idt.c     | 8 +++++++-
>  drivers/ntb/hw/intel/ntb_hw_intel.c | 4 ++++
>  drivers/ntb/ntb.c                   | 1 -
>  4 files changed, 15 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/ntb/hw/amd/ntb_hw_amd.c b/drivers/ntb/hw/amd/ntb_hw_amd.c
> index f0788aae05c9..3cfa46876239 100644
> --- a/drivers/ntb/hw/amd/ntb_hw_amd.c
> +++ b/drivers/ntb/hw/amd/ntb_hw_amd.c
> @@ -1020,6 +1020,10 @@ static int amd_ntb_init_pci(struct amd_ntb_dev *ndev,
>                         goto err_dma_mask;
>                 dev_warn(&pdev->dev, "Cannot DMA consistent highmem\n");
>         }
> +       rc = dma_coerce_mask_and_coherent(&ndev->ntb.dev,
> +                                         dma_get_mask(&pdev->dev));
> +       if (rc)
> +               goto err_dma_mask;
>
>         ndev->self_mmio = pci_iomap(pdev, 0, 0);
>         if (!ndev->self_mmio) {
> diff --git a/drivers/ntb/hw/idt/ntb_hw_idt.c b/drivers/ntb/hw/idt/ntb_hw_idt.c
> index 6fb87c0f0d97..d87dbd4bc82c 100644
> --- a/drivers/ntb/hw/idt/ntb_hw_idt.c
> +++ b/drivers/ntb/hw/idt/ntb_hw_idt.c
> @@ -2426,7 +2426,7 @@ static int idt_init_pci(struct idt_ntb_dev *ndev)
>         struct pci_dev *pdev = ndev->ntb.pdev;
>         int ret;
>
> -       /* Initialize the bit mask of DMA */
> +       /* Initialize the bit mask of PCI/NTB DMA */
>         ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(64));
>         if (ret != 0) {
>                 ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
> @@ -2447,6 +2447,12 @@ static int idt_init_pci(struct idt_ntb_dev *ndev)
>                 dev_warn(&pdev->dev,
>                         "Cannot set consistent DMA highmem bit mask\n");
>         }
> +       ret = dma_coerce_mask_and_coherent(&ndev->ntb.dev,
> +                                          dma_get_mask(&pdev->dev));
> +       if (ret != 0) {
> +               dev_err(&pdev->dev, "Failed to set NTB device DMA bit mask\n");
> +               return ret;
> +       }
>
>         /*
>          * Enable the device advanced error reporting. It's not critical to
> diff --git a/drivers/ntb/hw/intel/ntb_hw_intel.c b/drivers/ntb/hw/intel/ntb_hw_intel.c
> index 4de074a86073..ea6c82f8655f 100644
> --- a/drivers/ntb/hw/intel/ntb_hw_intel.c
> +++ b/drivers/ntb/hw/intel/ntb_hw_intel.c
> @@ -2586,6 +2586,10 @@ static int intel_ntb_init_pci(struct intel_ntb_dev *ndev, struct pci_dev *pdev)
>                         goto err_dma_mask;
>                 dev_warn(&pdev->dev, "Cannot DMA consistent highmem\n");
>         }
> +       rc = dma_coerce_mask_and_coherent(&ndev->ntb.dev,
> +                                         dma_get_mask(&pdev->dev));
> +       if (rc)
> +               goto err_dma_mask;
>
>         ndev->self_mmio = pci_iomap(pdev, 0, 0);
>         if (!ndev->self_mmio) {
> diff --git a/drivers/ntb/ntb.c b/drivers/ntb/ntb.c
> index 03b80d89b980..79e50a5f8902 100644
> --- a/drivers/ntb/ntb.c
> +++ b/drivers/ntb/ntb.c
> @@ -112,7 +112,6 @@ int ntb_register_device(struct ntb_dev *ntb)
>
>         init_completion(&ntb->released);
>
> -       memset(&ntb->dev, 0, sizeof(ntb->dev));
>         ntb->dev.bus = &ntb_bus;
>         ntb->dev.parent = &ntb->pdev->dev;
>         ntb->dev.release = ntb_dev_release;
> --
> 2.12.0
>

Re: [PATCH v2 02/15] NTB: Set dma mask and dma coherent mask to NTB devices

[Logan Gunthorpe]

On 05/12/17 09:51 AM, Jon Mason wrote:
> On Sun, Dec 3, 2017 at 2:17 PM, Serge Semin <fancer.lancer@gmail.com> wrote:
>> The dma_mask and dma_coherent_mask fields of the NTB struct device
>> weren't initialized in hardware drivers. In fact it should be done
>> instead of PCIe interface usage, since NTB clients are supposed to
>> use NTB API only and left unaware of real hardware implementation.
>> In addition to that ntb_device_register() method shouldn't clear
>> the passed ntb_dev structure, since it dma_mask is initialized
>> by hardware drivers.
> 
> This seems like a bug fix.  Should this be broken out of this patch or
> is it not noticed without your changes?

I was digging into this a bit more and in addition to my earlier review 
comments I think the patch is incorrect for a couple reasons:

1) dma_set_mask() (and friends) are meant to inform the kernel of device 
specific restrictions it cannot know. Calling it with the parent PCI 
device's mask seems pointless.

2) Every dma_alloc() call in the NTB subsystem uses the PCI device's 
struct device. This is ugly in itself but until it changes this patch 
does nothing.

Logan

Re: [PATCH v2 02/15] NTB: Set dma mask and dma coherent mask to NTB devices

[Serge Semin]

On Tue, Dec 05, 2017 at 11:51:08AM -0500, Jon Mason <jdmason@kudzu.us> wrote:
> On Sun, Dec 3, 2017 at 2:17 PM, Serge Semin <fancer.lancer@gmail.com> wrote:
> > The dma_mask and dma_coherent_mask fields of the NTB struct device
> > weren't initialized in hardware drivers. In fact it should be done
> > instead of PCIe interface usage, since NTB clients are supposed to
> > use NTB API only and left unaware of real hardware implementation.
> > In addition to that ntb_device_register() method shouldn't clear
> > the passed ntb_dev structure, since it dma_mask is initialized
> > by hardware drivers.
> 
> This seems like a bug fix.  Should this be broken out of this patch or
> is it not noticed without your changes?
> 

Yes, this is a bug fix. All the NTB API users shouldn't know what hardware type
is hidden behind it, so the code would be portable for all NTB devices. In this
case NTB device should have dma_masks being properly initialized. Since we pass
DMA addresses to the PCI device then in hardware drivers, it's justified to
copy the masks to NTB device, so the client drivers could allocate the proper
memory addresses.
It can't be broken out, since dma_alloc_coherent() is called in ntb_perf
driver with NTB device passed now. We discovered the problem when the series was
tested on the Intel platform. The same is with ntb_tool driver.

Thanks,
-Sergey

> Thanks,
> Jon
> 
> > Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
> > ---
> >  drivers/ntb/hw/amd/ntb_hw_amd.c     | 4 ++++
> >  drivers/ntb/hw/idt/ntb_hw_idt.c     | 8 +++++++-
> >  drivers/ntb/hw/intel/ntb_hw_intel.c | 4 ++++
> >  drivers/ntb/ntb.c                   | 1 -
> >  4 files changed, 15 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/ntb/hw/amd/ntb_hw_amd.c b/drivers/ntb/hw/amd/ntb_hw_amd.c
> > index f0788aae05c9..3cfa46876239 100644
> > --- a/drivers/ntb/hw/amd/ntb_hw_amd.c
> > +++ b/drivers/ntb/hw/amd/ntb_hw_amd.c
> > @@ -1020,6 +1020,10 @@ static int amd_ntb_init_pci(struct amd_ntb_dev *ndev,
> >                         goto err_dma_mask;
> >                 dev_warn(&pdev->dev, "Cannot DMA consistent highmem\n");
> >         }
> > +       rc = dma_coerce_mask_and_coherent(&ndev->ntb.dev,
> > +                                         dma_get_mask(&pdev->dev));
> > +       if (rc)
> > +               goto err_dma_mask;
> >
> >         ndev->self_mmio = pci_iomap(pdev, 0, 0);
> >         if (!ndev->self_mmio) {
> > diff --git a/drivers/ntb/hw/idt/ntb_hw_idt.c b/drivers/ntb/hw/idt/ntb_hw_idt.c
> > index 6fb87c0f0d97..d87dbd4bc82c 100644
> > --- a/drivers/ntb/hw/idt/ntb_hw_idt.c
> > +++ b/drivers/ntb/hw/idt/ntb_hw_idt.c
> > @@ -2426,7 +2426,7 @@ static int idt_init_pci(struct idt_ntb_dev *ndev)
> >         struct pci_dev *pdev = ndev->ntb.pdev;
> >         int ret;
> >
> > -       /* Initialize the bit mask of DMA */
> > +       /* Initialize the bit mask of PCI/NTB DMA */
> >         ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(64));
> >         if (ret != 0) {
> >                 ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
> > @@ -2447,6 +2447,12 @@ static int idt_init_pci(struct idt_ntb_dev *ndev)
> >                 dev_warn(&pdev->dev,
> >                         "Cannot set consistent DMA highmem bit mask\n");
> >         }
> > +       ret = dma_coerce_mask_and_coherent(&ndev->ntb.dev,
> > +                                          dma_get_mask(&pdev->dev));
> > +       if (ret != 0) {
> > +               dev_err(&pdev->dev, "Failed to set NTB device DMA bit mask\n");
> > +               return ret;
> > +       }
> >
> >         /*
> >          * Enable the device advanced error reporting. It's not critical to
> > diff --git a/drivers/ntb/hw/intel/ntb_hw_intel.c b/drivers/ntb/hw/intel/ntb_hw_intel.c
> > index 4de074a86073..ea6c82f8655f 100644
> > --- a/drivers/ntb/hw/intel/ntb_hw_intel.c
> > +++ b/drivers/ntb/hw/intel/ntb_hw_intel.c
> > @@ -2586,6 +2586,10 @@ static int intel_ntb_init_pci(struct intel_ntb_dev *ndev, struct pci_dev *pdev)
> >                         goto err_dma_mask;
> >                 dev_warn(&pdev->dev, "Cannot DMA consistent highmem\n");
> >         }
> > +       rc = dma_coerce_mask_and_coherent(&ndev->ntb.dev,
> > +                                         dma_get_mask(&pdev->dev));
> > +       if (rc)
> > +               goto err_dma_mask;
> >
> >         ndev->self_mmio = pci_iomap(pdev, 0, 0);
> >         if (!ndev->self_mmio) {
> > diff --git a/drivers/ntb/ntb.c b/drivers/ntb/ntb.c
> > index 03b80d89b980..79e50a5f8902 100644
> > --- a/drivers/ntb/ntb.c
> > +++ b/drivers/ntb/ntb.c
> > @@ -112,7 +112,6 @@ int ntb_register_device(struct ntb_dev *ntb)
> >
> >         init_completion(&ntb->released);
> >
> > -       memset(&ntb->dev, 0, sizeof(ntb->dev));
> >         ntb->dev.bus = &ntb_bus;
> >         ntb->dev.parent = &ntb->pdev->dev;
> >         ntb->dev.release = ntb_dev_release;
> > --
> > 2.12.0
> >

[PATCH v2 03/15] NTB: Fix UB/bug in ntb_mw_get_align()

[Serge Semin]

Simple (1 << pidx) operation causes undefined behaviour when
pidx >= 32. It must be casted to u64 to match the actual return
value of ntb_link_is_up() method, so to have all the possible
peer indexes covered and to get rid of undefined behaviour.
Additionally there are special macros in "linux/bitops.h" to perform
the bit-set-shift operations, so it's recommended to have them used
for proper bit setting.

Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
Reviewed-by: Logan Gunthorpe <logang@deltatee.com>
---
 include/linux/ntb.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/linux/ntb.h b/include/linux/ntb.h
index c1646f2c6344..488e586fb76c 100644
--- a/include/linux/ntb.h
+++ b/include/linux/ntb.h
@@ -764,7 +764,7 @@ static inline int ntb_mw_get_align(struct ntb_dev *ntb, int pidx, int widx,
 				   resource_size_t *size_align,
 				   resource_size_t *size_max)
 {
-	if (!(ntb_link_is_up(ntb, NULL, NULL) & (1 << pidx)))
+	if (!(ntb_link_is_up(ntb, NULL, NULL) & BIT_ULL(pidx)))
 		return -ENOTCONN;
 
 	return ntb->ops->mw_get_align(ntb, pidx, widx, addr_align, size_align,
-- 
2.12.0

Re: [PATCH v2 03/15] NTB: Fix UB/bug in ntb_mw_get_align()

[Jon Mason]

On Sun, Dec 3, 2017 at 2:17 PM, Serge Semin <fancer.lancer@gmail.com> wrote:
> Simple (1 << pidx) operation causes undefined behaviour when
> pidx >= 32. It must be casted to u64 to match the actual return
> value of ntb_link_is_up() method, so to have all the possible
> peer indexes covered and to get rid of undefined behaviour.
> Additionally there are special macros in "linux/bitops.h" to perform
> the bit-set-shift operations, so it's recommended to have them used
> for proper bit setting.

This looks good to me, but also seems like a bug fix.  Please comment
on if this is not noticed.

Thanks,
Jon

>
> Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
> Reviewed-by: Logan Gunthorpe <logang@deltatee.com>
> ---
>  include/linux/ntb.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/include/linux/ntb.h b/include/linux/ntb.h
> index c1646f2c6344..488e586fb76c 100644
> --- a/include/linux/ntb.h
> +++ b/include/linux/ntb.h
> @@ -764,7 +764,7 @@ static inline int ntb_mw_get_align(struct ntb_dev *ntb, int pidx, int widx,
>                                    resource_size_t *size_align,
>                                    resource_size_t *size_max)
>  {
> -       if (!(ntb_link_is_up(ntb, NULL, NULL) & (1 << pidx)))
> +       if (!(ntb_link_is_up(ntb, NULL, NULL) & BIT_ULL(pidx)))
>                 return -ENOTCONN;
>
>         return ntb->ops->mw_get_align(ntb, pidx, widx, addr_align, size_align,
> --
> 2.12.0
>

Re: [PATCH v2 03/15] NTB: Fix UB/bug in ntb_mw_get_align()

[Logan Gunthorpe]

On 05/12/17 09:52 AM, Jon Mason wrote:
> On Sun, Dec 3, 2017 at 2:17 PM, Serge Semin <fancer.lancer@gmail.com> wrote:
>> Simple (1 << pidx) operation causes undefined behaviour when
>> pidx >= 32. It must be casted to u64 to match the actual return
>> value of ntb_link_is_up() method, so to have all the possible
>> peer indexes covered and to get rid of undefined behaviour.
>> Additionally there are special macros in "linux/bitops.h" to perform
>> the bit-set-shift operations, so it's recommended to have them used
>> for proper bit setting.
> 
> This looks good to me, but also seems like a bug fix.  Please comment
> on if this is not noticed.

It would be a bug on any system that has more than 32 partitions which 
is run on a 32 bit machine (or 64 partitions on a 64bit machine). Such a 
system is theoretical for the foreseeable future. But it would be good 
to fix it now.

Logan

Re: [PATCH v2 03/15] NTB: Fix UB/bug in ntb_mw_get_align()

[Jon Mason]

On Tue, Dec 5, 2017 at 12:01 PM, Logan Gunthorpe <logang@deltatee.com> wrote:
>
>
> On 05/12/17 09:52 AM, Jon Mason wrote:
>>
>> On Sun, Dec 3, 2017 at 2:17 PM, Serge Semin <fancer.lancer@gmail.com>
>> wrote:
>>>
>>> Simple (1 << pidx) operation causes undefined behaviour when
>>> pidx >= 32. It must be casted to u64 to match the actual return
>>> value of ntb_link_is_up() method, so to have all the possible
>>> peer indexes covered and to get rid of undefined behaviour.
>>> Additionally there are special macros in "linux/bitops.h" to perform
>>> the bit-set-shift operations, so it's recommended to have them used
>>> for proper bit setting.
>>
>>
>> This looks good to me, but also seems like a bug fix.  Please comment
>> on if this is not noticed.
>
>
> It would be a bug on any system that has more than 32 partitions which is
> run on a 32 bit machine (or 64 partitions on a 64bit machine). Such a system
> is theoretical for the foreseeable future. But it would be good to fix it
> now.

Seems like a non-issue then.  Disregard.

>
> Logan
>
> --
> You received this message because you are subscribed to the Google Groups
> "linux-ntb" group.
> To unsubscribe from this group and stop receiving emails from it, send an
> email to linux-ntb+unsubscribe@googlegroups.com.
> To post to this group, send email to linux-ntb@googlegroups.com.
> To view this discussion on the web visit
> https://groups.google.com/d/msgid/linux-ntb/8859c11b-6c6b-3780-c13a-2ae0affd7033%40deltatee.com.
> For more options, visit https://groups.google.com/d/optout.

Re: [PATCH v2 03/15] NTB: Fix UB/bug in ntb_mw_get_align()

[Serge Semin]

On Tue, Dec 05, 2017 at 11:52:32AM -0500, Jon Mason <jdmason@kudzu.us> wrote:
> On Sun, Dec 3, 2017 at 2:17 PM, Serge Semin <fancer.lancer@gmail.com> wrote:
> > Simple (1 << pidx) operation causes undefined behaviour when
> > pidx >= 32. It must be casted to u64 to match the actual return
> > value of ntb_link_is_up() method, so to have all the possible
> > peer indexes covered and to get rid of undefined behaviour.
> > Additionally there are special macros in "linux/bitops.h" to perform
> > the bit-set-shift operations, so it's recommended to have them used
> > for proper bit setting.
> 
> This looks good to me, but also seems like a bug fix.  Please comment
> on if this is not noticed.
> 

The consequences of the bug isn't noticeable at the moment, but potentially
it can be seen on the devices like Switchtec (when multi-portness is finally
added). Anyway it's better to fix it now, than to wait for obvious bug.
Additionally as I said the originator of the code should have used BIT_ULL
instead of the pure bit shifting.

Thanks,
-Sergey

> Thanks,
> Jon
> 
> >
> > Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
> > Reviewed-by: Logan Gunthorpe <logang@deltatee.com>
> > ---
> >  include/linux/ntb.h | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/include/linux/ntb.h b/include/linux/ntb.h
> > index c1646f2c6344..488e586fb76c 100644
> > --- a/include/linux/ntb.h
> > +++ b/include/linux/ntb.h
> > @@ -764,7 +764,7 @@ static inline int ntb_mw_get_align(struct ntb_dev *ntb, int pidx, int widx,
> >                                    resource_size_t *size_align,
> >                                    resource_size_t *size_max)
> >  {
> > -       if (!(ntb_link_is_up(ntb, NULL, NULL) & (1 << pidx)))
> > +       if (!(ntb_link_is_up(ntb, NULL, NULL) & BIT_ULL(pidx)))
> >                 return -ENOTCONN;
> >
> >         return ntb->ops->mw_get_align(ntb, pidx, widx, addr_align, size_align,
> > --
> > 2.12.0
> >

Re: [PATCH v2 03/15] NTB: Fix UB/bug in ntb_mw_get_align()

[Jon Mason]

On Tue, Dec 5, 2017 at 12:56 PM, Serge Semin <fancer.lancer@gmail.com> wrote:
> On Tue, Dec 05, 2017 at 11:52:32AM -0500, Jon Mason <jdmason@kudzu.us> wrote:
>> On Sun, Dec 3, 2017 at 2:17 PM, Serge Semin <fancer.lancer@gmail.com> wrote:
>> > Simple (1 << pidx) operation causes undefined behaviour when
>> > pidx >= 32. It must be casted to u64 to match the actual return
>> > value of ntb_link_is_up() method, so to have all the possible
>> > peer indexes covered and to get rid of undefined behaviour.
>> > Additionally there are special macros in "linux/bitops.h" to perform
>> > the bit-set-shift operations, so it's recommended to have them used
>> > for proper bit setting.
>>
>> This looks good to me, but also seems like a bug fix.  Please comment
>> on if this is not noticed.
>>
>
> The consequences of the bug isn't noticeable at the moment, but potentially
> it can be seen on the devices like Switchtec (when multi-portness is finally
> added). Anyway it's better to fix it now, than to wait for obvious bug.
> Additionally as I said the originator of the code should have used BIT_ULL
> instead of the pure bit shifting.

This is more of a question of whether it should go into -stable and be
outside this patch set.  If this is impossible to ever hit, then
including it here instead of fast tracking it in -stable is fine.

Thanks,
Jon

>
> Thanks,
> -Sergey
>
>> Thanks,
>> Jon
>>
>> >
>> > Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
>> > Reviewed-by: Logan Gunthorpe <logang@deltatee.com>
>> > ---
>> >  include/linux/ntb.h | 2 +-
>> >  1 file changed, 1 insertion(+), 1 deletion(-)
>> >
>> > diff --git a/include/linux/ntb.h b/include/linux/ntb.h
>> > index c1646f2c6344..488e586fb76c 100644
>> > --- a/include/linux/ntb.h
>> > +++ b/include/linux/ntb.h
>> > @@ -764,7 +764,7 @@ static inline int ntb_mw_get_align(struct ntb_dev *ntb, int pidx, int widx,
>> >                                    resource_size_t *size_align,
>> >                                    resource_size_t *size_max)
>> >  {
>> > -       if (!(ntb_link_is_up(ntb, NULL, NULL) & (1 << pidx)))
>> > +       if (!(ntb_link_is_up(ntb, NULL, NULL) & BIT_ULL(pidx)))
>> >                 return -ENOTCONN;
>> >
>> >         return ntb->ops->mw_get_align(ntb, pidx, widx, addr_align, size_align,
>> > --
>> > 2.12.0
>> >

Re: [PATCH v2 03/15] NTB: Fix UB/bug in ntb_mw_get_align()

[Serge Semin]

On Tue, Dec 05, 2017 at 01:08:44PM -0500, Jon Mason <jdmason@kudzu.us> wrote:
> On Tue, Dec 5, 2017 at 12:56 PM, Serge Semin <fancer.lancer@gmail.com> wrote:
> > On Tue, Dec 05, 2017 at 11:52:32AM -0500, Jon Mason <jdmason@kudzu.us> wrote:
> >> On Sun, Dec 3, 2017 at 2:17 PM, Serge Semin <fancer.lancer@gmail.com> wrote:
> >> > Simple (1 << pidx) operation causes undefined behaviour when
> >> > pidx >= 32. It must be casted to u64 to match the actual return
> >> > value of ntb_link_is_up() method, so to have all the possible
> >> > peer indexes covered and to get rid of undefined behaviour.
> >> > Additionally there are special macros in "linux/bitops.h" to perform
> >> > the bit-set-shift operations, so it's recommended to have them used
> >> > for proper bit setting.
> >>
> >> This looks good to me, but also seems like a bug fix.  Please comment
> >> on if this is not noticed.
> >>
> >
> > The consequences of the bug isn't noticeable at the moment, but potentially
> > it can be seen on the devices like Switchtec (when multi-portness is finally
> > added). Anyway it's better to fix it now, than to wait for obvious bug.
> > Additionally as I said the originator of the code should have used BIT_ULL
> > instead of the pure bit shifting.
> 
> This is more of a question of whether it should go into -stable and be
> outside this patch set.  If this is impossible to ever hit, then
> including it here instead of fast tracking it in -stable is fine.
> 
> Thanks,
> Jon
> 

Yeah, it can wait.

Thanks,
-Sergey

> >
> > Thanks,
> > -Sergey
> >
> >> Thanks,
> >> Jon
> >>
> >> >
> >> > Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
> >> > Reviewed-by: Logan Gunthorpe <logang@deltatee.com>
> >> > ---
> >> >  include/linux/ntb.h | 2 +-
> >> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >> >
> >> > diff --git a/include/linux/ntb.h b/include/linux/ntb.h
> >> > index c1646f2c6344..488e586fb76c 100644
> >> > --- a/include/linux/ntb.h
> >> > +++ b/include/linux/ntb.h
> >> > @@ -764,7 +764,7 @@ static inline int ntb_mw_get_align(struct ntb_dev *ntb, int pidx, int widx,
> >> >                                    resource_size_t *size_align,
> >> >                                    resource_size_t *size_max)
> >> >  {
> >> > -       if (!(ntb_link_is_up(ntb, NULL, NULL) & (1 << pidx)))
> >> > +       if (!(ntb_link_is_up(ntb, NULL, NULL) & BIT_ULL(pidx)))
> >> >                 return -ENOTCONN;
> >> >
> >> >         return ntb->ops->mw_get_align(ntb, pidx, widx, addr_align, size_align,
> >> > --
> >> > 2.12.0
> >> >

[PATCH v2 04/15] NTB: ntb_pp: Add full multi-port NTB API support

[Serge Semin]

NTB API has been updated to support multi-port devices like IDT
89HPESx series or Microsemi Switchtec. Message registers
functionality has also been added to new API. In order to keep
the new hardware and corresponding capabilities well tested, NTB
pingpong driver is accordingly altered.

Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
---

Changelog v1:
- Add Multi-port API support
- Ping-pong now works like cyclic ping around all the peers

Changelog v2:
- Remove driver Author/Description/Version macros

 drivers/ntb/test/ntb_pingpong.c | 450 +++++++++++++++++++++++++---------------
 1 file changed, 286 insertions(+), 164 deletions(-)

diff --git a/drivers/ntb/test/ntb_pingpong.c b/drivers/ntb/test/ntb_pingpong.c
index 3f5a92bae6f8..3e4a35a856cc 100644
--- a/drivers/ntb/test/ntb_pingpong.c
+++ b/drivers/ntb/test/ntb_pingpong.c
@@ -1,10 +1,11 @@
 /*
- * This file is provided under a dual BSD/GPLv2 license.  When using or
+ *   This file is provided under a dual BSD/GPLv2 license.  When using or
  *   redistributing this file, you may do so under either license.
  *
  *   GPL LICENSE SUMMARY
  *
  *   Copyright (C) 2015 EMC Corporation. All Rights Reserved.
+ *   Copyright (C) 2017 T-Platforms. All Rights Reserved.
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of version 2 of the GNU General Public License as
@@ -18,6 +19,7 @@
  *   BSD LICENSE
  *
  *   Copyright (C) 2015 EMC Corporation. All Rights Reserved.
+ *   Copyright (C) 2017 T-Platforms. All Rights Reserved.
  *
  *   Redistribution and use in source and binary forms, with or without
  *   modification, are permitted provided that the following conditions
@@ -49,34 +51,46 @@
  *
  * Contact Information:
  * Allen Hubbe <Allen.Hubbe@emc.com>
+ * Serge Semin <fancer.lancer@gmail.com>, <Sergey.Semin@t-platforms.ru>
  */
 
-/* Note: load this module with option 'dyndbg=+p' */
+/*
+ * How to use this tool, by example.
+ *
+ * Assuming $DBG_DIR is something like:
+ * '/sys/kernel/debug/ntb_perf/0000:00:03.0'
+ * Suppose aside from local device there is at least one remote device
+ * connected to NTB with index 0.
+ *-----------------------------------------------------------------------------
+ * Eg: install driver with specified delay between doorbell event and response
+ *
+ * root@self# insmod ntb_pingpong.ko delay_ms=1000
+ *-----------------------------------------------------------------------------
+ * Eg: get number of ping-pong cycles performed
+ *
+ * root@self# cat $DBG_DIR/count
+ */
 
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/device.h>
+#include <linux/bitops.h>
 
-#include <linux/dma-mapping.h>
 #include <linux/pci.h>
 #include <linux/slab.h>
-#include <linux/spinlock.h>
+#include <linux/hrtimer.h>
 #include <linux/debugfs.h>
 
 #include <linux/ntb.h>
 
-#define DRIVER_NAME			"ntb_pingpong"
-#define DRIVER_DESCRIPTION		"PCIe NTB Simple Pingpong Client"
-
-#define DRIVER_LICENSE			"Dual BSD/GPL"
-#define DRIVER_VERSION			"1.0"
-#define DRIVER_RELDATE			"24 March 2015"
-#define DRIVER_AUTHOR			"Allen Hubbe <Allen.Hubbe@emc.com>"
+#define DRIVER_NAME		"ntb_pingpong"
+#define DRIVER_VERSION		"2.0"
 
-MODULE_LICENSE(DRIVER_LICENSE);
+MODULE_LICENSE("Dual BSD/GPL");
 MODULE_VERSION(DRIVER_VERSION);
-MODULE_AUTHOR(DRIVER_AUTHOR);
-MODULE_DESCRIPTION(DRIVER_DESCRIPTION);
+MODULE_AUTHOR("Allen Hubbe <Allen.Hubbe@emc.com>");
+MODULE_DESCRIPTION("PCIe NTB Simple Pingpong Client");
 
 static unsigned int unsafe;
 module_param(unsafe, uint, 0644);
@@ -86,237 +100,345 @@ static unsigned int delay_ms = 1000;
 module_param(delay_ms, uint, 0644);
 MODULE_PARM_DESC(delay_ms, "Milliseconds to delay the response to peer");
 
-static unsigned long db_init = 0x7;
-module_param(db_init, ulong, 0644);
-MODULE_PARM_DESC(db_init, "Initial doorbell bits to ring on the peer");
-
-/* Only two-ports NTB devices are supported */
-#define PIDX		NTB_DEF_PEER_IDX
-
 struct pp_ctx {
-	struct ntb_dev			*ntb;
-	u64				db_bits;
-	/* synchronize access to db_bits by ping and pong */
-	spinlock_t			db_lock;
-	struct timer_list		db_timer;
-	unsigned long			db_delay;
-	struct dentry			*debugfs_node_dir;
-	struct dentry			*debugfs_count;
-	atomic_t			count;
+	struct ntb_dev *ntb;
+	struct hrtimer timer;
+	u64 in_db;
+	u64 out_db;
+	int out_pidx;
+	u64 nmask;
+	u64 pmask;
+	atomic_t count;
+	spinlock_t lock;
+	struct dentry *dbgfs_dir;
 };
+#define to_pp_timer(__timer) \
+	container_of(__timer, struct pp_ctx, timer)
 
-static struct dentry *pp_debugfs_dir;
+static struct dentry *pp_dbgfs_topdir;
 
-static void pp_ping(struct timer_list *t)
+static int pp_find_next_peer(struct pp_ctx *pp)
 {
-	struct pp_ctx *pp = from_timer(pp, t, db_timer);
-	unsigned long irqflags;
-	u64 db_bits, db_mask;
-	u32 spad_rd, spad_wr;
+	u64 link, out_db;
+	int pidx;
+
+	link = ntb_link_is_up(pp->ntb, NULL, NULL);
+
+	/* Find next available peer */
+	if (link & pp->nmask) {
+		pidx = __ffs64(link & pp->nmask);
+		out_db = BIT_ULL(pidx + 1);
+	} else if (link & pp->pmask) {
+		pidx = __ffs64(link & pp->pmask);
+		out_db = BIT_ULL(pidx);
+	} else {
+		return -ENODEV;
+	}
 
-	spin_lock_irqsave(&pp->db_lock, irqflags);
-	{
-		db_mask = ntb_db_valid_mask(pp->ntb);
-		db_bits = ntb_db_read(pp->ntb);
+	spin_lock(&pp->lock);
+	pp->out_pidx = pidx;
+	pp->out_db = out_db;
+	spin_unlock(&pp->lock);
 
-		if (db_bits) {
-			dev_dbg(&pp->ntb->dev,
-				"Masked pongs %#llx\n",
-				db_bits);
-			ntb_db_clear(pp->ntb, db_bits);
-		}
+	return 0;
+}
 
-		db_bits = ((pp->db_bits | db_bits) << 1) & db_mask;
+static void pp_setup(struct pp_ctx *pp)
+{
+	int ret;
 
-		if (!db_bits)
-			db_bits = db_init;
+	ntb_db_set_mask(pp->ntb, pp->in_db);
 
-		spad_rd = ntb_spad_read(pp->ntb, 0);
-		spad_wr = spad_rd + 1;
+	hrtimer_cancel(&pp->timer);
 
-		dev_dbg(&pp->ntb->dev,
-			"Ping bits %#llx read %#x write %#x\n",
-			db_bits, spad_rd, spad_wr);
+	ret = pp_find_next_peer(pp);
+	if (ret == -ENODEV) {
+		dev_dbg(&pp->ntb->dev, "Got no peers, so cancel\n");
+		return;
+	}
 
-		ntb_peer_spad_write(pp->ntb, PIDX, 0, spad_wr);
-		ntb_peer_db_set(pp->ntb, db_bits);
-		ntb_db_clear_mask(pp->ntb, db_mask);
+	spin_lock(&pp->lock);
+	dev_dbg(&pp->ntb->dev, "Ping-pong started with port %d, db %#llx\n",
+		ntb_peer_port_number(pp->ntb, pp->out_pidx), pp->out_db);
+	spin_unlock(&pp->lock);
 
-		pp->db_bits = 0;
-	}
-	spin_unlock_irqrestore(&pp->db_lock, irqflags);
+	hrtimer_start(&pp->timer, ms_to_ktime(delay_ms), HRTIMER_MODE_REL);
 }
 
-static void pp_link_event(void *ctx)
+static void pp_clear(struct pp_ctx *pp)
 {
-	struct pp_ctx *pp = ctx;
+	hrtimer_cancel(&pp->timer);
 
-	if (ntb_link_is_up(pp->ntb, NULL, NULL) == 1) {
-		dev_dbg(&pp->ntb->dev, "link is up\n");
-		pp_ping(&pp->db_timer);
-	} else {
-		dev_dbg(&pp->ntb->dev, "link is down\n");
-		del_timer(&pp->db_timer);
-	}
+	ntb_db_set_mask(pp->ntb, pp->in_db);
+
+	dev_dbg(&pp->ntb->dev, "Ping-pong cancelled\n");
 }
 
-static void pp_db_event(void *ctx, int vec)
+static void pp_ping(struct pp_ctx *pp)
 {
-	struct pp_ctx *pp = ctx;
-	u64 db_bits, db_mask;
-	unsigned long irqflags;
+	u32 count;
 
-	spin_lock_irqsave(&pp->db_lock, irqflags);
-	{
-		db_mask = ntb_db_vector_mask(pp->ntb, vec);
-		db_bits = db_mask & ntb_db_read(pp->ntb);
-		ntb_db_set_mask(pp->ntb, db_mask);
-		ntb_db_clear(pp->ntb, db_bits);
+	count = atomic_read(&pp->count);
 
-		pp->db_bits |= db_bits;
+	spin_lock(&pp->lock);
+	ntb_peer_spad_write(pp->ntb, pp->out_pidx, 0, count);
+	ntb_peer_msg_write(pp->ntb, pp->out_pidx, 0, count);
 
-		mod_timer(&pp->db_timer, jiffies + pp->db_delay);
+	dev_dbg(&pp->ntb->dev, "Ping port %d spad %#x, msg %#x\n",
+		ntb_peer_port_number(pp->ntb, pp->out_pidx), count, count);
 
-		dev_dbg(&pp->ntb->dev,
-			"Pong vec %d bits %#llx\n",
-			vec, db_bits);
-		atomic_inc(&pp->count);
-	}
-	spin_unlock_irqrestore(&pp->db_lock, irqflags);
+	ntb_peer_db_set(pp->ntb, pp->out_db);
+	ntb_db_clear_mask(pp->ntb, pp->in_db);
+	spin_unlock(&pp->lock);
 }
 
-static int pp_debugfs_setup(struct pp_ctx *pp)
+static void pp_pong(struct pp_ctx *pp)
 {
-	struct pci_dev *pdev = pp->ntb->pdev;
+	u32 msg_data = -1, spad_data = -1;
+	int pidx = 0;
 
-	if (!pp_debugfs_dir)
-		return -ENODEV;
+	/* Read pong data */
+	spad_data = ntb_spad_read(pp->ntb, 0);
+	msg_data = ntb_msg_read(pp->ntb, &pidx, 0);
+	ntb_msg_clear_sts(pp->ntb, -1);
 
-	pp->debugfs_node_dir = debugfs_create_dir(pci_name(pdev),
-						  pp_debugfs_dir);
-	if (!pp->debugfs_node_dir)
-		return -ENODEV;
+	/*
+	 * Scratchpad and message data may differ, since message register can't
+	 * be rewritten unless status is cleared. Additionally either of them
+	 * might be unsupported
+	 */
+	dev_dbg(&pp->ntb->dev, "Pong spad %#x, msg %#x (port %d)\n",
+		spad_data, msg_data, ntb_peer_port_number(pp->ntb, pidx));
 
-	pp->debugfs_count = debugfs_create_atomic_t("count", S_IRUSR | S_IWUSR,
-						    pp->debugfs_node_dir,
-						    &pp->count);
-	if (!pp->debugfs_count)
-		return -ENODEV;
+	atomic_inc(&pp->count);
 
-	return 0;
+	ntb_db_set_mask(pp->ntb, pp->in_db);
+	ntb_db_clear(pp->ntb, pp->in_db);
+
+	hrtimer_start(&pp->timer, ms_to_ktime(delay_ms), HRTIMER_MODE_REL);
+}
+
+static enum hrtimer_restart pp_timer_func(struct hrtimer *t)
+{
+	struct pp_ctx *pp = to_pp_timer(t);
+
+	pp_ping(pp);
+
+	return HRTIMER_NORESTART;
+}
+
+static void pp_link_event(void *ctx)
+{
+	struct pp_ctx *pp = ctx;
+
+	pp_setup(pp);
+}
+
+static void pp_db_event(void *ctx, int vec)
+{
+	struct pp_ctx *pp = ctx;
+
+	pp_pong(pp);
 }
 
 static const struct ntb_ctx_ops pp_ops = {
 	.link_event = pp_link_event,
-	.db_event = pp_db_event,
+	.db_event = pp_db_event
 };
 
-static int pp_probe(struct ntb_client *client,
-		    struct ntb_dev *ntb)
+static int pp_check_ntb(struct ntb_dev *ntb)
 {
-	struct pp_ctx *pp;
-	int rc;
+	u64 pmask;
 
 	if (ntb_db_is_unsafe(ntb)) {
-		dev_dbg(&ntb->dev, "doorbell is unsafe\n");
-		if (!unsafe) {
-			rc = -EINVAL;
-			goto err_pp;
-		}
-	}
-
-	if (ntb_spad_count(ntb) < 1) {
-		dev_dbg(&ntb->dev, "no enough scratchpads\n");
-		rc = -EINVAL;
-		goto err_pp;
+		dev_dbg(&ntb->dev, "Doorbell is unsafe\n");
+		if (!unsafe)
+			return -EINVAL;
 	}
 
 	if (ntb_spad_is_unsafe(ntb)) {
-		dev_dbg(&ntb->dev, "scratchpad is unsafe\n");
-		if (!unsafe) {
-			rc = -EINVAL;
-			goto err_pp;
-		}
+		dev_dbg(&ntb->dev, "Scratchpad is unsafe\n");
+		if (!unsafe)
+			return -EINVAL;
 	}
 
-	if (ntb_peer_port_count(ntb) != NTB_DEF_PEER_CNT)
-		dev_warn(&ntb->dev, "multi-port NTB is unsupported\n");
+	pmask = GENMASK_ULL(ntb_peer_port_count(ntb), 0);
+	if ((ntb_db_valid_mask(ntb) & pmask) != pmask) {
+		dev_err(&ntb->dev, "Unsupported DB configuration\n");
+		return -EINVAL;
+	}
 
-	pp = kmalloc(sizeof(*pp), GFP_KERNEL);
-	if (!pp) {
-		rc = -ENOMEM;
-		goto err_pp;
+	if (ntb_spad_count(ntb) < 1 && ntb_msg_count(ntb) < 1) {
+		dev_dbg(&ntb->dev, "Scratchpads and messages unsupported\n");
+		return -EINVAL;
+	} else if (ntb_spad_count(ntb) < 1) {
+		dev_dbg(&ntb->dev, "Scratchpads unsupported\n");
+	} else if (ntb_msg_count(ntb) < 1) {
+		dev_dbg(&ntb->dev, "Messages unsupported\n");
 	}
 
+	return 0;
+}
+
+static struct pp_ctx *pp_create_data(struct ntb_dev *ntb)
+{
+	struct pp_ctx *pp;
+
+	pp = devm_kzalloc(&ntb->dev, sizeof(*pp), GFP_KERNEL);
+	if (!pp)
+		return ERR_PTR(-ENOMEM);
+
 	pp->ntb = ntb;
-	pp->db_bits = 0;
 	atomic_set(&pp->count, 0);
-	spin_lock_init(&pp->db_lock);
-	timer_setup(&pp->db_timer, pp_ping, 0);
-	pp->db_delay = msecs_to_jiffies(delay_ms);
+	spin_lock_init(&pp->lock);
+	hrtimer_init(&pp->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
+	pp->timer.function = pp_timer_func;
 
-	rc = ntb_set_ctx(ntb, pp, &pp_ops);
-	if (rc)
-		goto err_ctx;
+	return pp;
+}
+
+static void pp_init_flds(struct pp_ctx *pp)
+{
+	int pidx, lport, pcnt;
+
+	/* Find global port index */
+	lport = ntb_port_number(pp->ntb);
+	pcnt = ntb_peer_port_count(pp->ntb);
+	for (pidx = 0; pidx < pcnt; pidx++) {
+		if (lport < ntb_peer_port_number(pp->ntb, pidx))
+			break;
+	}
 
-	rc = pp_debugfs_setup(pp);
-	if (rc)
-		goto err_ctx;
+	pp->in_db = BIT_ULL(pidx);
+	pp->pmask = GENMASK_ULL(pidx, 0) >> 1;
+	pp->nmask = GENMASK_ULL(pcnt - 1, pidx);
 
-	ntb_link_enable(ntb, NTB_SPEED_AUTO, NTB_WIDTH_AUTO);
-	ntb_link_event(ntb);
+	dev_dbg(&pp->ntb->dev, "Inbound db %#llx, prev %#llx, next %#llx\n",
+		pp->in_db, pp->pmask, pp->nmask);
+}
+
+static int pp_mask_events(struct pp_ctx *pp)
+{
+	u64 db_mask, msg_mask;
+	int ret;
+
+	db_mask = ntb_db_valid_mask(pp->ntb);
+	ret = ntb_db_set_mask(pp->ntb, db_mask);
+	if (ret)
+		return ret;
+
+	/* Skip message events masking if unsupported */
+	if (ntb_msg_count(pp->ntb) < 1)
+		return 0;
+
+	msg_mask = ntb_msg_outbits(pp->ntb) | ntb_msg_inbits(pp->ntb);
+	return ntb_msg_set_mask(pp->ntb, msg_mask);
+}
+
+static int pp_setup_ctx(struct pp_ctx *pp)
+{
+	int ret;
+
+	ret = ntb_set_ctx(pp->ntb, pp, &pp_ops);
+	if (ret)
+		return ret;
+
+	ntb_link_enable(pp->ntb, NTB_SPEED_AUTO, NTB_WIDTH_AUTO);
+	/* Might be not necessary */
+	ntb_link_event(pp->ntb);
 
 	return 0;
+}
+
+static void pp_clear_ctx(struct pp_ctx *pp)
+{
+	ntb_link_disable(pp->ntb);
 
-err_ctx:
-	kfree(pp);
-err_pp:
-	return rc;
+	ntb_clear_ctx(pp->ntb);
 }
 
-static void pp_remove(struct ntb_client *client,
-		      struct ntb_dev *ntb)
+static void pp_setup_dbgfs(struct pp_ctx *pp)
+{
+	struct pci_dev *pdev = pp->ntb->pdev;
+	void *ret;
+
+	pp->dbgfs_dir = debugfs_create_dir(pci_name(pdev), pp_dbgfs_topdir);
+
+	ret = debugfs_create_atomic_t("count", 0600, pp->dbgfs_dir, &pp->count);
+	if (!ret)
+		dev_warn(&pp->ntb->dev, "DebugFS unsupported\n");
+}
+
+static void pp_clear_dbgfs(struct pp_ctx *pp)
+{
+	debugfs_remove_recursive(pp->dbgfs_dir);
+}
+
+static int pp_probe(struct ntb_client *client, struct ntb_dev *ntb)
+{
+	struct pp_ctx *pp;
+	int ret;
+
+	ret = pp_check_ntb(ntb);
+	if (ret)
+		return ret;
+
+	pp = pp_create_data(ntb);
+	if (IS_ERR(pp))
+		return PTR_ERR(pp);
+
+	pp_init_flds(pp);
+
+	ret = pp_mask_events(pp);
+	if (ret)
+		return ret;
+
+	ret = pp_setup_ctx(pp);
+	if (ret)
+		return ret;
+
+	pp_setup_dbgfs(pp);
+
+	return 0;
+}
+
+static void pp_remove(struct ntb_client *client, struct ntb_dev *ntb)
 {
 	struct pp_ctx *pp = ntb->ctx;
 
-	debugfs_remove_recursive(pp->debugfs_node_dir);
+	pp_clear_dbgfs(pp);
 
-	ntb_clear_ctx(ntb);
-	del_timer_sync(&pp->db_timer);
-	ntb_link_disable(ntb);
+	pp_clear_ctx(pp);
 
-	kfree(pp);
+	pp_clear(pp);
 }
 
 static struct ntb_client pp_client = {
 	.ops = {
 		.probe = pp_probe,
-		.remove = pp_remove,
-	},
+		.remove = pp_remove
+	}
 };
 
 static int __init pp_init(void)
 {
-	int rc;
+	int ret;
 
 	if (debugfs_initialized())
-		pp_debugfs_dir = debugfs_create_dir(KBUILD_MODNAME, NULL);
+		pp_dbgfs_topdir = debugfs_create_dir(KBUILD_MODNAME, NULL);
 
-	rc = ntb_register_client(&pp_client);
-	if (rc)
-		goto err_client;
+	ret = ntb_register_client(&pp_client);
+	if (ret)
+		debugfs_remove_recursive(pp_dbgfs_topdir);
 
-	return 0;
-
-err_client:
-	debugfs_remove_recursive(pp_debugfs_dir);
-	return rc;
+	return ret;
 }
 module_init(pp_init);
 
 static void __exit pp_exit(void)
 {
 	ntb_unregister_client(&pp_client);
-	debugfs_remove_recursive(pp_debugfs_dir);
+	debugfs_remove_recursive(pp_dbgfs_topdir);
 }
 module_exit(pp_exit);
+
-- 
2.12.0

Re: [PATCH v2 04/15] NTB: ntb_pp: Add full multi-port NTB API support

[Jon Mason]

On Sun, Dec 3, 2017 at 2:17 PM, Serge Semin <fancer.lancer@gmail.com> wrote:
> NTB API has been updated to support multi-port devices like IDT
> 89HPESx series or Microsemi Switchtec. Message registers
> functionality has also been added to new API. In order to keep
> the new hardware and corresponding capabilities well tested, NTB
> pingpong driver is accordingly altered.
>
> Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
> ---
>
> Changelog v1:
> - Add Multi-port API support
> - Ping-pong now works like cyclic ping around all the peers
>
> Changelog v2:
> - Remove driver Author/Description/Version macros
>
>  drivers/ntb/test/ntb_pingpong.c | 450 +++++++++++++++++++++++++---------------
>  1 file changed, 286 insertions(+), 164 deletions(-)
>
> diff --git a/drivers/ntb/test/ntb_pingpong.c b/drivers/ntb/test/ntb_pingpong.c
> index 3f5a92bae6f8..3e4a35a856cc 100644
> --- a/drivers/ntb/test/ntb_pingpong.c
> +++ b/drivers/ntb/test/ntb_pingpong.c
> @@ -1,10 +1,11 @@
>  /*
> - * This file is provided under a dual BSD/GPLv2 license.  When using or
> + *   This file is provided under a dual BSD/GPLv2 license.  When using or
>   *   redistributing this file, you may do so under either license.
>   *
>   *   GPL LICENSE SUMMARY
>   *
>   *   Copyright (C) 2015 EMC Corporation. All Rights Reserved.
> + *   Copyright (C) 2017 T-Platforms. All Rights Reserved.
>   *
>   *   This program is free software; you can redistribute it and/or modify
>   *   it under the terms of version 2 of the GNU General Public License as
> @@ -18,6 +19,7 @@
>   *   BSD LICENSE
>   *
>   *   Copyright (C) 2015 EMC Corporation. All Rights Reserved.
> + *   Copyright (C) 2017 T-Platforms. All Rights Reserved.
>   *
>   *   Redistribution and use in source and binary forms, with or without
>   *   modification, are permitted provided that the following conditions
> @@ -49,34 +51,46 @@
>   *
>   * Contact Information:
>   * Allen Hubbe <Allen.Hubbe@emc.com>
> + * Serge Semin <fancer.lancer@gmail.com>, <Sergey.Semin@t-platforms.ru>

2 emails seems unnecessary.  Just add whichever you want kernel emails on.

>   */
>
> -/* Note: load this module with option 'dyndbg=+p' */
> +/*
> + * How to use this tool, by example.
> + *
> + * Assuming $DBG_DIR is something like:
> + * '/sys/kernel/debug/ntb_perf/0000:00:03.0'
> + * Suppose aside from local device there is at least one remote device
> + * connected to NTB with index 0.
> + *-----------------------------------------------------------------------------
> + * Eg: install driver with specified delay between doorbell event and response
> + *
> + * root@self# insmod ntb_pingpong.ko delay_ms=1000
> + *-----------------------------------------------------------------------------
> + * Eg: get number of ping-pong cycles performed
> + *
> + * root@self# cat $DBG_DIR/count
> + */
>
>  #include <linux/init.h>
>  #include <linux/kernel.h>
>  #include <linux/module.h>
> +#include <linux/device.h>
> +#include <linux/bitops.h>
>
> -#include <linux/dma-mapping.h>
>  #include <linux/pci.h>
>  #include <linux/slab.h>
> -#include <linux/spinlock.h>
> +#include <linux/hrtimer.h>
>  #include <linux/debugfs.h>
>
>  #include <linux/ntb.h>
>
> -#define DRIVER_NAME                    "ntb_pingpong"
> -#define DRIVER_DESCRIPTION             "PCIe NTB Simple Pingpong Client"
> -
> -#define DRIVER_LICENSE                 "Dual BSD/GPL"
> -#define DRIVER_VERSION                 "1.0"
> -#define DRIVER_RELDATE                 "24 March 2015"
> -#define DRIVER_AUTHOR                  "Allen Hubbe <Allen.Hubbe@emc.com>"
> +#define DRIVER_NAME            "ntb_pingpong"
> +#define DRIVER_VERSION         "2.0"
>
> -MODULE_LICENSE(DRIVER_LICENSE);
> +MODULE_LICENSE("Dual BSD/GPL");
>  MODULE_VERSION(DRIVER_VERSION);
> -MODULE_AUTHOR(DRIVER_AUTHOR);
> -MODULE_DESCRIPTION(DRIVER_DESCRIPTION);
> +MODULE_AUTHOR("Allen Hubbe <Allen.Hubbe@emc.com>");
> +MODULE_DESCRIPTION("PCIe NTB Simple Pingpong Client");

The changes above seem like unrelated, unnecessary cleanup.  If so,
break it out into a separate patch.  Otherwise, code changes might get
lost in the mess.

>
>  static unsigned int unsafe;
>  module_param(unsafe, uint, 0644);
> @@ -86,237 +100,345 @@ static unsigned int delay_ms = 1000;
>  module_param(delay_ms, uint, 0644);
>  MODULE_PARM_DESC(delay_ms, "Milliseconds to delay the response to peer");
>
> -static unsigned long db_init = 0x7;
> -module_param(db_init, ulong, 0644);
> -MODULE_PARM_DESC(db_init, "Initial doorbell bits to ring on the peer");
> -
> -/* Only two-ports NTB devices are supported */
> -#define PIDX           NTB_DEF_PEER_IDX
> -
>  struct pp_ctx {
> -       struct ntb_dev                  *ntb;
> -       u64                             db_bits;
> -       /* synchronize access to db_bits by ping and pong */
> -       spinlock_t                      db_lock;
> -       struct timer_list               db_timer;
> -       unsigned long                   db_delay;
> -       struct dentry                   *debugfs_node_dir;
> -       struct dentry                   *debugfs_count;
> -       atomic_t                        count;
> +       struct ntb_dev *ntb;
> +       struct hrtimer timer;
> +       u64 in_db;
> +       u64 out_db;
> +       int out_pidx;
> +       u64 nmask;
> +       u64 pmask;
> +       atomic_t count;
> +       spinlock_t lock;
> +       struct dentry *dbgfs_dir;
>  };
> +#define to_pp_timer(__timer) \
> +       container_of(__timer, struct pp_ctx, timer)
>
> -static struct dentry *pp_debugfs_dir;
> +static struct dentry *pp_dbgfs_topdir;
>
> -static void pp_ping(struct timer_list *t)
> +static int pp_find_next_peer(struct pp_ctx *pp)
>  {
> -       struct pp_ctx *pp = from_timer(pp, t, db_timer);
> -       unsigned long irqflags;
> -       u64 db_bits, db_mask;
> -       u32 spad_rd, spad_wr;
> +       u64 link, out_db;
> +       int pidx;
> +
> +       link = ntb_link_is_up(pp->ntb, NULL, NULL);
> +
> +       /* Find next available peer */
> +       if (link & pp->nmask) {
> +               pidx = __ffs64(link & pp->nmask);
> +               out_db = BIT_ULL(pidx + 1);
> +       } else if (link & pp->pmask) {
> +               pidx = __ffs64(link & pp->pmask);
> +               out_db = BIT_ULL(pidx);
> +       } else {
> +               return -ENODEV;
> +       }
>
> -       spin_lock_irqsave(&pp->db_lock, irqflags);
> -       {
> -               db_mask = ntb_db_valid_mask(pp->ntb);
> -               db_bits = ntb_db_read(pp->ntb);
> +       spin_lock(&pp->lock);
> +       pp->out_pidx = pidx;
> +       pp->out_db = out_db;
> +       spin_unlock(&pp->lock);
>
> -               if (db_bits) {
> -                       dev_dbg(&pp->ntb->dev,
> -                               "Masked pongs %#llx\n",
> -                               db_bits);
> -                       ntb_db_clear(pp->ntb, db_bits);
> -               }
> +       return 0;
> +}
>
> -               db_bits = ((pp->db_bits | db_bits) << 1) & db_mask;
> +static void pp_setup(struct pp_ctx *pp)
> +{
> +       int ret;
>
> -               if (!db_bits)
> -                       db_bits = db_init;
> +       ntb_db_set_mask(pp->ntb, pp->in_db);
>
> -               spad_rd = ntb_spad_read(pp->ntb, 0);
> -               spad_wr = spad_rd + 1;
> +       hrtimer_cancel(&pp->timer);
>
> -               dev_dbg(&pp->ntb->dev,
> -                       "Ping bits %#llx read %#x write %#x\n",
> -                       db_bits, spad_rd, spad_wr);
> +       ret = pp_find_next_peer(pp);
> +       if (ret == -ENODEV) {

I would suggest any error (thus < 0)

> +               dev_dbg(&pp->ntb->dev, "Got no peers, so cancel\n");
> +               return;
> +       }
>
> -               ntb_peer_spad_write(pp->ntb, PIDX, 0, spad_wr);
> -               ntb_peer_db_set(pp->ntb, db_bits);
> -               ntb_db_clear_mask(pp->ntb, db_mask);
> +       spin_lock(&pp->lock);
> +       dev_dbg(&pp->ntb->dev, "Ping-pong started with port %d, db %#llx\n",
> +               ntb_peer_port_number(pp->ntb, pp->out_pidx), pp->out_db);
> +       spin_unlock(&pp->lock);

Ugh, I don't like this.  You are adding a side effect of the lock
being potentially grabbed by someone else just for debugging that
might not be enabled.

>
> -               pp->db_bits = 0;
> -       }
> -       spin_unlock_irqrestore(&pp->db_lock, irqflags);
> +       hrtimer_start(&pp->timer, ms_to_ktime(delay_ms), HRTIMER_MODE_REL);
>  }
>
> -static void pp_link_event(void *ctx)
> +static void pp_clear(struct pp_ctx *pp)
>  {
> -       struct pp_ctx *pp = ctx;
> +       hrtimer_cancel(&pp->timer);
>
> -       if (ntb_link_is_up(pp->ntb, NULL, NULL) == 1) {
> -               dev_dbg(&pp->ntb->dev, "link is up\n");
> -               pp_ping(&pp->db_timer);
> -       } else {
> -               dev_dbg(&pp->ntb->dev, "link is down\n");
> -               del_timer(&pp->db_timer);
> -       }
> +       ntb_db_set_mask(pp->ntb, pp->in_db);
> +
> +       dev_dbg(&pp->ntb->dev, "Ping-pong cancelled\n");
>  }
>
> -static void pp_db_event(void *ctx, int vec)
> +static void pp_ping(struct pp_ctx *pp)
>  {
> -       struct pp_ctx *pp = ctx;
> -       u64 db_bits, db_mask;
> -       unsigned long irqflags;
> +       u32 count;
>
> -       spin_lock_irqsave(&pp->db_lock, irqflags);
> -       {
> -               db_mask = ntb_db_vector_mask(pp->ntb, vec);
> -               db_bits = db_mask & ntb_db_read(pp->ntb);
> -               ntb_db_set_mask(pp->ntb, db_mask);
> -               ntb_db_clear(pp->ntb, db_bits);
> +       count = atomic_read(&pp->count);
>
> -               pp->db_bits |= db_bits;
> +       spin_lock(&pp->lock);
> +       ntb_peer_spad_write(pp->ntb, pp->out_pidx, 0, count);
> +       ntb_peer_msg_write(pp->ntb, pp->out_pidx, 0, count);
>
> -               mod_timer(&pp->db_timer, jiffies + pp->db_delay);
> +       dev_dbg(&pp->ntb->dev, "Ping port %d spad %#x, msg %#x\n",
> +               ntb_peer_port_number(pp->ntb, pp->out_pidx), count, count);
>
> -               dev_dbg(&pp->ntb->dev,
> -                       "Pong vec %d bits %#llx\n",
> -                       vec, db_bits);
> -               atomic_inc(&pp->count);
> -       }
> -       spin_unlock_irqrestore(&pp->db_lock, irqflags);
> +       ntb_peer_db_set(pp->ntb, pp->out_db);
> +       ntb_db_clear_mask(pp->ntb, pp->in_db);
> +       spin_unlock(&pp->lock);
>  }
>
> -static int pp_debugfs_setup(struct pp_ctx *pp)
> +static void pp_pong(struct pp_ctx *pp)
>  {
> -       struct pci_dev *pdev = pp->ntb->pdev;
> +       u32 msg_data = -1, spad_data = -1;
> +       int pidx = 0;
>
> -       if (!pp_debugfs_dir)
> -               return -ENODEV;
> +       /* Read pong data */
> +       spad_data = ntb_spad_read(pp->ntb, 0);
> +       msg_data = ntb_msg_read(pp->ntb, &pidx, 0);
> +       ntb_msg_clear_sts(pp->ntb, -1);
>
> -       pp->debugfs_node_dir = debugfs_create_dir(pci_name(pdev),
> -                                                 pp_debugfs_dir);
> -       if (!pp->debugfs_node_dir)
> -               return -ENODEV;
> +       /*
> +        * Scratchpad and message data may differ, since message register can't
> +        * be rewritten unless status is cleared. Additionally either of them
> +        * might be unsupported
> +        */
> +       dev_dbg(&pp->ntb->dev, "Pong spad %#x, msg %#x (port %d)\n",
> +               spad_data, msg_data, ntb_peer_port_number(pp->ntb, pidx));
>
> -       pp->debugfs_count = debugfs_create_atomic_t("count", S_IRUSR | S_IWUSR,
> -                                                   pp->debugfs_node_dir,
> -                                                   &pp->count);
> -       if (!pp->debugfs_count)
> -               return -ENODEV;
> +       atomic_inc(&pp->count);
>
> -       return 0;
> +       ntb_db_set_mask(pp->ntb, pp->in_db);
> +       ntb_db_clear(pp->ntb, pp->in_db);
> +
> +       hrtimer_start(&pp->timer, ms_to_ktime(delay_ms), HRTIMER_MODE_REL);
> +}
> +
> +static enum hrtimer_restart pp_timer_func(struct hrtimer *t)
> +{
> +       struct pp_ctx *pp = to_pp_timer(t);
> +
> +       pp_ping(pp);
> +
> +       return HRTIMER_NORESTART;
> +}
> +
> +static void pp_link_event(void *ctx)
> +{
> +       struct pp_ctx *pp = ctx;
> +
> +       pp_setup(pp);
> +}
> +
> +static void pp_db_event(void *ctx, int vec)
> +{
> +       struct pp_ctx *pp = ctx;
> +
> +       pp_pong(pp);
>  }
>
>  static const struct ntb_ctx_ops pp_ops = {
>         .link_event = pp_link_event,
> -       .db_event = pp_db_event,
> +       .db_event = pp_db_event
>  };
>
> -static int pp_probe(struct ntb_client *client,
> -                   struct ntb_dev *ntb)
> +static int pp_check_ntb(struct ntb_dev *ntb)
>  {
> -       struct pp_ctx *pp;
> -       int rc;
> +       u64 pmask;
>
>         if (ntb_db_is_unsafe(ntb)) {
> -               dev_dbg(&ntb->dev, "doorbell is unsafe\n");
> -               if (!unsafe) {
> -                       rc = -EINVAL;
> -                       goto err_pp;
> -               }
> -       }
> -
> -       if (ntb_spad_count(ntb) < 1) {
> -               dev_dbg(&ntb->dev, "no enough scratchpads\n");
> -               rc = -EINVAL;
> -               goto err_pp;
> +               dev_dbg(&ntb->dev, "Doorbell is unsafe\n");
> +               if (!unsafe)
> +                       return -EINVAL;
>         }
>
>         if (ntb_spad_is_unsafe(ntb)) {
> -               dev_dbg(&ntb->dev, "scratchpad is unsafe\n");
> -               if (!unsafe) {
> -                       rc = -EINVAL;
> -                       goto err_pp;
> -               }
> +               dev_dbg(&ntb->dev, "Scratchpad is unsafe\n");
> +               if (!unsafe)
> +                       return -EINVAL;
>         }
>
> -       if (ntb_peer_port_count(ntb) != NTB_DEF_PEER_CNT)
> -               dev_warn(&ntb->dev, "multi-port NTB is unsupported\n");
> +       pmask = GENMASK_ULL(ntb_peer_port_count(ntb), 0);
> +       if ((ntb_db_valid_mask(ntb) & pmask) != pmask) {
> +               dev_err(&ntb->dev, "Unsupported DB configuration\n");
> +               return -EINVAL;
> +       }
>
> -       pp = kmalloc(sizeof(*pp), GFP_KERNEL);
> -       if (!pp) {
> -               rc = -ENOMEM;
> -               goto err_pp;
> +       if (ntb_spad_count(ntb) < 1 && ntb_msg_count(ntb) < 1) {
> +               dev_dbg(&ntb->dev, "Scratchpads and messages unsupported\n");
> +               return -EINVAL;
> +       } else if (ntb_spad_count(ntb) < 1) {
> +               dev_dbg(&ntb->dev, "Scratchpads unsupported\n");
> +       } else if (ntb_msg_count(ntb) < 1) {
> +               dev_dbg(&ntb->dev, "Messages unsupported\n");

Should these be warnings or errors?

>         }
>
> +       return 0;
> +}
> +
> +static struct pp_ctx *pp_create_data(struct ntb_dev *ntb)
> +{
> +       struct pp_ctx *pp;
> +
> +       pp = devm_kzalloc(&ntb->dev, sizeof(*pp), GFP_KERNEL);
> +       if (!pp)
> +               return ERR_PTR(-ENOMEM);
> +
>         pp->ntb = ntb;
> -       pp->db_bits = 0;
>         atomic_set(&pp->count, 0);
> -       spin_lock_init(&pp->db_lock);
> -       timer_setup(&pp->db_timer, pp_ping, 0);
> -       pp->db_delay = msecs_to_jiffies(delay_ms);
> +       spin_lock_init(&pp->lock);
> +       hrtimer_init(&pp->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
> +       pp->timer.function = pp_timer_func;
>
> -       rc = ntb_set_ctx(ntb, pp, &pp_ops);
> -       if (rc)
> -               goto err_ctx;
> +       return pp;
> +}
> +
> +static void pp_init_flds(struct pp_ctx *pp)
> +{
> +       int pidx, lport, pcnt;
> +
> +       /* Find global port index */
> +       lport = ntb_port_number(pp->ntb);
> +       pcnt = ntb_peer_port_count(pp->ntb);
> +       for (pidx = 0; pidx < pcnt; pidx++) {
> +               if (lport < ntb_peer_port_number(pp->ntb, pidx))
> +                       break;
> +       }
>
> -       rc = pp_debugfs_setup(pp);
> -       if (rc)
> -               goto err_ctx;
> +       pp->in_db = BIT_ULL(pidx);
> +       pp->pmask = GENMASK_ULL(pidx, 0) >> 1;
> +       pp->nmask = GENMASK_ULL(pcnt - 1, pidx);
>
> -       ntb_link_enable(ntb, NTB_SPEED_AUTO, NTB_WIDTH_AUTO);
> -       ntb_link_event(ntb);
> +       dev_dbg(&pp->ntb->dev, "Inbound db %#llx, prev %#llx, next %#llx\n",
> +               pp->in_db, pp->pmask, pp->nmask);
> +}
> +
> +static int pp_mask_events(struct pp_ctx *pp)
> +{
> +       u64 db_mask, msg_mask;
> +       int ret;
> +
> +       db_mask = ntb_db_valid_mask(pp->ntb);
> +       ret = ntb_db_set_mask(pp->ntb, db_mask);
> +       if (ret)
> +               return ret;
> +
> +       /* Skip message events masking if unsupported */
> +       if (ntb_msg_count(pp->ntb) < 1)
> +               return 0;
> +
> +       msg_mask = ntb_msg_outbits(pp->ntb) | ntb_msg_inbits(pp->ntb);
> +       return ntb_msg_set_mask(pp->ntb, msg_mask);
> +}
> +
> +static int pp_setup_ctx(struct pp_ctx *pp)
> +{
> +       int ret;
> +
> +       ret = ntb_set_ctx(pp->ntb, pp, &pp_ops);
> +       if (ret)
> +               return ret;
> +
> +       ntb_link_enable(pp->ntb, NTB_SPEED_AUTO, NTB_WIDTH_AUTO);
> +       /* Might be not necessary */
> +       ntb_link_event(pp->ntb);
>
>         return 0;
> +}
> +
> +static void pp_clear_ctx(struct pp_ctx *pp)
> +{
> +       ntb_link_disable(pp->ntb);
>
> -err_ctx:
> -       kfree(pp);
> -err_pp:
> -       return rc;
> +       ntb_clear_ctx(pp->ntb);
>  }
>
> -static void pp_remove(struct ntb_client *client,
> -                     struct ntb_dev *ntb)
> +static void pp_setup_dbgfs(struct pp_ctx *pp)
> +{
> +       struct pci_dev *pdev = pp->ntb->pdev;
> +       void *ret;
> +
> +       pp->dbgfs_dir = debugfs_create_dir(pci_name(pdev), pp_dbgfs_topdir);
> +
> +       ret = debugfs_create_atomic_t("count", 0600, pp->dbgfs_dir, &pp->count);
> +       if (!ret)
> +               dev_warn(&pp->ntb->dev, "DebugFS unsupported\n");

Shouldn't this be fatal?

> +}
> +
> +static void pp_clear_dbgfs(struct pp_ctx *pp)
> +{
> +       debugfs_remove_recursive(pp->dbgfs_dir);
> +}
> +
> +static int pp_probe(struct ntb_client *client, struct ntb_dev *ntb)
> +{
> +       struct pp_ctx *pp;
> +       int ret;
> +
> +       ret = pp_check_ntb(ntb);
> +       if (ret)
> +               return ret;
> +
> +       pp = pp_create_data(ntb);
> +       if (IS_ERR(pp))
> +               return PTR_ERR(pp);
> +
> +       pp_init_flds(pp);
> +
> +       ret = pp_mask_events(pp);
> +       if (ret)
> +               return ret;
> +
> +       ret = pp_setup_ctx(pp);
> +       if (ret)
> +               return ret;
> +
> +       pp_setup_dbgfs(pp);
> +
> +       return 0;
> +}
> +
> +static void pp_remove(struct ntb_client *client, struct ntb_dev *ntb)
>  {
>         struct pp_ctx *pp = ntb->ctx;
>
> -       debugfs_remove_recursive(pp->debugfs_node_dir);
> +       pp_clear_dbgfs(pp);
>
> -       ntb_clear_ctx(ntb);
> -       del_timer_sync(&pp->db_timer);
> -       ntb_link_disable(ntb);
> +       pp_clear_ctx(pp);
>
> -       kfree(pp);
> +       pp_clear(pp);
>  }
>
>  static struct ntb_client pp_client = {
>         .ops = {
>                 .probe = pp_probe,
> -               .remove = pp_remove,
> -       },
> +               .remove = pp_remove
> +       }
>  };
>
>  static int __init pp_init(void)
>  {
> -       int rc;
> +       int ret;
>
>         if (debugfs_initialized())
> -               pp_debugfs_dir = debugfs_create_dir(KBUILD_MODNAME, NULL);
> +               pp_dbgfs_topdir = debugfs_create_dir(KBUILD_MODNAME, NULL);
>
> -       rc = ntb_register_client(&pp_client);
> -       if (rc)
> -               goto err_client;
> +       ret = ntb_register_client(&pp_client);
> +       if (ret)
> +               debugfs_remove_recursive(pp_dbgfs_topdir);
>
> -       return 0;
> -
> -err_client:
> -       debugfs_remove_recursive(pp_debugfs_dir);
> -       return rc;
> +       return ret;
>  }
>  module_init(pp_init);
>
>  static void __exit pp_exit(void)
>  {
>         ntb_unregister_client(&pp_client);
> -       debugfs_remove_recursive(pp_debugfs_dir);
> +       debugfs_remove_recursive(pp_dbgfs_topdir);
>  }
>  module_exit(pp_exit);
> +
> --
> 2.12.0
>

Re: [PATCH v2 04/15] NTB: ntb_pp: Add full multi-port NTB API support

[Serge Semin]

On Tue, Dec 05, 2017 at 12:02:13PM -0500, Jon Mason <jdmason@kudzu.us> wrote:
> On Sun, Dec 3, 2017 at 2:17 PM, Serge Semin <fancer.lancer@gmail.com> wrote:
> > NTB API has been updated to support multi-port devices like IDT
> > 89HPESx series or Microsemi Switchtec. Message registers
> > functionality has also been added to new API. In order to keep
> > the new hardware and corresponding capabilities well tested, NTB
> > pingpong driver is accordingly altered.
> >
> > Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
> > ---
> >
> > Changelog v1:
> > - Add Multi-port API support
> > - Ping-pong now works like cyclic ping around all the peers
> >
> > Changelog v2:
> > - Remove driver Author/Description/Version macros
> >
> >  drivers/ntb/test/ntb_pingpong.c | 450 +++++++++++++++++++++++++---------------
> >  1 file changed, 286 insertions(+), 164 deletions(-)
> >
> > diff --git a/drivers/ntb/test/ntb_pingpong.c b/drivers/ntb/test/ntb_pingpong.c
> > index 3f5a92bae6f8..3e4a35a856cc 100644
> > --- a/drivers/ntb/test/ntb_pingpong.c
> > +++ b/drivers/ntb/test/ntb_pingpong.c
> > @@ -1,10 +1,11 @@
> >  /*
> > - * This file is provided under a dual BSD/GPLv2 license.  When using or
> > + *   This file is provided under a dual BSD/GPLv2 license.  When using or
> >   *   redistributing this file, you may do so under either license.
> >   *
> >   *   GPL LICENSE SUMMARY
> >   *
> >   *   Copyright (C) 2015 EMC Corporation. All Rights Reserved.
> > + *   Copyright (C) 2017 T-Platforms. All Rights Reserved.
> >   *
> >   *   This program is free software; you can redistribute it and/or modify
> >   *   it under the terms of version 2 of the GNU General Public License as
> > @@ -18,6 +19,7 @@
> >   *   BSD LICENSE
> >   *
> >   *   Copyright (C) 2015 EMC Corporation. All Rights Reserved.
> > + *   Copyright (C) 2017 T-Platforms. All Rights Reserved.
> >   *
> >   *   Redistribution and use in source and binary forms, with or without
> >   *   modification, are permitted provided that the following conditions
> > @@ -49,34 +51,46 @@
> >   *
> >   * Contact Information:
> >   * Allen Hubbe <Allen.Hubbe@emc.com>
> > + * Serge Semin <fancer.lancer@gmail.com>, <Sergey.Semin@t-platforms.ru>
> 
> 2 emails seems unnecessary.  Just add whichever you want kernel emails on.
> 

I'd prefer gmail one, but we agreed to completely remove the contacts info from
the drivers anyway. So these lines will be discarded in v3.

> >   */
> >
> > -/* Note: load this module with option 'dyndbg=+p' */
> > +/*
> > + * How to use this tool, by example.
> > + *
> > + * Assuming $DBG_DIR is something like:
> > + * '/sys/kernel/debug/ntb_perf/0000:00:03.0'
> > + * Suppose aside from local device there is at least one remote device
> > + * connected to NTB with index 0.
> > + *-----------------------------------------------------------------------------
> > + * Eg: install driver with specified delay between doorbell event and response
> > + *
> > + * root@self# insmod ntb_pingpong.ko delay_ms=1000
> > + *-----------------------------------------------------------------------------
> > + * Eg: get number of ping-pong cycles performed
> > + *
> > + * root@self# cat $DBG_DIR/count
> > + */
> >
> >  #include <linux/init.h>
> >  #include <linux/kernel.h>
> >  #include <linux/module.h>
> > +#include <linux/device.h>
> > +#include <linux/bitops.h>
> >
> > -#include <linux/dma-mapping.h>
> >  #include <linux/pci.h>
> >  #include <linux/slab.h>
> > -#include <linux/spinlock.h>
> > +#include <linux/hrtimer.h>
> >  #include <linux/debugfs.h>
> >
> >  #include <linux/ntb.h>
> >
> > -#define DRIVER_NAME                    "ntb_pingpong"
> > -#define DRIVER_DESCRIPTION             "PCIe NTB Simple Pingpong Client"
> > -
> > -#define DRIVER_LICENSE                 "Dual BSD/GPL"
> > -#define DRIVER_VERSION                 "1.0"
> > -#define DRIVER_RELDATE                 "24 March 2015"
> > -#define DRIVER_AUTHOR                  "Allen Hubbe <Allen.Hubbe@emc.com>"
> > +#define DRIVER_NAME            "ntb_pingpong"
> > +#define DRIVER_VERSION         "2.0"
> >
> > -MODULE_LICENSE(DRIVER_LICENSE);
> > +MODULE_LICENSE("Dual BSD/GPL");
> >  MODULE_VERSION(DRIVER_VERSION);
> > -MODULE_AUTHOR(DRIVER_AUTHOR);
> > -MODULE_DESCRIPTION(DRIVER_DESCRIPTION);
> > +MODULE_AUTHOR("Allen Hubbe <Allen.Hubbe@emc.com>");
> > +MODULE_DESCRIPTION("PCIe NTB Simple Pingpong Client");
> 
> The changes above seem like unrelated, unnecessary cleanup.  If so,
> break it out into a separate patch.  Otherwise, code changes might get
> lost in the mess.
> 

Is it really necessary to have all of this info defined in macro? We don't use
them anywhere in the source below. I add this change here due to the last Greg
patch, where he removed DRIVER_LICENSE from the code. He said, that the license
check tool needs it to be directly defined in the MODULE_LICENSE. The rest of 
macro aren't used by any tool, but still there might be some utility in future
to collect all the driver authors or descriptions. Still if you think it is
unnecessary and it's ok to still have the macro left here, I'll get them back
to the drivers code.

> >
> >  static unsigned int unsafe;
> >  module_param(unsafe, uint, 0644);
> > @@ -86,237 +100,345 @@ static unsigned int delay_ms = 1000;
> >  module_param(delay_ms, uint, 0644);
> >  MODULE_PARM_DESC(delay_ms, "Milliseconds to delay the response to peer");
> >
> > -static unsigned long db_init = 0x7;
> > -module_param(db_init, ulong, 0644);
> > -MODULE_PARM_DESC(db_init, "Initial doorbell bits to ring on the peer");
> > -
> > -/* Only two-ports NTB devices are supported */
> > -#define PIDX           NTB_DEF_PEER_IDX
> > -
> >  struct pp_ctx {
> > -       struct ntb_dev                  *ntb;
> > -       u64                             db_bits;
> > -       /* synchronize access to db_bits by ping and pong */
> > -       spinlock_t                      db_lock;
> > -       struct timer_list               db_timer;
> > -       unsigned long                   db_delay;
> > -       struct dentry                   *debugfs_node_dir;
> > -       struct dentry                   *debugfs_count;
> > -       atomic_t                        count;
> > +       struct ntb_dev *ntb;
> > +       struct hrtimer timer;
> > +       u64 in_db;
> > +       u64 out_db;
> > +       int out_pidx;
> > +       u64 nmask;
> > +       u64 pmask;
> > +       atomic_t count;
> > +       spinlock_t lock;
> > +       struct dentry *dbgfs_dir;
> >  };
> > +#define to_pp_timer(__timer) \
> > +       container_of(__timer, struct pp_ctx, timer)
> >
> > -static struct dentry *pp_debugfs_dir;
> > +static struct dentry *pp_dbgfs_topdir;
> >
> > -static void pp_ping(struct timer_list *t)
> > +static int pp_find_next_peer(struct pp_ctx *pp)
> >  {
> > -       struct pp_ctx *pp = from_timer(pp, t, db_timer);
> > -       unsigned long irqflags;
> > -       u64 db_bits, db_mask;
> > -       u32 spad_rd, spad_wr;
> > +       u64 link, out_db;
> > +       int pidx;
> > +
> > +       link = ntb_link_is_up(pp->ntb, NULL, NULL);
> > +
> > +       /* Find next available peer */
> > +       if (link & pp->nmask) {
> > +               pidx = __ffs64(link & pp->nmask);
> > +               out_db = BIT_ULL(pidx + 1);
> > +       } else if (link & pp->pmask) {
> > +               pidx = __ffs64(link & pp->pmask);
> > +               out_db = BIT_ULL(pidx);
> > +       } else {
> > +               return -ENODEV;
> > +       }
> >
> > -       spin_lock_irqsave(&pp->db_lock, irqflags);
> > -       {
> > -               db_mask = ntb_db_valid_mask(pp->ntb);
> > -               db_bits = ntb_db_read(pp->ntb);
> > +       spin_lock(&pp->lock);
> > +       pp->out_pidx = pidx;
> > +       pp->out_db = out_db;
> > +       spin_unlock(&pp->lock);
> >
> > -               if (db_bits) {
> > -                       dev_dbg(&pp->ntb->dev,
> > -                               "Masked pongs %#llx\n",
> > -                               db_bits);
> > -                       ntb_db_clear(pp->ntb, db_bits);
> > -               }
> > +       return 0;
> > +}
> >
> > -               db_bits = ((pp->db_bits | db_bits) << 1) & db_mask;
> > +static void pp_setup(struct pp_ctx *pp)
> > +{
> > +       int ret;
> >
> > -               if (!db_bits)
> > -                       db_bits = db_init;
> > +       ntb_db_set_mask(pp->ntb, pp->in_db);
> >
> > -               spad_rd = ntb_spad_read(pp->ntb, 0);
> > -               spad_wr = spad_rd + 1;
> > +       hrtimer_cancel(&pp->timer);
> >
> > -               dev_dbg(&pp->ntb->dev,
> > -                       "Ping bits %#llx read %#x write %#x\n",
> > -                       db_bits, spad_rd, spad_wr);
> > +       ret = pp_find_next_peer(pp);
> > +       if (ret == -ENODEV) {
> 
> I would suggest any error (thus < 0)
> 

pp_find_next_peer() doesn't return any error except -ENODEV, so technically
it is ok to leave it as is. Additionally the definite value check can be seen
as some kind of code documentation. The only problem which I see here can happen
only if somebody changes the function definition, so it would return another
errors. I'd leave it as is for now, since positive sides seem to me more
valuable.

> > +               dev_dbg(&pp->ntb->dev, "Got no peers, so cancel\n");
> > +               return;
> > +       }
> >
> > -               ntb_peer_spad_write(pp->ntb, PIDX, 0, spad_wr);
> > -               ntb_peer_db_set(pp->ntb, db_bits);
> > -               ntb_db_clear_mask(pp->ntb, db_mask);
> > +       spin_lock(&pp->lock);
> > +       dev_dbg(&pp->ntb->dev, "Ping-pong started with port %d, db %#llx\n",
> > +               ntb_peer_port_number(pp->ntb, pp->out_pidx), pp->out_db);
> > +       spin_unlock(&pp->lock);
> 
> Ugh, I don't like this.  You are adding a side effect of the lock
> being potentially grabbed by someone else just for debugging that
> might not be enabled.
> 

Fair enough. I'll discard the lock/unlock.

> >
> > -               pp->db_bits = 0;
> > -       }
> > -       spin_unlock_irqrestore(&pp->db_lock, irqflags);
> > +       hrtimer_start(&pp->timer, ms_to_ktime(delay_ms), HRTIMER_MODE_REL);
> >  }
> >
> > -static void pp_link_event(void *ctx)
> > +static void pp_clear(struct pp_ctx *pp)
> >  {
> > -       struct pp_ctx *pp = ctx;
> > +       hrtimer_cancel(&pp->timer);
> >
> > -       if (ntb_link_is_up(pp->ntb, NULL, NULL) == 1) {
> > -               dev_dbg(&pp->ntb->dev, "link is up\n");
> > -               pp_ping(&pp->db_timer);
> > -       } else {
> > -               dev_dbg(&pp->ntb->dev, "link is down\n");
> > -               del_timer(&pp->db_timer);
> > -       }
> > +       ntb_db_set_mask(pp->ntb, pp->in_db);
> > +
> > +       dev_dbg(&pp->ntb->dev, "Ping-pong cancelled\n");
> >  }
> >
> > -static void pp_db_event(void *ctx, int vec)
> > +static void pp_ping(struct pp_ctx *pp)
> >  {
> > -       struct pp_ctx *pp = ctx;
> > -       u64 db_bits, db_mask;
> > -       unsigned long irqflags;
> > +       u32 count;
> >
> > -       spin_lock_irqsave(&pp->db_lock, irqflags);
> > -       {
> > -               db_mask = ntb_db_vector_mask(pp->ntb, vec);
> > -               db_bits = db_mask & ntb_db_read(pp->ntb);
> > -               ntb_db_set_mask(pp->ntb, db_mask);
> > -               ntb_db_clear(pp->ntb, db_bits);
> > +       count = atomic_read(&pp->count);
> >
> > -               pp->db_bits |= db_bits;
> > +       spin_lock(&pp->lock);
> > +       ntb_peer_spad_write(pp->ntb, pp->out_pidx, 0, count);
> > +       ntb_peer_msg_write(pp->ntb, pp->out_pidx, 0, count);
> >
> > -               mod_timer(&pp->db_timer, jiffies + pp->db_delay);
> > +       dev_dbg(&pp->ntb->dev, "Ping port %d spad %#x, msg %#x\n",
> > +               ntb_peer_port_number(pp->ntb, pp->out_pidx), count, count);
> >
> > -               dev_dbg(&pp->ntb->dev,
> > -                       "Pong vec %d bits %#llx\n",
> > -                       vec, db_bits);
> > -               atomic_inc(&pp->count);
> > -       }
> > -       spin_unlock_irqrestore(&pp->db_lock, irqflags);
> > +       ntb_peer_db_set(pp->ntb, pp->out_db);
> > +       ntb_db_clear_mask(pp->ntb, pp->in_db);
> > +       spin_unlock(&pp->lock);
> >  }
> >
> > -static int pp_debugfs_setup(struct pp_ctx *pp)
> > +static void pp_pong(struct pp_ctx *pp)
> >  {
> > -       struct pci_dev *pdev = pp->ntb->pdev;
> > +       u32 msg_data = -1, spad_data = -1;
> > +       int pidx = 0;
> >
> > -       if (!pp_debugfs_dir)
> > -               return -ENODEV;
> > +       /* Read pong data */
> > +       spad_data = ntb_spad_read(pp->ntb, 0);
> > +       msg_data = ntb_msg_read(pp->ntb, &pidx, 0);
> > +       ntb_msg_clear_sts(pp->ntb, -1);
> >
> > -       pp->debugfs_node_dir = debugfs_create_dir(pci_name(pdev),
> > -                                                 pp_debugfs_dir);
> > -       if (!pp->debugfs_node_dir)
> > -               return -ENODEV;
> > +       /*
> > +        * Scratchpad and message data may differ, since message register can't
> > +        * be rewritten unless status is cleared. Additionally either of them
> > +        * might be unsupported
> > +        */
> > +       dev_dbg(&pp->ntb->dev, "Pong spad %#x, msg %#x (port %d)\n",
> > +               spad_data, msg_data, ntb_peer_port_number(pp->ntb, pidx));
> >
> > -       pp->debugfs_count = debugfs_create_atomic_t("count", S_IRUSR | S_IWUSR,
> > -                                                   pp->debugfs_node_dir,
> > -                                                   &pp->count);
> > -       if (!pp->debugfs_count)
> > -               return -ENODEV;
> > +       atomic_inc(&pp->count);
> >
> > -       return 0;
> > +       ntb_db_set_mask(pp->ntb, pp->in_db);
> > +       ntb_db_clear(pp->ntb, pp->in_db);
> > +
> > +       hrtimer_start(&pp->timer, ms_to_ktime(delay_ms), HRTIMER_MODE_REL);
> > +}
> > +
> > +static enum hrtimer_restart pp_timer_func(struct hrtimer *t)
> > +{
> > +       struct pp_ctx *pp = to_pp_timer(t);
> > +
> > +       pp_ping(pp);
> > +
> > +       return HRTIMER_NORESTART;
> > +}
> > +
> > +static void pp_link_event(void *ctx)
> > +{
> > +       struct pp_ctx *pp = ctx;
> > +
> > +       pp_setup(pp);
> > +}
> > +
> > +static void pp_db_event(void *ctx, int vec)
> > +{
> > +       struct pp_ctx *pp = ctx;
> > +
> > +       pp_pong(pp);
> >  }
> >
> >  static const struct ntb_ctx_ops pp_ops = {
> >         .link_event = pp_link_event,
> > -       .db_event = pp_db_event,
> > +       .db_event = pp_db_event
> >  };
> >
> > -static int pp_probe(struct ntb_client *client,
> > -                   struct ntb_dev *ntb)
> > +static int pp_check_ntb(struct ntb_dev *ntb)
> >  {
> > -       struct pp_ctx *pp;
> > -       int rc;
> > +       u64 pmask;
> >
> >         if (ntb_db_is_unsafe(ntb)) {
> > -               dev_dbg(&ntb->dev, "doorbell is unsafe\n");
> > -               if (!unsafe) {
> > -                       rc = -EINVAL;
> > -                       goto err_pp;
> > -               }
> > -       }
> > -
> > -       if (ntb_spad_count(ntb) < 1) {
> > -               dev_dbg(&ntb->dev, "no enough scratchpads\n");
> > -               rc = -EINVAL;
> > -               goto err_pp;
> > +               dev_dbg(&ntb->dev, "Doorbell is unsafe\n");
> > +               if (!unsafe)
> > +                       return -EINVAL;
> >         }
> >
> >         if (ntb_spad_is_unsafe(ntb)) {
> > -               dev_dbg(&ntb->dev, "scratchpad is unsafe\n");
> > -               if (!unsafe) {
> > -                       rc = -EINVAL;
> > -                       goto err_pp;
> > -               }
> > +               dev_dbg(&ntb->dev, "Scratchpad is unsafe\n");
> > +               if (!unsafe)
> > +                       return -EINVAL;
> >         }
> >
> > -       if (ntb_peer_port_count(ntb) != NTB_DEF_PEER_CNT)
> > -               dev_warn(&ntb->dev, "multi-port NTB is unsupported\n");
> > +       pmask = GENMASK_ULL(ntb_peer_port_count(ntb), 0);
> > +       if ((ntb_db_valid_mask(ntb) & pmask) != pmask) {
> > +               dev_err(&ntb->dev, "Unsupported DB configuration\n");
> > +               return -EINVAL;
> > +       }
> >
> > -       pp = kmalloc(sizeof(*pp), GFP_KERNEL);
> > -       if (!pp) {
> > -               rc = -ENOMEM;
> > -               goto err_pp;
> > +       if (ntb_spad_count(ntb) < 1 && ntb_msg_count(ntb) < 1) {
> > +               dev_dbg(&ntb->dev, "Scratchpads and messages unsupported\n");
> > +               return -EINVAL;
> > +       } else if (ntb_spad_count(ntb) < 1) {
> > +               dev_dbg(&ntb->dev, "Scratchpads unsupported\n");
> > +       } else if (ntb_msg_count(ntb) < 1) {
> > +               dev_dbg(&ntb->dev, "Messages unsupported\n");
> 
> Should these be warnings or errors?
> 

The last two should be debug prints. It's ok if one of them unsupported,
some of NTB devices can provides Messages only, some work with Scratchpads.
As far as I know there is only one NTB device, which supports both of them
on hardware level. It's IDT® 89HPES8NT2, 89HPES16NT2, 89HPES16NT2, 89HPES12NT3,
89HPES24NT3 series, which isn't supported by the current IDT driver, since
I don't have it.
But it's bug if neither of the registers supported. NTB API even doesn't allow
such devices registration. In this case we should print an error. I'll replace
the first dev_dbg with dev_err then.

> >         }
> >
> > +       return 0;
> > +}
> > +
> > +static struct pp_ctx *pp_create_data(struct ntb_dev *ntb)
> > +{
> > +       struct pp_ctx *pp;
> > +
> > +       pp = devm_kzalloc(&ntb->dev, sizeof(*pp), GFP_KERNEL);
> > +       if (!pp)
> > +               return ERR_PTR(-ENOMEM);
> > +
> >         pp->ntb = ntb;
> > -       pp->db_bits = 0;
> >         atomic_set(&pp->count, 0);
> > -       spin_lock_init(&pp->db_lock);
> > -       timer_setup(&pp->db_timer, pp_ping, 0);
> > -       pp->db_delay = msecs_to_jiffies(delay_ms);
> > +       spin_lock_init(&pp->lock);
> > +       hrtimer_init(&pp->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
> > +       pp->timer.function = pp_timer_func;
> >
> > -       rc = ntb_set_ctx(ntb, pp, &pp_ops);
> > -       if (rc)
> > -               goto err_ctx;
> > +       return pp;
> > +}
> > +
> > +static void pp_init_flds(struct pp_ctx *pp)
> > +{
> > +       int pidx, lport, pcnt;
> > +
> > +       /* Find global port index */
> > +       lport = ntb_port_number(pp->ntb);
> > +       pcnt = ntb_peer_port_count(pp->ntb);
> > +       for (pidx = 0; pidx < pcnt; pidx++) {
> > +               if (lport < ntb_peer_port_number(pp->ntb, pidx))
> > +                       break;
> > +       }
> >
> > -       rc = pp_debugfs_setup(pp);
> > -       if (rc)
> > -               goto err_ctx;
> > +       pp->in_db = BIT_ULL(pidx);
> > +       pp->pmask = GENMASK_ULL(pidx, 0) >> 1;
> > +       pp->nmask = GENMASK_ULL(pcnt - 1, pidx);
> >
> > -       ntb_link_enable(ntb, NTB_SPEED_AUTO, NTB_WIDTH_AUTO);
> > -       ntb_link_event(ntb);
> > +       dev_dbg(&pp->ntb->dev, "Inbound db %#llx, prev %#llx, next %#llx\n",
> > +               pp->in_db, pp->pmask, pp->nmask);
> > +}
> > +
> > +static int pp_mask_events(struct pp_ctx *pp)
> > +{
> > +       u64 db_mask, msg_mask;
> > +       int ret;
> > +
> > +       db_mask = ntb_db_valid_mask(pp->ntb);
> > +       ret = ntb_db_set_mask(pp->ntb, db_mask);
> > +       if (ret)
> > +               return ret;
> > +
> > +       /* Skip message events masking if unsupported */
> > +       if (ntb_msg_count(pp->ntb) < 1)
> > +               return 0;
> > +
> > +       msg_mask = ntb_msg_outbits(pp->ntb) | ntb_msg_inbits(pp->ntb);
> > +       return ntb_msg_set_mask(pp->ntb, msg_mask);
> > +}
> > +
> > +static int pp_setup_ctx(struct pp_ctx *pp)
> > +{
> > +       int ret;
> > +
> > +       ret = ntb_set_ctx(pp->ntb, pp, &pp_ops);
> > +       if (ret)
> > +               return ret;
> > +
> > +       ntb_link_enable(pp->ntb, NTB_SPEED_AUTO, NTB_WIDTH_AUTO);
> > +       /* Might be not necessary */
> > +       ntb_link_event(pp->ntb);
> >
> >         return 0;
> > +}
> > +
> > +static void pp_clear_ctx(struct pp_ctx *pp)
> > +{
> > +       ntb_link_disable(pp->ntb);
> >
> > -err_ctx:
> > -       kfree(pp);
> > -err_pp:
> > -       return rc;
> > +       ntb_clear_ctx(pp->ntb);
> >  }
> >
> > -static void pp_remove(struct ntb_client *client,
> > -                     struct ntb_dev *ntb)
> > +static void pp_setup_dbgfs(struct pp_ctx *pp)
> > +{
> > +       struct pci_dev *pdev = pp->ntb->pdev;
> > +       void *ret;
> > +
> > +       pp->dbgfs_dir = debugfs_create_dir(pci_name(pdev), pp_dbgfs_topdir);
> > +
> > +       ret = debugfs_create_atomic_t("count", 0600, pp->dbgfs_dir, &pp->count);
> > +       if (!ret)
> > +               dev_warn(&pp->ntb->dev, "DebugFS unsupported\n");
> 
> Shouldn't this be fatal?
> 

If only I had the record of all the comments I have got on the DebugFS
initialization code.) Everyone had different opinion on this.
Last time I submitted a patch to driver/misc subsystem, where Grag K-H is
reviewer. He said, that DebugFS got just one purpose - for debugging. A driver
isn't supposed to fail in case if the FS isn't available in the kernel. I had to
rewrite the code in the same way he said. I assume the Ping-Pong driver shall
still work if DebugFS isn't available, but the user won't be able to see how
many pings have been made. For such circumstances I added the warning to inform
the user about this. So lets leave the code as is. Although I'd accept such the
comment on ntb_tool/ntb_perf drivers, since they get to be useless without
DebugFS support in the kernel.

> > +}
> > +
> > +static void pp_clear_dbgfs(struct pp_ctx *pp)
> > +{
> > +       debugfs_remove_recursive(pp->dbgfs_dir);
> > +}
> > +
> > +static int pp_probe(struct ntb_client *client, struct ntb_dev *ntb)
> > +{
> > +       struct pp_ctx *pp;
> > +       int ret;
> > +
> > +       ret = pp_check_ntb(ntb);
> > +       if (ret)
> > +               return ret;
> > +
> > +       pp = pp_create_data(ntb);
> > +       if (IS_ERR(pp))
> > +               return PTR_ERR(pp);
> > +
> > +       pp_init_flds(pp);
> > +
> > +       ret = pp_mask_events(pp);
> > +       if (ret)
> > +               return ret;
> > +
> > +       ret = pp_setup_ctx(pp);
> > +       if (ret)
> > +               return ret;
> > +
> > +       pp_setup_dbgfs(pp);
> > +
> > +       return 0;
> > +}
> > +
> > +static void pp_remove(struct ntb_client *client, struct ntb_dev *ntb)
> >  {
> >         struct pp_ctx *pp = ntb->ctx;
> >
> > -       debugfs_remove_recursive(pp->debugfs_node_dir);
> > +       pp_clear_dbgfs(pp);
> >
> > -       ntb_clear_ctx(ntb);
> > -       del_timer_sync(&pp->db_timer);
> > -       ntb_link_disable(ntb);
> > +       pp_clear_ctx(pp);
> >
> > -       kfree(pp);
> > +       pp_clear(pp);
> >  }
> >
> >  static struct ntb_client pp_client = {
> >         .ops = {
> >                 .probe = pp_probe,
> > -               .remove = pp_remove,
> > -       },
> > +               .remove = pp_remove
> > +       }
> >  };
> >
> >  static int __init pp_init(void)
> >  {
> > -       int rc;
> > +       int ret;
> >
> >         if (debugfs_initialized())
> > -               pp_debugfs_dir = debugfs_create_dir(KBUILD_MODNAME, NULL);
> > +               pp_dbgfs_topdir = debugfs_create_dir(KBUILD_MODNAME, NULL);
> >
> > -       rc = ntb_register_client(&pp_client);
> > -       if (rc)
> > -               goto err_client;
> > +       ret = ntb_register_client(&pp_client);
> > +       if (ret)
> > +               debugfs_remove_recursive(pp_dbgfs_topdir);
> >
> > -       return 0;
> > -
> > -err_client:
> > -       debugfs_remove_recursive(pp_debugfs_dir);
> > -       return rc;
> > +       return ret;
> >  }
> >  module_init(pp_init);
> >
> >  static void __exit pp_exit(void)
> >  {
> >         ntb_unregister_client(&pp_client);
> > -       debugfs_remove_recursive(pp_debugfs_dir);
> > +       debugfs_remove_recursive(pp_dbgfs_topdir);
> >  }
> >  module_exit(pp_exit);
> > +
> > --
> > 2.12.0
> >

Re: [PATCH v2 04/15] NTB: ntb_pp: Add full multi-port NTB API support

[Serge Semin]

On Tue, Dec 05, 2017 at 12:02:13PM -0500, Jon Mason <jdmason@kudzu.us> wrote:
> On Sun, Dec 3, 2017 at 2:17 PM, Serge Semin <fancer.lancer@gmail.com> wrote:
> > NTB API has been updated to support multi-port devices like IDT
> > 89HPESx series or Microsemi Switchtec. Message registers
> > functionality has also been added to new API. In order to keep
> > the new hardware and corresponding capabilities well tested, NTB
> > pingpong driver is accordingly altered.
> >
> > Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
> > ---
> >
> > Changelog v1:
> > - Add Multi-port API support
> > - Ping-pong now works like cyclic ping around all the peers
> >
> > Changelog v2:
> > - Remove driver Author/Description/Version macros
> >
> >  drivers/ntb/test/ntb_pingpong.c | 450 +++++++++++++++++++++++++---------------
> >  1 file changed, 286 insertions(+), 164 deletions(-)
> >
> > diff --git a/drivers/ntb/test/ntb_pingpong.c b/drivers/ntb/test/ntb_pingpong.c
> > index 3f5a92bae6f8..3e4a35a856cc 100644
> > --- a/drivers/ntb/test/ntb_pingpong.c
> > +++ b/drivers/ntb/test/ntb_pingpong.c
> > @@ -1,10 +1,11 @@
> >  /*
> > - * This file is provided under a dual BSD/GPLv2 license.  When using or
> > + *   This file is provided under a dual BSD/GPLv2 license.  When using or
> >   *   redistributing this file, you may do so under either license.
> >   *
> >   *   GPL LICENSE SUMMARY
> >   *
> >   *   Copyright (C) 2015 EMC Corporation. All Rights Reserved.
> > + *   Copyright (C) 2017 T-Platforms. All Rights Reserved.
> >   *
> >   *   This program is free software; you can redistribute it and/or modify
> >   *   it under the terms of version 2 of the GNU General Public License as
> > @@ -18,6 +19,7 @@
> >   *   BSD LICENSE
> >   *
> >   *   Copyright (C) 2015 EMC Corporation. All Rights Reserved.
> > + *   Copyright (C) 2017 T-Platforms. All Rights Reserved.
> >   *
> >   *   Redistribution and use in source and binary forms, with or without
> >   *   modification, are permitted provided that the following conditions
> > @@ -49,34 +51,46 @@
> >   *
> >   * Contact Information:
> >   * Allen Hubbe <Allen.Hubbe@emc.com>
> > + * Serge Semin <fancer.lancer@gmail.com>, <Sergey.Semin@t-platforms.ru>
> 
> 2 emails seems unnecessary.  Just add whichever you want kernel emails on.
> 

I'd prefer gmail one, but we agreed to completely remove the contacts info from
the drivers anyway. So these lines will be discarded in v3.

> >   */
> >
> > -/* Note: load this module with option 'dyndbg=+p' */
> > +/*
> > + * How to use this tool, by example.
> > + *
> > + * Assuming $DBG_DIR is something like:
> > + * '/sys/kernel/debug/ntb_perf/0000:00:03.0'
> > + * Suppose aside from local device there is at least one remote device
> > + * connected to NTB with index 0.
> > + *-----------------------------------------------------------------------------
> > + * Eg: install driver with specified delay between doorbell event and response
> > + *
> > + * root@self# insmod ntb_pingpong.ko delay_ms=1000
> > + *-----------------------------------------------------------------------------
> > + * Eg: get number of ping-pong cycles performed
> > + *
> > + * root@self# cat $DBG_DIR/count
> > + */
> >
> >  #include <linux/init.h>
> >  #include <linux/kernel.h>
> >  #include <linux/module.h>
> > +#include <linux/device.h>
> > +#include <linux/bitops.h>
> >
> > -#include <linux/dma-mapping.h>
> >  #include <linux/pci.h>
> >  #include <linux/slab.h>
> > -#include <linux/spinlock.h>
> > +#include <linux/hrtimer.h>
> >  #include <linux/debugfs.h>
> >
> >  #include <linux/ntb.h>
> >
> > -#define DRIVER_NAME                    "ntb_pingpong"
> > -#define DRIVER_DESCRIPTION             "PCIe NTB Simple Pingpong Client"
> > -
> > -#define DRIVER_LICENSE                 "Dual BSD/GPL"
> > -#define DRIVER_VERSION                 "1.0"
> > -#define DRIVER_RELDATE                 "24 March 2015"
> > -#define DRIVER_AUTHOR                  "Allen Hubbe <Allen.Hubbe@emc.com>"
> > +#define DRIVER_NAME            "ntb_pingpong"
> > +#define DRIVER_VERSION         "2.0"
> >
> > -MODULE_LICENSE(DRIVER_LICENSE);
> > +MODULE_LICENSE("Dual BSD/GPL");
> >  MODULE_VERSION(DRIVER_VERSION);
> > -MODULE_AUTHOR(DRIVER_AUTHOR);
> > -MODULE_DESCRIPTION(DRIVER_DESCRIPTION);
> > +MODULE_AUTHOR("Allen Hubbe <Allen.Hubbe@emc.com>");
> > +MODULE_DESCRIPTION("PCIe NTB Simple Pingpong Client");
> 
> The changes above seem like unrelated, unnecessary cleanup.  If so,
> break it out into a separate patch.  Otherwise, code changes might get
> lost in the mess.
> 

Is it really necessary to have all of this info defined in macro? We don't use
them anywhere in the source below. I add this change here due to the last Greg
patch, where he removed DRIVER_LICENSE from the code. He said, that the license
check tool needs it to be directly defined in the MODULE_LICENSE. The rest of 
macro aren't used by any tool, but still there might be some utility in future
to collect all the driver authors or descriptions. Still if you think it is
unnecessary and it's ok to still have the macro left here, I'll get them back
to the drivers code.

> >
> >  static unsigned int unsafe;
> >  module_param(unsafe, uint, 0644);
> > @@ -86,237 +100,345 @@ static unsigned int delay_ms = 1000;
> >  module_param(delay_ms, uint, 0644);
> >  MODULE_PARM_DESC(delay_ms, "Milliseconds to delay the response to peer");
> >
> > -static unsigned long db_init = 0x7;
> > -module_param(db_init, ulong, 0644);
> > -MODULE_PARM_DESC(db_init, "Initial doorbell bits to ring on the peer");
> > -
> > -/* Only two-ports NTB devices are supported */
> > -#define PIDX           NTB_DEF_PEER_IDX
> > -
> >  struct pp_ctx {
> > -       struct ntb_dev                  *ntb;
> > -       u64                             db_bits;
> > -       /* synchronize access to db_bits by ping and pong */
> > -       spinlock_t                      db_lock;
> > -       struct timer_list               db_timer;
> > -       unsigned long                   db_delay;
> > -       struct dentry                   *debugfs_node_dir;
> > -       struct dentry                   *debugfs_count;
> > -       atomic_t                        count;
> > +       struct ntb_dev *ntb;
> > +       struct hrtimer timer;
> > +       u64 in_db;
> > +       u64 out_db;
> > +       int out_pidx;
> > +       u64 nmask;
> > +       u64 pmask;
> > +       atomic_t count;
> > +       spinlock_t lock;
> > +       struct dentry *dbgfs_dir;
> >  };
> > +#define to_pp_timer(__timer) \
> > +       container_of(__timer, struct pp_ctx, timer)
> >
> > -static struct dentry *pp_debugfs_dir;
> > +static struct dentry *pp_dbgfs_topdir;
> >
> > -static void pp_ping(struct timer_list *t)
> > +static int pp_find_next_peer(struct pp_ctx *pp)
> >  {
> > -       struct pp_ctx *pp = from_timer(pp, t, db_timer);
> > -       unsigned long irqflags;
> > -       u64 db_bits, db_mask;
> > -       u32 spad_rd, spad_wr;
> > +       u64 link, out_db;
> > +       int pidx;
> > +
> > +       link = ntb_link_is_up(pp->ntb, NULL, NULL);
> > +
> > +       /* Find next available peer */
> > +       if (link & pp->nmask) {
> > +               pidx = __ffs64(link & pp->nmask);
> > +               out_db = BIT_ULL(pidx + 1);
> > +       } else if (link & pp->pmask) {
> > +               pidx = __ffs64(link & pp->pmask);
> > +               out_db = BIT_ULL(pidx);
> > +       } else {
> > +               return -ENODEV;
> > +       }
> >
> > -       spin_lock_irqsave(&pp->db_lock, irqflags);
> > -       {
> > -               db_mask = ntb_db_valid_mask(pp->ntb);
> > -               db_bits = ntb_db_read(pp->ntb);
> > +       spin_lock(&pp->lock);
> > +       pp->out_pidx = pidx;
> > +       pp->out_db = out_db;
> > +       spin_unlock(&pp->lock);
> >
> > -               if (db_bits) {
> > -                       dev_dbg(&pp->ntb->dev,
> > -                               "Masked pongs %#llx\n",
> > -                               db_bits);
> > -                       ntb_db_clear(pp->ntb, db_bits);
> > -               }
> > +       return 0;
> > +}
> >
> > -               db_bits = ((pp->db_bits | db_bits) << 1) & db_mask;
> > +static void pp_setup(struct pp_ctx *pp)
> > +{
> > +       int ret;
> >
> > -               if (!db_bits)
> > -                       db_bits = db_init;
> > +       ntb_db_set_mask(pp->ntb, pp->in_db);
> >
> > -               spad_rd = ntb_spad_read(pp->ntb, 0);
> > -               spad_wr = spad_rd + 1;
> > +       hrtimer_cancel(&pp->timer);
> >
> > -               dev_dbg(&pp->ntb->dev,
> > -                       "Ping bits %#llx read %#x write %#x\n",
> > -                       db_bits, spad_rd, spad_wr);
> > +       ret = pp_find_next_peer(pp);
> > +       if (ret == -ENODEV) {
> 
> I would suggest any error (thus < 0)
> 

pp_find_next_peer() doesn't return any error except -ENODEV, so technically
it is ok to leave it as is. Additionally the definite value check can be seen
as some kind of code documentation. The only problem which I see here can happen
only if somebody changes the function definition, so it would return another
errors. I'd leave it as is for now, since positive sides seem to me more
valuable.

> > +               dev_dbg(&pp->ntb->dev, "Got no peers, so cancel\n");
> > +               return;
> > +       }
> >
> > -               ntb_peer_spad_write(pp->ntb, PIDX, 0, spad_wr);
> > -               ntb_peer_db_set(pp->ntb, db_bits);
> > -               ntb_db_clear_mask(pp->ntb, db_mask);
> > +       spin_lock(&pp->lock);
> > +       dev_dbg(&pp->ntb->dev, "Ping-pong started with port %d, db %#llx\n",
> > +               ntb_peer_port_number(pp->ntb, pp->out_pidx), pp->out_db);
> > +       spin_unlock(&pp->lock);
> 
> Ugh, I don't like this.  You are adding a side effect of the lock
> being potentially grabbed by someone else just for debugging that
> might not be enabled.
> 

Fair enough. I'll discard the lock/unlock.

> >
> > -               pp->db_bits = 0;
> > -       }
> > -       spin_unlock_irqrestore(&pp->db_lock, irqflags);
> > +       hrtimer_start(&pp->timer, ms_to_ktime(delay_ms), HRTIMER_MODE_REL);
> >  }
> >
> > -static void pp_link_event(void *ctx)
> > +static void pp_clear(struct pp_ctx *pp)
> >  {
> > -       struct pp_ctx *pp = ctx;
> > +       hrtimer_cancel(&pp->timer);
> >
> > -       if (ntb_link_is_up(pp->ntb, NULL, NULL) == 1) {
> > -               dev_dbg(&pp->ntb->dev, "link is up\n");
> > -               pp_ping(&pp->db_timer);
> > -       } else {
> > -               dev_dbg(&pp->ntb->dev, "link is down\n");
> > -               del_timer(&pp->db_timer);
> > -       }
> > +       ntb_db_set_mask(pp->ntb, pp->in_db);
> > +
> > +       dev_dbg(&pp->ntb->dev, "Ping-pong cancelled\n");
> >  }
> >
> > -static void pp_db_event(void *ctx, int vec)
> > +static void pp_ping(struct pp_ctx *pp)
> >  {
> > -       struct pp_ctx *pp = ctx;
> > -       u64 db_bits, db_mask;
> > -       unsigned long irqflags;
> > +       u32 count;
> >
> > -       spin_lock_irqsave(&pp->db_lock, irqflags);
> > -       {
> > -               db_mask = ntb_db_vector_mask(pp->ntb, vec);
> > -               db_bits = db_mask & ntb_db_read(pp->ntb);
> > -               ntb_db_set_mask(pp->ntb, db_mask);
> > -               ntb_db_clear(pp->ntb, db_bits);
> > +       count = atomic_read(&pp->count);
> >
> > -               pp->db_bits |= db_bits;
> > +       spin_lock(&pp->lock);
> > +       ntb_peer_spad_write(pp->ntb, pp->out_pidx, 0, count);
> > +       ntb_peer_msg_write(pp->ntb, pp->out_pidx, 0, count);
> >
> > -               mod_timer(&pp->db_timer, jiffies + pp->db_delay);
> > +       dev_dbg(&pp->ntb->dev, "Ping port %d spad %#x, msg %#x\n",
> > +               ntb_peer_port_number(pp->ntb, pp->out_pidx), count, count);
> >
> > -               dev_dbg(&pp->ntb->dev,
> > -                       "Pong vec %d bits %#llx\n",
> > -                       vec, db_bits);
> > -               atomic_inc(&pp->count);
> > -       }
> > -       spin_unlock_irqrestore(&pp->db_lock, irqflags);
> > +       ntb_peer_db_set(pp->ntb, pp->out_db);
> > +       ntb_db_clear_mask(pp->ntb, pp->in_db);
> > +       spin_unlock(&pp->lock);
> >  }
> >
> > -static int pp_debugfs_setup(struct pp_ctx *pp)
> > +static void pp_pong(struct pp_ctx *pp)
> >  {
> > -       struct pci_dev *pdev = pp->ntb->pdev;
> > +       u32 msg_data = -1, spad_data = -1;
> > +       int pidx = 0;
> >
> > -       if (!pp_debugfs_dir)
> > -               return -ENODEV;
> > +       /* Read pong data */
> > +       spad_data = ntb_spad_read(pp->ntb, 0);
> > +       msg_data = ntb_msg_read(pp->ntb, &pidx, 0);
> > +       ntb_msg_clear_sts(pp->ntb, -1);
> >
> > -       pp->debugfs_node_dir = debugfs_create_dir(pci_name(pdev),
> > -                                                 pp_debugfs_dir);
> > -       if (!pp->debugfs_node_dir)
> > -               return -ENODEV;
> > +       /*
> > +        * Scratchpad and message data may differ, since message register can't
> > +        * be rewritten unless status is cleared. Additionally either of them
> > +        * might be unsupported
> > +        */
> > +       dev_dbg(&pp->ntb->dev, "Pong spad %#x, msg %#x (port %d)\n",
> > +               spad_data, msg_data, ntb_peer_port_number(pp->ntb, pidx));
> >
> > -       pp->debugfs_count = debugfs_create_atomic_t("count", S_IRUSR | S_IWUSR,
> > -                                                   pp->debugfs_node_dir,
> > -                                                   &pp->count);
> > -       if (!pp->debugfs_count)
> > -               return -ENODEV;
> > +       atomic_inc(&pp->count);
> >
> > -       return 0;
> > +       ntb_db_set_mask(pp->ntb, pp->in_db);
> > +       ntb_db_clear(pp->ntb, pp->in_db);
> > +
> > +       hrtimer_start(&pp->timer, ms_to_ktime(delay_ms), HRTIMER_MODE_REL);
> > +}
> > +
> > +static enum hrtimer_restart pp_timer_func(struct hrtimer *t)
> > +{
> > +       struct pp_ctx *pp = to_pp_timer(t);
> > +
> > +       pp_ping(pp);
> > +
> > +       return HRTIMER_NORESTART;
> > +}
> > +
> > +static void pp_link_event(void *ctx)
> > +{
> > +       struct pp_ctx *pp = ctx;
> > +
> > +       pp_setup(pp);
> > +}
> > +
> > +static void pp_db_event(void *ctx, int vec)
> > +{
> > +       struct pp_ctx *pp = ctx;
> > +
> > +       pp_pong(pp);
> >  }
> >
> >  static const struct ntb_ctx_ops pp_ops = {
> >         .link_event = pp_link_event,
> > -       .db_event = pp_db_event,
> > +       .db_event = pp_db_event
> >  };
> >
> > -static int pp_probe(struct ntb_client *client,
> > -                   struct ntb_dev *ntb)
> > +static int pp_check_ntb(struct ntb_dev *ntb)
> >  {
> > -       struct pp_ctx *pp;
> > -       int rc;
> > +       u64 pmask;
> >
> >         if (ntb_db_is_unsafe(ntb)) {
> > -               dev_dbg(&ntb->dev, "doorbell is unsafe\n");
> > -               if (!unsafe) {
> > -                       rc = -EINVAL;
> > -                       goto err_pp;
> > -               }
> > -       }
> > -
> > -       if (ntb_spad_count(ntb) < 1) {
> > -               dev_dbg(&ntb->dev, "no enough scratchpads\n");
> > -               rc = -EINVAL;
> > -               goto err_pp;
> > +               dev_dbg(&ntb->dev, "Doorbell is unsafe\n");
> > +               if (!unsafe)
> > +                       return -EINVAL;
> >         }
> >
> >         if (ntb_spad_is_unsafe(ntb)) {
> > -               dev_dbg(&ntb->dev, "scratchpad is unsafe\n");
> > -               if (!unsafe) {
> > -                       rc = -EINVAL;
> > -                       goto err_pp;
> > -               }
> > +               dev_dbg(&ntb->dev, "Scratchpad is unsafe\n");
> > +               if (!unsafe)
> > +                       return -EINVAL;
> >         }
> >
> > -       if (ntb_peer_port_count(ntb) != NTB_DEF_PEER_CNT)
> > -               dev_warn(&ntb->dev, "multi-port NTB is unsupported\n");
> > +       pmask = GENMASK_ULL(ntb_peer_port_count(ntb), 0);
> > +       if ((ntb_db_valid_mask(ntb) & pmask) != pmask) {
> > +               dev_err(&ntb->dev, "Unsupported DB configuration\n");
> > +               return -EINVAL;
> > +       }
> >
> > -       pp = kmalloc(sizeof(*pp), GFP_KERNEL);
> > -       if (!pp) {
> > -               rc = -ENOMEM;
> > -               goto err_pp;
> > +       if (ntb_spad_count(ntb) < 1 && ntb_msg_count(ntb) < 1) {
> > +               dev_dbg(&ntb->dev, "Scratchpads and messages unsupported\n");
> > +               return -EINVAL;
> > +       } else if (ntb_spad_count(ntb) < 1) {
> > +               dev_dbg(&ntb->dev, "Scratchpads unsupported\n");
> > +       } else if (ntb_msg_count(ntb) < 1) {
> > +               dev_dbg(&ntb->dev, "Messages unsupported\n");
> 
> Should these be warnings or errors?
> 

The last two should be debug prints. It's ok if one of them unsupported,
some of NTB devices can provides Messages only, some work with Scratchpads.
As far as I know there is only one NTB device, which supports both of them
on hardware level. It's IDT� 89HPES8NT2, 89HPES16NT2, 89HPES16NT2, 89HPES12NT3,
89HPES24NT3 series, which isn't supported by the current IDT driver, since
I don't have it.
But it's bug if neither of the registers supported. NTB API even doesn't allow
such devices registration. In this case we should print an error. I'll replace
the first dev_dbg with dev_err then.

> >         }
> >
> > +       return 0;
> > +}
> > +
> > +static struct pp_ctx *pp_create_data(struct ntb_dev *ntb)
> > +{
> > +       struct pp_ctx *pp;
> > +
> > +       pp = devm_kzalloc(&ntb->dev, sizeof(*pp), GFP_KERNEL);
> > +       if (!pp)
> > +               return ERR_PTR(-ENOMEM);
> > +
> >         pp->ntb = ntb;
> > -       pp->db_bits = 0;
> >         atomic_set(&pp->count, 0);
> > -       spin_lock_init(&pp->db_lock);
> > -       timer_setup(&pp->db_timer, pp_ping, 0);
> > -       pp->db_delay = msecs_to_jiffies(delay_ms);
> > +       spin_lock_init(&pp->lock);
> > +       hrtimer_init(&pp->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
> > +       pp->timer.function = pp_timer_func;
> >
> > -       rc = ntb_set_ctx(ntb, pp, &pp_ops);
> > -       if (rc)
> > -               goto err_ctx;
> > +       return pp;
> > +}
> > +
> > +static void pp_init_flds(struct pp_ctx *pp)
> > +{
> > +       int pidx, lport, pcnt;
> > +
> > +       /* Find global port index */
> > +       lport = ntb_port_number(pp->ntb);
> > +       pcnt = ntb_peer_port_count(pp->ntb);
> > +       for (pidx = 0; pidx < pcnt; pidx++) {
> > +               if (lport < ntb_peer_port_number(pp->ntb, pidx))
> > +                       break;
> > +       }
> >
> > -       rc = pp_debugfs_setup(pp);
> > -       if (rc)
> > -               goto err_ctx;
> > +       pp->in_db = BIT_ULL(pidx);
> > +       pp->pmask = GENMASK_ULL(pidx, 0) >> 1;
> > +       pp->nmask = GENMASK_ULL(pcnt - 1, pidx);
> >
> > -       ntb_link_enable(ntb, NTB_SPEED_AUTO, NTB_WIDTH_AUTO);
> > -       ntb_link_event(ntb);
> > +       dev_dbg(&pp->ntb->dev, "Inbound db %#llx, prev %#llx, next %#llx\n",
> > +               pp->in_db, pp->pmask, pp->nmask);
> > +}
> > +
> > +static int pp_mask_events(struct pp_ctx *pp)
> > +{
> > +       u64 db_mask, msg_mask;
> > +       int ret;
> > +
> > +       db_mask = ntb_db_valid_mask(pp->ntb);
> > +       ret = ntb_db_set_mask(pp->ntb, db_mask);
> > +       if (ret)
> > +               return ret;
> > +
> > +       /* Skip message events masking if unsupported */
> > +       if (ntb_msg_count(pp->ntb) < 1)
> > +               return 0;
> > +
> > +       msg_mask = ntb_msg_outbits(pp->ntb) | ntb_msg_inbits(pp->ntb);
> > +       return ntb_msg_set_mask(pp->ntb, msg_mask);
> > +}
> > +
> > +static int pp_setup_ctx(struct pp_ctx *pp)
> > +{
> > +       int ret;
> > +
> > +       ret = ntb_set_ctx(pp->ntb, pp, &pp_ops);
> > +       if (ret)
> > +               return ret;
> > +
> > +       ntb_link_enable(pp->ntb, NTB_SPEED_AUTO, NTB_WIDTH_AUTO);
> > +       /* Might be not necessary */
> > +       ntb_link_event(pp->ntb);
> >
> >         return 0;
> > +}
> > +
> > +static void pp_clear_ctx(struct pp_ctx *pp)
> > +{
> > +       ntb_link_disable(pp->ntb);
> >
> > -err_ctx:
> > -       kfree(pp);
> > -err_pp:
> > -       return rc;
> > +       ntb_clear_ctx(pp->ntb);
> >  }
> >
> > -static void pp_remove(struct ntb_client *client,
> > -                     struct ntb_dev *ntb)
> > +static void pp_setup_dbgfs(struct pp_ctx *pp)
> > +{
> > +       struct pci_dev *pdev = pp->ntb->pdev;
> > +       void *ret;
> > +
> > +       pp->dbgfs_dir = debugfs_create_dir(pci_name(pdev), pp_dbgfs_topdir);
> > +
> > +       ret = debugfs_create_atomic_t("count", 0600, pp->dbgfs_dir, &pp->count);
> > +       if (!ret)
> > +               dev_warn(&pp->ntb->dev, "DebugFS unsupported\n");
> 
> Shouldn't this be fatal?
> 

If only I had the record of all the comments I have got on the DebugFS
initialization code.) Everyone had different opinion on this.
Last time I submitted a patch to driver/misc subsystem, where Grag K-H is
reviewer. He said, that DebugFS got just one purpose - for debugging. A driver
isn't supposed to fail in case if the FS isn't available in the kernel. I had to
rewrite the code in the same way he said. I assume the Ping-Pong driver shall
still work if DebugFS isn't available, but the user won't be able to see how
many pings have been made. For such circumstances I added the warning to inform
the user about this. So lets leave the code as is. Although I'd accept such the
comment on ntb_tool/ntb_perf drivers, since they get to be useless without
DebugFS support in the kernel.

> > +}
> > +
> > +static void pp_clear_dbgfs(struct pp_ctx *pp)
> > +{
> > +       debugfs_remove_recursive(pp->dbgfs_dir);
> > +}
> > +
> > +static int pp_probe(struct ntb_client *client, struct ntb_dev *ntb)
> > +{
> > +       struct pp_ctx *pp;
> > +       int ret;
> > +
> > +       ret = pp_check_ntb(ntb);
> > +       if (ret)
> > +               return ret;
> > +
> > +       pp = pp_create_data(ntb);
> > +       if (IS_ERR(pp))
> > +               return PTR_ERR(pp);
> > +
> > +       pp_init_flds(pp);
> > +
> > +       ret = pp_mask_events(pp);
> > +       if (ret)
> > +               return ret;
> > +
> > +       ret = pp_setup_ctx(pp);
> > +       if (ret)
> > +               return ret;
> > +
> > +       pp_setup_dbgfs(pp);
> > +
> > +       return 0;
> > +}
> > +
> > +static void pp_remove(struct ntb_client *client, struct ntb_dev *ntb)
> >  {
> >         struct pp_ctx *pp = ntb->ctx;
> >
> > -       debugfs_remove_recursive(pp->debugfs_node_dir);
> > +       pp_clear_dbgfs(pp);
> >
> > -       ntb_clear_ctx(ntb);
> > -       del_timer_sync(&pp->db_timer);
> > -       ntb_link_disable(ntb);
> > +       pp_clear_ctx(pp);
> >
> > -       kfree(pp);
> > +       pp_clear(pp);
> >  }
> >
> >  static struct ntb_client pp_client = {
> >         .ops = {
> >                 .probe = pp_probe,
> > -               .remove = pp_remove,
> > -       },
> > +               .remove = pp_remove
> > +       }
> >  };
> >
> >  static int __init pp_init(void)
> >  {
> > -       int rc;
> > +       int ret;
> >
> >         if (debugfs_initialized())
> > -               pp_debugfs_dir = debugfs_create_dir(KBUILD_MODNAME, NULL);
> > +               pp_dbgfs_topdir = debugfs_create_dir(KBUILD_MODNAME, NULL);
> >
> > -       rc = ntb_register_client(&pp_client);
> > -       if (rc)
> > -               goto err_client;
> > +       ret = ntb_register_client(&pp_client);
> > +       if (ret)
> > +               debugfs_remove_recursive(pp_dbgfs_topdir);
> >
> > -       return 0;
> > -
> > -err_client:
> > -       debugfs_remove_recursive(pp_debugfs_dir);
> > -       return rc;
> > +       return ret;
> >  }
> >  module_init(pp_init);
> >
> >  static void __exit pp_exit(void)
> >  {
> >         ntb_unregister_client(&pp_client);
> > -       debugfs_remove_recursive(pp_debugfs_dir);
> > +       debugfs_remove_recursive(pp_dbgfs_topdir);
> >  }
> >  module_exit(pp_exit);
> > +
> > --
> > 2.12.0
> >

Re: [PATCH v2 04/15] NTB: ntb_pp: Add full multi-port NTB API support

[Logan Gunthorpe]

On 05/12/17 12:53 PM, Serge Semin wrote:
> Is it really necessary to have all of this info defined in macro? We don't use
> them anywhere in the source below. I add this change here due to the last Greg
> patch, where he removed DRIVER_LICENSE from the code. He said, that the license
> check tool needs it to be directly defined in the MODULE_LICENSE. The rest of
> macro aren't used by any tool, but still there might be some utility in future
> to collect all the driver authors or descriptions. Still if you think it is
> unnecessary and it's ok to still have the macro left here, I'll get them back
> to the drivers code.

No one's arguing against the actual change, only that it does not belong 
in this patch. If you want to make the change send it as it's own patch 
with it's own justification and we can discuss it there.

Logan

[PATCH v2 05/15] NTB: ntb_tool: Add full multi-port NTB API support

[Serge Semin]

NTB API has been updated to support multi-port devices like IDT
89HPESx series or Microsemi Switchtec. Message registers
functionality has also been added to new API. In order to keep
the new hardware and corresponding capabilities well tested, NTB
tool driver is accordingly altered.

Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
---

Changelog v1:
- Alter interface in compliance with multi-port API
- Move Message/MW/Port/Link settings to a specific directory

Changelog v2:
- Remove driver Author/Description/License macros
- Return error if ntb_mw_get_align called while link is down
- Add db_valid_mask DebugFS file
- Add msg_inbits/msg_outbits DebugFS files

 drivers/ntb/test/ntb_tool.c | 1805 +++++++++++++++++++++++++++++--------------
 1 file changed, 1228 insertions(+), 577 deletions(-)

diff --git a/drivers/ntb/test/ntb_tool.c b/drivers/ntb/test/ntb_tool.c
index 91526a986caa..e3fbc5944679 100644
--- a/drivers/ntb/test/ntb_tool.c
+++ b/drivers/ntb/test/ntb_tool.c
@@ -5,6 +5,7 @@
  *   GPL LICENSE SUMMARY
  *
  *   Copyright (C) 2015 EMC Corporation. All Rights Reserved.
+ *   Copyright (C) 2017 T-Platforms All Rights Reserved.
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of version 2 of the GNU General Public License as
@@ -18,6 +19,7 @@
  *   BSD LICENSE
  *
  *   Copyright (C) 2015 EMC Corporation. All Rights Reserved.
+ *   Copyright (C) 2017 T-Platforms All Rights Reserved.
  *
  *   Redistribution and use in source and binary forms, with or without
  *   modification, are permitted provided that the following conditions
@@ -49,6 +51,7 @@
  *
  * Contact Information:
  * Allen Hubbe <Allen.Hubbe@emc.com>
+ * Serge Semin <fancer.lancer@gmail.com>, <Sergey.Semin@t-platforms.ru>
  */
 
 /*
@@ -56,42 +59,125 @@
  *
  * Assuming $DBG_DIR is something like:
  * '/sys/kernel/debug/ntb_tool/0000:00:03.0'
+ * Suppose aside from local device there is at least one remote device
+ * connected to NTB with index 0.
+ *-----------------------------------------------------------------------------
+ * Eg: check local/peer device information.
  *
- * Eg: check if clearing the doorbell mask generates an interrupt.
+ * # Get local device port number
+ * root@self# cat $DBG_DIR/port
  *
- * # Check the link status
- * root@self# cat $DBG_DIR/link
+ * # Check local device functionality
+ * root@self# ls $DBG_DIR
+ * db            msg1          msg_sts     peer4/        port
+ * db_event      msg2          peer0/      peer5/        spad0
+ * db_mask       msg3          peer1/      peer_db       spad1
+ * link          msg_event     peer2/      peer_db_mask  spad2
+ * msg0          msg_mask      peer3/      peer_spad     spad3
+ * # As one can see it supports:
+ * # 1) four inbound message registers
+ * # 2) four inbound scratchpads
+ * # 3) up to six peer devices
  *
- * # Block until the link is up
- * root@self# echo Y > $DBG_DIR/link_event
+ * # Check peer device port number
+ * root@self# cat $DBG_DIR/peer0/port
  *
- * # Set the doorbell mask
- * root@self# echo 's 1' > $DBG_DIR/mask
+ * # Check peer device(s) functionality to be used
+ * root@self# ls $DBG_DIR/peer0
+ * link             mw_trans0       mw_trans6        port
+ * link_event       mw_trans1       mw_trans7        spad0
+ * msg0             mw_trans2       peer_mw_trans0   spad1
+ * msg1             mw_trans3       peer_mw_trans1   spad2
+ * msg2             mw_trans4       peer_mw_trans2   spad3
+ * msg3             mw_trans5       peer_mw_trans3
+ * # As one can see we got:
+ * # 1) four outbound message registers
+ * # 2) four outbound scratchpads
+ * # 3) eight inbound memory windows
+ * # 4) four outbound memory windows
+ *-----------------------------------------------------------------------------
+ * Eg: NTB link tests
  *
- * # Ring the doorbell from the peer
+ * # Set local link up/down
+ * root@self# echo Y > $DBG_DIR/link
+ * root@self# echo N > $DBG_DIR/link
+ *
+ * # Check if link with peer device is up/down:
+ * root@self# cat $DBG_DIR/peer0/link
+ *
+ * # Block until the link is up/down
+ * root@self# echo Y > $DBG_DIR/peer0/link_event
+ * root@self# echo N > $DBG_DIR/peer0/link_event
+ *-----------------------------------------------------------------------------
+ * Eg: Doorbell registers tests (some functionality might be absent)
+ *
+ * # Set/clear/get local doorbell
+ * root@self# echo 's 1' > $DBG_DIR/db
+ * root@self# echo 'c 1' > $DBG_DIR/db
+ * root@self# cat  $DBG_DIR/db
+ *
+ * # Set/clear/get local doorbell mask
+ * root@self# echo 's 1' > $DBG_DIR/db_mask
+ * root@self# echo 'c 1' > $DBG_DIR/db_mask
+ * root@self# cat $DBG_DIR/db_mask
+ *
+ * # Ring/clear/get peer doorbell
  * root@peer# echo 's 1' > $DBG_DIR/peer_db
+ * root@peer# echo 'c 1' > $DBG_DIR/peer_db
+ * root@peer# cat $DBG_DIR/peer_db
+ *
+ * # Set/clear/get peer doorbell mask
+ * root@self# echo 's 1' > $DBG_DIR/peer_db_mask
+ * root@self# echo 'c 1' > $DBG_DIR/peer_db_mask
+ * root@self# cat $DBG_DIR/peer_db_mask
+ *
+ * # Block until local doorbell is set with specified value
+ * root@self# echo 1 > $DBG_DIR/db_event
+ *-----------------------------------------------------------------------------
+ * Eg: Message registers tests (functionality might be absent)
+ *
+ * # Set/clear/get in/out message registers status
+ * root@self# echo 's 1' > $DBG_DIR/msg_sts
+ * root@self# echo 'c 1' > $DBG_DIR/msg_sts
+ * root@self# cat $DBG_DIR/msg_sts
  *
- * # Clear the doorbell mask
- * root@self# echo 'c 1' > $DBG_DIR/mask
+ * # Set/clear in/out message registers mask
+ * root@self# echo 's 1' > $DBG_DIR/msg_mask
+ * root@self# echo 'c 1' > $DBG_DIR/msg_mask
  *
- * Observe debugging output in dmesg or your console.  You should see a
- * doorbell event triggered by clearing the mask.  If not, this may indicate an
- * issue with the hardware that needs to be worked around in the driver.
+ * # Get inbound message register #0 value and source of port index
+ * root@self# cat  $DBG_DIR/msg0
  *
- * Eg: read and write scratchpad registers
+ * # Send some data to peer over outbound message register #0
+ * root@self# echo 0x01020304 > $DBG_DIR/peer0/msg0
+ *-----------------------------------------------------------------------------
+ * Eg: Scratchpad registers tests (functionality might be absent)
  *
- * root@peer# echo '0 0x01010101 1 0x7f7f7f7f' > $DBG_DIR/peer_spad
+ * # Write/read to/from local scratchpad register #0
+ * root@peer# echo 0x01020304 > $DBG_DIR/spad0
+ * root@peer# cat $DBG_DIR/spad0
  *
- * root@self# cat $DBG_DIR/spad
+ * # Write/read to/from peer scratchpad register #0
+ * root@peer# echo 0x01020304 > $DBG_DIR/peer0/spad0
+ * root@peer# cat $DBG_DIR/peer0/spad0
+ *-----------------------------------------------------------------------------
+ * Eg: Memory windows tests
  *
- * Observe that spad 0 and 1 have the values set by the peer.
+ * # Create inbound memory window buffer of specified size/get its base address
+ * root@peer# echo 16384 > $DBG_DIR/peer0/mw_trans0
+ * root@peer# cat $DBG_DIR/peer0/mw_trans0
  *
- * # Check the memory window translation info
- * cat $DBG_DIR/peer_trans0
+ * # Write/read data to/from inbound memory window
+ * root@peer# echo Hello > $DBG_DIR/peer0/mw0
+ * root@peer# head -c 7 $DBG_DIR/peer0/mw0
  *
- * # Setup a 16k memory window buffer
- * echo 16384 > $DBG_DIR/peer_trans0
+ * # Map outbound memory window/check it settings (on peer device)
+ * root@peer# echo 0xADD0BA5E:16384 > $DBG_DIR/peer0/peer_mw_trans0
+ * root@peer# cat $DBG_DIR/peer0/peer_mw_trans0
  *
+ * # Write/read data to/from outbound memory window (on peer device)
+ * root@peer# echo olleH > $DBG_DIR/peer0/peer_mw0
+ * root@peer# head -c 7 $DBG_DIR/peer0/peer_mw0
  */
 
 #include <linux/init.h>
@@ -106,49 +192,77 @@
 
 #include <linux/ntb.h>
 
-#define DRIVER_NAME			"ntb_tool"
-#define DRIVER_DESCRIPTION		"PCIe NTB Debugging Tool"
+#define DRIVER_NAME		"ntb_tool"
+#define DRIVER_VERSION		"2.0"
 
-#define DRIVER_LICENSE			"Dual BSD/GPL"
-#define DRIVER_VERSION			"1.0"
-#define DRIVER_RELDATE			"22 April 2015"
-#define DRIVER_AUTHOR			"Allen Hubbe <Allen.Hubbe@emc.com>"
-
-MODULE_LICENSE(DRIVER_LICENSE);
+MODULE_LICENSE("Dual BSD/GPL");
 MODULE_VERSION(DRIVER_VERSION);
-MODULE_AUTHOR(DRIVER_AUTHOR);
-MODULE_DESCRIPTION(DRIVER_DESCRIPTION);
-
-/* It is rare to have hadrware with greater than six MWs */
-#define MAX_MWS	6
-/* Only two-ports devices are supported */
-#define PIDX	NTB_DEF_PEER_IDX
-
-static struct dentry *tool_dbgfs;
+MODULE_AUTHOR("Allen Hubbe <Allen.Hubbe@emc.com>");
+MODULE_DESCRIPTION("PCIe NTB Debugging Tool");
 
 struct tool_mw {
-	int idx;
+	int widx;
+	int pidx;
 	struct tool_ctx *tc;
-	resource_size_t win_size;
+	union {
+		u8 *mm_base;
+		u8 __iomem *io_base;
+	};
+	union {
+		dma_addr_t dma_base;
+		u64 tr_base;
+	};
 	resource_size_t size;
-	u8 __iomem *local;
-	u8 *peer;
-	dma_addr_t peer_dma;
-	struct dentry *peer_dbg_file;
+	struct dentry *dbgfs_file;
+};
+
+struct tool_mw_wrap {
+	int pidx;
+	struct tool_mw *mw;
+};
+
+struct tool_msg {
+	int midx;
+	int pidx;
+	struct tool_ctx *tc;
+};
+
+struct tool_spad {
+	int sidx;
+	int pidx;
+	struct tool_ctx *tc;
+};
+
+struct tool_peer {
+	int pidx;
+	struct tool_ctx *tc;
+	int inmw_cnt;
+	struct tool_mw *inmws;
+	int outmw_cnt;
+	struct tool_mw_wrap *outmws;
+	int outmsg_cnt;
+	struct tool_msg *outmsgs;
+	int outspad_cnt;
+	struct tool_spad *outspads;
+	struct dentry *dbgfs_dir;
 };
 
 struct tool_ctx {
 	struct ntb_dev *ntb;
-	struct dentry *dbgfs;
 	wait_queue_head_t link_wq;
-	int mw_count;
-	struct tool_mw mws[MAX_MWS];
+	wait_queue_head_t db_wq;
+	wait_queue_head_t msg_wq;
+	int outmw_cnt;
+	struct tool_mw *outmws;
+	int peer_cnt;
+	struct tool_peer *peers;
+	int inmsg_cnt;
+	struct tool_msg *inmsgs;
+	int inspad_cnt;
+	struct tool_spad *inspads;
+	struct dentry *dbgfs_dir;
 };
 
-#define SPAD_FNAME_SIZE 0x10
-#define INT_PTR(x) ((void *)(unsigned long)x)
-#define PTR_INT(x) ((int)(unsigned long)x)
-
 #define TOOL_FOPS_RDWR(__name, __read, __write) \
 	const struct file_operations __name = {	\
 		.owner = THIS_MODULE,		\
@@ -157,6 +271,13 @@ struct tool_ctx {
 		.write = __write,		\
 	}
 
+static struct dentry *tool_dbgfs_topdir;
+
+/*==============================================================================
+ *                               NTB events handlers
+ *==============================================================================
+ */
+
 static void tool_link_event(void *ctx)
 {
 	struct tool_ctx *tc = ctx;
@@ -182,580 +303,576 @@ static void tool_db_event(void *ctx, int vec)
 
 	dev_dbg(&tc->ntb->dev, "doorbell vec %d mask %#llx bits %#llx\n",
 		vec, db_mask, db_bits);
+
+	wake_up(&tc->db_wq);
+}
+
+static void tool_msg_event(void *ctx)
+{
+	struct tool_ctx *tc = ctx;
+	u64 msg_sts;
+
+	msg_sts = ntb_msg_read_sts(tc->ntb);
+
+	dev_dbg(&tc->ntb->dev, "message bits %#llx\n", msg_sts);
+
+	wake_up(&tc->msg_wq);
 }
 
 static const struct ntb_ctx_ops tool_ops = {
 	.link_event = tool_link_event,
 	.db_event = tool_db_event,
+	.msg_event = tool_msg_event
 };
 
-static ssize_t tool_dbfn_read(struct tool_ctx *tc, char __user *ubuf,
-			      size_t size, loff_t *offp,
-			      u64 (*db_read_fn)(struct ntb_dev *))
+/*==============================================================================
+ *                        Common read/write methods
+ *==============================================================================
+ */
+
+static ssize_t tool_fn_read(struct tool_ctx *tc, char __user *ubuf,
+			    size_t size, loff_t *offp,
+			    u64 (*fn_read)(struct ntb_dev *))
 {
 	size_t buf_size;
-	char *buf;
-	ssize_t pos, rc;
+	char buf[32];
+	ssize_t pos;
 
-	if (!db_read_fn)
+	if (!fn_read)
 		return -EINVAL;
 
-	buf_size = min_t(size_t, size, 0x20);
-
-	buf = kmalloc(buf_size, GFP_KERNEL);
-	if (!buf)
-		return -ENOMEM;
-
-	pos = scnprintf(buf, buf_size, "%#llx\n",
-			db_read_fn(tc->ntb));
-
-	rc = simple_read_from_buffer(ubuf, size, offp, buf, pos);
+	buf_size = min(size, sizeof(buf));
 
-	kfree(buf);
+	pos = scnprintf(buf, buf_size, "%#llx\n", fn_read(tc->ntb));
 
-	return rc;
+	return simple_read_from_buffer(ubuf, size, offp, buf, pos);
 }
 
-static ssize_t tool_dbfn_write(struct tool_ctx *tc,
-			       const char __user *ubuf,
-			       size_t size, loff_t *offp,
-			       int (*db_set_fn)(struct ntb_dev *, u64),
-			       int (*db_clear_fn)(struct ntb_dev *, u64))
+static ssize_t tool_fn_write(struct tool_ctx *tc,
+			     const char __user *ubuf,
+			     size_t size, loff_t *offp,
+			     int (*fn_set)(struct ntb_dev *, u64),
+			     int (*fn_clear)(struct ntb_dev *, u64))
 {
-	u64 db_bits;
 	char *buf, cmd;
-	ssize_t rc;
+	ssize_t ret;
+	u64 bits;
 	int n;
 
 	buf = kmalloc(size + 1, GFP_KERNEL);
 	if (!buf)
 		return -ENOMEM;
 
-	rc = simple_write_to_buffer(buf, size, offp, ubuf, size);
-	if (rc < 0) {
+	ret = simple_write_to_buffer(buf, size, offp, ubuf, size);
+	if (ret < 0) {
 		kfree(buf);
-		return rc;
+		return ret;
 	}
 
 	buf[size] = 0;
 
-	n = sscanf(buf, "%c %lli", &cmd, &db_bits);
+	n = sscanf(buf, "%c %lli", &cmd, &bits);
 
 	kfree(buf);
 
 	if (n != 2) {
-		rc = -EINVAL;
+		ret = -EINVAL;
 	} else if (cmd == 's') {
-		if (!db_set_fn)
-			rc = -EINVAL;
+		if (!fn_set)
+			ret = -EINVAL;
 		else
-			rc = db_set_fn(tc->ntb, db_bits);
+			ret = fn_set(tc->ntb, bits);
 	} else if (cmd == 'c') {
-		if (!db_clear_fn)
-			rc = -EINVAL;
+		if (!fn_clear)
+			ret = -EINVAL;
 		else
-			rc = db_clear_fn(tc->ntb, db_bits);
+			ret = fn_clear(tc->ntb, bits);
 	} else {
-		rc = -EINVAL;
+		ret = -EINVAL;
 	}
 
-	return rc ? : size;
+	return ret ? : size;
 }
 
-static ssize_t tool_spadfn_read(struct tool_ctx *tc, char __user *ubuf,
-				size_t size, loff_t *offp,
-				u32 (*spad_read_fn)(struct ntb_dev *, int))
-{
-	size_t buf_size;
-	char *buf;
-	ssize_t pos, rc;
-	int i, spad_count;
-
-	if (!spad_read_fn)
-		return -EINVAL;
-
-	spad_count = ntb_spad_count(tc->ntb);
+/*==============================================================================
+ *                            Port read/write methods
+ *==============================================================================
+ */
 
-	/*
-	 * We multiply the number of spads by 15 to get the buffer size
-	 * this is from 3 for the %d, 10 for the largest hex value
-	 * (0x00000000) and 2 for the tab and line feed.
-	 */
-	buf_size = min_t(size_t, size, spad_count * 15);
+static ssize_t tool_port_read(struct file *filep, char __user *ubuf,
+			      size_t size, loff_t *offp)
+{
+	struct tool_ctx *tc = filep->private_data;
+	char buf[32];
+	int pos;
 
-	buf = kmalloc(buf_size, GFP_KERNEL);
-	if (!buf)
-		return -ENOMEM;
+	pos = scnprintf(buf, sizeof(buf), "%d\n", ntb_port_number(tc->ntb));
 
-	pos = 0;
+	return simple_read_from_buffer(ubuf, size, offp, buf, pos);
+}
 
-	for (i = 0; i < spad_count; ++i) {
-		pos += scnprintf(buf + pos, buf_size - pos, "%d\t%#x\n",
-				 i, spad_read_fn(tc->ntb, i));
-	}
+static TOOL_FOPS_RDWR(tool_port_fops,
+		      tool_port_read,
+		      NULL);
 
-	rc = simple_read_from_buffer(ubuf, size, offp, buf, pos);
+static ssize_t tool_peer_port_read(struct file *filep, char __user *ubuf,
+				   size_t size, loff_t *offp)
+{
+	struct tool_peer *peer = filep->private_data;
+	struct tool_ctx *tc = peer->tc;
+	char buf[32];
+	int pos;
 
-	kfree(buf);
+	pos = scnprintf(buf, sizeof(buf), "%d\n",
+		ntb_peer_port_number(tc->ntb, peer->pidx));
 
-	return rc;
+	return simple_read_from_buffer(ubuf, size, offp, buf, pos);
 }
 
-static ssize_t tool_spadfn_write(struct tool_ctx *tc,
-				 const char __user *ubuf,
-				 size_t size, loff_t *offp,
-				 int (*spad_write_fn)(struct ntb_dev *,
-						      int, u32))
+static TOOL_FOPS_RDWR(tool_peer_port_fops,
+		      tool_peer_port_read,
+		      NULL);
+
+static int tool_init_peers(struct tool_ctx *tc)
 {
-	int spad_idx;
-	u32 spad_val;
-	char *buf, *buf_ptr;
-	int pos, n;
-	ssize_t rc;
-
-	if (!spad_write_fn) {
-		dev_dbg(&tc->ntb->dev, "no spad write fn\n");
-		return -EINVAL;
-	}
+	int pidx;
 
-	buf = kmalloc(size + 1, GFP_KERNEL);
-	if (!buf)
+	tc->peer_cnt = ntb_peer_port_count(tc->ntb);
+	tc->peers = devm_kcalloc(&tc->ntb->dev, tc->peer_cnt,
+				 sizeof(*tc->peers), GFP_KERNEL);
+	if (tc->peers == NULL)
 		return -ENOMEM;
 
-	rc = simple_write_to_buffer(buf, size, offp, ubuf, size);
-	if (rc < 0) {
-		kfree(buf);
-		return rc;
-	}
-
-	buf[size] = 0;
-	buf_ptr = buf;
-	n = sscanf(buf_ptr, "%d %i%n", &spad_idx, &spad_val, &pos);
-	while (n == 2) {
-		buf_ptr += pos;
-		rc = spad_write_fn(tc->ntb, spad_idx, spad_val);
-		if (rc)
-			break;
-
-		n = sscanf(buf_ptr, "%d %i%n", &spad_idx, &spad_val, &pos);
+	for (pidx = 0; pidx < tc->peer_cnt; pidx++) {
+		tc->peers[pidx].pidx = pidx;
+		tc->peers[pidx].tc = tc;
 	}
 
-	if (n < 0)
-		rc = n;
-
-	kfree(buf);
-
-	return rc ? : size;
+	return 0;
 }
 
-static ssize_t tool_db_read(struct file *filep, char __user *ubuf,
-			    size_t size, loff_t *offp)
-{
-	struct tool_ctx *tc = filep->private_data;
-
-	return tool_dbfn_read(tc, ubuf, size, offp,
-			      tc->ntb->ops->db_read);
-}
+/*==============================================================================
+ *                       Link state read/write methods
+ *==============================================================================
+ */
 
-static ssize_t tool_db_write(struct file *filep, const char __user *ubuf,
-			     size_t size, loff_t *offp)
+static ssize_t tool_link_write(struct file *filep, const char __user *ubuf,
+			       size_t size, loff_t *offp)
 {
 	struct tool_ctx *tc = filep->private_data;
+	bool val;
+	int ret;
 
-	return tool_dbfn_write(tc, ubuf, size, offp,
-			       tc->ntb->ops->db_set,
-			       tc->ntb->ops->db_clear);
-}
+	ret = kstrtobool_from_user(ubuf, size, &val);
+	if (ret)
+		return ret;
 
-static TOOL_FOPS_RDWR(tool_db_fops,
-		      tool_db_read,
-		      tool_db_write);
+	if (val)
+		ret = ntb_link_enable(tc->ntb, NTB_SPEED_AUTO, NTB_WIDTH_AUTO);
+	else
+		ret = ntb_link_disable(tc->ntb);
 
-static ssize_t tool_mask_read(struct file *filep, char __user *ubuf,
-			      size_t size, loff_t *offp)
-{
-	struct tool_ctx *tc = filep->private_data;
+	if (ret)
+		return ret;
 
-	return tool_dbfn_read(tc, ubuf, size, offp,
-			      tc->ntb->ops->db_read_mask);
+	return size;
 }
 
-static ssize_t tool_mask_write(struct file *filep, const char __user *ubuf,
-			       size_t size, loff_t *offp)
+static TOOL_FOPS_RDWR(tool_link_fops,
+		      NULL,
+		      tool_link_write);
+
+static ssize_t tool_peer_link_read(struct file *filep, char __user *ubuf,
+				   size_t size, loff_t *offp)
 {
-	struct tool_ctx *tc = filep->private_data;
+	struct tool_peer *peer = filep->private_data;
+	struct tool_ctx *tc = peer->tc;
+	char buf[3];
+
+	if (ntb_link_is_up(tc->ntb, NULL, NULL) & BIT(peer->pidx))
+		buf[0] = 'Y';
+	else
+		buf[0] = 'N';
+	buf[1] = '\n';
+	buf[2] = '\0';
 
-	return tool_dbfn_write(tc, ubuf, size, offp,
-			       tc->ntb->ops->db_set_mask,
-			       tc->ntb->ops->db_clear_mask);
+	return simple_read_from_buffer(ubuf, size, offp, buf, 3);
 }
 
-static TOOL_FOPS_RDWR(tool_mask_fops,
-		      tool_mask_read,
-		      tool_mask_write);
+static TOOL_FOPS_RDWR(tool_peer_link_fops,
+		      tool_peer_link_read,
+		      NULL);
 
-static ssize_t tool_peer_db_read(struct file *filep, char __user *ubuf,
-				 size_t size, loff_t *offp)
+static ssize_t tool_peer_link_event_write(struct file *filep,
+					  const char __user *ubuf,
+					  size_t size, loff_t *offp)
 {
-	struct tool_ctx *tc = filep->private_data;
+	struct tool_peer *peer = filep->private_data;
+	struct tool_ctx *tc = peer->tc;
+	u64 link_msk;
+	bool val;
+	int ret;
 
-	return tool_dbfn_read(tc, ubuf, size, offp,
-			      tc->ntb->ops->peer_db_read);
-}
+	ret = kstrtobool_from_user(ubuf, size, &val);
+	if (ret)
+		return ret;
 
-static ssize_t tool_peer_db_write(struct file *filep, const char __user *ubuf,
-				  size_t size, loff_t *offp)
-{
-	struct tool_ctx *tc = filep->private_data;
+	link_msk = BIT_ULL_MASK(peer->pidx);
+
+	if (wait_event_interruptible(tc->link_wq,
+		!!(ntb_link_is_up(tc->ntb, NULL, NULL) & link_msk) == val))
+		return -ERESTART;
 
-	return tool_dbfn_write(tc, ubuf, size, offp,
-			       tc->ntb->ops->peer_db_set,
-			       tc->ntb->ops->peer_db_clear);
+	return size;
 }
 
-static TOOL_FOPS_RDWR(tool_peer_db_fops,
-		      tool_peer_db_read,
-		      tool_peer_db_write);
+static TOOL_FOPS_RDWR(tool_peer_link_event_fops,
+		      NULL,
+		      tool_peer_link_event_write);
 
-static ssize_t tool_peer_mask_read(struct file *filep, char __user *ubuf,
-				   size_t size, loff_t *offp)
+/*==============================================================================
+ *                  Memory windows read/write/setting methods
+ *==============================================================================
+ */
+
+static ssize_t tool_mw_read(struct file *filep, char __user *ubuf,
+			    size_t size, loff_t *offp)
 {
-	struct tool_ctx *tc = filep->private_data;
+	struct tool_mw *inmw = filep->private_data;
 
-	return tool_dbfn_read(tc, ubuf, size, offp,
-			      tc->ntb->ops->peer_db_read_mask);
+	if (inmw->mm_base == NULL)
+		return -ENXIO;
+
+	return simple_read_from_buffer(ubuf, size, offp,
+				       inmw->mm_base, inmw->size);
 }
 
-static ssize_t tool_peer_mask_write(struct file *filep, const char __user *ubuf,
-				    size_t size, loff_t *offp)
+static ssize_t tool_mw_write(struct file *filep, const char __user *ubuf,
+			     size_t size, loff_t *offp)
 {
-	struct tool_ctx *tc = filep->private_data;
+	struct tool_mw *inmw = filep->private_data;
+
+	if (inmw->mm_base == NULL)
+		return -ENXIO;
 
-	return tool_dbfn_write(tc, ubuf, size, offp,
-			       tc->ntb->ops->peer_db_set_mask,
-			       tc->ntb->ops->peer_db_clear_mask);
+	return simple_write_to_buffer(inmw->mm_base, inmw->size, offp,
+				      ubuf, size);
 }
 
-static TOOL_FOPS_RDWR(tool_peer_mask_fops,
-		      tool_peer_mask_read,
-		      tool_peer_mask_write);
+static TOOL_FOPS_RDWR(tool_mw_fops,
+		      tool_mw_read,
+		      tool_mw_write);
 
-static ssize_t tool_spad_read(struct file *filep, char __user *ubuf,
-			      size_t size, loff_t *offp)
+static int tool_setup_mw(struct tool_ctx *tc, int pidx, int widx,
+			 size_t req_size)
 {
-	struct tool_ctx *tc = filep->private_data;
+	resource_size_t size, addr_align, size_align;
+	struct tool_mw *inmw = &tc->peers[pidx].inmws[widx];
+	char buf[16];
+	int ret;
 
-	return tool_spadfn_read(tc, ubuf, size, offp,
-				tc->ntb->ops->spad_read);
-}
+	if (inmw->mm_base != NULL)
+		return 0;
 
-static ssize_t tool_spad_write(struct file *filep, const char __user *ubuf,
-			       size_t size, loff_t *offp)
-{
-	struct tool_ctx *tc = filep->private_data;
+	ret = ntb_mw_get_align(tc->ntb, pidx, widx, &addr_align,
+				&size_align, &size);
+	if (ret)
+		return ret;
+
+	inmw->size = min_t(resource_size_t, req_size, size);
+	inmw->size = round_up(inmw->size, addr_align);
+	inmw->size = round_up(inmw->size, size_align);
+	inmw->mm_base = dma_alloc_coherent(&tc->ntb->dev, inmw->size,
+					   &inmw->dma_base, GFP_KERNEL);
+	if (!inmw->mm_base)
+		return -ENOMEM;
 
-	return tool_spadfn_write(tc, ubuf, size, offp,
-				 tc->ntb->ops->spad_write);
-}
+	if (!IS_ALIGNED(inmw->dma_base, addr_align)) {
+		ret = -ENOMEM;
+		goto err_free_dma;
+	}
 
-static TOOL_FOPS_RDWR(tool_spad_fops,
-		      tool_spad_read,
-		      tool_spad_write);
+	ret = ntb_mw_set_trans(tc->ntb, pidx, widx, inmw->dma_base, inmw->size);
+	if (ret)
+		goto err_free_dma;
 
-static u32 ntb_tool_peer_spad_read(struct ntb_dev *ntb, int sidx)
-{
-	return ntb_peer_spad_read(ntb, PIDX, sidx);
-}
+	snprintf(buf, sizeof(buf), "mw%d", widx);
+	inmw->dbgfs_file = debugfs_create_file(buf, 0600,
+					       tc->peers[pidx].dbgfs_dir, inmw,
+					       &tool_mw_fops);
 
-static ssize_t tool_peer_spad_read(struct file *filep, char __user *ubuf,
-				   size_t size, loff_t *offp)
-{
-	struct tool_ctx *tc = filep->private_data;
+	return 0;
 
-	return tool_spadfn_read(tc, ubuf, size, offp, ntb_tool_peer_spad_read);
-}
+err_free_dma:
+	dma_free_coherent(&tc->ntb->dev, inmw->size, inmw->mm_base,
+			  inmw->dma_base);
+	inmw->mm_base = NULL;
+	inmw->dma_base = 0;
+	inmw->size = 0;
 
-static int ntb_tool_peer_spad_write(struct ntb_dev *ntb, int sidx, u32 val)
-{
-	return ntb_peer_spad_write(ntb, PIDX, sidx, val);
+	return ret;
 }
 
-static ssize_t tool_peer_spad_write(struct file *filep, const char __user *ubuf,
-				    size_t size, loff_t *offp)
+static void tool_free_mw(struct tool_ctx *tc, int pidx, int widx)
 {
-	struct tool_ctx *tc = filep->private_data;
-
-	return tool_spadfn_write(tc, ubuf, size, offp,
-				 ntb_tool_peer_spad_write);
-}
-
-static TOOL_FOPS_RDWR(tool_peer_spad_fops,
-		      tool_peer_spad_read,
-		      tool_peer_spad_write);
+	struct tool_mw *inmw = &tc->peers[pidx].inmws[widx];
 
-static ssize_t tool_link_read(struct file *filep, char __user *ubuf,
-			      size_t size, loff_t *offp)
-{
-	struct tool_ctx *tc = filep->private_data;
-	char buf[3];
+	debugfs_remove(inmw->dbgfs_file);
 
-	buf[0] = ntb_link_is_up(tc->ntb, NULL, NULL) ? 'Y' : 'N';
-	buf[1] = '\n';
-	buf[2] = '\0';
+	if (inmw->mm_base != NULL) {
+		ntb_mw_clear_trans(tc->ntb, pidx, widx);
+		dma_free_coherent(&tc->ntb->dev, inmw->size,
+				  inmw->mm_base, inmw->dma_base);
+	}
 
-	return simple_read_from_buffer(ubuf, size, offp, buf, 2);
+	inmw->mm_base = NULL;
+	inmw->dma_base = 0;
+	inmw->size = 0;
+	inmw->dbgfs_file = NULL;
 }
 
-static ssize_t tool_link_write(struct file *filep, const char __user *ubuf,
-			       size_t size, loff_t *offp)
+static ssize_t tool_mw_trans_read(struct file *filep, char __user *ubuf,
+				  size_t size, loff_t *offp)
 {
-	struct tool_ctx *tc = filep->private_data;
-	char buf[32];
+	struct tool_mw *inmw = filep->private_data;
+	resource_size_t addr_align;
+	resource_size_t size_align;
+	resource_size_t size_max;
+	ssize_t ret, off = 0;
 	size_t buf_size;
-	bool val;
-	int rc;
+	char *buf;
 
-	buf_size = min(size, (sizeof(buf) - 1));
-	if (copy_from_user(buf, ubuf, buf_size))
-		return -EFAULT;
+	buf_size = min_t(size_t, size, 512);
 
-	buf[buf_size] = '\0';
+	buf = kmalloc(buf_size, GFP_KERNEL);
+	if (!buf)
+		return -ENOMEM;
 
-	rc = strtobool(buf, &val);
-	if (rc)
-		return rc;
+	ret = ntb_mw_get_align(inmw->tc->ntb, inmw->pidx, inmw->widx,
+			       &addr_align, &size_align, &size_max);
+	if (ret)
+		return ret;
 
-	if (val)
-		rc = ntb_link_enable(tc->ntb, NTB_SPEED_AUTO, NTB_WIDTH_AUTO);
-	else
-		rc = ntb_link_disable(tc->ntb);
+	off += scnprintf(buf + off, buf_size - off,
+			 "Inbound MW     \t%d\n",
+			 inmw->widx);
 
-	if (rc)
-		return rc;
+	off += scnprintf(buf + off, buf_size - off,
+			 "Port           \t%d (%d)\n",
+			 ntb_peer_port_number(inmw->tc->ntb, inmw->pidx),
+			 inmw->pidx);
 
-	return size;
-}
+	off += scnprintf(buf + off, buf_size - off,
+			 "Window Address \t0x%pK\n", inmw->mm_base);
 
-static TOOL_FOPS_RDWR(tool_link_fops,
-		      tool_link_read,
-		      tool_link_write);
+	off += scnprintf(buf + off, buf_size - off,
+			 "DMA Address    \t%pad\n",
+			 &inmw->dma_base);
 
-static ssize_t tool_link_event_write(struct file *filep,
-				     const char __user *ubuf,
-				     size_t size, loff_t *offp)
-{
-	struct tool_ctx *tc = filep->private_data;
-	char buf[32];
-	size_t buf_size;
-	bool val;
-	int rc;
+	off += scnprintf(buf + off, buf_size - off,
+			 "Window Size    \t%pa[p]\n",
+			 &inmw->size);
 
-	buf_size = min(size, (sizeof(buf) - 1));
-	if (copy_from_user(buf, ubuf, buf_size))
-		return -EFAULT;
+	off += scnprintf(buf + off, buf_size - off,
+			 "Alignment      \t%pa[p]\n",
+			 &addr_align);
 
-	buf[buf_size] = '\0';
+	off += scnprintf(buf + off, buf_size - off,
+			 "Size Alignment \t%pa[p]\n",
+			 &size_align);
+
+	off += scnprintf(buf + off, buf_size - off,
+			 "Size Max       \t%pa[p]\n",
+			 &size_max);
 
-	rc = strtobool(buf, &val);
-	if (rc)
-		return rc;
+	ret = simple_read_from_buffer(ubuf, size, offp, buf, off);
+	kfree(buf);
 
-	if (wait_event_interruptible(tc->link_wq,
-		ntb_link_is_up(tc->ntb, NULL, NULL) == val))
-		return -ERESTART;
+	return ret;
+}
+
+static ssize_t tool_mw_trans_write(struct file *filep, const char __user *ubuf,
+				   size_t size, loff_t *offp)
+{
+	struct tool_mw *inmw = filep->private_data;
+	unsigned int val;
+	int ret;
+
+	ret = kstrtouint_from_user(ubuf, size, 0, &val);
+	if (ret)
+		return ret;
+
+	tool_free_mw(inmw->tc, inmw->pidx, inmw->widx);
+	if (val) {
+		ret = tool_setup_mw(inmw->tc, inmw->pidx, inmw->widx, val);
+		if (ret)
+			return ret;
+	}
 
 	return size;
 }
 
-static TOOL_FOPS_RDWR(tool_link_event_fops,
-		      NULL,
-		      tool_link_event_write);
+static TOOL_FOPS_RDWR(tool_mw_trans_fops,
+		      tool_mw_trans_read,
+		      tool_mw_trans_write);
 
-static ssize_t tool_mw_read(struct file *filep, char __user *ubuf,
-			    size_t size, loff_t *offp)
+static ssize_t tool_peer_mw_read(struct file *filep, char __user *ubuf,
+				 size_t size, loff_t *offp)
 {
-	struct tool_mw *mw = filep->private_data;
-	ssize_t rc;
+	struct tool_mw *outmw = filep->private_data;
 	loff_t pos = *offp;
+	ssize_t ret;
 	void *buf;
 
-	if (mw->local == NULL)
+	if (outmw->io_base == NULL)
 		return -EIO;
-	if (pos < 0)
-		return -EINVAL;
-	if (pos >= mw->win_size || !size)
+
+	if (pos >= outmw->size || !size)
 		return 0;
-	if (size > mw->win_size - pos)
-		size = mw->win_size - pos;
+
+	if (size > outmw->size - pos)
+		size = outmw->size - pos;
 
 	buf = kmalloc(size, GFP_KERNEL);
 	if (!buf)
 		return -ENOMEM;
 
-	memcpy_fromio(buf, mw->local + pos, size);
-	rc = copy_to_user(ubuf, buf, size);
-	if (rc == size) {
-		rc = -EFAULT;
+	memcpy_fromio(buf, outmw->io_base + pos, size);
+	ret = copy_to_user(ubuf, buf, size);
+	if (ret == size) {
+		ret = -EFAULT;
 		goto err_free;
 	}
 
-	size -= rc;
+	size -= ret;
 	*offp = pos + size;
-	rc = size;
+	ret = size;
 
 err_free:
 	kfree(buf);
 
-	return rc;
+	return ret;
 }
 
-static ssize_t tool_mw_write(struct file *filep, const char __user *ubuf,
-			     size_t size, loff_t *offp)
+static ssize_t tool_peer_mw_write(struct file *filep, const char __user *ubuf,
+				  size_t size, loff_t *offp)
 {
-	struct tool_mw *mw = filep->private_data;
-	ssize_t rc;
+	struct tool_mw *outmw = filep->private_data;
+	ssize_t ret;
 	loff_t pos = *offp;
 	void *buf;
 
-	if (pos < 0)
-		return -EINVAL;
-	if (pos >= mw->win_size || !size)
+	if (outmw->io_base == NULL)
+		return -EIO;
+
+	if (pos >= outmw->size || !size)
 		return 0;
-	if (size > mw->win_size - pos)
-		size = mw->win_size - pos;
+	if (size > outmw->size - pos)
+		size = outmw->size - pos;
 
 	buf = kmalloc(size, GFP_KERNEL);
 	if (!buf)
 		return -ENOMEM;
 
-	rc = copy_from_user(buf, ubuf, size);
-	if (rc == size) {
-		rc = -EFAULT;
+	ret = copy_from_user(buf, ubuf, size);
+	if (ret == size) {
+		ret = -EFAULT;
 		goto err_free;
 	}
 
-	size -= rc;
+	size -= ret;
 	*offp = pos + size;
-	rc = size;
+	ret = size;
 
-	memcpy_toio(mw->local + pos, buf, size);
+	memcpy_toio(outmw->io_base + pos, buf, size);
 
 err_free:
 	kfree(buf);
 
-	return rc;
-}
-
-static TOOL_FOPS_RDWR(tool_mw_fops,
-		      tool_mw_read,
-		      tool_mw_write);
-
-static ssize_t tool_peer_mw_read(struct file *filep, char __user *ubuf,
-				 size_t size, loff_t *offp)
-{
-	struct tool_mw *mw = filep->private_data;
-
-	if (!mw->peer)
-		return -ENXIO;
-
-	return simple_read_from_buffer(ubuf, size, offp, mw->peer, mw->size);
-}
-
-static ssize_t tool_peer_mw_write(struct file *filep, const char __user *ubuf,
-				  size_t size, loff_t *offp)
-{
-	struct tool_mw *mw = filep->private_data;
-
-	if (!mw->peer)
-		return -ENXIO;
-
-	return simple_write_to_buffer(mw->peer, mw->size, offp, ubuf, size);
+	return ret;
 }
 
 static TOOL_FOPS_RDWR(tool_peer_mw_fops,
 		      tool_peer_mw_read,
 		      tool_peer_mw_write);
 
-static int tool_setup_mw(struct tool_ctx *tc, int idx, size_t req_size)
+static int tool_setup_peer_mw(struct tool_ctx *tc, int pidx, int widx,
+			      u64 req_addr, size_t req_size)
 {
-	int rc;
-	struct tool_mw *mw = &tc->mws[idx];
-	resource_size_t size, align_addr, align_size;
+	struct tool_mw *outmw = &tc->outmws[widx];
+	resource_size_t map_size;
+	phys_addr_t map_base;
 	char buf[16];
+	int ret;
 
-	if (mw->peer)
+	if (outmw->io_base != NULL)
 		return 0;
 
-	rc = ntb_mw_get_align(tc->ntb, PIDX, idx, &align_addr,
-				&align_size, &size);
-	if (rc)
-		return rc;
+	ret = ntb_peer_mw_get_addr(tc->ntb, widx, &map_base, &map_size);
+	if (ret)
+		return ret;
 
-	mw->size = min_t(resource_size_t, req_size, size);
-	mw->size = round_up(mw->size, align_addr);
-	mw->size = round_up(mw->size, align_size);
-	mw->peer = dma_alloc_coherent(&tc->ntb->pdev->dev, mw->size,
-				      &mw->peer_dma, GFP_KERNEL);
+	ret = ntb_peer_mw_set_trans(tc->ntb, pidx, widx, req_addr, req_size);
+	if (ret)
+		return ret;
 
-	if (!mw->peer || !IS_ALIGNED(mw->peer_dma, align_addr))
-		return -ENOMEM;
+	outmw->io_base = ioremap_wc(map_base, map_size);
+	if (outmw->io_base == NULL) {
+		ret = -EFAULT;
+		goto err_clear_trans;
+	}
 
-	rc = ntb_mw_set_trans(tc->ntb, PIDX, idx, mw->peer_dma, mw->size);
-	if (rc)
-		goto err_free_dma;
+	outmw->tr_base = req_addr;
+	outmw->size = req_size;
+	outmw->pidx = pidx;
 
-	snprintf(buf, sizeof(buf), "peer_mw%d", idx);
-	mw->peer_dbg_file = debugfs_create_file(buf, S_IRUSR | S_IWUSR,
-						mw->tc->dbgfs, mw,
-						&tool_peer_mw_fops);
+	snprintf(buf, sizeof(buf), "peer_mw%d", widx);
+	outmw->dbgfs_file = debugfs_create_file(buf, 0600,
+					       tc->peers[pidx].dbgfs_dir, outmw,
+					       &tool_peer_mw_fops);
 
 	return 0;
 
-err_free_dma:
-	dma_free_coherent(&tc->ntb->pdev->dev, mw->size,
-			  mw->peer,
-			  mw->peer_dma);
-	mw->peer = NULL;
-	mw->peer_dma = 0;
-	mw->size = 0;
-
-	return rc;
+err_clear_trans:
+	ntb_peer_mw_clear_trans(tc->ntb, pidx, widx);
+
+	return ret;
 }
 
-static void tool_free_mw(struct tool_ctx *tc, int idx)
+static void tool_free_peer_mw(struct tool_ctx *tc, int widx)
 {
-	struct tool_mw *mw = &tc->mws[idx];
+	struct tool_mw *outmw = &tc->outmws[widx];
 
-	if (mw->peer) {
-		ntb_mw_clear_trans(tc->ntb, PIDX, idx);
-		dma_free_coherent(&tc->ntb->pdev->dev, mw->size,
-				  mw->peer,
-				  mw->peer_dma);
-	}
+	debugfs_remove(outmw->dbgfs_file);
 
-	mw->peer = NULL;
-	mw->peer_dma = 0;
-
-	debugfs_remove(mw->peer_dbg_file);
+	if (outmw->io_base != NULL) {
+		iounmap(tc->outmws[widx].io_base);
+		ntb_peer_mw_clear_trans(tc->ntb, outmw->pidx, widx);
+	}
 
-	mw->peer_dbg_file = NULL;
+	outmw->io_base = NULL;
+	outmw->tr_base = 0;
+	outmw->size = 0;
+	outmw->pidx = -1;
+	outmw->dbgfs_file = NULL;
 }
 
-static ssize_t tool_peer_mw_trans_read(struct file *filep,
-				       char __user *ubuf,
-				       size_t size, loff_t *offp)
+static ssize_t tool_peer_mw_trans_read(struct file *filep, char __user *ubuf,
+					size_t size, loff_t *offp)
 {
-	struct tool_mw *mw = filep->private_data;
-
-	char *buf;
+	struct tool_mw_wrap *outmw_wrap = filep->private_data;
+	struct tool_mw *outmw = outmw_wrap->mw;
+	resource_size_t map_size;
+	phys_addr_t map_base;
+	ssize_t off = 0;
 	size_t buf_size;
-	ssize_t ret, off = 0;
+	char *buf;
+	int ret;
 
-	phys_addr_t base;
-	resource_size_t mw_size;
-	resource_size_t align_addr = 0;
-	resource_size_t align_size = 0;
-	resource_size_t max_size = 0;
+	ret = ntb_peer_mw_get_addr(outmw->tc->ntb, outmw->widx,
+				  &map_base, &map_size);
+	if (ret)
+		return ret;
 
 	buf_size = min_t(size_t, size, 512);
 
@@ -763,43 +880,37 @@ static ssize_t tool_peer_mw_trans_read(struct file *filep,
 	if (!buf)
 		return -ENOMEM;
 
-	ntb_mw_get_align(mw->tc->ntb, PIDX, mw->idx,
-			 &align_addr, &align_size, &max_size);
-	ntb_peer_mw_get_addr(mw->tc->ntb, mw->idx, &base, &mw_size);
-
 	off += scnprintf(buf + off, buf_size - off,
-			 "Peer MW %d Information:\n", mw->idx);
+			 "Outbound MW:        \t%d\n", outmw->widx);
 
-	off += scnprintf(buf + off, buf_size - off,
-			 "Physical Address      \t%pa[p]\n",
-			 &base);
-
-	off += scnprintf(buf + off, buf_size - off,
-			 "Window Size           \t%lld\n",
-			 (unsigned long long)mw_size);
+	if (outmw->io_base != NULL) {
+		off += scnprintf(buf + off, buf_size - off,
+			"Port attached       \t%d (%d)\n",
+			ntb_peer_port_number(outmw->tc->ntb, outmw->pidx),
+			outmw->pidx);
+	} else {
+		off += scnprintf(buf + off, buf_size - off,
+				 "Port attached       \t-1 (-1)\n");
+	}
 
 	off += scnprintf(buf + off, buf_size - off,
-			 "Alignment             \t%lld\n",
-			 (unsigned long long)align_addr);
+			 "Virtual address     \t0x%pK\n", outmw->io_base);
 
 	off += scnprintf(buf + off, buf_size - off,
-			 "Size Alignment        \t%lld\n",
-			 (unsigned long long)align_size);
+			 "Phys Address        \t%pa[p]\n", &map_base);
 
 	off += scnprintf(buf + off, buf_size - off,
-			 "Size Max              \t%lld\n",
-			 (unsigned long long)max_size);
+			 "Mapping Size        \t%pa[p]\n", &map_size);
 
 	off += scnprintf(buf + off, buf_size - off,
-			 "Ready                 \t%c\n",
-			 (mw->peer) ? 'Y' : 'N');
+			 "Translation Address \t0x%016llx\n", outmw->tr_base);
 
 	off += scnprintf(buf + off, buf_size - off,
-			 "Allocated Size       \t%zd\n",
-			 (mw->peer) ? (size_t)mw->size : 0);
+			 "Window Size         \t%pa[p]\n", &outmw->size);
 
 	ret = simple_read_from_buffer(ubuf, size, offp, buf, off);
 	kfree(buf);
+
 	return ret;
 }
 
@@ -807,12 +918,12 @@ static ssize_t tool_peer_mw_trans_write(struct file *filep,
 					const char __user *ubuf,
 					size_t size, loff_t *offp)
 {
-	struct tool_mw *mw = filep->private_data;
-
+	struct tool_mw_wrap *outmw_wrap = filep->private_data;
+	struct tool_mw *outmw = outmw_wrap->mw;
+	size_t buf_size, wsize;
 	char buf[32];
-	size_t buf_size;
-	unsigned long long val;
-	int rc;
+	int ret, n;
+	u64 addr;
 
 	buf_size = min(size, (sizeof(buf) - 1));
 	if (copy_from_user(buf, ubuf, buf_size))
@@ -820,16 +931,17 @@ static ssize_t tool_peer_mw_trans_write(struct file *filep,
 
 	buf[buf_size] = '\0';
 
-	rc = kstrtoull(buf, 0, &val);
-	if (rc)
-		return rc;
-
-	tool_free_mw(mw->tc, mw->idx);
-	if (val)
-		rc = tool_setup_mw(mw->tc, mw->idx, val);
+	n = sscanf(buf, "%lli:%zi", &addr, &wsize);
+	if (n != 2)
+		return -EINVAL;
 
-	if (rc)
-		return rc;
+	tool_free_peer_mw(outmw->tc, outmw->widx);
+	if (wsize) {
+		ret = tool_setup_peer_mw(outmw->tc, outmw_wrap->pidx,
+					 outmw->widx, addr, wsize);
+		if (ret)
+			return ret;
+	}
 
 	return size;
 }
@@ -838,195 +950,734 @@ static TOOL_FOPS_RDWR(tool_peer_mw_trans_fops,
 		      tool_peer_mw_trans_read,
 		      tool_peer_mw_trans_write);
 
-static int tool_init_mw(struct tool_ctx *tc, int idx)
+static int tool_init_mws(struct tool_ctx *tc)
 {
-	struct tool_mw *mw = &tc->mws[idx];
-	phys_addr_t base;
-	int rc;
-
-	rc = ntb_peer_mw_get_addr(tc->ntb, idx, &base, &mw->win_size);
-	if (rc)
-		return rc;
-
-	mw->tc = tc;
-	mw->idx = idx;
-	mw->local = ioremap_wc(base, mw->win_size);
-	if (!mw->local)
-		return -EFAULT;
+	int widx, pidx;
+
+	/* Initialize outbound memory windows */
+	tc->outmw_cnt = ntb_peer_mw_count(tc->ntb);
+	tc->outmws = devm_kcalloc(&tc->ntb->dev, tc->outmw_cnt,
+				  sizeof(*tc->outmws), GFP_KERNEL);
+	if (tc->outmws == NULL)
+		return -ENOMEM;
+
+	for (widx = 0; widx < tc->outmw_cnt; widx++) {
+		tc->outmws[widx].widx = widx;
+		tc->outmws[widx].pidx = -1;
+		tc->outmws[widx].tc = tc;
+	}
+
+	/* Initialize inbound memory windows and outbound MWs wrapper */
+	for (pidx = 0; pidx < tc->peer_cnt; pidx++) {
+		tc->peers[pidx].inmw_cnt = ntb_mw_count(tc->ntb, pidx);
+		tc->peers[pidx].inmws =
+			devm_kcalloc(&tc->ntb->dev, tc->peers[pidx].inmw_cnt,
+				    sizeof(*tc->peers[pidx].inmws), GFP_KERNEL);
+		if (tc->peers[pidx].inmws == NULL)
+			return -ENOMEM;
+
+		for (widx = 0; widx < tc->peers[pidx].inmw_cnt; widx++) {
+			tc->peers[pidx].inmws[widx].widx = widx;
+			tc->peers[pidx].inmws[widx].pidx = pidx;
+			tc->peers[pidx].inmws[widx].tc = tc;
+		}
+
+		tc->peers[pidx].outmw_cnt = ntb_peer_mw_count(tc->ntb);
+		tc->peers[pidx].outmws =
+			devm_kcalloc(&tc->ntb->dev, tc->peers[pidx].outmw_cnt,
+				   sizeof(*tc->peers[pidx].outmws), GFP_KERNEL);
+
+		for (widx = 0; widx < tc->peers[pidx].outmw_cnt; widx++) {
+			tc->peers[pidx].outmws[widx].pidx = pidx;
+			tc->peers[pidx].outmws[widx].mw = &tc->outmws[widx];
+		}
+	}
 
 	return 0;
 }
 
-static void tool_free_mws(struct tool_ctx *tc)
+static void tool_clear_mws(struct tool_ctx *tc)
 {
-	int i;
+	int widx, pidx;
 
-	for (i = 0; i < tc->mw_count; i++) {
-		tool_free_mw(tc, i);
+	/* Free outbound memory windows */
+	for (widx = 0; widx < tc->outmw_cnt; widx++)
+		tool_free_peer_mw(tc, widx);
 
-		if (tc->mws[i].local)
-			iounmap(tc->mws[i].local);
+	/* Free outbound memory windows */
+	for (pidx = 0; pidx < tc->peer_cnt; pidx++)
+		for (widx = 0; widx < tc->peers[pidx].inmw_cnt; widx++)
+			tool_free_mw(tc, pidx, widx);
+}
 
-		tc->mws[i].local = NULL;
-	}
+/*==============================================================================
+ *                       Doorbell read/write methods
+ *==============================================================================
+ */
+
+static ssize_t tool_db_read(struct file *filep, char __user *ubuf,
+			    size_t size, loff_t *offp)
+{
+	struct tool_ctx *tc = filep->private_data;
+
+	return tool_fn_read(tc, ubuf, size, offp, tc->ntb->ops->db_read);
 }
 
-static void tool_setup_dbgfs(struct tool_ctx *tc)
+static ssize_t tool_db_write(struct file *filep, const char __user *ubuf,
+			     size_t size, loff_t *offp)
 {
-	int i;
+	struct tool_ctx *tc = filep->private_data;
 
-	/* This modules is useless without dbgfs... */
-	if (!tool_dbgfs) {
-		tc->dbgfs = NULL;
-		return;
+	return tool_fn_write(tc, ubuf, size, offp, tc->ntb->ops->db_set,
+			     tc->ntb->ops->db_clear);
+}
+
+static TOOL_FOPS_RDWR(tool_db_fops,
+		      tool_db_read,
+		      tool_db_write);
+
+static ssize_t tool_db_valid_mask_read(struct file *filep, char __user *ubuf,
+				       size_t size, loff_t *offp)
+{
+	struct tool_ctx *tc = filep->private_data;
+
+	return tool_fn_read(tc, ubuf, size, offp, tc->ntb->ops->db_valid_mask);
+}
+
+static TOOL_FOPS_RDWR(tool_db_valid_mask_fops,
+		      tool_db_valid_mask_read,
+		      NULL);
+
+static ssize_t tool_db_mask_read(struct file *filep, char __user *ubuf,
+				 size_t size, loff_t *offp)
+{
+	struct tool_ctx *tc = filep->private_data;
+
+	return tool_fn_read(tc, ubuf, size, offp, tc->ntb->ops->db_read_mask);
+}
+
+static ssize_t tool_db_mask_write(struct file *filep, const char __user *ubuf,
+			       size_t size, loff_t *offp)
+{
+	struct tool_ctx *tc = filep->private_data;
+
+	return tool_fn_write(tc, ubuf, size, offp, tc->ntb->ops->db_set_mask,
+			     tc->ntb->ops->db_clear_mask);
+}
+
+static TOOL_FOPS_RDWR(tool_db_mask_fops,
+		      tool_db_mask_read,
+		      tool_db_mask_write);
+
+static ssize_t tool_peer_db_read(struct file *filep, char __user *ubuf,
+				 size_t size, loff_t *offp)
+{
+	struct tool_ctx *tc = filep->private_data;
+
+	return tool_fn_read(tc, ubuf, size, offp, tc->ntb->ops->peer_db_read);
+}
+
+static ssize_t tool_peer_db_write(struct file *filep, const char __user *ubuf,
+				  size_t size, loff_t *offp)
+{
+	struct tool_ctx *tc = filep->private_data;
+
+	return tool_fn_write(tc, ubuf, size, offp, tc->ntb->ops->peer_db_set,
+			     tc->ntb->ops->peer_db_clear);
+}
+
+static TOOL_FOPS_RDWR(tool_peer_db_fops,
+		      tool_peer_db_read,
+		      tool_peer_db_write);
+
+static ssize_t tool_peer_db_mask_read(struct file *filep, char __user *ubuf,
+				   size_t size, loff_t *offp)
+{
+	struct tool_ctx *tc = filep->private_data;
+
+	return tool_fn_read(tc, ubuf, size, offp,
+			    tc->ntb->ops->peer_db_read_mask);
+}
+
+static ssize_t tool_peer_db_mask_write(struct file *filep,
+				       const char __user *ubuf,
+				       size_t size, loff_t *offp)
+{
+	struct tool_ctx *tc = filep->private_data;
+
+	return tool_fn_write(tc, ubuf, size, offp,
+			     tc->ntb->ops->peer_db_set_mask,
+			     tc->ntb->ops->peer_db_clear_mask);
+}
+
+static TOOL_FOPS_RDWR(tool_peer_db_mask_fops,
+		      tool_peer_db_mask_read,
+		      tool_peer_db_mask_write);
+
+static ssize_t tool_db_event_write(struct file *filep,
+				   const char __user *ubuf,
+				   size_t size, loff_t *offp)
+{
+	struct tool_ctx *tc = filep->private_data;
+	u64 val;
+	int ret;
+
+	ret = kstrtou64_from_user(ubuf, size, 0, &val);
+	if (ret)
+		return ret;
+
+	if (wait_event_interruptible(tc->db_wq, ntb_db_read(tc->ntb) == val))
+		return -ERESTART;
+
+	return size;
+}
+
+static TOOL_FOPS_RDWR(tool_db_event_fops,
+		      NULL,
+		      tool_db_event_write);
+
+/*==============================================================================
+ *                       Scratchpads read/write methods
+ *==============================================================================
+ */
+
+static ssize_t tool_spad_read(struct file *filep, char __user *ubuf,
+			      size_t size, loff_t *offp)
+{
+	struct tool_spad *spad = filep->private_data;
+	char buf[32];
+	ssize_t pos;
+
+	if (!spad->tc->ntb->ops->spad_read)
+		return -EINVAL;
+
+	pos = scnprintf(buf, sizeof(buf), "%#x\n",
+		ntb_spad_read(spad->tc->ntb, spad->sidx));
+
+	return simple_read_from_buffer(ubuf, size, offp, buf, pos);
+}
+
+static ssize_t tool_spad_write(struct file *filep, const char __user *ubuf,
+			       size_t size, loff_t *offp)
+{
+	struct tool_spad *spad = filep->private_data;
+	u32 val;
+	int ret;
+
+	if (!spad->tc->ntb->ops->spad_write) {
+		dev_dbg(&spad->tc->ntb->dev, "no spad write fn\n");
+		return -EINVAL;
 	}
 
-	tc->dbgfs = debugfs_create_dir(dev_name(&tc->ntb->dev),
-				       tool_dbgfs);
-	if (!tc->dbgfs)
-		return;
+	ret = kstrtou32_from_user(ubuf, size, 0, &val);
+	if (ret)
+		return ret;
 
-	debugfs_create_file("db", S_IRUSR | S_IWUSR, tc->dbgfs,
-			    tc, &tool_db_fops);
+	ret = ntb_spad_write(spad->tc->ntb, spad->sidx, val);
 
-	debugfs_create_file("mask", S_IRUSR | S_IWUSR, tc->dbgfs,
-			    tc, &tool_mask_fops);
+	return ret ?: size;
+}
 
-	debugfs_create_file("peer_db", S_IRUSR | S_IWUSR, tc->dbgfs,
-			    tc, &tool_peer_db_fops);
+static TOOL_FOPS_RDWR(tool_spad_fops,
+		      tool_spad_read,
+		      tool_spad_write);
 
-	debugfs_create_file("peer_mask", S_IRUSR | S_IWUSR, tc->dbgfs,
-			    tc, &tool_peer_mask_fops);
+static ssize_t tool_peer_spad_read(struct file *filep, char __user *ubuf,
+				   size_t size, loff_t *offp)
+{
+	struct tool_spad *spad = filep->private_data;
+	char buf[32];
+	ssize_t pos;
 
-	debugfs_create_file("spad", S_IRUSR | S_IWUSR, tc->dbgfs,
-			    tc, &tool_spad_fops);
+	if (!spad->tc->ntb->ops->peer_spad_read)
+		return -EINVAL;
 
-	debugfs_create_file("peer_spad", S_IRUSR | S_IWUSR, tc->dbgfs,
-			    tc, &tool_peer_spad_fops);
+	pos = scnprintf(buf, sizeof(buf), "%#x\n",
+		ntb_peer_spad_read(spad->tc->ntb, spad->pidx, spad->sidx));
 
-	debugfs_create_file("link", S_IRUSR | S_IWUSR, tc->dbgfs,
-			    tc, &tool_link_fops);
+	return simple_read_from_buffer(ubuf, size, offp, buf, pos);
+}
+
+static ssize_t tool_peer_spad_write(struct file *filep, const char __user *ubuf,
+				    size_t size, loff_t *offp)
+{
+	struct tool_spad *spad = filep->private_data;
+	u32 val;
+	int ret;
+
+	if (!spad->tc->ntb->ops->peer_spad_write) {
+		dev_dbg(&spad->tc->ntb->dev, "no spad write fn\n");
+		return -EINVAL;
+	}
+
+	ret = kstrtou32_from_user(ubuf, size, 0, &val);
+	if (ret)
+		return ret;
 
-	debugfs_create_file("link_event", S_IWUSR, tc->dbgfs,
-			    tc, &tool_link_event_fops);
+	ret = ntb_peer_spad_write(spad->tc->ntb, spad->pidx, spad->sidx, val);
 
-	for (i = 0; i < tc->mw_count; i++) {
-		char buf[30];
+	return ret ?: size;
+}
+
+static TOOL_FOPS_RDWR(tool_peer_spad_fops,
+		      tool_peer_spad_read,
+		      tool_peer_spad_write);
 
-		snprintf(buf, sizeof(buf), "mw%d", i);
-		debugfs_create_file(buf, S_IRUSR | S_IWUSR, tc->dbgfs,
-				    &tc->mws[i], &tool_mw_fops);
+static int tool_init_spads(struct tool_ctx *tc)
+{
+	int sidx, pidx;
 
-		snprintf(buf, sizeof(buf), "peer_trans%d", i);
-		debugfs_create_file(buf, S_IRUSR | S_IWUSR, tc->dbgfs,
-				    &tc->mws[i], &tool_peer_mw_trans_fops);
+	/* Initialize inbound scratchpad structures */
+	tc->inspad_cnt = ntb_spad_count(tc->ntb);
+	tc->inspads = devm_kcalloc(&tc->ntb->dev, tc->inspad_cnt,
+				   sizeof(*tc->inspads), GFP_KERNEL);
+	if (tc->inspads == NULL)
+		return -ENOMEM;
+
+	for (sidx = 0; sidx < tc->inspad_cnt; sidx++) {
+		tc->inspads[sidx].sidx = sidx;
+		tc->inspads[sidx].pidx = -1;
+		tc->inspads[sidx].tc = tc;
 	}
+
+	/* Initialize outbound scratchpad structures */
+	for (pidx = 0; pidx < tc->peer_cnt; pidx++) {
+		tc->peers[pidx].outspad_cnt = ntb_spad_count(tc->ntb);
+		tc->peers[pidx].outspads =
+			devm_kcalloc(&tc->ntb->dev, tc->peers[pidx].outspad_cnt,
+				sizeof(*tc->peers[pidx].outspads), GFP_KERNEL);
+		if (tc->peers[pidx].outspads == NULL)
+			return -ENOMEM;
+
+		for (sidx = 0; sidx < tc->peers[pidx].outspad_cnt; sidx++) {
+			tc->peers[pidx].outspads[sidx].sidx = sidx;
+			tc->peers[pidx].outspads[sidx].pidx = pidx;
+			tc->peers[pidx].outspads[sidx].tc = tc;
+		}
+	}
+
+	return 0;
 }
 
-static int tool_probe(struct ntb_client *self, struct ntb_dev *ntb)
+/*==============================================================================
+ *                       Messages read/write methods
+ *==============================================================================
+ */
+
+static ssize_t tool_inmsg_read(struct file *filep, char __user *ubuf,
+			       size_t size, loff_t *offp)
 {
-	struct tool_ctx *tc;
-	int rc;
-	int i;
+	struct tool_msg *msg = filep->private_data;
+	char buf[32];
+	ssize_t pos;
+	u32 data;
+	int pidx;
+
+	data = ntb_msg_read(msg->tc->ntb, &pidx, msg->midx);
+
+	pos = scnprintf(buf, sizeof(buf), "0x%08x<-%d\n", data, pidx);
+
+	return simple_read_from_buffer(ubuf, size, offp, buf, pos);
+}
+
+static TOOL_FOPS_RDWR(tool_inmsg_fops,
+		      tool_inmsg_read,
+		      NULL);
+
+static ssize_t tool_outmsg_write(struct file *filep,
+				 const char __user *ubuf,
+				 size_t size, loff_t *offp)
+{
+	struct tool_msg *msg = filep->private_data;
+	u32 val;
+	int ret;
+
+	ret = kstrtou32_from_user(ubuf, size, 0, &val);
+	if (ret)
+		return ret;
+
+	ret = ntb_peer_msg_write(msg->tc->ntb, msg->pidx, msg->midx, val);
+
+	return ret ? : size;
+}
+
+static TOOL_FOPS_RDWR(tool_outmsg_fops,
+		      NULL,
+		      tool_outmsg_write);
+
+static ssize_t tool_msg_sts_read(struct file *filep, char __user *ubuf,
+				 size_t size, loff_t *offp)
+{
+	struct tool_ctx *tc = filep->private_data;
+
+	return tool_fn_read(tc, ubuf, size, offp, tc->ntb->ops->msg_read_sts);
+}
+
+static ssize_t tool_msg_sts_write(struct file *filep, const char __user *ubuf,
+				  size_t size, loff_t *offp)
+{
+	struct tool_ctx *tc = filep->private_data;
+
+	return tool_fn_write(tc, ubuf, size, offp, NULL,
+			     tc->ntb->ops->msg_clear_sts);
+}
+
+static TOOL_FOPS_RDWR(tool_msg_sts_fops,
+		      tool_msg_sts_read,
+		      tool_msg_sts_write);
+
+static ssize_t tool_msg_inbits_read(struct file *filep, char __user *ubuf,
+				    size_t size, loff_t *offp)
+{
+	struct tool_ctx *tc = filep->private_data;
+
+	return tool_fn_read(tc, ubuf, size, offp, tc->ntb->ops->msg_inbits);
+}
+
+static TOOL_FOPS_RDWR(tool_msg_inbits_fops,
+		      tool_msg_inbits_read,
+		      NULL);
+
+static ssize_t tool_msg_outbits_read(struct file *filep, char __user *ubuf,
+				     size_t size, loff_t *offp)
+{
+	struct tool_ctx *tc = filep->private_data;
+
+	return tool_fn_read(tc, ubuf, size, offp, tc->ntb->ops->msg_outbits);
+}
+
+static TOOL_FOPS_RDWR(tool_msg_outbits_fops,
+		      tool_msg_outbits_read,
+		      NULL);
+
+static ssize_t tool_msg_mask_write(struct file *filep, const char __user *ubuf,
+				   size_t size, loff_t *offp)
+{
+	struct tool_ctx *tc = filep->private_data;
+
+	return tool_fn_write(tc, ubuf, size, offp,
+			     tc->ntb->ops->msg_set_mask,
+			     tc->ntb->ops->msg_clear_mask);
+}
+
+static TOOL_FOPS_RDWR(tool_msg_mask_fops,
+		      NULL,
+		      tool_msg_mask_write);
+
+static ssize_t tool_msg_event_write(struct file *filep,
+				    const char __user *ubuf,
+				    size_t size, loff_t *offp)
+{
+	struct tool_ctx *tc = filep->private_data;
+	u64 val;
+	int ret;
+
+	ret = kstrtou64_from_user(ubuf, size, 0, &val);
+	if (ret)
+		return ret;
+
+	if (wait_event_interruptible(tc->msg_wq,
+		ntb_msg_read_sts(tc->ntb) == val))
+		return -ERESTART;
+
+	return size;
+}
+
+static TOOL_FOPS_RDWR(tool_msg_event_fops,
+		      NULL,
+		      tool_msg_event_write);
 
-	if (!ntb->ops->mw_set_trans) {
-		dev_dbg(&ntb->dev, "need inbound MW based NTB API\n");
-		rc = -EINVAL;
-		goto err_tc;
+static int tool_init_msgs(struct tool_ctx *tc)
+{
+	int midx, pidx;
+
+	/* Initialize inbound message structures */
+	tc->inmsg_cnt = ntb_msg_count(tc->ntb);
+	tc->inmsgs = devm_kcalloc(&tc->ntb->dev, tc->inmsg_cnt,
+				   sizeof(*tc->inmsgs), GFP_KERNEL);
+	if (tc->inmsgs == NULL)
+		return -ENOMEM;
+
+	for (midx = 0; midx < tc->inmsg_cnt; midx++) {
+		tc->inmsgs[midx].midx = midx;
+		tc->inmsgs[midx].pidx = -1;
+		tc->inmsgs[midx].tc = tc;
 	}
 
-	if (ntb_spad_count(ntb) < 1) {
-		dev_dbg(&ntb->dev, "no enough scratchpads\n");
-		rc = -EINVAL;
-		goto err_tc;
+	/* Initialize outbound message structures */
+	for (pidx = 0; pidx < tc->peer_cnt; pidx++) {
+		tc->peers[pidx].outmsg_cnt = ntb_msg_count(tc->ntb);
+		tc->peers[pidx].outmsgs =
+			devm_kcalloc(&tc->ntb->dev, tc->peers[pidx].outmsg_cnt,
+				sizeof(*tc->peers[pidx].outmsgs), GFP_KERNEL);
+		if (tc->peers[pidx].outmsgs == NULL)
+			return -ENOMEM;
+
+		for (midx = 0; midx < tc->peers[pidx].outmsg_cnt; midx++) {
+			tc->peers[pidx].outmsgs[midx].midx = midx;
+			tc->peers[pidx].outmsgs[midx].pidx = pidx;
+			tc->peers[pidx].outmsgs[midx].tc = tc;
+		}
 	}
 
+	return 0;
+}
+
+/*==============================================================================
+ *                          Initialization methods
+ *==============================================================================
+ */
+
+static struct tool_ctx *tool_create_data(struct ntb_dev *ntb)
+{
+	struct tool_ctx *tc;
+
+	tc = devm_kzalloc(&ntb->dev, sizeof(*tc), GFP_KERNEL);
+	if (tc == NULL)
+		return ERR_PTR(-ENOMEM);
+
+	tc->ntb = ntb;
+	init_waitqueue_head(&tc->link_wq);
+	init_waitqueue_head(&tc->db_wq);
+	init_waitqueue_head(&tc->msg_wq);
+
 	if (ntb_db_is_unsafe(ntb))
 		dev_dbg(&ntb->dev, "doorbell is unsafe\n");
 
 	if (ntb_spad_is_unsafe(ntb))
 		dev_dbg(&ntb->dev, "scratchpad is unsafe\n");
 
-	if (ntb_peer_port_count(ntb) != NTB_DEF_PEER_CNT)
-		dev_warn(&ntb->dev, "multi-port NTB is unsupported\n");
+	return tc;
+}
+
+static void tool_clear_data(struct tool_ctx *tc)
+{
+	wake_up(&tc->link_wq);
+	wake_up(&tc->db_wq);
+	wake_up(&tc->msg_wq);
+}
+
+static int tool_init_ntb(struct tool_ctx *tc)
+{
+	return ntb_set_ctx(tc->ntb, tc, &tool_ops);
+}
+
+static void tool_clear_ntb(struct tool_ctx *tc)
+{
+	ntb_clear_ctx(tc->ntb);
+	ntb_link_disable(tc->ntb);
+}
 
-	tc = kzalloc(sizeof(*tc), GFP_KERNEL);
-	if (!tc) {
-		rc = -ENOMEM;
-		goto err_tc;
+static void tool_setup_dbgfs(struct tool_ctx *tc)
+{
+	int pidx, widx, sidx, midx;
+	char buf[30];
+
+	/* This modules is useless without dbgfs... */
+	if (!tool_dbgfs_topdir) {
+		tc->dbgfs_dir = NULL;
+		return;
 	}
 
-	tc->ntb = ntb;
-	init_waitqueue_head(&tc->link_wq);
+	tc->dbgfs_dir = debugfs_create_dir(dev_name(&tc->ntb->dev),
+					   tool_dbgfs_topdir);
+	if (!tc->dbgfs_dir)
+		return;
 
-	tc->mw_count = min(ntb_peer_mw_count(tc->ntb), MAX_MWS);
-	for (i = 0; i < tc->mw_count; i++) {
-		rc = tool_init_mw(tc, i);
-		if (rc)
-			goto err_ctx;
+	debugfs_create_file("port", 0600, tc->dbgfs_dir,
+			    tc, &tool_port_fops);
+
+	debugfs_create_file("link", 0600, tc->dbgfs_dir,
+			    tc, &tool_link_fops);
+
+	debugfs_create_file("db", 0600, tc->dbgfs_dir,
+			    tc, &tool_db_fops);
+
+	debugfs_create_file("db_valid_mask", 0600, tc->dbgfs_dir,
+			    tc, &tool_db_valid_mask_fops);
+
+	debugfs_create_file("db_mask", 0600, tc->dbgfs_dir,
+			    tc, &tool_db_mask_fops);
+
+	debugfs_create_file("db_event", 0600, tc->dbgfs_dir,
+			    tc, &tool_db_event_fops);
+
+	debugfs_create_file("peer_db", 0600, tc->dbgfs_dir,
+			    tc, &tool_peer_db_fops);
+
+	debugfs_create_file("peer_db_mask", 0600, tc->dbgfs_dir,
+			    tc, &tool_peer_db_mask_fops);
+
+	if (tc->inspad_cnt != 0) {
+		for (sidx = 0; sidx < tc->inspad_cnt; sidx++) {
+			snprintf(buf, sizeof(buf), "spad%d", sidx);
+
+			debugfs_create_file(buf, 0600, tc->dbgfs_dir,
+					   &tc->inspads[sidx], &tool_spad_fops);
+		}
 	}
 
-	tool_setup_dbgfs(tc);
+	if (tc->inmsg_cnt != 0) {
+		for (midx = 0; midx < tc->inmsg_cnt; midx++) {
+			snprintf(buf, sizeof(buf), "msg%d", midx);
+			debugfs_create_file(buf, 0600, tc->dbgfs_dir,
+					   &tc->inmsgs[midx], &tool_inmsg_fops);
+		}
+
+		debugfs_create_file("msg_sts", 0600, tc->dbgfs_dir,
+				    tc, &tool_msg_sts_fops);
+
+		debugfs_create_file("msg_inbits", 0600, tc->dbgfs_dir,
+				    tc, &tool_msg_inbits_fops);
+
+		debugfs_create_file("msg_outbits", 0600, tc->dbgfs_dir,
+				    tc, &tool_msg_outbits_fops);
+
+		debugfs_create_file("msg_mask", 0600, tc->dbgfs_dir,
+				    tc, &tool_msg_mask_fops);
+
+		debugfs_create_file("msg_event", 0600, tc->dbgfs_dir,
+				    tc, &tool_msg_event_fops);
+	}
+
+	for (pidx = 0; pidx < tc->peer_cnt; pidx++) {
+		snprintf(buf, sizeof(buf), "peer%d", pidx);
+		tc->peers[pidx].dbgfs_dir =
+			debugfs_create_dir(buf, tc->dbgfs_dir);
+
+		debugfs_create_file("port", 0600,
+				    tc->peers[pidx].dbgfs_dir,
+				    &tc->peers[pidx], &tool_peer_port_fops);
+
+		debugfs_create_file("link", 0200,
+				    tc->peers[pidx].dbgfs_dir,
+				    &tc->peers[pidx], &tool_peer_link_fops);
+
+		debugfs_create_file("link_event", 0200,
+				  tc->peers[pidx].dbgfs_dir,
+				  &tc->peers[pidx], &tool_peer_link_event_fops);
+
+		for (widx = 0; widx < tc->peers[pidx].inmw_cnt; widx++) {
+			snprintf(buf, sizeof(buf), "mw_trans%d", widx);
+			debugfs_create_file(buf, 0600,
+					    tc->peers[pidx].dbgfs_dir,
+					    &tc->peers[pidx].inmws[widx],
+					    &tool_mw_trans_fops);
+		}
+
+		for (widx = 0; widx < tc->peers[pidx].outmw_cnt; widx++) {
+			snprintf(buf, sizeof(buf), "peer_mw_trans%d", widx);
+			debugfs_create_file(buf, 0600,
+					    tc->peers[pidx].dbgfs_dir,
+					    &tc->peers[pidx].outmws[widx],
+					    &tool_peer_mw_trans_fops);
+		}
+
+		for (sidx = 0; sidx < tc->peers[pidx].outspad_cnt; sidx++) {
+			snprintf(buf, sizeof(buf), "spad%d", sidx);
+
+			debugfs_create_file(buf, 0600,
+					    tc->peers[pidx].dbgfs_dir,
+					    &tc->peers[pidx].outspads[sidx],
+					    &tool_peer_spad_fops);
+		}
+
+		for (midx = 0; midx < tc->peers[pidx].outmsg_cnt; midx++) {
+			snprintf(buf, sizeof(buf), "msg%d", midx);
+			debugfs_create_file(buf, 0600,
+					    tc->peers[pidx].dbgfs_dir,
+					    &tc->peers[pidx].outmsgs[midx],
+					    &tool_outmsg_fops);
+		}
+	}
+}
+
+static void tool_clear_dbgfs(struct tool_ctx *tc)
+{
+	debugfs_remove_recursive(tc->dbgfs_dir);
+}
+
+static int tool_probe(struct ntb_client *self, struct ntb_dev *ntb)
+{
+	struct tool_ctx *tc;
+	int ret;
 
-	rc = ntb_set_ctx(ntb, tc, &tool_ops);
-	if (rc)
-		goto err_ctx;
+	tc = tool_create_data(ntb);
+	if (IS_ERR(tc))
+		return PTR_ERR(tc);
 
-	ntb_link_enable(ntb, NTB_SPEED_AUTO, NTB_WIDTH_AUTO);
-	ntb_link_event(ntb);
+	ret = tool_init_peers(tc);
+	if (ret != 0)
+		goto err_clear_data;
+
+	ret = tool_init_mws(tc);
+	if (ret != 0)
+		goto err_clear_data;
+
+	ret = tool_init_spads(tc);
+	if (ret != 0)
+		goto err_clear_mws;
+
+	ret = tool_init_msgs(tc);
+	if (ret != 0)
+		goto err_clear_mws;
+
+	ret = tool_init_ntb(tc);
+	if (ret != 0)
+		goto err_clear_mws;
+
+	tool_setup_dbgfs(tc);
 
 	return 0;
 
-err_ctx:
-	tool_free_mws(tc);
-	debugfs_remove_recursive(tc->dbgfs);
-	kfree(tc);
-err_tc:
-	return rc;
+err_clear_mws:
+	tool_clear_mws(tc);
+
+err_clear_data:
+	tool_clear_data(tc);
+
+	return ret;
 }
 
 static void tool_remove(struct ntb_client *self, struct ntb_dev *ntb)
 {
 	struct tool_ctx *tc = ntb->ctx;
 
-	tool_free_mws(tc);
+	tool_clear_dbgfs(tc);
+
+	tool_clear_ntb(tc);
 
-	ntb_clear_ctx(ntb);
-	ntb_link_disable(ntb);
+	tool_clear_mws(tc);
 
-	debugfs_remove_recursive(tc->dbgfs);
-	kfree(tc);
+	tool_clear_data(tc);
 }
 
 static struct ntb_client tool_client = {
 	.ops = {
 		.probe = tool_probe,
 		.remove = tool_remove,
-	},
+	}
 };
 
 static int __init tool_init(void)
 {
-	int rc;
+	int ret;
 
 	if (debugfs_initialized())
-		tool_dbgfs = debugfs_create_dir(KBUILD_MODNAME, NULL);
-
-	rc = ntb_register_client(&tool_client);
-	if (rc)
-		goto err_client;
+		tool_dbgfs_topdir = debugfs_create_dir(KBUILD_MODNAME, NULL);
 
-	return 0;
+	ret = ntb_register_client(&tool_client);
+	if (ret)
+		debugfs_remove_recursive(tool_dbgfs_topdir);
 
-err_client:
-	debugfs_remove_recursive(tool_dbgfs);
-	return rc;
+	return ret;
 }
 module_init(tool_init);
 
 static void __exit tool_exit(void)
 {
 	ntb_unregister_client(&tool_client);
-	debugfs_remove_recursive(tool_dbgfs);
+	debugfs_remove_recursive(tool_dbgfs_topdir);
 }
 module_exit(tool_exit);
+
-- 
2.12.0

Re: [PATCH v2 05/15] NTB: ntb_tool: Add full multi-port NTB API support

[Jon Mason]

On Sun, Dec 3, 2017 at 2:17 PM, Serge Semin <fancer.lancer@gmail.com> wrote:
> NTB API has been updated to support multi-port devices like IDT
> 89HPESx series or Microsemi Switchtec. Message registers
> functionality has also been added to new API. In order to keep
> the new hardware and corresponding capabilities well tested, NTB
> tool driver is accordingly altered.
>
> Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
> ---
>
> Changelog v1:
> - Alter interface in compliance with multi-port API
> - Move Message/MW/Port/Link settings to a specific directory
>
> Changelog v2:
> - Remove driver Author/Description/License macros
> - Return error if ntb_mw_get_align called while link is down
> - Add db_valid_mask DebugFS file
> - Add msg_inbits/msg_outbits DebugFS files
>
>  drivers/ntb/test/ntb_tool.c | 1805 +++++++++++++++++++++++++++++--------------
>  1 file changed, 1228 insertions(+), 577 deletions(-)
>
> diff --git a/drivers/ntb/test/ntb_tool.c b/drivers/ntb/test/ntb_tool.c
> index 91526a986caa..e3fbc5944679 100644
> --- a/drivers/ntb/test/ntb_tool.c
> +++ b/drivers/ntb/test/ntb_tool.c
> @@ -5,6 +5,7 @@
>   *   GPL LICENSE SUMMARY
>   *
>   *   Copyright (C) 2015 EMC Corporation. All Rights Reserved.
> + *   Copyright (C) 2017 T-Platforms All Rights Reserved.
>   *
>   *   This program is free software; you can redistribute it and/or modify
>   *   it under the terms of version 2 of the GNU General Public License as
> @@ -18,6 +19,7 @@
>   *   BSD LICENSE
>   *
>   *   Copyright (C) 2015 EMC Corporation. All Rights Reserved.
> + *   Copyright (C) 2017 T-Platforms All Rights Reserved.
>   *
>   *   Redistribution and use in source and binary forms, with or without
>   *   modification, are permitted provided that the following conditions
> @@ -49,6 +51,7 @@
>   *
>   * Contact Information:
>   * Allen Hubbe <Allen.Hubbe@emc.com>
> + * Serge Semin <fancer.lancer@gmail.com>, <Sergey.Semin@t-platforms.ru>
>   */
>
>  /*
> @@ -56,42 +59,125 @@
>   *
>   * Assuming $DBG_DIR is something like:
>   * '/sys/kernel/debug/ntb_tool/0000:00:03.0'
> + * Suppose aside from local device there is at least one remote device
> + * connected to NTB with index 0.
> + *-----------------------------------------------------------------------------
> + * Eg: check local/peer device information.
>   *
> - * Eg: check if clearing the doorbell mask generates an interrupt.
> + * # Get local device port number
> + * root@self# cat $DBG_DIR/port
>   *
> - * # Check the link status
> - * root@self# cat $DBG_DIR/link
> + * # Check local device functionality
> + * root@self# ls $DBG_DIR
> + * db            msg1          msg_sts     peer4/        port
> + * db_event      msg2          peer0/      peer5/        spad0
> + * db_mask       msg3          peer1/      peer_db       spad1
> + * link          msg_event     peer2/      peer_db_mask  spad2
> + * msg0          msg_mask      peer3/      peer_spad     spad3
> + * # As one can see it supports:
> + * # 1) four inbound message registers
> + * # 2) four inbound scratchpads
> + * # 3) up to six peer devices
>   *
> - * # Block until the link is up
> - * root@self# echo Y > $DBG_DIR/link_event
> + * # Check peer device port number
> + * root@self# cat $DBG_DIR/peer0/port
>   *
> - * # Set the doorbell mask
> - * root@self# echo 's 1' > $DBG_DIR/mask
> + * # Check peer device(s) functionality to be used
> + * root@self# ls $DBG_DIR/peer0
> + * link             mw_trans0       mw_trans6        port
> + * link_event       mw_trans1       mw_trans7        spad0
> + * msg0             mw_trans2       peer_mw_trans0   spad1
> + * msg1             mw_trans3       peer_mw_trans1   spad2
> + * msg2             mw_trans4       peer_mw_trans2   spad3
> + * msg3             mw_trans5       peer_mw_trans3
> + * # As one can see we got:
> + * # 1) four outbound message registers
> + * # 2) four outbound scratchpads
> + * # 3) eight inbound memory windows
> + * # 4) four outbound memory windows
> + *-----------------------------------------------------------------------------
> + * Eg: NTB link tests
>   *
> - * # Ring the doorbell from the peer
> + * # Set local link up/down
> + * root@self# echo Y > $DBG_DIR/link
> + * root@self# echo N > $DBG_DIR/link
> + *
> + * # Check if link with peer device is up/down:
> + * root@self# cat $DBG_DIR/peer0/link
> + *
> + * # Block until the link is up/down
> + * root@self# echo Y > $DBG_DIR/peer0/link_event
> + * root@self# echo N > $DBG_DIR/peer0/link_event
> + *-----------------------------------------------------------------------------
> + * Eg: Doorbell registers tests (some functionality might be absent)
> + *
> + * # Set/clear/get local doorbell
> + * root@self# echo 's 1' > $DBG_DIR/db
> + * root@self# echo 'c 1' > $DBG_DIR/db
> + * root@self# cat  $DBG_DIR/db
> + *
> + * # Set/clear/get local doorbell mask
> + * root@self# echo 's 1' > $DBG_DIR/db_mask
> + * root@self# echo 'c 1' > $DBG_DIR/db_mask
> + * root@self# cat $DBG_DIR/db_mask
> + *
> + * # Ring/clear/get peer doorbell
>   * root@peer# echo 's 1' > $DBG_DIR/peer_db
> + * root@peer# echo 'c 1' > $DBG_DIR/peer_db
> + * root@peer# cat $DBG_DIR/peer_db
> + *
> + * # Set/clear/get peer doorbell mask
> + * root@self# echo 's 1' > $DBG_DIR/peer_db_mask
> + * root@self# echo 'c 1' > $DBG_DIR/peer_db_mask
> + * root@self# cat $DBG_DIR/peer_db_mask
> + *
> + * # Block until local doorbell is set with specified value
> + * root@self# echo 1 > $DBG_DIR/db_event
> + *-----------------------------------------------------------------------------
> + * Eg: Message registers tests (functionality might be absent)
> + *
> + * # Set/clear/get in/out message registers status
> + * root@self# echo 's 1' > $DBG_DIR/msg_sts
> + * root@self# echo 'c 1' > $DBG_DIR/msg_sts
> + * root@self# cat $DBG_DIR/msg_sts
>   *
> - * # Clear the doorbell mask
> - * root@self# echo 'c 1' > $DBG_DIR/mask
> + * # Set/clear in/out message registers mask
> + * root@self# echo 's 1' > $DBG_DIR/msg_mask
> + * root@self# echo 'c 1' > $DBG_DIR/msg_mask
>   *
> - * Observe debugging output in dmesg or your console.  You should see a
> - * doorbell event triggered by clearing the mask.  If not, this may indicate an
> - * issue with the hardware that needs to be worked around in the driver.
> + * # Get inbound message register #0 value and source of port index
> + * root@self# cat  $DBG_DIR/msg0
>   *
> - * Eg: read and write scratchpad registers
> + * # Send some data to peer over outbound message register #0
> + * root@self# echo 0x01020304 > $DBG_DIR/peer0/msg0
> + *-----------------------------------------------------------------------------
> + * Eg: Scratchpad registers tests (functionality might be absent)
>   *
> - * root@peer# echo '0 0x01010101 1 0x7f7f7f7f' > $DBG_DIR/peer_spad
> + * # Write/read to/from local scratchpad register #0
> + * root@peer# echo 0x01020304 > $DBG_DIR/spad0
> + * root@peer# cat $DBG_DIR/spad0
>   *
> - * root@self# cat $DBG_DIR/spad
> + * # Write/read to/from peer scratchpad register #0
> + * root@peer# echo 0x01020304 > $DBG_DIR/peer0/spad0
> + * root@peer# cat $DBG_DIR/peer0/spad0
> + *-----------------------------------------------------------------------------
> + * Eg: Memory windows tests
>   *
> - * Observe that spad 0 and 1 have the values set by the peer.
> + * # Create inbound memory window buffer of specified size/get its base address
> + * root@peer# echo 16384 > $DBG_DIR/peer0/mw_trans0
> + * root@peer# cat $DBG_DIR/peer0/mw_trans0
>   *
> - * # Check the memory window translation info
> - * cat $DBG_DIR/peer_trans0
> + * # Write/read data to/from inbound memory window
> + * root@peer# echo Hello > $DBG_DIR/peer0/mw0
> + * root@peer# head -c 7 $DBG_DIR/peer0/mw0
>   *
> - * # Setup a 16k memory window buffer
> - * echo 16384 > $DBG_DIR/peer_trans0
> + * # Map outbound memory window/check it settings (on peer device)
> + * root@peer# echo 0xADD0BA5E:16384 > $DBG_DIR/peer0/peer_mw_trans0
> + * root@peer# cat $DBG_DIR/peer0/peer_mw_trans0
>   *
> + * # Write/read data to/from outbound memory window (on peer device)
> + * root@peer# echo olleH > $DBG_DIR/peer0/peer_mw0
> + * root@peer# head -c 7 $DBG_DIR/peer0/peer_mw0
>   */
>
>  #include <linux/init.h>
> @@ -106,49 +192,77 @@
>
>  #include <linux/ntb.h>
>
> -#define DRIVER_NAME                    "ntb_tool"
> -#define DRIVER_DESCRIPTION             "PCIe NTB Debugging Tool"
> +#define DRIVER_NAME            "ntb_tool"
> +#define DRIVER_VERSION         "2.0"
>
> -#define DRIVER_LICENSE                 "Dual BSD/GPL"
> -#define DRIVER_VERSION                 "1.0"
> -#define DRIVER_RELDATE                 "22 April 2015"
> -#define DRIVER_AUTHOR                  "Allen Hubbe <Allen.Hubbe@emc.com>"
> -
> -MODULE_LICENSE(DRIVER_LICENSE);
> +MODULE_LICENSE("Dual BSD/GPL");
>  MODULE_VERSION(DRIVER_VERSION);
> -MODULE_AUTHOR(DRIVER_AUTHOR);
> -MODULE_DESCRIPTION(DRIVER_DESCRIPTION);
> -
> -/* It is rare to have hadrware with greater than six MWs */
> -#define MAX_MWS        6
> -/* Only two-ports devices are supported */
> -#define PIDX   NTB_DEF_PEER_IDX
> -
> -static struct dentry *tool_dbgfs;
> +MODULE_AUTHOR("Allen Hubbe <Allen.Hubbe@emc.com>");
> +MODULE_DESCRIPTION("PCIe NTB Debugging Tool");
>
>  struct tool_mw {
> -       int idx;
> +       int widx;
> +       int pidx;
>         struct tool_ctx *tc;
> -       resource_size_t win_size;
> +       union {
> +               u8 *mm_base;
> +               u8 __iomem *io_base;
> +       };
> +       union {
> +               dma_addr_t dma_base;
> +               u64 tr_base;
> +       };
>         resource_size_t size;
> -       u8 __iomem *local;
> -       u8 *peer;
> -       dma_addr_t peer_dma;
> -       struct dentry *peer_dbg_file;
> +       struct dentry *dbgfs_file;
> +};
> +
> +struct tool_mw_wrap {
> +       int pidx;
> +       struct tool_mw *mw;
> +};
> +
> +struct tool_msg {
> +       int midx;
> +       int pidx;
> +       struct tool_ctx *tc;
> +};
> +
> +struct tool_spad {
> +       int sidx;
> +       int pidx;
> +       struct tool_ctx *tc;
> +};
> +
> +struct tool_peer {
> +       int pidx;
> +       struct tool_ctx *tc;
> +       int inmw_cnt;
> +       struct tool_mw *inmws;
> +       int outmw_cnt;
> +       struct tool_mw_wrap *outmws;
> +       int outmsg_cnt;
> +       struct tool_msg *outmsgs;
> +       int outspad_cnt;
> +       struct tool_spad *outspads;
> +       struct dentry *dbgfs_dir;
>  };
>
>  struct tool_ctx {
>         struct ntb_dev *ntb;
> -       struct dentry *dbgfs;
>         wait_queue_head_t link_wq;
> -       int mw_count;
> -       struct tool_mw mws[MAX_MWS];
> +       wait_queue_head_t db_wq;
> +       wait_queue_head_t msg_wq;
> +       int outmw_cnt;
> +       struct tool_mw *outmws;
> +       int peer_cnt;
> +       struct tool_peer *peers;
> +       int inmsg_cnt;
> +       struct tool_msg *inmsgs;
> +       int inspad_cnt;
> +       struct tool_spad *inspads;
> +       struct dentry *dbgfs_dir;
>  };
>
> -#define SPAD_FNAME_SIZE 0x10
> -#define INT_PTR(x) ((void *)(unsigned long)x)
> -#define PTR_INT(x) ((int)(unsigned long)x)
> -
>  #define TOOL_FOPS_RDWR(__name, __read, __write) \
>         const struct file_operations __name = { \
>                 .owner = THIS_MODULE,           \
> @@ -157,6 +271,13 @@ struct tool_ctx {
>                 .write = __write,               \
>         }
>
> +static struct dentry *tool_dbgfs_topdir;
> +
> +/*==============================================================================
> + *                               NTB events handlers
> + *==============================================================================
> + */
> +
>  static void tool_link_event(void *ctx)
>  {
>         struct tool_ctx *tc = ctx;
> @@ -182,580 +303,576 @@ static void tool_db_event(void *ctx, int vec)
>
>         dev_dbg(&tc->ntb->dev, "doorbell vec %d mask %#llx bits %#llx\n",
>                 vec, db_mask, db_bits);
> +
> +       wake_up(&tc->db_wq);
> +}
> +
> +static void tool_msg_event(void *ctx)
> +{
> +       struct tool_ctx *tc = ctx;
> +       u64 msg_sts;
> +
> +       msg_sts = ntb_msg_read_sts(tc->ntb);
> +
> +       dev_dbg(&tc->ntb->dev, "message bits %#llx\n", msg_sts);
> +
> +       wake_up(&tc->msg_wq);
>  }
>
>  static const struct ntb_ctx_ops tool_ops = {
>         .link_event = tool_link_event,
>         .db_event = tool_db_event,
> +       .msg_event = tool_msg_event
>  };
>
> -static ssize_t tool_dbfn_read(struct tool_ctx *tc, char __user *ubuf,
> -                             size_t size, loff_t *offp,
> -                             u64 (*db_read_fn)(struct ntb_dev *))
> +/*==============================================================================
> + *                        Common read/write methods
> + *==============================================================================
> + */
> +
> +static ssize_t tool_fn_read(struct tool_ctx *tc, char __user *ubuf,
> +                           size_t size, loff_t *offp,
> +                           u64 (*fn_read)(struct ntb_dev *))
>  {
>         size_t buf_size;
> -       char *buf;
> -       ssize_t pos, rc;
> +       char buf[32];

I would think you would want the malloc like before, but if not then
make this a #define and reference it as necessary throughout the code.

> +       ssize_t pos;
>
> -       if (!db_read_fn)
> +       if (!fn_read)
>                 return -EINVAL;
>
> -       buf_size = min_t(size_t, size, 0x20);
> -
> -       buf = kmalloc(buf_size, GFP_KERNEL);
> -       if (!buf)
> -               return -ENOMEM;
> -
> -       pos = scnprintf(buf, buf_size, "%#llx\n",
> -                       db_read_fn(tc->ntb));
> -
> -       rc = simple_read_from_buffer(ubuf, size, offp, buf, pos);
> +       buf_size = min(size, sizeof(buf));
>
> -       kfree(buf);
> +       pos = scnprintf(buf, buf_size, "%#llx\n", fn_read(tc->ntb));
>
> -       return rc;
> +       return simple_read_from_buffer(ubuf, size, offp, buf, pos);
>  }
>
> -static ssize_t tool_dbfn_write(struct tool_ctx *tc,
> -                              const char __user *ubuf,
> -                              size_t size, loff_t *offp,
> -                              int (*db_set_fn)(struct ntb_dev *, u64),
> -                              int (*db_clear_fn)(struct ntb_dev *, u64))
> +static ssize_t tool_fn_write(struct tool_ctx *tc,
> +                            const char __user *ubuf,
> +                            size_t size, loff_t *offp,
> +                            int (*fn_set)(struct ntb_dev *, u64),
> +                            int (*fn_clear)(struct ntb_dev *, u64))
>  {
> -       u64 db_bits;
>         char *buf, cmd;
> -       ssize_t rc;
> +       ssize_t ret;
> +       u64 bits;
>         int n;
>
>         buf = kmalloc(size + 1, GFP_KERNEL);
>         if (!buf)
>                 return -ENOMEM;
>
> -       rc = simple_write_to_buffer(buf, size, offp, ubuf, size);
> -       if (rc < 0) {
> +       ret = simple_write_to_buffer(buf, size, offp, ubuf, size);
> +       if (ret < 0) {
>                 kfree(buf);
> -               return rc;
> +               return ret;
>         }
>
>         buf[size] = 0;
>
> -       n = sscanf(buf, "%c %lli", &cmd, &db_bits);
> +       n = sscanf(buf, "%c %lli", &cmd, &bits);
>
>         kfree(buf);
>
>         if (n != 2) {
> -               rc = -EINVAL;
> +               ret = -EINVAL;
>         } else if (cmd == 's') {
> -               if (!db_set_fn)
> -                       rc = -EINVAL;
> +               if (!fn_set)
> +                       ret = -EINVAL;
>                 else
> -                       rc = db_set_fn(tc->ntb, db_bits);
> +                       ret = fn_set(tc->ntb, bits);
>         } else if (cmd == 'c') {
> -               if (!db_clear_fn)
> -                       rc = -EINVAL;
> +               if (!fn_clear)
> +                       ret = -EINVAL;
>                 else
> -                       rc = db_clear_fn(tc->ntb, db_bits);
> +                       ret = fn_clear(tc->ntb, bits);
>         } else {
> -               rc = -EINVAL;
> +               ret = -EINVAL;
>         }
>
> -       return rc ? : size;
> +       return ret ? : size;
>  }
>
> -static ssize_t tool_spadfn_read(struct tool_ctx *tc, char __user *ubuf,
> -                               size_t size, loff_t *offp,
> -                               u32 (*spad_read_fn)(struct ntb_dev *, int))
> -{
> -       size_t buf_size;
> -       char *buf;
> -       ssize_t pos, rc;
> -       int i, spad_count;
> -
> -       if (!spad_read_fn)
> -               return -EINVAL;
> -
> -       spad_count = ntb_spad_count(tc->ntb);
> +/*==============================================================================
> + *                            Port read/write methods
> + *==============================================================================
> + */
>
> -       /*
> -        * We multiply the number of spads by 15 to get the buffer size
> -        * this is from 3 for the %d, 10 for the largest hex value
> -        * (0x00000000) and 2 for the tab and line feed.
> -        */
> -       buf_size = min_t(size_t, size, spad_count * 15);
> +static ssize_t tool_port_read(struct file *filep, char __user *ubuf,
> +                             size_t size, loff_t *offp)
> +{
> +       struct tool_ctx *tc = filep->private_data;
> +       char buf[32];
> +       int pos;
>
> -       buf = kmalloc(buf_size, GFP_KERNEL);
> -       if (!buf)
> -               return -ENOMEM;
> +       pos = scnprintf(buf, sizeof(buf), "%d\n", ntb_port_number(tc->ntb));
>
> -       pos = 0;
> +       return simple_read_from_buffer(ubuf, size, offp, buf, pos);
> +}
>
> -       for (i = 0; i < spad_count; ++i) {
> -               pos += scnprintf(buf + pos, buf_size - pos, "%d\t%#x\n",
> -                                i, spad_read_fn(tc->ntb, i));
> -       }
> +static TOOL_FOPS_RDWR(tool_port_fops,
> +                     tool_port_read,
> +                     NULL);
>
> -       rc = simple_read_from_buffer(ubuf, size, offp, buf, pos);
> +static ssize_t tool_peer_port_read(struct file *filep, char __user *ubuf,
> +                                  size_t size, loff_t *offp)
> +{
> +       struct tool_peer *peer = filep->private_data;
> +       struct tool_ctx *tc = peer->tc;
> +       char buf[32];
> +       int pos;
>
> -       kfree(buf);
> +       pos = scnprintf(buf, sizeof(buf), "%d\n",
> +               ntb_peer_port_number(tc->ntb, peer->pidx));
>
> -       return rc;
> +       return simple_read_from_buffer(ubuf, size, offp, buf, pos);
>  }
>
> -static ssize_t tool_spadfn_write(struct tool_ctx *tc,
> -                                const char __user *ubuf,
> -                                size_t size, loff_t *offp,
> -                                int (*spad_write_fn)(struct ntb_dev *,
> -                                                     int, u32))
> +static TOOL_FOPS_RDWR(tool_peer_port_fops,
> +                     tool_peer_port_read,
> +                     NULL);
> +
> +static int tool_init_peers(struct tool_ctx *tc)
>  {
> -       int spad_idx;
> -       u32 spad_val;
> -       char *buf, *buf_ptr;
> -       int pos, n;
> -       ssize_t rc;
> -
> -       if (!spad_write_fn) {
> -               dev_dbg(&tc->ntb->dev, "no spad write fn\n");
> -               return -EINVAL;
> -       }
> +       int pidx;
>
> -       buf = kmalloc(size + 1, GFP_KERNEL);
> -       if (!buf)
> +       tc->peer_cnt = ntb_peer_port_count(tc->ntb);
> +       tc->peers = devm_kcalloc(&tc->ntb->dev, tc->peer_cnt,
> +                                sizeof(*tc->peers), GFP_KERNEL);
> +       if (tc->peers == NULL)
>                 return -ENOMEM;
>
> -       rc = simple_write_to_buffer(buf, size, offp, ubuf, size);
> -       if (rc < 0) {
> -               kfree(buf);
> -               return rc;
> -       }
> -
> -       buf[size] = 0;
> -       buf_ptr = buf;
> -       n = sscanf(buf_ptr, "%d %i%n", &spad_idx, &spad_val, &pos);
> -       while (n == 2) {
> -               buf_ptr += pos;
> -               rc = spad_write_fn(tc->ntb, spad_idx, spad_val);
> -               if (rc)
> -                       break;
> -
> -               n = sscanf(buf_ptr, "%d %i%n", &spad_idx, &spad_val, &pos);
> +       for (pidx = 0; pidx < tc->peer_cnt; pidx++) {
> +               tc->peers[pidx].pidx = pidx;
> +               tc->peers[pidx].tc = tc;
>         }
>
> -       if (n < 0)
> -               rc = n;
> -
> -       kfree(buf);
> -
> -       return rc ? : size;
> +       return 0;
>  }
>
> -static ssize_t tool_db_read(struct file *filep, char __user *ubuf,
> -                           size_t size, loff_t *offp)
> -{
> -       struct tool_ctx *tc = filep->private_data;
> -
> -       return tool_dbfn_read(tc, ubuf, size, offp,
> -                             tc->ntb->ops->db_read);
> -}
> +/*==============================================================================
> + *                       Link state read/write methods
> + *==============================================================================
> + */
>
> -static ssize_t tool_db_write(struct file *filep, const char __user *ubuf,
> -                            size_t size, loff_t *offp)
> +static ssize_t tool_link_write(struct file *filep, const char __user *ubuf,
> +                              size_t size, loff_t *offp)
>  {
>         struct tool_ctx *tc = filep->private_data;
> +       bool val;
> +       int ret;
>
> -       return tool_dbfn_write(tc, ubuf, size, offp,
> -                              tc->ntb->ops->db_set,
> -                              tc->ntb->ops->db_clear);
> -}
> +       ret = kstrtobool_from_user(ubuf, size, &val);
> +       if (ret)
> +               return ret;
>
> -static TOOL_FOPS_RDWR(tool_db_fops,
> -                     tool_db_read,
> -                     tool_db_write);
> +       if (val)
> +               ret = ntb_link_enable(tc->ntb, NTB_SPEED_AUTO, NTB_WIDTH_AUTO);
> +       else
> +               ret = ntb_link_disable(tc->ntb);
>
> -static ssize_t tool_mask_read(struct file *filep, char __user *ubuf,
> -                             size_t size, loff_t *offp)
> -{
> -       struct tool_ctx *tc = filep->private_data;
> +       if (ret)
> +               return ret;
>
> -       return tool_dbfn_read(tc, ubuf, size, offp,
> -                             tc->ntb->ops->db_read_mask);
> +       return size;
>  }
>
> -static ssize_t tool_mask_write(struct file *filep, const char __user *ubuf,
> -                              size_t size, loff_t *offp)
> +static TOOL_FOPS_RDWR(tool_link_fops,
> +                     NULL,
> +                     tool_link_write);
> +
> +static ssize_t tool_peer_link_read(struct file *filep, char __user *ubuf,
> +                                  size_t size, loff_t *offp)
>  {
> -       struct tool_ctx *tc = filep->private_data;
> +       struct tool_peer *peer = filep->private_data;
> +       struct tool_ctx *tc = peer->tc;
> +       char buf[3];
> +
> +       if (ntb_link_is_up(tc->ntb, NULL, NULL) & BIT(peer->pidx))
> +               buf[0] = 'Y';
> +       else
> +               buf[0] = 'N';
> +       buf[1] = '\n';
> +       buf[2] = '\0';
>
> -       return tool_dbfn_write(tc, ubuf, size, offp,
> -                              tc->ntb->ops->db_set_mask,
> -                              tc->ntb->ops->db_clear_mask);
> +       return simple_read_from_buffer(ubuf, size, offp, buf, 3);
>  }
>
> -static TOOL_FOPS_RDWR(tool_mask_fops,
> -                     tool_mask_read,
> -                     tool_mask_write);
> +static TOOL_FOPS_RDWR(tool_peer_link_fops,
> +                     tool_peer_link_read,
> +                     NULL);
>
> -static ssize_t tool_peer_db_read(struct file *filep, char __user *ubuf,
> -                                size_t size, loff_t *offp)
> +static ssize_t tool_peer_link_event_write(struct file *filep,
> +                                         const char __user *ubuf,
> +                                         size_t size, loff_t *offp)
>  {
> -       struct tool_ctx *tc = filep->private_data;
> +       struct tool_peer *peer = filep->private_data;
> +       struct tool_ctx *tc = peer->tc;
> +       u64 link_msk;
> +       bool val;
> +       int ret;
>
> -       return tool_dbfn_read(tc, ubuf, size, offp,
> -                             tc->ntb->ops->peer_db_read);
> -}
> +       ret = kstrtobool_from_user(ubuf, size, &val);
> +       if (ret)
> +               return ret;
>
> -static ssize_t tool_peer_db_write(struct file *filep, const char __user *ubuf,
> -                                 size_t size, loff_t *offp)
> -{
> -       struct tool_ctx *tc = filep->private_data;
> +       link_msk = BIT_ULL_MASK(peer->pidx);
> +
> +       if (wait_event_interruptible(tc->link_wq,
> +               !!(ntb_link_is_up(tc->ntb, NULL, NULL) & link_msk) == val))
> +               return -ERESTART;
>
> -       return tool_dbfn_write(tc, ubuf, size, offp,
> -                              tc->ntb->ops->peer_db_set,
> -                              tc->ntb->ops->peer_db_clear);
> +       return size;
>  }
>
> -static TOOL_FOPS_RDWR(tool_peer_db_fops,
> -                     tool_peer_db_read,
> -                     tool_peer_db_write);
> +static TOOL_FOPS_RDWR(tool_peer_link_event_fops,
> +                     NULL,
> +                     tool_peer_link_event_write);
>
> -static ssize_t tool_peer_mask_read(struct file *filep, char __user *ubuf,
> -                                  size_t size, loff_t *offp)
> +/*==============================================================================
> + *                  Memory windows read/write/setting methods
> + *==============================================================================
> + */
> +
> +static ssize_t tool_mw_read(struct file *filep, char __user *ubuf,
> +                           size_t size, loff_t *offp)
>  {
> -       struct tool_ctx *tc = filep->private_data;
> +       struct tool_mw *inmw = filep->private_data;
>
> -       return tool_dbfn_read(tc, ubuf, size, offp,
> -                             tc->ntb->ops->peer_db_read_mask);
> +       if (inmw->mm_base == NULL)
> +               return -ENXIO;
> +
> +       return simple_read_from_buffer(ubuf, size, offp,
> +                                      inmw->mm_base, inmw->size);
>  }
>
> -static ssize_t tool_peer_mask_write(struct file *filep, const char __user *ubuf,
> -                                   size_t size, loff_t *offp)
> +static ssize_t tool_mw_write(struct file *filep, const char __user *ubuf,
> +                            size_t size, loff_t *offp)
>  {
> -       struct tool_ctx *tc = filep->private_data;
> +       struct tool_mw *inmw = filep->private_data;
> +
> +       if (inmw->mm_base == NULL)
> +               return -ENXIO;
>
> -       return tool_dbfn_write(tc, ubuf, size, offp,
> -                              tc->ntb->ops->peer_db_set_mask,
> -                              tc->ntb->ops->peer_db_clear_mask);
> +       return simple_write_to_buffer(inmw->mm_base, inmw->size, offp,
> +                                     ubuf, size);
>  }
>
> -static TOOL_FOPS_RDWR(tool_peer_mask_fops,
> -                     tool_peer_mask_read,
> -                     tool_peer_mask_write);
> +static TOOL_FOPS_RDWR(tool_mw_fops,
> +                     tool_mw_read,
> +                     tool_mw_write);
>
> -static ssize_t tool_spad_read(struct file *filep, char __user *ubuf,
> -                             size_t size, loff_t *offp)
> +static int tool_setup_mw(struct tool_ctx *tc, int pidx, int widx,
> +                        size_t req_size)
>  {
> -       struct tool_ctx *tc = filep->private_data;
> +       resource_size_t size, addr_align, size_align;
> +       struct tool_mw *inmw = &tc->peers[pidx].inmws[widx];
> +       char buf[16];
> +       int ret;
>
> -       return tool_spadfn_read(tc, ubuf, size, offp,
> -                               tc->ntb->ops->spad_read);
> -}
> +       if (inmw->mm_base != NULL)
> +               return 0;
>
> -static ssize_t tool_spad_write(struct file *filep, const char __user *ubuf,
> -                              size_t size, loff_t *offp)
> -{
> -       struct tool_ctx *tc = filep->private_data;
> +       ret = ntb_mw_get_align(tc->ntb, pidx, widx, &addr_align,
> +                               &size_align, &size);
> +       if (ret)
> +               return ret;
> +
> +       inmw->size = min_t(resource_size_t, req_size, size);
> +       inmw->size = round_up(inmw->size, addr_align);
> +       inmw->size = round_up(inmw->size, size_align);
> +       inmw->mm_base = dma_alloc_coherent(&tc->ntb->dev, inmw->size,
> +                                          &inmw->dma_base, GFP_KERNEL);
> +       if (!inmw->mm_base)
> +               return -ENOMEM;
>
> -       return tool_spadfn_write(tc, ubuf, size, offp,
> -                                tc->ntb->ops->spad_write);
> -}
> +       if (!IS_ALIGNED(inmw->dma_base, addr_align)) {
> +               ret = -ENOMEM;
> +               goto err_free_dma;
> +       }
>
> -static TOOL_FOPS_RDWR(tool_spad_fops,
> -                     tool_spad_read,
> -                     tool_spad_write);
> +       ret = ntb_mw_set_trans(tc->ntb, pidx, widx, inmw->dma_base, inmw->size);
> +       if (ret)
> +               goto err_free_dma;
>
> -static u32 ntb_tool_peer_spad_read(struct ntb_dev *ntb, int sidx)
> -{
> -       return ntb_peer_spad_read(ntb, PIDX, sidx);
> -}
> +       snprintf(buf, sizeof(buf), "mw%d", widx);
> +       inmw->dbgfs_file = debugfs_create_file(buf, 0600,
> +                                              tc->peers[pidx].dbgfs_dir, inmw,
> +                                              &tool_mw_fops);
>
> -static ssize_t tool_peer_spad_read(struct file *filep, char __user *ubuf,
> -                                  size_t size, loff_t *offp)
> -{
> -       struct tool_ctx *tc = filep->private_data;
> +       return 0;
>
> -       return tool_spadfn_read(tc, ubuf, size, offp, ntb_tool_peer_spad_read);
> -}
> +err_free_dma:
> +       dma_free_coherent(&tc->ntb->dev, inmw->size, inmw->mm_base,
> +                         inmw->dma_base);
> +       inmw->mm_base = NULL;
> +       inmw->dma_base = 0;
> +       inmw->size = 0;
>
> -static int ntb_tool_peer_spad_write(struct ntb_dev *ntb, int sidx, u32 val)
> -{
> -       return ntb_peer_spad_write(ntb, PIDX, sidx, val);
> +       return ret;
>  }
>
> -static ssize_t tool_peer_spad_write(struct file *filep, const char __user *ubuf,
> -                                   size_t size, loff_t *offp)
> +static void tool_free_mw(struct tool_ctx *tc, int pidx, int widx)
>  {
> -       struct tool_ctx *tc = filep->private_data;
> -
> -       return tool_spadfn_write(tc, ubuf, size, offp,
> -                                ntb_tool_peer_spad_write);
> -}
> -
> -static TOOL_FOPS_RDWR(tool_peer_spad_fops,
> -                     tool_peer_spad_read,
> -                     tool_peer_spad_write);
> +       struct tool_mw *inmw = &tc->peers[pidx].inmws[widx];
>
> -static ssize_t tool_link_read(struct file *filep, char __user *ubuf,
> -                             size_t size, loff_t *offp)
> -{
> -       struct tool_ctx *tc = filep->private_data;
> -       char buf[3];
> +       debugfs_remove(inmw->dbgfs_file);
>
> -       buf[0] = ntb_link_is_up(tc->ntb, NULL, NULL) ? 'Y' : 'N';
> -       buf[1] = '\n';
> -       buf[2] = '\0';
> +       if (inmw->mm_base != NULL) {
> +               ntb_mw_clear_trans(tc->ntb, pidx, widx);
> +               dma_free_coherent(&tc->ntb->dev, inmw->size,
> +                                 inmw->mm_base, inmw->dma_base);
> +       }
>
> -       return simple_read_from_buffer(ubuf, size, offp, buf, 2);
> +       inmw->mm_base = NULL;
> +       inmw->dma_base = 0;
> +       inmw->size = 0;
> +       inmw->dbgfs_file = NULL;
>  }
>
> -static ssize_t tool_link_write(struct file *filep, const char __user *ubuf,
> -                              size_t size, loff_t *offp)
> +static ssize_t tool_mw_trans_read(struct file *filep, char __user *ubuf,
> +                                 size_t size, loff_t *offp)
>  {
> -       struct tool_ctx *tc = filep->private_data;
> -       char buf[32];
> +       struct tool_mw *inmw = filep->private_data;
> +       resource_size_t addr_align;
> +       resource_size_t size_align;
> +       resource_size_t size_max;
> +       ssize_t ret, off = 0;
>         size_t buf_size;
> -       bool val;
> -       int rc;
> +       char *buf;
>
> -       buf_size = min(size, (sizeof(buf) - 1));
> -       if (copy_from_user(buf, ubuf, buf_size))
> -               return -EFAULT;
> +       buf_size = min_t(size_t, size, 512);
>
> -       buf[buf_size] = '\0';
> +       buf = kmalloc(buf_size, GFP_KERNEL);
> +       if (!buf)
> +               return -ENOMEM;
>
> -       rc = strtobool(buf, &val);
> -       if (rc)
> -               return rc;
> +       ret = ntb_mw_get_align(inmw->tc->ntb, inmw->pidx, inmw->widx,
> +                              &addr_align, &size_align, &size_max);
> +       if (ret)
> +               return ret;
>
> -       if (val)
> -               rc = ntb_link_enable(tc->ntb, NTB_SPEED_AUTO, NTB_WIDTH_AUTO);
> -       else
> -               rc = ntb_link_disable(tc->ntb);
> +       off += scnprintf(buf + off, buf_size - off,
> +                        "Inbound MW     \t%d\n",
> +                        inmw->widx);
>
> -       if (rc)
> -               return rc;
> +       off += scnprintf(buf + off, buf_size - off,
> +                        "Port           \t%d (%d)\n",
> +                        ntb_peer_port_number(inmw->tc->ntb, inmw->pidx),
> +                        inmw->pidx);
>
> -       return size;
> -}
> +       off += scnprintf(buf + off, buf_size - off,
> +                        "Window Address \t0x%pK\n", inmw->mm_base);
>
> -static TOOL_FOPS_RDWR(tool_link_fops,
> -                     tool_link_read,
> -                     tool_link_write);
> +       off += scnprintf(buf + off, buf_size - off,
> +                        "DMA Address    \t%pad\n",
> +                        &inmw->dma_base);
>
> -static ssize_t tool_link_event_write(struct file *filep,
> -                                    const char __user *ubuf,
> -                                    size_t size, loff_t *offp)
> -{
> -       struct tool_ctx *tc = filep->private_data;
> -       char buf[32];
> -       size_t buf_size;
> -       bool val;
> -       int rc;
> +       off += scnprintf(buf + off, buf_size - off,
> +                        "Window Size    \t%pa[p]\n",
> +                        &inmw->size);
>
> -       buf_size = min(size, (sizeof(buf) - 1));
> -       if (copy_from_user(buf, ubuf, buf_size))
> -               return -EFAULT;
> +       off += scnprintf(buf + off, buf_size - off,
> +                        "Alignment      \t%pa[p]\n",
> +                        &addr_align);
>
> -       buf[buf_size] = '\0';
> +       off += scnprintf(buf + off, buf_size - off,
> +                        "Size Alignment \t%pa[p]\n",
> +                        &size_align);
> +
> +       off += scnprintf(buf + off, buf_size - off,
> +                        "Size Max       \t%pa[p]\n",
> +                        &size_max);
>
> -       rc = strtobool(buf, &val);
> -       if (rc)
> -               return rc;
> +       ret = simple_read_from_buffer(ubuf, size, offp, buf, off);
> +       kfree(buf);
>
> -       if (wait_event_interruptible(tc->link_wq,
> -               ntb_link_is_up(tc->ntb, NULL, NULL) == val))
> -               return -ERESTART;
> +       return ret;
> +}
> +
> +static ssize_t tool_mw_trans_write(struct file *filep, const char __user *ubuf,
> +                                  size_t size, loff_t *offp)
> +{
> +       struct tool_mw *inmw = filep->private_data;
> +       unsigned int val;
> +       int ret;
> +
> +       ret = kstrtouint_from_user(ubuf, size, 0, &val);
> +       if (ret)
> +               return ret;
> +
> +       tool_free_mw(inmw->tc, inmw->pidx, inmw->widx);
> +       if (val) {
> +               ret = tool_setup_mw(inmw->tc, inmw->pidx, inmw->widx, val);
> +               if (ret)
> +                       return ret;
> +       }
>
>         return size;
>  }
>
> -static TOOL_FOPS_RDWR(tool_link_event_fops,
> -                     NULL,
> -                     tool_link_event_write);
> +static TOOL_FOPS_RDWR(tool_mw_trans_fops,
> +                     tool_mw_trans_read,
> +                     tool_mw_trans_write);
>
> -static ssize_t tool_mw_read(struct file *filep, char __user *ubuf,
> -                           size_t size, loff_t *offp)
> +static ssize_t tool_peer_mw_read(struct file *filep, char __user *ubuf,
> +                                size_t size, loff_t *offp)
>  {
> -       struct tool_mw *mw = filep->private_data;
> -       ssize_t rc;
> +       struct tool_mw *outmw = filep->private_data;
>         loff_t pos = *offp;
> +       ssize_t ret;
>         void *buf;
>
> -       if (mw->local == NULL)
> +       if (outmw->io_base == NULL)
>                 return -EIO;
> -       if (pos < 0)
> -               return -EINVAL;
> -       if (pos >= mw->win_size || !size)
> +
> +       if (pos >= outmw->size || !size)
>                 return 0;
> -       if (size > mw->win_size - pos)
> -               size = mw->win_size - pos;
> +
> +       if (size > outmw->size - pos)
> +               size = outmw->size - pos;
>
>         buf = kmalloc(size, GFP_KERNEL);
>         if (!buf)
>                 return -ENOMEM;
>
> -       memcpy_fromio(buf, mw->local + pos, size);
> -       rc = copy_to_user(ubuf, buf, size);
> -       if (rc == size) {
> -               rc = -EFAULT;
> +       memcpy_fromio(buf, outmw->io_base + pos, size);
> +       ret = copy_to_user(ubuf, buf, size);
> +       if (ret == size) {
> +               ret = -EFAULT;
>                 goto err_free;
>         }
>
> -       size -= rc;
> +       size -= ret;
>         *offp = pos + size;
> -       rc = size;
> +       ret = size;
>
>  err_free:
>         kfree(buf);
>
> -       return rc;
> +       return ret;
>  }
>
> -static ssize_t tool_mw_write(struct file *filep, const char __user *ubuf,
> -                            size_t size, loff_t *offp)
> +static ssize_t tool_peer_mw_write(struct file *filep, const char __user *ubuf,
> +                                 size_t size, loff_t *offp)
>  {
> -       struct tool_mw *mw = filep->private_data;
> -       ssize_t rc;
> +       struct tool_mw *outmw = filep->private_data;
> +       ssize_t ret;
>         loff_t pos = *offp;
>         void *buf;
>
> -       if (pos < 0)
> -               return -EINVAL;
> -       if (pos >= mw->win_size || !size)
> +       if (outmw->io_base == NULL)
> +               return -EIO;
> +
> +       if (pos >= outmw->size || !size)
>                 return 0;
> -       if (size > mw->win_size - pos)
> -               size = mw->win_size - pos;
> +       if (size > outmw->size - pos)
> +               size = outmw->size - pos;
>
>         buf = kmalloc(size, GFP_KERNEL);
>         if (!buf)
>                 return -ENOMEM;
>
> -       rc = copy_from_user(buf, ubuf, size);
> -       if (rc == size) {
> -               rc = -EFAULT;
> +       ret = copy_from_user(buf, ubuf, size);
> +       if (ret == size) {
> +               ret = -EFAULT;
>                 goto err_free;
>         }
>
> -       size -= rc;
> +       size -= ret;
>         *offp = pos + size;
> -       rc = size;
> +       ret = size;
>
> -       memcpy_toio(mw->local + pos, buf, size);
> +       memcpy_toio(outmw->io_base + pos, buf, size);
>
>  err_free:
>         kfree(buf);
>
> -       return rc;
> -}
> -
> -static TOOL_FOPS_RDWR(tool_mw_fops,
> -                     tool_mw_read,
> -                     tool_mw_write);
> -
> -static ssize_t tool_peer_mw_read(struct file *filep, char __user *ubuf,
> -                                size_t size, loff_t *offp)
> -{
> -       struct tool_mw *mw = filep->private_data;
> -
> -       if (!mw->peer)
> -               return -ENXIO;
> -
> -       return simple_read_from_buffer(ubuf, size, offp, mw->peer, mw->size);
> -}
> -
> -static ssize_t tool_peer_mw_write(struct file *filep, const char __user *ubuf,
> -                                 size_t size, loff_t *offp)
> -{
> -       struct tool_mw *mw = filep->private_data;
> -
> -       if (!mw->peer)
> -               return -ENXIO;
> -
> -       return simple_write_to_buffer(mw->peer, mw->size, offp, ubuf, size);
> +       return ret;
>  }
>
>  static TOOL_FOPS_RDWR(tool_peer_mw_fops,
>                       tool_peer_mw_read,
>                       tool_peer_mw_write);
>
> -static int tool_setup_mw(struct tool_ctx *tc, int idx, size_t req_size)
> +static int tool_setup_peer_mw(struct tool_ctx *tc, int pidx, int widx,
> +                             u64 req_addr, size_t req_size)
>  {
> -       int rc;
> -       struct tool_mw *mw = &tc->mws[idx];
> -       resource_size_t size, align_addr, align_size;
> +       struct tool_mw *outmw = &tc->outmws[widx];
> +       resource_size_t map_size;
> +       phys_addr_t map_base;
>         char buf[16];
> +       int ret;
>
> -       if (mw->peer)
> +       if (outmw->io_base != NULL)
>                 return 0;
>
> -       rc = ntb_mw_get_align(tc->ntb, PIDX, idx, &align_addr,
> -                               &align_size, &size);
> -       if (rc)
> -               return rc;
> +       ret = ntb_peer_mw_get_addr(tc->ntb, widx, &map_base, &map_size);
> +       if (ret)
> +               return ret;
>
> -       mw->size = min_t(resource_size_t, req_size, size);
> -       mw->size = round_up(mw->size, align_addr);
> -       mw->size = round_up(mw->size, align_size);
> -       mw->peer = dma_alloc_coherent(&tc->ntb->pdev->dev, mw->size,
> -                                     &mw->peer_dma, GFP_KERNEL);
> +       ret = ntb_peer_mw_set_trans(tc->ntb, pidx, widx, req_addr, req_size);
> +       if (ret)
> +               return ret;
>
> -       if (!mw->peer || !IS_ALIGNED(mw->peer_dma, align_addr))
> -               return -ENOMEM;
> +       outmw->io_base = ioremap_wc(map_base, map_size);
> +       if (outmw->io_base == NULL) {
> +               ret = -EFAULT;
> +               goto err_clear_trans;
> +       }
>
> -       rc = ntb_mw_set_trans(tc->ntb, PIDX, idx, mw->peer_dma, mw->size);
> -       if (rc)
> -               goto err_free_dma;
> +       outmw->tr_base = req_addr;
> +       outmw->size = req_size;
> +       outmw->pidx = pidx;
>
> -       snprintf(buf, sizeof(buf), "peer_mw%d", idx);
> -       mw->peer_dbg_file = debugfs_create_file(buf, S_IRUSR | S_IWUSR,
> -                                               mw->tc->dbgfs, mw,
> -                                               &tool_peer_mw_fops);
> +       snprintf(buf, sizeof(buf), "peer_mw%d", widx);
> +       outmw->dbgfs_file = debugfs_create_file(buf, 0600,
> +                                              tc->peers[pidx].dbgfs_dir, outmw,
> +                                              &tool_peer_mw_fops);
>
>         return 0;
>
> -err_free_dma:
> -       dma_free_coherent(&tc->ntb->pdev->dev, mw->size,
> -                         mw->peer,
> -                         mw->peer_dma);
> -       mw->peer = NULL;
> -       mw->peer_dma = 0;
> -       mw->size = 0;
> -
> -       return rc;
> +err_clear_trans:
> +       ntb_peer_mw_clear_trans(tc->ntb, pidx, widx);
> +
> +       return ret;
>  }
>
> -static void tool_free_mw(struct tool_ctx *tc, int idx)
> +static void tool_free_peer_mw(struct tool_ctx *tc, int widx)
>  {
> -       struct tool_mw *mw = &tc->mws[idx];
> +       struct tool_mw *outmw = &tc->outmws[widx];
>
> -       if (mw->peer) {
> -               ntb_mw_clear_trans(tc->ntb, PIDX, idx);
> -               dma_free_coherent(&tc->ntb->pdev->dev, mw->size,
> -                                 mw->peer,
> -                                 mw->peer_dma);
> -       }
> +       debugfs_remove(outmw->dbgfs_file);
>
> -       mw->peer = NULL;
> -       mw->peer_dma = 0;
> -
> -       debugfs_remove(mw->peer_dbg_file);
> +       if (outmw->io_base != NULL) {
> +               iounmap(tc->outmws[widx].io_base);
> +               ntb_peer_mw_clear_trans(tc->ntb, outmw->pidx, widx);
> +       }
>
> -       mw->peer_dbg_file = NULL;
> +       outmw->io_base = NULL;
> +       outmw->tr_base = 0;
> +       outmw->size = 0;
> +       outmw->pidx = -1;
> +       outmw->dbgfs_file = NULL;
>  }
>
> -static ssize_t tool_peer_mw_trans_read(struct file *filep,
> -                                      char __user *ubuf,
> -                                      size_t size, loff_t *offp)
> +static ssize_t tool_peer_mw_trans_read(struct file *filep, char __user *ubuf,
> +                                       size_t size, loff_t *offp)
>  {
> -       struct tool_mw *mw = filep->private_data;
> -
> -       char *buf;
> +       struct tool_mw_wrap *outmw_wrap = filep->private_data;
> +       struct tool_mw *outmw = outmw_wrap->mw;
> +       resource_size_t map_size;
> +       phys_addr_t map_base;
> +       ssize_t off = 0;
>         size_t buf_size;
> -       ssize_t ret, off = 0;
> +       char *buf;
> +       int ret;
>
> -       phys_addr_t base;
> -       resource_size_t mw_size;
> -       resource_size_t align_addr = 0;
> -       resource_size_t align_size = 0;
> -       resource_size_t max_size = 0;
> +       ret = ntb_peer_mw_get_addr(outmw->tc->ntb, outmw->widx,
> +                                 &map_base, &map_size);
> +       if (ret)
> +               return ret;
>
>         buf_size = min_t(size_t, size, 512);
>
> @@ -763,43 +880,37 @@ static ssize_t tool_peer_mw_trans_read(struct file *filep,
>         if (!buf)
>                 return -ENOMEM;
>
> -       ntb_mw_get_align(mw->tc->ntb, PIDX, mw->idx,
> -                        &align_addr, &align_size, &max_size);
> -       ntb_peer_mw_get_addr(mw->tc->ntb, mw->idx, &base, &mw_size);
> -
>         off += scnprintf(buf + off, buf_size - off,
> -                        "Peer MW %d Information:\n", mw->idx);
> +                        "Outbound MW:        \t%d\n", outmw->widx);
>
> -       off += scnprintf(buf + off, buf_size - off,
> -                        "Physical Address      \t%pa[p]\n",
> -                        &base);
> -
> -       off += scnprintf(buf + off, buf_size - off,
> -                        "Window Size           \t%lld\n",
> -                        (unsigned long long)mw_size);
> +       if (outmw->io_base != NULL) {
> +               off += scnprintf(buf + off, buf_size - off,
> +                       "Port attached       \t%d (%d)\n",
> +                       ntb_peer_port_number(outmw->tc->ntb, outmw->pidx),
> +                       outmw->pidx);
> +       } else {
> +               off += scnprintf(buf + off, buf_size - off,
> +                                "Port attached       \t-1 (-1)\n");
> +       }
>
>         off += scnprintf(buf + off, buf_size - off,
> -                        "Alignment             \t%lld\n",
> -                        (unsigned long long)align_addr);
> +                        "Virtual address     \t0x%pK\n", outmw->io_base);
>
>         off += scnprintf(buf + off, buf_size - off,
> -                        "Size Alignment        \t%lld\n",
> -                        (unsigned long long)align_size);
> +                        "Phys Address        \t%pa[p]\n", &map_base);
>
>         off += scnprintf(buf + off, buf_size - off,
> -                        "Size Max              \t%lld\n",
> -                        (unsigned long long)max_size);
> +                        "Mapping Size        \t%pa[p]\n", &map_size);
>
>         off += scnprintf(buf + off, buf_size - off,
> -                        "Ready                 \t%c\n",
> -                        (mw->peer) ? 'Y' : 'N');
> +                        "Translation Address \t0x%016llx\n", outmw->tr_base);
>
>         off += scnprintf(buf + off, buf_size - off,
> -                        "Allocated Size       \t%zd\n",
> -                        (mw->peer) ? (size_t)mw->size : 0);
> +                        "Window Size         \t%pa[p]\n", &outmw->size);
>
>         ret = simple_read_from_buffer(ubuf, size, offp, buf, off);
>         kfree(buf);
> +
>         return ret;
>  }
>
> @@ -807,12 +918,12 @@ static ssize_t tool_peer_mw_trans_write(struct file *filep,
>                                         const char __user *ubuf,
>                                         size_t size, loff_t *offp)
>  {
> -       struct tool_mw *mw = filep->private_data;
> -
> +       struct tool_mw_wrap *outmw_wrap = filep->private_data;
> +       struct tool_mw *outmw = outmw_wrap->mw;
> +       size_t buf_size, wsize;
>         char buf[32];
> -       size_t buf_size;
> -       unsigned long long val;
> -       int rc;
> +       int ret, n;
> +       u64 addr;
>
>         buf_size = min(size, (sizeof(buf) - 1));
>         if (copy_from_user(buf, ubuf, buf_size))
> @@ -820,16 +931,17 @@ static ssize_t tool_peer_mw_trans_write(struct file *filep,
>
>         buf[buf_size] = '\0';
>
> -       rc = kstrtoull(buf, 0, &val);
> -       if (rc)
> -               return rc;
> -
> -       tool_free_mw(mw->tc, mw->idx);
> -       if (val)
> -               rc = tool_setup_mw(mw->tc, mw->idx, val);
> +       n = sscanf(buf, "%lli:%zi", &addr, &wsize);
> +       if (n != 2)
> +               return -EINVAL;
>
> -       if (rc)
> -               return rc;
> +       tool_free_peer_mw(outmw->tc, outmw->widx);
> +       if (wsize) {
> +               ret = tool_setup_peer_mw(outmw->tc, outmw_wrap->pidx,
> +                                        outmw->widx, addr, wsize);
> +               if (ret)
> +                       return ret;
> +       }
>
>         return size;
>  }
> @@ -838,195 +950,734 @@ static TOOL_FOPS_RDWR(tool_peer_mw_trans_fops,
>                       tool_peer_mw_trans_read,
>                       tool_peer_mw_trans_write);
>
> -static int tool_init_mw(struct tool_ctx *tc, int idx)
> +static int tool_init_mws(struct tool_ctx *tc)
>  {
> -       struct tool_mw *mw = &tc->mws[idx];
> -       phys_addr_t base;
> -       int rc;
> -
> -       rc = ntb_peer_mw_get_addr(tc->ntb, idx, &base, &mw->win_size);
> -       if (rc)
> -               return rc;
> -
> -       mw->tc = tc;
> -       mw->idx = idx;
> -       mw->local = ioremap_wc(base, mw->win_size);
> -       if (!mw->local)
> -               return -EFAULT;
> +       int widx, pidx;
> +
> +       /* Initialize outbound memory windows */
> +       tc->outmw_cnt = ntb_peer_mw_count(tc->ntb);
> +       tc->outmws = devm_kcalloc(&tc->ntb->dev, tc->outmw_cnt,
> +                                 sizeof(*tc->outmws), GFP_KERNEL);
> +       if (tc->outmws == NULL)
> +               return -ENOMEM;
> +
> +       for (widx = 0; widx < tc->outmw_cnt; widx++) {
> +               tc->outmws[widx].widx = widx;
> +               tc->outmws[widx].pidx = -1;
> +               tc->outmws[widx].tc = tc;
> +       }
> +
> +       /* Initialize inbound memory windows and outbound MWs wrapper */
> +       for (pidx = 0; pidx < tc->peer_cnt; pidx++) {
> +               tc->peers[pidx].inmw_cnt = ntb_mw_count(tc->ntb, pidx);
> +               tc->peers[pidx].inmws =
> +                       devm_kcalloc(&tc->ntb->dev, tc->peers[pidx].inmw_cnt,
> +                                   sizeof(*tc->peers[pidx].inmws), GFP_KERNEL);
> +               if (tc->peers[pidx].inmws == NULL)
> +                       return -ENOMEM;
> +
> +               for (widx = 0; widx < tc->peers[pidx].inmw_cnt; widx++) {
> +                       tc->peers[pidx].inmws[widx].widx = widx;
> +                       tc->peers[pidx].inmws[widx].pidx = pidx;
> +                       tc->peers[pidx].inmws[widx].tc = tc;
> +               }
> +
> +               tc->peers[pidx].outmw_cnt = ntb_peer_mw_count(tc->ntb);
> +               tc->peers[pidx].outmws =
> +                       devm_kcalloc(&tc->ntb->dev, tc->peers[pidx].outmw_cnt,
> +                                  sizeof(*tc->peers[pidx].outmws), GFP_KERNEL);
> +
> +               for (widx = 0; widx < tc->peers[pidx].outmw_cnt; widx++) {
> +                       tc->peers[pidx].outmws[widx].pidx = pidx;
> +                       tc->peers[pidx].outmws[widx].mw = &tc->outmws[widx];
> +               }
> +       }
>
>         return 0;
>  }
>
> -static void tool_free_mws(struct tool_ctx *tc)
> +static void tool_clear_mws(struct tool_ctx *tc)
>  {
> -       int i;
> +       int widx, pidx;
>
> -       for (i = 0; i < tc->mw_count; i++) {
> -               tool_free_mw(tc, i);
> +       /* Free outbound memory windows */
> +       for (widx = 0; widx < tc->outmw_cnt; widx++)
> +               tool_free_peer_mw(tc, widx);
>
> -               if (tc->mws[i].local)
> -                       iounmap(tc->mws[i].local);
> +       /* Free outbound memory windows */
> +       for (pidx = 0; pidx < tc->peer_cnt; pidx++)
> +               for (widx = 0; widx < tc->peers[pidx].inmw_cnt; widx++)
> +                       tool_free_mw(tc, pidx, widx);
> +}
>
> -               tc->mws[i].local = NULL;
> -       }
> +/*==============================================================================
> + *                       Doorbell read/write methods
> + *==============================================================================
> + */
> +
> +static ssize_t tool_db_read(struct file *filep, char __user *ubuf,
> +                           size_t size, loff_t *offp)
> +{
> +       struct tool_ctx *tc = filep->private_data;
> +
> +       return tool_fn_read(tc, ubuf, size, offp, tc->ntb->ops->db_read);
>  }
>
> -static void tool_setup_dbgfs(struct tool_ctx *tc)
> +static ssize_t tool_db_write(struct file *filep, const char __user *ubuf,
> +                            size_t size, loff_t *offp)
>  {
> -       int i;
> +       struct tool_ctx *tc = filep->private_data;
>
> -       /* This modules is useless without dbgfs... */
> -       if (!tool_dbgfs) {
> -               tc->dbgfs = NULL;
> -               return;
> +       return tool_fn_write(tc, ubuf, size, offp, tc->ntb->ops->db_set,
> +                            tc->ntb->ops->db_clear);
> +}
> +
> +static TOOL_FOPS_RDWR(tool_db_fops,
> +                     tool_db_read,
> +                     tool_db_write);
> +
> +static ssize_t tool_db_valid_mask_read(struct file *filep, char __user *ubuf,
> +                                      size_t size, loff_t *offp)
> +{
> +       struct tool_ctx *tc = filep->private_data;
> +
> +       return tool_fn_read(tc, ubuf, size, offp, tc->ntb->ops->db_valid_mask);
> +}
> +
> +static TOOL_FOPS_RDWR(tool_db_valid_mask_fops,
> +                     tool_db_valid_mask_read,
> +                     NULL);
> +
> +static ssize_t tool_db_mask_read(struct file *filep, char __user *ubuf,
> +                                size_t size, loff_t *offp)
> +{
> +       struct tool_ctx *tc = filep->private_data;
> +
> +       return tool_fn_read(tc, ubuf, size, offp, tc->ntb->ops->db_read_mask);
> +}
> +
> +static ssize_t tool_db_mask_write(struct file *filep, const char __user *ubuf,
> +                              size_t size, loff_t *offp)
> +{
> +       struct tool_ctx *tc = filep->private_data;
> +
> +       return tool_fn_write(tc, ubuf, size, offp, tc->ntb->ops->db_set_mask,
> +                            tc->ntb->ops->db_clear_mask);
> +}
> +
> +static TOOL_FOPS_RDWR(tool_db_mask_fops,
> +                     tool_db_mask_read,
> +                     tool_db_mask_write);
> +
> +static ssize_t tool_peer_db_read(struct file *filep, char __user *ubuf,
> +                                size_t size, loff_t *offp)
> +{
> +       struct tool_ctx *tc = filep->private_data;
> +
> +       return tool_fn_read(tc, ubuf, size, offp, tc->ntb->ops->peer_db_read);
> +}
> +
> +static ssize_t tool_peer_db_write(struct file *filep, const char __user *ubuf,
> +                                 size_t size, loff_t *offp)
> +{
> +       struct tool_ctx *tc = filep->private_data;
> +
> +       return tool_fn_write(tc, ubuf, size, offp, tc->ntb->ops->peer_db_set,
> +                            tc->ntb->ops->peer_db_clear);
> +}
> +
> +static TOOL_FOPS_RDWR(tool_peer_db_fops,
> +                     tool_peer_db_read,
> +                     tool_peer_db_write);
> +
> +static ssize_t tool_peer_db_mask_read(struct file *filep, char __user *ubuf,
> +                                  size_t size, loff_t *offp)
> +{
> +       struct tool_ctx *tc = filep->private_data;
> +
> +       return tool_fn_read(tc, ubuf, size, offp,
> +                           tc->ntb->ops->peer_db_read_mask);
> +}
> +
> +static ssize_t tool_peer_db_mask_write(struct file *filep,
> +                                      const char __user *ubuf,
> +                                      size_t size, loff_t *offp)
> +{
> +       struct tool_ctx *tc = filep->private_data;
> +
> +       return tool_fn_write(tc, ubuf, size, offp,
> +                            tc->ntb->ops->peer_db_set_mask,
> +                            tc->ntb->ops->peer_db_clear_mask);
> +}
> +
> +static TOOL_FOPS_RDWR(tool_peer_db_mask_fops,
> +                     tool_peer_db_mask_read,
> +                     tool_peer_db_mask_write);
> +
> +static ssize_t tool_db_event_write(struct file *filep,
> +                                  const char __user *ubuf,
> +                                  size_t size, loff_t *offp)
> +{
> +       struct tool_ctx *tc = filep->private_data;
> +       u64 val;
> +       int ret;
> +
> +       ret = kstrtou64_from_user(ubuf, size, 0, &val);
> +       if (ret)
> +               return ret;
> +
> +       if (wait_event_interruptible(tc->db_wq, ntb_db_read(tc->ntb) == val))
> +               return -ERESTART;
> +
> +       return size;
> +}
> +
> +static TOOL_FOPS_RDWR(tool_db_event_fops,
> +                     NULL,
> +                     tool_db_event_write);
> +
> +/*==============================================================================
> + *                       Scratchpads read/write methods
> + *==============================================================================
> + */
> +
> +static ssize_t tool_spad_read(struct file *filep, char __user *ubuf,
> +                             size_t size, loff_t *offp)
> +{
> +       struct tool_spad *spad = filep->private_data;
> +       char buf[32];
> +       ssize_t pos;
> +
> +       if (!spad->tc->ntb->ops->spad_read)
> +               return -EINVAL;
> +
> +       pos = scnprintf(buf, sizeof(buf), "%#x\n",
> +               ntb_spad_read(spad->tc->ntb, spad->sidx));
> +
> +       return simple_read_from_buffer(ubuf, size, offp, buf, pos);
> +}
> +
> +static ssize_t tool_spad_write(struct file *filep, const char __user *ubuf,
> +                              size_t size, loff_t *offp)
> +{
> +       struct tool_spad *spad = filep->private_data;
> +       u32 val;
> +       int ret;
> +
> +       if (!spad->tc->ntb->ops->spad_write) {
> +               dev_dbg(&spad->tc->ntb->dev, "no spad write fn\n");
> +               return -EINVAL;
>         }
>
> -       tc->dbgfs = debugfs_create_dir(dev_name(&tc->ntb->dev),
> -                                      tool_dbgfs);
> -       if (!tc->dbgfs)
> -               return;
> +       ret = kstrtou32_from_user(ubuf, size, 0, &val);
> +       if (ret)
> +               return ret;
>
> -       debugfs_create_file("db", S_IRUSR | S_IWUSR, tc->dbgfs,
> -                           tc, &tool_db_fops);
> +       ret = ntb_spad_write(spad->tc->ntb, spad->sidx, val);
>
> -       debugfs_create_file("mask", S_IRUSR | S_IWUSR, tc->dbgfs,
> -                           tc, &tool_mask_fops);
> +       return ret ?: size;
> +}
>
> -       debugfs_create_file("peer_db", S_IRUSR | S_IWUSR, tc->dbgfs,
> -                           tc, &tool_peer_db_fops);
> +static TOOL_FOPS_RDWR(tool_spad_fops,
> +                     tool_spad_read,
> +                     tool_spad_write);
>
> -       debugfs_create_file("peer_mask", S_IRUSR | S_IWUSR, tc->dbgfs,
> -                           tc, &tool_peer_mask_fops);
> +static ssize_t tool_peer_spad_read(struct file *filep, char __user *ubuf,
> +                                  size_t size, loff_t *offp)
> +{
> +       struct tool_spad *spad = filep->private_data;
> +       char buf[32];
> +       ssize_t pos;
>
> -       debugfs_create_file("spad", S_IRUSR | S_IWUSR, tc->dbgfs,
> -                           tc, &tool_spad_fops);
> +       if (!spad->tc->ntb->ops->peer_spad_read)
> +               return -EINVAL;
>
> -       debugfs_create_file("peer_spad", S_IRUSR | S_IWUSR, tc->dbgfs,
> -                           tc, &tool_peer_spad_fops);
> +       pos = scnprintf(buf, sizeof(buf), "%#x\n",
> +               ntb_peer_spad_read(spad->tc->ntb, spad->pidx, spad->sidx));
>
> -       debugfs_create_file("link", S_IRUSR | S_IWUSR, tc->dbgfs,
> -                           tc, &tool_link_fops);
> +       return simple_read_from_buffer(ubuf, size, offp, buf, pos);
> +}
> +
> +static ssize_t tool_peer_spad_write(struct file *filep, const char __user *ubuf,
> +                                   size_t size, loff_t *offp)
> +{
> +       struct tool_spad *spad = filep->private_data;
> +       u32 val;
> +       int ret;
> +
> +       if (!spad->tc->ntb->ops->peer_spad_write) {
> +               dev_dbg(&spad->tc->ntb->dev, "no spad write fn\n");
> +               return -EINVAL;
> +       }
> +
> +       ret = kstrtou32_from_user(ubuf, size, 0, &val);
> +       if (ret)
> +               return ret;
>
> -       debugfs_create_file("link_event", S_IWUSR, tc->dbgfs,
> -                           tc, &tool_link_event_fops);
> +       ret = ntb_peer_spad_write(spad->tc->ntb, spad->pidx, spad->sidx, val);
>
> -       for (i = 0; i < tc->mw_count; i++) {
> -               char buf[30];
> +       return ret ?: size;
> +}
> +
> +static TOOL_FOPS_RDWR(tool_peer_spad_fops,
> +                     tool_peer_spad_read,
> +                     tool_peer_spad_write);
>
> -               snprintf(buf, sizeof(buf), "mw%d", i);
> -               debugfs_create_file(buf, S_IRUSR | S_IWUSR, tc->dbgfs,
> -                                   &tc->mws[i], &tool_mw_fops);
> +static int tool_init_spads(struct tool_ctx *tc)
> +{
> +       int sidx, pidx;
>
> -               snprintf(buf, sizeof(buf), "peer_trans%d", i);
> -               debugfs_create_file(buf, S_IRUSR | S_IWUSR, tc->dbgfs,
> -                                   &tc->mws[i], &tool_peer_mw_trans_fops);
> +       /* Initialize inbound scratchpad structures */
> +       tc->inspad_cnt = ntb_spad_count(tc->ntb);
> +       tc->inspads = devm_kcalloc(&tc->ntb->dev, tc->inspad_cnt,
> +                                  sizeof(*tc->inspads), GFP_KERNEL);
> +       if (tc->inspads == NULL)
> +               return -ENOMEM;
> +
> +       for (sidx = 0; sidx < tc->inspad_cnt; sidx++) {
> +               tc->inspads[sidx].sidx = sidx;
> +               tc->inspads[sidx].pidx = -1;
> +               tc->inspads[sidx].tc = tc;
>         }
> +
> +       /* Initialize outbound scratchpad structures */
> +       for (pidx = 0; pidx < tc->peer_cnt; pidx++) {
> +               tc->peers[pidx].outspad_cnt = ntb_spad_count(tc->ntb);
> +               tc->peers[pidx].outspads =
> +                       devm_kcalloc(&tc->ntb->dev, tc->peers[pidx].outspad_cnt,
> +                               sizeof(*tc->peers[pidx].outspads), GFP_KERNEL);
> +               if (tc->peers[pidx].outspads == NULL)
> +                       return -ENOMEM;
> +
> +               for (sidx = 0; sidx < tc->peers[pidx].outspad_cnt; sidx++) {
> +                       tc->peers[pidx].outspads[sidx].sidx = sidx;
> +                       tc->peers[pidx].outspads[sidx].pidx = pidx;
> +                       tc->peers[pidx].outspads[sidx].tc = tc;
> +               }
> +       }
> +
> +       return 0;
>  }
>
> -static int tool_probe(struct ntb_client *self, struct ntb_dev *ntb)
> +/*==============================================================================
> + *                       Messages read/write methods
> + *==============================================================================
> + */
> +
> +static ssize_t tool_inmsg_read(struct file *filep, char __user *ubuf,
> +                              size_t size, loff_t *offp)
>  {
> -       struct tool_ctx *tc;
> -       int rc;
> -       int i;
> +       struct tool_msg *msg = filep->private_data;
> +       char buf[32];
> +       ssize_t pos;
> +       u32 data;
> +       int pidx;
> +
> +       data = ntb_msg_read(msg->tc->ntb, &pidx, msg->midx);
> +
> +       pos = scnprintf(buf, sizeof(buf), "0x%08x<-%d\n", data, pidx);
> +
> +       return simple_read_from_buffer(ubuf, size, offp, buf, pos);
> +}
> +
> +static TOOL_FOPS_RDWR(tool_inmsg_fops,
> +                     tool_inmsg_read,
> +                     NULL);
> +
> +static ssize_t tool_outmsg_write(struct file *filep,
> +                                const char __user *ubuf,
> +                                size_t size, loff_t *offp)
> +{
> +       struct tool_msg *msg = filep->private_data;
> +       u32 val;
> +       int ret;
> +
> +       ret = kstrtou32_from_user(ubuf, size, 0, &val);
> +       if (ret)
> +               return ret;
> +
> +       ret = ntb_peer_msg_write(msg->tc->ntb, msg->pidx, msg->midx, val);
> +
> +       return ret ? : size;
> +}
> +
> +static TOOL_FOPS_RDWR(tool_outmsg_fops,
> +                     NULL,
> +                     tool_outmsg_write);
> +
> +static ssize_t tool_msg_sts_read(struct file *filep, char __user *ubuf,
> +                                size_t size, loff_t *offp)
> +{
> +       struct tool_ctx *tc = filep->private_data;
> +
> +       return tool_fn_read(tc, ubuf, size, offp, tc->ntb->ops->msg_read_sts);
> +}
> +
> +static ssize_t tool_msg_sts_write(struct file *filep, const char __user *ubuf,
> +                                 size_t size, loff_t *offp)
> +{
> +       struct tool_ctx *tc = filep->private_data;
> +
> +       return tool_fn_write(tc, ubuf, size, offp, NULL,
> +                            tc->ntb->ops->msg_clear_sts);
> +}
> +
> +static TOOL_FOPS_RDWR(tool_msg_sts_fops,
> +                     tool_msg_sts_read,
> +                     tool_msg_sts_write);
> +
> +static ssize_t tool_msg_inbits_read(struct file *filep, char __user *ubuf,
> +                                   size_t size, loff_t *offp)
> +{
> +       struct tool_ctx *tc = filep->private_data;
> +
> +       return tool_fn_read(tc, ubuf, size, offp, tc->ntb->ops->msg_inbits);
> +}
> +
> +static TOOL_FOPS_RDWR(tool_msg_inbits_fops,
> +                     tool_msg_inbits_read,
> +                     NULL);
> +
> +static ssize_t tool_msg_outbits_read(struct file *filep, char __user *ubuf,
> +                                    size_t size, loff_t *offp)
> +{
> +       struct tool_ctx *tc = filep->private_data;
> +
> +       return tool_fn_read(tc, ubuf, size, offp, tc->ntb->ops->msg_outbits);
> +}
> +
> +static TOOL_FOPS_RDWR(tool_msg_outbits_fops,
> +                     tool_msg_outbits_read,
> +                     NULL);
> +
> +static ssize_t tool_msg_mask_write(struct file *filep, const char __user *ubuf,
> +                                  size_t size, loff_t *offp)
> +{
> +       struct tool_ctx *tc = filep->private_data;
> +
> +       return tool_fn_write(tc, ubuf, size, offp,
> +                            tc->ntb->ops->msg_set_mask,
> +                            tc->ntb->ops->msg_clear_mask);
> +}
> +
> +static TOOL_FOPS_RDWR(tool_msg_mask_fops,
> +                     NULL,
> +                     tool_msg_mask_write);
> +
> +static ssize_t tool_msg_event_write(struct file *filep,
> +                                   const char __user *ubuf,
> +                                   size_t size, loff_t *offp)
> +{
> +       struct tool_ctx *tc = filep->private_data;
> +       u64 val;
> +       int ret;
> +
> +       ret = kstrtou64_from_user(ubuf, size, 0, &val);
> +       if (ret)
> +               return ret;
> +
> +       if (wait_event_interruptible(tc->msg_wq,
> +               ntb_msg_read_sts(tc->ntb) == val))
> +               return -ERESTART;
> +
> +       return size;
> +}
> +
> +static TOOL_FOPS_RDWR(tool_msg_event_fops,
> +                     NULL,
> +                     tool_msg_event_write);
>
> -       if (!ntb->ops->mw_set_trans) {
> -               dev_dbg(&ntb->dev, "need inbound MW based NTB API\n");
> -               rc = -EINVAL;
> -               goto err_tc;
> +static int tool_init_msgs(struct tool_ctx *tc)
> +{
> +       int midx, pidx;
> +
> +       /* Initialize inbound message structures */
> +       tc->inmsg_cnt = ntb_msg_count(tc->ntb);
> +       tc->inmsgs = devm_kcalloc(&tc->ntb->dev, tc->inmsg_cnt,
> +                                  sizeof(*tc->inmsgs), GFP_KERNEL);
> +       if (tc->inmsgs == NULL)
> +               return -ENOMEM;
> +
> +       for (midx = 0; midx < tc->inmsg_cnt; midx++) {
> +               tc->inmsgs[midx].midx = midx;
> +               tc->inmsgs[midx].pidx = -1;
> +               tc->inmsgs[midx].tc = tc;
>         }
>
> -       if (ntb_spad_count(ntb) < 1) {
> -               dev_dbg(&ntb->dev, "no enough scratchpads\n");
> -               rc = -EINVAL;
> -               goto err_tc;
> +       /* Initialize outbound message structures */
> +       for (pidx = 0; pidx < tc->peer_cnt; pidx++) {
> +               tc->peers[pidx].outmsg_cnt = ntb_msg_count(tc->ntb);
> +               tc->peers[pidx].outmsgs =
> +                       devm_kcalloc(&tc->ntb->dev, tc->peers[pidx].outmsg_cnt,
> +                               sizeof(*tc->peers[pidx].outmsgs), GFP_KERNEL);
> +               if (tc->peers[pidx].outmsgs == NULL)
> +                       return -ENOMEM;
> +
> +               for (midx = 0; midx < tc->peers[pidx].outmsg_cnt; midx++) {
> +                       tc->peers[pidx].outmsgs[midx].midx = midx;
> +                       tc->peers[pidx].outmsgs[midx].pidx = pidx;
> +                       tc->peers[pidx].outmsgs[midx].tc = tc;
> +               }
>         }
>
> +       return 0;
> +}
> +
> +/*==============================================================================
> + *                          Initialization methods
> + *==============================================================================
> + */
> +
> +static struct tool_ctx *tool_create_data(struct ntb_dev *ntb)
> +{
> +       struct tool_ctx *tc;
> +
> +       tc = devm_kzalloc(&ntb->dev, sizeof(*tc), GFP_KERNEL);
> +       if (tc == NULL)
> +               return ERR_PTR(-ENOMEM);
> +
> +       tc->ntb = ntb;
> +       init_waitqueue_head(&tc->link_wq);
> +       init_waitqueue_head(&tc->db_wq);
> +       init_waitqueue_head(&tc->msg_wq);
> +
>         if (ntb_db_is_unsafe(ntb))
>                 dev_dbg(&ntb->dev, "doorbell is unsafe\n");
>
>         if (ntb_spad_is_unsafe(ntb))
>                 dev_dbg(&ntb->dev, "scratchpad is unsafe\n");
>
> -       if (ntb_peer_port_count(ntb) != NTB_DEF_PEER_CNT)
> -               dev_warn(&ntb->dev, "multi-port NTB is unsupported\n");
> +       return tc;
> +}
> +
> +static void tool_clear_data(struct tool_ctx *tc)
> +{
> +       wake_up(&tc->link_wq);
> +       wake_up(&tc->db_wq);
> +       wake_up(&tc->msg_wq);
> +}
> +
> +static int tool_init_ntb(struct tool_ctx *tc)
> +{
> +       return ntb_set_ctx(tc->ntb, tc, &tool_ops);
> +}
> +
> +static void tool_clear_ntb(struct tool_ctx *tc)
> +{
> +       ntb_clear_ctx(tc->ntb);
> +       ntb_link_disable(tc->ntb);
> +}
>
> -       tc = kzalloc(sizeof(*tc), GFP_KERNEL);
> -       if (!tc) {
> -               rc = -ENOMEM;
> -               goto err_tc;
> +static void tool_setup_dbgfs(struct tool_ctx *tc)
> +{
> +       int pidx, widx, sidx, midx;
> +       char buf[30];
> +
> +       /* This modules is useless without dbgfs... */
> +       if (!tool_dbgfs_topdir) {
> +               tc->dbgfs_dir = NULL;
> +               return;
>         }
>
> -       tc->ntb = ntb;
> -       init_waitqueue_head(&tc->link_wq);
> +       tc->dbgfs_dir = debugfs_create_dir(dev_name(&tc->ntb->dev),
> +                                          tool_dbgfs_topdir);
> +       if (!tc->dbgfs_dir)
> +               return;
>
> -       tc->mw_count = min(ntb_peer_mw_count(tc->ntb), MAX_MWS);
> -       for (i = 0; i < tc->mw_count; i++) {
> -               rc = tool_init_mw(tc, i);
> -               if (rc)
> -                       goto err_ctx;
> +       debugfs_create_file("port", 0600, tc->dbgfs_dir,
> +                           tc, &tool_port_fops);
> +
> +       debugfs_create_file("link", 0600, tc->dbgfs_dir,
> +                           tc, &tool_link_fops);
> +
> +       debugfs_create_file("db", 0600, tc->dbgfs_dir,
> +                           tc, &tool_db_fops);
> +
> +       debugfs_create_file("db_valid_mask", 0600, tc->dbgfs_dir,
> +                           tc, &tool_db_valid_mask_fops);
> +
> +       debugfs_create_file("db_mask", 0600, tc->dbgfs_dir,
> +                           tc, &tool_db_mask_fops);
> +
> +       debugfs_create_file("db_event", 0600, tc->dbgfs_dir,
> +                           tc, &tool_db_event_fops);
> +
> +       debugfs_create_file("peer_db", 0600, tc->dbgfs_dir,
> +                           tc, &tool_peer_db_fops);
> +
> +       debugfs_create_file("peer_db_mask", 0600, tc->dbgfs_dir,
> +                           tc, &tool_peer_db_mask_fops);
> +
> +       if (tc->inspad_cnt != 0) {
> +               for (sidx = 0; sidx < tc->inspad_cnt; sidx++) {
> +                       snprintf(buf, sizeof(buf), "spad%d", sidx);
> +
> +                       debugfs_create_file(buf, 0600, tc->dbgfs_dir,
> +                                          &tc->inspads[sidx], &tool_spad_fops);
> +               }
>         }
>
> -       tool_setup_dbgfs(tc);
> +       if (tc->inmsg_cnt != 0) {
> +               for (midx = 0; midx < tc->inmsg_cnt; midx++) {
> +                       snprintf(buf, sizeof(buf), "msg%d", midx);
> +                       debugfs_create_file(buf, 0600, tc->dbgfs_dir,
> +                                          &tc->inmsgs[midx], &tool_inmsg_fops);
> +               }
> +
> +               debugfs_create_file("msg_sts", 0600, tc->dbgfs_dir,
> +                                   tc, &tool_msg_sts_fops);
> +
> +               debugfs_create_file("msg_inbits", 0600, tc->dbgfs_dir,
> +                                   tc, &tool_msg_inbits_fops);
> +
> +               debugfs_create_file("msg_outbits", 0600, tc->dbgfs_dir,
> +                                   tc, &tool_msg_outbits_fops);
> +
> +               debugfs_create_file("msg_mask", 0600, tc->dbgfs_dir,
> +                                   tc, &tool_msg_mask_fops);
> +
> +               debugfs_create_file("msg_event", 0600, tc->dbgfs_dir,
> +                                   tc, &tool_msg_event_fops);
> +       }
> +
> +       for (pidx = 0; pidx < tc->peer_cnt; pidx++) {
> +               snprintf(buf, sizeof(buf), "peer%d", pidx);
> +               tc->peers[pidx].dbgfs_dir =
> +                       debugfs_create_dir(buf, tc->dbgfs_dir);
> +
> +               debugfs_create_file("port", 0600,
> +                                   tc->peers[pidx].dbgfs_dir,
> +                                   &tc->peers[pidx], &tool_peer_port_fops);
> +
> +               debugfs_create_file("link", 0200,
> +                                   tc->peers[pidx].dbgfs_dir,
> +                                   &tc->peers[pidx], &tool_peer_link_fops);
> +
> +               debugfs_create_file("link_event", 0200,
> +                                 tc->peers[pidx].dbgfs_dir,
> +                                 &tc->peers[pidx], &tool_peer_link_event_fops);
> +
> +               for (widx = 0; widx < tc->peers[pidx].inmw_cnt; widx++) {
> +                       snprintf(buf, sizeof(buf), "mw_trans%d", widx);
> +                       debugfs_create_file(buf, 0600,
> +                                           tc->peers[pidx].dbgfs_dir,
> +                                           &tc->peers[pidx].inmws[widx],
> +                                           &tool_mw_trans_fops);
> +               }
> +
> +               for (widx = 0; widx < tc->peers[pidx].outmw_cnt; widx++) {
> +                       snprintf(buf, sizeof(buf), "peer_mw_trans%d", widx);
> +                       debugfs_create_file(buf, 0600,
> +                                           tc->peers[pidx].dbgfs_dir,
> +                                           &tc->peers[pidx].outmws[widx],
> +                                           &tool_peer_mw_trans_fops);
> +               }
> +
> +               for (sidx = 0; sidx < tc->peers[pidx].outspad_cnt; sidx++) {
> +                       snprintf(buf, sizeof(buf), "spad%d", sidx);
> +
> +                       debugfs_create_file(buf, 0600,
> +                                           tc->peers[pidx].dbgfs_dir,
> +                                           &tc->peers[pidx].outspads[sidx],
> +                                           &tool_peer_spad_fops);
> +               }
> +
> +               for (midx = 0; midx < tc->peers[pidx].outmsg_cnt; midx++) {
> +                       snprintf(buf, sizeof(buf), "msg%d", midx);
> +                       debugfs_create_file(buf, 0600,
> +                                           tc->peers[pidx].dbgfs_dir,
> +                                           &tc->peers[pidx].outmsgs[midx],
> +                                           &tool_outmsg_fops);
> +               }
> +       }
> +}
> +
> +static void tool_clear_dbgfs(struct tool_ctx *tc)
> +{
> +       debugfs_remove_recursive(tc->dbgfs_dir);
> +}
> +
> +static int tool_probe(struct ntb_client *self, struct ntb_dev *ntb)
> +{
> +       struct tool_ctx *tc;
> +       int ret;
>
> -       rc = ntb_set_ctx(ntb, tc, &tool_ops);
> -       if (rc)
> -               goto err_ctx;
> +       tc = tool_create_data(ntb);
> +       if (IS_ERR(tc))
> +               return PTR_ERR(tc);
>
> -       ntb_link_enable(ntb, NTB_SPEED_AUTO, NTB_WIDTH_AUTO);
> -       ntb_link_event(ntb);
> +       ret = tool_init_peers(tc);
> +       if (ret != 0)
> +               goto err_clear_data;
> +
> +       ret = tool_init_mws(tc);
> +       if (ret != 0)
> +               goto err_clear_data;
> +
> +       ret = tool_init_spads(tc);
> +       if (ret != 0)
> +               goto err_clear_mws;
> +
> +       ret = tool_init_msgs(tc);
> +       if (ret != 0)
> +               goto err_clear_mws;
> +
> +       ret = tool_init_ntb(tc);
> +       if (ret != 0)
> +               goto err_clear_mws;
> +
> +       tool_setup_dbgfs(tc);
>
>         return 0;
>
> -err_ctx:
> -       tool_free_mws(tc);
> -       debugfs_remove_recursive(tc->dbgfs);
> -       kfree(tc);
> -err_tc:
> -       return rc;
> +err_clear_mws:
> +       tool_clear_mws(tc);
> +
> +err_clear_data:
> +       tool_clear_data(tc);
> +
> +       return ret;
>  }
>
>  static void tool_remove(struct ntb_client *self, struct ntb_dev *ntb)
>  {
>         struct tool_ctx *tc = ntb->ctx;
>
> -       tool_free_mws(tc);
> +       tool_clear_dbgfs(tc);
> +
> +       tool_clear_ntb(tc);
>
> -       ntb_clear_ctx(ntb);
> -       ntb_link_disable(ntb);
> +       tool_clear_mws(tc);
>
> -       debugfs_remove_recursive(tc->dbgfs);
> -       kfree(tc);
> +       tool_clear_data(tc);
>  }
>
>  static struct ntb_client tool_client = {
>         .ops = {
>                 .probe = tool_probe,
>                 .remove = tool_remove,
> -       },
> +       }
>  };
>
>  static int __init tool_init(void)
>  {
> -       int rc;
> +       int ret;
>
>         if (debugfs_initialized())
> -               tool_dbgfs = debugfs_create_dir(KBUILD_MODNAME, NULL);
> -
> -       rc = ntb_register_client(&tool_client);
> -       if (rc)
> -               goto err_client;
> +               tool_dbgfs_topdir = debugfs_create_dir(KBUILD_MODNAME, NULL);
>
> -       return 0;
> +       ret = ntb_register_client(&tool_client);
> +       if (ret)
> +               debugfs_remove_recursive(tool_dbgfs_topdir);
>
> -err_client:
> -       debugfs_remove_recursive(tool_dbgfs);
> -       return rc;
> +       return ret;
>  }
>  module_init(tool_init);
>
>  static void __exit tool_exit(void)
>  {
>         ntb_unregister_client(&tool_client);
> -       debugfs_remove_recursive(tool_dbgfs);
> +       debugfs_remove_recursive(tool_dbgfs_topdir);
>  }
>  module_exit(tool_exit);
> +
> --
> 2.12.0
>

Re: [PATCH v2 05/15] NTB: ntb_tool: Add full multi-port NTB API support

[Logan Gunthorpe]

On 05/12/17 11:03 AM, Jon Mason wrote:
>> +static ssize_t tool_fn_read(struct tool_ctx *tc, char __user *ubuf,
>> +                           size_t size, loff_t *offp,
>> +                           u64 (*fn_read)(struct ntb_dev *))
>>   {
>>          size_t buf_size;
>> -       char *buf;
>> -       ssize_t pos, rc;
>> +       char buf[32];
> 
> I would think you would want the malloc like before, but if not then
> make this a #define and reference it as necessary throughout the code.

I disagree. Allocating a small 32-byte buf on the stack is a nice 
cleanup. I'm not sure what you are referring to about the #define.

Logan

Re: [PATCH v2 05/15] NTB: ntb_tool: Add full multi-port NTB API support

[Serge Semin]

On Tue, Dec 05, 2017 at 01:03:25PM -0500, Jon Mason <jdmason@kudzu.us> wrote:
> On Sun, Dec 3, 2017 at 2:17 PM, Serge Semin <fancer.lancer@gmail.com> wrote:
> > NTB API has been updated to support multi-port devices like IDT
> > 89HPESx series or Microsemi Switchtec. Message registers
> > functionality has also been added to new API. In order to keep
> > the new hardware and corresponding capabilities well tested, NTB
> > tool driver is accordingly altered.
> >
> > Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
> > ---
> >
> > Changelog v1:
> > - Alter interface in compliance with multi-port API
> > - Move Message/MW/Port/Link settings to a specific directory
> >
> > Changelog v2:
> > - Remove driver Author/Description/License macros
> > - Return error if ntb_mw_get_align called while link is down
> > - Add db_valid_mask DebugFS file
> > - Add msg_inbits/msg_outbits DebugFS files
> >
> >  drivers/ntb/test/ntb_tool.c | 1805 +++++++++++++++++++++++++++++--------------
> >  1 file changed, 1228 insertions(+), 577 deletions(-)
> >
> > diff --git a/drivers/ntb/test/ntb_tool.c b/drivers/ntb/test/ntb_tool.c
> > index 91526a986caa..e3fbc5944679 100644
> > --- a/drivers/ntb/test/ntb_tool.c
> > +++ b/drivers/ntb/test/ntb_tool.c
> > @@ -5,6 +5,7 @@
> >   *   GPL LICENSE SUMMARY
> >   *
> >   *   Copyright (C) 2015 EMC Corporation. All Rights Reserved.
> > + *   Copyright (C) 2017 T-Platforms All Rights Reserved.
> >   *
> >   *   This program is free software; you can redistribute it and/or modify
> >   *   it under the terms of version 2 of the GNU General Public License as
> > @@ -18,6 +19,7 @@
> >   *   BSD LICENSE
> >   *
> >   *   Copyright (C) 2015 EMC Corporation. All Rights Reserved.
> > + *   Copyright (C) 2017 T-Platforms All Rights Reserved.
> >   *
> >   *   Redistribution and use in source and binary forms, with or without
> >   *   modification, are permitted provided that the following conditions
> > @@ -49,6 +51,7 @@
> >   *
> >   * Contact Information:
> >   * Allen Hubbe <Allen.Hubbe@emc.com>
> > + * Serge Semin <fancer.lancer@gmail.com>, <Sergey.Semin@t-platforms.ru>
> >   */
> >
> >  /*
> > @@ -56,42 +59,125 @@
> >   *
> >   * Assuming $DBG_DIR is something like:
> >   * '/sys/kernel/debug/ntb_tool/0000:00:03.0'
> > + * Suppose aside from local device there is at least one remote device
> > + * connected to NTB with index 0.
> > + *-----------------------------------------------------------------------------
> > + * Eg: check local/peer device information.
> >   *
> > - * Eg: check if clearing the doorbell mask generates an interrupt.
> > + * # Get local device port number
> > + * root@self# cat $DBG_DIR/port
> >   *
> > - * # Check the link status
> > - * root@self# cat $DBG_DIR/link
> > + * # Check local device functionality
> > + * root@self# ls $DBG_DIR
> > + * db            msg1          msg_sts     peer4/        port
> > + * db_event      msg2          peer0/      peer5/        spad0
> > + * db_mask       msg3          peer1/      peer_db       spad1
> > + * link          msg_event     peer2/      peer_db_mask  spad2
> > + * msg0          msg_mask      peer3/      peer_spad     spad3
> > + * # As one can see it supports:
> > + * # 1) four inbound message registers
> > + * # 2) four inbound scratchpads
> > + * # 3) up to six peer devices
> >   *
> > - * # Block until the link is up
> > - * root@self# echo Y > $DBG_DIR/link_event
> > + * # Check peer device port number
> > + * root@self# cat $DBG_DIR/peer0/port
> >   *
> > - * # Set the doorbell mask
> > - * root@self# echo 's 1' > $DBG_DIR/mask
> > + * # Check peer device(s) functionality to be used
> > + * root@self# ls $DBG_DIR/peer0
> > + * link             mw_trans0       mw_trans6        port
> > + * link_event       mw_trans1       mw_trans7        spad0
> > + * msg0             mw_trans2       peer_mw_trans0   spad1
> > + * msg1             mw_trans3       peer_mw_trans1   spad2
> > + * msg2             mw_trans4       peer_mw_trans2   spad3
> > + * msg3             mw_trans5       peer_mw_trans3
> > + * # As one can see we got:
> > + * # 1) four outbound message registers
> > + * # 2) four outbound scratchpads
> > + * # 3) eight inbound memory windows
> > + * # 4) four outbound memory windows
> > + *-----------------------------------------------------------------------------
> > + * Eg: NTB link tests
> >   *
> > - * # Ring the doorbell from the peer
> > + * # Set local link up/down
> > + * root@self# echo Y > $DBG_DIR/link
> > + * root@self# echo N > $DBG_DIR/link
> > + *
> > + * # Check if link with peer device is up/down:
> > + * root@self# cat $DBG_DIR/peer0/link
> > + *
> > + * # Block until the link is up/down
> > + * root@self# echo Y > $DBG_DIR/peer0/link_event
> > + * root@self# echo N > $DBG_DIR/peer0/link_event
> > + *-----------------------------------------------------------------------------
> > + * Eg: Doorbell registers tests (some functionality might be absent)
> > + *
> > + * # Set/clear/get local doorbell
> > + * root@self# echo 's 1' > $DBG_DIR/db
> > + * root@self# echo 'c 1' > $DBG_DIR/db
> > + * root@self# cat  $DBG_DIR/db
> > + *
> > + * # Set/clear/get local doorbell mask
> > + * root@self# echo 's 1' > $DBG_DIR/db_mask
> > + * root@self# echo 'c 1' > $DBG_DIR/db_mask
> > + * root@self# cat $DBG_DIR/db_mask
> > + *
> > + * # Ring/clear/get peer doorbell
> >   * root@peer# echo 's 1' > $DBG_DIR/peer_db
> > + * root@peer# echo 'c 1' > $DBG_DIR/peer_db
> > + * root@peer# cat $DBG_DIR/peer_db
> > + *
> > + * # Set/clear/get peer doorbell mask
> > + * root@self# echo 's 1' > $DBG_DIR/peer_db_mask
> > + * root@self# echo 'c 1' > $DBG_DIR/peer_db_mask
> > + * root@self# cat $DBG_DIR/peer_db_mask
> > + *
> > + * # Block until local doorbell is set with specified value
> > + * root@self# echo 1 > $DBG_DIR/db_event
> > + *-----------------------------------------------------------------------------
> > + * Eg: Message registers tests (functionality might be absent)
> > + *
> > + * # Set/clear/get in/out message registers status
> > + * root@self# echo 's 1' > $DBG_DIR/msg_sts
> > + * root@self# echo 'c 1' > $DBG_DIR/msg_sts
> > + * root@self# cat $DBG_DIR/msg_sts
> >   *
> > - * # Clear the doorbell mask
> > - * root@self# echo 'c 1' > $DBG_DIR/mask
> > + * # Set/clear in/out message registers mask
> > + * root@self# echo 's 1' > $DBG_DIR/msg_mask
> > + * root@self# echo 'c 1' > $DBG_DIR/msg_mask
> >   *
> > - * Observe debugging output in dmesg or your console.  You should see a
> > - * doorbell event triggered by clearing the mask.  If not, this may indicate an
> > - * issue with the hardware that needs to be worked around in the driver.
> > + * # Get inbound message register #0 value and source of port index
> > + * root@self# cat  $DBG_DIR/msg0
> >   *
> > - * Eg: read and write scratchpad registers
> > + * # Send some data to peer over outbound message register #0
> > + * root@self# echo 0x01020304 > $DBG_DIR/peer0/msg0
> > + *-----------------------------------------------------------------------------
> > + * Eg: Scratchpad registers tests (functionality might be absent)
> >   *
> > - * root@peer# echo '0 0x01010101 1 0x7f7f7f7f' > $DBG_DIR/peer_spad
> > + * # Write/read to/from local scratchpad register #0
> > + * root@peer# echo 0x01020304 > $DBG_DIR/spad0
> > + * root@peer# cat $DBG_DIR/spad0
> >   *
> > - * root@self# cat $DBG_DIR/spad
> > + * # Write/read to/from peer scratchpad register #0
> > + * root@peer# echo 0x01020304 > $DBG_DIR/peer0/spad0
> > + * root@peer# cat $DBG_DIR/peer0/spad0
> > + *-----------------------------------------------------------------------------
> > + * Eg: Memory windows tests
> >   *
> > - * Observe that spad 0 and 1 have the values set by the peer.
> > + * # Create inbound memory window buffer of specified size/get its base address
> > + * root@peer# echo 16384 > $DBG_DIR/peer0/mw_trans0
> > + * root@peer# cat $DBG_DIR/peer0/mw_trans0
> >   *
> > - * # Check the memory window translation info
> > - * cat $DBG_DIR/peer_trans0
> > + * # Write/read data to/from inbound memory window
> > + * root@peer# echo Hello > $DBG_DIR/peer0/mw0
> > + * root@peer# head -c 7 $DBG_DIR/peer0/mw0
> >   *
> > - * # Setup a 16k memory window buffer
> > - * echo 16384 > $DBG_DIR/peer_trans0
> > + * # Map outbound memory window/check it settings (on peer device)
> > + * root@peer# echo 0xADD0BA5E:16384 > $DBG_DIR/peer0/peer_mw_trans0
> > + * root@peer# cat $DBG_DIR/peer0/peer_mw_trans0
> >   *
> > + * # Write/read data to/from outbound memory window (on peer device)
> > + * root@peer# echo olleH > $DBG_DIR/peer0/peer_mw0
> > + * root@peer# head -c 7 $DBG_DIR/peer0/peer_mw0
> >   */
> >
> >  #include <linux/init.h>
> > @@ -106,49 +192,77 @@
> >
> >  #include <linux/ntb.h>
> >
> > -#define DRIVER_NAME                    "ntb_tool"
> > -#define DRIVER_DESCRIPTION             "PCIe NTB Debugging Tool"
> > +#define DRIVER_NAME            "ntb_tool"
> > +#define DRIVER_VERSION         "2.0"
> >
> > -#define DRIVER_LICENSE                 "Dual BSD/GPL"
> > -#define DRIVER_VERSION                 "1.0"
> > -#define DRIVER_RELDATE                 "22 April 2015"
> > -#define DRIVER_AUTHOR                  "Allen Hubbe <Allen.Hubbe@emc.com>"
> > -
> > -MODULE_LICENSE(DRIVER_LICENSE);
> > +MODULE_LICENSE("Dual BSD/GPL");
> >  MODULE_VERSION(DRIVER_VERSION);
> > -MODULE_AUTHOR(DRIVER_AUTHOR);
> > -MODULE_DESCRIPTION(DRIVER_DESCRIPTION);
> > -
> > -/* It is rare to have hadrware with greater than six MWs */
> > -#define MAX_MWS        6
> > -/* Only two-ports devices are supported */
> > -#define PIDX   NTB_DEF_PEER_IDX
> > -
> > -static struct dentry *tool_dbgfs;
> > +MODULE_AUTHOR("Allen Hubbe <Allen.Hubbe@emc.com>");
> > +MODULE_DESCRIPTION("PCIe NTB Debugging Tool");
> >
> >  struct tool_mw {
> > -       int idx;
> > +       int widx;
> > +       int pidx;
> >         struct tool_ctx *tc;
> > -       resource_size_t win_size;
> > +       union {
> > +               u8 *mm_base;
> > +               u8 __iomem *io_base;
> > +       };
> > +       union {
> > +               dma_addr_t dma_base;
> > +               u64 tr_base;
> > +       };
> >         resource_size_t size;
> > -       u8 __iomem *local;
> > -       u8 *peer;
> > -       dma_addr_t peer_dma;
> > -       struct dentry *peer_dbg_file;
> > +       struct dentry *dbgfs_file;
> > +};
> > +
> > +struct tool_mw_wrap {
> > +       int pidx;
> > +       struct tool_mw *mw;
> > +};
> > +
> > +struct tool_msg {
> > +       int midx;
> > +       int pidx;
> > +       struct tool_ctx *tc;
> > +};
> > +
> > +struct tool_spad {
> > +       int sidx;
> > +       int pidx;
> > +       struct tool_ctx *tc;
> > +};
> > +
> > +struct tool_peer {
> > +       int pidx;
> > +       struct tool_ctx *tc;
> > +       int inmw_cnt;
> > +       struct tool_mw *inmws;
> > +       int outmw_cnt;
> > +       struct tool_mw_wrap *outmws;
> > +       int outmsg_cnt;
> > +       struct tool_msg *outmsgs;
> > +       int outspad_cnt;
> > +       struct tool_spad *outspads;
> > +       struct dentry *dbgfs_dir;
> >  };
> >
> >  struct tool_ctx {
> >         struct ntb_dev *ntb;
> > -       struct dentry *dbgfs;
> >         wait_queue_head_t link_wq;
> > -       int mw_count;
> > -       struct tool_mw mws[MAX_MWS];
> > +       wait_queue_head_t db_wq;
> > +       wait_queue_head_t msg_wq;
> > +       int outmw_cnt;
> > +       struct tool_mw *outmws;
> > +       int peer_cnt;
> > +       struct tool_peer *peers;
> > +       int inmsg_cnt;
> > +       struct tool_msg *inmsgs;
> > +       int inspad_cnt;
> > +       struct tool_spad *inspads;
> > +       struct dentry *dbgfs_dir;
> >  };
> >
> > -#define SPAD_FNAME_SIZE 0x10
> > -#define INT_PTR(x) ((void *)(unsigned long)x)
> > -#define PTR_INT(x) ((int)(unsigned long)x)
> > -
> >  #define TOOL_FOPS_RDWR(__name, __read, __write) \
> >         const struct file_operations __name = { \
> >                 .owner = THIS_MODULE,           \
> > @@ -157,6 +271,13 @@ struct tool_ctx {
> >                 .write = __write,               \
> >         }
> >
> > +static struct dentry *tool_dbgfs_topdir;
> > +
> > +/*==============================================================================
> > + *                               NTB events handlers
> > + *==============================================================================
> > + */
> > +
> >  static void tool_link_event(void *ctx)
> >  {
> >         struct tool_ctx *tc = ctx;
> > @@ -182,580 +303,576 @@ static void tool_db_event(void *ctx, int vec)
> >
> >         dev_dbg(&tc->ntb->dev, "doorbell vec %d mask %#llx bits %#llx\n",
> >                 vec, db_mask, db_bits);
> > +
> > +       wake_up(&tc->db_wq);
> > +}
> > +
> > +static void tool_msg_event(void *ctx)
> > +{
> > +       struct tool_ctx *tc = ctx;
> > +       u64 msg_sts;
> > +
> > +       msg_sts = ntb_msg_read_sts(tc->ntb);
> > +
> > +       dev_dbg(&tc->ntb->dev, "message bits %#llx\n", msg_sts);
> > +
> > +       wake_up(&tc->msg_wq);
> >  }
> >
> >  static const struct ntb_ctx_ops tool_ops = {
> >         .link_event = tool_link_event,
> >         .db_event = tool_db_event,
> > +       .msg_event = tool_msg_event
> >  };
> >
> > -static ssize_t tool_dbfn_read(struct tool_ctx *tc, char __user *ubuf,
> > -                             size_t size, loff_t *offp,
> > -                             u64 (*db_read_fn)(struct ntb_dev *))
> > +/*==============================================================================
> > + *                        Common read/write methods
> > + *==============================================================================
> > + */
> > +
> > +static ssize_t tool_fn_read(struct tool_ctx *tc, char __user *ubuf,
> > +                           size_t size, loff_t *offp,
> > +                           u64 (*fn_read)(struct ntb_dev *))
> >  {
> >         size_t buf_size;
> > -       char *buf;
> > -       ssize_t pos, rc;
> > +       char buf[32];
> 
> I would think you would want the malloc like before, but if not then
> make this a #define and reference it as necessary throughout the code.
> 

Agreed. I'll replace it with macro.

> > +       ssize_t pos;
> >
> > -       if (!db_read_fn)
> > +       if (!fn_read)
> >                 return -EINVAL;
> >
> > -       buf_size = min_t(size_t, size, 0x20);
> > -
> > -       buf = kmalloc(buf_size, GFP_KERNEL);
> > -       if (!buf)
> > -               return -ENOMEM;
> > -
> > -       pos = scnprintf(buf, buf_size, "%#llx\n",
> > -                       db_read_fn(tc->ntb));
> > -
> > -       rc = simple_read_from_buffer(ubuf, size, offp, buf, pos);
> > +       buf_size = min(size, sizeof(buf));
> >
> > -       kfree(buf);
> > +       pos = scnprintf(buf, buf_size, "%#llx\n", fn_read(tc->ntb));
> >
> > -       return rc;
> > +       return simple_read_from_buffer(ubuf, size, offp, buf, pos);
> >  }
> >
> > -static ssize_t tool_dbfn_write(struct tool_ctx *tc,
> > -                              const char __user *ubuf,
> > -                              size_t size, loff_t *offp,
> > -                              int (*db_set_fn)(struct ntb_dev *, u64),
> > -                              int (*db_clear_fn)(struct ntb_dev *, u64))
> > +static ssize_t tool_fn_write(struct tool_ctx *tc,
> > +                            const char __user *ubuf,
> > +                            size_t size, loff_t *offp,
> > +                            int (*fn_set)(struct ntb_dev *, u64),
> > +                            int (*fn_clear)(struct ntb_dev *, u64))
> >  {
> > -       u64 db_bits;
> >         char *buf, cmd;
> > -       ssize_t rc;
> > +       ssize_t ret;
> > +       u64 bits;
> >         int n;
> >
> >         buf = kmalloc(size + 1, GFP_KERNEL);
> >         if (!buf)
> >                 return -ENOMEM;
> >
> > -       rc = simple_write_to_buffer(buf, size, offp, ubuf, size);
> > -       if (rc < 0) {
> > +       ret = simple_write_to_buffer(buf, size, offp, ubuf, size);
> > +       if (ret < 0) {
> >                 kfree(buf);
> > -               return rc;
> > +               return ret;
> >         }
> >
> >         buf[size] = 0;
> >
> > -       n = sscanf(buf, "%c %lli", &cmd, &db_bits);
> > +       n = sscanf(buf, "%c %lli", &cmd, &bits);
> >
> >         kfree(buf);
> >
> >         if (n != 2) {
> > -               rc = -EINVAL;
> > +               ret = -EINVAL;
> >         } else if (cmd == 's') {
> > -               if (!db_set_fn)
> > -                       rc = -EINVAL;
> > +               if (!fn_set)
> > +                       ret = -EINVAL;
> >                 else
> > -                       rc = db_set_fn(tc->ntb, db_bits);
> > +                       ret = fn_set(tc->ntb, bits);
> >         } else if (cmd == 'c') {
> > -               if (!db_clear_fn)
> > -                       rc = -EINVAL;
> > +               if (!fn_clear)
> > +                       ret = -EINVAL;
> >                 else
> > -                       rc = db_clear_fn(tc->ntb, db_bits);
> > +                       ret = fn_clear(tc->ntb, bits);
> >         } else {
> > -               rc = -EINVAL;
> > +               ret = -EINVAL;
> >         }
> >
> > -       return rc ? : size;
> > +       return ret ? : size;
> >  }
> >
> > -static ssize_t tool_spadfn_read(struct tool_ctx *tc, char __user *ubuf,
> > -                               size_t size, loff_t *offp,
> > -                               u32 (*spad_read_fn)(struct ntb_dev *, int))
> > -{
> > -       size_t buf_size;
> > -       char *buf;
> > -       ssize_t pos, rc;
> > -       int i, spad_count;
> > -
> > -       if (!spad_read_fn)
> > -               return -EINVAL;
> > -
> > -       spad_count = ntb_spad_count(tc->ntb);
> > +/*==============================================================================
> > + *                            Port read/write methods
> > + *==============================================================================
> > + */
> >
> > -       /*
> > -        * We multiply the number of spads by 15 to get the buffer size
> > -        * this is from 3 for the %d, 10 for the largest hex value
> > -        * (0x00000000) and 2 for the tab and line feed.
> > -        */
> > -       buf_size = min_t(size_t, size, spad_count * 15);
> > +static ssize_t tool_port_read(struct file *filep, char __user *ubuf,
> > +                             size_t size, loff_t *offp)
> > +{
> > +       struct tool_ctx *tc = filep->private_data;
> > +       char buf[32];
> > +       int pos;
> >
> > -       buf = kmalloc(buf_size, GFP_KERNEL);
> > -       if (!buf)
> > -               return -ENOMEM;
> > +       pos = scnprintf(buf, sizeof(buf), "%d\n", ntb_port_number(tc->ntb));
> >
> > -       pos = 0;
> > +       return simple_read_from_buffer(ubuf, size, offp, buf, pos);
> > +}
> >
> > -       for (i = 0; i < spad_count; ++i) {
> > -               pos += scnprintf(buf + pos, buf_size - pos, "%d\t%#x\n",
> > -                                i, spad_read_fn(tc->ntb, i));
> > -       }
> > +static TOOL_FOPS_RDWR(tool_port_fops,
> > +                     tool_port_read,
> > +                     NULL);
> >
> > -       rc = simple_read_from_buffer(ubuf, size, offp, buf, pos);
> > +static ssize_t tool_peer_port_read(struct file *filep, char __user *ubuf,
> > +                                  size_t size, loff_t *offp)
> > +{
> > +       struct tool_peer *peer = filep->private_data;
> > +       struct tool_ctx *tc = peer->tc;
> > +       char buf[32];
> > +       int pos;
> >
> > -       kfree(buf);
> > +       pos = scnprintf(buf, sizeof(buf), "%d\n",
> > +               ntb_peer_port_number(tc->ntb, peer->pidx));
> >
> > -       return rc;
> > +       return simple_read_from_buffer(ubuf, size, offp, buf, pos);
> >  }
> >
> > -static ssize_t tool_spadfn_write(struct tool_ctx *tc,
> > -                                const char __user *ubuf,
> > -                                size_t size, loff_t *offp,
> > -                                int (*spad_write_fn)(struct ntb_dev *,
> > -                                                     int, u32))
> > +static TOOL_FOPS_RDWR(tool_peer_port_fops,
> > +                     tool_peer_port_read,
> > +                     NULL);
> > +
> > +static int tool_init_peers(struct tool_ctx *tc)
> >  {
> > -       int spad_idx;
> > -       u32 spad_val;
> > -       char *buf, *buf_ptr;
> > -       int pos, n;
> > -       ssize_t rc;
> > -
> > -       if (!spad_write_fn) {
> > -               dev_dbg(&tc->ntb->dev, "no spad write fn\n");
> > -               return -EINVAL;
> > -       }
> > +       int pidx;
> >
> > -       buf = kmalloc(size + 1, GFP_KERNEL);
> > -       if (!buf)
> > +       tc->peer_cnt = ntb_peer_port_count(tc->ntb);
> > +       tc->peers = devm_kcalloc(&tc->ntb->dev, tc->peer_cnt,
> > +                                sizeof(*tc->peers), GFP_KERNEL);
> > +       if (tc->peers == NULL)
> >                 return -ENOMEM;
> >
> > -       rc = simple_write_to_buffer(buf, size, offp, ubuf, size);
> > -       if (rc < 0) {
> > -               kfree(buf);
> > -               return rc;
> > -       }
> > -
> > -       buf[size] = 0;
> > -       buf_ptr = buf;
> > -       n = sscanf(buf_ptr, "%d %i%n", &spad_idx, &spad_val, &pos);
> > -       while (n == 2) {
> > -               buf_ptr += pos;
> > -               rc = spad_write_fn(tc->ntb, spad_idx, spad_val);
> > -               if (rc)
> > -                       break;
> > -
> > -               n = sscanf(buf_ptr, "%d %i%n", &spad_idx, &spad_val, &pos);
> > +       for (pidx = 0; pidx < tc->peer_cnt; pidx++) {
> > +               tc->peers[pidx].pidx = pidx;
> > +               tc->peers[pidx].tc = tc;
> >         }
> >
> > -       if (n < 0)
> > -               rc = n;
> > -
> > -       kfree(buf);
> > -
> > -       return rc ? : size;
> > +       return 0;
> >  }
> >
> > -static ssize_t tool_db_read(struct file *filep, char __user *ubuf,
> > -                           size_t size, loff_t *offp)
> > -{
> > -       struct tool_ctx *tc = filep->private_data;
> > -
> > -       return tool_dbfn_read(tc, ubuf, size, offp,
> > -                             tc->ntb->ops->db_read);
> > -}
> > +/*==============================================================================
> > + *                       Link state read/write methods
> > + *==============================================================================
> > + */
> >
> > -static ssize_t tool_db_write(struct file *filep, const char __user *ubuf,
> > -                            size_t size, loff_t *offp)
> > +static ssize_t tool_link_write(struct file *filep, const char __user *ubuf,
> > +                              size_t size, loff_t *offp)
> >  {
> >         struct tool_ctx *tc = filep->private_data;
> > +       bool val;
> > +       int ret;
> >
> > -       return tool_dbfn_write(tc, ubuf, size, offp,
> > -                              tc->ntb->ops->db_set,
> > -                              tc->ntb->ops->db_clear);
> > -}
> > +       ret = kstrtobool_from_user(ubuf, size, &val);
> > +       if (ret)
> > +               return ret;
> >
> > -static TOOL_FOPS_RDWR(tool_db_fops,
> > -                     tool_db_read,
> > -                     tool_db_write);
> > +       if (val)
> > +               ret = ntb_link_enable(tc->ntb, NTB_SPEED_AUTO, NTB_WIDTH_AUTO);
> > +       else
> > +               ret = ntb_link_disable(tc->ntb);
> >
> > -static ssize_t tool_mask_read(struct file *filep, char __user *ubuf,
> > -                             size_t size, loff_t *offp)
> > -{
> > -       struct tool_ctx *tc = filep->private_data;
> > +       if (ret)
> > +               return ret;
> >
> > -       return tool_dbfn_read(tc, ubuf, size, offp,
> > -                             tc->ntb->ops->db_read_mask);
> > +       return size;
> >  }
> >
> > -static ssize_t tool_mask_write(struct file *filep, const char __user *ubuf,
> > -                              size_t size, loff_t *offp)
> > +static TOOL_FOPS_RDWR(tool_link_fops,
> > +                     NULL,
> > +                     tool_link_write);
> > +
> > +static ssize_t tool_peer_link_read(struct file *filep, char __user *ubuf,
> > +                                  size_t size, loff_t *offp)
> >  {
> > -       struct tool_ctx *tc = filep->private_data;
> > +       struct tool_peer *peer = filep->private_data;
> > +       struct tool_ctx *tc = peer->tc;
> > +       char buf[3];
> > +
> > +       if (ntb_link_is_up(tc->ntb, NULL, NULL) & BIT(peer->pidx))
> > +               buf[0] = 'Y';
> > +       else
> > +               buf[0] = 'N';
> > +       buf[1] = '\n';
> > +       buf[2] = '\0';
> >
> > -       return tool_dbfn_write(tc, ubuf, size, offp,
> > -                              tc->ntb->ops->db_set_mask,
> > -                              tc->ntb->ops->db_clear_mask);
> > +       return simple_read_from_buffer(ubuf, size, offp, buf, 3);
> >  }
> >
> > -static TOOL_FOPS_RDWR(tool_mask_fops,
> > -                     tool_mask_read,
> > -                     tool_mask_write);
> > +static TOOL_FOPS_RDWR(tool_peer_link_fops,
> > +                     tool_peer_link_read,
> > +                     NULL);
> >
> > -static ssize_t tool_peer_db_read(struct file *filep, char __user *ubuf,
> > -                                size_t size, loff_t *offp)
> > +static ssize_t tool_peer_link_event_write(struct file *filep,
> > +                                         const char __user *ubuf,
> > +                                         size_t size, loff_t *offp)
> >  {
> > -       struct tool_ctx *tc = filep->private_data;
> > +       struct tool_peer *peer = filep->private_data;
> > +       struct tool_ctx *tc = peer->tc;
> > +       u64 link_msk;
> > +       bool val;
> > +       int ret;
> >
> > -       return tool_dbfn_read(tc, ubuf, size, offp,
> > -                             tc->ntb->ops->peer_db_read);
> > -}
> > +       ret = kstrtobool_from_user(ubuf, size, &val);
> > +       if (ret)
> > +               return ret;
> >
> > -static ssize_t tool_peer_db_write(struct file *filep, const char __user *ubuf,
> > -                                 size_t size, loff_t *offp)
> > -{
> > -       struct tool_ctx *tc = filep->private_data;
> > +       link_msk = BIT_ULL_MASK(peer->pidx);
> > +
> > +       if (wait_event_interruptible(tc->link_wq,
> > +               !!(ntb_link_is_up(tc->ntb, NULL, NULL) & link_msk) == val))
> > +               return -ERESTART;
> >
> > -       return tool_dbfn_write(tc, ubuf, size, offp,
> > -                              tc->ntb->ops->peer_db_set,
> > -                              tc->ntb->ops->peer_db_clear);
> > +       return size;
> >  }
> >
> > -static TOOL_FOPS_RDWR(tool_peer_db_fops,
> > -                     tool_peer_db_read,
> > -                     tool_peer_db_write);
> > +static TOOL_FOPS_RDWR(tool_peer_link_event_fops,
> > +                     NULL,
> > +                     tool_peer_link_event_write);
> >
> > -static ssize_t tool_peer_mask_read(struct file *filep, char __user *ubuf,
> > -                                  size_t size, loff_t *offp)
> > +/*==============================================================================
> > + *                  Memory windows read/write/setting methods
> > + *==============================================================================
> > + */
> > +
> > +static ssize_t tool_mw_read(struct file *filep, char __user *ubuf,
> > +                           size_t size, loff_t *offp)
> >  {
> > -       struct tool_ctx *tc = filep->private_data;
> > +       struct tool_mw *inmw = filep->private_data;
> >
> > -       return tool_dbfn_read(tc, ubuf, size, offp,
> > -                             tc->ntb->ops->peer_db_read_mask);
> > +       if (inmw->mm_base == NULL)
> > +               return -ENXIO;
> > +
> > +       return simple_read_from_buffer(ubuf, size, offp,
> > +                                      inmw->mm_base, inmw->size);
> >  }
> >
> > -static ssize_t tool_peer_mask_write(struct file *filep, const char __user *ubuf,
> > -                                   size_t size, loff_t *offp)
> > +static ssize_t tool_mw_write(struct file *filep, const char __user *ubuf,
> > +                            size_t size, loff_t *offp)
> >  {
> > -       struct tool_ctx *tc = filep->private_data;
> > +       struct tool_mw *inmw = filep->private_data;
> > +
> > +       if (inmw->mm_base == NULL)
> > +               return -ENXIO;
> >
> > -       return tool_dbfn_write(tc, ubuf, size, offp,
> > -                              tc->ntb->ops->peer_db_set_mask,
> > -                              tc->ntb->ops->peer_db_clear_mask);
> > +       return simple_write_to_buffer(inmw->mm_base, inmw->size, offp,
> > +                                     ubuf, size);
> >  }
> >
> > -static TOOL_FOPS_RDWR(tool_peer_mask_fops,
> > -                     tool_peer_mask_read,
> > -                     tool_peer_mask_write);
> > +static TOOL_FOPS_RDWR(tool_mw_fops,
> > +                     tool_mw_read,
> > +                     tool_mw_write);
> >
> > -static ssize_t tool_spad_read(struct file *filep, char __user *ubuf,
> > -                             size_t size, loff_t *offp)
> > +static int tool_setup_mw(struct tool_ctx *tc, int pidx, int widx,
> > +                        size_t req_size)
> >  {
> > -       struct tool_ctx *tc = filep->private_data;
> > +       resource_size_t size, addr_align, size_align;
> > +       struct tool_mw *inmw = &tc->peers[pidx].inmws[widx];
> > +       char buf[16];
> > +       int ret;
> >
> > -       return tool_spadfn_read(tc, ubuf, size, offp,
> > -                               tc->ntb->ops->spad_read);
> > -}
> > +       if (inmw->mm_base != NULL)
> > +               return 0;
> >
> > -static ssize_t tool_spad_write(struct file *filep, const char __user *ubuf,
> > -                              size_t size, loff_t *offp)
> > -{
> > -       struct tool_ctx *tc = filep->private_data;
> > +       ret = ntb_mw_get_align(tc->ntb, pidx, widx, &addr_align,
> > +                               &size_align, &size);
> > +       if (ret)
> > +               return ret;
> > +
> > +       inmw->size = min_t(resource_size_t, req_size, size);
> > +       inmw->size = round_up(inmw->size, addr_align);
> > +       inmw->size = round_up(inmw->size, size_align);
> > +       inmw->mm_base = dma_alloc_coherent(&tc->ntb->dev, inmw->size,
> > +                                          &inmw->dma_base, GFP_KERNEL);
> > +       if (!inmw->mm_base)
> > +               return -ENOMEM;
> >
> > -       return tool_spadfn_write(tc, ubuf, size, offp,
> > -                                tc->ntb->ops->spad_write);
> > -}
> > +       if (!IS_ALIGNED(inmw->dma_base, addr_align)) {
> > +               ret = -ENOMEM;
> > +               goto err_free_dma;
> > +       }
> >
> > -static TOOL_FOPS_RDWR(tool_spad_fops,
> > -                     tool_spad_read,
> > -                     tool_spad_write);
> > +       ret = ntb_mw_set_trans(tc->ntb, pidx, widx, inmw->dma_base, inmw->size);
> > +       if (ret)
> > +               goto err_free_dma;
> >
> > -static u32 ntb_tool_peer_spad_read(struct ntb_dev *ntb, int sidx)
> > -{
> > -       return ntb_peer_spad_read(ntb, PIDX, sidx);
> > -}
> > +       snprintf(buf, sizeof(buf), "mw%d", widx);
> > +       inmw->dbgfs_file = debugfs_create_file(buf, 0600,
> > +                                              tc->peers[pidx].dbgfs_dir, inmw,
> > +                                              &tool_mw_fops);
> >
> > -static ssize_t tool_peer_spad_read(struct file *filep, char __user *ubuf,
> > -                                  size_t size, loff_t *offp)
> > -{
> > -       struct tool_ctx *tc = filep->private_data;
> > +       return 0;
> >
> > -       return tool_spadfn_read(tc, ubuf, size, offp, ntb_tool_peer_spad_read);
> > -}
> > +err_free_dma:
> > +       dma_free_coherent(&tc->ntb->dev, inmw->size, inmw->mm_base,
> > +                         inmw->dma_base);
> > +       inmw->mm_base = NULL;
> > +       inmw->dma_base = 0;
> > +       inmw->size = 0;
> >
> > -static int ntb_tool_peer_spad_write(struct ntb_dev *ntb, int sidx, u32 val)
> > -{
> > -       return ntb_peer_spad_write(ntb, PIDX, sidx, val);
> > +       return ret;
> >  }
> >
> > -static ssize_t tool_peer_spad_write(struct file *filep, const char __user *ubuf,
> > -                                   size_t size, loff_t *offp)
> > +static void tool_free_mw(struct tool_ctx *tc, int pidx, int widx)
> >  {
> > -       struct tool_ctx *tc = filep->private_data;
> > -
> > -       return tool_spadfn_write(tc, ubuf, size, offp,
> > -                                ntb_tool_peer_spad_write);
> > -}
> > -
> > -static TOOL_FOPS_RDWR(tool_peer_spad_fops,
> > -                     tool_peer_spad_read,
> > -                     tool_peer_spad_write);
> > +       struct tool_mw *inmw = &tc->peers[pidx].inmws[widx];
> >
> > -static ssize_t tool_link_read(struct file *filep, char __user *ubuf,
> > -                             size_t size, loff_t *offp)
> > -{
> > -       struct tool_ctx *tc = filep->private_data;
> > -       char buf[3];
> > +       debugfs_remove(inmw->dbgfs_file);
> >
> > -       buf[0] = ntb_link_is_up(tc->ntb, NULL, NULL) ? 'Y' : 'N';
> > -       buf[1] = '\n';
> > -       buf[2] = '\0';
> > +       if (inmw->mm_base != NULL) {
> > +               ntb_mw_clear_trans(tc->ntb, pidx, widx);
> > +               dma_free_coherent(&tc->ntb->dev, inmw->size,
> > +                                 inmw->mm_base, inmw->dma_base);
> > +       }
> >
> > -       return simple_read_from_buffer(ubuf, size, offp, buf, 2);
> > +       inmw->mm_base = NULL;
> > +       inmw->dma_base = 0;
> > +       inmw->size = 0;
> > +       inmw->dbgfs_file = NULL;
> >  }
> >
> > -static ssize_t tool_link_write(struct file *filep, const char __user *ubuf,
> > -                              size_t size, loff_t *offp)
> > +static ssize_t tool_mw_trans_read(struct file *filep, char __user *ubuf,
> > +                                 size_t size, loff_t *offp)
> >  {
> > -       struct tool_ctx *tc = filep->private_data;
> > -       char buf[32];
> > +       struct tool_mw *inmw = filep->private_data;
> > +       resource_size_t addr_align;
> > +       resource_size_t size_align;
> > +       resource_size_t size_max;
> > +       ssize_t ret, off = 0;
> >         size_t buf_size;
> > -       bool val;
> > -       int rc;
> > +       char *buf;
> >
> > -       buf_size = min(size, (sizeof(buf) - 1));
> > -       if (copy_from_user(buf, ubuf, buf_size))
> > -               return -EFAULT;
> > +       buf_size = min_t(size_t, size, 512);
> >
> > -       buf[buf_size] = '\0';
> > +       buf = kmalloc(buf_size, GFP_KERNEL);
> > +       if (!buf)
> > +               return -ENOMEM;
> >
> > -       rc = strtobool(buf, &val);
> > -       if (rc)
> > -               return rc;
> > +       ret = ntb_mw_get_align(inmw->tc->ntb, inmw->pidx, inmw->widx,
> > +                              &addr_align, &size_align, &size_max);
> > +       if (ret)
> > +               return ret;
> >
> > -       if (val)
> > -               rc = ntb_link_enable(tc->ntb, NTB_SPEED_AUTO, NTB_WIDTH_AUTO);
> > -       else
> > -               rc = ntb_link_disable(tc->ntb);
> > +       off += scnprintf(buf + off, buf_size - off,
> > +                        "Inbound MW     \t%d\n",
> > +                        inmw->widx);
> >
> > -       if (rc)
> > -               return rc;
> > +       off += scnprintf(buf + off, buf_size - off,
> > +                        "Port           \t%d (%d)\n",
> > +                        ntb_peer_port_number(inmw->tc->ntb, inmw->pidx),
> > +                        inmw->pidx);
> >
> > -       return size;
> > -}
> > +       off += scnprintf(buf + off, buf_size - off,
> > +                        "Window Address \t0x%pK\n", inmw->mm_base);
> >
> > -static TOOL_FOPS_RDWR(tool_link_fops,
> > -                     tool_link_read,
> > -                     tool_link_write);
> > +       off += scnprintf(buf + off, buf_size - off,
> > +                        "DMA Address    \t%pad\n",
> > +                        &inmw->dma_base);
> >
> > -static ssize_t tool_link_event_write(struct file *filep,
> > -                                    const char __user *ubuf,
> > -                                    size_t size, loff_t *offp)
> > -{
> > -       struct tool_ctx *tc = filep->private_data;
> > -       char buf[32];
> > -       size_t buf_size;
> > -       bool val;
> > -       int rc;
> > +       off += scnprintf(buf + off, buf_size - off,
> > +                        "Window Size    \t%pa[p]\n",
> > +                        &inmw->size);
> >
> > -       buf_size = min(size, (sizeof(buf) - 1));
> > -       if (copy_from_user(buf, ubuf, buf_size))
> > -               return -EFAULT;
> > +       off += scnprintf(buf + off, buf_size - off,
> > +                        "Alignment      \t%pa[p]\n",
> > +                        &addr_align);
> >
> > -       buf[buf_size] = '\0';
> > +       off += scnprintf(buf + off, buf_size - off,
> > +                        "Size Alignment \t%pa[p]\n",
> > +                        &size_align);
> > +
> > +       off += scnprintf(buf + off, buf_size - off,
> > +                        "Size Max       \t%pa[p]\n",
> > +                        &size_max);
> >
> > -       rc = strtobool(buf, &val);
> > -       if (rc)
> > -               return rc;
> > +       ret = simple_read_from_buffer(ubuf, size, offp, buf, off);
> > +       kfree(buf);
> >
> > -       if (wait_event_interruptible(tc->link_wq,
> > -               ntb_link_is_up(tc->ntb, NULL, NULL) == val))
> > -               return -ERESTART;
> > +       return ret;
> > +}
> > +
> > +static ssize_t tool_mw_trans_write(struct file *filep, const char __user *ubuf,
> > +                                  size_t size, loff_t *offp)
> > +{
> > +       struct tool_mw *inmw = filep->private_data;
> > +       unsigned int val;
> > +       int ret;
> > +
> > +       ret = kstrtouint_from_user(ubuf, size, 0, &val);
> > +       if (ret)
> > +               return ret;
> > +
> > +       tool_free_mw(inmw->tc, inmw->pidx, inmw->widx);
> > +       if (val) {
> > +               ret = tool_setup_mw(inmw->tc, inmw->pidx, inmw->widx, val);
> > +               if (ret)
> > +                       return ret;
> > +       }
> >
> >         return size;
> >  }
> >
> > -static TOOL_FOPS_RDWR(tool_link_event_fops,
> > -                     NULL,
> > -                     tool_link_event_write);
> > +static TOOL_FOPS_RDWR(tool_mw_trans_fops,
> > +                     tool_mw_trans_read,
> > +                     tool_mw_trans_write);
> >
> > -static ssize_t tool_mw_read(struct file *filep, char __user *ubuf,
> > -                           size_t size, loff_t *offp)
> > +static ssize_t tool_peer_mw_read(struct file *filep, char __user *ubuf,
> > +                                size_t size, loff_t *offp)
> >  {
> > -       struct tool_mw *mw = filep->private_data;
> > -       ssize_t rc;
> > +       struct tool_mw *outmw = filep->private_data;
> >         loff_t pos = *offp;
> > +       ssize_t ret;
> >         void *buf;
> >
> > -       if (mw->local == NULL)
> > +       if (outmw->io_base == NULL)
> >                 return -EIO;
> > -       if (pos < 0)
> > -               return -EINVAL;
> > -       if (pos >= mw->win_size || !size)
> > +
> > +       if (pos >= outmw->size || !size)
> >                 return 0;
> > -       if (size > mw->win_size - pos)
> > -               size = mw->win_size - pos;
> > +
> > +       if (size > outmw->size - pos)
> > +               size = outmw->size - pos;
> >
> >         buf = kmalloc(size, GFP_KERNEL);
> >         if (!buf)
> >                 return -ENOMEM;
> >
> > -       memcpy_fromio(buf, mw->local + pos, size);
> > -       rc = copy_to_user(ubuf, buf, size);
> > -       if (rc == size) {
> > -               rc = -EFAULT;
> > +       memcpy_fromio(buf, outmw->io_base + pos, size);
> > +       ret = copy_to_user(ubuf, buf, size);
> > +       if (ret == size) {
> > +               ret = -EFAULT;
> >                 goto err_free;
> >         }
> >
> > -       size -= rc;
> > +       size -= ret;
> >         *offp = pos + size;
> > -       rc = size;
> > +       ret = size;
> >
> >  err_free:
> >         kfree(buf);
> >
> > -       return rc;
> > +       return ret;
> >  }
> >
> > -static ssize_t tool_mw_write(struct file *filep, const char __user *ubuf,
> > -                            size_t size, loff_t *offp)
> > +static ssize_t tool_peer_mw_write(struct file *filep, const char __user *ubuf,
> > +                                 size_t size, loff_t *offp)
> >  {
> > -       struct tool_mw *mw = filep->private_data;
> > -       ssize_t rc;
> > +       struct tool_mw *outmw = filep->private_data;
> > +       ssize_t ret;
> >         loff_t pos = *offp;
> >         void *buf;
> >
> > -       if (pos < 0)
> > -               return -EINVAL;
> > -       if (pos >= mw->win_size || !size)
> > +       if (outmw->io_base == NULL)
> > +               return -EIO;
> > +
> > +       if (pos >= outmw->size || !size)
> >                 return 0;
> > -       if (size > mw->win_size - pos)
> > -               size = mw->win_size - pos;
> > +       if (size > outmw->size - pos)
> > +               size = outmw->size - pos;
> >
> >         buf = kmalloc(size, GFP_KERNEL);
> >         if (!buf)
> >                 return -ENOMEM;
> >
> > -       rc = copy_from_user(buf, ubuf, size);
> > -       if (rc == size) {
> > -               rc = -EFAULT;
> > +       ret = copy_from_user(buf, ubuf, size);
> > +       if (ret == size) {
> > +               ret = -EFAULT;
> >                 goto err_free;
> >         }
> >
> > -       size -= rc;
> > +       size -= ret;
> >         *offp = pos + size;
> > -       rc = size;
> > +       ret = size;
> >
> > -       memcpy_toio(mw->local + pos, buf, size);
> > +       memcpy_toio(outmw->io_base + pos, buf, size);
> >
> >  err_free:
> >         kfree(buf);
> >
> > -       return rc;
> > -}
> > -
> > -static TOOL_FOPS_RDWR(tool_mw_fops,
> > -                     tool_mw_read,
> > -                     tool_mw_write);
> > -
> > -static ssize_t tool_peer_mw_read(struct file *filep, char __user *ubuf,
> > -                                size_t size, loff_t *offp)
> > -{
> > -       struct tool_mw *mw = filep->private_data;
> > -
> > -       if (!mw->peer)
> > -               return -ENXIO;
> > -
> > -       return simple_read_from_buffer(ubuf, size, offp, mw->peer, mw->size);
> > -}
> > -
> > -static ssize_t tool_peer_mw_write(struct file *filep, const char __user *ubuf,
> > -                                 size_t size, loff_t *offp)
> > -{
> > -       struct tool_mw *mw = filep->private_data;
> > -
> > -       if (!mw->peer)
> > -               return -ENXIO;
> > -
> > -       return simple_write_to_buffer(mw->peer, mw->size, offp, ubuf, size);
> > +       return ret;
> >  }
> >
> >  static TOOL_FOPS_RDWR(tool_peer_mw_fops,
> >                       tool_peer_mw_read,
> >                       tool_peer_mw_write);
> >
> > -static int tool_setup_mw(struct tool_ctx *tc, int idx, size_t req_size)
> > +static int tool_setup_peer_mw(struct tool_ctx *tc, int pidx, int widx,
> > +                             u64 req_addr, size_t req_size)
> >  {
> > -       int rc;
> > -       struct tool_mw *mw = &tc->mws[idx];
> > -       resource_size_t size, align_addr, align_size;
> > +       struct tool_mw *outmw = &tc->outmws[widx];
> > +       resource_size_t map_size;
> > +       phys_addr_t map_base;
> >         char buf[16];
> > +       int ret;
> >
> > -       if (mw->peer)
> > +       if (outmw->io_base != NULL)
> >                 return 0;
> >
> > -       rc = ntb_mw_get_align(tc->ntb, PIDX, idx, &align_addr,
> > -                               &align_size, &size);
> > -       if (rc)
> > -               return rc;
> > +       ret = ntb_peer_mw_get_addr(tc->ntb, widx, &map_base, &map_size);
> > +       if (ret)
> > +               return ret;
> >
> > -       mw->size = min_t(resource_size_t, req_size, size);
> > -       mw->size = round_up(mw->size, align_addr);
> > -       mw->size = round_up(mw->size, align_size);
> > -       mw->peer = dma_alloc_coherent(&tc->ntb->pdev->dev, mw->size,
> > -                                     &mw->peer_dma, GFP_KERNEL);
> > +       ret = ntb_peer_mw_set_trans(tc->ntb, pidx, widx, req_addr, req_size);
> > +       if (ret)
> > +               return ret;
> >
> > -       if (!mw->peer || !IS_ALIGNED(mw->peer_dma, align_addr))
> > -               return -ENOMEM;
> > +       outmw->io_base = ioremap_wc(map_base, map_size);
> > +       if (outmw->io_base == NULL) {
> > +               ret = -EFAULT;
> > +               goto err_clear_trans;
> > +       }
> >
> > -       rc = ntb_mw_set_trans(tc->ntb, PIDX, idx, mw->peer_dma, mw->size);
> > -       if (rc)
> > -               goto err_free_dma;
> > +       outmw->tr_base = req_addr;
> > +       outmw->size = req_size;
> > +       outmw->pidx = pidx;
> >
> > -       snprintf(buf, sizeof(buf), "peer_mw%d", idx);
> > -       mw->peer_dbg_file = debugfs_create_file(buf, S_IRUSR | S_IWUSR,
> > -                                               mw->tc->dbgfs, mw,
> > -                                               &tool_peer_mw_fops);
> > +       snprintf(buf, sizeof(buf), "peer_mw%d", widx);
> > +       outmw->dbgfs_file = debugfs_create_file(buf, 0600,
> > +                                              tc->peers[pidx].dbgfs_dir, outmw,
> > +                                              &tool_peer_mw_fops);
> >
> >         return 0;
> >
> > -err_free_dma:
> > -       dma_free_coherent(&tc->ntb->pdev->dev, mw->size,
> > -                         mw->peer,
> > -                         mw->peer_dma);
> > -       mw->peer = NULL;
> > -       mw->peer_dma = 0;
> > -       mw->size = 0;
> > -
> > -       return rc;
> > +err_clear_trans:
> > +       ntb_peer_mw_clear_trans(tc->ntb, pidx, widx);
> > +
> > +       return ret;
> >  }
> >
> > -static void tool_free_mw(struct tool_ctx *tc, int idx)
> > +static void tool_free_peer_mw(struct tool_ctx *tc, int widx)
> >  {
> > -       struct tool_mw *mw = &tc->mws[idx];
> > +       struct tool_mw *outmw = &tc->outmws[widx];
> >
> > -       if (mw->peer) {
> > -               ntb_mw_clear_trans(tc->ntb, PIDX, idx);
> > -               dma_free_coherent(&tc->ntb->pdev->dev, mw->size,
> > -                                 mw->peer,
> > -                                 mw->peer_dma);
> > -       }
> > +       debugfs_remove(outmw->dbgfs_file);
> >
> > -       mw->peer = NULL;
> > -       mw->peer_dma = 0;
> > -
> > -       debugfs_remove(mw->peer_dbg_file);
> > +       if (outmw->io_base != NULL) {
> > +               iounmap(tc->outmws[widx].io_base);
> > +               ntb_peer_mw_clear_trans(tc->ntb, outmw->pidx, widx);
> > +       }
> >
> > -       mw->peer_dbg_file = NULL;
> > +       outmw->io_base = NULL;
> > +       outmw->tr_base = 0;
> > +       outmw->size = 0;
> > +       outmw->pidx = -1;
> > +       outmw->dbgfs_file = NULL;
> >  }
> >
> > -static ssize_t tool_peer_mw_trans_read(struct file *filep,
> > -                                      char __user *ubuf,
> > -                                      size_t size, loff_t *offp)
> > +static ssize_t tool_peer_mw_trans_read(struct file *filep, char __user *ubuf,
> > +                                       size_t size, loff_t *offp)
> >  {
> > -       struct tool_mw *mw = filep->private_data;
> > -
> > -       char *buf;
> > +       struct tool_mw_wrap *outmw_wrap = filep->private_data;
> > +       struct tool_mw *outmw = outmw_wrap->mw;
> > +       resource_size_t map_size;
> > +       phys_addr_t map_base;
> > +       ssize_t off = 0;
> >         size_t buf_size;
> > -       ssize_t ret, off = 0;
> > +       char *buf;
> > +       int ret;
> >
> > -       phys_addr_t base;
> > -       resource_size_t mw_size;
> > -       resource_size_t align_addr = 0;
> > -       resource_size_t align_size = 0;
> > -       resource_size_t max_size = 0;
> > +       ret = ntb_peer_mw_get_addr(outmw->tc->ntb, outmw->widx,
> > +                                 &map_base, &map_size);
> > +       if (ret)
> > +               return ret;
> >
> >         buf_size = min_t(size_t, size, 512);
> >
> > @@ -763,43 +880,37 @@ static ssize_t tool_peer_mw_trans_read(struct file *filep,
> >         if (!buf)
> >                 return -ENOMEM;
> >
> > -       ntb_mw_get_align(mw->tc->ntb, PIDX, mw->idx,
> > -                        &align_addr, &align_size, &max_size);
> > -       ntb_peer_mw_get_addr(mw->tc->ntb, mw->idx, &base, &mw_size);
> > -
> >         off += scnprintf(buf + off, buf_size - off,
> > -                        "Peer MW %d Information:\n", mw->idx);
> > +                        "Outbound MW:        \t%d\n", outmw->widx);
> >
> > -       off += scnprintf(buf + off, buf_size - off,
> > -                        "Physical Address      \t%pa[p]\n",
> > -                        &base);
> > -
> > -       off += scnprintf(buf + off, buf_size - off,
> > -                        "Window Size           \t%lld\n",
> > -                        (unsigned long long)mw_size);
> > +       if (outmw->io_base != NULL) {
> > +               off += scnprintf(buf + off, buf_size - off,
> > +                       "Port attached       \t%d (%d)\n",
> > +                       ntb_peer_port_number(outmw->tc->ntb, outmw->pidx),
> > +                       outmw->pidx);
> > +       } else {
> > +               off += scnprintf(buf + off, buf_size - off,
> > +                                "Port attached       \t-1 (-1)\n");
> > +       }
> >
> >         off += scnprintf(buf + off, buf_size - off,
> > -                        "Alignment             \t%lld\n",
> > -                        (unsigned long long)align_addr);
> > +                        "Virtual address     \t0x%pK\n", outmw->io_base);
> >
> >         off += scnprintf(buf + off, buf_size - off,
> > -                        "Size Alignment        \t%lld\n",
> > -                        (unsigned long long)align_size);
> > +                        "Phys Address        \t%pa[p]\n", &map_base);
> >
> >         off += scnprintf(buf + off, buf_size - off,
> > -                        "Size Max              \t%lld\n",
> > -                        (unsigned long long)max_size);
> > +                        "Mapping Size        \t%pa[p]\n", &map_size);
> >
> >         off += scnprintf(buf + off, buf_size - off,
> > -                        "Ready                 \t%c\n",
> > -                        (mw->peer) ? 'Y' : 'N');
> > +                        "Translation Address \t0x%016llx\n", outmw->tr_base);
> >
> >         off += scnprintf(buf + off, buf_size - off,
> > -                        "Allocated Size       \t%zd\n",
> > -                        (mw->peer) ? (size_t)mw->size : 0);
> > +                        "Window Size         \t%pa[p]\n", &outmw->size);
> >
> >         ret = simple_read_from_buffer(ubuf, size, offp, buf, off);
> >         kfree(buf);
> > +
> >         return ret;
> >  }
> >
> > @@ -807,12 +918,12 @@ static ssize_t tool_peer_mw_trans_write(struct file *filep,
> >                                         const char __user *ubuf,
> >                                         size_t size, loff_t *offp)
> >  {
> > -       struct tool_mw *mw = filep->private_data;
> > -
> > +       struct tool_mw_wrap *outmw_wrap = filep->private_data;
> > +       struct tool_mw *outmw = outmw_wrap->mw;
> > +       size_t buf_size, wsize;
> >         char buf[32];
> > -       size_t buf_size;
> > -       unsigned long long val;
> > -       int rc;
> > +       int ret, n;
> > +       u64 addr;
> >
> >         buf_size = min(size, (sizeof(buf) - 1));
> >         if (copy_from_user(buf, ubuf, buf_size))
> > @@ -820,16 +931,17 @@ static ssize_t tool_peer_mw_trans_write(struct file *filep,
> >
> >         buf[buf_size] = '\0';
> >
> > -       rc = kstrtoull(buf, 0, &val);
> > -       if (rc)
> > -               return rc;
> > -
> > -       tool_free_mw(mw->tc, mw->idx);
> > -       if (val)
> > -               rc = tool_setup_mw(mw->tc, mw->idx, val);
> > +       n = sscanf(buf, "%lli:%zi", &addr, &wsize);
> > +       if (n != 2)
> > +               return -EINVAL;
> >
> > -       if (rc)
> > -               return rc;
> > +       tool_free_peer_mw(outmw->tc, outmw->widx);
> > +       if (wsize) {
> > +               ret = tool_setup_peer_mw(outmw->tc, outmw_wrap->pidx,
> > +                                        outmw->widx, addr, wsize);
> > +               if (ret)
> > +                       return ret;
> > +       }
> >
> >         return size;
> >  }
> > @@ -838,195 +950,734 @@ static TOOL_FOPS_RDWR(tool_peer_mw_trans_fops,
> >                       tool_peer_mw_trans_read,
> >                       tool_peer_mw_trans_write);
> >
> > -static int tool_init_mw(struct tool_ctx *tc, int idx)
> > +static int tool_init_mws(struct tool_ctx *tc)
> >  {
> > -       struct tool_mw *mw = &tc->mws[idx];
> > -       phys_addr_t base;
> > -       int rc;
> > -
> > -       rc = ntb_peer_mw_get_addr(tc->ntb, idx, &base, &mw->win_size);
> > -       if (rc)
> > -               return rc;
> > -
> > -       mw->tc = tc;
> > -       mw->idx = idx;
> > -       mw->local = ioremap_wc(base, mw->win_size);
> > -       if (!mw->local)
> > -               return -EFAULT;
> > +       int widx, pidx;
> > +
> > +       /* Initialize outbound memory windows */
> > +       tc->outmw_cnt = ntb_peer_mw_count(tc->ntb);
> > +       tc->outmws = devm_kcalloc(&tc->ntb->dev, tc->outmw_cnt,
> > +                                 sizeof(*tc->outmws), GFP_KERNEL);
> > +       if (tc->outmws == NULL)
> > +               return -ENOMEM;
> > +
> > +       for (widx = 0; widx < tc->outmw_cnt; widx++) {
> > +               tc->outmws[widx].widx = widx;
> > +               tc->outmws[widx].pidx = -1;
> > +               tc->outmws[widx].tc = tc;
> > +       }
> > +
> > +       /* Initialize inbound memory windows and outbound MWs wrapper */
> > +       for (pidx = 0; pidx < tc->peer_cnt; pidx++) {
> > +               tc->peers[pidx].inmw_cnt = ntb_mw_count(tc->ntb, pidx);
> > +               tc->peers[pidx].inmws =
> > +                       devm_kcalloc(&tc->ntb->dev, tc->peers[pidx].inmw_cnt,
> > +                                   sizeof(*tc->peers[pidx].inmws), GFP_KERNEL);
> > +               if (tc->peers[pidx].inmws == NULL)
> > +                       return -ENOMEM;
> > +
> > +               for (widx = 0; widx < tc->peers[pidx].inmw_cnt; widx++) {
> > +                       tc->peers[pidx].inmws[widx].widx = widx;
> > +                       tc->peers[pidx].inmws[widx].pidx = pidx;
> > +                       tc->peers[pidx].inmws[widx].tc = tc;
> > +               }
> > +
> > +               tc->peers[pidx].outmw_cnt = ntb_peer_mw_count(tc->ntb);
> > +               tc->peers[pidx].outmws =
> > +                       devm_kcalloc(&tc->ntb->dev, tc->peers[pidx].outmw_cnt,
> > +                                  sizeof(*tc->peers[pidx].outmws), GFP_KERNEL);
> > +
> > +               for (widx = 0; widx < tc->peers[pidx].outmw_cnt; widx++) {
> > +                       tc->peers[pidx].outmws[widx].pidx = pidx;
> > +                       tc->peers[pidx].outmws[widx].mw = &tc->outmws[widx];
> > +               }
> > +       }
> >
> >         return 0;
> >  }
> >
> > -static void tool_free_mws(struct tool_ctx *tc)
> > +static void tool_clear_mws(struct tool_ctx *tc)
> >  {
> > -       int i;
> > +       int widx, pidx;
> >
> > -       for (i = 0; i < tc->mw_count; i++) {
> > -               tool_free_mw(tc, i);
> > +       /* Free outbound memory windows */
> > +       for (widx = 0; widx < tc->outmw_cnt; widx++)
> > +               tool_free_peer_mw(tc, widx);
> >
> > -               if (tc->mws[i].local)
> > -                       iounmap(tc->mws[i].local);
> > +       /* Free outbound memory windows */
> > +       for (pidx = 0; pidx < tc->peer_cnt; pidx++)
> > +               for (widx = 0; widx < tc->peers[pidx].inmw_cnt; widx++)
> > +                       tool_free_mw(tc, pidx, widx);
> > +}
> >
> > -               tc->mws[i].local = NULL;
> > -       }
> > +/*==============================================================================
> > + *                       Doorbell read/write methods
> > + *==============================================================================
> > + */
> > +
> > +static ssize_t tool_db_read(struct file *filep, char __user *ubuf,
> > +                           size_t size, loff_t *offp)
> > +{
> > +       struct tool_ctx *tc = filep->private_data;
> > +
> > +       return tool_fn_read(tc, ubuf, size, offp, tc->ntb->ops->db_read);
> >  }
> >
> > -static void tool_setup_dbgfs(struct tool_ctx *tc)
> > +static ssize_t tool_db_write(struct file *filep, const char __user *ubuf,
> > +                            size_t size, loff_t *offp)
> >  {
> > -       int i;
> > +       struct tool_ctx *tc = filep->private_data;
> >
> > -       /* This modules is useless without dbgfs... */
> > -       if (!tool_dbgfs) {
> > -               tc->dbgfs = NULL;
> > -               return;
> > +       return tool_fn_write(tc, ubuf, size, offp, tc->ntb->ops->db_set,
> > +                            tc->ntb->ops->db_clear);
> > +}
> > +
> > +static TOOL_FOPS_RDWR(tool_db_fops,
> > +                     tool_db_read,
> > +                     tool_db_write);
> > +
> > +static ssize_t tool_db_valid_mask_read(struct file *filep, char __user *ubuf,
> > +                                      size_t size, loff_t *offp)
> > +{
> > +       struct tool_ctx *tc = filep->private_data;
> > +
> > +       return tool_fn_read(tc, ubuf, size, offp, tc->ntb->ops->db_valid_mask);
> > +}
> > +
> > +static TOOL_FOPS_RDWR(tool_db_valid_mask_fops,
> > +                     tool_db_valid_mask_read,
> > +                     NULL);
> > +
> > +static ssize_t tool_db_mask_read(struct file *filep, char __user *ubuf,
> > +                                size_t size, loff_t *offp)
> > +{
> > +       struct tool_ctx *tc = filep->private_data;
> > +
> > +       return tool_fn_read(tc, ubuf, size, offp, tc->ntb->ops->db_read_mask);
> > +}
> > +
> > +static ssize_t tool_db_mask_write(struct file *filep, const char __user *ubuf,
> > +                              size_t size, loff_t *offp)
> > +{
> > +       struct tool_ctx *tc = filep->private_data;
> > +
> > +       return tool_fn_write(tc, ubuf, size, offp, tc->ntb->ops->db_set_mask,
> > +                            tc->ntb->ops->db_clear_mask);
> > +}
> > +
> > +static TOOL_FOPS_RDWR(tool_db_mask_fops,
> > +                     tool_db_mask_read,
> > +                     tool_db_mask_write);
> > +
> > +static ssize_t tool_peer_db_read(struct file *filep, char __user *ubuf,
> > +                                size_t size, loff_t *offp)
> > +{
> > +       struct tool_ctx *tc = filep->private_data;
> > +
> > +       return tool_fn_read(tc, ubuf, size, offp, tc->ntb->ops->peer_db_read);
> > +}
> > +
> > +static ssize_t tool_peer_db_write(struct file *filep, const char __user *ubuf,
> > +                                 size_t size, loff_t *offp)
> > +{
> > +       struct tool_ctx *tc = filep->private_data;
> > +
> > +       return tool_fn_write(tc, ubuf, size, offp, tc->ntb->ops->peer_db_set,
> > +                            tc->ntb->ops->peer_db_clear);
> > +}
> > +
> > +static TOOL_FOPS_RDWR(tool_peer_db_fops,
> > +                     tool_peer_db_read,
> > +                     tool_peer_db_write);
> > +
> > +static ssize_t tool_peer_db_mask_read(struct file *filep, char __user *ubuf,
> > +                                  size_t size, loff_t *offp)
> > +{
> > +       struct tool_ctx *tc = filep->private_data;
> > +
> > +       return tool_fn_read(tc, ubuf, size, offp,
> > +                           tc->ntb->ops->peer_db_read_mask);
> > +}
> > +
> > +static ssize_t tool_peer_db_mask_write(struct file *filep,
> > +                                      const char __user *ubuf,
> > +                                      size_t size, loff_t *offp)
> > +{
> > +       struct tool_ctx *tc = filep->private_data;
> > +
> > +       return tool_fn_write(tc, ubuf, size, offp,
> > +                            tc->ntb->ops->peer_db_set_mask,
> > +                            tc->ntb->ops->peer_db_clear_mask);
> > +}
> > +
> > +static TOOL_FOPS_RDWR(tool_peer_db_mask_fops,
> > +                     tool_peer_db_mask_read,
> > +                     tool_peer_db_mask_write);
> > +
> > +static ssize_t tool_db_event_write(struct file *filep,
> > +                                  const char __user *ubuf,
> > +                                  size_t size, loff_t *offp)
> > +{
> > +       struct tool_ctx *tc = filep->private_data;
> > +       u64 val;
> > +       int ret;
> > +
> > +       ret = kstrtou64_from_user(ubuf, size, 0, &val);
> > +       if (ret)
> > +               return ret;
> > +
> > +       if (wait_event_interruptible(tc->db_wq, ntb_db_read(tc->ntb) == val))
> > +               return -ERESTART;
> > +
> > +       return size;
> > +}
> > +
> > +static TOOL_FOPS_RDWR(tool_db_event_fops,
> > +                     NULL,
> > +                     tool_db_event_write);
> > +
> > +/*==============================================================================
> > + *                       Scratchpads read/write methods
> > + *==============================================================================
> > + */
> > +
> > +static ssize_t tool_spad_read(struct file *filep, char __user *ubuf,
> > +                             size_t size, loff_t *offp)
> > +{
> > +       struct tool_spad *spad = filep->private_data;
> > +       char buf[32];
> > +       ssize_t pos;
> > +
> > +       if (!spad->tc->ntb->ops->spad_read)
> > +               return -EINVAL;
> > +
> > +       pos = scnprintf(buf, sizeof(buf), "%#x\n",
> > +               ntb_spad_read(spad->tc->ntb, spad->sidx));
> > +
> > +       return simple_read_from_buffer(ubuf, size, offp, buf, pos);
> > +}
> > +
> > +static ssize_t tool_spad_write(struct file *filep, const char __user *ubuf,
> > +                              size_t size, loff_t *offp)
> > +{
> > +       struct tool_spad *spad = filep->private_data;
> > +       u32 val;
> > +       int ret;
> > +
> > +       if (!spad->tc->ntb->ops->spad_write) {
> > +               dev_dbg(&spad->tc->ntb->dev, "no spad write fn\n");
> > +               return -EINVAL;
> >         }
> >
> > -       tc->dbgfs = debugfs_create_dir(dev_name(&tc->ntb->dev),
> > -                                      tool_dbgfs);
> > -       if (!tc->dbgfs)
> > -               return;
> > +       ret = kstrtou32_from_user(ubuf, size, 0, &val);
> > +       if (ret)
> > +               return ret;
> >
> > -       debugfs_create_file("db", S_IRUSR | S_IWUSR, tc->dbgfs,
> > -                           tc, &tool_db_fops);
> > +       ret = ntb_spad_write(spad->tc->ntb, spad->sidx, val);
> >
> > -       debugfs_create_file("mask", S_IRUSR | S_IWUSR, tc->dbgfs,
> > -                           tc, &tool_mask_fops);
> > +       return ret ?: size;
> > +}
> >
> > -       debugfs_create_file("peer_db", S_IRUSR | S_IWUSR, tc->dbgfs,
> > -                           tc, &tool_peer_db_fops);
> > +static TOOL_FOPS_RDWR(tool_spad_fops,
> > +                     tool_spad_read,
> > +                     tool_spad_write);
> >
> > -       debugfs_create_file("peer_mask", S_IRUSR | S_IWUSR, tc->dbgfs,
> > -                           tc, &tool_peer_mask_fops);
> > +static ssize_t tool_peer_spad_read(struct file *filep, char __user *ubuf,
> > +                                  size_t size, loff_t *offp)
> > +{
> > +       struct tool_spad *spad = filep->private_data;
> > +       char buf[32];
> > +       ssize_t pos;
> >
> > -       debugfs_create_file("spad", S_IRUSR | S_IWUSR, tc->dbgfs,
> > -                           tc, &tool_spad_fops);
> > +       if (!spad->tc->ntb->ops->peer_spad_read)
> > +               return -EINVAL;
> >
> > -       debugfs_create_file("peer_spad", S_IRUSR | S_IWUSR, tc->dbgfs,
> > -                           tc, &tool_peer_spad_fops);
> > +       pos = scnprintf(buf, sizeof(buf), "%#x\n",
> > +               ntb_peer_spad_read(spad->tc->ntb, spad->pidx, spad->sidx));
> >
> > -       debugfs_create_file("link", S_IRUSR | S_IWUSR, tc->dbgfs,
> > -                           tc, &tool_link_fops);
> > +       return simple_read_from_buffer(ubuf, size, offp, buf, pos);
> > +}
> > +
> > +static ssize_t tool_peer_spad_write(struct file *filep, const char __user *ubuf,
> > +                                   size_t size, loff_t *offp)
> > +{
> > +       struct tool_spad *spad = filep->private_data;
> > +       u32 val;
> > +       int ret;
> > +
> > +       if (!spad->tc->ntb->ops->peer_spad_write) {
> > +               dev_dbg(&spad->tc->ntb->dev, "no spad write fn\n");
> > +               return -EINVAL;
> > +       }
> > +
> > +       ret = kstrtou32_from_user(ubuf, size, 0, &val);
> > +       if (ret)
> > +               return ret;
> >
> > -       debugfs_create_file("link_event", S_IWUSR, tc->dbgfs,
> > -                           tc, &tool_link_event_fops);
> > +       ret = ntb_peer_spad_write(spad->tc->ntb, spad->pidx, spad->sidx, val);
> >
> > -       for (i = 0; i < tc->mw_count; i++) {
> > -               char buf[30];
> > +       return ret ?: size;
> > +}
> > +
> > +static TOOL_FOPS_RDWR(tool_peer_spad_fops,
> > +                     tool_peer_spad_read,
> > +                     tool_peer_spad_write);
> >
> > -               snprintf(buf, sizeof(buf), "mw%d", i);
> > -               debugfs_create_file(buf, S_IRUSR | S_IWUSR, tc->dbgfs,
> > -                                   &tc->mws[i], &tool_mw_fops);
> > +static int tool_init_spads(struct tool_ctx *tc)
> > +{
> > +       int sidx, pidx;
> >
> > -               snprintf(buf, sizeof(buf), "peer_trans%d", i);
> > -               debugfs_create_file(buf, S_IRUSR | S_IWUSR, tc->dbgfs,
> > -                                   &tc->mws[i], &tool_peer_mw_trans_fops);
> > +       /* Initialize inbound scratchpad structures */
> > +       tc->inspad_cnt = ntb_spad_count(tc->ntb);
> > +       tc->inspads = devm_kcalloc(&tc->ntb->dev, tc->inspad_cnt,
> > +                                  sizeof(*tc->inspads), GFP_KERNEL);
> > +       if (tc->inspads == NULL)
> > +               return -ENOMEM;
> > +
> > +       for (sidx = 0; sidx < tc->inspad_cnt; sidx++) {
> > +               tc->inspads[sidx].sidx = sidx;
> > +               tc->inspads[sidx].pidx = -1;
> > +               tc->inspads[sidx].tc = tc;
> >         }
> > +
> > +       /* Initialize outbound scratchpad structures */
> > +       for (pidx = 0; pidx < tc->peer_cnt; pidx++) {
> > +               tc->peers[pidx].outspad_cnt = ntb_spad_count(tc->ntb);
> > +               tc->peers[pidx].outspads =
> > +                       devm_kcalloc(&tc->ntb->dev, tc->peers[pidx].outspad_cnt,
> > +                               sizeof(*tc->peers[pidx].outspads), GFP_KERNEL);
> > +               if (tc->peers[pidx].outspads == NULL)
> > +                       return -ENOMEM;
> > +
> > +               for (sidx = 0; sidx < tc->peers[pidx].outspad_cnt; sidx++) {
> > +                       tc->peers[pidx].outspads[sidx].sidx = sidx;
> > +                       tc->peers[pidx].outspads[sidx].pidx = pidx;
> > +                       tc->peers[pidx].outspads[sidx].tc = tc;
> > +               }
> > +       }
> > +
> > +       return 0;
> >  }
> >
> > -static int tool_probe(struct ntb_client *self, struct ntb_dev *ntb)
> > +/*==============================================================================
> > + *                       Messages read/write methods
> > + *==============================================================================
> > + */
> > +
> > +static ssize_t tool_inmsg_read(struct file *filep, char __user *ubuf,
> > +                              size_t size, loff_t *offp)
> >  {
> > -       struct tool_ctx *tc;
> > -       int rc;
> > -       int i;
> > +       struct tool_msg *msg = filep->private_data;
> > +       char buf[32];
> > +       ssize_t pos;
> > +       u32 data;
> > +       int pidx;
> > +
> > +       data = ntb_msg_read(msg->tc->ntb, &pidx, msg->midx);
> > +
> > +       pos = scnprintf(buf, sizeof(buf), "0x%08x<-%d\n", data, pidx);
> > +
> > +       return simple_read_from_buffer(ubuf, size, offp, buf, pos);
> > +}
> > +
> > +static TOOL_FOPS_RDWR(tool_inmsg_fops,
> > +                     tool_inmsg_read,
> > +                     NULL);
> > +
> > +static ssize_t tool_outmsg_write(struct file *filep,
> > +                                const char __user *ubuf,
> > +                                size_t size, loff_t *offp)
> > +{
> > +       struct tool_msg *msg = filep->private_data;
> > +       u32 val;
> > +       int ret;
> > +
> > +       ret = kstrtou32_from_user(ubuf, size, 0, &val);
> > +       if (ret)
> > +               return ret;
> > +
> > +       ret = ntb_peer_msg_write(msg->tc->ntb, msg->pidx, msg->midx, val);
> > +
> > +       return ret ? : size;
> > +}
> > +
> > +static TOOL_FOPS_RDWR(tool_outmsg_fops,
> > +                     NULL,
> > +                     tool_outmsg_write);
> > +
> > +static ssize_t tool_msg_sts_read(struct file *filep, char __user *ubuf,
> > +                                size_t size, loff_t *offp)
> > +{
> > +       struct tool_ctx *tc = filep->private_data;
> > +
> > +       return tool_fn_read(tc, ubuf, size, offp, tc->ntb->ops->msg_read_sts);
> > +}
> > +
> > +static ssize_t tool_msg_sts_write(struct file *filep, const char __user *ubuf,
> > +                                 size_t size, loff_t *offp)
> > +{
> > +       struct tool_ctx *tc = filep->private_data;
> > +
> > +       return tool_fn_write(tc, ubuf, size, offp, NULL,
> > +                            tc->ntb->ops->msg_clear_sts);
> > +}
> > +
> > +static TOOL_FOPS_RDWR(tool_msg_sts_fops,
> > +                     tool_msg_sts_read,
> > +                     tool_msg_sts_write);
> > +
> > +static ssize_t tool_msg_inbits_read(struct file *filep, char __user *ubuf,
> > +                                   size_t size, loff_t *offp)
> > +{
> > +       struct tool_ctx *tc = filep->private_data;
> > +
> > +       return tool_fn_read(tc, ubuf, size, offp, tc->ntb->ops->msg_inbits);
> > +}
> > +
> > +static TOOL_FOPS_RDWR(tool_msg_inbits_fops,
> > +                     tool_msg_inbits_read,
> > +                     NULL);
> > +
> > +static ssize_t tool_msg_outbits_read(struct file *filep, char __user *ubuf,
> > +                                    size_t size, loff_t *offp)
> > +{
> > +       struct tool_ctx *tc = filep->private_data;
> > +
> > +       return tool_fn_read(tc, ubuf, size, offp, tc->ntb->ops->msg_outbits);
> > +}
> > +
> > +static TOOL_FOPS_RDWR(tool_msg_outbits_fops,
> > +                     tool_msg_outbits_read,
> > +                     NULL);
> > +
> > +static ssize_t tool_msg_mask_write(struct file *filep, const char __user *ubuf,
> > +                                  size_t size, loff_t *offp)
> > +{
> > +       struct tool_ctx *tc = filep->private_data;
> > +
> > +       return tool_fn_write(tc, ubuf, size, offp,
> > +                            tc->ntb->ops->msg_set_mask,
> > +                            tc->ntb->ops->msg_clear_mask);
> > +}
> > +
> > +static TOOL_FOPS_RDWR(tool_msg_mask_fops,
> > +                     NULL,
> > +                     tool_msg_mask_write);
> > +
> > +static ssize_t tool_msg_event_write(struct file *filep,
> > +                                   const char __user *ubuf,
> > +                                   size_t size, loff_t *offp)
> > +{
> > +       struct tool_ctx *tc = filep->private_data;
> > +       u64 val;
> > +       int ret;
> > +
> > +       ret = kstrtou64_from_user(ubuf, size, 0, &val);
> > +       if (ret)
> > +               return ret;
> > +
> > +       if (wait_event_interruptible(tc->msg_wq,
> > +               ntb_msg_read_sts(tc->ntb) == val))
> > +               return -ERESTART;
> > +
> > +       return size;
> > +}
> > +
> > +static TOOL_FOPS_RDWR(tool_msg_event_fops,
> > +                     NULL,
> > +                     tool_msg_event_write);
> >
> > -       if (!ntb->ops->mw_set_trans) {
> > -               dev_dbg(&ntb->dev, "need inbound MW based NTB API\n");
> > -               rc = -EINVAL;
> > -               goto err_tc;
> > +static int tool_init_msgs(struct tool_ctx *tc)
> > +{
> > +       int midx, pidx;
> > +
> > +       /* Initialize inbound message structures */
> > +       tc->inmsg_cnt = ntb_msg_count(tc->ntb);
> > +       tc->inmsgs = devm_kcalloc(&tc->ntb->dev, tc->inmsg_cnt,
> > +                                  sizeof(*tc->inmsgs), GFP_KERNEL);
> > +       if (tc->inmsgs == NULL)
> > +               return -ENOMEM;
> > +
> > +       for (midx = 0; midx < tc->inmsg_cnt; midx++) {
> > +               tc->inmsgs[midx].midx = midx;
> > +               tc->inmsgs[midx].pidx = -1;
> > +               tc->inmsgs[midx].tc = tc;
> >         }
> >
> > -       if (ntb_spad_count(ntb) < 1) {
> > -               dev_dbg(&ntb->dev, "no enough scratchpads\n");
> > -               rc = -EINVAL;
> > -               goto err_tc;
> > +       /* Initialize outbound message structures */
> > +       for (pidx = 0; pidx < tc->peer_cnt; pidx++) {
> > +               tc->peers[pidx].outmsg_cnt = ntb_msg_count(tc->ntb);
> > +               tc->peers[pidx].outmsgs =
> > +                       devm_kcalloc(&tc->ntb->dev, tc->peers[pidx].outmsg_cnt,
> > +                               sizeof(*tc->peers[pidx].outmsgs), GFP_KERNEL);
> > +               if (tc->peers[pidx].outmsgs == NULL)
> > +                       return -ENOMEM;
> > +
> > +               for (midx = 0; midx < tc->peers[pidx].outmsg_cnt; midx++) {
> > +                       tc->peers[pidx].outmsgs[midx].midx = midx;
> > +                       tc->peers[pidx].outmsgs[midx].pidx = pidx;
> > +                       tc->peers[pidx].outmsgs[midx].tc = tc;
> > +               }
> >         }
> >
> > +       return 0;
> > +}
> > +
> > +/*==============================================================================
> > + *                          Initialization methods
> > + *==============================================================================
> > + */
> > +
> > +static struct tool_ctx *tool_create_data(struct ntb_dev *ntb)
> > +{
> > +       struct tool_ctx *tc;
> > +
> > +       tc = devm_kzalloc(&ntb->dev, sizeof(*tc), GFP_KERNEL);
> > +       if (tc == NULL)
> > +               return ERR_PTR(-ENOMEM);
> > +
> > +       tc->ntb = ntb;
> > +       init_waitqueue_head(&tc->link_wq);
> > +       init_waitqueue_head(&tc->db_wq);
> > +       init_waitqueue_head(&tc->msg_wq);
> > +
> >         if (ntb_db_is_unsafe(ntb))
> >                 dev_dbg(&ntb->dev, "doorbell is unsafe\n");
> >
> >         if (ntb_spad_is_unsafe(ntb))
> >                 dev_dbg(&ntb->dev, "scratchpad is unsafe\n");
> >
> > -       if (ntb_peer_port_count(ntb) != NTB_DEF_PEER_CNT)
> > -               dev_warn(&ntb->dev, "multi-port NTB is unsupported\n");
> > +       return tc;
> > +}
> > +
> > +static void tool_clear_data(struct tool_ctx *tc)
> > +{
> > +       wake_up(&tc->link_wq);
> > +       wake_up(&tc->db_wq);
> > +       wake_up(&tc->msg_wq);
> > +}
> > +
> > +static int tool_init_ntb(struct tool_ctx *tc)
> > +{
> > +       return ntb_set_ctx(tc->ntb, tc, &tool_ops);
> > +}
> > +
> > +static void tool_clear_ntb(struct tool_ctx *tc)
> > +{
> > +       ntb_clear_ctx(tc->ntb);
> > +       ntb_link_disable(tc->ntb);
> > +}
> >
> > -       tc = kzalloc(sizeof(*tc), GFP_KERNEL);
> > -       if (!tc) {
> > -               rc = -ENOMEM;
> > -               goto err_tc;
> > +static void tool_setup_dbgfs(struct tool_ctx *tc)
> > +{
> > +       int pidx, widx, sidx, midx;
> > +       char buf[30];
> > +
> > +       /* This modules is useless without dbgfs... */
> > +       if (!tool_dbgfs_topdir) {
> > +               tc->dbgfs_dir = NULL;
> > +               return;
> >         }
> >
> > -       tc->ntb = ntb;
> > -       init_waitqueue_head(&tc->link_wq);
> > +       tc->dbgfs_dir = debugfs_create_dir(dev_name(&tc->ntb->dev),
> > +                                          tool_dbgfs_topdir);
> > +       if (!tc->dbgfs_dir)
> > +               return;
> >
> > -       tc->mw_count = min(ntb_peer_mw_count(tc->ntb), MAX_MWS);
> > -       for (i = 0; i < tc->mw_count; i++) {
> > -               rc = tool_init_mw(tc, i);
> > -               if (rc)
> > -                       goto err_ctx;
> > +       debugfs_create_file("port", 0600, tc->dbgfs_dir,
> > +                           tc, &tool_port_fops);
> > +
> > +       debugfs_create_file("link", 0600, tc->dbgfs_dir,
> > +                           tc, &tool_link_fops);
> > +
> > +       debugfs_create_file("db", 0600, tc->dbgfs_dir,
> > +                           tc, &tool_db_fops);
> > +
> > +       debugfs_create_file("db_valid_mask", 0600, tc->dbgfs_dir,
> > +                           tc, &tool_db_valid_mask_fops);
> > +
> > +       debugfs_create_file("db_mask", 0600, tc->dbgfs_dir,
> > +                           tc, &tool_db_mask_fops);
> > +
> > +       debugfs_create_file("db_event", 0600, tc->dbgfs_dir,
> > +                           tc, &tool_db_event_fops);
> > +
> > +       debugfs_create_file("peer_db", 0600, tc->dbgfs_dir,
> > +                           tc, &tool_peer_db_fops);
> > +
> > +       debugfs_create_file("peer_db_mask", 0600, tc->dbgfs_dir,
> > +                           tc, &tool_peer_db_mask_fops);
> > +
> > +       if (tc->inspad_cnt != 0) {
> > +               for (sidx = 0; sidx < tc->inspad_cnt; sidx++) {
> > +                       snprintf(buf, sizeof(buf), "spad%d", sidx);
> > +
> > +                       debugfs_create_file(buf, 0600, tc->dbgfs_dir,
> > +                                          &tc->inspads[sidx], &tool_spad_fops);
> > +               }
> >         }
> >
> > -       tool_setup_dbgfs(tc);
> > +       if (tc->inmsg_cnt != 0) {
> > +               for (midx = 0; midx < tc->inmsg_cnt; midx++) {
> > +                       snprintf(buf, sizeof(buf), "msg%d", midx);
> > +                       debugfs_create_file(buf, 0600, tc->dbgfs_dir,
> > +                                          &tc->inmsgs[midx], &tool_inmsg_fops);
> > +               }
> > +
> > +               debugfs_create_file("msg_sts", 0600, tc->dbgfs_dir,
> > +                                   tc, &tool_msg_sts_fops);
> > +
> > +               debugfs_create_file("msg_inbits", 0600, tc->dbgfs_dir,
> > +                                   tc, &tool_msg_inbits_fops);
> > +
> > +               debugfs_create_file("msg_outbits", 0600, tc->dbgfs_dir,
> > +                                   tc, &tool_msg_outbits_fops);
> > +
> > +               debugfs_create_file("msg_mask", 0600, tc->dbgfs_dir,
> > +                                   tc, &tool_msg_mask_fops);
> > +
> > +               debugfs_create_file("msg_event", 0600, tc->dbgfs_dir,
> > +                                   tc, &tool_msg_event_fops);
> > +       }
> > +
> > +       for (pidx = 0; pidx < tc->peer_cnt; pidx++) {
> > +               snprintf(buf, sizeof(buf), "peer%d", pidx);
> > +               tc->peers[pidx].dbgfs_dir =
> > +                       debugfs_create_dir(buf, tc->dbgfs_dir);
> > +
> > +               debugfs_create_file("port", 0600,
> > +                                   tc->peers[pidx].dbgfs_dir,
> > +                                   &tc->peers[pidx], &tool_peer_port_fops);
> > +
> > +               debugfs_create_file("link", 0200,
> > +                                   tc->peers[pidx].dbgfs_dir,
> > +                                   &tc->peers[pidx], &tool_peer_link_fops);
> > +
> > +               debugfs_create_file("link_event", 0200,
> > +                                 tc->peers[pidx].dbgfs_dir,
> > +                                 &tc->peers[pidx], &tool_peer_link_event_fops);
> > +
> > +               for (widx = 0; widx < tc->peers[pidx].inmw_cnt; widx++) {
> > +                       snprintf(buf, sizeof(buf), "mw_trans%d", widx);
> > +                       debugfs_create_file(buf, 0600,
> > +                                           tc->peers[pidx].dbgfs_dir,
> > +                                           &tc->peers[pidx].inmws[widx],
> > +                                           &tool_mw_trans_fops);
> > +               }
> > +
> > +               for (widx = 0; widx < tc->peers[pidx].outmw_cnt; widx++) {
> > +                       snprintf(buf, sizeof(buf), "peer_mw_trans%d", widx);
> > +                       debugfs_create_file(buf, 0600,
> > +                                           tc->peers[pidx].dbgfs_dir,
> > +                                           &tc->peers[pidx].outmws[widx],
> > +                                           &tool_peer_mw_trans_fops);
> > +               }
> > +
> > +               for (sidx = 0; sidx < tc->peers[pidx].outspad_cnt; sidx++) {
> > +                       snprintf(buf, sizeof(buf), "spad%d", sidx);
> > +
> > +                       debugfs_create_file(buf, 0600,
> > +                                           tc->peers[pidx].dbgfs_dir,
> > +                                           &tc->peers[pidx].outspads[sidx],
> > +                                           &tool_peer_spad_fops);
> > +               }
> > +
> > +               for (midx = 0; midx < tc->peers[pidx].outmsg_cnt; midx++) {
> > +                       snprintf(buf, sizeof(buf), "msg%d", midx);
> > +                       debugfs_create_file(buf, 0600,
> > +                                           tc->peers[pidx].dbgfs_dir,
> > +                                           &tc->peers[pidx].outmsgs[midx],
> > +                                           &tool_outmsg_fops);
> > +               }
> > +       }
> > +}
> > +
> > +static void tool_clear_dbgfs(struct tool_ctx *tc)
> > +{
> > +       debugfs_remove_recursive(tc->dbgfs_dir);
> > +}
> > +
> > +static int tool_probe(struct ntb_client *self, struct ntb_dev *ntb)
> > +{
> > +       struct tool_ctx *tc;
> > +       int ret;
> >
> > -       rc = ntb_set_ctx(ntb, tc, &tool_ops);
> > -       if (rc)
> > -               goto err_ctx;
> > +       tc = tool_create_data(ntb);
> > +       if (IS_ERR(tc))
> > +               return PTR_ERR(tc);
> >
> > -       ntb_link_enable(ntb, NTB_SPEED_AUTO, NTB_WIDTH_AUTO);
> > -       ntb_link_event(ntb);
> > +       ret = tool_init_peers(tc);
> > +       if (ret != 0)
> > +               goto err_clear_data;
> > +
> > +       ret = tool_init_mws(tc);
> > +       if (ret != 0)
> > +               goto err_clear_data;
> > +
> > +       ret = tool_init_spads(tc);
> > +       if (ret != 0)
> > +               goto err_clear_mws;
> > +
> > +       ret = tool_init_msgs(tc);
> > +       if (ret != 0)
> > +               goto err_clear_mws;
> > +
> > +       ret = tool_init_ntb(tc);
> > +       if (ret != 0)
> > +               goto err_clear_mws;
> > +
> > +       tool_setup_dbgfs(tc);
> >
> >         return 0;
> >
> > -err_ctx:
> > -       tool_free_mws(tc);
> > -       debugfs_remove_recursive(tc->dbgfs);
> > -       kfree(tc);
> > -err_tc:
> > -       return rc;
> > +err_clear_mws:
> > +       tool_clear_mws(tc);
> > +
> > +err_clear_data:
> > +       tool_clear_data(tc);
> > +
> > +       return ret;
> >  }
> >
> >  static void tool_remove(struct ntb_client *self, struct ntb_dev *ntb)
> >  {
> >         struct tool_ctx *tc = ntb->ctx;
> >
> > -       tool_free_mws(tc);
> > +       tool_clear_dbgfs(tc);
> > +
> > +       tool_clear_ntb(tc);
> >
> > -       ntb_clear_ctx(ntb);
> > -       ntb_link_disable(ntb);
> > +       tool_clear_mws(tc);
> >
> > -       debugfs_remove_recursive(tc->dbgfs);
> > -       kfree(tc);
> > +       tool_clear_data(tc);
> >  }
> >
> >  static struct ntb_client tool_client = {
> >         .ops = {
> >                 .probe = tool_probe,
> >                 .remove = tool_remove,
> > -       },
> > +       }
> >  };
> >
> >  static int __init tool_init(void)
> >  {
> > -       int rc;
> > +       int ret;
> >
> >         if (debugfs_initialized())
> > -               tool_dbgfs = debugfs_create_dir(KBUILD_MODNAME, NULL);
> > -
> > -       rc = ntb_register_client(&tool_client);
> > -       if (rc)
> > -               goto err_client;
> > +               tool_dbgfs_topdir = debugfs_create_dir(KBUILD_MODNAME, NULL);
> >
> > -       return 0;
> > +       ret = ntb_register_client(&tool_client);
> > +       if (ret)
> > +               debugfs_remove_recursive(tool_dbgfs_topdir);
> >
> > -err_client:
> > -       debugfs_remove_recursive(tool_dbgfs);
> > -       return rc;
> > +       return ret;
> >  }
> >  module_init(tool_init);
> >
> >  static void __exit tool_exit(void)
> >  {
> >         ntb_unregister_client(&tool_client);
> > -       debugfs_remove_recursive(tool_dbgfs);
> > +       debugfs_remove_recursive(tool_dbgfs_topdir);
> >  }
> >  module_exit(tool_exit);
> > +
> > --
> > 2.12.0
> >
> 
> -- 
> You received this message because you are subscribed to the Google Groups "linux-ntb" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to linux-ntb+unsubscribe@googlegroups.com.
> To post to this group, send email to linux-ntb@googlegroups.com.
> To view this discussion on the web visit https://groups.google.com/d/msgid/linux-ntb/CAPoiz9yy8sMHTHzBYS3AJYArmnfQY-ntHrZa_m3G3-ALxa_QyA%40mail.gmail.com.
> For more options, visit https://groups.google.com/d/optout.

[PATCH v2 06/15] NTB: ntb_perf: Add full multi-port NTB API support

[Serge Semin]

NTB API has been updated to support multi-port devices like IDT
89HPESx series or Microsemi Switchtec. Message registers
functionality has also been added to new API. In order to keep
the new hardware and corresponding capabilities well tested, NTB
performance driver is accordingly altered.

Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
---

Changelog v1:
- Alter interface in compliance with multi-port API
- Create Scratchpads and Message compliant NTB link init process
- Simplify memcpy and DMA-based tests process
- Limit DebugFS access methods to prevent the driver failure

Changelog v2:
- Remove driver Author/Description/License macros
- Replace magic numbers with macros
- Fix global index calc error for devices with highest port index
- Fix invalid scratchpad selection in send_msg algorithm
- Fix bytes order translation in message recv method
- Use local global index to select an inbound MW
- Add commands send/recv/exec debug prints
- Call ntb_mw_get_align when link is supposed to be up

 drivers/ntb/test/ntb_perf.c | 1826 +++++++++++++++++++++++++++++--------------
 1 file changed, 1222 insertions(+), 604 deletions(-)

diff --git a/drivers/ntb/test/ntb_perf.c b/drivers/ntb/test/ntb_perf.c
index 427112cf101a..5ca5cc6f9687 100644
--- a/drivers/ntb/test/ntb_perf.c
+++ b/drivers/ntb/test/ntb_perf.c
@@ -5,6 +5,7 @@
  *   GPL LICENSE SUMMARY
  *
  *   Copyright(c) 2015 Intel Corporation. All rights reserved.
+ *   Copyright(c) 2017 T-Platforms. All Rights Reserved.
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of version 2 of the GNU General Public License as
@@ -13,6 +14,7 @@
  *   BSD LICENSE
  *
  *   Copyright(c) 2015 Intel Corporation. All rights reserved.
+ *   Copyright(c) 2017 T-Platforms. All Rights Reserved.
  *
  *   Redistribution and use in source and binary forms, with or without
  *   modification, are permitted provided that the following conditions
@@ -40,860 +42,1476 @@
  *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *   PCIe NTB Perf Linux driver
+ * PCIe NTB Perf Linux driver
+ *
+ * Contact Information:
+ * Dave Jiang <dave.jiang@intel.com>
+ * Serge Semin <fancer.lancer@gmail.com>, <Sergey.Semin@t-platforms.ru>
+ */
+
+/*
+ * How to use this tool, by example.
+ *
+ * Assuming $DBG_DIR is something like:
+ * '/sys/kernel/debug/ntb_perf/0000:00:03.0'
+ * Suppose aside from local device there is at least one remote device
+ * connected to NTB with index 0.
+ *-----------------------------------------------------------------------------
+ * Eg: install driver with specified chunk/total orders and dma-enabled flag
+ *
+ * root@self# insmod ntb_perf.ko chunk_order=19 total_order=28 use_dma
+ *-----------------------------------------------------------------------------
+ * Eg: check NTB ports (index) and MW mapping information
+ *
+ * root@self# cat $DBG_DIR/info
+ *-----------------------------------------------------------------------------
+ * Eg: start performance test with peer (index 0) and get the test metrics
+ *
+ * root@self# echo 0 > $DBG_DIR/run
+ * root@self# cat $DBG_DIR/run
  */
 
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/kthread.h>
-#include <linux/time.h>
-#include <linux/timer.h>
+#include <linux/sched.h>
+#include <linux/wait.h>
 #include <linux/dma-mapping.h>
+#include <linux/dmaengine.h>
 #include <linux/pci.h>
+#include <linux/ktime.h>
 #include <linux/slab.h>
-#include <linux/spinlock.h>
-#include <linux/debugfs.h>
-#include <linux/dmaengine.h>
 #include <linux/delay.h>
 #include <linux/sizes.h>
+#include <linux/workqueue.h>
+#include <linux/debugfs.h>
+#include <linux/random.h>
 #include <linux/ntb.h>
-#include <linux/mutex.h>
 
 #define DRIVER_NAME		"ntb_perf"
-#define DRIVER_DESCRIPTION	"PCIe NTB Performance Measurement Tool"
-
-#define DRIVER_LICENSE		"Dual BSD/GPL"
-#define DRIVER_VERSION		"1.0"
-#define DRIVER_AUTHOR		"Dave Jiang <dave.jiang@intel.com>"
-
-#define PERF_LINK_DOWN_TIMEOUT	10
-#define PERF_VERSION		0xffff0001
-#define MAX_THREADS		32
-#define MAX_TEST_SIZE		SZ_1M
-#define MAX_SRCS		32
-#define DMA_OUT_RESOURCE_TO	msecs_to_jiffies(50)
-#define DMA_RETRIES		20
-#define SZ_4G			(1ULL << 32)
-#define MAX_SEG_ORDER		20 /* no larger than 1M for kmalloc buffer */
-#define PIDX			NTB_DEF_PEER_IDX
-
-MODULE_LICENSE(DRIVER_LICENSE);
+#define DRIVER_VERSION		"2.0"
+
+MODULE_LICENSE("Dual BSD/GPL");
 MODULE_VERSION(DRIVER_VERSION);
-MODULE_AUTHOR(DRIVER_AUTHOR);
-MODULE_DESCRIPTION(DRIVER_DESCRIPTION);
+MODULE_AUTHOR("Dave Jiang <dave.jiang@intel.com>");
+MODULE_DESCRIPTION("PCIe NTB Performance Measurement Tool");
 
-static struct dentry *perf_debugfs_dir;
+#define MAX_THREADS_CNT		32
+#define DEF_THREADS_CNT		1
+#define MAX_CHUNK_SIZE		SZ_1M
+#define MAX_CHUNK_ORDER		20 /* no larger than 1M */
+
+#define DMA_TRIES		100
+#define DMA_MDELAY		10
+
+#define MSG_TRIES		500
+#define MSG_UDELAY_LOW		1000
+#define MSG_UDELAY_HIGH		2000
 
 static unsigned long max_mw_size;
 module_param(max_mw_size, ulong, 0644);
-MODULE_PARM_DESC(max_mw_size, "Limit size of large memory windows");
+MODULE_PARM_DESC(max_mw_size, "Upper limit of memory window size");
 
-static unsigned int seg_order = 19; /* 512K */
-module_param(seg_order, uint, 0644);
-MODULE_PARM_DESC(seg_order, "size order [2^n] of buffer segment for testing");
+static unsigned char chunk_order = 19; /* 512K */
+module_param(chunk_order, byte, 0644);
+MODULE_PARM_DESC(chunk_order, "Data chunk order [2^n] to transfer");
 
-static unsigned int run_order = 32; /* 4G */
-module_param(run_order, uint, 0644);
-MODULE_PARM_DESC(run_order, "size order [2^n] of total data to transfer");
+static unsigned char total_order = 30; /* 1G */
+module_param(total_order, byte, 0644);
+MODULE_PARM_DESC(total_order, "Total data order [2^n] to transfer");
 
 static bool use_dma; /* default to 0 */
 module_param(use_dma, bool, 0644);
-MODULE_PARM_DESC(use_dma, "Using DMA engine to measure performance");
-
-static bool on_node = true; /* default to 1 */
-module_param(on_node, bool, 0644);
-MODULE_PARM_DESC(on_node, "Run threads only on NTB device node (default: true)");
-
-struct perf_mw {
-	phys_addr_t	phys_addr;
-	resource_size_t	phys_size;
-	void __iomem	*vbase;
-	size_t		xlat_size;
-	size_t		buf_size;
-	void		*virt_addr;
-	dma_addr_t	dma_addr;
+MODULE_PARM_DESC(use_dma, "Use DMA engine to measure performance");
+
+/*==============================================================================
+ *                         Perf driver data definition
+ *==============================================================================
+ */
+
+enum perf_cmd {
+	PERF_CMD_INVAL = -1,/* invalid spad command */
+	PERF_CMD_SSIZE = 0, /* send out buffer size */
+	PERF_CMD_RSIZE = 1, /* recv in  buffer size */
+	PERF_CMD_SXLAT = 2, /* send in  buffer xlat */
+	PERF_CMD_RXLAT = 3, /* recv out buffer xlat */
+	PERF_CMD_CLEAR = 4, /* clear allocated memory */
+	PERF_STS_DONE  = 5, /* init is done */
+	PERF_STS_LNKUP = 6, /* link up state flag */
 };
 
 struct perf_ctx;
 
-struct pthr_ctx {
-	struct task_struct	*thread;
-	struct perf_ctx		*perf;
-	atomic_t		dma_sync;
-	struct dma_chan		*dma_chan;
-	int			dma_prep_err;
-	int			src_idx;
-	void			*srcs[MAX_SRCS];
-	wait_queue_head_t       *wq;
-	int			status;
-	u64			copied;
-	u64			diff_us;
+struct perf_peer {
+	struct perf_ctx	*perf;
+	int pidx;
+	int gidx;
+
+	/* Outbound MW params */
+	u64 outbuf_xlat;
+	resource_size_t outbuf_size;
+	void __iomem *outbuf;
+
+	/* Inbound MW params */
+	dma_addr_t inbuf_xlat;
+	resource_size_t inbuf_size;
+	void		*inbuf;
+
+	/* NTB connection setup service */
+	struct work_struct	service;
+	unsigned long		sts;
 };
+#define to_peer_service(__work) \
+	container_of(__work, struct perf_peer, service)
 
-struct perf_ctx {
-	struct ntb_dev		*ntb;
-	spinlock_t		db_lock;
-	struct perf_mw		mw;
-	bool			link_is_up;
-	struct delayed_work	link_work;
-	wait_queue_head_t	link_wq;
-	u8			perf_threads;
-	/* mutex ensures only one set of threads run at once */
-	struct mutex		run_mutex;
-	struct pthr_ctx		pthr_ctx[MAX_THREADS];
-	atomic_t		tsync;
-	atomic_t                tdone;
+struct perf_thread {
+	struct perf_ctx *perf;
+	int tidx;
+
+	/* DMA-based test sync parameters */
+	atomic_t dma_sync;
+	wait_queue_head_t dma_wait;
+	struct dma_chan *dma_chan;
+
+	/* Data source and measured statistics */
+	void *src;
+	u64 copied;
+	ktime_t duration;
+	int status;
+	struct work_struct work;
 };
+#define to_thread_work(__work) \
+	container_of(__work, struct perf_thread, work)
 
-enum {
-	VERSION = 0,
-	MW_SZ_HIGH,
-	MW_SZ_LOW,
-	MAX_SPAD
+struct perf_ctx {
+	struct ntb_dev *ntb;
+
+	/* Global device index and peers descriptors */
+	int gidx;
+	int pcnt;
+	struct perf_peer *peers;
+
+	/* Performance measuring work-threads interface */
+	unsigned long busy_flag;
+	wait_queue_head_t twait;
+	atomic_t tsync;
+	u8 tcnt;
+	struct perf_peer *test_peer;
+	struct perf_thread threads[MAX_THREADS_CNT];
+
+	/* Scratchpad/Message IO operations */
+	int (*cmd_send)(struct perf_peer *peer, enum perf_cmd cmd, u64 data);
+	int (*cmd_recv)(struct perf_ctx *perf, int *pidx, enum perf_cmd *cmd,
+			u64 *data);
+
+	struct dentry *dbgfs_dir;
 };
 
+/*
+ * Scratchpads-base commands interface
+ */
+#define PERF_SPAD_CNT(_pcnt) \
+	(3*((_pcnt) + 1))
+#define PERF_SPAD_CMD(_gidx) \
+	(3*(_gidx))
+#define PERF_SPAD_LDATA(_gidx) \
+	(3*(_gidx) + 1)
+#define PERF_SPAD_HDATA(_gidx) \
+	(3*(_gidx) + 2)
+#define PERF_SPAD_NOTIFY(_gidx) \
+	(BIT_ULL(_gidx))
+
+/*
+ * Messages-base commands interface
+ */
+#define PERF_MSG_CNT		3
+#define PERF_MSG_CMD		0
+#define PERF_MSG_LDATA		1
+#define PERF_MSG_HDATA		2
+
+/*==============================================================================
+ *                           Static data declarations
+ *==============================================================================
+ */
+
+static struct dentry *perf_dbgfs_topdir;
+
+static struct workqueue_struct *perf_wq __read_mostly;
+
+/*==============================================================================
+ *                  NTB cross-link commands execution service
+ *==============================================================================
+ */
+
+static void perf_terminate_test(struct perf_ctx *perf);
+
+static inline bool perf_link_is_up(struct perf_peer *peer)
+{
+	u64 link;
+
+	link = ntb_link_is_up(peer->perf->ntb, NULL, NULL);
+	return !!(link & BIT_ULL_MASK(peer->pidx));
+}
+
+static int perf_spad_cmd_send(struct perf_peer *peer, enum perf_cmd cmd,
+			      u64 data)
+{
+	struct perf_ctx *perf = peer->perf;
+	int try;
+	u32 sts;
+
+	dev_dbg(&perf->ntb->dev, "CMD send: %d 0x%llx\n", cmd, data);
+
+	/*
+	 * Perform predefined number of attempts before give up.
+	 * We are sending the data to the port specific scratchpad, so
+	 * to prevent a multi-port access race-condition. Additionally
+	 * there is no need in local locking since only thread-safe
+	 * service work is using this method.
+	 */
+	for (try = 0; try < MSG_TRIES; try++) {
+		if (!perf_link_is_up(peer))
+			return -ENOLINK;
+
+		sts = ntb_peer_spad_read(perf->ntb, peer->pidx,
+					 PERF_SPAD_CMD(perf->gidx));
+		if (le32_to_cpu(sts) != PERF_CMD_INVAL) {
+			usleep_range(MSG_UDELAY_LOW, MSG_UDELAY_HIGH);
+			continue;
+		}
+
+		ntb_peer_spad_write(perf->ntb, peer->pidx,
+				    PERF_SPAD_LDATA(perf->gidx),
+				    cpu_to_le32(lower_32_bits(data)));
+		ntb_peer_spad_write(perf->ntb, peer->pidx,
+				    PERF_SPAD_HDATA(perf->gidx),
+				    cpu_to_le32(upper_32_bits(data)));
+		mmiowb();
+		ntb_peer_spad_write(perf->ntb, peer->pidx,
+				    PERF_SPAD_CMD(perf->gidx),
+				    cpu_to_le32(cmd));
+		mmiowb();
+		ntb_peer_db_set(perf->ntb, PERF_SPAD_NOTIFY(peer->gidx));
+
+		dev_dbg(&perf->ntb->dev, "DB ring peer %#llx\n",
+			PERF_SPAD_NOTIFY(peer->gidx));
+
+		break;
+	}
+
+	return try < MSG_TRIES ? 0 : -EAGAIN;
+}
+
+static int perf_spad_cmd_recv(struct perf_ctx *perf, int *pidx,
+			      enum perf_cmd *cmd, u64 *data)
+{
+	struct perf_peer *peer;
+	u32 val;
+
+	ntb_db_clear(perf->ntb, PERF_SPAD_NOTIFY(perf->gidx));
+
+	/*
+	 * We start scanning all over, since cleared DB may have been set
+	 * by any peer. Yes, it makes peer with smaller index being
+	 * serviced with greater priority, but it's convenient for spad
+	 * and message code unification and simplicity.
+	 */
+	for (*pidx = 0; *pidx < perf->pcnt; (*pidx)++) {
+		peer = &perf->peers[*pidx];
+
+		if (!perf_link_is_up(peer))
+			continue;
+
+		val = ntb_spad_read(perf->ntb, PERF_SPAD_CMD(peer->gidx));
+		val = le32_to_cpu(val);
+		if (val == PERF_CMD_INVAL)
+			continue;
+
+		*cmd = val;
+
+		val = ntb_spad_read(perf->ntb, PERF_SPAD_LDATA(peer->gidx));
+		*data = le32_to_cpu(val);
+
+		val = ntb_spad_read(perf->ntb, PERF_SPAD_HDATA(peer->gidx));
+		*data |= (u64)le32_to_cpu(val) << 32;
+
+		/* Next command can be retrieved from now */
+		ntb_spad_write(perf->ntb, PERF_SPAD_CMD(peer->gidx),
+			       cpu_to_le32(PERF_CMD_INVAL));
+
+		dev_dbg(&perf->ntb->dev, "CMD recv: %d 0x%llx\n", *cmd, *data);
+
+		return 0;
+	}
+
+	return -ENODATA;
+}
+
+static int perf_msg_cmd_send(struct perf_peer *peer, enum perf_cmd cmd,
+			     u64 data)
+{
+	struct perf_ctx *perf = peer->perf;
+	int try, ret;
+	u64 outbits;
+
+	dev_dbg(&perf->ntb->dev, "CMD send: %d 0x%llx\n", cmd, data);
+
+	/*
+	 * Perform predefined number of attempts before give up. Message
+	 * registers are free of race-condition problem when accessed
+	 * from different ports, so we don't need splitting registers
+	 * by global device index. We also won't have local locking,
+	 * since the method is used from service work only.
+	 */
+	outbits = ntb_msg_outbits(perf->ntb);
+	for (try = 0; try < MSG_TRIES; try++) {
+		if (!perf_link_is_up(peer))
+			return -ENOLINK;
+
+		ret = ntb_msg_clear_sts(perf->ntb, outbits);
+		if (ret)
+			return ret;
+
+		ntb_peer_msg_write(perf->ntb, peer->pidx, PERF_MSG_LDATA,
+			      cpu_to_le32(lower_32_bits(data)));
+
+		if (ntb_msg_read_sts(perf->ntb) & outbits) {
+			usleep_range(MSG_UDELAY_LOW, MSG_UDELAY_HIGH);
+			continue;
+		}
+
+		ntb_peer_msg_write(perf->ntb, peer->pidx, PERF_MSG_HDATA,
+			      cpu_to_le32(upper_32_bits(data)));
+		mmiowb();
+
+		/* This call shall trigger peer message event */
+		ntb_peer_msg_write(perf->ntb, peer->pidx, PERF_MSG_CMD,
+			      cpu_to_le32(cmd));
+
+		break;
+	}
+
+	return try < MSG_TRIES ? 0 : -EAGAIN;
+}
+
+static int perf_msg_cmd_recv(struct perf_ctx *perf, int *pidx,
+			     enum perf_cmd *cmd, u64 *data)
+{
+	u64 inbits;
+	u32 val;
+
+	inbits = ntb_msg_inbits(perf->ntb);
+
+	if (hweight64(ntb_msg_read_sts(perf->ntb) & inbits) < 3)
+		return -ENODATA;
+
+	val = ntb_msg_read(perf->ntb, pidx, PERF_MSG_CMD);
+	*cmd = le32_to_cpu(val);
+
+	val = ntb_msg_read(perf->ntb, pidx, PERF_MSG_LDATA);
+	*data = le32_to_cpu(val);
+
+	val = ntb_msg_read(perf->ntb, pidx, PERF_MSG_HDATA);
+	*data |= (u64)le32_to_cpu(val) << 32;
+
+	/* Next command can be retrieved from now */
+	ntb_msg_clear_sts(perf->ntb, inbits);
+
+	dev_dbg(&perf->ntb->dev, "CMD recv: %d 0x%llx\n", *cmd, *data);
+
+	return 0;
+}
+
+static int perf_cmd_send(struct perf_peer *peer, enum perf_cmd cmd, u64 data)
+{
+	struct perf_ctx *perf = peer->perf;
+
+	if (cmd == PERF_CMD_SSIZE || cmd == PERF_CMD_SXLAT)
+		return perf->cmd_send(peer, cmd, data);
+
+	dev_err(&perf->ntb->dev, "Send invalid command\n");
+	return -EINVAL;
+}
+
+static int perf_cmd_exec(struct perf_peer *peer, enum perf_cmd cmd)
+{
+	switch (cmd) {
+	case PERF_CMD_SSIZE:
+	case PERF_CMD_RSIZE:
+	case PERF_CMD_SXLAT:
+	case PERF_CMD_RXLAT:
+	case PERF_CMD_CLEAR:
+		break;
+	default:
+		dev_err(&peer->perf->ntb->dev, "Exec invalid command\n");
+		return -EINVAL;
+	}
+
+	/* No need of memory barrier, since bit ops have invernal lock */
+	set_bit(cmd, &peer->sts);
+
+	dev_dbg(&peer->perf->ntb->dev, "CMD exec: %d\n", cmd);
+
+	(void)queue_work(system_highpri_wq, &peer->service);
+
+	return 0;
+}
+
+static int perf_cmd_recv(struct perf_ctx *perf)
+{
+	struct perf_peer *peer;
+	int ret, pidx, cmd;
+	u64 data;
+
+	while (!(ret = perf->cmd_recv(perf, &pidx, &cmd, &data))) {
+		peer = &perf->peers[pidx];
+
+		switch (cmd) {
+		case PERF_CMD_SSIZE:
+			peer->inbuf_size = data;
+			return perf_cmd_exec(peer, PERF_CMD_RSIZE);
+		case PERF_CMD_SXLAT:
+			peer->outbuf_xlat = data;
+			return perf_cmd_exec(peer, PERF_CMD_RXLAT);
+		default:
+			dev_err(&perf->ntb->dev, "Recv invalid command\n");
+			return -EINVAL;
+		}
+	}
+
+	return ret == -ENODATA ? 0 : ret;
+}
+
 static void perf_link_event(void *ctx)
 {
 	struct perf_ctx *perf = ctx;
+	struct perf_peer *peer;
+	bool lnk_up;
+	int pidx;
 
-	if (ntb_link_is_up(perf->ntb, NULL, NULL) == 1) {
-		schedule_delayed_work(&perf->link_work, 2*HZ);
-	} else {
-		dev_dbg(&perf->ntb->pdev->dev, "link down\n");
+	for (pidx = 0; pidx < perf->pcnt; pidx++) {
+		peer = &perf->peers[pidx];
 
-		if (!perf->link_is_up)
-			cancel_delayed_work_sync(&perf->link_work);
+		lnk_up = perf_link_is_up(peer);
 
-		perf->link_is_up = false;
+		if (lnk_up &&
+		    !test_and_set_bit(PERF_STS_LNKUP, &peer->sts)) {
+			perf_cmd_exec(peer, PERF_CMD_SSIZE);
+		} else if (!lnk_up &&
+			   test_and_clear_bit(PERF_STS_LNKUP, &peer->sts)) {
+			perf_cmd_exec(peer, PERF_CMD_CLEAR);
+		}
 	}
 }
 
 static void perf_db_event(void *ctx, int vec)
 {
 	struct perf_ctx *perf = ctx;
-	u64 db_bits, db_mask;
 
-	db_mask = ntb_db_vector_mask(perf->ntb, vec);
-	db_bits = ntb_db_read(perf->ntb);
+	dev_dbg(&perf->ntb->dev, "DB vec %d mask %#llx bits %#llx\n", vec,
+		ntb_db_vector_mask(perf->ntb, vec), ntb_db_read(perf->ntb));
 
-	dev_dbg(&perf->ntb->dev, "doorbell vec %d mask %#llx bits %#llx\n",
-		vec, db_mask, db_bits);
+	/* Just receive all available commands */
+	(void)perf_cmd_recv(perf);
+}
+
+static void perf_msg_event(void *ctx)
+{
+	struct perf_ctx *perf = ctx;
+
+	dev_dbg(&perf->ntb->dev, "Msg status bits %#llx\n",
+		ntb_msg_read_sts(perf->ntb));
+
+	/* Messages are only sent one-by-one */
+	(void)perf_cmd_recv(perf);
 }
 
 static const struct ntb_ctx_ops perf_ops = {
 	.link_event = perf_link_event,
 	.db_event = perf_db_event,
+	.msg_event = perf_msg_event
 };
 
-static void perf_copy_callback(void *data)
+static void perf_free_outbuf(struct perf_peer *peer)
+{
+	(void)ntb_peer_mw_clear_trans(peer->perf->ntb, peer->pidx, peer->gidx);
+}
+
+static int perf_setup_outbuf(struct perf_peer *peer)
 {
-	struct pthr_ctx *pctx = data;
+	struct perf_ctx *perf = peer->perf;
+	int ret;
+
+	/* Outbuf size can be unaligned due to custom max_mw_size */
+	ret = ntb_peer_mw_set_trans(perf->ntb, peer->pidx, peer->gidx,
+				    peer->outbuf_xlat, peer->outbuf_size);
+	if (ret) {
+		dev_err(&perf->ntb->dev, "Failed to set outbuf translation\n");
+		return ret;
+	}
+
+	/* Initialization is finally done */
+	set_bit(PERF_STS_DONE, &peer->sts);
 
-	atomic_dec(&pctx->dma_sync);
+	return 0;
 }
 
-static ssize_t perf_copy(struct pthr_ctx *pctx, char __iomem *dst,
-			 char *src, size_t size)
+static void perf_free_inbuf(struct perf_peer *peer)
 {
-	struct perf_ctx *perf = pctx->perf;
-	struct dma_async_tx_descriptor *txd;
-	struct dma_chan *chan = pctx->dma_chan;
-	struct dma_device *device;
-	struct dmaengine_unmap_data *unmap;
-	dma_cookie_t cookie;
-	size_t src_off, dst_off;
-	struct perf_mw *mw = &perf->mw;
-	void __iomem *vbase;
-	void __iomem *dst_vaddr;
-	dma_addr_t dst_phys;
-	int retries = 0;
+	if (!peer->inbuf)
+		return;
 
-	if (!use_dma) {
-		memcpy_toio(dst, src, size);
-		return size;
+	(void)ntb_mw_clear_trans(peer->perf->ntb, peer->pidx, peer->gidx);
+	dma_free_coherent(&peer->perf->ntb->dev, peer->inbuf_size,
+			  peer->inbuf, peer->inbuf_xlat);
+	peer->inbuf = NULL;
+}
+
+static int perf_setup_inbuf(struct perf_peer *peer)
+{
+	resource_size_t xlat_align, size_align, size_max;
+	struct perf_ctx *perf = peer->perf;
+	int ret;
+
+	/* Get inbound MW parameters */
+	ret = ntb_mw_get_align(perf->ntb, peer->pidx, perf->gidx,
+			       &xlat_align, &size_align, &size_max);
+	if (ret) {
+		dev_err(&perf->ntb->dev, "Couldn't get inbuf restrictions\n");
+		return ret;
 	}
 
-	if (!chan) {
-		dev_err(&perf->ntb->dev, "DMA engine does not exist\n");
+	if (peer->inbuf_size > size_max) {
+		dev_err(&perf->ntb->dev, "Too big inbuf size %pa > %pa\n",
+			&peer->inbuf_size, &size_max);
 		return -EINVAL;
 	}
 
-	device = chan->device;
-	src_off = (uintptr_t)src & ~PAGE_MASK;
-	dst_off = (uintptr_t __force)dst & ~PAGE_MASK;
+	peer->inbuf_size = round_up(peer->inbuf_size, size_align);
 
-	if (!is_dma_copy_aligned(device, src_off, dst_off, size))
-		return -ENODEV;
-
-	vbase = mw->vbase;
-	dst_vaddr = dst;
-	dst_phys = mw->phys_addr + (dst_vaddr - vbase);
+	perf_free_inbuf(peer);
 
-	unmap = dmaengine_get_unmap_data(device->dev, 1, GFP_NOWAIT);
-	if (!unmap)
+	peer->inbuf = dma_alloc_coherent(&perf->ntb->dev, peer->inbuf_size,
+					 &peer->inbuf_xlat, GFP_KERNEL);
+	if (!peer->inbuf) {
+		dev_err(&perf->ntb->dev, "Failed to alloc inbuf of %pa\n",
+			&peer->inbuf_size);
 		return -ENOMEM;
+	}
+	if (!IS_ALIGNED(peer->inbuf_xlat, xlat_align)) {
+		dev_err(&perf->ntb->dev, "Unaligned inbuf allocated\n");
+		goto err_free_inbuf;
+	}
 
-	unmap->len = size;
-	unmap->addr[0] = dma_map_page(device->dev, virt_to_page(src),
-				      src_off, size, DMA_TO_DEVICE);
-	if (dma_mapping_error(device->dev, unmap->addr[0]))
-		goto err_get_unmap;
+	ret = ntb_mw_set_trans(perf->ntb, peer->pidx, peer->gidx,
+			       peer->inbuf_xlat, peer->inbuf_size);
+	if (ret) {
+		dev_err(&perf->ntb->dev, "Failed to set inbuf translation\n");
+		goto err_free_inbuf;
+	}
 
-	unmap->to_cnt = 1;
+	/*
+	 * We submit inbuf xlat transmission cmd for execution here to follow
+	 * the code architecture, even though this method is called from service
+	 * work itself so the command will be executed right after it returns.
+	 */
+	(void)perf_cmd_exec(peer, PERF_CMD_SXLAT);
 
-	do {
-		txd = device->device_prep_dma_memcpy(chan, dst_phys,
-						     unmap->addr[0],
-						     size, DMA_PREP_INTERRUPT);
-		if (!txd) {
-			set_current_state(TASK_INTERRUPTIBLE);
-			schedule_timeout(DMA_OUT_RESOURCE_TO);
-		}
-	} while (!txd && (++retries < DMA_RETRIES));
+	return 0;
 
-	if (!txd) {
-		pctx->dma_prep_err++;
-		goto err_get_unmap;
-	}
+err_free_inbuf:
+	perf_free_inbuf(peer);
 
-	txd->callback = perf_copy_callback;
-	txd->callback_param = pctx;
-	dma_set_unmap(txd, unmap);
+	return ret;
+}
 
-	cookie = dmaengine_submit(txd);
-	if (dma_submit_error(cookie))
-		goto err_set_unmap;
+static void perf_service_work(struct work_struct *work)
+{
+	struct perf_peer *peer = to_peer_service(work);
 
-	dmaengine_unmap_put(unmap);
+	if (test_and_clear_bit(PERF_CMD_SSIZE, &peer->sts))
+		perf_cmd_send(peer, PERF_CMD_SSIZE, peer->outbuf_size);
 
-	atomic_inc(&pctx->dma_sync);
-	dma_async_issue_pending(chan);
+	if (test_and_clear_bit(PERF_CMD_RSIZE, &peer->sts))
+		perf_setup_inbuf(peer);
 
-	return size;
+	if (test_and_clear_bit(PERF_CMD_SXLAT, &peer->sts))
+		perf_cmd_send(peer, PERF_CMD_SXLAT, peer->inbuf_xlat);
 
-err_set_unmap:
-	dmaengine_unmap_put(unmap);
-err_get_unmap:
-	dmaengine_unmap_put(unmap);
-	return 0;
-}
+	if (test_and_clear_bit(PERF_CMD_RXLAT, &peer->sts))
+		perf_setup_outbuf(peer);
 
-static int perf_move_data(struct pthr_ctx *pctx, char __iomem *dst, char *src,
-			  u64 buf_size, u64 win_size, u64 total)
-{
-	int chunks, total_chunks, i;
-	int copied_chunks = 0;
-	u64 copied = 0, result;
-	char __iomem *tmp = dst;
-	u64 perf, diff_us;
-	ktime_t kstart, kstop, kdiff;
-	unsigned long last_sleep = jiffies;
-
-	chunks = div64_u64(win_size, buf_size);
-	total_chunks = div64_u64(total, buf_size);
-	kstart = ktime_get();
-
-	for (i = 0; i < total_chunks; i++) {
-		result = perf_copy(pctx, tmp, src, buf_size);
-		copied += result;
-		copied_chunks++;
-		if (copied_chunks == chunks) {
-			tmp = dst;
-			copied_chunks = 0;
-		} else
-			tmp += buf_size;
-
-		/* Probably should schedule every 5s to prevent soft hang. */
-		if (unlikely((jiffies - last_sleep) > 5 * HZ)) {
-			last_sleep = jiffies;
-			set_current_state(TASK_INTERRUPTIBLE);
-			schedule_timeout(1);
+	if (test_and_clear_bit(PERF_CMD_CLEAR, &peer->sts)) {
+		clear_bit(PERF_STS_DONE, &peer->sts);
+		if (test_bit(0, &peer->perf->busy_flag) &&
+		    peer == peer->perf->test_peer) {
+			dev_warn(&peer->perf->ntb->dev,
+				"Freeing while test on-fly\n");
+			perf_terminate_test(peer->perf);
 		}
+		perf_free_outbuf(peer);
+		perf_free_inbuf(peer);
+	}
+}
 
-		if (unlikely(kthread_should_stop()))
-			break;
+static int perf_init_service(struct perf_ctx *perf)
+{
+	u64 mask;
+
+	if (ntb_peer_mw_count(perf->ntb) < perf->pcnt + 1) {
+		dev_err(&perf->ntb->dev, "Not enough memory windows\n");
+		return -EINVAL;
 	}
 
-	if (use_dma) {
-		pr_debug("%s: All DMA descriptors submitted\n", current->comm);
-		while (atomic_read(&pctx->dma_sync) != 0) {
-			if (kthread_should_stop())
-				break;
-			msleep(20);
-		}
+	if (ntb_msg_count(perf->ntb) >= PERF_MSG_CNT) {
+		perf->cmd_send = perf_msg_cmd_send;
+		perf->cmd_recv = perf_msg_cmd_recv;
+
+		dev_dbg(&perf->ntb->dev, "Message service initialized\n");
+
+		return 0;
 	}
 
-	kstop = ktime_get();
-	kdiff = ktime_sub(kstop, kstart);
-	diff_us = ktime_to_us(kdiff);
+	dev_dbg(&perf->ntb->dev, "Message service unsupported\n");
 
-	pr_debug("%s: copied %llu bytes\n", current->comm, copied);
+	mask = GENMASK_ULL(perf->pcnt, 0);
+	if (ntb_spad_count(perf->ntb) >= PERF_SPAD_CNT(perf->pcnt) &&
+	    (ntb_db_valid_mask(perf->ntb) & mask) == mask) {
+		perf->cmd_send = perf_spad_cmd_send;
+		perf->cmd_recv = perf_spad_cmd_recv;
 
-	pr_debug("%s: lasted %llu usecs\n", current->comm, diff_us);
+		dev_dbg(&perf->ntb->dev, "Scratchpad service initialized\n");
 
-	perf = div64_u64(copied, diff_us);
+		return 0;
+	}
 
-	pr_debug("%s: MBytes/s: %llu\n", current->comm, perf);
+	dev_dbg(&perf->ntb->dev, "Scratchpad service unsupported\n");
 
-	pctx->copied = copied;
-	pctx->diff_us = diff_us;
+	dev_err(&perf->ntb->dev, "Command services unsupported\n");
 
-	return 0;
+	return -EINVAL;
 }
 
-static bool perf_dma_filter_fn(struct dma_chan *chan, void *node)
+static int perf_enable_service(struct perf_ctx *perf)
 {
-	/* Is the channel required to be on the same node as the device? */
-	if (!on_node)
-		return true;
+	u64 mask, incmd_bit;
+	int ret, sidx, scnt;
 
-	return dev_to_node(&chan->dev->device) == (int)(unsigned long)node;
-}
+	mask = ntb_db_valid_mask(perf->ntb);
+	(void)ntb_db_set_mask(perf->ntb, mask);
 
-static int ntb_perf_thread(void *data)
-{
-	struct pthr_ctx *pctx = data;
-	struct perf_ctx *perf = pctx->perf;
-	struct pci_dev *pdev = perf->ntb->pdev;
-	struct perf_mw *mw = &perf->mw;
-	char __iomem *dst;
-	u64 win_size, buf_size, total;
-	void *src;
-	int rc, node, i;
-	struct dma_chan *dma_chan = NULL;
+	ret = ntb_set_ctx(perf->ntb, perf, &perf_ops);
+	if (ret)
+		return ret;
 
-	pr_debug("kthread %s starting...\n", current->comm);
+	if (perf->cmd_send == perf_msg_cmd_send) {
+		u64 inbits, outbits;
 
-	node = on_node ? dev_to_node(&pdev->dev) : NUMA_NO_NODE;
+		inbits = ntb_msg_inbits(perf->ntb);
+		outbits = ntb_msg_outbits(perf->ntb);
+		(void)ntb_msg_set_mask(perf->ntb, inbits | outbits);
 
-	if (use_dma && !pctx->dma_chan) {
-		dma_cap_mask_t dma_mask;
+		incmd_bit = BIT_ULL(__ffs64(inbits));
+		ret = ntb_msg_clear_mask(perf->ntb, incmd_bit);
 
-		dma_cap_zero(dma_mask);
-		dma_cap_set(DMA_MEMCPY, dma_mask);
-		dma_chan = dma_request_channel(dma_mask, perf_dma_filter_fn,
-					       (void *)(unsigned long)node);
-		if (!dma_chan) {
-			pr_warn("%s: cannot acquire DMA channel, quitting\n",
-				current->comm);
-			return -ENODEV;
-		}
-		pctx->dma_chan = dma_chan;
+		dev_dbg(&perf->ntb->dev, "MSG sts unmasked %#llx\n", incmd_bit);
+	} else {
+		scnt = ntb_spad_count(perf->ntb);
+		for (sidx = 0; sidx < scnt; sidx++)
+			ntb_spad_write(perf->ntb, sidx, PERF_CMD_INVAL);
+		incmd_bit = PERF_SPAD_NOTIFY(perf->gidx);
+		ret = ntb_db_clear_mask(perf->ntb, incmd_bit);
+
+		dev_dbg(&perf->ntb->dev, "DB bits unmasked %#llx\n", incmd_bit);
+	}
+	if (ret) {
+		ntb_clear_ctx(perf->ntb);
+		return ret;
 	}
 
-	for (i = 0; i < MAX_SRCS; i++) {
-		pctx->srcs[i] = kmalloc_node(MAX_TEST_SIZE, GFP_KERNEL, node);
-		if (!pctx->srcs[i]) {
-			rc = -ENOMEM;
-			goto err;
-		}
+	ntb_link_enable(perf->ntb, NTB_SPEED_AUTO, NTB_WIDTH_AUTO);
+	/* Might be not necessary */
+	ntb_link_event(perf->ntb);
+
+	return 0;
+}
+
+static void perf_disable_service(struct perf_ctx *perf)
+{
+	int pidx;
+
+	ntb_link_disable(perf->ntb);
+
+	if (perf->cmd_send == perf_msg_cmd_send) {
+		u64 inbits;
+
+		inbits = ntb_msg_inbits(perf->ntb);
+		(void)ntb_msg_set_mask(perf->ntb, inbits);
+	} else {
+		(void)ntb_db_set_mask(perf->ntb, PERF_SPAD_NOTIFY(perf->gidx));
 	}
 
-	win_size = mw->phys_size;
-	buf_size = 1ULL << seg_order;
-	total = 1ULL << run_order;
+	ntb_clear_ctx(perf->ntb);
 
-	if (buf_size > MAX_TEST_SIZE)
-		buf_size = MAX_TEST_SIZE;
+	for (pidx = 0; pidx < perf->pcnt; pidx++)
+		perf_cmd_exec(&perf->peers[pidx], PERF_CMD_CLEAR);
 
-	dst = (char __iomem *)mw->vbase;
+	for (pidx = 0; pidx < perf->pcnt; pidx++)
+		flush_work(&perf->peers[pidx].service);
+}
 
-	atomic_inc(&perf->tsync);
-	while (atomic_read(&perf->tsync) != perf->perf_threads)
-		schedule();
+/*==============================================================================
+ *                      Performance measuring work-thread
+ *==============================================================================
+ */
 
-	src = pctx->srcs[pctx->src_idx];
-	pctx->src_idx = (pctx->src_idx + 1) & (MAX_SRCS - 1);
+static void perf_dma_copy_callback(void *data)
+{
+	struct perf_thread *pthr = data;
 
-	rc = perf_move_data(pctx, dst, src, buf_size, win_size, total);
+	atomic_dec(&pthr->dma_sync);
+	wake_up(&pthr->dma_wait);
+}
 
-	atomic_dec(&perf->tsync);
+static int perf_copy_chunk(struct perf_thread *pthr,
+			   void __iomem *dst, void *src, size_t len)
+{
+	struct dma_async_tx_descriptor *tx;
+	struct dmaengine_unmap_data *unmap;
+	struct device *dma_dev;
+	int try, ret = 0;
 
-	if (rc < 0) {
-		pr_err("%s: failed\n", current->comm);
-		rc = -ENXIO;
-		goto err;
+	if (!use_dma) {
+		memcpy_toio(dst, src, len);
+		goto ret_check_tsync;
 	}
 
-	for (i = 0; i < MAX_SRCS; i++) {
-		kfree(pctx->srcs[i]);
-		pctx->srcs[i] = NULL;
+	dma_dev = pthr->dma_chan->device->dev;
+
+	if (!is_dma_copy_aligned(pthr->dma_chan->device, offset_in_page(src),
+				 offset_in_page(dst), len))
+		return -EIO;
+
+	unmap = dmaengine_get_unmap_data(dma_dev, 2, GFP_NOWAIT);
+	if (!unmap)
+		return -ENOMEM;
+
+	unmap->len = len;
+	unmap->addr[0] = dma_map_page(dma_dev, virt_to_page(src),
+		offset_in_page(src), len, DMA_TO_DEVICE);
+	if (dma_mapping_error(dma_dev, unmap->addr[0])) {
+		ret = -EIO;
+		goto err_free_resource;
 	}
+	unmap->to_cnt = 1;
 
-	atomic_inc(&perf->tdone);
-	wake_up(pctx->wq);
-	rc = 0;
-	goto done;
+	unmap->addr[1] = dma_map_page(dma_dev, virt_to_page(dst),
+		offset_in_page(dst), len, DMA_FROM_DEVICE);
+	if (dma_mapping_error(dma_dev, unmap->addr[1])) {
+		ret = -EIO;
+		goto err_free_resource;
+	}
+	unmap->from_cnt = 1;
 
-err:
-	for (i = 0; i < MAX_SRCS; i++) {
-		kfree(pctx->srcs[i]);
-		pctx->srcs[i] = NULL;
+	do {
+		tx = dmaengine_prep_dma_memcpy(pthr->dma_chan, unmap->addr[1],
+			unmap->addr[0], len, DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
+		if (!tx)
+			msleep(DMA_MDELAY);
+	} while (!tx && (try++ < DMA_TRIES));
+
+	if (!tx) {
+		ret = -EIO;
+		goto err_free_resource;
 	}
 
-	if (dma_chan) {
-		dma_release_channel(dma_chan);
-		pctx->dma_chan = NULL;
+	tx->callback = perf_dma_copy_callback;
+	tx->callback_param = pthr;
+	dma_set_unmap(tx, unmap);
+
+	if (dma_submit_error(dmaengine_submit(tx))) {
+		dmaengine_unmap_put(unmap);
+		goto err_free_resource;
 	}
 
-done:
-	/* Wait until we are told to stop */
-	for (;;) {
-		set_current_state(TASK_INTERRUPTIBLE);
-		if (kthread_should_stop())
-			break;
-		schedule();
+	dmaengine_unmap_put(unmap);
+
+	atomic_inc(&pthr->dma_sync);
+	dma_async_issue_pending(pthr->dma_chan);
+
+ret_check_tsync:
+	return likely(atomic_read(&pthr->perf->tsync) > 0) ? 0 : -EINTR;
+
+err_free_resource:
+	dmaengine_unmap_put(unmap);
+
+	return ret;
+}
+
+static bool perf_dma_filter(struct dma_chan *chan, void *data)
+{
+	struct perf_ctx *perf = data;
+	int node;
+
+	node = dev_to_node(&perf->ntb->dev);
+
+	return node == NUMA_NO_NODE || node == dev_to_node(chan->device->dev);
+}
+
+static int perf_init_test(struct perf_thread *pthr)
+{
+	struct perf_ctx *perf = pthr->perf;
+	dma_cap_mask_t dma_mask;
+
+	pthr->src = kmalloc_node(perf->test_peer->outbuf_size, GFP_KERNEL,
+				 dev_to_node(&perf->ntb->dev));
+	if (!pthr->src)
+		return -ENOMEM;
+
+	get_random_bytes(pthr->src, perf->test_peer->outbuf_size);
+
+	if (!use_dma)
+		return 0;
+
+	dma_cap_zero(dma_mask);
+	dma_cap_set(DMA_MEMCPY, dma_mask);
+	pthr->dma_chan = dma_request_channel(dma_mask, perf_dma_filter, perf);
+	if (!pthr->dma_chan) {
+		dev_err(&perf->ntb->dev, "%d: Failed to get DMA channel\n",
+			pthr->tidx);
+		atomic_dec(&perf->tsync);
+		wake_up(&perf->twait);
+		kfree(pthr->src);
+		return -ENODEV;
 	}
-	__set_current_state(TASK_RUNNING);
 
-	return rc;
+	atomic_set(&pthr->dma_sync, 0);
+
+	return 0;
 }
 
-static void perf_free_mw(struct perf_ctx *perf)
+static int perf_run_test(struct perf_thread *pthr)
 {
-	struct perf_mw *mw = &perf->mw;
-	struct pci_dev *pdev = perf->ntb->pdev;
+	struct perf_peer *peer = pthr->perf->test_peer;
+	struct perf_ctx *perf = pthr->perf;
+	void __iomem *flt_dst, *bnd_dst;
+	u64 total_size, chunk_size;
+	void *flt_src;
+	int ret = 0;
+
+	total_size = 1ULL << total_order;
+	chunk_size = 1ULL << chunk_order;
+	chunk_size = min_t(u64, peer->outbuf_size, chunk_size);
+
+	flt_src = pthr->src;
+	bnd_dst = peer->outbuf + peer->outbuf_size;
+	flt_dst = peer->outbuf;
+
+	pthr->duration = ktime_get();
+
+	/* Copied field is cleared on test launch stage */
+	while (pthr->copied < total_size) {
+		ret = perf_copy_chunk(pthr, flt_dst, flt_src, chunk_size);
+		if (ret) {
+			dev_err(&perf->ntb->dev, "%d: Got error %d on test\n",
+				pthr->tidx, ret);
+			return ret;
+		}
 
-	if (!mw->virt_addr)
-		return;
+		pthr->copied += chunk_size;
 
-	ntb_mw_clear_trans(perf->ntb, PIDX, 0);
-	dma_free_coherent(&pdev->dev, mw->buf_size,
-			  mw->virt_addr, mw->dma_addr);
-	mw->xlat_size = 0;
-	mw->buf_size = 0;
-	mw->virt_addr = NULL;
+		flt_dst += chunk_size;
+		flt_src += chunk_size;
+		if (flt_dst >= bnd_dst || flt_dst < peer->outbuf) {
+			flt_dst = peer->outbuf;
+			flt_src = pthr->src;
+		}
+
+		/* Give up CPU to give a chance for other threads to use it */
+		schedule();
+	}
+
+	return 0;
 }
 
-static int perf_set_mw(struct perf_ctx *perf, resource_size_t size)
+static int perf_sync_test(struct perf_thread *pthr)
 {
-	struct perf_mw *mw = &perf->mw;
-	size_t xlat_size, buf_size;
-	resource_size_t	xlat_align;
-	resource_size_t	xlat_align_size;
-	int rc;
+	struct perf_ctx *perf = pthr->perf;
 
-	if (!size)
-		return -EINVAL;
+	if (!use_dma)
+		goto no_dma_ret;
 
-	rc = ntb_mw_get_align(perf->ntb, PIDX, 0, &xlat_align,
-			      &xlat_align_size, NULL);
-	if (rc)
-		return rc;
+	wait_event(pthr->dma_wait,
+		   (atomic_read(&pthr->dma_sync) == 0 ||
+		    atomic_read(&perf->tsync) < 0));
 
-	xlat_size = round_up(size, xlat_align_size);
-	buf_size = round_up(size, xlat_align);
+	if (atomic_read(&perf->tsync) < 0)
+		return -EINTR;
 
-	if (mw->xlat_size == xlat_size)
-		return 0;
+no_dma_ret:
+	pthr->duration = ktime_sub(ktime_get(), pthr->duration);
+
+	dev_dbg(&perf->ntb->dev, "%d: copied %llu bytes\n",
+		pthr->tidx, pthr->copied);
 
-	if (mw->buf_size)
-		perf_free_mw(perf);
+	dev_dbg(&perf->ntb->dev, "%d: lasted %llu usecs\n",
+		pthr->tidx, ktime_to_us(pthr->duration));
 
-	mw->xlat_size = xlat_size;
-	mw->buf_size = buf_size;
+	dev_dbg(&perf->ntb->dev, "%d: %llu MBytes/s\n", pthr->tidx,
+		div64_u64(pthr->copied, ktime_to_us(pthr->duration)));
 
-	mw->virt_addr = dma_alloc_coherent(&perf->ntb->pdev->dev, buf_size,
-					   &mw->dma_addr, GFP_KERNEL);
-	if (!mw->virt_addr) {
-		mw->xlat_size = 0;
-		mw->buf_size = 0;
+	return 0;
+}
+
+static void perf_clear_test(struct perf_thread *pthr)
+{
+	struct perf_ctx *perf = pthr->perf;
+
+	if (!use_dma)
+		goto no_dma_notify;
+
+	/*
+	 * If test finished without errors, termination isn't needed.
+	 * We call it anyway just to be sure of the transfers completion.
+	 */
+	(void)dmaengine_terminate_sync(pthr->dma_chan);
+
+	dma_release_channel(pthr->dma_chan);
+
+no_dma_notify:
+	atomic_dec(&perf->tsync);
+	wake_up(&perf->twait);
+	kfree(pthr->src);
+}
+
+static void perf_thread_work(struct work_struct *work)
+{
+	struct perf_thread *pthr = to_thread_work(work);
+	int ret;
+
+	/*
+	 * Perform stages in compliance with use_dma flag value.
+	 * Test status is changed only if error happened, otherwise
+	 * status -ENODATA is kept while test is on-fly. Results
+	 * synchronization is performed only if test fininshed
+	 * without an error or interruption.
+	 */
+	ret = perf_init_test(pthr);
+	if (ret) {
+		pthr->status = ret;
+		return;
 	}
 
-	rc = ntb_mw_set_trans(perf->ntb, PIDX, 0, mw->dma_addr, mw->xlat_size);
-	if (rc) {
-		dev_err(&perf->ntb->dev, "Unable to set mw0 translation\n");
-		perf_free_mw(perf);
-		return -EIO;
+	ret = perf_run_test(pthr);
+	if (ret) {
+		pthr->status = ret;
+		goto err_clear_test;
 	}
 
-	return 0;
+	pthr->status = perf_sync_test(pthr);
+
+err_clear_test:
+	perf_clear_test(pthr);
 }
 
-static void perf_link_work(struct work_struct *work)
+static int perf_set_tcnt(struct perf_ctx *perf, u8 tcnt)
 {
-	struct perf_ctx *perf =
-		container_of(work, struct perf_ctx, link_work.work);
-	struct ntb_dev *ndev = perf->ntb;
-	struct pci_dev *pdev = ndev->pdev;
-	u32 val;
-	u64 size;
-	int rc;
+	if (tcnt == 0 || tcnt > MAX_THREADS_CNT)
+		return -EINVAL;
 
-	dev_dbg(&perf->ntb->pdev->dev, "%s called\n", __func__);
+	if (test_and_set_bit_lock(0, &perf->busy_flag))
+		return -EBUSY;
 
-	size = perf->mw.phys_size;
+	perf->tcnt = tcnt;
 
-	if (max_mw_size && size > max_mw_size)
-		size = max_mw_size;
+	clear_bit_unlock(0, &perf->busy_flag);
 
-	ntb_peer_spad_write(ndev, PIDX, MW_SZ_HIGH, upper_32_bits(size));
-	ntb_peer_spad_write(ndev, PIDX, MW_SZ_LOW, lower_32_bits(size));
-	ntb_peer_spad_write(ndev, PIDX, VERSION, PERF_VERSION);
+	return 0;
+}
+
+static void perf_terminate_test(struct perf_ctx *perf)
+{
+	int tidx;
+
+	atomic_set(&perf->tsync, -1);
+	wake_up(&perf->twait);
 
-	/* now read what peer wrote */
-	val = ntb_spad_read(ndev, VERSION);
-	if (val != PERF_VERSION) {
-		dev_dbg(&pdev->dev, "Remote version = %#x\n", val);
-		goto out;
+	for (tidx = 0; tidx < MAX_THREADS_CNT; tidx++) {
+		wake_up(&perf->threads[tidx].dma_wait);
+		cancel_work_sync(&perf->threads[tidx].work);
 	}
+}
 
-	val = ntb_spad_read(ndev, MW_SZ_HIGH);
-	size = (u64)val << 32;
+static int perf_submit_test(struct perf_peer *peer)
+{
+	struct perf_ctx *perf = peer->perf;
+	struct perf_thread *pthr;
+	int tidx, ret;
+
+	if (!test_bit(PERF_STS_DONE, &peer->sts))
+		return -ENOLINK;
 
-	val = ntb_spad_read(ndev, MW_SZ_LOW);
-	size |= val;
+	if (test_and_set_bit_lock(0, &perf->busy_flag))
+		return -EBUSY;
 
-	dev_dbg(&pdev->dev, "Remote MW size = %#llx\n", size);
+	perf->test_peer = peer;
+	atomic_set(&perf->tsync, perf->tcnt);
 
-	rc = perf_set_mw(perf, size);
-	if (rc)
-		goto out1;
+	for (tidx = 0; tidx < MAX_THREADS_CNT; tidx++) {
+		pthr = &perf->threads[tidx];
 
-	perf->link_is_up = true;
-	wake_up(&perf->link_wq);
+		pthr->status = -ENODATA;
+		pthr->copied = 0;
+		pthr->duration = ktime_set(0, 0);
+		if (tidx < perf->tcnt)
+			(void)queue_work(perf_wq, &pthr->work);
+	}
 
-	return;
+	ret = wait_event_interruptible(perf->twait,
+				       atomic_read(&perf->tsync) <= 0);
+	if (ret == -ERESTARTSYS) {
+		perf_terminate_test(perf);
+		ret = -EINTR;
+	}
 
-out1:
-	perf_free_mw(perf);
+	clear_bit_unlock(0, &perf->busy_flag);
 
-out:
-	if (ntb_link_is_up(ndev, NULL, NULL) == 1)
-		schedule_delayed_work(&perf->link_work,
-				      msecs_to_jiffies(PERF_LINK_DOWN_TIMEOUT));
+	return ret;
 }
 
-static int perf_setup_mw(struct ntb_dev *ntb, struct perf_ctx *perf)
+static int perf_read_stats(struct perf_ctx *perf, char *buf,
+			   size_t size, ssize_t *pos)
 {
-	struct perf_mw *mw;
-	int rc;
+	struct perf_thread *pthr;
+	int tidx;
 
-	mw = &perf->mw;
+	if (test_and_set_bit_lock(0, &perf->busy_flag))
+		return -EBUSY;
 
-	rc = ntb_peer_mw_get_addr(ntb, 0, &mw->phys_addr, &mw->phys_size);
-	if (rc)
-		return rc;
+	(*pos) += scnprintf(buf + *pos, size - *pos,
+		"    Peer %d test statistics:\n", perf->test_peer->pidx);
 
-	perf->mw.vbase = ioremap_wc(mw->phys_addr, mw->phys_size);
-	if (!mw->vbase)
-		return -ENOMEM;
+	for (tidx = 0; tidx < MAX_THREADS_CNT; tidx++) {
+		pthr = &perf->threads[tidx];
+
+		if (pthr->status == -ENODATA)
+			continue;
+
+		if (pthr->status) {
+			(*pos) += scnprintf(buf + *pos, size - *pos,
+				"%d: error status %d\n", tidx, pthr->status);
+			continue;
+		}
+
+		(*pos) += scnprintf(buf + *pos, size - *pos,
+			"%d: copied %llu bytes in %llu usecs, %llu MBytes/s\n",
+			tidx, pthr->copied, ktime_to_us(pthr->duration),
+			div64_u64(pthr->copied, ktime_to_us(pthr->duration)));
+	}
+
+	clear_bit_unlock(0, &perf->busy_flag);
 
 	return 0;
 }
 
-static ssize_t debugfs_run_read(struct file *filp, char __user *ubuf,
-				size_t count, loff_t *offp)
+static void perf_init_threads(struct perf_ctx *perf)
+{
+	struct perf_thread *pthr;
+	int tidx;
+
+	perf->tcnt = DEF_THREADS_CNT;
+	perf->test_peer = &perf->peers[0];
+	init_waitqueue_head(&perf->twait);
+
+	for (tidx = 0; tidx < MAX_THREADS_CNT; tidx++) {
+		pthr = &perf->threads[tidx];
+
+		pthr->perf = perf;
+		pthr->tidx = tidx;
+		pthr->status = -ENODATA;
+		init_waitqueue_head(&pthr->dma_wait);
+		INIT_WORK(&pthr->work, perf_thread_work);
+	}
+}
+
+static void perf_clear_threads(struct perf_ctx *perf)
 {
-	struct perf_ctx *perf = filp->private_data;
+	perf_terminate_test(perf);
+}
+
+/*==============================================================================
+ *                               DebugFS nodes
+ *==============================================================================
+ */
+
+static ssize_t perf_dbgfs_read_info(struct file *filep, char __user *ubuf,
+				    size_t size, loff_t *offp)
+{
+	struct perf_ctx *perf = filep->private_data;
+	struct perf_peer *peer;
+	size_t buf_size;
+	ssize_t pos = 0;
+	int ret, pidx;
 	char *buf;
-	ssize_t ret, out_off = 0;
-	struct pthr_ctx *pctx;
-	int i;
-	u64 rate;
 
-	if (!perf)
-		return 0;
+	buf_size = min_t(size_t, size, 0x1000U);
 
-	buf = kmalloc(1024, GFP_KERNEL);
+	buf = kmalloc(buf_size, GFP_KERNEL);
 	if (!buf)
 		return -ENOMEM;
 
-	if (mutex_is_locked(&perf->run_mutex)) {
-		out_off = scnprintf(buf, 64, "running\n");
-		goto read_from_buf;
+	pos += scnprintf(buf + pos, buf_size - pos,
+		"    Performance measuring tool info:\n\n");
+
+	pos += scnprintf(buf + pos, buf_size - pos,
+		"Local port %d, Global index %d\n", ntb_port_number(perf->ntb),
+		perf->gidx);
+	pos += scnprintf(buf + pos, buf_size - pos, "Test status: ");
+	if (test_bit(0, &perf->busy_flag)) {
+		pos += scnprintf(buf + pos, buf_size - pos,
+			"on-fly with port %d (%d)\n",
+			ntb_peer_port_number(perf->ntb, perf->test_peer->pidx),
+			perf->test_peer->pidx);
+	} else {
+		pos += scnprintf(buf + pos, buf_size - pos, "idle\n");
 	}
 
-	for (i = 0; i < MAX_THREADS; i++) {
-		pctx = &perf->pthr_ctx[i];
+	for (pidx = 0; pidx < perf->pcnt; pidx++) {
+		peer = &perf->peers[pidx];
+
+		pos += scnprintf(buf + pos, buf_size - pos,
+			"Port %d (%d), Global index %d:\n",
+			ntb_peer_port_number(perf->ntb, peer->pidx), peer->pidx,
+			peer->gidx);
+
+		pos += scnprintf(buf + pos, buf_size - pos,
+			"\tLink status: %s\n",
+			test_bit(PERF_STS_LNKUP, &peer->sts) ? "up" : "down");
+
+		pos += scnprintf(buf + pos, buf_size - pos,
+			"\tOut buffer addr 0x%pK\n", peer->outbuf);
 
-		if (pctx->status == -ENODATA)
-			break;
+		pos += scnprintf(buf + pos, buf_size - pos,
+			"\tOut buffer size %pa\n", &peer->outbuf_size);
 
-		if (pctx->status) {
-			out_off += scnprintf(buf + out_off, 1024 - out_off,
-					    "%d: error %d\n", i,
-					    pctx->status);
+		pos += scnprintf(buf + pos, buf_size - pos,
+			"\tOut buffer xlat 0x%016llx[p]\n", peer->outbuf_xlat);
+
+		if (!peer->inbuf) {
+			pos += scnprintf(buf + pos, buf_size - pos,
+				"\tIn buffer addr: unallocated\n");
 			continue;
 		}
 
-		rate = div64_u64(pctx->copied, pctx->diff_us);
-		out_off += scnprintf(buf + out_off, 1024 - out_off,
-			"%d: copied %llu bytes in %llu usecs, %llu MBytes/s\n",
-			i, pctx->copied, pctx->diff_us, rate);
+		pos += scnprintf(buf + pos, buf_size - pos,
+			"\tIn buffer addr 0x%pK\n", peer->inbuf);
+
+		pos += scnprintf(buf + pos, buf_size - pos,
+			"\tIn buffer size %pa\n", &peer->inbuf_size);
+
+		pos += scnprintf(buf + pos, buf_size - pos,
+			"\tIn buffer xlat %pad[p]\n", &peer->inbuf_xlat);
 	}
 
-read_from_buf:
-	ret = simple_read_from_buffer(ubuf, count, offp, buf, out_off);
+	ret = simple_read_from_buffer(ubuf, size, offp, buf, pos);
 	kfree(buf);
 
 	return ret;
 }
 
-static void threads_cleanup(struct perf_ctx *perf)
+static const struct file_operations perf_dbgfs_info = {
+	.open = simple_open,
+	.read = perf_dbgfs_read_info
+};
+
+static ssize_t perf_dbgfs_read_run(struct file *filep, char __user *ubuf,
+				   size_t size, loff_t *offp)
 {
-	struct pthr_ctx *pctx;
-	int i;
+	struct perf_ctx *perf = filep->private_data;
+	ssize_t ret, pos = 0;
+	char *buf;
 
-	for (i = 0; i < MAX_THREADS; i++) {
-		pctx = &perf->pthr_ctx[i];
-		if (pctx->thread) {
-			pctx->status = kthread_stop(pctx->thread);
-			pctx->thread = NULL;
-		}
-	}
-}
+	buf = kmalloc(1024, GFP_KERNEL);
+	if (!buf)
+		return -ENOMEM;
 
-static void perf_clear_thread_status(struct perf_ctx *perf)
-{
-	int i;
+	ret = perf_read_stats(perf, buf, 1024, &pos);
+	if (ret)
+		goto err_free;
+
+	ret = simple_read_from_buffer(ubuf, size, offp, buf, pos);
+err_free:
+	kfree(buf);
 
-	for (i = 0; i < MAX_THREADS; i++)
-		perf->pthr_ctx[i].status = -ENODATA;
+	return ret;
 }
 
-static ssize_t debugfs_run_write(struct file *filp, const char __user *ubuf,
-				 size_t count, loff_t *offp)
+static ssize_t perf_dbgfs_write_run(struct file *filep, const char __user *ubuf,
+				    size_t size, loff_t *offp)
 {
-	struct perf_ctx *perf = filp->private_data;
-	int node, i;
-	DECLARE_WAIT_QUEUE_HEAD(wq);
+	struct perf_ctx *perf = filep->private_data;
+	struct perf_peer *peer;
+	int pidx, ret;
 
-	if (wait_event_interruptible(perf->link_wq, perf->link_is_up))
-		return -ENOLINK;
+	ret = kstrtoint_from_user(ubuf, size, 0, &pidx);
+	if (ret)
+		return ret;
 
-	if (perf->perf_threads == 0)
+	if (pidx < 0 || pidx >= perf->pcnt)
 		return -EINVAL;
 
-	if (!mutex_trylock(&perf->run_mutex))
-		return -EBUSY;
+	peer = &perf->peers[pidx];
 
-	perf_clear_thread_status(perf);
+	ret = perf_submit_test(peer);
+	if (ret)
+		return ret;
 
-	if (perf->perf_threads > MAX_THREADS) {
-		perf->perf_threads = MAX_THREADS;
-		pr_info("Reset total threads to: %u\n", MAX_THREADS);
-	}
+	return size;
+}
 
-	/* no greater than 1M */
-	if (seg_order > MAX_SEG_ORDER) {
-		seg_order = MAX_SEG_ORDER;
-		pr_info("Fix seg_order to %u\n", seg_order);
-	}
+static const struct file_operations perf_dbgfs_run = {
+	.open = simple_open,
+	.read = perf_dbgfs_read_run,
+	.write = perf_dbgfs_write_run
+};
 
-	if (run_order < seg_order) {
-		run_order = seg_order;
-		pr_info("Fix run_order to %u\n", run_order);
-	}
+static ssize_t perf_dbgfs_read_tcnt(struct file *filep, char __user *ubuf,
+				    size_t size, loff_t *offp)
+{
+	struct perf_ctx *perf = filep->private_data;
+	char buf[8];
+	ssize_t pos;
 
-	node = on_node ? dev_to_node(&perf->ntb->pdev->dev)
-		       : NUMA_NO_NODE;
-	atomic_set(&perf->tdone, 0);
+	pos = scnprintf(buf, sizeof(buf), "%hhu\n", perf->tcnt);
 
-	/* launch kernel thread */
-	for (i = 0; i < perf->perf_threads; i++) {
-		struct pthr_ctx *pctx;
+	return simple_read_from_buffer(ubuf, size, offp, buf, pos);
+}
 
-		pctx = &perf->pthr_ctx[i];
-		atomic_set(&pctx->dma_sync, 0);
-		pctx->perf = perf;
-		pctx->wq = &wq;
-		pctx->thread =
-			kthread_create_on_node(ntb_perf_thread,
-					       (void *)pctx,
-					       node, "ntb_perf %d", i);
-		if (IS_ERR(pctx->thread)) {
-			pctx->thread = NULL;
-			goto err;
-		} else {
-			wake_up_process(pctx->thread);
-		}
-	}
+static ssize_t perf_dbgfs_write_tcnt(struct file *filep,
+				     const char __user *ubuf,
+				     size_t size, loff_t *offp)
+{
+	struct perf_ctx *perf = filep->private_data;
+	int ret;
+	u8 val;
 
-	wait_event_interruptible(wq,
-		atomic_read(&perf->tdone) == perf->perf_threads);
+	ret = kstrtou8_from_user(ubuf, size, 0, &val);
+	if (ret)
+		return ret;
 
-	threads_cleanup(perf);
-	mutex_unlock(&perf->run_mutex);
-	return count;
+	ret = perf_set_tcnt(perf, val);
+	if (ret)
+		return ret;
 
-err:
-	threads_cleanup(perf);
-	mutex_unlock(&perf->run_mutex);
-	return -ENXIO;
+	return size;
 }
 
-static const struct file_operations ntb_perf_debugfs_run = {
-	.owner = THIS_MODULE,
+static const struct file_operations perf_dbgfs_tcnt = {
 	.open = simple_open,
-	.read = debugfs_run_read,
-	.write = debugfs_run_write,
+	.read = perf_dbgfs_read_tcnt,
+	.write = perf_dbgfs_write_tcnt
 };
 
-static int perf_debugfs_setup(struct perf_ctx *perf)
+static void perf_setup_dbgfs(struct perf_ctx *perf)
 {
 	struct pci_dev *pdev = perf->ntb->pdev;
-	struct dentry *debugfs_node_dir;
-	struct dentry *debugfs_run;
-	struct dentry *debugfs_threads;
-	struct dentry *debugfs_seg_order;
-	struct dentry *debugfs_run_order;
-	struct dentry *debugfs_use_dma;
-	struct dentry *debugfs_on_node;
-
-	if (!debugfs_initialized())
-		return -ENODEV;
 
-	/* Assumpion: only one NTB device in the system */
-	if (!perf_debugfs_dir) {
-		perf_debugfs_dir = debugfs_create_dir(KBUILD_MODNAME, NULL);
-		if (!perf_debugfs_dir)
-			return -ENODEV;
-	}
-
-	debugfs_node_dir = debugfs_create_dir(pci_name(pdev),
-					      perf_debugfs_dir);
-	if (!debugfs_node_dir)
-		goto err;
-
-	debugfs_run = debugfs_create_file("run", S_IRUSR | S_IWUSR,
-					  debugfs_node_dir, perf,
-					  &ntb_perf_debugfs_run);
-	if (!debugfs_run)
-		goto err;
-
-	debugfs_threads = debugfs_create_u8("threads", S_IRUSR | S_IWUSR,
-					    debugfs_node_dir,
-					    &perf->perf_threads);
-	if (!debugfs_threads)
-		goto err;
-
-	debugfs_seg_order = debugfs_create_u32("seg_order", 0600,
-					       debugfs_node_dir,
-					       &seg_order);
-	if (!debugfs_seg_order)
-		goto err;
-
-	debugfs_run_order = debugfs_create_u32("run_order", 0600,
-					       debugfs_node_dir,
-					       &run_order);
-	if (!debugfs_run_order)
-		goto err;
-
-	debugfs_use_dma = debugfs_create_bool("use_dma", 0600,
-					       debugfs_node_dir,
-					       &use_dma);
-	if (!debugfs_use_dma)
-		goto err;
-
-	debugfs_on_node = debugfs_create_bool("on_node", 0600,
-					      debugfs_node_dir,
-					      &on_node);
-	if (!debugfs_on_node)
-		goto err;
+	perf->dbgfs_dir = debugfs_create_dir(pci_name(pdev), perf_dbgfs_topdir);
+	if (!perf->dbgfs_dir) {
+		dev_warn(&perf->ntb->dev, "DebugFS unsupported\n");
+		return;
+	}
+
+	debugfs_create_file("info", 0600, perf->dbgfs_dir, perf,
+			    &perf_dbgfs_info);
 
-	return 0;
+	debugfs_create_file("run", 0600, perf->dbgfs_dir, perf,
+			    &perf_dbgfs_run);
 
-err:
-	debugfs_remove_recursive(perf_debugfs_dir);
-	perf_debugfs_dir = NULL;
-	return -ENODEV;
+	debugfs_create_file("threads_count", 0600, perf->dbgfs_dir, perf,
+			    &perf_dbgfs_tcnt);
+
+	/* They are made read-only for test exec safety and integrity */
+	debugfs_create_u8("chunk_order", 0500, perf->dbgfs_dir, &chunk_order);
+
+	debugfs_create_u8("total_order", 0500, perf->dbgfs_dir, &total_order);
+
+	debugfs_create_bool("use_dma", 0500, perf->dbgfs_dir, &use_dma);
 }
 
-static int perf_probe(struct ntb_client *client, struct ntb_dev *ntb)
+static void perf_clear_dbgfs(struct perf_ctx *perf)
+{
+	debugfs_remove_recursive(perf->dbgfs_dir);
+}
+
+/*==============================================================================
+ *                        Basic driver initialization
+ *==============================================================================
+ */
+
+static struct perf_ctx *perf_create_data(struct ntb_dev *ntb)
 {
-	struct pci_dev *pdev = ntb->pdev;
 	struct perf_ctx *perf;
-	int node;
-	int rc = 0;
 
-	if (ntb_spad_count(ntb) < MAX_SPAD) {
-		dev_err(&ntb->dev, "Not enough scratch pad registers for %s",
-			DRIVER_NAME);
-		return -EIO;
-	}
+	perf = devm_kzalloc(&ntb->dev, sizeof(*perf), GFP_KERNEL);
+	if (!perf)
+		return ERR_PTR(-ENOMEM);
 
-	if (!ntb->ops->mw_set_trans) {
-		dev_err(&ntb->dev, "Need inbound MW based NTB API\n");
-		return -EINVAL;
+	perf->pcnt = ntb_peer_port_count(ntb);
+	perf->peers = devm_kcalloc(&ntb->dev, perf->pcnt, sizeof(*perf->peers),
+				  GFP_KERNEL);
+	if (!perf->peers)
+		return ERR_PTR(-ENOMEM);
+
+	perf->ntb = ntb;
+
+	return perf;
+}
+
+static int perf_setup_peer_mw(struct perf_peer *peer)
+{
+	struct perf_ctx *perf = peer->perf;
+	phys_addr_t phys_addr;
+	int ret;
+
+	/* Get outbound MW parameters and map it */
+	ret = ntb_peer_mw_get_addr(perf->ntb, peer->gidx, &phys_addr,
+				   &peer->outbuf_size);
+	if (ret)
+		return ret;
+
+	peer->outbuf = devm_ioremap_wc(&perf->ntb->dev, phys_addr,
+					peer->outbuf_size);
+	if (!peer->outbuf)
+		return -ENOMEM;
+
+	if (max_mw_size && peer->outbuf_size > max_mw_size) {
+		peer->outbuf_size = max_mw_size;
+		dev_warn(&peer->perf->ntb->dev,
+			"Peer %d outbuf reduced to %#llx\n", peer->pidx,
+			peer->outbuf_size);
 	}
 
-	if (ntb_peer_port_count(ntb) != NTB_DEF_PEER_CNT)
-		dev_warn(&ntb->dev, "Multi-port NTB devices unsupported\n");
+	return 0;
+}
 
-	node = on_node ? dev_to_node(&pdev->dev) : NUMA_NO_NODE;
-	perf = kzalloc_node(sizeof(*perf), GFP_KERNEL, node);
-	if (!perf) {
-		rc = -ENOMEM;
-		goto err_perf;
+static int perf_init_peers(struct perf_ctx *perf)
+{
+	struct perf_peer *peer;
+	int pidx, lport, ret;
+
+	lport = ntb_port_number(perf->ntb);
+	perf->gidx = -1;
+	for (pidx = 0; pidx < perf->pcnt; pidx++) {
+		peer = &perf->peers[pidx];
+
+		peer->perf = perf;
+		peer->pidx = pidx;
+		if (lport < ntb_peer_port_number(perf->ntb, pidx)) {
+			if (perf->gidx == -1)
+				perf->gidx = pidx;
+			peer->gidx = pidx + 1;
+		} else {
+			peer->gidx = pidx;
+		}
+		INIT_WORK(&peer->service, perf_service_work);
 	}
+	if (perf->gidx == -1)
+		perf->gidx = pidx;
 
-	perf->ntb = ntb;
-	perf->perf_threads = 1;
-	atomic_set(&perf->tsync, 0);
-	mutex_init(&perf->run_mutex);
-	spin_lock_init(&perf->db_lock);
-	perf_setup_mw(ntb, perf);
-	init_waitqueue_head(&perf->link_wq);
-	INIT_DELAYED_WORK(&perf->link_work, perf_link_work);
+	for (pidx = 0; pidx < perf->pcnt; pidx++) {
+		ret = perf_setup_peer_mw(&perf->peers[pidx]);
+		if (ret)
+			return ret;
+	}
+
+	dev_dbg(&perf->ntb->dev, "Global port index %d\n", perf->gidx);
+
+	return 0;
+}
 
-	rc = ntb_set_ctx(ntb, perf, &perf_ops);
-	if (rc)
-		goto err_ctx;
+static int perf_probe(struct ntb_client *client, struct ntb_dev *ntb)
+{
+	struct perf_ctx *perf;
+	int ret;
 
-	perf->link_is_up = false;
-	ntb_link_enable(ntb, NTB_SPEED_AUTO, NTB_WIDTH_AUTO);
-	ntb_link_event(ntb);
+	perf = perf_create_data(ntb);
+	if (IS_ERR(perf))
+		return PTR_ERR(perf);
 
-	rc = perf_debugfs_setup(perf);
-	if (rc)
-		goto err_ctx;
+	ret = perf_init_peers(perf);
+	if (ret)
+		return ret;
 
-	perf_clear_thread_status(perf);
+	perf_init_threads(perf);
 
-	return 0;
+	ret = perf_init_service(perf);
+	if (ret)
+		return ret;
 
-err_ctx:
-	cancel_delayed_work_sync(&perf->link_work);
-	kfree(perf);
-err_perf:
-	return rc;
+	ret = perf_enable_service(perf);
+	if (ret)
+		return ret;
+
+	perf_setup_dbgfs(perf);
+
+	return 0;
 }
 
 static void perf_remove(struct ntb_client *client, struct ntb_dev *ntb)
 {
 	struct perf_ctx *perf = ntb->ctx;
-	int i;
 
-	dev_dbg(&perf->ntb->dev, "%s called\n", __func__);
+	perf_clear_dbgfs(perf);
 
-	mutex_lock(&perf->run_mutex);
+	perf_disable_service(perf);
 
-	cancel_delayed_work_sync(&perf->link_work);
+	perf_clear_threads(perf);
+}
 
-	ntb_clear_ctx(ntb);
-	ntb_link_disable(ntb);
+static struct ntb_client perf_client = {
+	.ops = {
+		.probe = perf_probe,
+		.remove = perf_remove
+	}
+};
 
-	debugfs_remove_recursive(perf_debugfs_dir);
-	perf_debugfs_dir = NULL;
+static int __init perf_init(void)
+{
+	int ret;
 
-	if (use_dma) {
-		for (i = 0; i < MAX_THREADS; i++) {
-			struct pthr_ctx *pctx = &perf->pthr_ctx[i];
+	if (chunk_order > MAX_CHUNK_ORDER) {
+		chunk_order = MAX_CHUNK_ORDER;
+		pr_info("Chunk order reduced to %hhu\n", chunk_order);
+	}
 
-			if (pctx->dma_chan)
-				dma_release_channel(pctx->dma_chan);
-		}
+	if (total_order < chunk_order) {
+		total_order = chunk_order;
+		pr_info("Total data order reduced to %hhu\n", total_order);
 	}
 
-	kfree(perf);
+	perf_wq = alloc_workqueue("perf_wq", WQ_UNBOUND | WQ_SYSFS, 0);
+	if (!perf_wq)
+		return -ENOMEM;
+
+	if (debugfs_initialized())
+		perf_dbgfs_topdir = debugfs_create_dir(KBUILD_MODNAME, NULL);
+
+	ret = ntb_register_client(&perf_client);
+	if (ret) {
+		debugfs_remove_recursive(perf_dbgfs_topdir);
+		destroy_workqueue(perf_wq);
+	}
+
+	return ret;
 }
+module_init(perf_init);
+
+static void __exit perf_exit(void)
+{
+	ntb_unregister_client(&perf_client);
+	debugfs_remove_recursive(perf_dbgfs_topdir);
+	destroy_workqueue(perf_wq);
+}
+module_exit(perf_exit);
 
-static struct ntb_client perf_client = {
-	.ops = {
-		.probe = perf_probe,
-		.remove = perf_remove,
-	},
-};
-module_ntb_client(perf_client);
-- 
2.12.0

Re: [PATCH v2 06/15] NTB: ntb_perf: Add full multi-port NTB API support

[Jon Mason]

On Sun, Dec 3, 2017 at 2:17 PM, Serge Semin <fancer.lancer@gmail.com> wrote:
> NTB API has been updated to support multi-port devices like IDT
> 89HPESx series or Microsemi Switchtec. Message registers
> functionality has also been added to new API. In order to keep
> the new hardware and corresponding capabilities well tested, NTB
> performance driver is accordingly altered.
>
> Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
> ---
>
> Changelog v1:
> - Alter interface in compliance with multi-port API
> - Create Scratchpads and Message compliant NTB link init process
> - Simplify memcpy and DMA-based tests process
> - Limit DebugFS access methods to prevent the driver failure
>
> Changelog v2:
> - Remove driver Author/Description/License macros
> - Replace magic numbers with macros
> - Fix global index calc error for devices with highest port index
> - Fix invalid scratchpad selection in send_msg algorithm
> - Fix bytes order translation in message recv method
> - Use local global index to select an inbound MW
> - Add commands send/recv/exec debug prints
> - Call ntb_mw_get_align when link is supposed to be up
>
>  drivers/ntb/test/ntb_perf.c | 1826 +++++++++++++++++++++++++++++--------------
>  1 file changed, 1222 insertions(+), 604 deletions(-)
>
> diff --git a/drivers/ntb/test/ntb_perf.c b/drivers/ntb/test/ntb_perf.c
> index 427112cf101a..5ca5cc6f9687 100644
> --- a/drivers/ntb/test/ntb_perf.c
> +++ b/drivers/ntb/test/ntb_perf.c
> @@ -5,6 +5,7 @@
>   *   GPL LICENSE SUMMARY
>   *
>   *   Copyright(c) 2015 Intel Corporation. All rights reserved.
> + *   Copyright(c) 2017 T-Platforms. All Rights Reserved.
>   *
>   *   This program is free software; you can redistribute it and/or modify
>   *   it under the terms of version 2 of the GNU General Public License as
> @@ -13,6 +14,7 @@
>   *   BSD LICENSE
>   *
>   *   Copyright(c) 2015 Intel Corporation. All rights reserved.
> + *   Copyright(c) 2017 T-Platforms. All Rights Reserved.
>   *
>   *   Redistribution and use in source and binary forms, with or without
>   *   modification, are permitted provided that the following conditions
> @@ -40,860 +42,1476 @@
>   *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>   *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>   *
> - *   PCIe NTB Perf Linux driver
> + * PCIe NTB Perf Linux driver
> + *
> + * Contact Information:
> + * Dave Jiang <dave.jiang@intel.com>
> + * Serge Semin <fancer.lancer@gmail.com>, <Sergey.Semin@t-platforms.ru>
> + */
> +
> +/*
> + * How to use this tool, by example.
> + *
> + * Assuming $DBG_DIR is something like:
> + * '/sys/kernel/debug/ntb_perf/0000:00:03.0'
> + * Suppose aside from local device there is at least one remote device
> + * connected to NTB with index 0.
> + *-----------------------------------------------------------------------------
> + * Eg: install driver with specified chunk/total orders and dma-enabled flag
> + *
> + * root@self# insmod ntb_perf.ko chunk_order=19 total_order=28 use_dma
> + *-----------------------------------------------------------------------------
> + * Eg: check NTB ports (index) and MW mapping information
> + *
> + * root@self# cat $DBG_DIR/info
> + *-----------------------------------------------------------------------------
> + * Eg: start performance test with peer (index 0) and get the test metrics
> + *
> + * root@self# echo 0 > $DBG_DIR/run
> + * root@self# cat $DBG_DIR/run
>   */
>
>  #include <linux/init.h>
>  #include <linux/kernel.h>
>  #include <linux/module.h>
> -#include <linux/kthread.h>
> -#include <linux/time.h>
> -#include <linux/timer.h>
> +#include <linux/sched.h>
> +#include <linux/wait.h>
>  #include <linux/dma-mapping.h>
> +#include <linux/dmaengine.h>
>  #include <linux/pci.h>
> +#include <linux/ktime.h>
>  #include <linux/slab.h>
> -#include <linux/spinlock.h>
> -#include <linux/debugfs.h>
> -#include <linux/dmaengine.h>
>  #include <linux/delay.h>
>  #include <linux/sizes.h>
> +#include <linux/workqueue.h>
> +#include <linux/debugfs.h>
> +#include <linux/random.h>
>  #include <linux/ntb.h>
> -#include <linux/mutex.h>
>
>  #define DRIVER_NAME            "ntb_perf"
> -#define DRIVER_DESCRIPTION     "PCIe NTB Performance Measurement Tool"
> -
> -#define DRIVER_LICENSE         "Dual BSD/GPL"
> -#define DRIVER_VERSION         "1.0"
> -#define DRIVER_AUTHOR          "Dave Jiang <dave.jiang@intel.com>"
> -
> -#define PERF_LINK_DOWN_TIMEOUT 10
> -#define PERF_VERSION           0xffff0001
> -#define MAX_THREADS            32
> -#define MAX_TEST_SIZE          SZ_1M
> -#define MAX_SRCS               32
> -#define DMA_OUT_RESOURCE_TO    msecs_to_jiffies(50)
> -#define DMA_RETRIES            20
> -#define SZ_4G                  (1ULL << 32)
> -#define MAX_SEG_ORDER          20 /* no larger than 1M for kmalloc buffer */
> -#define PIDX                   NTB_DEF_PEER_IDX
> -
> -MODULE_LICENSE(DRIVER_LICENSE);
> +#define DRIVER_VERSION         "2.0"
> +
> +MODULE_LICENSE("Dual BSD/GPL");
>  MODULE_VERSION(DRIVER_VERSION);
> -MODULE_AUTHOR(DRIVER_AUTHOR);
> -MODULE_DESCRIPTION(DRIVER_DESCRIPTION);
> +MODULE_AUTHOR("Dave Jiang <dave.jiang@intel.com>");
> +MODULE_DESCRIPTION("PCIe NTB Performance Measurement Tool");
>
> -static struct dentry *perf_debugfs_dir;
> +#define MAX_THREADS_CNT                32
> +#define DEF_THREADS_CNT                1
> +#define MAX_CHUNK_SIZE         SZ_1M
> +#define MAX_CHUNK_ORDER                20 /* no larger than 1M */
> +
> +#define DMA_TRIES              100
> +#define DMA_MDELAY             10
> +
> +#define MSG_TRIES              500
> +#define MSG_UDELAY_LOW         1000
> +#define MSG_UDELAY_HIGH                2000
>
>  static unsigned long max_mw_size;
>  module_param(max_mw_size, ulong, 0644);
> -MODULE_PARM_DESC(max_mw_size, "Limit size of large memory windows");
> +MODULE_PARM_DESC(max_mw_size, "Upper limit of memory window size");
>
> -static unsigned int seg_order = 19; /* 512K */
> -module_param(seg_order, uint, 0644);
> -MODULE_PARM_DESC(seg_order, "size order [2^n] of buffer segment for testing");
> +static unsigned char chunk_order = 19; /* 512K */
> +module_param(chunk_order, byte, 0644);
> +MODULE_PARM_DESC(chunk_order, "Data chunk order [2^n] to transfer");
>
> -static unsigned int run_order = 32; /* 4G */
> -module_param(run_order, uint, 0644);
> -MODULE_PARM_DESC(run_order, "size order [2^n] of total data to transfer");
> +static unsigned char total_order = 30; /* 1G */
> +module_param(total_order, byte, 0644);
> +MODULE_PARM_DESC(total_order, "Total data order [2^n] to transfer");
>
>  static bool use_dma; /* default to 0 */
>  module_param(use_dma, bool, 0644);
> -MODULE_PARM_DESC(use_dma, "Using DMA engine to measure performance");
> -
> -static bool on_node = true; /* default to 1 */
> -module_param(on_node, bool, 0644);
> -MODULE_PARM_DESC(on_node, "Run threads only on NTB device node (default: true)");
> -
> -struct perf_mw {
> -       phys_addr_t     phys_addr;
> -       resource_size_t phys_size;
> -       void __iomem    *vbase;
> -       size_t          xlat_size;
> -       size_t          buf_size;
> -       void            *virt_addr;
> -       dma_addr_t      dma_addr;
> +MODULE_PARM_DESC(use_dma, "Use DMA engine to measure performance");
> +
> +/*==============================================================================
> + *                         Perf driver data definition
> + *==============================================================================
> + */
> +
> +enum perf_cmd {
> +       PERF_CMD_INVAL = -1,/* invalid spad command */
> +       PERF_CMD_SSIZE = 0, /* send out buffer size */
> +       PERF_CMD_RSIZE = 1, /* recv in  buffer size */
> +       PERF_CMD_SXLAT = 2, /* send in  buffer xlat */
> +       PERF_CMD_RXLAT = 3, /* recv out buffer xlat */
> +       PERF_CMD_CLEAR = 4, /* clear allocated memory */
> +       PERF_STS_DONE  = 5, /* init is done */
> +       PERF_STS_LNKUP = 6, /* link up state flag */
>  };
>
>  struct perf_ctx;
>
> -struct pthr_ctx {
> -       struct task_struct      *thread;
> -       struct perf_ctx         *perf;
> -       atomic_t                dma_sync;
> -       struct dma_chan         *dma_chan;
> -       int                     dma_prep_err;
> -       int                     src_idx;
> -       void                    *srcs[MAX_SRCS];
> -       wait_queue_head_t       *wq;
> -       int                     status;
> -       u64                     copied;
> -       u64                     diff_us;
> +struct perf_peer {
> +       struct perf_ctx *perf;
> +       int pidx;
> +       int gidx;
> +
> +       /* Outbound MW params */
> +       u64 outbuf_xlat;
> +       resource_size_t outbuf_size;
> +       void __iomem *outbuf;
> +
> +       /* Inbound MW params */
> +       dma_addr_t inbuf_xlat;
> +       resource_size_t inbuf_size;
> +       void            *inbuf;
> +
> +       /* NTB connection setup service */
> +       struct work_struct      service;
> +       unsigned long           sts;
>  };
> +#define to_peer_service(__work) \
> +       container_of(__work, struct perf_peer, service)
>
> -struct perf_ctx {
> -       struct ntb_dev          *ntb;
> -       spinlock_t              db_lock;
> -       struct perf_mw          mw;
> -       bool                    link_is_up;
> -       struct delayed_work     link_work;
> -       wait_queue_head_t       link_wq;
> -       u8                      perf_threads;
> -       /* mutex ensures only one set of threads run at once */
> -       struct mutex            run_mutex;
> -       struct pthr_ctx         pthr_ctx[MAX_THREADS];
> -       atomic_t                tsync;
> -       atomic_t                tdone;
> +struct perf_thread {
> +       struct perf_ctx *perf;
> +       int tidx;
> +
> +       /* DMA-based test sync parameters */
> +       atomic_t dma_sync;
> +       wait_queue_head_t dma_wait;
> +       struct dma_chan *dma_chan;
> +
> +       /* Data source and measured statistics */
> +       void *src;
> +       u64 copied;
> +       ktime_t duration;
> +       int status;
> +       struct work_struct work;
>  };
> +#define to_thread_work(__work) \
> +       container_of(__work, struct perf_thread, work)
>
> -enum {
> -       VERSION = 0,
> -       MW_SZ_HIGH,
> -       MW_SZ_LOW,
> -       MAX_SPAD
> +struct perf_ctx {
> +       struct ntb_dev *ntb;
> +
> +       /* Global device index and peers descriptors */
> +       int gidx;
> +       int pcnt;
> +       struct perf_peer *peers;
> +
> +       /* Performance measuring work-threads interface */
> +       unsigned long busy_flag;
> +       wait_queue_head_t twait;
> +       atomic_t tsync;
> +       u8 tcnt;
> +       struct perf_peer *test_peer;
> +       struct perf_thread threads[MAX_THREADS_CNT];
> +
> +       /* Scratchpad/Message IO operations */
> +       int (*cmd_send)(struct perf_peer *peer, enum perf_cmd cmd, u64 data);
> +       int (*cmd_recv)(struct perf_ctx *perf, int *pidx, enum perf_cmd *cmd,
> +                       u64 *data);
> +
> +       struct dentry *dbgfs_dir;
>  };
>
> +/*
> + * Scratchpads-base commands interface
> + */
> +#define PERF_SPAD_CNT(_pcnt) \
> +       (3*((_pcnt) + 1))
> +#define PERF_SPAD_CMD(_gidx) \
> +       (3*(_gidx))
> +#define PERF_SPAD_LDATA(_gidx) \
> +       (3*(_gidx) + 1)
> +#define PERF_SPAD_HDATA(_gidx) \
> +       (3*(_gidx) + 2)
> +#define PERF_SPAD_NOTIFY(_gidx) \
> +       (BIT_ULL(_gidx))
> +
> +/*
> + * Messages-base commands interface
> + */
> +#define PERF_MSG_CNT           3
> +#define PERF_MSG_CMD           0
> +#define PERF_MSG_LDATA         1
> +#define PERF_MSG_HDATA         2
> +
> +/*==============================================================================
> + *                           Static data declarations
> + *==============================================================================
> + */
> +
> +static struct dentry *perf_dbgfs_topdir;
> +
> +static struct workqueue_struct *perf_wq __read_mostly;
> +
> +/*==============================================================================
> + *                  NTB cross-link commands execution service
> + *==============================================================================
> + */
> +
> +static void perf_terminate_test(struct perf_ctx *perf);
> +
> +static inline bool perf_link_is_up(struct perf_peer *peer)
> +{
> +       u64 link;
> +
> +       link = ntb_link_is_up(peer->perf->ntb, NULL, NULL);
> +       return !!(link & BIT_ULL_MASK(peer->pidx));
> +}
> +
> +static int perf_spad_cmd_send(struct perf_peer *peer, enum perf_cmd cmd,
> +                             u64 data)
> +{
> +       struct perf_ctx *perf = peer->perf;
> +       int try;
> +       u32 sts;
> +
> +       dev_dbg(&perf->ntb->dev, "CMD send: %d 0x%llx\n", cmd, data);
> +
> +       /*
> +        * Perform predefined number of attempts before give up.
> +        * We are sending the data to the port specific scratchpad, so
> +        * to prevent a multi-port access race-condition. Additionally
> +        * there is no need in local locking since only thread-safe
> +        * service work is using this method.
> +        */
> +       for (try = 0; try < MSG_TRIES; try++) {
> +               if (!perf_link_is_up(peer))
> +                       return -ENOLINK;
> +
> +               sts = ntb_peer_spad_read(perf->ntb, peer->pidx,
> +                                        PERF_SPAD_CMD(perf->gidx));
> +               if (le32_to_cpu(sts) != PERF_CMD_INVAL) {
> +                       usleep_range(MSG_UDELAY_LOW, MSG_UDELAY_HIGH);
> +                       continue;
> +               }
> +
> +               ntb_peer_spad_write(perf->ntb, peer->pidx,
> +                                   PERF_SPAD_LDATA(perf->gidx),
> +                                   cpu_to_le32(lower_32_bits(data)));
> +               ntb_peer_spad_write(perf->ntb, peer->pidx,
> +                                   PERF_SPAD_HDATA(perf->gidx),
> +                                   cpu_to_le32(upper_32_bits(data)));
> +               mmiowb();
> +               ntb_peer_spad_write(perf->ntb, peer->pidx,
> +                                   PERF_SPAD_CMD(perf->gidx),
> +                                   cpu_to_le32(cmd));
> +               mmiowb();
> +               ntb_peer_db_set(perf->ntb, PERF_SPAD_NOTIFY(peer->gidx));
> +
> +               dev_dbg(&perf->ntb->dev, "DB ring peer %#llx\n",
> +                       PERF_SPAD_NOTIFY(peer->gidx));
> +
> +               break;
> +       }
> +
> +       return try < MSG_TRIES ? 0 : -EAGAIN;
> +}
> +
> +static int perf_spad_cmd_recv(struct perf_ctx *perf, int *pidx,
> +                             enum perf_cmd *cmd, u64 *data)
> +{
> +       struct perf_peer *peer;
> +       u32 val;
> +
> +       ntb_db_clear(perf->ntb, PERF_SPAD_NOTIFY(perf->gidx));
> +
> +       /*
> +        * We start scanning all over, since cleared DB may have been set
> +        * by any peer. Yes, it makes peer with smaller index being
> +        * serviced with greater priority, but it's convenient for spad
> +        * and message code unification and simplicity.
> +        */
> +       for (*pidx = 0; *pidx < perf->pcnt; (*pidx)++) {
> +               peer = &perf->peers[*pidx];
> +
> +               if (!perf_link_is_up(peer))
> +                       continue;
> +
> +               val = ntb_spad_read(perf->ntb, PERF_SPAD_CMD(peer->gidx));
> +               val = le32_to_cpu(val);
> +               if (val == PERF_CMD_INVAL)
> +                       continue;
> +
> +               *cmd = val;
> +
> +               val = ntb_spad_read(perf->ntb, PERF_SPAD_LDATA(peer->gidx));
> +               *data = le32_to_cpu(val);
> +
> +               val = ntb_spad_read(perf->ntb, PERF_SPAD_HDATA(peer->gidx));
> +               *data |= (u64)le32_to_cpu(val) << 32;
> +
> +               /* Next command can be retrieved from now */
> +               ntb_spad_write(perf->ntb, PERF_SPAD_CMD(peer->gidx),
> +                              cpu_to_le32(PERF_CMD_INVAL));
> +
> +               dev_dbg(&perf->ntb->dev, "CMD recv: %d 0x%llx\n", *cmd, *data);
> +
> +               return 0;
> +       }
> +
> +       return -ENODATA;
> +}
> +
> +static int perf_msg_cmd_send(struct perf_peer *peer, enum perf_cmd cmd,
> +                            u64 data)
> +{
> +       struct perf_ctx *perf = peer->perf;
> +       int try, ret;
> +       u64 outbits;
> +
> +       dev_dbg(&perf->ntb->dev, "CMD send: %d 0x%llx\n", cmd, data);
> +
> +       /*
> +        * Perform predefined number of attempts before give up. Message
> +        * registers are free of race-condition problem when accessed
> +        * from different ports, so we don't need splitting registers
> +        * by global device index. We also won't have local locking,
> +        * since the method is used from service work only.
> +        */
> +       outbits = ntb_msg_outbits(perf->ntb);
> +       for (try = 0; try < MSG_TRIES; try++) {
> +               if (!perf_link_is_up(peer))
> +                       return -ENOLINK;
> +
> +               ret = ntb_msg_clear_sts(perf->ntb, outbits);
> +               if (ret)
> +                       return ret;
> +
> +               ntb_peer_msg_write(perf->ntb, peer->pidx, PERF_MSG_LDATA,
> +                             cpu_to_le32(lower_32_bits(data)));
> +
> +               if (ntb_msg_read_sts(perf->ntb) & outbits) {
> +                       usleep_range(MSG_UDELAY_LOW, MSG_UDELAY_HIGH);
> +                       continue;
> +               }
> +
> +               ntb_peer_msg_write(perf->ntb, peer->pidx, PERF_MSG_HDATA,
> +                             cpu_to_le32(upper_32_bits(data)));
> +               mmiowb();
> +
> +               /* This call shall trigger peer message event */
> +               ntb_peer_msg_write(perf->ntb, peer->pidx, PERF_MSG_CMD,
> +                             cpu_to_le32(cmd));
> +
> +               break;
> +       }
> +
> +       return try < MSG_TRIES ? 0 : -EAGAIN;
> +}
> +
> +static int perf_msg_cmd_recv(struct perf_ctx *perf, int *pidx,
> +                            enum perf_cmd *cmd, u64 *data)
> +{
> +       u64 inbits;
> +       u32 val;
> +
> +       inbits = ntb_msg_inbits(perf->ntb);
> +
> +       if (hweight64(ntb_msg_read_sts(perf->ntb) & inbits) < 3)
> +               return -ENODATA;
> +
> +       val = ntb_msg_read(perf->ntb, pidx, PERF_MSG_CMD);
> +       *cmd = le32_to_cpu(val);
> +
> +       val = ntb_msg_read(perf->ntb, pidx, PERF_MSG_LDATA);
> +       *data = le32_to_cpu(val);
> +
> +       val = ntb_msg_read(perf->ntb, pidx, PERF_MSG_HDATA);
> +       *data |= (u64)le32_to_cpu(val) << 32;
> +
> +       /* Next command can be retrieved from now */
> +       ntb_msg_clear_sts(perf->ntb, inbits);
> +
> +       dev_dbg(&perf->ntb->dev, "CMD recv: %d 0x%llx\n", *cmd, *data);
> +
> +       return 0;
> +}
> +
> +static int perf_cmd_send(struct perf_peer *peer, enum perf_cmd cmd, u64 data)
> +{
> +       struct perf_ctx *perf = peer->perf;
> +
> +       if (cmd == PERF_CMD_SSIZE || cmd == PERF_CMD_SXLAT)
> +               return perf->cmd_send(peer, cmd, data);
> +
> +       dev_err(&perf->ntb->dev, "Send invalid command\n");
> +       return -EINVAL;
> +}
> +
> +static int perf_cmd_exec(struct perf_peer *peer, enum perf_cmd cmd)
> +{
> +       switch (cmd) {
> +       case PERF_CMD_SSIZE:
> +       case PERF_CMD_RSIZE:
> +       case PERF_CMD_SXLAT:
> +       case PERF_CMD_RXLAT:
> +       case PERF_CMD_CLEAR:
> +               break;
> +       default:
> +               dev_err(&peer->perf->ntb->dev, "Exec invalid command\n");
> +               return -EINVAL;
> +       }
> +
> +       /* No need of memory barrier, since bit ops have invernal lock */
> +       set_bit(cmd, &peer->sts);
> +
> +       dev_dbg(&peer->perf->ntb->dev, "CMD exec: %d\n", cmd);
> +
> +       (void)queue_work(system_highpri_wq, &peer->service);

Seems like this should be the return value of this function, isntead
of using a cast to ignore it.  Am I missing something?

> +
> +       return 0;
> +}
> +
> +static int perf_cmd_recv(struct perf_ctx *perf)
> +{
> +       struct perf_peer *peer;
> +       int ret, pidx, cmd;
> +       u64 data;
> +
> +       while (!(ret = perf->cmd_recv(perf, &pidx, &cmd, &data))) {
> +               peer = &perf->peers[pidx];
> +
> +               switch (cmd) {
> +               case PERF_CMD_SSIZE:
> +                       peer->inbuf_size = data;
> +                       return perf_cmd_exec(peer, PERF_CMD_RSIZE);
> +               case PERF_CMD_SXLAT:
> +                       peer->outbuf_xlat = data;
> +                       return perf_cmd_exec(peer, PERF_CMD_RXLAT);
> +               default:
> +                       dev_err(&perf->ntb->dev, "Recv invalid command\n");
> +                       return -EINVAL;
> +               }
> +       }
> +
> +       return ret == -ENODATA ? 0 : ret;

Add a comment here explaining that no data came in, and that's ok :)
Otherwise you'll have someone staring at it for 5 mins unnecessarily

> +}
> +
>  static void perf_link_event(void *ctx)
>  {
>         struct perf_ctx *perf = ctx;
> +       struct perf_peer *peer;
> +       bool lnk_up;
> +       int pidx;
>
> -       if (ntb_link_is_up(perf->ntb, NULL, NULL) == 1) {
> -               schedule_delayed_work(&perf->link_work, 2*HZ);
> -       } else {
> -               dev_dbg(&perf->ntb->pdev->dev, "link down\n");
> +       for (pidx = 0; pidx < perf->pcnt; pidx++) {
> +               peer = &perf->peers[pidx];
>
> -               if (!perf->link_is_up)
> -                       cancel_delayed_work_sync(&perf->link_work);
> +               lnk_up = perf_link_is_up(peer);
>
> -               perf->link_is_up = false;
> +               if (lnk_up &&
> +                   !test_and_set_bit(PERF_STS_LNKUP, &peer->sts)) {
> +                       perf_cmd_exec(peer, PERF_CMD_SSIZE);
> +               } else if (!lnk_up &&
> +                          test_and_clear_bit(PERF_STS_LNKUP, &peer->sts)) {
> +                       perf_cmd_exec(peer, PERF_CMD_CLEAR);
> +               }
>         }
>  }
>
>  static void perf_db_event(void *ctx, int vec)
>  {
>         struct perf_ctx *perf = ctx;
> -       u64 db_bits, db_mask;
>
> -       db_mask = ntb_db_vector_mask(perf->ntb, vec);
> -       db_bits = ntb_db_read(perf->ntb);
> +       dev_dbg(&perf->ntb->dev, "DB vec %d mask %#llx bits %#llx\n", vec,
> +               ntb_db_vector_mask(perf->ntb, vec), ntb_db_read(perf->ntb));
>
> -       dev_dbg(&perf->ntb->dev, "doorbell vec %d mask %#llx bits %#llx\n",
> -               vec, db_mask, db_bits);
> +       /* Just receive all available commands */
> +       (void)perf_cmd_recv(perf);

Is this throwing an error if not cast?  If so, can't we just make this
a return type of void?
Same for all casts below too

> +}
> +
> +static void perf_msg_event(void *ctx)
> +{
> +       struct perf_ctx *perf = ctx;
> +
> +       dev_dbg(&perf->ntb->dev, "Msg status bits %#llx\n",
> +               ntb_msg_read_sts(perf->ntb));
> +
> +       /* Messages are only sent one-by-one */
> +       (void)perf_cmd_recv(perf);
>  }
>
>  static const struct ntb_ctx_ops perf_ops = {
>         .link_event = perf_link_event,
>         .db_event = perf_db_event,
> +       .msg_event = perf_msg_event
>  };
>
> -static void perf_copy_callback(void *data)
> +static void perf_free_outbuf(struct perf_peer *peer)
> +{
> +       (void)ntb_peer_mw_clear_trans(peer->perf->ntb, peer->pidx, peer->gidx);
> +}
> +
> +static int perf_setup_outbuf(struct perf_peer *peer)
>  {
> -       struct pthr_ctx *pctx = data;
> +       struct perf_ctx *perf = peer->perf;
> +       int ret;
> +
> +       /* Outbuf size can be unaligned due to custom max_mw_size */
> +       ret = ntb_peer_mw_set_trans(perf->ntb, peer->pidx, peer->gidx,
> +                                   peer->outbuf_xlat, peer->outbuf_size);
> +       if (ret) {
> +               dev_err(&perf->ntb->dev, "Failed to set outbuf translation\n");
> +               return ret;
> +       }
> +
> +       /* Initialization is finally done */
> +       set_bit(PERF_STS_DONE, &peer->sts);
>
> -       atomic_dec(&pctx->dma_sync);
> +       return 0;
>  }
>
> -static ssize_t perf_copy(struct pthr_ctx *pctx, char __iomem *dst,
> -                        char *src, size_t size)
> +static void perf_free_inbuf(struct perf_peer *peer)
>  {
> -       struct perf_ctx *perf = pctx->perf;
> -       struct dma_async_tx_descriptor *txd;
> -       struct dma_chan *chan = pctx->dma_chan;
> -       struct dma_device *device;
> -       struct dmaengine_unmap_data *unmap;
> -       dma_cookie_t cookie;
> -       size_t src_off, dst_off;
> -       struct perf_mw *mw = &perf->mw;
> -       void __iomem *vbase;
> -       void __iomem *dst_vaddr;
> -       dma_addr_t dst_phys;
> -       int retries = 0;
> +       if (!peer->inbuf)
> +               return;
>
> -       if (!use_dma) {
> -               memcpy_toio(dst, src, size);
> -               return size;
> +       (void)ntb_mw_clear_trans(peer->perf->ntb, peer->pidx, peer->gidx);
> +       dma_free_coherent(&peer->perf->ntb->dev, peer->inbuf_size,
> +                         peer->inbuf, peer->inbuf_xlat);
> +       peer->inbuf = NULL;
> +}
> +
> +static int perf_setup_inbuf(struct perf_peer *peer)
> +{
> +       resource_size_t xlat_align, size_align, size_max;
> +       struct perf_ctx *perf = peer->perf;
> +       int ret;
> +
> +       /* Get inbound MW parameters */
> +       ret = ntb_mw_get_align(perf->ntb, peer->pidx, perf->gidx,
> +                              &xlat_align, &size_align, &size_max);
> +       if (ret) {
> +               dev_err(&perf->ntb->dev, "Couldn't get inbuf restrictions\n");
> +               return ret;
>         }
>
> -       if (!chan) {
> -               dev_err(&perf->ntb->dev, "DMA engine does not exist\n");
> +       if (peer->inbuf_size > size_max) {
> +               dev_err(&perf->ntb->dev, "Too big inbuf size %pa > %pa\n",
> +                       &peer->inbuf_size, &size_max);
>                 return -EINVAL;
>         }
>
> -       device = chan->device;
> -       src_off = (uintptr_t)src & ~PAGE_MASK;
> -       dst_off = (uintptr_t __force)dst & ~PAGE_MASK;
> +       peer->inbuf_size = round_up(peer->inbuf_size, size_align);
>
> -       if (!is_dma_copy_aligned(device, src_off, dst_off, size))
> -               return -ENODEV;
> -
> -       vbase = mw->vbase;
> -       dst_vaddr = dst;
> -       dst_phys = mw->phys_addr + (dst_vaddr - vbase);
> +       perf_free_inbuf(peer);
>
> -       unmap = dmaengine_get_unmap_data(device->dev, 1, GFP_NOWAIT);
> -       if (!unmap)
> +       peer->inbuf = dma_alloc_coherent(&perf->ntb->dev, peer->inbuf_size,
> +                                        &peer->inbuf_xlat, GFP_KERNEL);
> +       if (!peer->inbuf) {
> +               dev_err(&perf->ntb->dev, "Failed to alloc inbuf of %pa\n",
> +                       &peer->inbuf_size);
>                 return -ENOMEM;
> +       }
> +       if (!IS_ALIGNED(peer->inbuf_xlat, xlat_align)) {
> +               dev_err(&perf->ntb->dev, "Unaligned inbuf allocated\n");
> +               goto err_free_inbuf;
> +       }
>
> -       unmap->len = size;
> -       unmap->addr[0] = dma_map_page(device->dev, virt_to_page(src),
> -                                     src_off, size, DMA_TO_DEVICE);
> -       if (dma_mapping_error(device->dev, unmap->addr[0]))
> -               goto err_get_unmap;
> +       ret = ntb_mw_set_trans(perf->ntb, peer->pidx, peer->gidx,
> +                              peer->inbuf_xlat, peer->inbuf_size);
> +       if (ret) {
> +               dev_err(&perf->ntb->dev, "Failed to set inbuf translation\n");
> +               goto err_free_inbuf;
> +       }
>
> -       unmap->to_cnt = 1;
> +       /*
> +        * We submit inbuf xlat transmission cmd for execution here to follow
> +        * the code architecture, even though this method is called from service
> +        * work itself so the command will be executed right after it returns.
> +        */
> +       (void)perf_cmd_exec(peer, PERF_CMD_SXLAT);
>
> -       do {
> -               txd = device->device_prep_dma_memcpy(chan, dst_phys,
> -                                                    unmap->addr[0],
> -                                                    size, DMA_PREP_INTERRUPT);
> -               if (!txd) {
> -                       set_current_state(TASK_INTERRUPTIBLE);
> -                       schedule_timeout(DMA_OUT_RESOURCE_TO);
> -               }
> -       } while (!txd && (++retries < DMA_RETRIES));
> +       return 0;
>
> -       if (!txd) {
> -               pctx->dma_prep_err++;
> -               goto err_get_unmap;
> -       }
> +err_free_inbuf:
> +       perf_free_inbuf(peer);
>
> -       txd->callback = perf_copy_callback;
> -       txd->callback_param = pctx;
> -       dma_set_unmap(txd, unmap);
> +       return ret;
> +}
>
> -       cookie = dmaengine_submit(txd);
> -       if (dma_submit_error(cookie))
> -               goto err_set_unmap;
> +static void perf_service_work(struct work_struct *work)
> +{
> +       struct perf_peer *peer = to_peer_service(work);
>
> -       dmaengine_unmap_put(unmap);
> +       if (test_and_clear_bit(PERF_CMD_SSIZE, &peer->sts))
> +               perf_cmd_send(peer, PERF_CMD_SSIZE, peer->outbuf_size);
>
> -       atomic_inc(&pctx->dma_sync);
> -       dma_async_issue_pending(chan);
> +       if (test_and_clear_bit(PERF_CMD_RSIZE, &peer->sts))
> +               perf_setup_inbuf(peer);
>
> -       return size;
> +       if (test_and_clear_bit(PERF_CMD_SXLAT, &peer->sts))
> +               perf_cmd_send(peer, PERF_CMD_SXLAT, peer->inbuf_xlat);
>
> -err_set_unmap:
> -       dmaengine_unmap_put(unmap);
> -err_get_unmap:
> -       dmaengine_unmap_put(unmap);
> -       return 0;
> -}
> +       if (test_and_clear_bit(PERF_CMD_RXLAT, &peer->sts))
> +               perf_setup_outbuf(peer);
>
> -static int perf_move_data(struct pthr_ctx *pctx, char __iomem *dst, char *src,
> -                         u64 buf_size, u64 win_size, u64 total)
> -{
> -       int chunks, total_chunks, i;
> -       int copied_chunks = 0;
> -       u64 copied = 0, result;
> -       char __iomem *tmp = dst;
> -       u64 perf, diff_us;
> -       ktime_t kstart, kstop, kdiff;
> -       unsigned long last_sleep = jiffies;
> -
> -       chunks = div64_u64(win_size, buf_size);
> -       total_chunks = div64_u64(total, buf_size);
> -       kstart = ktime_get();
> -
> -       for (i = 0; i < total_chunks; i++) {
> -               result = perf_copy(pctx, tmp, src, buf_size);
> -               copied += result;
> -               copied_chunks++;
> -               if (copied_chunks == chunks) {
> -                       tmp = dst;
> -                       copied_chunks = 0;
> -               } else
> -                       tmp += buf_size;
> -
> -               /* Probably should schedule every 5s to prevent soft hang. */
> -               if (unlikely((jiffies - last_sleep) > 5 * HZ)) {
> -                       last_sleep = jiffies;
> -                       set_current_state(TASK_INTERRUPTIBLE);
> -                       schedule_timeout(1);
> +       if (test_and_clear_bit(PERF_CMD_CLEAR, &peer->sts)) {
> +               clear_bit(PERF_STS_DONE, &peer->sts);
> +               if (test_bit(0, &peer->perf->busy_flag) &&
> +                   peer == peer->perf->test_peer) {
> +                       dev_warn(&peer->perf->ntb->dev,
> +                               "Freeing while test on-fly\n");
> +                       perf_terminate_test(peer->perf);
>                 }
> +               perf_free_outbuf(peer);
> +               perf_free_inbuf(peer);
> +       }
> +}
>
> -               if (unlikely(kthread_should_stop()))
> -                       break;
> +static int perf_init_service(struct perf_ctx *perf)
> +{
> +       u64 mask;
> +
> +       if (ntb_peer_mw_count(perf->ntb) < perf->pcnt + 1) {
> +               dev_err(&perf->ntb->dev, "Not enough memory windows\n");
> +               return -EINVAL;
>         }
>
> -       if (use_dma) {
> -               pr_debug("%s: All DMA descriptors submitted\n", current->comm);
> -               while (atomic_read(&pctx->dma_sync) != 0) {
> -                       if (kthread_should_stop())
> -                               break;
> -                       msleep(20);
> -               }
> +       if (ntb_msg_count(perf->ntb) >= PERF_MSG_CNT) {
> +               perf->cmd_send = perf_msg_cmd_send;
> +               perf->cmd_recv = perf_msg_cmd_recv;
> +
> +               dev_dbg(&perf->ntb->dev, "Message service initialized\n");
> +
> +               return 0;
>         }
>
> -       kstop = ktime_get();
> -       kdiff = ktime_sub(kstop, kstart);
> -       diff_us = ktime_to_us(kdiff);
> +       dev_dbg(&perf->ntb->dev, "Message service unsupported\n");
>
> -       pr_debug("%s: copied %llu bytes\n", current->comm, copied);
> +       mask = GENMASK_ULL(perf->pcnt, 0);
> +       if (ntb_spad_count(perf->ntb) >= PERF_SPAD_CNT(perf->pcnt) &&
> +           (ntb_db_valid_mask(perf->ntb) & mask) == mask) {
> +               perf->cmd_send = perf_spad_cmd_send;
> +               perf->cmd_recv = perf_spad_cmd_recv;
>
> -       pr_debug("%s: lasted %llu usecs\n", current->comm, diff_us);
> +               dev_dbg(&perf->ntb->dev, "Scratchpad service initialized\n");
>
> -       perf = div64_u64(copied, diff_us);
> +               return 0;
> +       }
>
> -       pr_debug("%s: MBytes/s: %llu\n", current->comm, perf);
> +       dev_dbg(&perf->ntb->dev, "Scratchpad service unsupported\n");
>
> -       pctx->copied = copied;
> -       pctx->diff_us = diff_us;
> +       dev_err(&perf->ntb->dev, "Command services unsupported\n");
>
> -       return 0;
> +       return -EINVAL;
>  }
>
> -static bool perf_dma_filter_fn(struct dma_chan *chan, void *node)
> +static int perf_enable_service(struct perf_ctx *perf)
>  {
> -       /* Is the channel required to be on the same node as the device? */
> -       if (!on_node)
> -               return true;
> +       u64 mask, incmd_bit;
> +       int ret, sidx, scnt;
>
> -       return dev_to_node(&chan->dev->device) == (int)(unsigned long)node;
> -}
> +       mask = ntb_db_valid_mask(perf->ntb);
> +       (void)ntb_db_set_mask(perf->ntb, mask);
>
> -static int ntb_perf_thread(void *data)
> -{
> -       struct pthr_ctx *pctx = data;
> -       struct perf_ctx *perf = pctx->perf;
> -       struct pci_dev *pdev = perf->ntb->pdev;
> -       struct perf_mw *mw = &perf->mw;
> -       char __iomem *dst;
> -       u64 win_size, buf_size, total;
> -       void *src;
> -       int rc, node, i;
> -       struct dma_chan *dma_chan = NULL;
> +       ret = ntb_set_ctx(perf->ntb, perf, &perf_ops);
> +       if (ret)
> +               return ret;
>
> -       pr_debug("kthread %s starting...\n", current->comm);
> +       if (perf->cmd_send == perf_msg_cmd_send) {
> +               u64 inbits, outbits;
>
> -       node = on_node ? dev_to_node(&pdev->dev) : NUMA_NO_NODE;
> +               inbits = ntb_msg_inbits(perf->ntb);
> +               outbits = ntb_msg_outbits(perf->ntb);
> +               (void)ntb_msg_set_mask(perf->ntb, inbits | outbits);
>
> -       if (use_dma && !pctx->dma_chan) {
> -               dma_cap_mask_t dma_mask;
> +               incmd_bit = BIT_ULL(__ffs64(inbits));
> +               ret = ntb_msg_clear_mask(perf->ntb, incmd_bit);
>
> -               dma_cap_zero(dma_mask);
> -               dma_cap_set(DMA_MEMCPY, dma_mask);
> -               dma_chan = dma_request_channel(dma_mask, perf_dma_filter_fn,
> -                                              (void *)(unsigned long)node);
> -               if (!dma_chan) {
> -                       pr_warn("%s: cannot acquire DMA channel, quitting\n",
> -                               current->comm);
> -                       return -ENODEV;
> -               }
> -               pctx->dma_chan = dma_chan;
> +               dev_dbg(&perf->ntb->dev, "MSG sts unmasked %#llx\n", incmd_bit);
> +       } else {
> +               scnt = ntb_spad_count(perf->ntb);
> +               for (sidx = 0; sidx < scnt; sidx++)
> +                       ntb_spad_write(perf->ntb, sidx, PERF_CMD_INVAL);
> +               incmd_bit = PERF_SPAD_NOTIFY(perf->gidx);
> +               ret = ntb_db_clear_mask(perf->ntb, incmd_bit);
> +
> +               dev_dbg(&perf->ntb->dev, "DB bits unmasked %#llx\n", incmd_bit);
> +       }
> +       if (ret) {
> +               ntb_clear_ctx(perf->ntb);
> +               return ret;
>         }
>
> -       for (i = 0; i < MAX_SRCS; i++) {
> -               pctx->srcs[i] = kmalloc_node(MAX_TEST_SIZE, GFP_KERNEL, node);
> -               if (!pctx->srcs[i]) {
> -                       rc = -ENOMEM;
> -                       goto err;
> -               }
> +       ntb_link_enable(perf->ntb, NTB_SPEED_AUTO, NTB_WIDTH_AUTO);
> +       /* Might be not necessary */
> +       ntb_link_event(perf->ntb);
> +
> +       return 0;
> +}
> +
> +static void perf_disable_service(struct perf_ctx *perf)
> +{
> +       int pidx;
> +
> +       ntb_link_disable(perf->ntb);
> +
> +       if (perf->cmd_send == perf_msg_cmd_send) {
> +               u64 inbits;
> +
> +               inbits = ntb_msg_inbits(perf->ntb);
> +               (void)ntb_msg_set_mask(perf->ntb, inbits);
> +       } else {
> +               (void)ntb_db_set_mask(perf->ntb, PERF_SPAD_NOTIFY(perf->gidx));
>         }
>
> -       win_size = mw->phys_size;
> -       buf_size = 1ULL << seg_order;
> -       total = 1ULL << run_order;
> +       ntb_clear_ctx(perf->ntb);
>
> -       if (buf_size > MAX_TEST_SIZE)
> -               buf_size = MAX_TEST_SIZE;
> +       for (pidx = 0; pidx < perf->pcnt; pidx++)
> +               perf_cmd_exec(&perf->peers[pidx], PERF_CMD_CLEAR);
>
> -       dst = (char __iomem *)mw->vbase;
> +       for (pidx = 0; pidx < perf->pcnt; pidx++)
> +               flush_work(&perf->peers[pidx].service);
> +}
>
> -       atomic_inc(&perf->tsync);
> -       while (atomic_read(&perf->tsync) != perf->perf_threads)
> -               schedule();
> +/*==============================================================================
> + *                      Performance measuring work-thread
> + *==============================================================================
> + */
>
> -       src = pctx->srcs[pctx->src_idx];
> -       pctx->src_idx = (pctx->src_idx + 1) & (MAX_SRCS - 1);
> +static void perf_dma_copy_callback(void *data)
> +{
> +       struct perf_thread *pthr = data;
>
> -       rc = perf_move_data(pctx, dst, src, buf_size, win_size, total);
> +       atomic_dec(&pthr->dma_sync);
> +       wake_up(&pthr->dma_wait);
> +}
>
> -       atomic_dec(&perf->tsync);
> +static int perf_copy_chunk(struct perf_thread *pthr,
> +                          void __iomem *dst, void *src, size_t len)
> +{
> +       struct dma_async_tx_descriptor *tx;
> +       struct dmaengine_unmap_data *unmap;
> +       struct device *dma_dev;
> +       int try, ret = 0;
>
> -       if (rc < 0) {
> -               pr_err("%s: failed\n", current->comm);
> -               rc = -ENXIO;
> -               goto err;
> +       if (!use_dma) {
> +               memcpy_toio(dst, src, len);
> +               goto ret_check_tsync;
>         }
>
> -       for (i = 0; i < MAX_SRCS; i++) {
> -               kfree(pctx->srcs[i]);
> -               pctx->srcs[i] = NULL;
> +       dma_dev = pthr->dma_chan->device->dev;
> +
> +       if (!is_dma_copy_aligned(pthr->dma_chan->device, offset_in_page(src),
> +                                offset_in_page(dst), len))
> +               return -EIO;
> +
> +       unmap = dmaengine_get_unmap_data(dma_dev, 2, GFP_NOWAIT);
> +       if (!unmap)
> +               return -ENOMEM;
> +
> +       unmap->len = len;
> +       unmap->addr[0] = dma_map_page(dma_dev, virt_to_page(src),
> +               offset_in_page(src), len, DMA_TO_DEVICE);
> +       if (dma_mapping_error(dma_dev, unmap->addr[0])) {
> +               ret = -EIO;
> +               goto err_free_resource;
>         }
> +       unmap->to_cnt = 1;
>
> -       atomic_inc(&perf->tdone);
> -       wake_up(pctx->wq);
> -       rc = 0;
> -       goto done;
> +       unmap->addr[1] = dma_map_page(dma_dev, virt_to_page(dst),
> +               offset_in_page(dst), len, DMA_FROM_DEVICE);
> +       if (dma_mapping_error(dma_dev, unmap->addr[1])) {
> +               ret = -EIO;
> +               goto err_free_resource;
> +       }
> +       unmap->from_cnt = 1;
>
> -err:
> -       for (i = 0; i < MAX_SRCS; i++) {
> -               kfree(pctx->srcs[i]);
> -               pctx->srcs[i] = NULL;
> +       do {
> +               tx = dmaengine_prep_dma_memcpy(pthr->dma_chan, unmap->addr[1],
> +                       unmap->addr[0], len, DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
> +               if (!tx)
> +                       msleep(DMA_MDELAY);
> +       } while (!tx && (try++ < DMA_TRIES));
> +
> +       if (!tx) {
> +               ret = -EIO;
> +               goto err_free_resource;
>         }
>
> -       if (dma_chan) {
> -               dma_release_channel(dma_chan);
> -               pctx->dma_chan = NULL;
> +       tx->callback = perf_dma_copy_callback;
> +       tx->callback_param = pthr;
> +       dma_set_unmap(tx, unmap);
> +
> +       if (dma_submit_error(dmaengine_submit(tx))) {
> +               dmaengine_unmap_put(unmap);
> +               goto err_free_resource;
>         }
>
> -done:
> -       /* Wait until we are told to stop */
> -       for (;;) {
> -               set_current_state(TASK_INTERRUPTIBLE);
> -               if (kthread_should_stop())
> -                       break;
> -               schedule();
> +       dmaengine_unmap_put(unmap);
> +
> +       atomic_inc(&pthr->dma_sync);
> +       dma_async_issue_pending(pthr->dma_chan);
> +
> +ret_check_tsync:
> +       return likely(atomic_read(&pthr->perf->tsync) > 0) ? 0 : -EINTR;
> +
> +err_free_resource:
> +       dmaengine_unmap_put(unmap);
> +
> +       return ret;
> +}
> +
> +static bool perf_dma_filter(struct dma_chan *chan, void *data)
> +{
> +       struct perf_ctx *perf = data;
> +       int node;
> +
> +       node = dev_to_node(&perf->ntb->dev);
> +
> +       return node == NUMA_NO_NODE || node == dev_to_node(chan->device->dev);
> +}
> +
> +static int perf_init_test(struct perf_thread *pthr)
> +{
> +       struct perf_ctx *perf = pthr->perf;
> +       dma_cap_mask_t dma_mask;
> +
> +       pthr->src = kmalloc_node(perf->test_peer->outbuf_size, GFP_KERNEL,
> +                                dev_to_node(&perf->ntb->dev));
> +       if (!pthr->src)
> +               return -ENOMEM;
> +
> +       get_random_bytes(pthr->src, perf->test_peer->outbuf_size);
> +
> +       if (!use_dma)
> +               return 0;
> +
> +       dma_cap_zero(dma_mask);
> +       dma_cap_set(DMA_MEMCPY, dma_mask);
> +       pthr->dma_chan = dma_request_channel(dma_mask, perf_dma_filter, perf);
> +       if (!pthr->dma_chan) {
> +               dev_err(&perf->ntb->dev, "%d: Failed to get DMA channel\n",
> +                       pthr->tidx);
> +               atomic_dec(&perf->tsync);
> +               wake_up(&perf->twait);
> +               kfree(pthr->src);
> +               return -ENODEV;
>         }
> -       __set_current_state(TASK_RUNNING);
>
> -       return rc;
> +       atomic_set(&pthr->dma_sync, 0);
> +
> +       return 0;
>  }
>
> -static void perf_free_mw(struct perf_ctx *perf)
> +static int perf_run_test(struct perf_thread *pthr)
>  {
> -       struct perf_mw *mw = &perf->mw;
> -       struct pci_dev *pdev = perf->ntb->pdev;
> +       struct perf_peer *peer = pthr->perf->test_peer;
> +       struct perf_ctx *perf = pthr->perf;
> +       void __iomem *flt_dst, *bnd_dst;
> +       u64 total_size, chunk_size;
> +       void *flt_src;
> +       int ret = 0;
> +
> +       total_size = 1ULL << total_order;
> +       chunk_size = 1ULL << chunk_order;
> +       chunk_size = min_t(u64, peer->outbuf_size, chunk_size);
> +
> +       flt_src = pthr->src;
> +       bnd_dst = peer->outbuf + peer->outbuf_size;
> +       flt_dst = peer->outbuf;
> +
> +       pthr->duration = ktime_get();
> +
> +       /* Copied field is cleared on test launch stage */
> +       while (pthr->copied < total_size) {
> +               ret = perf_copy_chunk(pthr, flt_dst, flt_src, chunk_size);
> +               if (ret) {
> +                       dev_err(&perf->ntb->dev, "%d: Got error %d on test\n",
> +                               pthr->tidx, ret);
> +                       return ret;
> +               }
>
> -       if (!mw->virt_addr)
> -               return;
> +               pthr->copied += chunk_size;
>
> -       ntb_mw_clear_trans(perf->ntb, PIDX, 0);
> -       dma_free_coherent(&pdev->dev, mw->buf_size,
> -                         mw->virt_addr, mw->dma_addr);
> -       mw->xlat_size = 0;
> -       mw->buf_size = 0;
> -       mw->virt_addr = NULL;
> +               flt_dst += chunk_size;
> +               flt_src += chunk_size;
> +               if (flt_dst >= bnd_dst || flt_dst < peer->outbuf) {
> +                       flt_dst = peer->outbuf;
> +                       flt_src = pthr->src;
> +               }
> +
> +               /* Give up CPU to give a chance for other threads to use it */
> +               schedule();
> +       }
> +
> +       return 0;
>  }
>
> -static int perf_set_mw(struct perf_ctx *perf, resource_size_t size)
> +static int perf_sync_test(struct perf_thread *pthr)
>  {
> -       struct perf_mw *mw = &perf->mw;
> -       size_t xlat_size, buf_size;
> -       resource_size_t xlat_align;
> -       resource_size_t xlat_align_size;
> -       int rc;
> +       struct perf_ctx *perf = pthr->perf;
>
> -       if (!size)
> -               return -EINVAL;
> +       if (!use_dma)
> +               goto no_dma_ret;
>
> -       rc = ntb_mw_get_align(perf->ntb, PIDX, 0, &xlat_align,
> -                             &xlat_align_size, NULL);
> -       if (rc)
> -               return rc;
> +       wait_event(pthr->dma_wait,
> +                  (atomic_read(&pthr->dma_sync) == 0 ||
> +                   atomic_read(&perf->tsync) < 0));
>
> -       xlat_size = round_up(size, xlat_align_size);
> -       buf_size = round_up(size, xlat_align);
> +       if (atomic_read(&perf->tsync) < 0)
> +               return -EINTR;
>
> -       if (mw->xlat_size == xlat_size)
> -               return 0;
> +no_dma_ret:
> +       pthr->duration = ktime_sub(ktime_get(), pthr->duration);
> +
> +       dev_dbg(&perf->ntb->dev, "%d: copied %llu bytes\n",
> +               pthr->tidx, pthr->copied);
>
> -       if (mw->buf_size)
> -               perf_free_mw(perf);
> +       dev_dbg(&perf->ntb->dev, "%d: lasted %llu usecs\n",
> +               pthr->tidx, ktime_to_us(pthr->duration));
>
> -       mw->xlat_size = xlat_size;
> -       mw->buf_size = buf_size;
> +       dev_dbg(&perf->ntb->dev, "%d: %llu MBytes/s\n", pthr->tidx,
> +               div64_u64(pthr->copied, ktime_to_us(pthr->duration)));
>
> -       mw->virt_addr = dma_alloc_coherent(&perf->ntb->pdev->dev, buf_size,
> -                                          &mw->dma_addr, GFP_KERNEL);
> -       if (!mw->virt_addr) {
> -               mw->xlat_size = 0;
> -               mw->buf_size = 0;
> +       return 0;
> +}
> +
> +static void perf_clear_test(struct perf_thread *pthr)
> +{
> +       struct perf_ctx *perf = pthr->perf;
> +
> +       if (!use_dma)
> +               goto no_dma_notify;
> +
> +       /*
> +        * If test finished without errors, termination isn't needed.
> +        * We call it anyway just to be sure of the transfers completion.
> +        */
> +       (void)dmaengine_terminate_sync(pthr->dma_chan);
> +
> +       dma_release_channel(pthr->dma_chan);
> +
> +no_dma_notify:
> +       atomic_dec(&perf->tsync);
> +       wake_up(&perf->twait);
> +       kfree(pthr->src);
> +}
> +
> +static void perf_thread_work(struct work_struct *work)
> +{
> +       struct perf_thread *pthr = to_thread_work(work);
> +       int ret;
> +
> +       /*
> +        * Perform stages in compliance with use_dma flag value.
> +        * Test status is changed only if error happened, otherwise
> +        * status -ENODATA is kept while test is on-fly. Results
> +        * synchronization is performed only if test fininshed
> +        * without an error or interruption.
> +        */
> +       ret = perf_init_test(pthr);
> +       if (ret) {
> +               pthr->status = ret;
> +               return;
>         }
>
> -       rc = ntb_mw_set_trans(perf->ntb, PIDX, 0, mw->dma_addr, mw->xlat_size);
> -       if (rc) {
> -               dev_err(&perf->ntb->dev, "Unable to set mw0 translation\n");
> -               perf_free_mw(perf);
> -               return -EIO;
> +       ret = perf_run_test(pthr);
> +       if (ret) {
> +               pthr->status = ret;
> +               goto err_clear_test;
>         }
>
> -       return 0;
> +       pthr->status = perf_sync_test(pthr);
> +
> +err_clear_test:
> +       perf_clear_test(pthr);
>  }
>
> -static void perf_link_work(struct work_struct *work)
> +static int perf_set_tcnt(struct perf_ctx *perf, u8 tcnt)
>  {
> -       struct perf_ctx *perf =
> -               container_of(work, struct perf_ctx, link_work.work);
> -       struct ntb_dev *ndev = perf->ntb;
> -       struct pci_dev *pdev = ndev->pdev;
> -       u32 val;
> -       u64 size;
> -       int rc;
> +       if (tcnt == 0 || tcnt > MAX_THREADS_CNT)
> +               return -EINVAL;
>
> -       dev_dbg(&perf->ntb->pdev->dev, "%s called\n", __func__);
> +       if (test_and_set_bit_lock(0, &perf->busy_flag))
> +               return -EBUSY;
>
> -       size = perf->mw.phys_size;
> +       perf->tcnt = tcnt;
>
> -       if (max_mw_size && size > max_mw_size)
> -               size = max_mw_size;
> +       clear_bit_unlock(0, &perf->busy_flag);
>
> -       ntb_peer_spad_write(ndev, PIDX, MW_SZ_HIGH, upper_32_bits(size));
> -       ntb_peer_spad_write(ndev, PIDX, MW_SZ_LOW, lower_32_bits(size));
> -       ntb_peer_spad_write(ndev, PIDX, VERSION, PERF_VERSION);
> +       return 0;
> +}
> +
> +static void perf_terminate_test(struct perf_ctx *perf)
> +{
> +       int tidx;
> +
> +       atomic_set(&perf->tsync, -1);
> +       wake_up(&perf->twait);
>
> -       /* now read what peer wrote */
> -       val = ntb_spad_read(ndev, VERSION);
> -       if (val != PERF_VERSION) {
> -               dev_dbg(&pdev->dev, "Remote version = %#x\n", val);
> -               goto out;
> +       for (tidx = 0; tidx < MAX_THREADS_CNT; tidx++) {
> +               wake_up(&perf->threads[tidx].dma_wait);
> +               cancel_work_sync(&perf->threads[tidx].work);
>         }
> +}
>
> -       val = ntb_spad_read(ndev, MW_SZ_HIGH);
> -       size = (u64)val << 32;
> +static int perf_submit_test(struct perf_peer *peer)
> +{
> +       struct perf_ctx *perf = peer->perf;
> +       struct perf_thread *pthr;
> +       int tidx, ret;
> +
> +       if (!test_bit(PERF_STS_DONE, &peer->sts))
> +               return -ENOLINK;
>
> -       val = ntb_spad_read(ndev, MW_SZ_LOW);
> -       size |= val;
> +       if (test_and_set_bit_lock(0, &perf->busy_flag))
> +               return -EBUSY;
>
> -       dev_dbg(&pdev->dev, "Remote MW size = %#llx\n", size);
> +       perf->test_peer = peer;
> +       atomic_set(&perf->tsync, perf->tcnt);
>
> -       rc = perf_set_mw(perf, size);
> -       if (rc)
> -               goto out1;
> +       for (tidx = 0; tidx < MAX_THREADS_CNT; tidx++) {
> +               pthr = &perf->threads[tidx];
>
> -       perf->link_is_up = true;
> -       wake_up(&perf->link_wq);
> +               pthr->status = -ENODATA;
> +               pthr->copied = 0;
> +               pthr->duration = ktime_set(0, 0);
> +               if (tidx < perf->tcnt)
> +                       (void)queue_work(perf_wq, &pthr->work);
> +       }
>
> -       return;
> +       ret = wait_event_interruptible(perf->twait,
> +                                      atomic_read(&perf->tsync) <= 0);
> +       if (ret == -ERESTARTSYS) {
> +               perf_terminate_test(perf);
> +               ret = -EINTR;
> +       }
>
> -out1:
> -       perf_free_mw(perf);
> +       clear_bit_unlock(0, &perf->busy_flag);
>
> -out:
> -       if (ntb_link_is_up(ndev, NULL, NULL) == 1)
> -               schedule_delayed_work(&perf->link_work,
> -                                     msecs_to_jiffies(PERF_LINK_DOWN_TIMEOUT));
> +       return ret;
>  }
>
> -static int perf_setup_mw(struct ntb_dev *ntb, struct perf_ctx *perf)
> +static int perf_read_stats(struct perf_ctx *perf, char *buf,
> +                          size_t size, ssize_t *pos)
>  {
> -       struct perf_mw *mw;
> -       int rc;
> +       struct perf_thread *pthr;
> +       int tidx;
>
> -       mw = &perf->mw;
> +       if (test_and_set_bit_lock(0, &perf->busy_flag))
> +               return -EBUSY;
>
> -       rc = ntb_peer_mw_get_addr(ntb, 0, &mw->phys_addr, &mw->phys_size);
> -       if (rc)
> -               return rc;
> +       (*pos) += scnprintf(buf + *pos, size - *pos,
> +               "    Peer %d test statistics:\n", perf->test_peer->pidx);
>
> -       perf->mw.vbase = ioremap_wc(mw->phys_addr, mw->phys_size);
> -       if (!mw->vbase)
> -               return -ENOMEM;
> +       for (tidx = 0; tidx < MAX_THREADS_CNT; tidx++) {
> +               pthr = &perf->threads[tidx];
> +
> +               if (pthr->status == -ENODATA)
> +                       continue;
> +
> +               if (pthr->status) {
> +                       (*pos) += scnprintf(buf + *pos, size - *pos,
> +                               "%d: error status %d\n", tidx, pthr->status);
> +                       continue;
> +               }
> +
> +               (*pos) += scnprintf(buf + *pos, size - *pos,
> +                       "%d: copied %llu bytes in %llu usecs, %llu MBytes/s\n",
> +                       tidx, pthr->copied, ktime_to_us(pthr->duration),
> +                       div64_u64(pthr->copied, ktime_to_us(pthr->duration)));
> +       }
> +
> +       clear_bit_unlock(0, &perf->busy_flag);
>
>         return 0;
>  }
>
> -static ssize_t debugfs_run_read(struct file *filp, char __user *ubuf,
> -                               size_t count, loff_t *offp)
> +static void perf_init_threads(struct perf_ctx *perf)
> +{
> +       struct perf_thread *pthr;
> +       int tidx;
> +
> +       perf->tcnt = DEF_THREADS_CNT;
> +       perf->test_peer = &perf->peers[0];
> +       init_waitqueue_head(&perf->twait);
> +
> +       for (tidx = 0; tidx < MAX_THREADS_CNT; tidx++) {
> +               pthr = &perf->threads[tidx];
> +
> +               pthr->perf = perf;
> +               pthr->tidx = tidx;
> +               pthr->status = -ENODATA;
> +               init_waitqueue_head(&pthr->dma_wait);
> +               INIT_WORK(&pthr->work, perf_thread_work);
> +       }
> +}
> +
> +static void perf_clear_threads(struct perf_ctx *perf)
>  {
> -       struct perf_ctx *perf = filp->private_data;
> +       perf_terminate_test(perf);
> +}
> +
> +/*==============================================================================
> + *                               DebugFS nodes
> + *==============================================================================
> + */
> +
> +static ssize_t perf_dbgfs_read_info(struct file *filep, char __user *ubuf,
> +                                   size_t size, loff_t *offp)
> +{
> +       struct perf_ctx *perf = filep->private_data;
> +       struct perf_peer *peer;
> +       size_t buf_size;
> +       ssize_t pos = 0;
> +       int ret, pidx;
>         char *buf;
> -       ssize_t ret, out_off = 0;
> -       struct pthr_ctx *pctx;
> -       int i;
> -       u64 rate;
>
> -       if (!perf)
> -               return 0;
> +       buf_size = min_t(size_t, size, 0x1000U);
>
> -       buf = kmalloc(1024, GFP_KERNEL);
> +       buf = kmalloc(buf_size, GFP_KERNEL);
>         if (!buf)
>                 return -ENOMEM;
>
> -       if (mutex_is_locked(&perf->run_mutex)) {
> -               out_off = scnprintf(buf, 64, "running\n");
> -               goto read_from_buf;
> +       pos += scnprintf(buf + pos, buf_size - pos,
> +               "    Performance measuring tool info:\n\n");
> +
> +       pos += scnprintf(buf + pos, buf_size - pos,
> +               "Local port %d, Global index %d\n", ntb_port_number(perf->ntb),
> +               perf->gidx);
> +       pos += scnprintf(buf + pos, buf_size - pos, "Test status: ");
> +       if (test_bit(0, &perf->busy_flag)) {
> +               pos += scnprintf(buf + pos, buf_size - pos,
> +                       "on-fly with port %d (%d)\n",
> +                       ntb_peer_port_number(perf->ntb, perf->test_peer->pidx),
> +                       perf->test_peer->pidx);
> +       } else {
> +               pos += scnprintf(buf + pos, buf_size - pos, "idle\n");
>         }
>
> -       for (i = 0; i < MAX_THREADS; i++) {
> -               pctx = &perf->pthr_ctx[i];
> +       for (pidx = 0; pidx < perf->pcnt; pidx++) {
> +               peer = &perf->peers[pidx];
> +
> +               pos += scnprintf(buf + pos, buf_size - pos,
> +                       "Port %d (%d), Global index %d:\n",
> +                       ntb_peer_port_number(perf->ntb, peer->pidx), peer->pidx,
> +                       peer->gidx);
> +
> +               pos += scnprintf(buf + pos, buf_size - pos,
> +                       "\tLink status: %s\n",
> +                       test_bit(PERF_STS_LNKUP, &peer->sts) ? "up" : "down");
> +
> +               pos += scnprintf(buf + pos, buf_size - pos,
> +                       "\tOut buffer addr 0x%pK\n", peer->outbuf);
>
> -               if (pctx->status == -ENODATA)
> -                       break;
> +               pos += scnprintf(buf + pos, buf_size - pos,
> +                       "\tOut buffer size %pa\n", &peer->outbuf_size);
>
> -               if (pctx->status) {
> -                       out_off += scnprintf(buf + out_off, 1024 - out_off,
> -                                           "%d: error %d\n", i,
> -                                           pctx->status);
> +               pos += scnprintf(buf + pos, buf_size - pos,
> +                       "\tOut buffer xlat 0x%016llx[p]\n", peer->outbuf_xlat);
> +
> +               if (!peer->inbuf) {
> +                       pos += scnprintf(buf + pos, buf_size - pos,
> +                               "\tIn buffer addr: unallocated\n");
>                         continue;
>                 }
>
> -               rate = div64_u64(pctx->copied, pctx->diff_us);
> -               out_off += scnprintf(buf + out_off, 1024 - out_off,
> -                       "%d: copied %llu bytes in %llu usecs, %llu MBytes/s\n",
> -                       i, pctx->copied, pctx->diff_us, rate);
> +               pos += scnprintf(buf + pos, buf_size - pos,
> +                       "\tIn buffer addr 0x%pK\n", peer->inbuf);
> +
> +               pos += scnprintf(buf + pos, buf_size - pos,
> +                       "\tIn buffer size %pa\n", &peer->inbuf_size);
> +
> +               pos += scnprintf(buf + pos, buf_size - pos,
> +                       "\tIn buffer xlat %pad[p]\n", &peer->inbuf_xlat);
>         }
>
> -read_from_buf:
> -       ret = simple_read_from_buffer(ubuf, count, offp, buf, out_off);
> +       ret = simple_read_from_buffer(ubuf, size, offp, buf, pos);
>         kfree(buf);
>
>         return ret;
>  }
>
> -static void threads_cleanup(struct perf_ctx *perf)
> +static const struct file_operations perf_dbgfs_info = {
> +       .open = simple_open,
> +       .read = perf_dbgfs_read_info
> +};
> +
> +static ssize_t perf_dbgfs_read_run(struct file *filep, char __user *ubuf,
> +                                  size_t size, loff_t *offp)
>  {
> -       struct pthr_ctx *pctx;
> -       int i;
> +       struct perf_ctx *perf = filep->private_data;
> +       ssize_t ret, pos = 0;
> +       char *buf;
>
> -       for (i = 0; i < MAX_THREADS; i++) {
> -               pctx = &perf->pthr_ctx[i];
> -               if (pctx->thread) {
> -                       pctx->status = kthread_stop(pctx->thread);
> -                       pctx->thread = NULL;
> -               }
> -       }
> -}
> +       buf = kmalloc(1024, GFP_KERNEL);

This size seems arbitrary.  Either make it a #define or reference the
actual size of what you are wanting.

> +       if (!buf)
> +               return -ENOMEM;
>
> -static void perf_clear_thread_status(struct perf_ctx *perf)
> -{
> -       int i;
> +       ret = perf_read_stats(perf, buf, 1024, &pos);
> +       if (ret)
> +               goto err_free;
> +
> +       ret = simple_read_from_buffer(ubuf, size, offp, buf, pos);
> +err_free:
> +       kfree(buf);
>
> -       for (i = 0; i < MAX_THREADS; i++)
> -               perf->pthr_ctx[i].status = -ENODATA;
> +       return ret;
>  }
>
> -static ssize_t debugfs_run_write(struct file *filp, const char __user *ubuf,
> -                                size_t count, loff_t *offp)
> +static ssize_t perf_dbgfs_write_run(struct file *filep, const char __user *ubuf,
> +                                   size_t size, loff_t *offp)
>  {
> -       struct perf_ctx *perf = filp->private_data;
> -       int node, i;
> -       DECLARE_WAIT_QUEUE_HEAD(wq);
> +       struct perf_ctx *perf = filep->private_data;
> +       struct perf_peer *peer;
> +       int pidx, ret;
>
> -       if (wait_event_interruptible(perf->link_wq, perf->link_is_up))
> -               return -ENOLINK;
> +       ret = kstrtoint_from_user(ubuf, size, 0, &pidx);
> +       if (ret)
> +               return ret;
>
> -       if (perf->perf_threads == 0)
> +       if (pidx < 0 || pidx >= perf->pcnt)
>                 return -EINVAL;
>
> -       if (!mutex_trylock(&perf->run_mutex))
> -               return -EBUSY;
> +       peer = &perf->peers[pidx];
>
> -       perf_clear_thread_status(perf);
> +       ret = perf_submit_test(peer);
> +       if (ret)
> +               return ret;
>
> -       if (perf->perf_threads > MAX_THREADS) {
> -               perf->perf_threads = MAX_THREADS;
> -               pr_info("Reset total threads to: %u\n", MAX_THREADS);
> -       }
> +       return size;
> +}
>
> -       /* no greater than 1M */
> -       if (seg_order > MAX_SEG_ORDER) {
> -               seg_order = MAX_SEG_ORDER;
> -               pr_info("Fix seg_order to %u\n", seg_order);
> -       }
> +static const struct file_operations perf_dbgfs_run = {
> +       .open = simple_open,
> +       .read = perf_dbgfs_read_run,
> +       .write = perf_dbgfs_write_run
> +};
>
> -       if (run_order < seg_order) {
> -               run_order = seg_order;
> -               pr_info("Fix run_order to %u\n", run_order);
> -       }
> +static ssize_t perf_dbgfs_read_tcnt(struct file *filep, char __user *ubuf,
> +                                   size_t size, loff_t *offp)
> +{
> +       struct perf_ctx *perf = filep->private_data;
> +       char buf[8];
> +       ssize_t pos;
>
> -       node = on_node ? dev_to_node(&perf->ntb->pdev->dev)
> -                      : NUMA_NO_NODE;
> -       atomic_set(&perf->tdone, 0);
> +       pos = scnprintf(buf, sizeof(buf), "%hhu\n", perf->tcnt);
>
> -       /* launch kernel thread */
> -       for (i = 0; i < perf->perf_threads; i++) {
> -               struct pthr_ctx *pctx;
> +       return simple_read_from_buffer(ubuf, size, offp, buf, pos);
> +}
>
> -               pctx = &perf->pthr_ctx[i];
> -               atomic_set(&pctx->dma_sync, 0);
> -               pctx->perf = perf;
> -               pctx->wq = &wq;
> -               pctx->thread =
> -                       kthread_create_on_node(ntb_perf_thread,
> -                                              (void *)pctx,
> -                                              node, "ntb_perf %d", i);
> -               if (IS_ERR(pctx->thread)) {
> -                       pctx->thread = NULL;
> -                       goto err;
> -               } else {
> -                       wake_up_process(pctx->thread);
> -               }
> -       }
> +static ssize_t perf_dbgfs_write_tcnt(struct file *filep,
> +                                    const char __user *ubuf,
> +                                    size_t size, loff_t *offp)
> +{
> +       struct perf_ctx *perf = filep->private_data;
> +       int ret;
> +       u8 val;
>
> -       wait_event_interruptible(wq,
> -               atomic_read(&perf->tdone) == perf->perf_threads);
> +       ret = kstrtou8_from_user(ubuf, size, 0, &val);
> +       if (ret)
> +               return ret;
>
> -       threads_cleanup(perf);
> -       mutex_unlock(&perf->run_mutex);
> -       return count;
> +       ret = perf_set_tcnt(perf, val);
> +       if (ret)
> +               return ret;
>
> -err:
> -       threads_cleanup(perf);
> -       mutex_unlock(&perf->run_mutex);
> -       return -ENXIO;
> +       return size;
>  }
>
> -static const struct file_operations ntb_perf_debugfs_run = {
> -       .owner = THIS_MODULE,
> +static const struct file_operations perf_dbgfs_tcnt = {
>         .open = simple_open,
> -       .read = debugfs_run_read,
> -       .write = debugfs_run_write,
> +       .read = perf_dbgfs_read_tcnt,
> +       .write = perf_dbgfs_write_tcnt
>  };
>
> -static int perf_debugfs_setup(struct perf_ctx *perf)
> +static void perf_setup_dbgfs(struct perf_ctx *perf)
>  {
>         struct pci_dev *pdev = perf->ntb->pdev;
> -       struct dentry *debugfs_node_dir;
> -       struct dentry *debugfs_run;
> -       struct dentry *debugfs_threads;
> -       struct dentry *debugfs_seg_order;
> -       struct dentry *debugfs_run_order;
> -       struct dentry *debugfs_use_dma;
> -       struct dentry *debugfs_on_node;
> -
> -       if (!debugfs_initialized())
> -               return -ENODEV;
>
> -       /* Assumpion: only one NTB device in the system */
> -       if (!perf_debugfs_dir) {
> -               perf_debugfs_dir = debugfs_create_dir(KBUILD_MODNAME, NULL);
> -               if (!perf_debugfs_dir)
> -                       return -ENODEV;
> -       }
> -
> -       debugfs_node_dir = debugfs_create_dir(pci_name(pdev),
> -                                             perf_debugfs_dir);
> -       if (!debugfs_node_dir)
> -               goto err;
> -
> -       debugfs_run = debugfs_create_file("run", S_IRUSR | S_IWUSR,
> -                                         debugfs_node_dir, perf,
> -                                         &ntb_perf_debugfs_run);
> -       if (!debugfs_run)
> -               goto err;
> -
> -       debugfs_threads = debugfs_create_u8("threads", S_IRUSR | S_IWUSR,
> -                                           debugfs_node_dir,
> -                                           &perf->perf_threads);
> -       if (!debugfs_threads)
> -               goto err;
> -
> -       debugfs_seg_order = debugfs_create_u32("seg_order", 0600,
> -                                              debugfs_node_dir,
> -                                              &seg_order);
> -       if (!debugfs_seg_order)
> -               goto err;
> -
> -       debugfs_run_order = debugfs_create_u32("run_order", 0600,
> -                                              debugfs_node_dir,
> -                                              &run_order);
> -       if (!debugfs_run_order)
> -               goto err;
> -
> -       debugfs_use_dma = debugfs_create_bool("use_dma", 0600,
> -                                              debugfs_node_dir,
> -                                              &use_dma);
> -       if (!debugfs_use_dma)
> -               goto err;
> -
> -       debugfs_on_node = debugfs_create_bool("on_node", 0600,
> -                                             debugfs_node_dir,
> -                                             &on_node);
> -       if (!debugfs_on_node)
> -               goto err;
> +       perf->dbgfs_dir = debugfs_create_dir(pci_name(pdev), perf_dbgfs_topdir);
> +       if (!perf->dbgfs_dir) {
> +               dev_warn(&perf->ntb->dev, "DebugFS unsupported\n");
> +               return;
> +       }
> +
> +       debugfs_create_file("info", 0600, perf->dbgfs_dir, perf,
> +                           &perf_dbgfs_info);
>
> -       return 0;
> +       debugfs_create_file("run", 0600, perf->dbgfs_dir, perf,
> +                           &perf_dbgfs_run);
>
> -err:
> -       debugfs_remove_recursive(perf_debugfs_dir);
> -       perf_debugfs_dir = NULL;
> -       return -ENODEV;
> +       debugfs_create_file("threads_count", 0600, perf->dbgfs_dir, perf,
> +                           &perf_dbgfs_tcnt);
> +
> +       /* They are made read-only for test exec safety and integrity */
> +       debugfs_create_u8("chunk_order", 0500, perf->dbgfs_dir, &chunk_order);
> +
> +       debugfs_create_u8("total_order", 0500, perf->dbgfs_dir, &total_order);
> +
> +       debugfs_create_bool("use_dma", 0500, perf->dbgfs_dir, &use_dma);
>  }
>
> -static int perf_probe(struct ntb_client *client, struct ntb_dev *ntb)
> +static void perf_clear_dbgfs(struct perf_ctx *perf)
> +{
> +       debugfs_remove_recursive(perf->dbgfs_dir);
> +}
> +
> +/*==============================================================================
> + *                        Basic driver initialization
> + *==============================================================================
> + */
> +
> +static struct perf_ctx *perf_create_data(struct ntb_dev *ntb)
>  {
> -       struct pci_dev *pdev = ntb->pdev;
>         struct perf_ctx *perf;
> -       int node;
> -       int rc = 0;
>
> -       if (ntb_spad_count(ntb) < MAX_SPAD) {
> -               dev_err(&ntb->dev, "Not enough scratch pad registers for %s",
> -                       DRIVER_NAME);
> -               return -EIO;
> -       }
> +       perf = devm_kzalloc(&ntb->dev, sizeof(*perf), GFP_KERNEL);
> +       if (!perf)
> +               return ERR_PTR(-ENOMEM);
>
> -       if (!ntb->ops->mw_set_trans) {
> -               dev_err(&ntb->dev, "Need inbound MW based NTB API\n");
> -               return -EINVAL;
> +       perf->pcnt = ntb_peer_port_count(ntb);
> +       perf->peers = devm_kcalloc(&ntb->dev, perf->pcnt, sizeof(*perf->peers),
> +                                 GFP_KERNEL);
> +       if (!perf->peers)
> +               return ERR_PTR(-ENOMEM);
> +
> +       perf->ntb = ntb;
> +
> +       return perf;
> +}
> +
> +static int perf_setup_peer_mw(struct perf_peer *peer)
> +{
> +       struct perf_ctx *perf = peer->perf;
> +       phys_addr_t phys_addr;
> +       int ret;
> +
> +       /* Get outbound MW parameters and map it */
> +       ret = ntb_peer_mw_get_addr(perf->ntb, peer->gidx, &phys_addr,
> +                                  &peer->outbuf_size);
> +       if (ret)
> +               return ret;
> +
> +       peer->outbuf = devm_ioremap_wc(&perf->ntb->dev, phys_addr,
> +                                       peer->outbuf_size);
> +       if (!peer->outbuf)
> +               return -ENOMEM;
> +
> +       if (max_mw_size && peer->outbuf_size > max_mw_size) {
> +               peer->outbuf_size = max_mw_size;
> +               dev_warn(&peer->perf->ntb->dev,
> +                       "Peer %d outbuf reduced to %#llx\n", peer->pidx,
> +                       peer->outbuf_size);
>         }
>
> -       if (ntb_peer_port_count(ntb) != NTB_DEF_PEER_CNT)
> -               dev_warn(&ntb->dev, "Multi-port NTB devices unsupported\n");
> +       return 0;
> +}
>
> -       node = on_node ? dev_to_node(&pdev->dev) : NUMA_NO_NODE;
> -       perf = kzalloc_node(sizeof(*perf), GFP_KERNEL, node);
> -       if (!perf) {
> -               rc = -ENOMEM;
> -               goto err_perf;
> +static int perf_init_peers(struct perf_ctx *perf)
> +{
> +       struct perf_peer *peer;
> +       int pidx, lport, ret;
> +
> +       lport = ntb_port_number(perf->ntb);
> +       perf->gidx = -1;
> +       for (pidx = 0; pidx < perf->pcnt; pidx++) {
> +               peer = &perf->peers[pidx];
> +
> +               peer->perf = perf;
> +               peer->pidx = pidx;
> +               if (lport < ntb_peer_port_number(perf->ntb, pidx)) {
> +                       if (perf->gidx == -1)
> +                               perf->gidx = pidx;
> +                       peer->gidx = pidx + 1;
> +               } else {
> +                       peer->gidx = pidx;
> +               }
> +               INIT_WORK(&peer->service, perf_service_work);
>         }
> +       if (perf->gidx == -1)
> +               perf->gidx = pidx;
>
> -       perf->ntb = ntb;
> -       perf->perf_threads = 1;
> -       atomic_set(&perf->tsync, 0);
> -       mutex_init(&perf->run_mutex);
> -       spin_lock_init(&perf->db_lock);
> -       perf_setup_mw(ntb, perf);
> -       init_waitqueue_head(&perf->link_wq);
> -       INIT_DELAYED_WORK(&perf->link_work, perf_link_work);
> +       for (pidx = 0; pidx < perf->pcnt; pidx++) {
> +               ret = perf_setup_peer_mw(&perf->peers[pidx]);
> +               if (ret)
> +                       return ret;
> +       }
> +
> +       dev_dbg(&perf->ntb->dev, "Global port index %d\n", perf->gidx);
> +
> +       return 0;
> +}
>
> -       rc = ntb_set_ctx(ntb, perf, &perf_ops);
> -       if (rc)
> -               goto err_ctx;
> +static int perf_probe(struct ntb_client *client, struct ntb_dev *ntb)
> +{
> +       struct perf_ctx *perf;
> +       int ret;
>
> -       perf->link_is_up = false;
> -       ntb_link_enable(ntb, NTB_SPEED_AUTO, NTB_WIDTH_AUTO);
> -       ntb_link_event(ntb);
> +       perf = perf_create_data(ntb);
> +       if (IS_ERR(perf))
> +               return PTR_ERR(perf);
>
> -       rc = perf_debugfs_setup(perf);
> -       if (rc)
> -               goto err_ctx;
> +       ret = perf_init_peers(perf);
> +       if (ret)
> +               return ret;
>
> -       perf_clear_thread_status(perf);
> +       perf_init_threads(perf);
>
> -       return 0;
> +       ret = perf_init_service(perf);
> +       if (ret)
> +               return ret;
>
> -err_ctx:
> -       cancel_delayed_work_sync(&perf->link_work);
> -       kfree(perf);
> -err_perf:
> -       return rc;
> +       ret = perf_enable_service(perf);
> +       if (ret)
> +               return ret;
> +
> +       perf_setup_dbgfs(perf);
> +
> +       return 0;
>  }
>
>  static void perf_remove(struct ntb_client *client, struct ntb_dev *ntb)
>  {
>         struct perf_ctx *perf = ntb->ctx;
> -       int i;
>
> -       dev_dbg(&perf->ntb->dev, "%s called\n", __func__);
> +       perf_clear_dbgfs(perf);
>
> -       mutex_lock(&perf->run_mutex);
> +       perf_disable_service(perf);
>
> -       cancel_delayed_work_sync(&perf->link_work);
> +       perf_clear_threads(perf);
> +}
>
> -       ntb_clear_ctx(ntb);
> -       ntb_link_disable(ntb);
> +static struct ntb_client perf_client = {
> +       .ops = {
> +               .probe = perf_probe,
> +               .remove = perf_remove
> +       }
> +};
>
> -       debugfs_remove_recursive(perf_debugfs_dir);
> -       perf_debugfs_dir = NULL;
> +static int __init perf_init(void)
> +{
> +       int ret;
>
> -       if (use_dma) {
> -               for (i = 0; i < MAX_THREADS; i++) {
> -                       struct pthr_ctx *pctx = &perf->pthr_ctx[i];
> +       if (chunk_order > MAX_CHUNK_ORDER) {
> +               chunk_order = MAX_CHUNK_ORDER;
> +               pr_info("Chunk order reduced to %hhu\n", chunk_order);
> +       }
>
> -                       if (pctx->dma_chan)
> -                               dma_release_channel(pctx->dma_chan);
> -               }
> +       if (total_order < chunk_order) {
> +               total_order = chunk_order;
> +               pr_info("Total data order reduced to %hhu\n", total_order);
>         }
>
> -       kfree(perf);
> +       perf_wq = alloc_workqueue("perf_wq", WQ_UNBOUND | WQ_SYSFS, 0);
> +       if (!perf_wq)
> +               return -ENOMEM;
> +
> +       if (debugfs_initialized())
> +               perf_dbgfs_topdir = debugfs_create_dir(KBUILD_MODNAME, NULL);
> +
> +       ret = ntb_register_client(&perf_client);
> +       if (ret) {
> +               debugfs_remove_recursive(perf_dbgfs_topdir);
> +               destroy_workqueue(perf_wq);
> +       }
> +
> +       return ret;
>  }
> +module_init(perf_init);
> +
> +static void __exit perf_exit(void)
> +{
> +       ntb_unregister_client(&perf_client);
> +       debugfs_remove_recursive(perf_dbgfs_topdir);
> +       destroy_workqueue(perf_wq);
> +}
> +module_exit(perf_exit);
>
> -static struct ntb_client perf_client = {
> -       .ops = {
> -               .probe = perf_probe,
> -               .remove = perf_remove,
> -       },
> -};
> -module_ntb_client(perf_client);
> --
> 2.12.0
>

Re: [PATCH v2 06/15] NTB: ntb_perf: Add full multi-port NTB API support

[Serge Semin]

On Tue, Dec 05, 2017 at 01:21:24PM -0500, Jon Mason <jdmason@kudzu.us> wrote:
> On Sun, Dec 3, 2017 at 2:17 PM, Serge Semin <fancer.lancer@gmail.com> wrote:
> > NTB API has been updated to support multi-port devices like IDT
> > 89HPESx series or Microsemi Switchtec. Message registers
> > functionality has also been added to new API. In order to keep
> > the new hardware and corresponding capabilities well tested, NTB
> > performance driver is accordingly altered.
> >
> > Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
> > ---
> >
> > Changelog v1:
> > - Alter interface in compliance with multi-port API
> > - Create Scratchpads and Message compliant NTB link init process
> > - Simplify memcpy and DMA-based tests process
> > - Limit DebugFS access methods to prevent the driver failure
> >
> > Changelog v2:
> > - Remove driver Author/Description/License macros
> > - Replace magic numbers with macros
> > - Fix global index calc error for devices with highest port index
> > - Fix invalid scratchpad selection in send_msg algorithm
> > - Fix bytes order translation in message recv method
> > - Use local global index to select an inbound MW
> > - Add commands send/recv/exec debug prints
> > - Call ntb_mw_get_align when link is supposed to be up
> >
> >  drivers/ntb/test/ntb_perf.c | 1826 +++++++++++++++++++++++++++++--------------
> >  1 file changed, 1222 insertions(+), 604 deletions(-)
> >
> > diff --git a/drivers/ntb/test/ntb_perf.c b/drivers/ntb/test/ntb_perf.c
> > index 427112cf101a..5ca5cc6f9687 100644
> > --- a/drivers/ntb/test/ntb_perf.c
> > +++ b/drivers/ntb/test/ntb_perf.c
> > @@ -5,6 +5,7 @@
> >   *   GPL LICENSE SUMMARY
> >   *
> >   *   Copyright(c) 2015 Intel Corporation. All rights reserved.
> > + *   Copyright(c) 2017 T-Platforms. All Rights Reserved.
> >   *
> >   *   This program is free software; you can redistribute it and/or modify
> >   *   it under the terms of version 2 of the GNU General Public License as
> > @@ -13,6 +14,7 @@
> >   *   BSD LICENSE
> >   *
> >   *   Copyright(c) 2015 Intel Corporation. All rights reserved.
> > + *   Copyright(c) 2017 T-Platforms. All Rights Reserved.
> >   *
> >   *   Redistribution and use in source and binary forms, with or without
> >   *   modification, are permitted provided that the following conditions
> > @@ -40,860 +42,1476 @@
> >   *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> >   *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> >   *
> > - *   PCIe NTB Perf Linux driver
> > + * PCIe NTB Perf Linux driver
> > + *
> > + * Contact Information:
> > + * Dave Jiang <dave.jiang@intel.com>
> > + * Serge Semin <fancer.lancer@gmail.com>, <Sergey.Semin@t-platforms.ru>
> > + */
> > +
> > +/*
> > + * How to use this tool, by example.
> > + *
> > + * Assuming $DBG_DIR is something like:
> > + * '/sys/kernel/debug/ntb_perf/0000:00:03.0'
> > + * Suppose aside from local device there is at least one remote device
> > + * connected to NTB with index 0.
> > + *-----------------------------------------------------------------------------
> > + * Eg: install driver with specified chunk/total orders and dma-enabled flag
> > + *
> > + * root@self# insmod ntb_perf.ko chunk_order=19 total_order=28 use_dma
> > + *-----------------------------------------------------------------------------
> > + * Eg: check NTB ports (index) and MW mapping information
> > + *
> > + * root@self# cat $DBG_DIR/info
> > + *-----------------------------------------------------------------------------
> > + * Eg: start performance test with peer (index 0) and get the test metrics
> > + *
> > + * root@self# echo 0 > $DBG_DIR/run
> > + * root@self# cat $DBG_DIR/run
> >   */
> >
> >  #include <linux/init.h>
> >  #include <linux/kernel.h>
> >  #include <linux/module.h>
> > -#include <linux/kthread.h>
> > -#include <linux/time.h>
> > -#include <linux/timer.h>
> > +#include <linux/sched.h>
> > +#include <linux/wait.h>
> >  #include <linux/dma-mapping.h>
> > +#include <linux/dmaengine.h>
> >  #include <linux/pci.h>
> > +#include <linux/ktime.h>
> >  #include <linux/slab.h>
> > -#include <linux/spinlock.h>
> > -#include <linux/debugfs.h>
> > -#include <linux/dmaengine.h>
> >  #include <linux/delay.h>
> >  #include <linux/sizes.h>
> > +#include <linux/workqueue.h>
> > +#include <linux/debugfs.h>
> > +#include <linux/random.h>
> >  #include <linux/ntb.h>
> > -#include <linux/mutex.h>
> >
> >  #define DRIVER_NAME            "ntb_perf"
> > -#define DRIVER_DESCRIPTION     "PCIe NTB Performance Measurement Tool"
> > -
> > -#define DRIVER_LICENSE         "Dual BSD/GPL"
> > -#define DRIVER_VERSION         "1.0"
> > -#define DRIVER_AUTHOR          "Dave Jiang <dave.jiang@intel.com>"
> > -
> > -#define PERF_LINK_DOWN_TIMEOUT 10
> > -#define PERF_VERSION           0xffff0001
> > -#define MAX_THREADS            32
> > -#define MAX_TEST_SIZE          SZ_1M
> > -#define MAX_SRCS               32
> > -#define DMA_OUT_RESOURCE_TO    msecs_to_jiffies(50)
> > -#define DMA_RETRIES            20
> > -#define SZ_4G                  (1ULL << 32)
> > -#define MAX_SEG_ORDER          20 /* no larger than 1M for kmalloc buffer */
> > -#define PIDX                   NTB_DEF_PEER_IDX
> > -
> > -MODULE_LICENSE(DRIVER_LICENSE);
> > +#define DRIVER_VERSION         "2.0"
> > +
> > +MODULE_LICENSE("Dual BSD/GPL");
> >  MODULE_VERSION(DRIVER_VERSION);
> > -MODULE_AUTHOR(DRIVER_AUTHOR);
> > -MODULE_DESCRIPTION(DRIVER_DESCRIPTION);
> > +MODULE_AUTHOR("Dave Jiang <dave.jiang@intel.com>");
> > +MODULE_DESCRIPTION("PCIe NTB Performance Measurement Tool");
> >
> > -static struct dentry *perf_debugfs_dir;
> > +#define MAX_THREADS_CNT                32
> > +#define DEF_THREADS_CNT                1
> > +#define MAX_CHUNK_SIZE         SZ_1M
> > +#define MAX_CHUNK_ORDER                20 /* no larger than 1M */
> > +
> > +#define DMA_TRIES              100
> > +#define DMA_MDELAY             10
> > +
> > +#define MSG_TRIES              500
> > +#define MSG_UDELAY_LOW         1000
> > +#define MSG_UDELAY_HIGH                2000
> >
> >  static unsigned long max_mw_size;
> >  module_param(max_mw_size, ulong, 0644);
> > -MODULE_PARM_DESC(max_mw_size, "Limit size of large memory windows");
> > +MODULE_PARM_DESC(max_mw_size, "Upper limit of memory window size");
> >
> > -static unsigned int seg_order = 19; /* 512K */
> > -module_param(seg_order, uint, 0644);
> > -MODULE_PARM_DESC(seg_order, "size order [2^n] of buffer segment for testing");
> > +static unsigned char chunk_order = 19; /* 512K */
> > +module_param(chunk_order, byte, 0644);
> > +MODULE_PARM_DESC(chunk_order, "Data chunk order [2^n] to transfer");
> >
> > -static unsigned int run_order = 32; /* 4G */
> > -module_param(run_order, uint, 0644);
> > -MODULE_PARM_DESC(run_order, "size order [2^n] of total data to transfer");
> > +static unsigned char total_order = 30; /* 1G */
> > +module_param(total_order, byte, 0644);
> > +MODULE_PARM_DESC(total_order, "Total data order [2^n] to transfer");
> >
> >  static bool use_dma; /* default to 0 */
> >  module_param(use_dma, bool, 0644);
> > -MODULE_PARM_DESC(use_dma, "Using DMA engine to measure performance");
> > -
> > -static bool on_node = true; /* default to 1 */
> > -module_param(on_node, bool, 0644);
> > -MODULE_PARM_DESC(on_node, "Run threads only on NTB device node (default: true)");
> > -
> > -struct perf_mw {
> > -       phys_addr_t     phys_addr;
> > -       resource_size_t phys_size;
> > -       void __iomem    *vbase;
> > -       size_t          xlat_size;
> > -       size_t          buf_size;
> > -       void            *virt_addr;
> > -       dma_addr_t      dma_addr;
> > +MODULE_PARM_DESC(use_dma, "Use DMA engine to measure performance");
> > +
> > +/*==============================================================================
> > + *                         Perf driver data definition
> > + *==============================================================================
> > + */
> > +
> > +enum perf_cmd {
> > +       PERF_CMD_INVAL = -1,/* invalid spad command */
> > +       PERF_CMD_SSIZE = 0, /* send out buffer size */
> > +       PERF_CMD_RSIZE = 1, /* recv in  buffer size */
> > +       PERF_CMD_SXLAT = 2, /* send in  buffer xlat */
> > +       PERF_CMD_RXLAT = 3, /* recv out buffer xlat */
> > +       PERF_CMD_CLEAR = 4, /* clear allocated memory */
> > +       PERF_STS_DONE  = 5, /* init is done */
> > +       PERF_STS_LNKUP = 6, /* link up state flag */
> >  };
> >
> >  struct perf_ctx;
> >
> > -struct pthr_ctx {
> > -       struct task_struct      *thread;
> > -       struct perf_ctx         *perf;
> > -       atomic_t                dma_sync;
> > -       struct dma_chan         *dma_chan;
> > -       int                     dma_prep_err;
> > -       int                     src_idx;
> > -       void                    *srcs[MAX_SRCS];
> > -       wait_queue_head_t       *wq;
> > -       int                     status;
> > -       u64                     copied;
> > -       u64                     diff_us;
> > +struct perf_peer {
> > +       struct perf_ctx *perf;
> > +       int pidx;
> > +       int gidx;
> > +
> > +       /* Outbound MW params */
> > +       u64 outbuf_xlat;
> > +       resource_size_t outbuf_size;
> > +       void __iomem *outbuf;
> > +
> > +       /* Inbound MW params */
> > +       dma_addr_t inbuf_xlat;
> > +       resource_size_t inbuf_size;
> > +       void            *inbuf;
> > +
> > +       /* NTB connection setup service */
> > +       struct work_struct      service;
> > +       unsigned long           sts;
> >  };
> > +#define to_peer_service(__work) \
> > +       container_of(__work, struct perf_peer, service)
> >
> > -struct perf_ctx {
> > -       struct ntb_dev          *ntb;
> > -       spinlock_t              db_lock;
> > -       struct perf_mw          mw;
> > -       bool                    link_is_up;
> > -       struct delayed_work     link_work;
> > -       wait_queue_head_t       link_wq;
> > -       u8                      perf_threads;
> > -       /* mutex ensures only one set of threads run at once */
> > -       struct mutex            run_mutex;
> > -       struct pthr_ctx         pthr_ctx[MAX_THREADS];
> > -       atomic_t                tsync;
> > -       atomic_t                tdone;
> > +struct perf_thread {
> > +       struct perf_ctx *perf;
> > +       int tidx;
> > +
> > +       /* DMA-based test sync parameters */
> > +       atomic_t dma_sync;
> > +       wait_queue_head_t dma_wait;
> > +       struct dma_chan *dma_chan;
> > +
> > +       /* Data source and measured statistics */
> > +       void *src;
> > +       u64 copied;
> > +       ktime_t duration;
> > +       int status;
> > +       struct work_struct work;
> >  };
> > +#define to_thread_work(__work) \
> > +       container_of(__work, struct perf_thread, work)
> >
> > -enum {
> > -       VERSION = 0,
> > -       MW_SZ_HIGH,
> > -       MW_SZ_LOW,
> > -       MAX_SPAD
> > +struct perf_ctx {
> > +       struct ntb_dev *ntb;
> > +
> > +       /* Global device index and peers descriptors */
> > +       int gidx;
> > +       int pcnt;
> > +       struct perf_peer *peers;
> > +
> > +       /* Performance measuring work-threads interface */
> > +       unsigned long busy_flag;
> > +       wait_queue_head_t twait;
> > +       atomic_t tsync;
> > +       u8 tcnt;
> > +       struct perf_peer *test_peer;
> > +       struct perf_thread threads[MAX_THREADS_CNT];
> > +
> > +       /* Scratchpad/Message IO operations */
> > +       int (*cmd_send)(struct perf_peer *peer, enum perf_cmd cmd, u64 data);
> > +       int (*cmd_recv)(struct perf_ctx *perf, int *pidx, enum perf_cmd *cmd,
> > +                       u64 *data);
> > +
> > +       struct dentry *dbgfs_dir;
> >  };
> >
> > +/*
> > + * Scratchpads-base commands interface
> > + */
> > +#define PERF_SPAD_CNT(_pcnt) \
> > +       (3*((_pcnt) + 1))
> > +#define PERF_SPAD_CMD(_gidx) \
> > +       (3*(_gidx))
> > +#define PERF_SPAD_LDATA(_gidx) \
> > +       (3*(_gidx) + 1)
> > +#define PERF_SPAD_HDATA(_gidx) \
> > +       (3*(_gidx) + 2)
> > +#define PERF_SPAD_NOTIFY(_gidx) \
> > +       (BIT_ULL(_gidx))
> > +
> > +/*
> > + * Messages-base commands interface
> > + */
> > +#define PERF_MSG_CNT           3
> > +#define PERF_MSG_CMD           0
> > +#define PERF_MSG_LDATA         1
> > +#define PERF_MSG_HDATA         2
> > +
> > +/*==============================================================================
> > + *                           Static data declarations
> > + *==============================================================================
> > + */
> > +
> > +static struct dentry *perf_dbgfs_topdir;
> > +
> > +static struct workqueue_struct *perf_wq __read_mostly;
> > +
> > +/*==============================================================================
> > + *                  NTB cross-link commands execution service
> > + *==============================================================================
> > + */
> > +
> > +static void perf_terminate_test(struct perf_ctx *perf);
> > +
> > +static inline bool perf_link_is_up(struct perf_peer *peer)
> > +{
> > +       u64 link;
> > +
> > +       link = ntb_link_is_up(peer->perf->ntb, NULL, NULL);
> > +       return !!(link & BIT_ULL_MASK(peer->pidx));
> > +}
> > +
> > +static int perf_spad_cmd_send(struct perf_peer *peer, enum perf_cmd cmd,
> > +                             u64 data)
> > +{
> > +       struct perf_ctx *perf = peer->perf;
> > +       int try;
> > +       u32 sts;
> > +
> > +       dev_dbg(&perf->ntb->dev, "CMD send: %d 0x%llx\n", cmd, data);
> > +
> > +       /*
> > +        * Perform predefined number of attempts before give up.
> > +        * We are sending the data to the port specific scratchpad, so
> > +        * to prevent a multi-port access race-condition. Additionally
> > +        * there is no need in local locking since only thread-safe
> > +        * service work is using this method.
> > +        */
> > +       for (try = 0; try < MSG_TRIES; try++) {
> > +               if (!perf_link_is_up(peer))
> > +                       return -ENOLINK;
> > +
> > +               sts = ntb_peer_spad_read(perf->ntb, peer->pidx,
> > +                                        PERF_SPAD_CMD(perf->gidx));
> > +               if (le32_to_cpu(sts) != PERF_CMD_INVAL) {
> > +                       usleep_range(MSG_UDELAY_LOW, MSG_UDELAY_HIGH);
> > +                       continue;
> > +               }
> > +
> > +               ntb_peer_spad_write(perf->ntb, peer->pidx,
> > +                                   PERF_SPAD_LDATA(perf->gidx),
> > +                                   cpu_to_le32(lower_32_bits(data)));
> > +               ntb_peer_spad_write(perf->ntb, peer->pidx,
> > +                                   PERF_SPAD_HDATA(perf->gidx),
> > +                                   cpu_to_le32(upper_32_bits(data)));
> > +               mmiowb();
> > +               ntb_peer_spad_write(perf->ntb, peer->pidx,
> > +                                   PERF_SPAD_CMD(perf->gidx),
> > +                                   cpu_to_le32(cmd));
> > +               mmiowb();
> > +               ntb_peer_db_set(perf->ntb, PERF_SPAD_NOTIFY(peer->gidx));
> > +
> > +               dev_dbg(&perf->ntb->dev, "DB ring peer %#llx\n",
> > +                       PERF_SPAD_NOTIFY(peer->gidx));
> > +
> > +               break;
> > +       }
> > +
> > +       return try < MSG_TRIES ? 0 : -EAGAIN;
> > +}
> > +
> > +static int perf_spad_cmd_recv(struct perf_ctx *perf, int *pidx,
> > +                             enum perf_cmd *cmd, u64 *data)
> > +{
> > +       struct perf_peer *peer;
> > +       u32 val;
> > +
> > +       ntb_db_clear(perf->ntb, PERF_SPAD_NOTIFY(perf->gidx));
> > +
> > +       /*
> > +        * We start scanning all over, since cleared DB may have been set
> > +        * by any peer. Yes, it makes peer with smaller index being
> > +        * serviced with greater priority, but it's convenient for spad
> > +        * and message code unification and simplicity.
> > +        */
> > +       for (*pidx = 0; *pidx < perf->pcnt; (*pidx)++) {
> > +               peer = &perf->peers[*pidx];
> > +
> > +               if (!perf_link_is_up(peer))
> > +                       continue;
> > +
> > +               val = ntb_spad_read(perf->ntb, PERF_SPAD_CMD(peer->gidx));
> > +               val = le32_to_cpu(val);
> > +               if (val == PERF_CMD_INVAL)
> > +                       continue;
> > +
> > +               *cmd = val;
> > +
> > +               val = ntb_spad_read(perf->ntb, PERF_SPAD_LDATA(peer->gidx));
> > +               *data = le32_to_cpu(val);
> > +
> > +               val = ntb_spad_read(perf->ntb, PERF_SPAD_HDATA(peer->gidx));
> > +               *data |= (u64)le32_to_cpu(val) << 32;
> > +
> > +               /* Next command can be retrieved from now */
> > +               ntb_spad_write(perf->ntb, PERF_SPAD_CMD(peer->gidx),
> > +                              cpu_to_le32(PERF_CMD_INVAL));
> > +
> > +               dev_dbg(&perf->ntb->dev, "CMD recv: %d 0x%llx\n", *cmd, *data);
> > +
> > +               return 0;
> > +       }
> > +
> > +       return -ENODATA;
> > +}
> > +
> > +static int perf_msg_cmd_send(struct perf_peer *peer, enum perf_cmd cmd,
> > +                            u64 data)
> > +{
> > +       struct perf_ctx *perf = peer->perf;
> > +       int try, ret;
> > +       u64 outbits;
> > +
> > +       dev_dbg(&perf->ntb->dev, "CMD send: %d 0x%llx\n", cmd, data);
> > +
> > +       /*
> > +        * Perform predefined number of attempts before give up. Message
> > +        * registers are free of race-condition problem when accessed
> > +        * from different ports, so we don't need splitting registers
> > +        * by global device index. We also won't have local locking,
> > +        * since the method is used from service work only.
> > +        */
> > +       outbits = ntb_msg_outbits(perf->ntb);
> > +       for (try = 0; try < MSG_TRIES; try++) {
> > +               if (!perf_link_is_up(peer))
> > +                       return -ENOLINK;
> > +
> > +               ret = ntb_msg_clear_sts(perf->ntb, outbits);
> > +               if (ret)
> > +                       return ret;
> > +
> > +               ntb_peer_msg_write(perf->ntb, peer->pidx, PERF_MSG_LDATA,
> > +                             cpu_to_le32(lower_32_bits(data)));
> > +
> > +               if (ntb_msg_read_sts(perf->ntb) & outbits) {
> > +                       usleep_range(MSG_UDELAY_LOW, MSG_UDELAY_HIGH);
> > +                       continue;
> > +               }
> > +
> > +               ntb_peer_msg_write(perf->ntb, peer->pidx, PERF_MSG_HDATA,
> > +                             cpu_to_le32(upper_32_bits(data)));
> > +               mmiowb();
> > +
> > +               /* This call shall trigger peer message event */
> > +               ntb_peer_msg_write(perf->ntb, peer->pidx, PERF_MSG_CMD,
> > +                             cpu_to_le32(cmd));
> > +
> > +               break;
> > +       }
> > +
> > +       return try < MSG_TRIES ? 0 : -EAGAIN;
> > +}
> > +
> > +static int perf_msg_cmd_recv(struct perf_ctx *perf, int *pidx,
> > +                            enum perf_cmd *cmd, u64 *data)
> > +{
> > +       u64 inbits;
> > +       u32 val;
> > +
> > +       inbits = ntb_msg_inbits(perf->ntb);
> > +
> > +       if (hweight64(ntb_msg_read_sts(perf->ntb) & inbits) < 3)
> > +               return -ENODATA;
> > +
> > +       val = ntb_msg_read(perf->ntb, pidx, PERF_MSG_CMD);
> > +       *cmd = le32_to_cpu(val);
> > +
> > +       val = ntb_msg_read(perf->ntb, pidx, PERF_MSG_LDATA);
> > +       *data = le32_to_cpu(val);
> > +
> > +       val = ntb_msg_read(perf->ntb, pidx, PERF_MSG_HDATA);
> > +       *data |= (u64)le32_to_cpu(val) << 32;
> > +
> > +       /* Next command can be retrieved from now */
> > +       ntb_msg_clear_sts(perf->ntb, inbits);
> > +
> > +       dev_dbg(&perf->ntb->dev, "CMD recv: %d 0x%llx\n", *cmd, *data);
> > +
> > +       return 0;
> > +}
> > +
> > +static int perf_cmd_send(struct perf_peer *peer, enum perf_cmd cmd, u64 data)
> > +{
> > +       struct perf_ctx *perf = peer->perf;
> > +
> > +       if (cmd == PERF_CMD_SSIZE || cmd == PERF_CMD_SXLAT)
> > +               return perf->cmd_send(peer, cmd, data);
> > +
> > +       dev_err(&perf->ntb->dev, "Send invalid command\n");
> > +       return -EINVAL;
> > +}
> > +
> > +static int perf_cmd_exec(struct perf_peer *peer, enum perf_cmd cmd)
> > +{
> > +       switch (cmd) {
> > +       case PERF_CMD_SSIZE:
> > +       case PERF_CMD_RSIZE:
> > +       case PERF_CMD_SXLAT:
> > +       case PERF_CMD_RXLAT:
> > +       case PERF_CMD_CLEAR:
> > +               break;
> > +       default:
> > +               dev_err(&peer->perf->ntb->dev, "Exec invalid command\n");
> > +               return -EINVAL;
> > +       }
> > +
> > +       /* No need of memory barrier, since bit ops have invernal lock */
> > +       set_bit(cmd, &peer->sts);
> > +
> > +       dev_dbg(&peer->perf->ntb->dev, "CMD exec: %d\n", cmd);
> > +
> > +       (void)queue_work(system_highpri_wq, &peer->service);
> 
> Seems like this should be the return value of this function, isntead
> of using a cast to ignore it.  Am I missing something?
> 
> > +
> > +       return 0;
> > +}
> > +
> > +static int perf_cmd_recv(struct perf_ctx *perf)
> > +{
> > +       struct perf_peer *peer;
> > +       int ret, pidx, cmd;
> > +       u64 data;
> > +
> > +       while (!(ret = perf->cmd_recv(perf, &pidx, &cmd, &data))) {
> > +               peer = &perf->peers[pidx];
> > +
> > +               switch (cmd) {
> > +               case PERF_CMD_SSIZE:
> > +                       peer->inbuf_size = data;
> > +                       return perf_cmd_exec(peer, PERF_CMD_RSIZE);
> > +               case PERF_CMD_SXLAT:
> > +                       peer->outbuf_xlat = data;
> > +                       return perf_cmd_exec(peer, PERF_CMD_RXLAT);
> > +               default:
> > +                       dev_err(&perf->ntb->dev, "Recv invalid command\n");
> > +                       return -EINVAL;
> > +               }
> > +       }
> > +
> > +       return ret == -ENODATA ? 0 : ret;
> 
> Add a comment here explaining that no data came in, and that's ok :)
> Otherwise you'll have someone staring at it for 5 mins unnecessarily
> 

Ok.)

> > +}
> > +
> >  static void perf_link_event(void *ctx)
> >  {
> >         struct perf_ctx *perf = ctx;
> > +       struct perf_peer *peer;
> > +       bool lnk_up;
> > +       int pidx;
> >
> > -       if (ntb_link_is_up(perf->ntb, NULL, NULL) == 1) {
> > -               schedule_delayed_work(&perf->link_work, 2*HZ);
> > -       } else {
> > -               dev_dbg(&perf->ntb->pdev->dev, "link down\n");
> > +       for (pidx = 0; pidx < perf->pcnt; pidx++) {
> > +               peer = &perf->peers[pidx];
> >
> > -               if (!perf->link_is_up)
> > -                       cancel_delayed_work_sync(&perf->link_work);
> > +               lnk_up = perf_link_is_up(peer);
> >
> > -               perf->link_is_up = false;
> > +               if (lnk_up &&
> > +                   !test_and_set_bit(PERF_STS_LNKUP, &peer->sts)) {
> > +                       perf_cmd_exec(peer, PERF_CMD_SSIZE);
> > +               } else if (!lnk_up &&
> > +                          test_and_clear_bit(PERF_STS_LNKUP, &peer->sts)) {
> > +                       perf_cmd_exec(peer, PERF_CMD_CLEAR);
> > +               }
> >         }
> >  }
> >
> >  static void perf_db_event(void *ctx, int vec)
> >  {
> >         struct perf_ctx *perf = ctx;
> > -       u64 db_bits, db_mask;
> >
> > -       db_mask = ntb_db_vector_mask(perf->ntb, vec);
> > -       db_bits = ntb_db_read(perf->ntb);
> > +       dev_dbg(&perf->ntb->dev, "DB vec %d mask %#llx bits %#llx\n", vec,
> > +               ntb_db_vector_mask(perf->ntb, vec), ntb_db_read(perf->ntb));
> >
> > -       dev_dbg(&perf->ntb->dev, "doorbell vec %d mask %#llx bits %#llx\n",
> > -               vec, db_mask, db_bits);
> > +       /* Just receive all available commands */
> > +       (void)perf_cmd_recv(perf);
> 
> Is this throwing an error if not cast?  If so, can't we just make this
> a return type of void?
> Same for all casts below too
> 

It is throwing an error, but I'd disagree with returning void from the function,
which may fail. Lets say the function doesn't know when and how it's going to be
called. In this way, if it fails it should inform the caller in any case either
by special return value or by a status argument. It's up to the caller to check
the error status. By casting to void I explicitly stated, that even though the
return value may mean failure, the caller doesn't use it. Indeed what can I do in
the DB event handler? Nothing special really. The specific error messages though
are printed within the function code. So I'd say lets leave it as is.

> > +}
> > +
> > +static void perf_msg_event(void *ctx)
> > +{
> > +       struct perf_ctx *perf = ctx;
> > +
> > +       dev_dbg(&perf->ntb->dev, "Msg status bits %#llx\n",
> > +               ntb_msg_read_sts(perf->ntb));
> > +
> > +       /* Messages are only sent one-by-one */
> > +       (void)perf_cmd_recv(perf);
> >  }
> >
> >  static const struct ntb_ctx_ops perf_ops = {
> >         .link_event = perf_link_event,
> >         .db_event = perf_db_event,
> > +       .msg_event = perf_msg_event
> >  };
> >
> > -static void perf_copy_callback(void *data)
> > +static void perf_free_outbuf(struct perf_peer *peer)
> > +{
> > +       (void)ntb_peer_mw_clear_trans(peer->perf->ntb, peer->pidx, peer->gidx);
> > +}
> > +
> > +static int perf_setup_outbuf(struct perf_peer *peer)
> >  {
> > -       struct pthr_ctx *pctx = data;
> > +       struct perf_ctx *perf = peer->perf;
> > +       int ret;
> > +
> > +       /* Outbuf size can be unaligned due to custom max_mw_size */
> > +       ret = ntb_peer_mw_set_trans(perf->ntb, peer->pidx, peer->gidx,
> > +                                   peer->outbuf_xlat, peer->outbuf_size);
> > +       if (ret) {
> > +               dev_err(&perf->ntb->dev, "Failed to set outbuf translation\n");
> > +               return ret;
> > +       }
> > +
> > +       /* Initialization is finally done */
> > +       set_bit(PERF_STS_DONE, &peer->sts);
> >
> > -       atomic_dec(&pctx->dma_sync);
> > +       return 0;
> >  }
> >
> > -static ssize_t perf_copy(struct pthr_ctx *pctx, char __iomem *dst,
> > -                        char *src, size_t size)
> > +static void perf_free_inbuf(struct perf_peer *peer)
> >  {
> > -       struct perf_ctx *perf = pctx->perf;
> > -       struct dma_async_tx_descriptor *txd;
> > -       struct dma_chan *chan = pctx->dma_chan;
> > -       struct dma_device *device;
> > -       struct dmaengine_unmap_data *unmap;
> > -       dma_cookie_t cookie;
> > -       size_t src_off, dst_off;
> > -       struct perf_mw *mw = &perf->mw;
> > -       void __iomem *vbase;
> > -       void __iomem *dst_vaddr;
> > -       dma_addr_t dst_phys;
> > -       int retries = 0;
> > +       if (!peer->inbuf)
> > +               return;
> >
> > -       if (!use_dma) {
> > -               memcpy_toio(dst, src, size);
> > -               return size;
> > +       (void)ntb_mw_clear_trans(peer->perf->ntb, peer->pidx, peer->gidx);
> > +       dma_free_coherent(&peer->perf->ntb->dev, peer->inbuf_size,
> > +                         peer->inbuf, peer->inbuf_xlat);
> > +       peer->inbuf = NULL;
> > +}
> > +
> > +static int perf_setup_inbuf(struct perf_peer *peer)
> > +{
> > +       resource_size_t xlat_align, size_align, size_max;
> > +       struct perf_ctx *perf = peer->perf;
> > +       int ret;
> > +
> > +       /* Get inbound MW parameters */
> > +       ret = ntb_mw_get_align(perf->ntb, peer->pidx, perf->gidx,
> > +                              &xlat_align, &size_align, &size_max);
> > +       if (ret) {
> > +               dev_err(&perf->ntb->dev, "Couldn't get inbuf restrictions\n");
> > +               return ret;
> >         }
> >
> > -       if (!chan) {
> > -               dev_err(&perf->ntb->dev, "DMA engine does not exist\n");
> > +       if (peer->inbuf_size > size_max) {
> > +               dev_err(&perf->ntb->dev, "Too big inbuf size %pa > %pa\n",
> > +                       &peer->inbuf_size, &size_max);
> >                 return -EINVAL;
> >         }
> >
> > -       device = chan->device;
> > -       src_off = (uintptr_t)src & ~PAGE_MASK;
> > -       dst_off = (uintptr_t __force)dst & ~PAGE_MASK;
> > +       peer->inbuf_size = round_up(peer->inbuf_size, size_align);
> >
> > -       if (!is_dma_copy_aligned(device, src_off, dst_off, size))
> > -               return -ENODEV;
> > -
> > -       vbase = mw->vbase;
> > -       dst_vaddr = dst;
> > -       dst_phys = mw->phys_addr + (dst_vaddr - vbase);
> > +       perf_free_inbuf(peer);
> >
> > -       unmap = dmaengine_get_unmap_data(device->dev, 1, GFP_NOWAIT);
> > -       if (!unmap)
> > +       peer->inbuf = dma_alloc_coherent(&perf->ntb->dev, peer->inbuf_size,
> > +                                        &peer->inbuf_xlat, GFP_KERNEL);
> > +       if (!peer->inbuf) {
> > +               dev_err(&perf->ntb->dev, "Failed to alloc inbuf of %pa\n",
> > +                       &peer->inbuf_size);
> >                 return -ENOMEM;
> > +       }
> > +       if (!IS_ALIGNED(peer->inbuf_xlat, xlat_align)) {
> > +               dev_err(&perf->ntb->dev, "Unaligned inbuf allocated\n");
> > +               goto err_free_inbuf;
> > +       }
> >
> > -       unmap->len = size;
> > -       unmap->addr[0] = dma_map_page(device->dev, virt_to_page(src),
> > -                                     src_off, size, DMA_TO_DEVICE);
> > -       if (dma_mapping_error(device->dev, unmap->addr[0]))
> > -               goto err_get_unmap;
> > +       ret = ntb_mw_set_trans(perf->ntb, peer->pidx, peer->gidx,
> > +                              peer->inbuf_xlat, peer->inbuf_size);
> > +       if (ret) {
> > +               dev_err(&perf->ntb->dev, "Failed to set inbuf translation\n");
> > +               goto err_free_inbuf;
> > +       }
> >
> > -       unmap->to_cnt = 1;
> > +       /*
> > +        * We submit inbuf xlat transmission cmd for execution here to follow
> > +        * the code architecture, even though this method is called from service
> > +        * work itself so the command will be executed right after it returns.
> > +        */
> > +       (void)perf_cmd_exec(peer, PERF_CMD_SXLAT);
> >
> > -       do {
> > -               txd = device->device_prep_dma_memcpy(chan, dst_phys,
> > -                                                    unmap->addr[0],
> > -                                                    size, DMA_PREP_INTERRUPT);
> > -               if (!txd) {
> > -                       set_current_state(TASK_INTERRUPTIBLE);
> > -                       schedule_timeout(DMA_OUT_RESOURCE_TO);
> > -               }
> > -       } while (!txd && (++retries < DMA_RETRIES));
> > +       return 0;
> >
> > -       if (!txd) {
> > -               pctx->dma_prep_err++;
> > -               goto err_get_unmap;
> > -       }
> > +err_free_inbuf:
> > +       perf_free_inbuf(peer);
> >
> > -       txd->callback = perf_copy_callback;
> > -       txd->callback_param = pctx;
> > -       dma_set_unmap(txd, unmap);
> > +       return ret;
> > +}
> >
> > -       cookie = dmaengine_submit(txd);
> > -       if (dma_submit_error(cookie))
> > -               goto err_set_unmap;
> > +static void perf_service_work(struct work_struct *work)
> > +{
> > +       struct perf_peer *peer = to_peer_service(work);
> >
> > -       dmaengine_unmap_put(unmap);
> > +       if (test_and_clear_bit(PERF_CMD_SSIZE, &peer->sts))
> > +               perf_cmd_send(peer, PERF_CMD_SSIZE, peer->outbuf_size);
> >
> > -       atomic_inc(&pctx->dma_sync);
> > -       dma_async_issue_pending(chan);
> > +       if (test_and_clear_bit(PERF_CMD_RSIZE, &peer->sts))
> > +               perf_setup_inbuf(peer);
> >
> > -       return size;
> > +       if (test_and_clear_bit(PERF_CMD_SXLAT, &peer->sts))
> > +               perf_cmd_send(peer, PERF_CMD_SXLAT, peer->inbuf_xlat);
> >
> > -err_set_unmap:
> > -       dmaengine_unmap_put(unmap);
> > -err_get_unmap:
> > -       dmaengine_unmap_put(unmap);
> > -       return 0;
> > -}
> > +       if (test_and_clear_bit(PERF_CMD_RXLAT, &peer->sts))
> > +               perf_setup_outbuf(peer);
> >
> > -static int perf_move_data(struct pthr_ctx *pctx, char __iomem *dst, char *src,
> > -                         u64 buf_size, u64 win_size, u64 total)
> > -{
> > -       int chunks, total_chunks, i;
> > -       int copied_chunks = 0;
> > -       u64 copied = 0, result;
> > -       char __iomem *tmp = dst;
> > -       u64 perf, diff_us;
> > -       ktime_t kstart, kstop, kdiff;
> > -       unsigned long last_sleep = jiffies;
> > -
> > -       chunks = div64_u64(win_size, buf_size);
> > -       total_chunks = div64_u64(total, buf_size);
> > -       kstart = ktime_get();
> > -
> > -       for (i = 0; i < total_chunks; i++) {
> > -               result = perf_copy(pctx, tmp, src, buf_size);
> > -               copied += result;
> > -               copied_chunks++;
> > -               if (copied_chunks == chunks) {
> > -                       tmp = dst;
> > -                       copied_chunks = 0;
> > -               } else
> > -                       tmp += buf_size;
> > -
> > -               /* Probably should schedule every 5s to prevent soft hang. */
> > -               if (unlikely((jiffies - last_sleep) > 5 * HZ)) {
> > -                       last_sleep = jiffies;
> > -                       set_current_state(TASK_INTERRUPTIBLE);
> > -                       schedule_timeout(1);
> > +       if (test_and_clear_bit(PERF_CMD_CLEAR, &peer->sts)) {
> > +               clear_bit(PERF_STS_DONE, &peer->sts);
> > +               if (test_bit(0, &peer->perf->busy_flag) &&
> > +                   peer == peer->perf->test_peer) {
> > +                       dev_warn(&peer->perf->ntb->dev,
> > +                               "Freeing while test on-fly\n");
> > +                       perf_terminate_test(peer->perf);
> >                 }
> > +               perf_free_outbuf(peer);
> > +               perf_free_inbuf(peer);
> > +       }
> > +}
> >
> > -               if (unlikely(kthread_should_stop()))
> > -                       break;
> > +static int perf_init_service(struct perf_ctx *perf)
> > +{
> > +       u64 mask;
> > +
> > +       if (ntb_peer_mw_count(perf->ntb) < perf->pcnt + 1) {
> > +               dev_err(&perf->ntb->dev, "Not enough memory windows\n");
> > +               return -EINVAL;
> >         }
> >
> > -       if (use_dma) {
> > -               pr_debug("%s: All DMA descriptors submitted\n", current->comm);
> > -               while (atomic_read(&pctx->dma_sync) != 0) {
> > -                       if (kthread_should_stop())
> > -                               break;
> > -                       msleep(20);
> > -               }
> > +       if (ntb_msg_count(perf->ntb) >= PERF_MSG_CNT) {
> > +               perf->cmd_send = perf_msg_cmd_send;
> > +               perf->cmd_recv = perf_msg_cmd_recv;
> > +
> > +               dev_dbg(&perf->ntb->dev, "Message service initialized\n");
> > +
> > +               return 0;
> >         }
> >
> > -       kstop = ktime_get();
> > -       kdiff = ktime_sub(kstop, kstart);
> > -       diff_us = ktime_to_us(kdiff);
> > +       dev_dbg(&perf->ntb->dev, "Message service unsupported\n");
> >
> > -       pr_debug("%s: copied %llu bytes\n", current->comm, copied);
> > +       mask = GENMASK_ULL(perf->pcnt, 0);
> > +       if (ntb_spad_count(perf->ntb) >= PERF_SPAD_CNT(perf->pcnt) &&
> > +           (ntb_db_valid_mask(perf->ntb) & mask) == mask) {
> > +               perf->cmd_send = perf_spad_cmd_send;
> > +               perf->cmd_recv = perf_spad_cmd_recv;
> >
> > -       pr_debug("%s: lasted %llu usecs\n", current->comm, diff_us);
> > +               dev_dbg(&perf->ntb->dev, "Scratchpad service initialized\n");
> >
> > -       perf = div64_u64(copied, diff_us);
> > +               return 0;
> > +       }
> >
> > -       pr_debug("%s: MBytes/s: %llu\n", current->comm, perf);
> > +       dev_dbg(&perf->ntb->dev, "Scratchpad service unsupported\n");
> >
> > -       pctx->copied = copied;
> > -       pctx->diff_us = diff_us;
> > +       dev_err(&perf->ntb->dev, "Command services unsupported\n");
> >
> > -       return 0;
> > +       return -EINVAL;
> >  }
> >
> > -static bool perf_dma_filter_fn(struct dma_chan *chan, void *node)
> > +static int perf_enable_service(struct perf_ctx *perf)
> >  {
> > -       /* Is the channel required to be on the same node as the device? */
> > -       if (!on_node)
> > -               return true;
> > +       u64 mask, incmd_bit;
> > +       int ret, sidx, scnt;
> >
> > -       return dev_to_node(&chan->dev->device) == (int)(unsigned long)node;
> > -}
> > +       mask = ntb_db_valid_mask(perf->ntb);
> > +       (void)ntb_db_set_mask(perf->ntb, mask);
> >
> > -static int ntb_perf_thread(void *data)
> > -{
> > -       struct pthr_ctx *pctx = data;
> > -       struct perf_ctx *perf = pctx->perf;
> > -       struct pci_dev *pdev = perf->ntb->pdev;
> > -       struct perf_mw *mw = &perf->mw;
> > -       char __iomem *dst;
> > -       u64 win_size, buf_size, total;
> > -       void *src;
> > -       int rc, node, i;
> > -       struct dma_chan *dma_chan = NULL;
> > +       ret = ntb_set_ctx(perf->ntb, perf, &perf_ops);
> > +       if (ret)
> > +               return ret;
> >
> > -       pr_debug("kthread %s starting...\n", current->comm);
> > +       if (perf->cmd_send == perf_msg_cmd_send) {
> > +               u64 inbits, outbits;
> >
> > -       node = on_node ? dev_to_node(&pdev->dev) : NUMA_NO_NODE;
> > +               inbits = ntb_msg_inbits(perf->ntb);
> > +               outbits = ntb_msg_outbits(perf->ntb);
> > +               (void)ntb_msg_set_mask(perf->ntb, inbits | outbits);
> >
> > -       if (use_dma && !pctx->dma_chan) {
> > -               dma_cap_mask_t dma_mask;
> > +               incmd_bit = BIT_ULL(__ffs64(inbits));
> > +               ret = ntb_msg_clear_mask(perf->ntb, incmd_bit);
> >
> > -               dma_cap_zero(dma_mask);
> > -               dma_cap_set(DMA_MEMCPY, dma_mask);
> > -               dma_chan = dma_request_channel(dma_mask, perf_dma_filter_fn,
> > -                                              (void *)(unsigned long)node);
> > -               if (!dma_chan) {
> > -                       pr_warn("%s: cannot acquire DMA channel, quitting\n",
> > -                               current->comm);
> > -                       return -ENODEV;
> > -               }
> > -               pctx->dma_chan = dma_chan;
> > +               dev_dbg(&perf->ntb->dev, "MSG sts unmasked %#llx\n", incmd_bit);
> > +       } else {
> > +               scnt = ntb_spad_count(perf->ntb);
> > +               for (sidx = 0; sidx < scnt; sidx++)
> > +                       ntb_spad_write(perf->ntb, sidx, PERF_CMD_INVAL);
> > +               incmd_bit = PERF_SPAD_NOTIFY(perf->gidx);
> > +               ret = ntb_db_clear_mask(perf->ntb, incmd_bit);
> > +
> > +               dev_dbg(&perf->ntb->dev, "DB bits unmasked %#llx\n", incmd_bit);
> > +       }
> > +       if (ret) {
> > +               ntb_clear_ctx(perf->ntb);
> > +               return ret;
> >         }
> >
> > -       for (i = 0; i < MAX_SRCS; i++) {
> > -               pctx->srcs[i] = kmalloc_node(MAX_TEST_SIZE, GFP_KERNEL, node);
> > -               if (!pctx->srcs[i]) {
> > -                       rc = -ENOMEM;
> > -                       goto err;
> > -               }
> > +       ntb_link_enable(perf->ntb, NTB_SPEED_AUTO, NTB_WIDTH_AUTO);
> > +       /* Might be not necessary */
> > +       ntb_link_event(perf->ntb);
> > +
> > +       return 0;
> > +}
> > +
> > +static void perf_disable_service(struct perf_ctx *perf)
> > +{
> > +       int pidx;
> > +
> > +       ntb_link_disable(perf->ntb);
> > +
> > +       if (perf->cmd_send == perf_msg_cmd_send) {
> > +               u64 inbits;
> > +
> > +               inbits = ntb_msg_inbits(perf->ntb);
> > +               (void)ntb_msg_set_mask(perf->ntb, inbits);
> > +       } else {
> > +               (void)ntb_db_set_mask(perf->ntb, PERF_SPAD_NOTIFY(perf->gidx));
> >         }
> >
> > -       win_size = mw->phys_size;
> > -       buf_size = 1ULL << seg_order;
> > -       total = 1ULL << run_order;
> > +       ntb_clear_ctx(perf->ntb);
> >
> > -       if (buf_size > MAX_TEST_SIZE)
> > -               buf_size = MAX_TEST_SIZE;
> > +       for (pidx = 0; pidx < perf->pcnt; pidx++)
> > +               perf_cmd_exec(&perf->peers[pidx], PERF_CMD_CLEAR);
> >
> > -       dst = (char __iomem *)mw->vbase;
> > +       for (pidx = 0; pidx < perf->pcnt; pidx++)
> > +               flush_work(&perf->peers[pidx].service);
> > +}
> >
> > -       atomic_inc(&perf->tsync);
> > -       while (atomic_read(&perf->tsync) != perf->perf_threads)
> > -               schedule();
> > +/*==============================================================================
> > + *                      Performance measuring work-thread
> > + *==============================================================================
> > + */
> >
> > -       src = pctx->srcs[pctx->src_idx];
> > -       pctx->src_idx = (pctx->src_idx + 1) & (MAX_SRCS - 1);
> > +static void perf_dma_copy_callback(void *data)
> > +{
> > +       struct perf_thread *pthr = data;
> >
> > -       rc = perf_move_data(pctx, dst, src, buf_size, win_size, total);
> > +       atomic_dec(&pthr->dma_sync);
> > +       wake_up(&pthr->dma_wait);
> > +}
> >
> > -       atomic_dec(&perf->tsync);
> > +static int perf_copy_chunk(struct perf_thread *pthr,
> > +                          void __iomem *dst, void *src, size_t len)
> > +{
> > +       struct dma_async_tx_descriptor *tx;
> > +       struct dmaengine_unmap_data *unmap;
> > +       struct device *dma_dev;
> > +       int try, ret = 0;
> >
> > -       if (rc < 0) {
> > -               pr_err("%s: failed\n", current->comm);
> > -               rc = -ENXIO;
> > -               goto err;
> > +       if (!use_dma) {
> > +               memcpy_toio(dst, src, len);
> > +               goto ret_check_tsync;
> >         }
> >
> > -       for (i = 0; i < MAX_SRCS; i++) {
> > -               kfree(pctx->srcs[i]);
> > -               pctx->srcs[i] = NULL;
> > +       dma_dev = pthr->dma_chan->device->dev;
> > +
> > +       if (!is_dma_copy_aligned(pthr->dma_chan->device, offset_in_page(src),
> > +                                offset_in_page(dst), len))
> > +               return -EIO;
> > +
> > +       unmap = dmaengine_get_unmap_data(dma_dev, 2, GFP_NOWAIT);
> > +       if (!unmap)
> > +               return -ENOMEM;
> > +
> > +       unmap->len = len;
> > +       unmap->addr[0] = dma_map_page(dma_dev, virt_to_page(src),
> > +               offset_in_page(src), len, DMA_TO_DEVICE);
> > +       if (dma_mapping_error(dma_dev, unmap->addr[0])) {
> > +               ret = -EIO;
> > +               goto err_free_resource;
> >         }
> > +       unmap->to_cnt = 1;
> >
> > -       atomic_inc(&perf->tdone);
> > -       wake_up(pctx->wq);
> > -       rc = 0;
> > -       goto done;
> > +       unmap->addr[1] = dma_map_page(dma_dev, virt_to_page(dst),
> > +               offset_in_page(dst), len, DMA_FROM_DEVICE);
> > +       if (dma_mapping_error(dma_dev, unmap->addr[1])) {
> > +               ret = -EIO;
> > +               goto err_free_resource;
> > +       }
> > +       unmap->from_cnt = 1;
> >
> > -err:
> > -       for (i = 0; i < MAX_SRCS; i++) {
> > -               kfree(pctx->srcs[i]);
> > -               pctx->srcs[i] = NULL;
> > +       do {
> > +               tx = dmaengine_prep_dma_memcpy(pthr->dma_chan, unmap->addr[1],
> > +                       unmap->addr[0], len, DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
> > +               if (!tx)
> > +                       msleep(DMA_MDELAY);
> > +       } while (!tx && (try++ < DMA_TRIES));
> > +
> > +       if (!tx) {
> > +               ret = -EIO;
> > +               goto err_free_resource;
> >         }
> >
> > -       if (dma_chan) {
> > -               dma_release_channel(dma_chan);
> > -               pctx->dma_chan = NULL;
> > +       tx->callback = perf_dma_copy_callback;
> > +       tx->callback_param = pthr;
> > +       dma_set_unmap(tx, unmap);
> > +
> > +       if (dma_submit_error(dmaengine_submit(tx))) {
> > +               dmaengine_unmap_put(unmap);
> > +               goto err_free_resource;
> >         }
> >
> > -done:
> > -       /* Wait until we are told to stop */
> > -       for (;;) {
> > -               set_current_state(TASK_INTERRUPTIBLE);
> > -               if (kthread_should_stop())
> > -                       break;
> > -               schedule();
> > +       dmaengine_unmap_put(unmap);
> > +
> > +       atomic_inc(&pthr->dma_sync);
> > +       dma_async_issue_pending(pthr->dma_chan);
> > +
> > +ret_check_tsync:
> > +       return likely(atomic_read(&pthr->perf->tsync) > 0) ? 0 : -EINTR;
> > +
> > +err_free_resource:
> > +       dmaengine_unmap_put(unmap);
> > +
> > +       return ret;
> > +}
> > +
> > +static bool perf_dma_filter(struct dma_chan *chan, void *data)
> > +{
> > +       struct perf_ctx *perf = data;
> > +       int node;
> > +
> > +       node = dev_to_node(&perf->ntb->dev);
> > +
> > +       return node == NUMA_NO_NODE || node == dev_to_node(chan->device->dev);
> > +}
> > +
> > +static int perf_init_test(struct perf_thread *pthr)
> > +{
> > +       struct perf_ctx *perf = pthr->perf;
> > +       dma_cap_mask_t dma_mask;
> > +
> > +       pthr->src = kmalloc_node(perf->test_peer->outbuf_size, GFP_KERNEL,
> > +                                dev_to_node(&perf->ntb->dev));
> > +       if (!pthr->src)
> > +               return -ENOMEM;
> > +
> > +       get_random_bytes(pthr->src, perf->test_peer->outbuf_size);
> > +
> > +       if (!use_dma)
> > +               return 0;
> > +
> > +       dma_cap_zero(dma_mask);
> > +       dma_cap_set(DMA_MEMCPY, dma_mask);
> > +       pthr->dma_chan = dma_request_channel(dma_mask, perf_dma_filter, perf);
> > +       if (!pthr->dma_chan) {
> > +               dev_err(&perf->ntb->dev, "%d: Failed to get DMA channel\n",
> > +                       pthr->tidx);
> > +               atomic_dec(&perf->tsync);
> > +               wake_up(&perf->twait);
> > +               kfree(pthr->src);
> > +               return -ENODEV;
> >         }
> > -       __set_current_state(TASK_RUNNING);
> >
> > -       return rc;
> > +       atomic_set(&pthr->dma_sync, 0);
> > +
> > +       return 0;
> >  }
> >
> > -static void perf_free_mw(struct perf_ctx *perf)
> > +static int perf_run_test(struct perf_thread *pthr)
> >  {
> > -       struct perf_mw *mw = &perf->mw;
> > -       struct pci_dev *pdev = perf->ntb->pdev;
> > +       struct perf_peer *peer = pthr->perf->test_peer;
> > +       struct perf_ctx *perf = pthr->perf;
> > +       void __iomem *flt_dst, *bnd_dst;
> > +       u64 total_size, chunk_size;
> > +       void *flt_src;
> > +       int ret = 0;
> > +
> > +       total_size = 1ULL << total_order;
> > +       chunk_size = 1ULL << chunk_order;
> > +       chunk_size = min_t(u64, peer->outbuf_size, chunk_size);
> > +
> > +       flt_src = pthr->src;
> > +       bnd_dst = peer->outbuf + peer->outbuf_size;
> > +       flt_dst = peer->outbuf;
> > +
> > +       pthr->duration = ktime_get();
> > +
> > +       /* Copied field is cleared on test launch stage */
> > +       while (pthr->copied < total_size) {
> > +               ret = perf_copy_chunk(pthr, flt_dst, flt_src, chunk_size);
> > +               if (ret) {
> > +                       dev_err(&perf->ntb->dev, "%d: Got error %d on test\n",
> > +                               pthr->tidx, ret);
> > +                       return ret;
> > +               }
> >
> > -       if (!mw->virt_addr)
> > -               return;
> > +               pthr->copied += chunk_size;
> >
> > -       ntb_mw_clear_trans(perf->ntb, PIDX, 0);
> > -       dma_free_coherent(&pdev->dev, mw->buf_size,
> > -                         mw->virt_addr, mw->dma_addr);
> > -       mw->xlat_size = 0;
> > -       mw->buf_size = 0;
> > -       mw->virt_addr = NULL;
> > +               flt_dst += chunk_size;
> > +               flt_src += chunk_size;
> > +               if (flt_dst >= bnd_dst || flt_dst < peer->outbuf) {
> > +                       flt_dst = peer->outbuf;
> > +                       flt_src = pthr->src;
> > +               }
> > +
> > +               /* Give up CPU to give a chance for other threads to use it */
> > +               schedule();
> > +       }
> > +
> > +       return 0;
> >  }
> >
> > -static int perf_set_mw(struct perf_ctx *perf, resource_size_t size)
> > +static int perf_sync_test(struct perf_thread *pthr)
> >  {
> > -       struct perf_mw *mw = &perf->mw;
> > -       size_t xlat_size, buf_size;
> > -       resource_size_t xlat_align;
> > -       resource_size_t xlat_align_size;
> > -       int rc;
> > +       struct perf_ctx *perf = pthr->perf;
> >
> > -       if (!size)
> > -               return -EINVAL;
> > +       if (!use_dma)
> > +               goto no_dma_ret;
> >
> > -       rc = ntb_mw_get_align(perf->ntb, PIDX, 0, &xlat_align,
> > -                             &xlat_align_size, NULL);
> > -       if (rc)
> > -               return rc;
> > +       wait_event(pthr->dma_wait,
> > +                  (atomic_read(&pthr->dma_sync) == 0 ||
> > +                   atomic_read(&perf->tsync) < 0));
> >
> > -       xlat_size = round_up(size, xlat_align_size);
> > -       buf_size = round_up(size, xlat_align);
> > +       if (atomic_read(&perf->tsync) < 0)
> > +               return -EINTR;
> >
> > -       if (mw->xlat_size == xlat_size)
> > -               return 0;
> > +no_dma_ret:
> > +       pthr->duration = ktime_sub(ktime_get(), pthr->duration);
> > +
> > +       dev_dbg(&perf->ntb->dev, "%d: copied %llu bytes\n",
> > +               pthr->tidx, pthr->copied);
> >
> > -       if (mw->buf_size)
> > -               perf_free_mw(perf);
> > +       dev_dbg(&perf->ntb->dev, "%d: lasted %llu usecs\n",
> > +               pthr->tidx, ktime_to_us(pthr->duration));
> >
> > -       mw->xlat_size = xlat_size;
> > -       mw->buf_size = buf_size;
> > +       dev_dbg(&perf->ntb->dev, "%d: %llu MBytes/s\n", pthr->tidx,
> > +               div64_u64(pthr->copied, ktime_to_us(pthr->duration)));
> >
> > -       mw->virt_addr = dma_alloc_coherent(&perf->ntb->pdev->dev, buf_size,
> > -                                          &mw->dma_addr, GFP_KERNEL);
> > -       if (!mw->virt_addr) {
> > -               mw->xlat_size = 0;
> > -               mw->buf_size = 0;
> > +       return 0;
> > +}
> > +
> > +static void perf_clear_test(struct perf_thread *pthr)
> > +{
> > +       struct perf_ctx *perf = pthr->perf;
> > +
> > +       if (!use_dma)
> > +               goto no_dma_notify;
> > +
> > +       /*
> > +        * If test finished without errors, termination isn't needed.
> > +        * We call it anyway just to be sure of the transfers completion.
> > +        */
> > +       (void)dmaengine_terminate_sync(pthr->dma_chan);
> > +
> > +       dma_release_channel(pthr->dma_chan);
> > +
> > +no_dma_notify:
> > +       atomic_dec(&perf->tsync);
> > +       wake_up(&perf->twait);
> > +       kfree(pthr->src);
> > +}
> > +
> > +static void perf_thread_work(struct work_struct *work)
> > +{
> > +       struct perf_thread *pthr = to_thread_work(work);
> > +       int ret;
> > +
> > +       /*
> > +        * Perform stages in compliance with use_dma flag value.
> > +        * Test status is changed only if error happened, otherwise
> > +        * status -ENODATA is kept while test is on-fly. Results
> > +        * synchronization is performed only if test fininshed
> > +        * without an error or interruption.
> > +        */
> > +       ret = perf_init_test(pthr);
> > +       if (ret) {
> > +               pthr->status = ret;
> > +               return;
> >         }
> >
> > -       rc = ntb_mw_set_trans(perf->ntb, PIDX, 0, mw->dma_addr, mw->xlat_size);
> > -       if (rc) {
> > -               dev_err(&perf->ntb->dev, "Unable to set mw0 translation\n");
> > -               perf_free_mw(perf);
> > -               return -EIO;
> > +       ret = perf_run_test(pthr);
> > +       if (ret) {
> > +               pthr->status = ret;
> > +               goto err_clear_test;
> >         }
> >
> > -       return 0;
> > +       pthr->status = perf_sync_test(pthr);
> > +
> > +err_clear_test:
> > +       perf_clear_test(pthr);
> >  }
> >
> > -static void perf_link_work(struct work_struct *work)
> > +static int perf_set_tcnt(struct perf_ctx *perf, u8 tcnt)
> >  {
> > -       struct perf_ctx *perf =
> > -               container_of(work, struct perf_ctx, link_work.work);
> > -       struct ntb_dev *ndev = perf->ntb;
> > -       struct pci_dev *pdev = ndev->pdev;
> > -       u32 val;
> > -       u64 size;
> > -       int rc;
> > +       if (tcnt == 0 || tcnt > MAX_THREADS_CNT)
> > +               return -EINVAL;
> >
> > -       dev_dbg(&perf->ntb->pdev->dev, "%s called\n", __func__);
> > +       if (test_and_set_bit_lock(0, &perf->busy_flag))
> > +               return -EBUSY;
> >
> > -       size = perf->mw.phys_size;
> > +       perf->tcnt = tcnt;
> >
> > -       if (max_mw_size && size > max_mw_size)
> > -               size = max_mw_size;
> > +       clear_bit_unlock(0, &perf->busy_flag);
> >
> > -       ntb_peer_spad_write(ndev, PIDX, MW_SZ_HIGH, upper_32_bits(size));
> > -       ntb_peer_spad_write(ndev, PIDX, MW_SZ_LOW, lower_32_bits(size));
> > -       ntb_peer_spad_write(ndev, PIDX, VERSION, PERF_VERSION);
> > +       return 0;
> > +}
> > +
> > +static void perf_terminate_test(struct perf_ctx *perf)
> > +{
> > +       int tidx;
> > +
> > +       atomic_set(&perf->tsync, -1);
> > +       wake_up(&perf->twait);
> >
> > -       /* now read what peer wrote */
> > -       val = ntb_spad_read(ndev, VERSION);
> > -       if (val != PERF_VERSION) {
> > -               dev_dbg(&pdev->dev, "Remote version = %#x\n", val);
> > -               goto out;
> > +       for (tidx = 0; tidx < MAX_THREADS_CNT; tidx++) {
> > +               wake_up(&perf->threads[tidx].dma_wait);
> > +               cancel_work_sync(&perf->threads[tidx].work);
> >         }
> > +}
> >
> > -       val = ntb_spad_read(ndev, MW_SZ_HIGH);
> > -       size = (u64)val << 32;
> > +static int perf_submit_test(struct perf_peer *peer)
> > +{
> > +       struct perf_ctx *perf = peer->perf;
> > +       struct perf_thread *pthr;
> > +       int tidx, ret;
> > +
> > +       if (!test_bit(PERF_STS_DONE, &peer->sts))
> > +               return -ENOLINK;
> >
> > -       val = ntb_spad_read(ndev, MW_SZ_LOW);
> > -       size |= val;
> > +       if (test_and_set_bit_lock(0, &perf->busy_flag))
> > +               return -EBUSY;
> >
> > -       dev_dbg(&pdev->dev, "Remote MW size = %#llx\n", size);
> > +       perf->test_peer = peer;
> > +       atomic_set(&perf->tsync, perf->tcnt);
> >
> > -       rc = perf_set_mw(perf, size);
> > -       if (rc)
> > -               goto out1;
> > +       for (tidx = 0; tidx < MAX_THREADS_CNT; tidx++) {
> > +               pthr = &perf->threads[tidx];
> >
> > -       perf->link_is_up = true;
> > -       wake_up(&perf->link_wq);
> > +               pthr->status = -ENODATA;
> > +               pthr->copied = 0;
> > +               pthr->duration = ktime_set(0, 0);
> > +               if (tidx < perf->tcnt)
> > +                       (void)queue_work(perf_wq, &pthr->work);
> > +       }
> >
> > -       return;
> > +       ret = wait_event_interruptible(perf->twait,
> > +                                      atomic_read(&perf->tsync) <= 0);
> > +       if (ret == -ERESTARTSYS) {
> > +               perf_terminate_test(perf);
> > +               ret = -EINTR;
> > +       }
> >
> > -out1:
> > -       perf_free_mw(perf);
> > +       clear_bit_unlock(0, &perf->busy_flag);
> >
> > -out:
> > -       if (ntb_link_is_up(ndev, NULL, NULL) == 1)
> > -               schedule_delayed_work(&perf->link_work,
> > -                                     msecs_to_jiffies(PERF_LINK_DOWN_TIMEOUT));
> > +       return ret;
> >  }
> >
> > -static int perf_setup_mw(struct ntb_dev *ntb, struct perf_ctx *perf)
> > +static int perf_read_stats(struct perf_ctx *perf, char *buf,
> > +                          size_t size, ssize_t *pos)
> >  {
> > -       struct perf_mw *mw;
> > -       int rc;
> > +       struct perf_thread *pthr;
> > +       int tidx;
> >
> > -       mw = &perf->mw;
> > +       if (test_and_set_bit_lock(0, &perf->busy_flag))
> > +               return -EBUSY;
> >
> > -       rc = ntb_peer_mw_get_addr(ntb, 0, &mw->phys_addr, &mw->phys_size);
> > -       if (rc)
> > -               return rc;
> > +       (*pos) += scnprintf(buf + *pos, size - *pos,
> > +               "    Peer %d test statistics:\n", perf->test_peer->pidx);
> >
> > -       perf->mw.vbase = ioremap_wc(mw->phys_addr, mw->phys_size);
> > -       if (!mw->vbase)
> > -               return -ENOMEM;
> > +       for (tidx = 0; tidx < MAX_THREADS_CNT; tidx++) {
> > +               pthr = &perf->threads[tidx];
> > +
> > +               if (pthr->status == -ENODATA)
> > +                       continue;
> > +
> > +               if (pthr->status) {
> > +                       (*pos) += scnprintf(buf + *pos, size - *pos,
> > +                               "%d: error status %d\n", tidx, pthr->status);
> > +                       continue;
> > +               }
> > +
> > +               (*pos) += scnprintf(buf + *pos, size - *pos,
> > +                       "%d: copied %llu bytes in %llu usecs, %llu MBytes/s\n",
> > +                       tidx, pthr->copied, ktime_to_us(pthr->duration),
> > +                       div64_u64(pthr->copied, ktime_to_us(pthr->duration)));
> > +       }
> > +
> > +       clear_bit_unlock(0, &perf->busy_flag);
> >
> >         return 0;
> >  }
> >
> > -static ssize_t debugfs_run_read(struct file *filp, char __user *ubuf,
> > -                               size_t count, loff_t *offp)
> > +static void perf_init_threads(struct perf_ctx *perf)
> > +{
> > +       struct perf_thread *pthr;
> > +       int tidx;
> > +
> > +       perf->tcnt = DEF_THREADS_CNT;
> > +       perf->test_peer = &perf->peers[0];
> > +       init_waitqueue_head(&perf->twait);
> > +
> > +       for (tidx = 0; tidx < MAX_THREADS_CNT; tidx++) {
> > +               pthr = &perf->threads[tidx];
> > +
> > +               pthr->perf = perf;
> > +               pthr->tidx = tidx;
> > +               pthr->status = -ENODATA;
> > +               init_waitqueue_head(&pthr->dma_wait);
> > +               INIT_WORK(&pthr->work, perf_thread_work);
> > +       }
> > +}
> > +
> > +static void perf_clear_threads(struct perf_ctx *perf)
> >  {
> > -       struct perf_ctx *perf = filp->private_data;
> > +       perf_terminate_test(perf);
> > +}
> > +
> > +/*==============================================================================
> > + *                               DebugFS nodes
> > + *==============================================================================
> > + */
> > +
> > +static ssize_t perf_dbgfs_read_info(struct file *filep, char __user *ubuf,
> > +                                   size_t size, loff_t *offp)
> > +{
> > +       struct perf_ctx *perf = filep->private_data;
> > +       struct perf_peer *peer;
> > +       size_t buf_size;
> > +       ssize_t pos = 0;
> > +       int ret, pidx;
> >         char *buf;
> > -       ssize_t ret, out_off = 0;
> > -       struct pthr_ctx *pctx;
> > -       int i;
> > -       u64 rate;
> >
> > -       if (!perf)
> > -               return 0;
> > +       buf_size = min_t(size_t, size, 0x1000U);
> >
> > -       buf = kmalloc(1024, GFP_KERNEL);
> > +       buf = kmalloc(buf_size, GFP_KERNEL);
> >         if (!buf)
> >                 return -ENOMEM;
> >
> > -       if (mutex_is_locked(&perf->run_mutex)) {
> > -               out_off = scnprintf(buf, 64, "running\n");
> > -               goto read_from_buf;
> > +       pos += scnprintf(buf + pos, buf_size - pos,
> > +               "    Performance measuring tool info:\n\n");
> > +
> > +       pos += scnprintf(buf + pos, buf_size - pos,
> > +               "Local port %d, Global index %d\n", ntb_port_number(perf->ntb),
> > +               perf->gidx);
> > +       pos += scnprintf(buf + pos, buf_size - pos, "Test status: ");
> > +       if (test_bit(0, &perf->busy_flag)) {
> > +               pos += scnprintf(buf + pos, buf_size - pos,
> > +                       "on-fly with port %d (%d)\n",
> > +                       ntb_peer_port_number(perf->ntb, perf->test_peer->pidx),
> > +                       perf->test_peer->pidx);
> > +       } else {
> > +               pos += scnprintf(buf + pos, buf_size - pos, "idle\n");
> >         }
> >
> > -       for (i = 0; i < MAX_THREADS; i++) {
> > -               pctx = &perf->pthr_ctx[i];
> > +       for (pidx = 0; pidx < perf->pcnt; pidx++) {
> > +               peer = &perf->peers[pidx];
> > +
> > +               pos += scnprintf(buf + pos, buf_size - pos,
> > +                       "Port %d (%d), Global index %d:\n",
> > +                       ntb_peer_port_number(perf->ntb, peer->pidx), peer->pidx,
> > +                       peer->gidx);
> > +
> > +               pos += scnprintf(buf + pos, buf_size - pos,
> > +                       "\tLink status: %s\n",
> > +                       test_bit(PERF_STS_LNKUP, &peer->sts) ? "up" : "down");
> > +
> > +               pos += scnprintf(buf + pos, buf_size - pos,
> > +                       "\tOut buffer addr 0x%pK\n", peer->outbuf);
> >
> > -               if (pctx->status == -ENODATA)
> > -                       break;
> > +               pos += scnprintf(buf + pos, buf_size - pos,
> > +                       "\tOut buffer size %pa\n", &peer->outbuf_size);
> >
> > -               if (pctx->status) {
> > -                       out_off += scnprintf(buf + out_off, 1024 - out_off,
> > -                                           "%d: error %d\n", i,
> > -                                           pctx->status);
> > +               pos += scnprintf(buf + pos, buf_size - pos,
> > +                       "\tOut buffer xlat 0x%016llx[p]\n", peer->outbuf_xlat);
> > +
> > +               if (!peer->inbuf) {
> > +                       pos += scnprintf(buf + pos, buf_size - pos,
> > +                               "\tIn buffer addr: unallocated\n");
> >                         continue;
> >                 }
> >
> > -               rate = div64_u64(pctx->copied, pctx->diff_us);
> > -               out_off += scnprintf(buf + out_off, 1024 - out_off,
> > -                       "%d: copied %llu bytes in %llu usecs, %llu MBytes/s\n",
> > -                       i, pctx->copied, pctx->diff_us, rate);
> > +               pos += scnprintf(buf + pos, buf_size - pos,
> > +                       "\tIn buffer addr 0x%pK\n", peer->inbuf);
> > +
> > +               pos += scnprintf(buf + pos, buf_size - pos,
> > +                       "\tIn buffer size %pa\n", &peer->inbuf_size);
> > +
> > +               pos += scnprintf(buf + pos, buf_size - pos,
> > +                       "\tIn buffer xlat %pad[p]\n", &peer->inbuf_xlat);
> >         }
> >
> > -read_from_buf:
> > -       ret = simple_read_from_buffer(ubuf, count, offp, buf, out_off);
> > +       ret = simple_read_from_buffer(ubuf, size, offp, buf, pos);
> >         kfree(buf);
> >
> >         return ret;
> >  }
> >
> > -static void threads_cleanup(struct perf_ctx *perf)
> > +static const struct file_operations perf_dbgfs_info = {
> > +       .open = simple_open,
> > +       .read = perf_dbgfs_read_info
> > +};
> > +
> > +static ssize_t perf_dbgfs_read_run(struct file *filep, char __user *ubuf,
> > +                                  size_t size, loff_t *offp)
> >  {
> > -       struct pthr_ctx *pctx;
> > -       int i;
> > +       struct perf_ctx *perf = filep->private_data;
> > +       ssize_t ret, pos = 0;
> > +       char *buf;
> >
> > -       for (i = 0; i < MAX_THREADS; i++) {
> > -               pctx = &perf->pthr_ctx[i];
> > -               if (pctx->thread) {
> > -                       pctx->status = kthread_stop(pctx->thread);
> > -                       pctx->thread = NULL;
> > -               }
> > -       }
> > -}
> > +       buf = kmalloc(1024, GFP_KERNEL);
> 
> This size seems arbitrary.  Either make it a #define or reference the
> actual size of what you are wanting.
> 

Ok.)

> > +       if (!buf)
> > +               return -ENOMEM;
> >
> > -static void perf_clear_thread_status(struct perf_ctx *perf)
> > -{
> > -       int i;
> > +       ret = perf_read_stats(perf, buf, 1024, &pos);
> > +       if (ret)
> > +               goto err_free;
> > +
> > +       ret = simple_read_from_buffer(ubuf, size, offp, buf, pos);
> > +err_free:
> > +       kfree(buf);
> >
> > -       for (i = 0; i < MAX_THREADS; i++)
> > -               perf->pthr_ctx[i].status = -ENODATA;
> > +       return ret;
> >  }
> >
> > -static ssize_t debugfs_run_write(struct file *filp, const char __user *ubuf,
> > -                                size_t count, loff_t *offp)
> > +static ssize_t perf_dbgfs_write_run(struct file *filep, const char __user *ubuf,
> > +                                   size_t size, loff_t *offp)
> >  {
> > -       struct perf_ctx *perf = filp->private_data;
> > -       int node, i;
> > -       DECLARE_WAIT_QUEUE_HEAD(wq);
> > +       struct perf_ctx *perf = filep->private_data;
> > +       struct perf_peer *peer;
> > +       int pidx, ret;
> >
> > -       if (wait_event_interruptible(perf->link_wq, perf->link_is_up))
> > -               return -ENOLINK;
> > +       ret = kstrtoint_from_user(ubuf, size, 0, &pidx);
> > +       if (ret)
> > +               return ret;
> >
> > -       if (perf->perf_threads == 0)
> > +       if (pidx < 0 || pidx >= perf->pcnt)
> >                 return -EINVAL;
> >
> > -       if (!mutex_trylock(&perf->run_mutex))
> > -               return -EBUSY;
> > +       peer = &perf->peers[pidx];
> >
> > -       perf_clear_thread_status(perf);
> > +       ret = perf_submit_test(peer);
> > +       if (ret)
> > +               return ret;
> >
> > -       if (perf->perf_threads > MAX_THREADS) {
> > -               perf->perf_threads = MAX_THREADS;
> > -               pr_info("Reset total threads to: %u\n", MAX_THREADS);
> > -       }
> > +       return size;
> > +}
> >
> > -       /* no greater than 1M */
> > -       if (seg_order > MAX_SEG_ORDER) {
> > -               seg_order = MAX_SEG_ORDER;
> > -               pr_info("Fix seg_order to %u\n", seg_order);
> > -       }
> > +static const struct file_operations perf_dbgfs_run = {
> > +       .open = simple_open,
> > +       .read = perf_dbgfs_read_run,
> > +       .write = perf_dbgfs_write_run
> > +};
> >
> > -       if (run_order < seg_order) {
> > -               run_order = seg_order;
> > -               pr_info("Fix run_order to %u\n", run_order);
> > -       }
> > +static ssize_t perf_dbgfs_read_tcnt(struct file *filep, char __user *ubuf,
> > +                                   size_t size, loff_t *offp)
> > +{
> > +       struct perf_ctx *perf = filep->private_data;
> > +       char buf[8];
> > +       ssize_t pos;
> >
> > -       node = on_node ? dev_to_node(&perf->ntb->pdev->dev)
> > -                      : NUMA_NO_NODE;
> > -       atomic_set(&perf->tdone, 0);
> > +       pos = scnprintf(buf, sizeof(buf), "%hhu\n", perf->tcnt);
> >
> > -       /* launch kernel thread */
> > -       for (i = 0; i < perf->perf_threads; i++) {
> > -               struct pthr_ctx *pctx;
> > +       return simple_read_from_buffer(ubuf, size, offp, buf, pos);
> > +}
> >
> > -               pctx = &perf->pthr_ctx[i];
> > -               atomic_set(&pctx->dma_sync, 0);
> > -               pctx->perf = perf;
> > -               pctx->wq = &wq;
> > -               pctx->thread =
> > -                       kthread_create_on_node(ntb_perf_thread,
> > -                                              (void *)pctx,
> > -                                              node, "ntb_perf %d", i);
> > -               if (IS_ERR(pctx->thread)) {
> > -                       pctx->thread = NULL;
> > -                       goto err;
> > -               } else {
> > -                       wake_up_process(pctx->thread);
> > -               }
> > -       }
> > +static ssize_t perf_dbgfs_write_tcnt(struct file *filep,
> > +                                    const char __user *ubuf,
> > +                                    size_t size, loff_t *offp)
> > +{
> > +       struct perf_ctx *perf = filep->private_data;
> > +       int ret;
> > +       u8 val;
> >
> > -       wait_event_interruptible(wq,
> > -               atomic_read(&perf->tdone) == perf->perf_threads);
> > +       ret = kstrtou8_from_user(ubuf, size, 0, &val);
> > +       if (ret)
> > +               return ret;
> >
> > -       threads_cleanup(perf);
> > -       mutex_unlock(&perf->run_mutex);
> > -       return count;
> > +       ret = perf_set_tcnt(perf, val);
> > +       if (ret)
> > +               return ret;
> >
> > -err:
> > -       threads_cleanup(perf);
> > -       mutex_unlock(&perf->run_mutex);
> > -       return -ENXIO;
> > +       return size;
> >  }
> >
> > -static const struct file_operations ntb_perf_debugfs_run = {
> > -       .owner = THIS_MODULE,
> > +static const struct file_operations perf_dbgfs_tcnt = {
> >         .open = simple_open,
> > -       .read = debugfs_run_read,
> > -       .write = debugfs_run_write,
> > +       .read = perf_dbgfs_read_tcnt,
> > +       .write = perf_dbgfs_write_tcnt
> >  };
> >
> > -static int perf_debugfs_setup(struct perf_ctx *perf)
> > +static void perf_setup_dbgfs(struct perf_ctx *perf)
> >  {
> >         struct pci_dev *pdev = perf->ntb->pdev;
> > -       struct dentry *debugfs_node_dir;
> > -       struct dentry *debugfs_run;
> > -       struct dentry *debugfs_threads;
> > -       struct dentry *debugfs_seg_order;
> > -       struct dentry *debugfs_run_order;
> > -       struct dentry *debugfs_use_dma;
> > -       struct dentry *debugfs_on_node;
> > -
> > -       if (!debugfs_initialized())
> > -               return -ENODEV;
> >
> > -       /* Assumpion: only one NTB device in the system */
> > -       if (!perf_debugfs_dir) {
> > -               perf_debugfs_dir = debugfs_create_dir(KBUILD_MODNAME, NULL);
> > -               if (!perf_debugfs_dir)
> > -                       return -ENODEV;
> > -       }
> > -
> > -       debugfs_node_dir = debugfs_create_dir(pci_name(pdev),
> > -                                             perf_debugfs_dir);
> > -       if (!debugfs_node_dir)
> > -               goto err;
> > -
> > -       debugfs_run = debugfs_create_file("run", S_IRUSR | S_IWUSR,
> > -                                         debugfs_node_dir, perf,
> > -                                         &ntb_perf_debugfs_run);
> > -       if (!debugfs_run)
> > -               goto err;
> > -
> > -       debugfs_threads = debugfs_create_u8("threads", S_IRUSR | S_IWUSR,
> > -                                           debugfs_node_dir,
> > -                                           &perf->perf_threads);
> > -       if (!debugfs_threads)
> > -               goto err;
> > -
> > -       debugfs_seg_order = debugfs_create_u32("seg_order", 0600,
> > -                                              debugfs_node_dir,
> > -                                              &seg_order);
> > -       if (!debugfs_seg_order)
> > -               goto err;
> > -
> > -       debugfs_run_order = debugfs_create_u32("run_order", 0600,
> > -                                              debugfs_node_dir,
> > -                                              &run_order);
> > -       if (!debugfs_run_order)
> > -               goto err;
> > -
> > -       debugfs_use_dma = debugfs_create_bool("use_dma", 0600,
> > -                                              debugfs_node_dir,
> > -                                              &use_dma);
> > -       if (!debugfs_use_dma)
> > -               goto err;
> > -
> > -       debugfs_on_node = debugfs_create_bool("on_node", 0600,
> > -                                             debugfs_node_dir,
> > -                                             &on_node);
> > -       if (!debugfs_on_node)
> > -               goto err;
> > +       perf->dbgfs_dir = debugfs_create_dir(pci_name(pdev), perf_dbgfs_topdir);
> > +       if (!perf->dbgfs_dir) {
> > +               dev_warn(&perf->ntb->dev, "DebugFS unsupported\n");
> > +               return;
> > +       }
> > +
> > +       debugfs_create_file("info", 0600, perf->dbgfs_dir, perf,
> > +                           &perf_dbgfs_info);
> >
> > -       return 0;
> > +       debugfs_create_file("run", 0600, perf->dbgfs_dir, perf,
> > +                           &perf_dbgfs_run);
> >
> > -err:
> > -       debugfs_remove_recursive(perf_debugfs_dir);
> > -       perf_debugfs_dir = NULL;
> > -       return -ENODEV;
> > +       debugfs_create_file("threads_count", 0600, perf->dbgfs_dir, perf,
> > +                           &perf_dbgfs_tcnt);
> > +
> > +       /* They are made read-only for test exec safety and integrity */
> > +       debugfs_create_u8("chunk_order", 0500, perf->dbgfs_dir, &chunk_order);
> > +
> > +       debugfs_create_u8("total_order", 0500, perf->dbgfs_dir, &total_order);
> > +
> > +       debugfs_create_bool("use_dma", 0500, perf->dbgfs_dir, &use_dma);
> >  }
> >
> > -static int perf_probe(struct ntb_client *client, struct ntb_dev *ntb)
> > +static void perf_clear_dbgfs(struct perf_ctx *perf)
> > +{
> > +       debugfs_remove_recursive(perf->dbgfs_dir);
> > +}
> > +
> > +/*==============================================================================
> > + *                        Basic driver initialization
> > + *==============================================================================
> > + */
> > +
> > +static struct perf_ctx *perf_create_data(struct ntb_dev *ntb)
> >  {
> > -       struct pci_dev *pdev = ntb->pdev;
> >         struct perf_ctx *perf;
> > -       int node;
> > -       int rc = 0;
> >
> > -       if (ntb_spad_count(ntb) < MAX_SPAD) {
> > -               dev_err(&ntb->dev, "Not enough scratch pad registers for %s",
> > -                       DRIVER_NAME);
> > -               return -EIO;
> > -       }
> > +       perf = devm_kzalloc(&ntb->dev, sizeof(*perf), GFP_KERNEL);
> > +       if (!perf)
> > +               return ERR_PTR(-ENOMEM);
> >
> > -       if (!ntb->ops->mw_set_trans) {
> > -               dev_err(&ntb->dev, "Need inbound MW based NTB API\n");
> > -               return -EINVAL;
> > +       perf->pcnt = ntb_peer_port_count(ntb);
> > +       perf->peers = devm_kcalloc(&ntb->dev, perf->pcnt, sizeof(*perf->peers),
> > +                                 GFP_KERNEL);
> > +       if (!perf->peers)
> > +               return ERR_PTR(-ENOMEM);
> > +
> > +       perf->ntb = ntb;
> > +
> > +       return perf;
> > +}
> > +
> > +static int perf_setup_peer_mw(struct perf_peer *peer)
> > +{
> > +       struct perf_ctx *perf = peer->perf;
> > +       phys_addr_t phys_addr;
> > +       int ret;
> > +
> > +       /* Get outbound MW parameters and map it */
> > +       ret = ntb_peer_mw_get_addr(perf->ntb, peer->gidx, &phys_addr,
> > +                                  &peer->outbuf_size);
> > +       if (ret)
> > +               return ret;
> > +
> > +       peer->outbuf = devm_ioremap_wc(&perf->ntb->dev, phys_addr,
> > +                                       peer->outbuf_size);
> > +       if (!peer->outbuf)
> > +               return -ENOMEM;
> > +
> > +       if (max_mw_size && peer->outbuf_size > max_mw_size) {
> > +               peer->outbuf_size = max_mw_size;
> > +               dev_warn(&peer->perf->ntb->dev,
> > +                       "Peer %d outbuf reduced to %#llx\n", peer->pidx,
> > +                       peer->outbuf_size);
> >         }
> >
> > -       if (ntb_peer_port_count(ntb) != NTB_DEF_PEER_CNT)
> > -               dev_warn(&ntb->dev, "Multi-port NTB devices unsupported\n");
> > +       return 0;
> > +}
> >
> > -       node = on_node ? dev_to_node(&pdev->dev) : NUMA_NO_NODE;
> > -       perf = kzalloc_node(sizeof(*perf), GFP_KERNEL, node);
> > -       if (!perf) {
> > -               rc = -ENOMEM;
> > -               goto err_perf;
> > +static int perf_init_peers(struct perf_ctx *perf)
> > +{
> > +       struct perf_peer *peer;
> > +       int pidx, lport, ret;
> > +
> > +       lport = ntb_port_number(perf->ntb);
> > +       perf->gidx = -1;
> > +       for (pidx = 0; pidx < perf->pcnt; pidx++) {
> > +               peer = &perf->peers[pidx];
> > +
> > +               peer->perf = perf;
> > +               peer->pidx = pidx;
> > +               if (lport < ntb_peer_port_number(perf->ntb, pidx)) {
> > +                       if (perf->gidx == -1)
> > +                               perf->gidx = pidx;
> > +                       peer->gidx = pidx + 1;
> > +               } else {
> > +                       peer->gidx = pidx;
> > +               }
> > +               INIT_WORK(&peer->service, perf_service_work);
> >         }
> > +       if (perf->gidx == -1)
> > +               perf->gidx = pidx;
> >
> > -       perf->ntb = ntb;
> > -       perf->perf_threads = 1;
> > -       atomic_set(&perf->tsync, 0);
> > -       mutex_init(&perf->run_mutex);
> > -       spin_lock_init(&perf->db_lock);
> > -       perf_setup_mw(ntb, perf);
> > -       init_waitqueue_head(&perf->link_wq);
> > -       INIT_DELAYED_WORK(&perf->link_work, perf_link_work);
> > +       for (pidx = 0; pidx < perf->pcnt; pidx++) {
> > +               ret = perf_setup_peer_mw(&perf->peers[pidx]);
> > +               if (ret)
> > +                       return ret;
> > +       }
> > +
> > +       dev_dbg(&perf->ntb->dev, "Global port index %d\n", perf->gidx);
> > +
> > +       return 0;
> > +}
> >
> > -       rc = ntb_set_ctx(ntb, perf, &perf_ops);
> > -       if (rc)
> > -               goto err_ctx;
> > +static int perf_probe(struct ntb_client *client, struct ntb_dev *ntb)
> > +{
> > +       struct perf_ctx *perf;
> > +       int ret;
> >
> > -       perf->link_is_up = false;
> > -       ntb_link_enable(ntb, NTB_SPEED_AUTO, NTB_WIDTH_AUTO);
> > -       ntb_link_event(ntb);
> > +       perf = perf_create_data(ntb);
> > +       if (IS_ERR(perf))
> > +               return PTR_ERR(perf);
> >
> > -       rc = perf_debugfs_setup(perf);
> > -       if (rc)
> > -               goto err_ctx;
> > +       ret = perf_init_peers(perf);
> > +       if (ret)
> > +               return ret;
> >
> > -       perf_clear_thread_status(perf);
> > +       perf_init_threads(perf);
> >
> > -       return 0;
> > +       ret = perf_init_service(perf);
> > +       if (ret)
> > +               return ret;
> >
> > -err_ctx:
> > -       cancel_delayed_work_sync(&perf->link_work);
> > -       kfree(perf);
> > -err_perf:
> > -       return rc;
> > +       ret = perf_enable_service(perf);
> > +       if (ret)
> > +               return ret;
> > +
> > +       perf_setup_dbgfs(perf);
> > +
> > +       return 0;
> >  }
> >
> >  static void perf_remove(struct ntb_client *client, struct ntb_dev *ntb)
> >  {
> >         struct perf_ctx *perf = ntb->ctx;
> > -       int i;
> >
> > -       dev_dbg(&perf->ntb->dev, "%s called\n", __func__);
> > +       perf_clear_dbgfs(perf);
> >
> > -       mutex_lock(&perf->run_mutex);
> > +       perf_disable_service(perf);
> >
> > -       cancel_delayed_work_sync(&perf->link_work);
> > +       perf_clear_threads(perf);
> > +}
> >
> > -       ntb_clear_ctx(ntb);
> > -       ntb_link_disable(ntb);
> > +static struct ntb_client perf_client = {
> > +       .ops = {
> > +               .probe = perf_probe,
> > +               .remove = perf_remove
> > +       }
> > +};
> >
> > -       debugfs_remove_recursive(perf_debugfs_dir);
> > -       perf_debugfs_dir = NULL;
> > +static int __init perf_init(void)
> > +{
> > +       int ret;
> >
> > -       if (use_dma) {
> > -               for (i = 0; i < MAX_THREADS; i++) {
> > -                       struct pthr_ctx *pctx = &perf->pthr_ctx[i];
> > +       if (chunk_order > MAX_CHUNK_ORDER) {
> > +               chunk_order = MAX_CHUNK_ORDER;
> > +               pr_info("Chunk order reduced to %hhu\n", chunk_order);
> > +       }
> >
> > -                       if (pctx->dma_chan)
> > -                               dma_release_channel(pctx->dma_chan);
> > -               }
> > +       if (total_order < chunk_order) {
> > +               total_order = chunk_order;
> > +               pr_info("Total data order reduced to %hhu\n", total_order);
> >         }
> >
> > -       kfree(perf);
> > +       perf_wq = alloc_workqueue("perf_wq", WQ_UNBOUND | WQ_SYSFS, 0);
> > +       if (!perf_wq)
> > +               return -ENOMEM;
> > +
> > +       if (debugfs_initialized())
> > +               perf_dbgfs_topdir = debugfs_create_dir(KBUILD_MODNAME, NULL);
> > +
> > +       ret = ntb_register_client(&perf_client);
> > +       if (ret) {
> > +               debugfs_remove_recursive(perf_dbgfs_topdir);
> > +               destroy_workqueue(perf_wq);
> > +       }
> > +
> > +       return ret;
> >  }
> > +module_init(perf_init);
> > +
> > +static void __exit perf_exit(void)
> > +{
> > +       ntb_unregister_client(&perf_client);
> > +       debugfs_remove_recursive(perf_dbgfs_topdir);
> > +       destroy_workqueue(perf_wq);
> > +}
> > +module_exit(perf_exit);
> >
> > -static struct ntb_client perf_client = {
> > -       .ops = {
> > -               .probe = perf_probe,
> > -               .remove = perf_remove,
> > -       },
> > -};
> > -module_ntb_client(perf_client);
> > --
> > 2.12.0
> >

Re: [PATCH v2 06/15] NTB: ntb_perf: Add full multi-port NTB API support

[kbuild test robot]

[-- Attachment #1: Type: text/plain, Size: 3618 bytes --]

Hi Serge,

I love your patch! Perhaps something to improve:

[auto build test WARNING on linus/master]
[also build test WARNING on v4.15-rc2]
[cannot apply to ntb/ntb-next next-20171205]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]

url:    https://github.com/0day-ci/linux/commits/Serge-Semin/NTB-Add-full-multi-port-API-support-to-the-test-drivers/20171206-081300
config: x86_64-randconfig-x004-201749 (attached as .config)
compiler: gcc-7 (Debian 7.2.0-12) 7.2.1 20171025
reproduce:
        # save the attached .config to linux build tree
        make ARCH=x86_64 

Note: it may well be a FALSE warning. FWIW you are at least aware of it now.
http://gcc.gnu.org/wiki/Better_Uninitialized_Warnings

All warnings (new ones prefixed by >>):

   drivers/ntb/test/ntb_perf.c: In function 'perf_thread_work':
>> drivers/ntb/test/ntb_perf.c:821:22: warning: 'try' may be used uninitialized in this function [-Wmaybe-uninitialized]
     } while (!tx && (try++ < DMA_TRIES));
                      ~~~^~
   drivers/ntb/test/ntb_perf.c:782:6: note: 'try' was declared here
     int try, ret = 0;
         ^~~

vim +/try +821 drivers/ntb/test/ntb_perf.c

   775	
   776	static int perf_copy_chunk(struct perf_thread *pthr,
   777				   void __iomem *dst, void *src, size_t len)
   778	{
   779		struct dma_async_tx_descriptor *tx;
   780		struct dmaengine_unmap_data *unmap;
   781		struct device *dma_dev;
   782		int try, ret = 0;
   783	
   784		if (!use_dma) {
   785			memcpy_toio(dst, src, len);
   786			goto ret_check_tsync;
   787		}
   788	
   789		dma_dev = pthr->dma_chan->device->dev;
   790	
   791		if (!is_dma_copy_aligned(pthr->dma_chan->device, offset_in_page(src),
   792					 offset_in_page(dst), len))
   793			return -EIO;
   794	
   795		unmap = dmaengine_get_unmap_data(dma_dev, 2, GFP_NOWAIT);
   796		if (!unmap)
   797			return -ENOMEM;
   798	
   799		unmap->len = len;
   800		unmap->addr[0] = dma_map_page(dma_dev, virt_to_page(src),
   801			offset_in_page(src), len, DMA_TO_DEVICE);
   802		if (dma_mapping_error(dma_dev, unmap->addr[0])) {
   803			ret = -EIO;
   804			goto err_free_resource;
   805		}
   806		unmap->to_cnt = 1;
   807	
   808		unmap->addr[1] = dma_map_page(dma_dev, virt_to_page(dst),
   809			offset_in_page(dst), len, DMA_FROM_DEVICE);
   810		if (dma_mapping_error(dma_dev, unmap->addr[1])) {
   811			ret = -EIO;
   812			goto err_free_resource;
   813		}
   814		unmap->from_cnt = 1;
   815	
   816		do {
   817			tx = dmaengine_prep_dma_memcpy(pthr->dma_chan, unmap->addr[1],
   818				unmap->addr[0], len, DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
   819			if (!tx)
   820				msleep(DMA_MDELAY);
 > 821		} while (!tx && (try++ < DMA_TRIES));
   822	
   823		if (!tx) {
   824			ret = -EIO;
   825			goto err_free_resource;
   826		}
   827	
   828		tx->callback = perf_dma_copy_callback;
   829		tx->callback_param = pthr;
   830		dma_set_unmap(tx, unmap);
   831	
   832		if (dma_submit_error(dmaengine_submit(tx))) {
   833			dmaengine_unmap_put(unmap);
   834			goto err_free_resource;
   835		}
   836	
   837		dmaengine_unmap_put(unmap);
   838	
   839		atomic_inc(&pthr->dma_sync);
   840		dma_async_issue_pending(pthr->dma_chan);
   841	
   842	ret_check_tsync:
   843		return likely(atomic_read(&pthr->perf->tsync) > 0) ? 0 : -EINTR;
   844	
   845	err_free_resource:
   846		dmaengine_unmap_put(unmap);
   847	
   848		return ret;
   849	}
   850	

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation

[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 25952 bytes --]

[PATCH v2 07/15] NTB: ntb_test: Safely use paths with whitespace

[Serge Semin]

If some of the variables like LOC/REM or LOCAL_*/REMOTE_* got
whitespaces, the script may fail with syntax error.

Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
Acked-by: Logan Gunthorpe <logang@deltatee.com>
Fixes: a9c59ef77458 ("ntb_test: Add a selftest script for the NTB subsystem")
---
 tools/testing/selftests/ntb/ntb_test.sh | 62 ++++++++++++++++-----------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/tools/testing/selftests/ntb/ntb_test.sh b/tools/testing/selftests/ntb/ntb_test.sh
index 5fc7ad359e21..a8647ad891eb 100755
--- a/tools/testing/selftests/ntb/ntb_test.sh
+++ b/tools/testing/selftests/ntb/ntb_test.sh
@@ -87,7 +87,7 @@ set -e
 
 function _modprobe()
 {
-        modprobe "$@"
+	modprobe "$@"
 
 	if [[ "$REMOTE_HOST" != "" ]]; then
 		ssh "$REMOTE_HOST" modprobe "$@"
@@ -274,13 +274,13 @@ function pingpong_test()
 
 	echo "Running ping pong tests on: $(basename $LOC) / $(basename $REM)"
 
-	LOC_START=$(read_file $LOC/count)
-	REM_START=$(read_file $REM/count)
+	LOC_START=$(read_file "$LOC/count")
+	REM_START=$(read_file "$REM/count")
 
 	sleep 7
 
-	LOC_END=$(read_file $LOC/count)
-	REM_END=$(read_file $REM/count)
+	LOC_END=$(read_file "$LOC/count")
+	REM_END=$(read_file "$REM/count")
 
 	if [[ $LOC_START == $LOC_END ]] || [[ $REM_START == $REM_END ]]; then
 		echo "Ping pong counter not incrementing!" >&2
@@ -304,15 +304,15 @@ function perf_test()
 		max_mw_size=$MAX_MW_SIZE use_dma=$USE_DMA
 
 	echo "Running local perf test $WITH DMA"
-	write_file "" $LOCAL_PERF/run
+	write_file "" "$LOCAL_PERF/run"
 	echo -n "  "
-	read_file $LOCAL_PERF/run
+	read_file "$LOCAL_PERF/run"
 	echo "  Passed"
 
 	echo "Running remote perf test $WITH DMA"
-	write_file "" $REMOTE_PERF/run
+	write_file "" "$REMOTE_PERF/run"
 	echo -n "  "
-	read_file $REMOTE_PERF/run
+	read_file "$REMOTE_PERF/run"
 	echo "  Passed"
 
 	_modprobe -r ntb_perf
@@ -320,39 +320,39 @@ function perf_test()
 
 function ntb_tool_tests()
 {
-	LOCAL_TOOL=$DEBUGFS/ntb_tool/$LOCAL_DEV
-	REMOTE_TOOL=$REMOTE_HOST:$DEBUGFS/ntb_tool/$REMOTE_DEV
+	LOCAL_TOOL="$DEBUGFS/ntb_tool/$LOCAL_DEV"
+	REMOTE_TOOL="$REMOTE_HOST:$DEBUGFS/ntb_tool/$REMOTE_DEV"
 
 	echo "Starting ntb_tool tests..."
 
 	_modprobe ntb_tool
 
-	write_file Y $LOCAL_TOOL/link_event
-	write_file Y $REMOTE_TOOL/link_event
+	write_file "Y" "$LOCAL_TOOL/link_event"
+	write_file "Y" "$REMOTE_TOOL/link_event"
 
-	link_test $LOCAL_TOOL $REMOTE_TOOL
-	link_test $REMOTE_TOOL $LOCAL_TOOL
+	link_test "$LOCAL_TOOL" "$REMOTE_TOOL"
+	link_test "$REMOTE_TOOL" "$LOCAL_TOOL"
 
 	#Ensure the link is up on both sides before continuing
-	write_file Y $LOCAL_TOOL/link_event
-	write_file Y $REMOTE_TOOL/link_event
+	write_file "Y" "$LOCAL_TOOL/link_event"
+	write_file "Y" "$REMOTE_TOOL/link_event"
 
-	for PEER_TRANS in $(ls $LOCAL_TOOL/peer_trans*); do
+	for PEER_TRANS in $(ls "$LOCAL_TOOL"/peer_trans*); do
 		PT=$(basename $PEER_TRANS)
-		write_file $MW_SIZE $LOCAL_TOOL/$PT
-		write_file $MW_SIZE $REMOTE_TOOL/$PT
+		write_file $MW_SIZE "$LOCAL_TOOL/$PT"
+		write_file $MW_SIZE "$REMOTE_TOOL/$PT"
 	done
 
-	doorbell_test $LOCAL_TOOL $REMOTE_TOOL
-	doorbell_test $REMOTE_TOOL $LOCAL_TOOL
-	scratchpad_test $LOCAL_TOOL $REMOTE_TOOL
-	scratchpad_test $REMOTE_TOOL $LOCAL_TOOL
+	doorbell_test "$LOCAL_TOOL" "$REMOTE_TOOL"
+	doorbell_test "$REMOTE_TOOL" "$LOCAL_TOOL"
+	scratchpad_test "$LOCAL_TOOL" "$REMOTE_TOOL"
+	scratchpad_test "$REMOTE_TOOL" "$LOCAL_TOOL"
 
-	for MW in $(ls $LOCAL_TOOL/mw*); do
+	for MW in $(ls "$LOCAL_TOOL"/mw*); do
 		MW=$(basename $MW)
 
-		mw_test $MW $LOCAL_TOOL $REMOTE_TOOL
-		mw_test $MW $REMOTE_TOOL $LOCAL_TOOL
+		mw_test $MW "$LOCAL_TOOL" "$REMOTE_TOOL"
+		mw_test $MW "$REMOTE_TOOL" "$LOCAL_TOOL"
 	done
 
 	_modprobe -r ntb_tool
@@ -360,8 +360,8 @@ function ntb_tool_tests()
 
 function ntb_pingpong_tests()
 {
-	LOCAL_PP=$DEBUGFS/ntb_pingpong/$LOCAL_DEV
-	REMOTE_PP=$REMOTE_HOST:$DEBUGFS/ntb_pingpong/$REMOTE_DEV
+	LOCAL_PP="$DEBUGFS/ntb_pingpong/$LOCAL_DEV"
+	REMOTE_PP="$REMOTE_HOST:$DEBUGFS/ntb_pingpong/$REMOTE_DEV"
 
 	echo "Starting ntb_pingpong tests..."
 
@@ -374,8 +374,8 @@ function ntb_pingpong_tests()
 
 function ntb_perf_tests()
 {
-	LOCAL_PERF=$DEBUGFS/ntb_perf/$LOCAL_DEV
-	REMOTE_PERF=$REMOTE_HOST:$DEBUGFS/ntb_perf/$REMOTE_DEV
+	LOCAL_PERF="$DEBUGFS/ntb_perf/$LOCAL_DEV"
+	REMOTE_PERF="$REMOTE_HOST:$DEBUGFS/ntb_perf/$REMOTE_DEV"
 
 	echo "Starting ntb_perf tests..."
 
-- 
2.12.0

Re: [PATCH v2 07/15] NTB: ntb_test: Safely use paths with whitespace

[Jon Mason]

On Sun, Dec 3, 2017 at 2:17 PM, Serge Semin <fancer.lancer@gmail.com> wrote:
> If some of the variables like LOC/REM or LOCAL_*/REMOTE_* got
> whitespaces, the script may fail with syntax error.
>
> Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
> Acked-by: Logan Gunthorpe <logang@deltatee.com>
> Fixes: a9c59ef77458 ("ntb_test: Add a selftest script for the NTB subsystem")

Looks fine to me

> ---
>  tools/testing/selftests/ntb/ntb_test.sh | 62 ++++++++++++++++-----------------
>  1 file changed, 31 insertions(+), 31 deletions(-)
>
> diff --git a/tools/testing/selftests/ntb/ntb_test.sh b/tools/testing/selftests/ntb/ntb_test.sh
> index 5fc7ad359e21..a8647ad891eb 100755
> --- a/tools/testing/selftests/ntb/ntb_test.sh
> +++ b/tools/testing/selftests/ntb/ntb_test.sh
> @@ -87,7 +87,7 @@ set -e
>
>  function _modprobe()
>  {
> -        modprobe "$@"
> +       modprobe "$@"
>
>         if [[ "$REMOTE_HOST" != "" ]]; then
>                 ssh "$REMOTE_HOST" modprobe "$@"
> @@ -274,13 +274,13 @@ function pingpong_test()
>
>         echo "Running ping pong tests on: $(basename $LOC) / $(basename $REM)"
>
> -       LOC_START=$(read_file $LOC/count)
> -       REM_START=$(read_file $REM/count)
> +       LOC_START=$(read_file "$LOC/count")
> +       REM_START=$(read_file "$REM/count")
>
>         sleep 7
>
> -       LOC_END=$(read_file $LOC/count)
> -       REM_END=$(read_file $REM/count)
> +       LOC_END=$(read_file "$LOC/count")
> +       REM_END=$(read_file "$REM/count")
>
>         if [[ $LOC_START == $LOC_END ]] || [[ $REM_START == $REM_END ]]; then
>                 echo "Ping pong counter not incrementing!" >&2
> @@ -304,15 +304,15 @@ function perf_test()
>                 max_mw_size=$MAX_MW_SIZE use_dma=$USE_DMA
>
>         echo "Running local perf test $WITH DMA"
> -       write_file "" $LOCAL_PERF/run
> +       write_file "" "$LOCAL_PERF/run"
>         echo -n "  "
> -       read_file $LOCAL_PERF/run
> +       read_file "$LOCAL_PERF/run"
>         echo "  Passed"
>
>         echo "Running remote perf test $WITH DMA"
> -       write_file "" $REMOTE_PERF/run
> +       write_file "" "$REMOTE_PERF/run"
>         echo -n "  "
> -       read_file $REMOTE_PERF/run
> +       read_file "$REMOTE_PERF/run"
>         echo "  Passed"
>
>         _modprobe -r ntb_perf
> @@ -320,39 +320,39 @@ function perf_test()
>
>  function ntb_tool_tests()
>  {
> -       LOCAL_TOOL=$DEBUGFS/ntb_tool/$LOCAL_DEV
> -       REMOTE_TOOL=$REMOTE_HOST:$DEBUGFS/ntb_tool/$REMOTE_DEV
> +       LOCAL_TOOL="$DEBUGFS/ntb_tool/$LOCAL_DEV"
> +       REMOTE_TOOL="$REMOTE_HOST:$DEBUGFS/ntb_tool/$REMOTE_DEV"
>
>         echo "Starting ntb_tool tests..."
>
>         _modprobe ntb_tool
>
> -       write_file Y $LOCAL_TOOL/link_event
> -       write_file Y $REMOTE_TOOL/link_event
> +       write_file "Y" "$LOCAL_TOOL/link_event"
> +       write_file "Y" "$REMOTE_TOOL/link_event"
>
> -       link_test $LOCAL_TOOL $REMOTE_TOOL
> -       link_test $REMOTE_TOOL $LOCAL_TOOL
> +       link_test "$LOCAL_TOOL" "$REMOTE_TOOL"
> +       link_test "$REMOTE_TOOL" "$LOCAL_TOOL"
>
>         #Ensure the link is up on both sides before continuing
> -       write_file Y $LOCAL_TOOL/link_event
> -       write_file Y $REMOTE_TOOL/link_event
> +       write_file "Y" "$LOCAL_TOOL/link_event"
> +       write_file "Y" "$REMOTE_TOOL/link_event"
>
> -       for PEER_TRANS in $(ls $LOCAL_TOOL/peer_trans*); do
> +       for PEER_TRANS in $(ls "$LOCAL_TOOL"/peer_trans*); do
>                 PT=$(basename $PEER_TRANS)
> -               write_file $MW_SIZE $LOCAL_TOOL/$PT
> -               write_file $MW_SIZE $REMOTE_TOOL/$PT
> +               write_file $MW_SIZE "$LOCAL_TOOL/$PT"
> +               write_file $MW_SIZE "$REMOTE_TOOL/$PT"
>         done
>
> -       doorbell_test $LOCAL_TOOL $REMOTE_TOOL
> -       doorbell_test $REMOTE_TOOL $LOCAL_TOOL
> -       scratchpad_test $LOCAL_TOOL $REMOTE_TOOL
> -       scratchpad_test $REMOTE_TOOL $LOCAL_TOOL
> +       doorbell_test "$LOCAL_TOOL" "$REMOTE_TOOL"
> +       doorbell_test "$REMOTE_TOOL" "$LOCAL_TOOL"
> +       scratchpad_test "$LOCAL_TOOL" "$REMOTE_TOOL"
> +       scratchpad_test "$REMOTE_TOOL" "$LOCAL_TOOL"
>
> -       for MW in $(ls $LOCAL_TOOL/mw*); do
> +       for MW in $(ls "$LOCAL_TOOL"/mw*); do
>                 MW=$(basename $MW)
>
> -               mw_test $MW $LOCAL_TOOL $REMOTE_TOOL
> -               mw_test $MW $REMOTE_TOOL $LOCAL_TOOL
> +               mw_test $MW "$LOCAL_TOOL" "$REMOTE_TOOL"
> +               mw_test $MW "$REMOTE_TOOL" "$LOCAL_TOOL"
>         done
>
>         _modprobe -r ntb_tool
> @@ -360,8 +360,8 @@ function ntb_tool_tests()
>
>  function ntb_pingpong_tests()
>  {
> -       LOCAL_PP=$DEBUGFS/ntb_pingpong/$LOCAL_DEV
> -       REMOTE_PP=$REMOTE_HOST:$DEBUGFS/ntb_pingpong/$REMOTE_DEV
> +       LOCAL_PP="$DEBUGFS/ntb_pingpong/$LOCAL_DEV"
> +       REMOTE_PP="$REMOTE_HOST:$DEBUGFS/ntb_pingpong/$REMOTE_DEV"
>
>         echo "Starting ntb_pingpong tests..."
>
> @@ -374,8 +374,8 @@ function ntb_pingpong_tests()
>
>  function ntb_perf_tests()
>  {
> -       LOCAL_PERF=$DEBUGFS/ntb_perf/$LOCAL_DEV
> -       REMOTE_PERF=$REMOTE_HOST:$DEBUGFS/ntb_perf/$REMOTE_DEV
> +       LOCAL_PERF="$DEBUGFS/ntb_perf/$LOCAL_DEV"
> +       REMOTE_PERF="$REMOTE_HOST:$DEBUGFS/ntb_perf/$REMOTE_DEV"
>
>         echo "Starting ntb_perf tests..."
>
> --
> 2.12.0
>

[PATCH v2 08/15] NTB: ntb_test: Add ntb_tool port tests

[Serge Semin]

Multi-port interface is now available in ntb_tool driver. According
to the new NTB API, there might be more than two devices connected
over NTB. It means that each device can have multiple freely
enumerated ports. Each port got index assigned by the NTB hardware
driver. This test is performed to determine the local and peer ports
as well as their indexes.

Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
---
 tools/testing/selftests/ntb/ntb_test.sh | 52 +++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/tools/testing/selftests/ntb/ntb_test.sh b/tools/testing/selftests/ntb/ntb_test.sh
index a8647ad891eb..541ba70ad640 100755
--- a/tools/testing/selftests/ntb/ntb_test.sh
+++ b/tools/testing/selftests/ntb/ntb_test.sh
@@ -127,6 +127,56 @@ function write_file()
 	fi
 }
 
+function check_file()
+{
+	split_remote $1
+
+	if [[ "$REMOTE" != "" ]]; then
+		ssh "$REMOTE" "[[ -e ${VPATH} ]]"
+	else
+		[[ -e ${VPATH} ]]
+	fi
+}
+
+function find_pidx()
+{
+	PORT=$1
+	PPATH=$2
+
+	for ((i = 0; i < 64; i++)); do
+		PEER_DIR="$PPATH/peer$i"
+
+		check_file ${PEER_DIR} || break
+
+		PEER_PORT=$(read_file "${PEER_DIR}/port")
+		if [[ ${PORT} -eq $PEER_PORT ]]; then
+			echo $i
+			return 0
+		fi
+	done
+
+	return 1
+}
+
+function port_test()
+{
+	LOC=$1
+	REM=$2
+
+	echo "Running port tests on: $(basename $LOC) / $(basename $REM)"
+
+	LOCAL_PORT=$(read_file "$LOC/port")
+	REMOTE_PORT=$(read_file "$REM/port")
+
+	LOCAL_PIDX=$(find_pidx ${REMOTE_PORT} "$LOC")
+	REMOTE_PIDX=$(find_pidx ${LOCAL_PORT} "$REM")
+
+	echo "Local port ${LOCAL_PORT} with index ${REMOTE_PIDX} on remote host"
+	echo "Peer port ${REMOTE_PORT} with index ${LOCAL_PIDX} on local host"
+
+	echo "  Passed"
+}
+
 function link_test()
 {
 	LOC=$1
@@ -327,6 +377,8 @@ function ntb_tool_tests()
 
 	_modprobe ntb_tool
 
+	port_test "$LOCAL_TOOL" "$REMOTE_TOOL"
+
 	write_file "Y" "$LOCAL_TOOL/link_event"
 	write_file "Y" "$REMOTE_TOOL/link_event"
 
-- 
2.12.0

[PATCH v2 09/15] NTB: ntb_test: Update ntb_tool link tests

[Serge Semin]

Link Up and Down methods are used to change NTB link settings on
local side only for multi-port devices. Link is considered up
only if both sides local and peer set it up. Intel/AMD hardware
acts a bit different by assigning the Primary and Secondary roles,
so Primary device only is able to change the link state. Such behaviour
should be reflected in the test code.

Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
---
 tools/testing/selftests/ntb/ntb_test.sh | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/tools/testing/selftests/ntb/ntb_test.sh b/tools/testing/selftests/ntb/ntb_test.sh
index 541ba70ad640..247458c6d8dc 100755
--- a/tools/testing/selftests/ntb/ntb_test.sh
+++ b/tools/testing/selftests/ntb/ntb_test.sh
@@ -138,6 +138,11 @@ function check_file()
 	fi
 }
 
+function subdirname()
+{
+	echo $(basename $(dirname $1)) 2> /dev/nulle
+}
+
 function find_pidx()
 {
 	PORT=$1
@@ -183,9 +188,9 @@ function link_test()
 	REM=$2
 	EXP=0
 
-	echo "Running link tests on: $(basename $LOC) / $(basename $REM)"
+	echo "Running link tests on: $(subdirname $LOC) / $(subdirname $REM)"
 
-	if ! write_file "N" "$LOC/link" 2> /dev/null; then
+	if ! write_file "N" "$LOC/../link" 2> /dev/null; then
 		echo "  Unsupported"
 		return
 	fi
@@ -193,12 +198,11 @@ function link_test()
 	write_file "N" "$LOC/link_event"
 
 	if [[ $(read_file "$REM/link") != "N" ]]; then
-		echo "Expected remote link to be down in $REM/link" >&2
+		echo "Expected link to be down in $REM/link" >&2
 		exit -1
 	fi
 
-	write_file "Y" "$LOC/link"
-	write_file "Y" "$LOC/link_event"
+	write_file "Y" "$LOC/../link"
 
 	echo "  Passed"
 }
@@ -379,15 +383,15 @@ function ntb_tool_tests()
 
 	port_test "$LOCAL_TOOL" "$REMOTE_TOOL"
 
-	write_file "Y" "$LOCAL_TOOL/link_event"
-	write_file "Y" "$REMOTE_TOOL/link_event"
+	LOCAL_PEER_TOOL="$LOCAL_TOOL/peer$LOCAL_PIDX"
+	REMOTE_PEER_TOOL="$REMOTE_TOOL/peer$REMOTE_PIDX"
 
-	link_test "$LOCAL_TOOL" "$REMOTE_TOOL"
-	link_test "$REMOTE_TOOL" "$LOCAL_TOOL"
+	link_test "$LOCAL_PEER_TOOL" "$REMOTE_PEER_TOOL"
+	link_test "$REMOTE_PEER_TOOL" "$LOCAL_PEER_TOOL"
 
 	#Ensure the link is up on both sides before continuing
-	write_file "Y" "$LOCAL_TOOL/link_event"
-	write_file "Y" "$REMOTE_TOOL/link_event"
+	write_file "Y" "$LOCAL_PEER_TOOL/link_event"
+	write_file "Y" "$REMOTE_PEER_TOOL/link_event"
 
 	for PEER_TRANS in $(ls "$LOCAL_TOOL"/peer_trans*); do
 		PT=$(basename $PEER_TRANS)
-- 
2.12.0

Re: [PATCH v2 09/15] NTB: ntb_test: Update ntb_tool link tests

[Jon Mason]

On Sun, Dec 3, 2017 at 2:17 PM, Serge Semin <fancer.lancer@gmail.com> wrote:
> Link Up and Down methods are used to change NTB link settings on
> local side only for multi-port devices. Link is considered up
> only if both sides local and peer set it up. Intel/AMD hardware
> acts a bit different by assigning the Primary and Secondary roles,
> so Primary device only is able to change the link state. Such behaviour
> should be reflected in the test code.
>
> Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
> ---
>  tools/testing/selftests/ntb/ntb_test.sh | 26 +++++++++++++++-----------
>  1 file changed, 15 insertions(+), 11 deletions(-)
>
> diff --git a/tools/testing/selftests/ntb/ntb_test.sh b/tools/testing/selftests/ntb/ntb_test.sh
> index 541ba70ad640..247458c6d8dc 100755
> --- a/tools/testing/selftests/ntb/ntb_test.sh
> +++ b/tools/testing/selftests/ntb/ntb_test.sh
> @@ -138,6 +138,11 @@ function check_file()
>         fi
>  }
>
> +function subdirname()
> +{
> +       echo $(basename $(dirname $1)) 2> /dev/nulle

shouldn't this be /dev/null?

> +}
> +
>  function find_pidx()
>  {
>         PORT=$1
> @@ -183,9 +188,9 @@ function link_test()
>         REM=$2
>         EXP=0
>
> -       echo "Running link tests on: $(basename $LOC) / $(basename $REM)"
> +       echo "Running link tests on: $(subdirname $LOC) / $(subdirname $REM)"
>
> -       if ! write_file "N" "$LOC/link" 2> /dev/null; then
> +       if ! write_file "N" "$LOC/../link" 2> /dev/null; then
>                 echo "  Unsupported"
>                 return
>         fi
> @@ -193,12 +198,11 @@ function link_test()
>         write_file "N" "$LOC/link_event"
>
>         if [[ $(read_file "$REM/link") != "N" ]]; then
> -               echo "Expected remote link to be down in $REM/link" >&2
> +               echo "Expected link to be down in $REM/link" >&2
>                 exit -1
>         fi
>
> -       write_file "Y" "$LOC/link"
> -       write_file "Y" "$LOC/link_event"
> +       write_file "Y" "$LOC/../link"
>
>         echo "  Passed"
>  }
> @@ -379,15 +383,15 @@ function ntb_tool_tests()
>
>         port_test "$LOCAL_TOOL" "$REMOTE_TOOL"
>
> -       write_file "Y" "$LOCAL_TOOL/link_event"
> -       write_file "Y" "$REMOTE_TOOL/link_event"
> +       LOCAL_PEER_TOOL="$LOCAL_TOOL/peer$LOCAL_PIDX"
> +       REMOTE_PEER_TOOL="$REMOTE_TOOL/peer$REMOTE_PIDX"
>
> -       link_test "$LOCAL_TOOL" "$REMOTE_TOOL"
> -       link_test "$REMOTE_TOOL" "$LOCAL_TOOL"
> +       link_test "$LOCAL_PEER_TOOL" "$REMOTE_PEER_TOOL"
> +       link_test "$REMOTE_PEER_TOOL" "$LOCAL_PEER_TOOL"
>
>         #Ensure the link is up on both sides before continuing
> -       write_file "Y" "$LOCAL_TOOL/link_event"
> -       write_file "Y" "$REMOTE_TOOL/link_event"
> +       write_file "Y" "$LOCAL_PEER_TOOL/link_event"
> +       write_file "Y" "$REMOTE_PEER_TOOL/link_event"
>
>         for PEER_TRANS in $(ls "$LOCAL_TOOL"/peer_trans*); do
>                 PT=$(basename $PEER_TRANS)
> --
> 2.12.0
>

Re: [PATCH v2 09/15] NTB: ntb_test: Update ntb_tool link tests

[Serge Semin]

On Tue, Dec 05, 2017 at 01:26:29PM -0500, Jon Mason <jdmason@kudzu.us> wrote:
> On Sun, Dec 3, 2017 at 2:17 PM, Serge Semin <fancer.lancer@gmail.com> wrote:
> > Link Up and Down methods are used to change NTB link settings on
> > local side only for multi-port devices. Link is considered up
> > only if both sides local and peer set it up. Intel/AMD hardware
> > acts a bit different by assigning the Primary and Secondary roles,
> > so Primary device only is able to change the link state. Such behaviour
> > should be reflected in the test code.
> >
> > Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
> > ---
> >  tools/testing/selftests/ntb/ntb_test.sh | 26 +++++++++++++++-----------
> >  1 file changed, 15 insertions(+), 11 deletions(-)
> >
> > diff --git a/tools/testing/selftests/ntb/ntb_test.sh b/tools/testing/selftests/ntb/ntb_test.sh
> > index 541ba70ad640..247458c6d8dc 100755
> > --- a/tools/testing/selftests/ntb/ntb_test.sh
> > +++ b/tools/testing/selftests/ntb/ntb_test.sh
> > @@ -138,6 +138,11 @@ function check_file()
> >         fi
> >  }
> >
> > +function subdirname()
> > +{
> > +       echo $(basename $(dirname $1)) 2> /dev/nulle
> 
> shouldn't this be /dev/null?
> 

Goot catch. That's right.

> > +}
> > +
> >  function find_pidx()
> >  {
> >         PORT=$1
> > @@ -183,9 +188,9 @@ function link_test()
> >         REM=$2
> >         EXP=0
> >
> > -       echo "Running link tests on: $(basename $LOC) / $(basename $REM)"
> > +       echo "Running link tests on: $(subdirname $LOC) / $(subdirname $REM)"
> >
> > -       if ! write_file "N" "$LOC/link" 2> /dev/null; then
> > +       if ! write_file "N" "$LOC/../link" 2> /dev/null; then
> >                 echo "  Unsupported"
> >                 return
> >         fi
> > @@ -193,12 +198,11 @@ function link_test()
> >         write_file "N" "$LOC/link_event"
> >
> >         if [[ $(read_file "$REM/link") != "N" ]]; then
> > -               echo "Expected remote link to be down in $REM/link" >&2
> > +               echo "Expected link to be down in $REM/link" >&2
> >                 exit -1
> >         fi
> >
> > -       write_file "Y" "$LOC/link"
> > -       write_file "Y" "$LOC/link_event"
> > +       write_file "Y" "$LOC/../link"
> >
> >         echo "  Passed"
> >  }
> > @@ -379,15 +383,15 @@ function ntb_tool_tests()
> >
> >         port_test "$LOCAL_TOOL" "$REMOTE_TOOL"
> >
> > -       write_file "Y" "$LOCAL_TOOL/link_event"
> > -       write_file "Y" "$REMOTE_TOOL/link_event"
> > +       LOCAL_PEER_TOOL="$LOCAL_TOOL/peer$LOCAL_PIDX"
> > +       REMOTE_PEER_TOOL="$REMOTE_TOOL/peer$REMOTE_PIDX"
> >
> > -       link_test "$LOCAL_TOOL" "$REMOTE_TOOL"
> > -       link_test "$REMOTE_TOOL" "$LOCAL_TOOL"
> > +       link_test "$LOCAL_PEER_TOOL" "$REMOTE_PEER_TOOL"
> > +       link_test "$REMOTE_PEER_TOOL" "$LOCAL_PEER_TOOL"
> >
> >         #Ensure the link is up on both sides before continuing
> > -       write_file "Y" "$LOCAL_TOOL/link_event"
> > -       write_file "Y" "$REMOTE_TOOL/link_event"
> > +       write_file "Y" "$LOCAL_PEER_TOOL/link_event"
> > +       write_file "Y" "$REMOTE_PEER_TOOL/link_event"
> >
> >         for PEER_TRANS in $(ls "$LOCAL_TOOL"/peer_trans*); do
> >                 PT=$(basename $PEER_TRANS)
> > --
> > 2.12.0
> >

[PATCH v2 10/15] NTB: ntb_test: Update ntb_tool DB tests

[Serge Semin]

DB interface of ntb_tool driver hasn't been changed much, but
db_valid_mask DebugFS file has still been added to new ntb_tool
driver. In this case it's much better to test all valid DB bits
instead of using the predefined mask, which may be incorrect in
general.

Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
---
 tools/testing/selftests/ntb/ntb_test.sh | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/tools/testing/selftests/ntb/ntb_test.sh b/tools/testing/selftests/ntb/ntb_test.sh
index 247458c6d8dc..3d43885ea4b5 100755
--- a/tools/testing/selftests/ntb/ntb_test.sh
+++ b/tools/testing/selftests/ntb/ntb_test.sh
@@ -18,7 +18,6 @@ LIST_DEVS=FALSE
 
 DEBUGFS=${DEBUGFS-/sys/kernel/debug}
 
-DB_BITMASK=0x7FFF
 PERF_RUN_ORDER=32
 MAX_MW_SIZE=0
 RUN_DMA_TESTS=
@@ -39,7 +38,6 @@ function show_help()
 	echo "be highly recommended."
 	echo
 	echo "Options:"
-	echo "  -b BITMASK      doorbell clear bitmask for ntb_tool"
 	echo "  -C              don't cleanup ntb modules on exit"
 	echo "  -d              run dma tests"
 	echo "  -h              show this help message"
@@ -56,7 +54,6 @@ function parse_args()
 	OPTIND=0
 	while getopts "b:Cdhlm:r:p:w:" opt; do
 		case "$opt" in
-		b)  DB_BITMASK=${OPTARG} ;;
 		C)  DONT_CLEANUP=1 ;;
 		d)  RUN_DMA_TESTS=1 ;;
 		h)  show_help; exit 0 ;;
@@ -215,21 +212,30 @@ function doorbell_test()
 
 	echo "Running db tests on: $(basename $LOC) / $(basename $REM)"
 
-	write_file "c $DB_BITMASK" "$REM/db"
+	DB_VALID_MASK=$(read_file "$LOC/db_valid_mask")
 
-	for ((i=1; i <= 8; i++)); do
-		let DB=$(read_file "$REM/db") || true
-		if [[ "$DB" != "$EXP" ]]; then
+	write_file "c $DB_VALID_MASK" "$REM/db"
+
+	for ((i = 0; i < 64; i++)); do
+		DB=$(read_file "$REM/db")
+		if [[ "$DB" -ne "$EXP" ]]; then
 			echo "Doorbell doesn't match expected value $EXP " \
 			     "in $REM/db" >&2
 			exit -1
 		fi
 
-		let "MASK=1 << ($i-1)" || true
-		let "EXP=$EXP | $MASK" || true
+		let "MASK = (1 << $i) & $DB_VALID_MASK" || true
+		let "EXP = $EXP | $MASK" || true
+
 		write_file "s $MASK" "$LOC/peer_db"
 	done
 
+	write_file "c $DB_VALID_MASK" "$REM/db_mask"
+	write_file $DB_VALID_MASK "$REM/db_event"
+	write_file "s $DB_VALID_MASK" "$REM/db_mask"
+
+	write_file "c $DB_VALID_MASK" "$REM/db"
+
 	echo "  Passed"
 }
 
@@ -393,14 +399,15 @@ function ntb_tool_tests()
 	write_file "Y" "$LOCAL_PEER_TOOL/link_event"
 	write_file "Y" "$REMOTE_PEER_TOOL/link_event"
 
+	doorbell_test "$LOCAL_TOOL" "$REMOTE_TOOL"
+	doorbell_test "$REMOTE_TOOL" "$LOCAL_TOOL"
+
 	for PEER_TRANS in $(ls "$LOCAL_TOOL"/peer_trans*); do
 		PT=$(basename $PEER_TRANS)
 		write_file $MW_SIZE "$LOCAL_TOOL/$PT"
 		write_file $MW_SIZE "$REMOTE_TOOL/$PT"
 	done
 
-	doorbell_test "$LOCAL_TOOL" "$REMOTE_TOOL"
-	doorbell_test "$REMOTE_TOOL" "$LOCAL_TOOL"
 	scratchpad_test "$LOCAL_TOOL" "$REMOTE_TOOL"
 	scratchpad_test "$REMOTE_TOOL" "$LOCAL_TOOL"
 
-- 
2.12.0

Re: [PATCH v2 10/15] NTB: ntb_test: Update ntb_tool DB tests

[Jon Mason]

On Sun, Dec 3, 2017 at 2:17 PM, Serge Semin <fancer.lancer@gmail.com> wrote:
> DB interface of ntb_tool driver hasn't been changed much, but
> db_valid_mask DebugFS file has still been added to new ntb_tool
> driver. In this case it's much better to test all valid DB bits
> instead of using the predefined mask, which may be incorrect in
> general.
>
> Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
> ---
>  tools/testing/selftests/ntb/ntb_test.sh | 29 ++++++++++++++++++-----------
>  1 file changed, 18 insertions(+), 11 deletions(-)
>
> diff --git a/tools/testing/selftests/ntb/ntb_test.sh b/tools/testing/selftests/ntb/ntb_test.sh
> index 247458c6d8dc..3d43885ea4b5 100755
> --- a/tools/testing/selftests/ntb/ntb_test.sh
> +++ b/tools/testing/selftests/ntb/ntb_test.sh
> @@ -18,7 +18,6 @@ LIST_DEVS=FALSE
>
>  DEBUGFS=${DEBUGFS-/sys/kernel/debug}
>
> -DB_BITMASK=0x7FFF
>  PERF_RUN_ORDER=32
>  MAX_MW_SIZE=0
>  RUN_DMA_TESTS=
> @@ -39,7 +38,6 @@ function show_help()
>         echo "be highly recommended."
>         echo
>         echo "Options:"
> -       echo "  -b BITMASK      doorbell clear bitmask for ntb_tool"
>         echo "  -C              don't cleanup ntb modules on exit"
>         echo "  -d              run dma tests"
>         echo "  -h              show this help message"
> @@ -56,7 +54,6 @@ function parse_args()
>         OPTIND=0
>         while getopts "b:Cdhlm:r:p:w:" opt; do
>                 case "$opt" in
> -               b)  DB_BITMASK=${OPTARG} ;;
>                 C)  DONT_CLEANUP=1 ;;
>                 d)  RUN_DMA_TESTS=1 ;;
>                 h)  show_help; exit 0 ;;
> @@ -215,21 +212,30 @@ function doorbell_test()
>
>         echo "Running db tests on: $(basename $LOC) / $(basename $REM)"
>
> -       write_file "c $DB_BITMASK" "$REM/db"
> +       DB_VALID_MASK=$(read_file "$LOC/db_valid_mask")
>
> -       for ((i=1; i <= 8; i++)); do
> -               let DB=$(read_file "$REM/db") || true
> -               if [[ "$DB" != "$EXP" ]]; then
> +       write_file "c $DB_VALID_MASK" "$REM/db"
> +
> +       for ((i = 0; i < 64; i++)); do

I'm guessing this should be a tunable variable, for those systems with
a different number of doorbells.


> +               DB=$(read_file "$REM/db")
> +               if [[ "$DB" -ne "$EXP" ]]; then
>                         echo "Doorbell doesn't match expected value $EXP " \
>                              "in $REM/db" >&2
>                         exit -1
>                 fi
>
> -               let "MASK=1 << ($i-1)" || true
> -               let "EXP=$EXP | $MASK" || true
> +               let "MASK = (1 << $i) & $DB_VALID_MASK" || true
> +               let "EXP = $EXP | $MASK" || true
> +
>                 write_file "s $MASK" "$LOC/peer_db"
>         done
>
> +       write_file "c $DB_VALID_MASK" "$REM/db_mask"
> +       write_file $DB_VALID_MASK "$REM/db_event"
> +       write_file "s $DB_VALID_MASK" "$REM/db_mask"
> +
> +       write_file "c $DB_VALID_MASK" "$REM/db"
> +
>         echo "  Passed"
>  }
>
> @@ -393,14 +399,15 @@ function ntb_tool_tests()
>         write_file "Y" "$LOCAL_PEER_TOOL/link_event"
>         write_file "Y" "$REMOTE_PEER_TOOL/link_event"
>
> +       doorbell_test "$LOCAL_TOOL" "$REMOTE_TOOL"
> +       doorbell_test "$REMOTE_TOOL" "$LOCAL_TOOL"
> +
>         for PEER_TRANS in $(ls "$LOCAL_TOOL"/peer_trans*); do
>                 PT=$(basename $PEER_TRANS)
>                 write_file $MW_SIZE "$LOCAL_TOOL/$PT"
>                 write_file $MW_SIZE "$REMOTE_TOOL/$PT"
>         done
>
> -       doorbell_test "$LOCAL_TOOL" "$REMOTE_TOOL"
> -       doorbell_test "$REMOTE_TOOL" "$LOCAL_TOOL"
>         scratchpad_test "$LOCAL_TOOL" "$REMOTE_TOOL"
>         scratchpad_test "$REMOTE_TOOL" "$LOCAL_TOOL"
>
> --
> 2.12.0
>

Re: [PATCH v2 10/15] NTB: ntb_test: Update ntb_tool DB tests

[Logan Gunthorpe]

On 05/12/17 11:27 AM, Jon Mason wrote:
>>          echo "Running db tests on: $(basename $LOC) / $(basename $REM)"
>>
>> -       write_file "c $DB_BITMASK" "$REM/db"
>> +       DB_VALID_MASK=$(read_file "$LOC/db_valid_mask")
>>
>> -       for ((i=1; i <= 8; i++)); do
>> -               let DB=$(read_file "$REM/db") || true
>> -               if [[ "$DB" != "$EXP" ]]; then
>> +       write_file "c $DB_VALID_MASK" "$REM/db"
>> +
>> +       for ((i = 0; i < 64; i++)); do
> 
> I'm guessing this should be a tunable variable, for those systems with
> a different number of doorbells.

That's actually the point of this patch. Serge is using db_valid_mask to 
test all possible doorbells instead of just the first 8. 64 is just the 
maximum number.

Looks like a nice improvement.

The only thing that's not clear to me is what this does:

> +	write_file "c $DB_VALID_MASK" "$REM/db_mask"
> +	write_file $DB_VALID_MASK "$REM/db_event"
> +	write_file "s $DB_VALID_MASK" "$REM/db_mask"
> +
> +	write_file "c $DB_VALID_MASK" "$REM/db"

It would be good to mention it in the commit message (then, as a rule of 
thumb, commits that do "A" and "B" should actually be two commits). 
Especially seeing db_event appears to be new and hasn't been discussed 
in any commit message.

Logan

Re: [PATCH v2 10/15] NTB: ntb_test: Update ntb_tool DB tests

[Serge Semin]

On Tue, Dec 05, 2017 at 01:27:57PM -0500, Jon Mason <jdmason@kudzu.us> wrote:
> On Sun, Dec 3, 2017 at 2:17 PM, Serge Semin <fancer.lancer@gmail.com> wrote:
> > DB interface of ntb_tool driver hasn't been changed much, but
> > db_valid_mask DebugFS file has still been added to new ntb_tool
> > driver. In this case it's much better to test all valid DB bits
> > instead of using the predefined mask, which may be incorrect in
> > general.
> >
> > Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
> > ---
> >  tools/testing/selftests/ntb/ntb_test.sh | 29 ++++++++++++++++++-----------
> >  1 file changed, 18 insertions(+), 11 deletions(-)
> >
> > diff --git a/tools/testing/selftests/ntb/ntb_test.sh b/tools/testing/selftests/ntb/ntb_test.sh
> > index 247458c6d8dc..3d43885ea4b5 100755
> > --- a/tools/testing/selftests/ntb/ntb_test.sh
> > +++ b/tools/testing/selftests/ntb/ntb_test.sh
> > @@ -18,7 +18,6 @@ LIST_DEVS=FALSE
> >
> >  DEBUGFS=${DEBUGFS-/sys/kernel/debug}
> >
> > -DB_BITMASK=0x7FFF
> >  PERF_RUN_ORDER=32
> >  MAX_MW_SIZE=0
> >  RUN_DMA_TESTS=
> > @@ -39,7 +38,6 @@ function show_help()
> >         echo "be highly recommended."
> >         echo
> >         echo "Options:"
> > -       echo "  -b BITMASK      doorbell clear bitmask for ntb_tool"
> >         echo "  -C              don't cleanup ntb modules on exit"
> >         echo "  -d              run dma tests"
> >         echo "  -h              show this help message"
> > @@ -56,7 +54,6 @@ function parse_args()
> >         OPTIND=0
> >         while getopts "b:Cdhlm:r:p:w:" opt; do
> >                 case "$opt" in
> > -               b)  DB_BITMASK=${OPTARG} ;;
> >                 C)  DONT_CLEANUP=1 ;;
> >                 d)  RUN_DMA_TESTS=1 ;;
> >                 h)  show_help; exit 0 ;;
> > @@ -215,21 +212,30 @@ function doorbell_test()
> >
> >         echo "Running db tests on: $(basename $LOC) / $(basename $REM)"
> >
> > -       write_file "c $DB_BITMASK" "$REM/db"
> > +       DB_VALID_MASK=$(read_file "$LOC/db_valid_mask")
> >
> > -       for ((i=1; i <= 8; i++)); do
> > -               let DB=$(read_file "$REM/db") || true
> > -               if [[ "$DB" != "$EXP" ]]; then
> > +       write_file "c $DB_VALID_MASK" "$REM/db"
> > +
> > +       for ((i = 0; i < 64; i++)); do
> 
> I'm guessing this should be a tunable variable, for those systems with
> a different number of doorbells.
> 

64 is the maximum number of doorbells supported by the NTB API. But we are
checking only the valid ones for the NTB device being tested. For this purpose
the script reads the db_valid_mask file.

> 
> > +               DB=$(read_file "$REM/db")
> > +               if [[ "$DB" -ne "$EXP" ]]; then
> >                         echo "Doorbell doesn't match expected value $EXP " \
> >                              "in $REM/db" >&2
> >                         exit -1
> >                 fi
> >
> > -               let "MASK=1 << ($i-1)" || true
> > -               let "EXP=$EXP | $MASK" || true
> > +               let "MASK = (1 << $i) & $DB_VALID_MASK" || true
> > +               let "EXP = $EXP | $MASK" || true
> > +
> >                 write_file "s $MASK" "$LOC/peer_db"
> >         done
> >
> > +       write_file "c $DB_VALID_MASK" "$REM/db_mask"
> > +       write_file $DB_VALID_MASK "$REM/db_event"
> > +       write_file "s $DB_VALID_MASK" "$REM/db_mask"
> > +
> > +       write_file "c $DB_VALID_MASK" "$REM/db"
> > +
> >         echo "  Passed"
> >  }
> >
> > @@ -393,14 +399,15 @@ function ntb_tool_tests()
> >         write_file "Y" "$LOCAL_PEER_TOOL/link_event"
> >         write_file "Y" "$REMOTE_PEER_TOOL/link_event"
> >
> > +       doorbell_test "$LOCAL_TOOL" "$REMOTE_TOOL"
> > +       doorbell_test "$REMOTE_TOOL" "$LOCAL_TOOL"
> > +
> >         for PEER_TRANS in $(ls "$LOCAL_TOOL"/peer_trans*); do
> >                 PT=$(basename $PEER_TRANS)
> >                 write_file $MW_SIZE "$LOCAL_TOOL/$PT"
> >                 write_file $MW_SIZE "$REMOTE_TOOL/$PT"
> >         done
> >
> > -       doorbell_test "$LOCAL_TOOL" "$REMOTE_TOOL"
> > -       doorbell_test "$REMOTE_TOOL" "$LOCAL_TOOL"
> >         scratchpad_test "$LOCAL_TOOL" "$REMOTE_TOOL"
> >         scratchpad_test "$REMOTE_TOOL" "$LOCAL_TOOL"
> >
> > --
> > 2.12.0
> >

[PATCH v2 11/15] NTB: ntb_test: Update ntb_tool Scratchpad tests

[Serge Semin]

Scratchpad NTB API has been changed so has the ntb_tool driver.
Outbound Scratchpad DebugFS files have been moved to peer specific
directories. Each scratchpad is now available via separate file.
The test code has been accordingly altered.

Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
---
 tools/testing/selftests/ntb/ntb_test.sh | 43 ++++++++++++++++++++-------------
 1 file changed, 26 insertions(+), 17 deletions(-)

diff --git a/tools/testing/selftests/ntb/ntb_test.sh b/tools/testing/selftests/ntb/ntb_test.sh
index 3d43885ea4b5..d37c974902e5 100755
--- a/tools/testing/selftests/ntb/ntb_test.sh
+++ b/tools/testing/selftests/ntb/ntb_test.sh
@@ -239,35 +239,44 @@ function doorbell_test()
 	echo "  Passed"
 }
 
-function read_spad()
+function get_files_count()
 {
-       VPATH=$1
-       IDX=$2
+	NAME=$1
+	LOC=$2
+
+	split_remote $LOC
 
-       ROW=($(read_file "$VPATH" | grep -e "^$IDX"))
-       let VAL=${ROW[1]} || true
-       echo $VAL
+	if [[ "$REMOTE" == "" ]]; then
+		echo $(ls -1 "$LOC"/${NAME}* 2>/dev/null | wc -l)
+	else
+		echo $(ssh "$REMOTE" "ls -1 \"$VPATH\"/${NAME}* | \
+		       wc -l" 2> /dev/null)
+	fi
 }
 
 function scratchpad_test()
 {
 	LOC=$1
 	REM=$2
-	CNT=$(read_file "$LOC/spad" | wc -l)
 
-	echo "Running spad tests on: $(basename $LOC) / $(basename $REM)"
+	echo "Running spad tests on: $(subdirname $LOC) / $(subdirname $REM)"
+
+	CNT=$(get_files_count "spad" "$LOC")
+
+	if [[ $CNT -eq 0 ]]; then
+		echo "  Unsupported"
+		return
+	fi
 
 	for ((i = 0; i < $CNT; i++)); do
 		VAL=$RANDOM
-		write_file "$i $VAL" "$LOC/peer_spad"
-		RVAL=$(read_spad "$REM/spad" $i)
+		write_file "$VAL" "$LOC/spad$i"
+		RVAL=$(read_file "$REM/../spad$i")
 
-		if [[ "$VAL" != "$RVAL" ]]; then
-			echo "Scratchpad doesn't match expected value $VAL " \
-			     "in $REM/spad, got $RVAL" >&2
+		if [[ "$VAL" -ne "$RVAL" ]]; then
+			echo "Scratchpad $i value $RVAL doesn't match $VAL" >&2
 			exit -1
 		fi
-
 	done
 
 	echo "  Passed"
@@ -402,15 +411,15 @@ function ntb_tool_tests()
 	doorbell_test "$LOCAL_TOOL" "$REMOTE_TOOL"
 	doorbell_test "$REMOTE_TOOL" "$LOCAL_TOOL"
 
+	scratchpad_test "$LOCAL_PEER_TOOL" "$REMOTE_PEER_TOOL"
+	scratchpad_test "$REMOTE_PEER_TOOL" "$LOCAL_PEER_TOOL"
+
 	for PEER_TRANS in $(ls "$LOCAL_TOOL"/peer_trans*); do
 		PT=$(basename $PEER_TRANS)
 		write_file $MW_SIZE "$LOCAL_TOOL/$PT"
 		write_file $MW_SIZE "$REMOTE_TOOL/$PT"
 	done
 
-	scratchpad_test "$LOCAL_TOOL" "$REMOTE_TOOL"
-	scratchpad_test "$REMOTE_TOOL" "$LOCAL_TOOL"
-
 	for MW in $(ls "$LOCAL_TOOL"/mw*); do
 		MW=$(basename $MW)
 
-- 
2.12.0

[PATCH v2 12/15] NTB: ntb_test: Add ntb_tool Message tests

[Serge Semin]

Messages NTB API is now available. ntb_tool driver has been altered
to perform messages send and receive operations. The test of messages
read/write to/from peer device has been added to the script.

Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
---
 tools/testing/selftests/ntb/ntb_test.sh | 37 +++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/tools/testing/selftests/ntb/ntb_test.sh b/tools/testing/selftests/ntb/ntb_test.sh
index d37c974902e5..36f6a444c0d9 100755
--- a/tools/testing/selftests/ntb/ntb_test.sh
+++ b/tools/testing/selftests/ntb/ntb_test.sh
@@ -282,6 +282,40 @@ function scratchpad_test()
 	echo "  Passed"
 }
 
+function message_test()
+{
+	LOC=$1
+	REM=$2
+
+	echo "Running msg tests on: $(subdirname $LOC) / $(subdirname $REM)"
+
+	CNT=$(get_files_count "msg" "$LOC")
+
+	if [[ $CNT -eq 0 ]]; then
+		echo "  Unsupported"
+		return
+	fi
+
+	MSG_OUTBITS_MASK=$(read_file "$LOC/../msg_inbits")
+	MSG_INBITS_MASK=$(read_file "$REM/../msg_inbits")
+
+	write_file "c $MSG_OUTBITS_MASK" "$LOC/../msg_sts"
+	write_file "c $MSG_INBITS_MASK" "$REM/../msg_sts"
+
+	for ((i = 0; i < $CNT; i++)); do
+		VAL=$RANDOM
+		write_file "$VAL" "$LOC/msg$i"
+		RVAL=$(read_file "$REM/../msg$i")
+
+		if [[ "$VAL" -ne "${RVAL%%<-*}" ]]; then
+			echo "Message $i value $RVAL doesn't match $VAL" >&2
+			exit -1
+		fi
+	done
+
+	echo "  Passed"
+}
+
 function write_mw()
 {
 	split_remote $2
@@ -414,6 +448,9 @@ function ntb_tool_tests()
 	scratchpad_test "$LOCAL_PEER_TOOL" "$REMOTE_PEER_TOOL"
 	scratchpad_test "$REMOTE_PEER_TOOL" "$LOCAL_PEER_TOOL"
 
+	message_test "$LOCAL_PEER_TOOL" "$REMOTE_PEER_TOOL"
+	message_test "$REMOTE_PEER_TOOL" "$LOCAL_PEER_TOOL"
+
 	for PEER_TRANS in $(ls "$LOCAL_TOOL"/peer_trans*); do
 		PT=$(basename $PEER_TRANS)
 		write_file $MW_SIZE "$LOCAL_TOOL/$PT"
-- 
2.12.0

[PATCH v2 13/15] NTB: ntb_test: Update ntb_tool MW tests

[Serge Semin]

There are devices (like IDT PCIe switches), which outbound MWs xlat address
is setup on peer side. In this case local side is supposed to allocate
a memory buffer and somehow deliver the xlat DMA address to peer so one
could set the outbound MW up. The MW test is altered so to support both
previous Intel/AMD and new IDT-like devices.

Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
---
 tools/testing/selftests/ntb/ntb_test.sh | 89 +++++++++++++++++++++++++--------
 1 file changed, 68 insertions(+), 21 deletions(-)

diff --git a/tools/testing/selftests/ntb/ntb_test.sh b/tools/testing/selftests/ntb/ntb_test.sh
index 36f6a444c0d9..88c8ceb20607 100755
--- a/tools/testing/selftests/ntb/ntb_test.sh
+++ b/tools/testing/selftests/ntb/ntb_test.sh
@@ -43,7 +43,9 @@ function show_help()
 	echo "  -h              show this help message"
 	echo "  -l              list available local and remote PCI ids"
 	echo "  -r REMOTE_HOST  specify the remote's hostname to connect"
-        echo "                  to for the test (using ssh)"
+	echo "                  to for the test (using ssh)"
+	echo "  -m MW_SIZE      memory window size for ntb_tool"
+	echo "                  (default: $MW_SIZE)"
 	echo "  -p NUM          ntb_perf run order (default: $PERF_RUN_ORDER)"
 	echo "  -w max_mw_size  maxmium memory window size"
 	echo
@@ -316,6 +318,32 @@ function message_test()
 	echo "  Passed"
 }
 
+function get_number()
+{
+	KEY=$1
+
+	sed -n "s/^\(${KEY}\)[ \t]*\(0x[0-9a-fA-F]*\)\(\[p\]\)\?$/\2/p"
+}
+
+function mw_alloc()
+{
+	IDX=$1
+	LOC=$2
+	REM=$3
+
+	write_file $MW_SIZE "$LOC/mw_trans$IDX"
+
+	INB_MW=$(read_file "$LOC/mw_trans$IDX")
+	MW_ALIGNED_SIZE=$(echo "$INB_MW" | get_number "Window Size")
+	MW_DMA_ADDR=$(echo "$INB_MW" | get_number "DMA Address")
+
+	write_file "$MW_DMA_ADDR:$(($MW_ALIGNED_SIZE))" "$REM/peer_mw_trans$IDX"
+
+	if [[ $MW_SIZE -ne $MW_ALIGNED_SIZE ]]; then
+		echo "MW $IDX size aligned to $MW_ALIGNED_SIZE"
+	fi
+}
+
 function write_mw()
 {
 	split_remote $2
@@ -328,17 +356,15 @@ function write_mw()
 	fi
 }
 
-function mw_test()
+function mw_check()
 {
 	IDX=$1
 	LOC=$2
 	REM=$3
 
-	echo "Running $IDX tests on: $(basename $LOC) / $(basename $REM)"
-
-	write_mw "$LOC/$IDX"
+	write_mw "$LOC/mw$IDX"
 
-	split_remote "$LOC/$IDX"
+	split_remote "$LOC/mw$IDX"
 	if [[ "$REMOTE" == "" ]]; then
 		A=$VPATH
 	else
@@ -346,7 +372,7 @@ function mw_test()
 		ssh "$REMOTE" cat "$VPATH" > "$A"
 	fi
 
-	split_remote "$REM/peer_$IDX"
+	split_remote "$REM/peer_mw$IDX"
 	if [[ "$REMOTE" == "" ]]; then
 		B=$VPATH
 	else
@@ -354,7 +380,7 @@ function mw_test()
 		ssh "$REMOTE" cat "$VPATH" > "$B"
 	fi
 
-	cmp -n $MW_SIZE "$A" "$B"
+	cmp -n $MW_ALIGNED_SIZE "$A" "$B"
 	if [[ $? != 0 ]]; then
 		echo "Memory window $MW did not match!" >&2
 	fi
@@ -366,8 +392,39 @@ function mw_test()
 	if [[ "$B" == "/tmp/*" ]]; then
 		rm "$B"
 	fi
+}
+
+function mw_free()
+{
+	IDX=$1
+	LOC=$2
+	REM=$3
+
+	write_file "$MW_DMA_ADDR:0" "$REM/peer_mw_trans$IDX"
+
+	write_file 0 "$LOC/mw_trans$IDX"
+}
+
+function mw_test()
+{
+	LOC=$1
+	REM=$2
+
+	CNT=$(get_files_count "mw_trans" "$LOC")
+
+	for ((i = 0; i < $CNT; i++)); do
+		echo "Running mw$i tests on: $(subdirname $LOC) / " \
+		     "$(subdirname $REM)"
+
+		mw_alloc $i $LOC $REM
+
+		mw_check $i $LOC $REM
+
+		mw_free $i $LOC  $REM
+
+		echo "  Passed"
+	done
 
-	echo "  Passed"
 }
 
 function pingpong_test()
@@ -451,18 +508,8 @@ function ntb_tool_tests()
 	message_test "$LOCAL_PEER_TOOL" "$REMOTE_PEER_TOOL"
 	message_test "$REMOTE_PEER_TOOL" "$LOCAL_PEER_TOOL"
 
-	for PEER_TRANS in $(ls "$LOCAL_TOOL"/peer_trans*); do
-		PT=$(basename $PEER_TRANS)
-		write_file $MW_SIZE "$LOCAL_TOOL/$PT"
-		write_file $MW_SIZE "$REMOTE_TOOL/$PT"
-	done
-
-	for MW in $(ls "$LOCAL_TOOL"/mw*); do
-		MW=$(basename $MW)
-
-		mw_test $MW "$LOCAL_TOOL" "$REMOTE_TOOL"
-		mw_test $MW "$REMOTE_TOOL" "$LOCAL_TOOL"
-	done
+	mw_test "$LOCAL_PEER_TOOL" "$REMOTE_PEER_TOOL"
+	mw_test "$REMOTE_PEER_TOOL" "$LOCAL_PEER_TOOL"
 
 	_modprobe -r ntb_tool
 }
-- 
2.12.0

[PATCH v2 14/15] NTB: ntb_test: Update ntb_perf tests

[Serge Semin]

ntb_perf driver has been also updated so to have the multi-port
interface support. User now must specify what peer port is going
to be used to perform the test.

Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
---
 tools/testing/selftests/ntb/ntb_test.sh | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/tools/testing/selftests/ntb/ntb_test.sh b/tools/testing/selftests/ntb/ntb_test.sh
index 88c8ceb20607..b91497d1291f 100755
--- a/tools/testing/selftests/ntb/ntb_test.sh
+++ b/tools/testing/selftests/ntb/ntb_test.sh
@@ -39,15 +39,16 @@ function show_help()
 	echo
 	echo "Options:"
 	echo "  -C              don't cleanup ntb modules on exit"
-	echo "  -d              run dma tests"
 	echo "  -h              show this help message"
 	echo "  -l              list available local and remote PCI ids"
 	echo "  -r REMOTE_HOST  specify the remote's hostname to connect"
 	echo "                  to for the test (using ssh)"
 	echo "  -m MW_SIZE      memory window size for ntb_tool"
 	echo "                  (default: $MW_SIZE)"
-	echo "  -p NUM          ntb_perf run order (default: $PERF_RUN_ORDER)"
-	echo "  -w max_mw_size  maxmium memory window size"
+	echo "  -d              run dma tests for ntb_perf"
+	echo "  -p ORDER        total data order for ntb_perf"
+	echo "                  (default: $PERF_RUN_ORDER)"
+	echo "  -w MAX_MW_SIZE  maxmium memory window size for ntb_perf"
 	echo
 }
 
@@ -460,17 +461,17 @@ function perf_test()
 		WITH="without"
 	fi
 
-	_modprobe ntb_perf run_order=$PERF_RUN_ORDER \
+	_modprobe ntb_perf total_order=$PERF_RUN_ORDER \
 		max_mw_size=$MAX_MW_SIZE use_dma=$USE_DMA
 
 	echo "Running local perf test $WITH DMA"
-	write_file "" "$LOCAL_PERF/run"
+	write_file "$LOCAL_PIDX" "$LOCAL_PERF/run"
 	echo -n "  "
 	read_file "$LOCAL_PERF/run"
 	echo "  Passed"
 
 	echo "Running remote perf test $WITH DMA"
-	write_file "" "$REMOTE_PERF/run"
+	write_file "$REMOTE_PIDX" "$REMOTE_PERF/run"
 	echo -n "  "
 	read_file "$REMOTE_PERF/run"
 	echo "  Passed"
-- 
2.12.0

[PATCH v2 15/15] NTB: ntb_hw_idt: Set NTB_TOPO_SWITCH topology

[Serge Semin]

Since Switchtec patch there has been a new topology added to
the NTB API. It's called NTB_TOPO_SWITCH and dedicated for
in general multi-port PCIe switch chips. Even though topo field
isn't used within the IDT driver much, lets set it for the sake
of unification.

Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
---
 drivers/ntb/hw/idt/ntb_hw_idt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/ntb/hw/idt/ntb_hw_idt.c b/drivers/ntb/hw/idt/ntb_hw_idt.c
index d87dbd4bc82c..27fdd14e0dca 100644
--- a/drivers/ntb/hw/idt/ntb_hw_idt.c
+++ b/drivers/ntb/hw/idt/ntb_hw_idt.c
@@ -2070,7 +2070,7 @@ static int idt_register_device(struct idt_ntb_dev *ndev)
 
 	/* Initialize the rest of NTB device structure and register it */
 	ndev->ntb.ops = &idt_ntb_ops;
-	ndev->ntb.topo = NTB_TOPO_PRI;
+	ndev->ntb.topo = NTB_TOPO_SWITCH;
 
 	ret = ntb_register_device(&ndev->ntb);
 	if (ret != 0) {
-- 
2.12.0

Re: [PATCH v2 00/15] NTB: Add full multi-port API support to the test drivers

[Logan Gunthorpe]

On 03/12/17 12:17 PM, Serge Semin wrote:
> The multi-port NTB API was introduced in kernel 4.13 as well as the
> first driver for the true multi-port devices of IDT PCIe-switches
> series. But the test drivers still were left almost unchanged. Yes,
> they didn't fail being used with new NTB API, but they only worked
> with two-ports NTB devices. This patchset is intended to fix the
> issue, by amending the NTB test drivers and script so they would be
> fully compatible with multi-port NTB API.
> 
> Additionally I found a few NTB subsystem issues while developing the
> submitted patches. So they are also fixed in this patchset.


Did anything change since the last posting of these patches? I took a
very brief look and did not see anything changed.

Logan

Re: [PATCH v2 00/15] NTB: Add full multi-port API support to the test drivers

[Serge Semin]

On Sun, Dec 03, 2017 at 09:54:58PM -0700, Logan Gunthorpe <logang@deltatee.com> wrote:
> 
> 
> On 03/12/17 12:17 PM, Serge Semin wrote:
> > The multi-port NTB API was introduced in kernel 4.13 as well as the
> > first driver for the true multi-port devices of IDT PCIe-switches
> > series. But the test drivers still were left almost unchanged. Yes,
> > they didn't fail being used with new NTB API, but they only worked
> > with two-ports NTB devices. This patchset is intended to fix the
> > issue, by amending the NTB test drivers and script so they would be
> > fully compatible with multi-port NTB API.
> > 
> > Additionally I found a few NTB subsystem issues while developing the
> > submitted patches. So they are also fixed in this patchset.
> 
> 
> Did anything change since the last posting of these patches? I took a
> very brief look and did not see anything changed.
> 

Nothing has changed.

> Logan
> 
> -- 
> You received this message because you are subscribed to the Google Groups "linux-ntb" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to linux-ntb+unsubscribe@googlegroups.com.
> To post to this group, send email to linux-ntb@googlegroups.com.
> To view this discussion on the web visit https://groups.google.com/d/msgid/linux-ntb/681f296e-136c-e907-c520-a2035897833a%40deltatee.com.
> For more options, visit https://groups.google.com/d/optout.

RE: [PATCH v2 00/15] NTB: Add full multi-port API support to the test drivers

[Allen Hubbe]

From: Serge Semin
> The multi-port NTB API was introduced in kernel 4.13 as well as the
> first driver for the true multi-port devices of IDT PCIe-switches
> series. But the test drivers still were left almost unchanged. Yes,
> they didn't fail being used with new NTB API, but they only worked
> with two-ports NTB devices. This patchset is intended to fix the
> issue, by amending the NTB test drivers and script so they would be
> fully compatible with multi-port NTB API.
> 
> Additionally I found a few NTB subsystem issues while developing the
> submitted patches. So they are also fixed in this patchset

Thanks for bringing the multiport support to the ntb tools and tests, and getting it all tested with help of @pallam.  I wondered about setting the dma mask on the ntb device object, and it is better now that you have done that.  In addition to the contact information to the file comments, MODULE_AUTHOR can also be specified more than once per module.

As Logan said, some of the renaming was not really necessary and made those patches more noisy than the needed to be.  I am not as much bothered by it, but it is a valid criticism.

I can't find an earlier comment I thought I had made regarding the changes in ntb_tool.  Maybe it was only on IRC.  I think the use of the anonymous unions tool_mw is confusing.  It seems to require the reader to first understand how local and peer mw setup works, and then see that the anonymous unions are accessed by the proper member names depending on the situation.  In my review, the use of those members appears to be correct in your code.  Since these drivers are also intended to be example code, I would have preferred distinct types instead of a common type with anonymous union members.  Distinct types would make type checking by the compiler more effective at catching improper use, and I think it would make the code more clear in its use as an example ntb driver.  Also, there might be some confusion in the naming of members "mw", since it might refer to a tool_mw or a tool_mw_wrap, and the name alone doesn't disclose the type, that requires reading and understanding the surrounding context in the code.

I am satisfied with these patches.  This is important for getting the multiport support established, and other than some comments about style and presentation of the patch set, nothing looks obviously wrong.  You should probably also seek Dave's ack on at least ntb_perf.

Acked-by: Allen Hubbe <Allen.Hubbe@dell.com>

> Serge Semin (15):
>   NTB: Rename NTB messaging API methods
>   NTB: Set dma mask and dma coherent mask to NTB devices
>   NTB: Fix UB/bug in ntb_mw_get_align()
>   NTB: ntb_pp: Add full multi-port NTB API support
>   NTB: ntb_tool: Add full multi-port NTB API support
>   NTB: ntb_perf: Add full multi-port NTB API support
>   NTB: ntb_test: Safely use paths with whitespace
>   NTB: ntb_test: Add ntb_tool port tests
>   NTB: ntb_test: Update ntb_tool link tests
>   NTB: ntb_test: Update ntb_tool DB tests
>   NTB: ntb_test: Update ntb_tool Scratchpad tests
>   NTB: ntb_test: Add ntb_tool Message tests
>   NTB: ntb_test: Update ntb_tool MW tests
>   NTB: ntb_test: Update ntb_perf tests
>   NTB: ntb_hw_idt: Set NTB_TOPO_SWITCH topology
> 
>  drivers/ntb/hw/amd/ntb_hw_amd.c         |    4 +
>  drivers/ntb/hw/idt/ntb_hw_idt.c         |   37 +-
>  drivers/ntb/hw/intel/ntb_hw_intel.c     |    4 +
>  drivers/ntb/ntb.c                       |    1 -
>  drivers/ntb/test/ntb_perf.c             | 1826 +++++++++++++++++++++----------
>  drivers/ntb/test/ntb_pingpong.c         |  450 +++++---
>  drivers/ntb/test/ntb_tool.c             | 1805 ++++++++++++++++++++----------
>  include/linux/ntb.h                     |   36 +-
>  tools/testing/selftests/ntb/ntb_test.sh |  307 ++++--
>  9 files changed, 3013 insertions(+), 1457 deletions(-)
> 
> --
> 2.12.0

RE: [PATCH v2 00/15] NTB: Add full multi-port API support to the test drivers

[Allen Hubbe]

From: Serge Semin
> The multi-port NTB API was introduced in kernel 4.13 as well as the
> first driver for the true multi-port devices of IDT PCIe-switches
> series. But the test drivers still were left almost unchanged. Yes,
> they didn't fail being used with new NTB API, but they only worked
> with two-ports NTB devices. This patchset is intended to fix the
> issue, by amending the NTB test drivers and script so they would be
> fully compatible with multi-port NTB API.
> 
> Additionally I found a few NTB subsystem issues while developing the
> submitted patches. So they are also fixed in this patchset

Thanks for bringing the multiport support to the ntb tools and tests, and getting it all tested with help of @pallam.  I wondered about setting the dma mask on the ntb device object, and it is better now that you have done that.  In addition to the contact information to the file comments, MODULE_AUTHOR can also be specified more than once per module.

As Logan said, some of the renaming was not really necessary and made those patches more noisy than the needed to be.  I am not as much bothered by it, but it is a valid criticism.

I can't find an earlier comment I thought I had made regarding the changes in ntb_tool.  Maybe it was only on IRC.  I think the use of the anonymous unions tool_mw is confusing.  It seems to require the reader to first understand how local and peer mw setup works, and then see that the anonymous unions are accessed by the proper member names depending on the situation.  In my review, the use of those members appears to be correct in your code.  Since these drivers are also intended to be example code, I would have preferred distinct types instead of a common type with anonymous union members.  Distinct types would make type checking by the compiler more effective at catching improper use, and I think it would make the code more clear in its use as an example ntb driver.  Also, there might be some confusion in the naming of members "mw", since it might refer to a tool_mw or a tool_mw_wrap, and the name alone doesn't disclose the type, that requires reading and understanding the surrounding context in the code.

I am satisfied with these patches.  This is important for getting the multiport support established, and other than some comments about style and presentation of the patch set, nothing looks obviously wrong.  You should probably also seek Dave's ack on at least ntb_perf.

Acked-by: Allen Hubbe <Allen.Hubbe@dell.com>

> Serge Semin (15):
>   NTB: Rename NTB messaging API methods
>   NTB: Set dma mask and dma coherent mask to NTB devices
>   NTB: Fix UB/bug in ntb_mw_get_align()
>   NTB: ntb_pp: Add full multi-port NTB API support
>   NTB: ntb_tool: Add full multi-port NTB API support
>   NTB: ntb_perf: Add full multi-port NTB API support
>   NTB: ntb_test: Safely use paths with whitespace
>   NTB: ntb_test: Add ntb_tool port tests
>   NTB: ntb_test: Update ntb_tool link tests
>   NTB: ntb_test: Update ntb_tool DB tests
>   NTB: ntb_test: Update ntb_tool Scratchpad tests
>   NTB: ntb_test: Add ntb_tool Message tests
>   NTB: ntb_test: Update ntb_tool MW tests
>   NTB: ntb_test: Update ntb_perf tests
>   NTB: ntb_hw_idt: Set NTB_TOPO_SWITCH topology
> 
>  drivers/ntb/hw/amd/ntb_hw_amd.c         |    4 +
>  drivers/ntb/hw/idt/ntb_hw_idt.c         |   37 +-
>  drivers/ntb/hw/intel/ntb_hw_intel.c     |    4 +
>  drivers/ntb/ntb.c                       |    1 -
>  drivers/ntb/test/ntb_perf.c             | 1826 +++++++++++++++++++++----------
>  drivers/ntb/test/ntb_pingpong.c         |  450 +++++---
>  drivers/ntb/test/ntb_tool.c             | 1805 ++++++++++++++++++++----------
>  include/linux/ntb.h                     |   36 +-
>  tools/testing/selftests/ntb/ntb_test.sh |  307 ++++--
>  9 files changed, 3013 insertions(+), 1457 deletions(-)
> 
> --
> 2.12.0

Re: [PATCH v2 00/15] NTB: Add full multi-port API support to the test drivers

[Serge Semin]

On Mon, Dec 04, 2017 at 03:10:20PM -0500, Allen Hubbe <Allen.Hubbe@dell.com> wrote:
> From: Serge Semin
> > The multi-port NTB API was introduced in kernel 4.13 as well as the
> > first driver for the true multi-port devices of IDT PCIe-switches
> > series. But the test drivers still were left almost unchanged. Yes,
> > they didn't fail being used with new NTB API, but they only worked
> > with two-ports NTB devices. This patchset is intended to fix the
> > issue, by amending the NTB test drivers and script so they would be
> > fully compatible with multi-port NTB API.
> > 
> > Additionally I found a few NTB subsystem issues while developing the
> > submitted patches. So they are also fixed in this patchset
> 

Hello Allen

> Thanks for bringing the multiport support to the ntb tools and tests, and getting it all tested with help of @pallam.  I wondered about setting the dma mask on the ntb device object, and it is better now that you have done that.  In addition to the contact information to the file comments, MODULE_AUTHOR can also be specified more than once per module.
> 
> As Logan said, some of the renaming was not really necessary and made those patches more noisy than the needed to be.  I am not as much bothered by it, but it is a valid criticism.
> 

Yeah, I know that. As I already said, it isn't usual of my patches
being so complicated. The reason why I made so many small renamings
was the code refactoring. I tried to set all the test drivers code
up to the same naming convention, so it would be easier for a code
reader to study it. Definitely, such the alterations should have
been done within a separate patch. But I started refactoring the
code and changing the logic for multi-portness all together, so it
would be too painful to unpick one from another after the work was
done. It especially concerned the ntb_tool and ntb_perf drivers. Next
time the procedures will be separately. Sorry for inconvenience and
thanks for understanding.

> I can't find an earlier comment I thought I had made regarding the changes in ntb_tool.  Maybe it was only on IRC.  I think the use of the anonymous unions tool_mw is confusing.  It seems to require the reader to first understand how local and peer mw setup works, and then see that the anonymous unions are accessed by the proper member names depending on the situation.  In my review, the use of those members appears to be correct in your code.  Since these drivers are also intended to be example code, I would have preferred distinct types instead of a common type with anonymous union members.  Distinct types would make type checking by the compiler more effective at catching improper use, and I think it would make the code more clear in its use as an example ntb driver.  Also, there might be some confusion in the naming of members "mw", since it might refer to a tool_mw or a tool_mw_wrap, and the name alone doesn't disclose the type, that requires reading and understanding the surrounding context in the code.
> 

Oops. We discussed it in the IRC. We agreed to add commentaries
around the types definition, so a reader would better understand their
purpose. I just forgot to move the change from my repo to the fork of
Jon's one. I'll do it and resend the patch.

> I am satisfied with these patches.  This is important for getting the multiport support established, and other than some comments about style and presentation of the patch set, nothing looks obviously wrong.  You should probably also seek Dave's ack on at least ntb_perf.
> 
> Acked-by: Allen Hubbe <Allen.Hubbe@dell.com>
> 

Thanks for your commentary and ack sign. Dave also made a great
effort in testing the ntb_perf driver. Especially in helping Ujjal
with our remote debugging procedure on the Intel platforms.) Anyway
I'll be waiting for his explicit ack under the patches he agrees on.

Thanks,
-Sergey

> > Serge Semin (15):
> >   NTB: Rename NTB messaging API methods
> >   NTB: Set dma mask and dma coherent mask to NTB devices
> >   NTB: Fix UB/bug in ntb_mw_get_align()
> >   NTB: ntb_pp: Add full multi-port NTB API support
> >   NTB: ntb_tool: Add full multi-port NTB API support
> >   NTB: ntb_perf: Add full multi-port NTB API support
> >   NTB: ntb_test: Safely use paths with whitespace
> >   NTB: ntb_test: Add ntb_tool port tests
> >   NTB: ntb_test: Update ntb_tool link tests
> >   NTB: ntb_test: Update ntb_tool DB tests
> >   NTB: ntb_test: Update ntb_tool Scratchpad tests
> >   NTB: ntb_test: Add ntb_tool Message tests
> >   NTB: ntb_test: Update ntb_tool MW tests
> >   NTB: ntb_test: Update ntb_perf tests
> >   NTB: ntb_hw_idt: Set NTB_TOPO_SWITCH topology
> > 
> >  drivers/ntb/hw/amd/ntb_hw_amd.c         |    4 +
> >  drivers/ntb/hw/idt/ntb_hw_idt.c         |   37 +-
> >  drivers/ntb/hw/intel/ntb_hw_intel.c     |    4 +
> >  drivers/ntb/ntb.c                       |    1 -
> >  drivers/ntb/test/ntb_perf.c             | 1826 +++++++++++++++++++++----------
> >  drivers/ntb/test/ntb_pingpong.c         |  450 +++++---
> >  drivers/ntb/test/ntb_tool.c             | 1805 ++++++++++++++++++++----------
> >  include/linux/ntb.h                     |   36 +-
> >  tools/testing/selftests/ntb/ntb_test.sh |  307 ++++--
> >  9 files changed, 3013 insertions(+), 1457 deletions(-)
> > 
> > --
> > 2.12.0
> 
> -- 
> You received this message because you are subscribed to the Google Groups "linux-ntb" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to linux-ntb+unsubscribe@googlegroups.com.
> To post to this group, send email to linux-ntb@googlegroups.com.
> To view this discussion on the web visit https://groups.google.com/d/msgid/linux-ntb/000001d36d3b%24e9f211d0%24bdd63570%24%40dell.com.
> For more options, visit https://groups.google.com/d/optout.

Re: [PATCH v2 00/15] NTB: Add full multi-port API support to the test drivers

[Logan Gunthorpe]

On 05/12/17 08:54 AM, Serge Semin wrote:
> Yeah, I know that. As I already said, it isn't usual of my patches
> being so complicated. The reason why I made so many small renamings
> was the code refactoring. I tried to set all the test drivers code
> up to the same naming convention, so it would be easier for a code
> reader to study it. Definitely, such the alterations should have
> been done within a separate patch. But I started refactoring the
> code and changing the logic for multi-portness all together, so it
> would be too painful to unpick one from another after the work was
> done. It especially concerned the ntb_tool and ntb_perf drivers. Next
> time the procedures will be separately. Sorry for inconvenience and
> thanks for understanding.

It's really not that hard, using git, to refactor a patch. If it's such 
a mess that you can't refactor it then it's probably a good indication 
that said patch should not be merged. The vast majority of other 
maintainers in the kernel would never accept such a large convoluted 
patch as it's too difficult to determine if something unintended changed 
and it makes debugging and bisecting (once it's merged) more difficult. 
Not to mention the fact that few developers are willing to put in the 
time to untangle it enough to properly review.

> Oops. We discussed it in the IRC. We agreed to add commentaries
> around the types definition, so a reader would better understand their
> purpose. I just forgot to move the change from my repo to the fork of
> Jon's one. I'll do it and resend the patch.

I agree with Allen. The unions are completely unnecessary. If there was 
a space constraint then they could be justified but we really don't have 
that here. In my opinion, you should just drop them -- a comment doesn't 
really improve things much.

Logan

[PATCH v3 00/15] NTB: Add full multi-port API support to the test drivers

[Serge Semin]

The multi-port NTB API was introduced in kernel 4.13 as well as the
first driver for the true multi-port devices of IDT PCIe-switches
series. But the test drivers still were left almost unchanged. Yes,
they didn't fail being used with new NTB API, but they only worked
with two-ports NTB devices. This patchset is intended to fix the
issue by amending the NTB test drivers and script so they would be
fully compatible with multi-port NTB API.

Additionally I found a few NTB subsystem issues while developing the
submitted patches. So they are also fixed in this patchset.

Serge Semin (15):
  NTB: Rename NTB messaging API methods
  NTB: Set dma mask and dma coherent mask to NTB devices
  NTB: Fix UB/bug in ntb_mw_get_align()
  NTB: ntb_pp: Add full multi-port NTB API support
  NTB: ntb_tool: Add full multi-port NTB API support
  NTB: ntb_perf: Add full multi-port NTB API support
  NTB: ntb_test: Safely use paths with whitespace
  NTB: ntb_test: Add ntb_tool port tests
  NTB: ntb_test: Update ntb_tool link tests
  NTB: ntb_test: Update ntb_tool DB tests
  NTB: ntb_test: Update ntb_tool Scratchpad tests
  NTB: ntb_test: Add ntb_tool Message tests
  NTB: ntb_test: Update ntb_tool MW tests
  NTB: ntb_test: Update ntb_perf tests
  NTB: ntb_hw_idt: Set NTB_TOPO_SWITCH topology

 drivers/ntb/hw/amd/ntb_hw_amd.c         |    4 +
 drivers/ntb/hw/idt/ntb_hw_idt.c         |   37 +-
 drivers/ntb/hw/intel/ntb_hw_intel.c     |    4 +
 drivers/ntb/ntb.c                       |    1 -
 drivers/ntb/test/ntb_perf.c             | 1825 +++++++++++++++++++++----------
 drivers/ntb/test/ntb_pingpong.c         |  450 +++++---
 drivers/ntb/test/ntb_tool.c             | 1823 ++++++++++++++++++++----------
 include/linux/ntb.h                     |   36 +-
 tools/testing/selftests/ntb/ntb_test.sh |  307 ++++--
 9 files changed, 3022 insertions(+), 1465 deletions(-)

-- 
2.12.0

[PATCH v3 01/15] NTB: Rename NTB messaging API methods

[Serge Semin]

There is a common methods signature form used over all the NTB API
like functions naming scheme, arguments names and order, etc.
Recently added NTB messaging API IO callbacks were named a bit
different so should be renamed to be in compliance with the rest
of the API.

Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
---
 drivers/ntb/hw/idt/ntb_hw_idt.c | 27 ++++++++++++---------------
 include/linux/ntb.h             | 34 ++++++++++++++++------------------
 2 files changed, 28 insertions(+), 33 deletions(-)

diff --git a/drivers/ntb/hw/idt/ntb_hw_idt.c b/drivers/ntb/hw/idt/ntb_hw_idt.c
index 0cd79f367f7c..24040317bb9c 100644
--- a/drivers/ntb/hw/idt/ntb_hw_idt.c
+++ b/drivers/ntb/hw/idt/ntb_hw_idt.c
@@ -1744,20 +1744,19 @@ static int idt_ntb_msg_clear_mask(struct ntb_dev *ntb, u64 mask_bits)
  * idt_ntb_msg_read() - read message register with specified index
  *			(NTB API callback)
  * @ntb:	NTB device context.
- * @midx:	Message register index
  * @pidx:	OUT - Port index of peer device a message retrieved from
- * @msg:	OUT - Data
+ * @midx:	Message register index
  *
  * Read data from the specified message register and source register.
  *
- * Return: zero on success, negative error if invalid argument passed.
+ * Return: inbound message register value.
  */
-static int idt_ntb_msg_read(struct ntb_dev *ntb, int midx, int *pidx, u32 *msg)
+static u32 idt_ntb_msg_read(struct ntb_dev *ntb, int *pidx, int midx)
 {
 	struct idt_ntb_dev *ndev = to_ndev_ntb(ntb);
 
 	if (midx < 0 || IDT_MSG_CNT <= midx)
-		return -EINVAL;
+		return ~(u32)0;
 
 	/* Retrieve source port index of the message */
 	if (pidx != NULL) {
@@ -1772,18 +1771,15 @@ static int idt_ntb_msg_read(struct ntb_dev *ntb, int midx, int *pidx, u32 *msg)
 	}
 
 	/* Retrieve data of the corresponding message register */
-	if (msg != NULL)
-		*msg = idt_nt_read(ndev, ntdata_tbl.msgs[midx].in);
-
-	return 0;
+	return idt_nt_read(ndev, ntdata_tbl.msgs[midx].in);
 }
 
 /*
- * idt_ntb_msg_write() - write data to the specified message register
- *			 (NTB API callback)
+ * idt_ntb_peer_msg_write() - write data to the specified message register
+ *			      (NTB API callback)
  * @ntb:	NTB device context.
- * @midx:	Message register index
  * @pidx:	Port index of peer device a message being sent to
+ * @midx:	Message register index
  * @msg:	Data to send
  *
  * Just try to send data to a peer. Message status register should be
@@ -1791,7 +1787,8 @@ static int idt_ntb_msg_read(struct ntb_dev *ntb, int midx, int *pidx, u32 *msg)
  *
  * Return: zero on success, negative error if invalid argument passed.
  */
-static int idt_ntb_msg_write(struct ntb_dev *ntb, int midx, int pidx, u32 msg)
+static int idt_ntb_peer_msg_write(struct ntb_dev *ntb, int pidx, int midx,
+				  u32 msg)
 {
 	struct idt_ntb_dev *ndev = to_ndev_ntb(ntb);
 	unsigned long irqflags;
@@ -2058,7 +2055,7 @@ static const struct ntb_dev_ops idt_ntb_ops = {
 	.msg_set_mask		= idt_ntb_msg_set_mask,
 	.msg_clear_mask		= idt_ntb_msg_clear_mask,
 	.msg_read		= idt_ntb_msg_read,
-	.msg_write		= idt_ntb_msg_write
+	.peer_msg_write		= idt_ntb_peer_msg_write
 };
 
 /*
@@ -2269,7 +2266,7 @@ static ssize_t idt_dbgfs_info_read(struct file *filp, char __user *ubuf,
 		 "Message data:\n");
 	for (idx = 0; idx < IDT_MSG_CNT; idx++) {
 		int src;
-		(void)idt_ntb_msg_read(&ndev->ntb, idx, &src, &data);
+		data = idt_ntb_msg_read(&ndev->ntb, &src, idx);
 		off += scnprintf(strbuf + off, size - off,
 			"\t%hhu. 0x%08x from peer %hhu (Port %hhu)\n",
 			idx, data, src, ndev->peers[src].port);
diff --git a/include/linux/ntb.h b/include/linux/ntb.h
index c308964777eb..c1646f2c6344 100644
--- a/include/linux/ntb.h
+++ b/include/linux/ntb.h
@@ -250,7 +250,7 @@ static inline int ntb_ctx_ops_is_valid(const struct ntb_ctx_ops *ops)
  * @msg_set_mask:	See ntb_msg_set_mask().
  * @msg_clear_mask:	See ntb_msg_clear_mask().
  * @msg_read:		See ntb_msg_read().
- * @msg_write:		See ntb_msg_write().
+ * @peer_msg_write:	See ntb_peer_msg_write().
  */
 struct ntb_dev_ops {
 	int (*port_number)(struct ntb_dev *ntb);
@@ -321,8 +321,8 @@ struct ntb_dev_ops {
 	int (*msg_clear_sts)(struct ntb_dev *ntb, u64 sts_bits);
 	int (*msg_set_mask)(struct ntb_dev *ntb, u64 mask_bits);
 	int (*msg_clear_mask)(struct ntb_dev *ntb, u64 mask_bits);
-	int (*msg_read)(struct ntb_dev *ntb, int midx, int *pidx, u32 *msg);
-	int (*msg_write)(struct ntb_dev *ntb, int midx, int pidx, u32 msg);
+	u32 (*msg_read)(struct ntb_dev *ntb, int *pidx, int midx);
+	int (*peer_msg_write)(struct ntb_dev *ntb, int pidx, int midx, u32 msg);
 };
 
 static inline int ntb_dev_ops_is_valid(const struct ntb_dev_ops *ops)
@@ -384,7 +384,7 @@ static inline int ntb_dev_ops_is_valid(const struct ntb_dev_ops *ops)
 		/* !ops->msg_set_mask == !ops->msg_count	&& */
 		/* !ops->msg_clear_mask == !ops->msg_count	&& */
 		!ops->msg_read == !ops->msg_count		&&
-		!ops->msg_write == !ops->msg_count		&&
+		!ops->peer_msg_write == !ops->msg_count		&&
 		1;
 }
 
@@ -1459,31 +1459,29 @@ static inline int ntb_msg_clear_mask(struct ntb_dev *ntb, u64 mask_bits)
 }
 
 /**
- * ntb_msg_read() - read message register with specified index
+ * ntb_msg_read() - read inbound message register with specified index
  * @ntb:	NTB device context.
- * @midx:	Message register index
  * @pidx:	OUT - Port index of peer device a message retrieved from
- * @msg:	OUT - Data
+ * @midx:	Message register index
  *
  * Read data from the specified message register. Source port index of a
  * message is retrieved as well.
  *
- * Return: Zero on success, otherwise a negative error number.
+ * Return: The value of the inbound message register.
  */
-static inline int ntb_msg_read(struct ntb_dev *ntb, int midx, int *pidx,
-			       u32 *msg)
+static inline u32 ntb_msg_read(struct ntb_dev *ntb, int *pidx, int midx)
 {
 	if (!ntb->ops->msg_read)
-		return -EINVAL;
+		return ~(u32)0;
 
-	return ntb->ops->msg_read(ntb, midx, pidx, msg);
+	return ntb->ops->msg_read(ntb, pidx, midx);
 }
 
 /**
- * ntb_msg_write() - write data to the specified message register
+ * ntb_peer_msg_write() - write data to the specified peer message register
  * @ntb:	NTB device context.
- * @midx:	Message register index
  * @pidx:	Port index of peer device a message being sent to
+ * @midx:	Message register index
  * @msg:	Data to send
  *
  * Send data to a specified peer device using the defined message register.
@@ -1492,13 +1490,13 @@ static inline int ntb_msg_read(struct ntb_dev *ntb, int midx, int *pidx,
  *
  * Return: Zero on success, otherwise a negative error number.
  */
-static inline int ntb_msg_write(struct ntb_dev *ntb, int midx, int pidx,
-				u32 msg)
+static inline int ntb_peer_msg_write(struct ntb_dev *ntb, int pidx, int midx,
+				     u32 msg)
 {
-	if (!ntb->ops->msg_write)
+	if (!ntb->ops->peer_msg_write)
 		return -EINVAL;
 
-	return ntb->ops->msg_write(ntb, midx, pidx, msg);
+	return ntb->ops->peer_msg_write(ntb, pidx, midx, msg);
 }
 
 #endif
-- 
2.12.0

Re: [PATCH v3 01/15] NTB: Rename NTB messaging API methods

[Logan Gunthorpe]

On 05/12/17 03:39 PM, Serge Semin wrote:
> There is a common methods signature form used over all the NTB API
> like functions naming scheme, arguments names and order, etc.
> Recently added NTB messaging API IO callbacks were named a bit
> different so should be renamed to be in compliance with the rest
> of the API.

I still think we should not do this so this patch gets a NAK from me.

Logan

[PATCH v3 02/15] NTB: Set dma mask and dma coherent mask to NTB devices

[Serge Semin]

The dma_mask and dma_coherent_mask fields of the NTB struct device
weren't initialized in hardware drivers. In fact it should be done
instead of PCIe interface usage, since NTB clients are supposed to
use NTB API and left unaware of real hardware implementation.
In addition to that ntb_device_register() method shouldn't clear
the passed ntb_dev structure, since it dma_mask is initialized
by hardware drivers.

Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
---
 drivers/ntb/hw/amd/ntb_hw_amd.c     | 4 ++++
 drivers/ntb/hw/idt/ntb_hw_idt.c     | 8 +++++++-
 drivers/ntb/hw/intel/ntb_hw_intel.c | 4 ++++
 drivers/ntb/ntb.c                   | 1 -
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/drivers/ntb/hw/amd/ntb_hw_amd.c b/drivers/ntb/hw/amd/ntb_hw_amd.c
index f0788aae05c9..3cfa46876239 100644
--- a/drivers/ntb/hw/amd/ntb_hw_amd.c
+++ b/drivers/ntb/hw/amd/ntb_hw_amd.c
@@ -1020,6 +1020,10 @@ static int amd_ntb_init_pci(struct amd_ntb_dev *ndev,
 			goto err_dma_mask;
 		dev_warn(&pdev->dev, "Cannot DMA consistent highmem\n");
 	}
+	rc = dma_coerce_mask_and_coherent(&ndev->ntb.dev,
+					  dma_get_mask(&pdev->dev));
+	if (rc)
+		goto err_dma_mask;
 
 	ndev->self_mmio = pci_iomap(pdev, 0, 0);
 	if (!ndev->self_mmio) {
diff --git a/drivers/ntb/hw/idt/ntb_hw_idt.c b/drivers/ntb/hw/idt/ntb_hw_idt.c
index 24040317bb9c..93d4c9d2a9ad 100644
--- a/drivers/ntb/hw/idt/ntb_hw_idt.c
+++ b/drivers/ntb/hw/idt/ntb_hw_idt.c
@@ -2426,7 +2426,7 @@ static int idt_init_pci(struct idt_ntb_dev *ndev)
 	struct pci_dev *pdev = ndev->ntb.pdev;
 	int ret;
 
-	/* Initialize the bit mask of DMA */
+	/* Initialize the bit mask of PCI/NTB DMA */
 	ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(64));
 	if (ret != 0) {
 		ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
@@ -2447,6 +2447,12 @@ static int idt_init_pci(struct idt_ntb_dev *ndev)
 		dev_warn(&pdev->dev,
 			"Cannot set consistent DMA highmem bit mask\n");
 	}
+	ret = dma_coerce_mask_and_coherent(&ndev->ntb.dev,
+					   dma_get_mask(&pdev->dev));
+	if (ret != 0) {
+		dev_err(&pdev->dev, "Failed to set NTB device DMA bit mask\n");
+		return ret;
+	}
 
 	/*
 	 * Enable the device advanced error reporting. It's not critical to
diff --git a/drivers/ntb/hw/intel/ntb_hw_intel.c b/drivers/ntb/hw/intel/ntb_hw_intel.c
index 4de074a86073..ea6c82f8655f 100644
--- a/drivers/ntb/hw/intel/ntb_hw_intel.c
+++ b/drivers/ntb/hw/intel/ntb_hw_intel.c
@@ -2586,6 +2586,10 @@ static int intel_ntb_init_pci(struct intel_ntb_dev *ndev, struct pci_dev *pdev)
 			goto err_dma_mask;
 		dev_warn(&pdev->dev, "Cannot DMA consistent highmem\n");
 	}
+	rc = dma_coerce_mask_and_coherent(&ndev->ntb.dev,
+					  dma_get_mask(&pdev->dev));
+	if (rc)
+		goto err_dma_mask;
 
 	ndev->self_mmio = pci_iomap(pdev, 0, 0);
 	if (!ndev->self_mmio) {
diff --git a/drivers/ntb/ntb.c b/drivers/ntb/ntb.c
index 03b80d89b980..79e50a5f8902 100644
--- a/drivers/ntb/ntb.c
+++ b/drivers/ntb/ntb.c
@@ -112,7 +112,6 @@ int ntb_register_device(struct ntb_dev *ntb)
 
 	init_completion(&ntb->released);
 
-	memset(&ntb->dev, 0, sizeof(ntb->dev));
 	ntb->dev.bus = &ntb_bus;
 	ntb->dev.parent = &ntb->pdev->dev;
 	ntb->dev.release = ntb_dev_release;
-- 
2.12.0

Re: [PATCH v3 02/15] NTB: Set dma mask and dma coherent mask to NTB devices

[Logan Gunthorpe]

On 05/12/17 03:39 PM, Serge Semin wrote:
> The dma_mask and dma_coherent_mask fields of the NTB struct device
> weren't initialized in hardware drivers. In fact it should be done
> instead of PCIe interface usage, since NTB clients are supposed to
> use NTB API and left unaware of real hardware implementation.
> In addition to that ntb_device_register() method shouldn't clear
> the passed ntb_dev structure, since it dma_mask is initialized
> by hardware drivers.

I think you still need to address my comments in the previous version. 
As best as I can see this patch does nothing.

Logan

[PATCH v3 03/15] NTB: Fix UB/bug in ntb_mw_get_align()

[Serge Semin]

Simple (1 << pidx) operation causes undefined behaviour when
pidx >= 32. It must be casted to u64 to match the actual return
value of ntb_link_is_up() method, so to have all the possible
peer indexes covered and to get rid of undefined behaviour.
Additionally there are special macros in "linux/bitops.h" to perform
the bit-set-shift operations, so it's recommended to have them used
for proper bit setting.

Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
---
 include/linux/ntb.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/linux/ntb.h b/include/linux/ntb.h
index c1646f2c6344..488e586fb76c 100644
--- a/include/linux/ntb.h
+++ b/include/linux/ntb.h
@@ -764,7 +764,7 @@ static inline int ntb_mw_get_align(struct ntb_dev *ntb, int pidx, int widx,
 				   resource_size_t *size_align,
 				   resource_size_t *size_max)
 {
-	if (!(ntb_link_is_up(ntb, NULL, NULL) & (1 << pidx)))
+	if (!(ntb_link_is_up(ntb, NULL, NULL) & BIT_ULL(pidx)))
 		return -ENOTCONN;
 
 	return ntb->ops->mw_get_align(ntb, pidx, widx, addr_align, size_align,
-- 
2.12.0

Re: [PATCH v3 03/15] NTB: Fix UB/bug in ntb_mw_get_align()

[Logan Gunthorpe]

On 05/12/17 03:39 PM, Serge Semin wrote:
> Simple (1 << pidx) operation causes undefined behaviour when
> pidx >= 32. It must be casted to u64 to match the actual return
> value of ntb_link_is_up() method, so to have all the possible
> peer indexes covered and to get rid of undefined behaviour.
> Additionally there are special macros in "linux/bitops.h" to perform
> the bit-set-shift operations, so it's recommended to have them used
> for proper bit setting.
> 
> Signed-off-by: Serge Semin <fancer.lancer@gmail.com>

Looks like you dropped my reviewed by tag for some reason.

Reviewed-by: Logan Gunthorpe <logang@deltatee.com>

[PATCH v3 04/15] NTB: ntb_pp: Add full multi-port NTB API support

[Serge Semin]

Current Ping Pong driver can't truly work with multi-port devices.
Additionally it requires the Scratchpad registers being available
on NTB device. This patches rewrites the driver so one would
perform the cyclic Ping-Pong algorithm around all the available
NTB peers and makes it working with NTB hardware, which doesn't
support Scratchpads, but such alternative as NTB Message register.
Additional cleanups are also added here.

Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
---

Changelog v1:
- Add Multi-port API support
- Use NTB Message registers if available
- Ping-pong now works like cyclic ping around all the peers

Changelog v2:
- Remove driver Author/Description/Version macros

Changelog v3:
- Remove contacts from the driver header
- Discard spin_lock/unlocks around debug prints
- Print error if neither Msg and Spads available

 drivers/ntb/test/ntb_pingpong.c | 450 +++++++++++++++++++++++++---------------
 1 file changed, 283 insertions(+), 167 deletions(-)

diff --git a/drivers/ntb/test/ntb_pingpong.c b/drivers/ntb/test/ntb_pingpong.c
index 3f5a92bae6f8..65865e460ab8 100644
--- a/drivers/ntb/test/ntb_pingpong.c
+++ b/drivers/ntb/test/ntb_pingpong.c
@@ -1,10 +1,11 @@
 /*
- * This file is provided under a dual BSD/GPLv2 license.  When using or
+ *   This file is provided under a dual BSD/GPLv2 license.  When using or
  *   redistributing this file, you may do so under either license.
  *
  *   GPL LICENSE SUMMARY
  *
  *   Copyright (C) 2015 EMC Corporation. All Rights Reserved.
+ *   Copyright (C) 2017 T-Platforms. All Rights Reserved.
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of version 2 of the GNU General Public License as
@@ -18,6 +19,7 @@
  *   BSD LICENSE
  *
  *   Copyright (C) 2015 EMC Corporation. All Rights Reserved.
+ *   Copyright (C) 2017 T-Platforms. All Rights Reserved.
  *
  *   Redistribution and use in source and binary forms, with or without
  *   modification, are permitted provided that the following conditions
@@ -46,37 +48,45 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * PCIe NTB Pingpong Linux driver
- *
- * Contact Information:
- * Allen Hubbe <Allen.Hubbe@emc.com>
  */
 
-/* Note: load this module with option 'dyndbg=+p' */
+/*
+ * How to use this tool, by example.
+ *
+ * Assuming $DBG_DIR is something like:
+ * '/sys/kernel/debug/ntb_perf/0000:00:03.0'
+ * Suppose aside from local device there is at least one remote device
+ * connected to NTB with index 0.
+ *-----------------------------------------------------------------------------
+ * Eg: install driver with specified delay between doorbell event and response
+ *
+ * root@self# insmod ntb_pingpong.ko delay_ms=1000
+ *-----------------------------------------------------------------------------
+ * Eg: get number of ping-pong cycles performed
+ *
+ * root@self# cat $DBG_DIR/count
+ */
 
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/device.h>
+#include <linux/bitops.h>
 
-#include <linux/dma-mapping.h>
 #include <linux/pci.h>
 #include <linux/slab.h>
-#include <linux/spinlock.h>
+#include <linux/hrtimer.h>
 #include <linux/debugfs.h>
 
 #include <linux/ntb.h>
 
-#define DRIVER_NAME			"ntb_pingpong"
-#define DRIVER_DESCRIPTION		"PCIe NTB Simple Pingpong Client"
-
-#define DRIVER_LICENSE			"Dual BSD/GPL"
-#define DRIVER_VERSION			"1.0"
-#define DRIVER_RELDATE			"24 March 2015"
-#define DRIVER_AUTHOR			"Allen Hubbe <Allen.Hubbe@emc.com>"
+#define DRIVER_NAME		"ntb_pingpong"
+#define DRIVER_VERSION		"2.0"
 
-MODULE_LICENSE(DRIVER_LICENSE);
+MODULE_LICENSE("Dual BSD/GPL");
 MODULE_VERSION(DRIVER_VERSION);
-MODULE_AUTHOR(DRIVER_AUTHOR);
-MODULE_DESCRIPTION(DRIVER_DESCRIPTION);
+MODULE_AUTHOR("Allen Hubbe <Allen.Hubbe@emc.com>");
+MODULE_DESCRIPTION("PCIe NTB Simple Pingpong Client");
 
 static unsigned int unsafe;
 module_param(unsafe, uint, 0644);
@@ -86,237 +96,343 @@ static unsigned int delay_ms = 1000;
 module_param(delay_ms, uint, 0644);
 MODULE_PARM_DESC(delay_ms, "Milliseconds to delay the response to peer");
 
-static unsigned long db_init = 0x7;
-module_param(db_init, ulong, 0644);
-MODULE_PARM_DESC(db_init, "Initial doorbell bits to ring on the peer");
-
-/* Only two-ports NTB devices are supported */
-#define PIDX		NTB_DEF_PEER_IDX
-
 struct pp_ctx {
-	struct ntb_dev			*ntb;
-	u64				db_bits;
-	/* synchronize access to db_bits by ping and pong */
-	spinlock_t			db_lock;
-	struct timer_list		db_timer;
-	unsigned long			db_delay;
-	struct dentry			*debugfs_node_dir;
-	struct dentry			*debugfs_count;
-	atomic_t			count;
+	struct ntb_dev *ntb;
+	struct hrtimer timer;
+	u64 in_db;
+	u64 out_db;
+	int out_pidx;
+	u64 nmask;
+	u64 pmask;
+	atomic_t count;
+	spinlock_t lock;
+	struct dentry *dbgfs_dir;
 };
+#define to_pp_timer(__timer) \
+	container_of(__timer, struct pp_ctx, timer)
 
-static struct dentry *pp_debugfs_dir;
+static struct dentry *pp_dbgfs_topdir;
 
-static void pp_ping(struct timer_list *t)
+static int pp_find_next_peer(struct pp_ctx *pp)
 {
-	struct pp_ctx *pp = from_timer(pp, t, db_timer);
-	unsigned long irqflags;
-	u64 db_bits, db_mask;
-	u32 spad_rd, spad_wr;
+	u64 link, out_db;
+	int pidx;
+
+	link = ntb_link_is_up(pp->ntb, NULL, NULL);
+
+	/* Find next available peer */
+	if (link & pp->nmask) {
+		pidx = __ffs64(link & pp->nmask);
+		out_db = BIT_ULL(pidx + 1);
+	} else if (link & pp->pmask) {
+		pidx = __ffs64(link & pp->pmask);
+		out_db = BIT_ULL(pidx);
+	} else {
+		return -ENODEV;
+	}
 
-	spin_lock_irqsave(&pp->db_lock, irqflags);
-	{
-		db_mask = ntb_db_valid_mask(pp->ntb);
-		db_bits = ntb_db_read(pp->ntb);
+	spin_lock(&pp->lock);
+	pp->out_pidx = pidx;
+	pp->out_db = out_db;
+	spin_unlock(&pp->lock);
 
-		if (db_bits) {
-			dev_dbg(&pp->ntb->dev,
-				"Masked pongs %#llx\n",
-				db_bits);
-			ntb_db_clear(pp->ntb, db_bits);
-		}
+	return 0;
+}
 
-		db_bits = ((pp->db_bits | db_bits) << 1) & db_mask;
+static void pp_setup(struct pp_ctx *pp)
+{
+	int ret;
 
-		if (!db_bits)
-			db_bits = db_init;
+	ntb_db_set_mask(pp->ntb, pp->in_db);
 
-		spad_rd = ntb_spad_read(pp->ntb, 0);
-		spad_wr = spad_rd + 1;
+	hrtimer_cancel(&pp->timer);
 
-		dev_dbg(&pp->ntb->dev,
-			"Ping bits %#llx read %#x write %#x\n",
-			db_bits, spad_rd, spad_wr);
+	ret = pp_find_next_peer(pp);
+	if (ret == -ENODEV) {
+		dev_dbg(&pp->ntb->dev, "Got no peers, so cancel\n");
+		return;
+	}
 
-		ntb_peer_spad_write(pp->ntb, PIDX, 0, spad_wr);
-		ntb_peer_db_set(pp->ntb, db_bits);
-		ntb_db_clear_mask(pp->ntb, db_mask);
+	dev_dbg(&pp->ntb->dev, "Ping-pong started with port %d, db %#llx\n",
+		ntb_peer_port_number(pp->ntb, pp->out_pidx), pp->out_db);
 
-		pp->db_bits = 0;
-	}
-	spin_unlock_irqrestore(&pp->db_lock, irqflags);
+	hrtimer_start(&pp->timer, ms_to_ktime(delay_ms), HRTIMER_MODE_REL);
 }
 
-static void pp_link_event(void *ctx)
+static void pp_clear(struct pp_ctx *pp)
 {
-	struct pp_ctx *pp = ctx;
+	hrtimer_cancel(&pp->timer);
 
-	if (ntb_link_is_up(pp->ntb, NULL, NULL) == 1) {
-		dev_dbg(&pp->ntb->dev, "link is up\n");
-		pp_ping(&pp->db_timer);
-	} else {
-		dev_dbg(&pp->ntb->dev, "link is down\n");
-		del_timer(&pp->db_timer);
-	}
+	ntb_db_set_mask(pp->ntb, pp->in_db);
+
+	dev_dbg(&pp->ntb->dev, "Ping-pong cancelled\n");
 }
 
-static void pp_db_event(void *ctx, int vec)
+static void pp_ping(struct pp_ctx *pp)
 {
-	struct pp_ctx *pp = ctx;
-	u64 db_bits, db_mask;
-	unsigned long irqflags;
+	u32 count;
 
-	spin_lock_irqsave(&pp->db_lock, irqflags);
-	{
-		db_mask = ntb_db_vector_mask(pp->ntb, vec);
-		db_bits = db_mask & ntb_db_read(pp->ntb);
-		ntb_db_set_mask(pp->ntb, db_mask);
-		ntb_db_clear(pp->ntb, db_bits);
+	count = atomic_read(&pp->count);
 
-		pp->db_bits |= db_bits;
+	spin_lock(&pp->lock);
+	ntb_peer_spad_write(pp->ntb, pp->out_pidx, 0, count);
+	ntb_peer_msg_write(pp->ntb, pp->out_pidx, 0, count);
 
-		mod_timer(&pp->db_timer, jiffies + pp->db_delay);
+	dev_dbg(&pp->ntb->dev, "Ping port %d spad %#x, msg %#x\n",
+		ntb_peer_port_number(pp->ntb, pp->out_pidx), count, count);
 
-		dev_dbg(&pp->ntb->dev,
-			"Pong vec %d bits %#llx\n",
-			vec, db_bits);
-		atomic_inc(&pp->count);
-	}
-	spin_unlock_irqrestore(&pp->db_lock, irqflags);
+	ntb_peer_db_set(pp->ntb, pp->out_db);
+	ntb_db_clear_mask(pp->ntb, pp->in_db);
+	spin_unlock(&pp->lock);
 }
 
-static int pp_debugfs_setup(struct pp_ctx *pp)
+static void pp_pong(struct pp_ctx *pp)
 {
-	struct pci_dev *pdev = pp->ntb->pdev;
+	u32 msg_data = -1, spad_data = -1;
+	int pidx = 0;
 
-	if (!pp_debugfs_dir)
-		return -ENODEV;
+	/* Read pong data */
+	spad_data = ntb_spad_read(pp->ntb, 0);
+	msg_data = ntb_msg_read(pp->ntb, &pidx, 0);
+	ntb_msg_clear_sts(pp->ntb, -1);
 
-	pp->debugfs_node_dir = debugfs_create_dir(pci_name(pdev),
-						  pp_debugfs_dir);
-	if (!pp->debugfs_node_dir)
-		return -ENODEV;
+	/*
+	 * Scratchpad and message data may differ, since message register can't
+	 * be rewritten unless status is cleared. Additionally either of them
+	 * might be unsupported
+	 */
+	dev_dbg(&pp->ntb->dev, "Pong spad %#x, msg %#x (port %d)\n",
+		spad_data, msg_data, ntb_peer_port_number(pp->ntb, pidx));
 
-	pp->debugfs_count = debugfs_create_atomic_t("count", S_IRUSR | S_IWUSR,
-						    pp->debugfs_node_dir,
-						    &pp->count);
-	if (!pp->debugfs_count)
-		return -ENODEV;
+	atomic_inc(&pp->count);
 
-	return 0;
+	ntb_db_set_mask(pp->ntb, pp->in_db);
+	ntb_db_clear(pp->ntb, pp->in_db);
+
+	hrtimer_start(&pp->timer, ms_to_ktime(delay_ms), HRTIMER_MODE_REL);
+}
+
+static enum hrtimer_restart pp_timer_func(struct hrtimer *t)
+{
+	struct pp_ctx *pp = to_pp_timer(t);
+
+	pp_ping(pp);
+
+	return HRTIMER_NORESTART;
+}
+
+static void pp_link_event(void *ctx)
+{
+	struct pp_ctx *pp = ctx;
+
+	pp_setup(pp);
+}
+
+static void pp_db_event(void *ctx, int vec)
+{
+	struct pp_ctx *pp = ctx;
+
+	pp_pong(pp);
 }
 
 static const struct ntb_ctx_ops pp_ops = {
 	.link_event = pp_link_event,
-	.db_event = pp_db_event,
+	.db_event = pp_db_event
 };
 
-static int pp_probe(struct ntb_client *client,
-		    struct ntb_dev *ntb)
+static int pp_check_ntb(struct ntb_dev *ntb)
 {
-	struct pp_ctx *pp;
-	int rc;
+	u64 pmask;
 
 	if (ntb_db_is_unsafe(ntb)) {
-		dev_dbg(&ntb->dev, "doorbell is unsafe\n");
-		if (!unsafe) {
-			rc = -EINVAL;
-			goto err_pp;
-		}
-	}
-
-	if (ntb_spad_count(ntb) < 1) {
-		dev_dbg(&ntb->dev, "no enough scratchpads\n");
-		rc = -EINVAL;
-		goto err_pp;
+		dev_dbg(&ntb->dev, "Doorbell is unsafe\n");
+		if (!unsafe)
+			return -EINVAL;
 	}
 
 	if (ntb_spad_is_unsafe(ntb)) {
-		dev_dbg(&ntb->dev, "scratchpad is unsafe\n");
-		if (!unsafe) {
-			rc = -EINVAL;
-			goto err_pp;
-		}
+		dev_dbg(&ntb->dev, "Scratchpad is unsafe\n");
+		if (!unsafe)
+			return -EINVAL;
 	}
 
-	if (ntb_peer_port_count(ntb) != NTB_DEF_PEER_CNT)
-		dev_warn(&ntb->dev, "multi-port NTB is unsupported\n");
+	pmask = GENMASK_ULL(ntb_peer_port_count(ntb), 0);
+	if ((ntb_db_valid_mask(ntb) & pmask) != pmask) {
+		dev_err(&ntb->dev, "Unsupported DB configuration\n");
+		return -EINVAL;
+	}
 
-	pp = kmalloc(sizeof(*pp), GFP_KERNEL);
-	if (!pp) {
-		rc = -ENOMEM;
-		goto err_pp;
+	if (ntb_spad_count(ntb) < 1 && ntb_msg_count(ntb) < 1) {
+		dev_err(&ntb->dev, "Scratchpads and messages unsupported\n");
+		return -EINVAL;
+	} else if (ntb_spad_count(ntb) < 1) {
+		dev_dbg(&ntb->dev, "Scratchpads unsupported\n");
+	} else if (ntb_msg_count(ntb) < 1) {
+		dev_dbg(&ntb->dev, "Messages unsupported\n");
 	}
 
+	return 0;
+}
+
+static struct pp_ctx *pp_create_data(struct ntb_dev *ntb)
+{
+	struct pp_ctx *pp;
+
+	pp = devm_kzalloc(&ntb->dev, sizeof(*pp), GFP_KERNEL);
+	if (!pp)
+		return ERR_PTR(-ENOMEM);
+
 	pp->ntb = ntb;
-	pp->db_bits = 0;
 	atomic_set(&pp->count, 0);
-	spin_lock_init(&pp->db_lock);
-	timer_setup(&pp->db_timer, pp_ping, 0);
-	pp->db_delay = msecs_to_jiffies(delay_ms);
+	spin_lock_init(&pp->lock);
+	hrtimer_init(&pp->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
+	pp->timer.function = pp_timer_func;
+
+	return pp;
+}
+
+static void pp_init_flds(struct pp_ctx *pp)
+{
+	int pidx, lport, pcnt;
+
+	/* Find global port index */
+	lport = ntb_port_number(pp->ntb);
+	pcnt = ntb_peer_port_count(pp->ntb);
+	for (pidx = 0; pidx < pcnt; pidx++) {
+		if (lport < ntb_peer_port_number(pp->ntb, pidx))
+			break;
+	}
 
-	rc = ntb_set_ctx(ntb, pp, &pp_ops);
-	if (rc)
-		goto err_ctx;
+	pp->in_db = BIT_ULL(pidx);
+	pp->pmask = GENMASK_ULL(pidx, 0) >> 1;
+	pp->nmask = GENMASK_ULL(pcnt - 1, pidx);
 
-	rc = pp_debugfs_setup(pp);
-	if (rc)
-		goto err_ctx;
+	dev_dbg(&pp->ntb->dev, "Inbound db %#llx, prev %#llx, next %#llx\n",
+		pp->in_db, pp->pmask, pp->nmask);
+}
+
+static int pp_mask_events(struct pp_ctx *pp)
+{
+	u64 db_mask, msg_mask;
+	int ret;
+
+	db_mask = ntb_db_valid_mask(pp->ntb);
+	ret = ntb_db_set_mask(pp->ntb, db_mask);
+	if (ret)
+		return ret;
 
-	ntb_link_enable(ntb, NTB_SPEED_AUTO, NTB_WIDTH_AUTO);
-	ntb_link_event(ntb);
+	/* Skip message events masking if unsupported */
+	if (ntb_msg_count(pp->ntb) < 1)
+		return 0;
+
+	msg_mask = ntb_msg_outbits(pp->ntb) | ntb_msg_inbits(pp->ntb);
+	return ntb_msg_set_mask(pp->ntb, msg_mask);
+}
+
+static int pp_setup_ctx(struct pp_ctx *pp)
+{
+	int ret;
+
+	ret = ntb_set_ctx(pp->ntb, pp, &pp_ops);
+	if (ret)
+		return ret;
+
+	ntb_link_enable(pp->ntb, NTB_SPEED_AUTO, NTB_WIDTH_AUTO);
+	/* Might be not necessary */
+	ntb_link_event(pp->ntb);
 
 	return 0;
+}
+
+static void pp_clear_ctx(struct pp_ctx *pp)
+{
+	ntb_link_disable(pp->ntb);
 
-err_ctx:
-	kfree(pp);
-err_pp:
-	return rc;
+	ntb_clear_ctx(pp->ntb);
 }
 
-static void pp_remove(struct ntb_client *client,
-		      struct ntb_dev *ntb)
+static void pp_setup_dbgfs(struct pp_ctx *pp)
+{
+	struct pci_dev *pdev = pp->ntb->pdev;
+	void *ret;
+
+	pp->dbgfs_dir = debugfs_create_dir(pci_name(pdev), pp_dbgfs_topdir);
+
+	ret = debugfs_create_atomic_t("count", 0600, pp->dbgfs_dir, &pp->count);
+	if (!ret)
+		dev_warn(&pp->ntb->dev, "DebugFS unsupported\n");
+}
+
+static void pp_clear_dbgfs(struct pp_ctx *pp)
+{
+	debugfs_remove_recursive(pp->dbgfs_dir);
+}
+
+static int pp_probe(struct ntb_client *client, struct ntb_dev *ntb)
+{
+	struct pp_ctx *pp;
+	int ret;
+
+	ret = pp_check_ntb(ntb);
+	if (ret)
+		return ret;
+
+	pp = pp_create_data(ntb);
+	if (IS_ERR(pp))
+		return PTR_ERR(pp);
+
+	pp_init_flds(pp);
+
+	ret = pp_mask_events(pp);
+	if (ret)
+		return ret;
+
+	ret = pp_setup_ctx(pp);
+	if (ret)
+		return ret;
+
+	pp_setup_dbgfs(pp);
+
+	return 0;
+}
+
+static void pp_remove(struct ntb_client *client, struct ntb_dev *ntb)
 {
 	struct pp_ctx *pp = ntb->ctx;
 
-	debugfs_remove_recursive(pp->debugfs_node_dir);
+	pp_clear_dbgfs(pp);
 
-	ntb_clear_ctx(ntb);
-	del_timer_sync(&pp->db_timer);
-	ntb_link_disable(ntb);
+	pp_clear_ctx(pp);
 
-	kfree(pp);
+	pp_clear(pp);
 }
 
 static struct ntb_client pp_client = {
 	.ops = {
 		.probe = pp_probe,
-		.remove = pp_remove,
-	},
+		.remove = pp_remove
+	}
 };
 
 static int __init pp_init(void)
 {
-	int rc;
+	int ret;
 
 	if (debugfs_initialized())
-		pp_debugfs_dir = debugfs_create_dir(KBUILD_MODNAME, NULL);
+		pp_dbgfs_topdir = debugfs_create_dir(KBUILD_MODNAME, NULL);
 
-	rc = ntb_register_client(&pp_client);
-	if (rc)
-		goto err_client;
+	ret = ntb_register_client(&pp_client);
+	if (ret)
+		debugfs_remove_recursive(pp_dbgfs_topdir);
 
-	return 0;
-
-err_client:
-	debugfs_remove_recursive(pp_debugfs_dir);
-	return rc;
+	return ret;
 }
 module_init(pp_init);
 
 static void __exit pp_exit(void)
 {
 	ntb_unregister_client(&pp_client);
-	debugfs_remove_recursive(pp_debugfs_dir);
+	debugfs_remove_recursive(pp_dbgfs_topdir);
 }
 module_exit(pp_exit);
+
-- 
2.12.0

[PATCH v3 05/15] NTB: ntb_tool: Add full multi-port NTB API support

[Serge Semin]

Former NTB Debugging tool driver supported only the limited
functionality of the recently updated NTB API, which is now available
to work with the truly NTB multi-port devices and devices, which
got NTB Message registers instead of Scratchpads. This patch
fully rewrites the driver so one would fully expose all the new
NTB API interfaces. Particularly it concerns the Message registers,
peer ports API, NTB link settings. Additional cleanups are also added
here.

Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
---

Changelog v1:
- Alter interface in compliance with multi-port API
- Move Message/MW/Port/Link settings to a specific directory

Changelog v2:
- Remove driver Author/Description/License macros
- Return error if ntb_mw_get_align called while link is down
- Add db_valid_mask DebugFS file
- Add msg_inbits/msg_outbits DebugFS files

Changelog v3:
- Remove contacts info from the driver header
- Add descriptive comments for the MW-related structures
- Replace on-stack bufs sizes with macro

 drivers/ntb/test/ntb_tool.c | 1823 +++++++++++++++++++++++++++++--------------
 1 file changed, 1241 insertions(+), 582 deletions(-)

diff --git a/drivers/ntb/test/ntb_tool.c b/drivers/ntb/test/ntb_tool.c
index 91526a986caa..920fc9b161b0 100644
--- a/drivers/ntb/test/ntb_tool.c
+++ b/drivers/ntb/test/ntb_tool.c
@@ -5,6 +5,7 @@
  *   GPL LICENSE SUMMARY
  *
  *   Copyright (C) 2015 EMC Corporation. All Rights Reserved.
+ *   Copyright (C) 2017 T-Platforms All Rights Reserved.
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of version 2 of the GNU General Public License as
@@ -18,6 +19,7 @@
  *   BSD LICENSE
  *
  *   Copyright (C) 2015 EMC Corporation. All Rights Reserved.
+ *   Copyright (C) 2017 T-Platforms All Rights Reserved.
  *
  *   Redistribution and use in source and binary forms, with or without
  *   modification, are permitted provided that the following conditions
@@ -46,9 +48,6 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * PCIe NTB Debugging Tool Linux driver
- *
- * Contact Information:
- * Allen Hubbe <Allen.Hubbe@emc.com>
  */
 
 /*
@@ -56,42 +55,125 @@
  *
  * Assuming $DBG_DIR is something like:
  * '/sys/kernel/debug/ntb_tool/0000:00:03.0'
+ * Suppose aside from local device there is at least one remote device
+ * connected to NTB with index 0.
+ *-----------------------------------------------------------------------------
+ * Eg: check local/peer device information.
+ *
+ * # Get local device port number
+ * root@self# cat $DBG_DIR/port
+ *
+ * # Check local device functionality
+ * root@self# ls $DBG_DIR
+ * db            msg1          msg_sts     peer4/        port
+ * db_event      msg2          peer0/      peer5/        spad0
+ * db_mask       msg3          peer1/      peer_db       spad1
+ * link          msg_event     peer2/      peer_db_mask  spad2
+ * msg0          msg_mask      peer3/      peer_spad     spad3
+ * # As one can see it supports:
+ * # 1) four inbound message registers
+ * # 2) four inbound scratchpads
+ * # 3) up to six peer devices
+ *
+ * # Check peer device port number
+ * root@self# cat $DBG_DIR/peer0/port
  *
- * Eg: check if clearing the doorbell mask generates an interrupt.
+ * # Check peer device(s) functionality to be used
+ * root@self# ls $DBG_DIR/peer0
+ * link             mw_trans0       mw_trans6        port
+ * link_event       mw_trans1       mw_trans7        spad0
+ * msg0             mw_trans2       peer_mw_trans0   spad1
+ * msg1             mw_trans3       peer_mw_trans1   spad2
+ * msg2             mw_trans4       peer_mw_trans2   spad3
+ * msg3             mw_trans5       peer_mw_trans3
+ * # As one can see we got:
+ * # 1) four outbound message registers
+ * # 2) four outbound scratchpads
+ * # 3) eight inbound memory windows
+ * # 4) four outbound memory windows
+ *-----------------------------------------------------------------------------
+ * Eg: NTB link tests
  *
- * # Check the link status
- * root@self# cat $DBG_DIR/link
+ * # Set local link up/down
+ * root@self# echo Y > $DBG_DIR/link
+ * root@self# echo N > $DBG_DIR/link
  *
- * # Block until the link is up
- * root@self# echo Y > $DBG_DIR/link_event
+ * # Check if link with peer device is up/down:
+ * root@self# cat $DBG_DIR/peer0/link
  *
- * # Set the doorbell mask
- * root@self# echo 's 1' > $DBG_DIR/mask
+ * # Block until the link is up/down
+ * root@self# echo Y > $DBG_DIR/peer0/link_event
+ * root@self# echo N > $DBG_DIR/peer0/link_event
+ *-----------------------------------------------------------------------------
+ * Eg: Doorbell registers tests (some functionality might be absent)
  *
- * # Ring the doorbell from the peer
+ * # Set/clear/get local doorbell
+ * root@self# echo 's 1' > $DBG_DIR/db
+ * root@self# echo 'c 1' > $DBG_DIR/db
+ * root@self# cat  $DBG_DIR/db
+ *
+ * # Set/clear/get local doorbell mask
+ * root@self# echo 's 1' > $DBG_DIR/db_mask
+ * root@self# echo 'c 1' > $DBG_DIR/db_mask
+ * root@self# cat $DBG_DIR/db_mask
+ *
+ * # Ring/clear/get peer doorbell
  * root@peer# echo 's 1' > $DBG_DIR/peer_db
+ * root@peer# echo 'c 1' > $DBG_DIR/peer_db
+ * root@peer# cat $DBG_DIR/peer_db
+ *
+ * # Set/clear/get peer doorbell mask
+ * root@self# echo 's 1' > $DBG_DIR/peer_db_mask
+ * root@self# echo 'c 1' > $DBG_DIR/peer_db_mask
+ * root@self# cat $DBG_DIR/peer_db_mask
+ *
+ * # Block until local doorbell is set with specified value
+ * root@self# echo 1 > $DBG_DIR/db_event
+ *-----------------------------------------------------------------------------
+ * Eg: Message registers tests (functionality might be absent)
  *
- * # Clear the doorbell mask
- * root@self# echo 'c 1' > $DBG_DIR/mask
+ * # Set/clear/get in/out message registers status
+ * root@self# echo 's 1' > $DBG_DIR/msg_sts
+ * root@self# echo 'c 1' > $DBG_DIR/msg_sts
+ * root@self# cat $DBG_DIR/msg_sts
  *
- * Observe debugging output in dmesg or your console.  You should see a
- * doorbell event triggered by clearing the mask.  If not, this may indicate an
- * issue with the hardware that needs to be worked around in the driver.
+ * # Set/clear in/out message registers mask
+ * root@self# echo 's 1' > $DBG_DIR/msg_mask
+ * root@self# echo 'c 1' > $DBG_DIR/msg_mask
  *
- * Eg: read and write scratchpad registers
+ * # Get inbound message register #0 value and source of port index
+ * root@self# cat  $DBG_DIR/msg0
  *
- * root@peer# echo '0 0x01010101 1 0x7f7f7f7f' > $DBG_DIR/peer_spad
+ * # Send some data to peer over outbound message register #0
+ * root@self# echo 0x01020304 > $DBG_DIR/peer0/msg0
+ *-----------------------------------------------------------------------------
+ * Eg: Scratchpad registers tests (functionality might be absent)
  *
- * root@self# cat $DBG_DIR/spad
+ * # Write/read to/from local scratchpad register #0
+ * root@peer# echo 0x01020304 > $DBG_DIR/spad0
+ * root@peer# cat $DBG_DIR/spad0
  *
- * Observe that spad 0 and 1 have the values set by the peer.
+ * # Write/read to/from peer scratchpad register #0
+ * root@peer# echo 0x01020304 > $DBG_DIR/peer0/spad0
+ * root@peer# cat $DBG_DIR/peer0/spad0
+ *-----------------------------------------------------------------------------
+ * Eg: Memory windows tests
  *
- * # Check the memory window translation info
- * cat $DBG_DIR/peer_trans0
+ * # Create inbound memory window buffer of specified size/get its base address
+ * root@peer# echo 16384 > $DBG_DIR/peer0/mw_trans0
+ * root@peer# cat $DBG_DIR/peer0/mw_trans0
  *
- * # Setup a 16k memory window buffer
- * echo 16384 > $DBG_DIR/peer_trans0
+ * # Write/read data to/from inbound memory window
+ * root@peer# echo Hello > $DBG_DIR/peer0/mw0
+ * root@peer# head -c 7 $DBG_DIR/peer0/mw0
  *
+ * # Map outbound memory window/check it settings (on peer device)
+ * root@peer# echo 0xADD0BA5E:16384 > $DBG_DIR/peer0/peer_mw_trans0
+ * root@peer# cat $DBG_DIR/peer0/peer_mw_trans0
+ *
+ * # Write/read data to/from outbound memory window (on peer device)
+ * root@peer# echo olleH > $DBG_DIR/peer0/peer_mw0
+ * root@peer# head -c 7 $DBG_DIR/peer0/peer_mw0
  */
 
 #include <linux/init.h>
@@ -106,49 +188,87 @@
 
 #include <linux/ntb.h>
 
-#define DRIVER_NAME			"ntb_tool"
-#define DRIVER_DESCRIPTION		"PCIe NTB Debugging Tool"
-
-#define DRIVER_LICENSE			"Dual BSD/GPL"
-#define DRIVER_VERSION			"1.0"
-#define DRIVER_RELDATE			"22 April 2015"
-#define DRIVER_AUTHOR			"Allen Hubbe <Allen.Hubbe@emc.com>"
+#define DRIVER_NAME		"ntb_tool"
+#define DRIVER_VERSION		"2.0"
 
-MODULE_LICENSE(DRIVER_LICENSE);
+MODULE_LICENSE("Dual BSD/GPL");
 MODULE_VERSION(DRIVER_VERSION);
-MODULE_AUTHOR(DRIVER_AUTHOR);
-MODULE_DESCRIPTION(DRIVER_DESCRIPTION);
-
-/* It is rare to have hadrware with greater than six MWs */
-#define MAX_MWS	6
-/* Only two-ports devices are supported */
-#define PIDX	NTB_DEF_PEER_IDX
-
-static struct dentry *tool_dbgfs;
+MODULE_AUTHOR("Allen Hubbe <Allen.Hubbe@emc.com>");
+MODULE_DESCRIPTION("PCIe NTB Debugging Tool");
 
+/*
+ * Inbound and outbound memory windows descriptor. Union members selection
+ * depends on the MW type the structure describes. mm_base/dma_base are the
+ * virtual and DMA address of an inbound MW. io_base/tr_base are the MMIO
+ * mapped virtual and xlat addresses of an outbound MW respectively.
+ */
 struct tool_mw {
-	int idx;
+	int widx;
+	int pidx;
 	struct tool_ctx *tc;
-	resource_size_t win_size;
+	union {
+		u8 *mm_base;
+		u8 __iomem *io_base;
+	};
+	union {
+		dma_addr_t dma_base;
+		u64 tr_base;
+	};
 	resource_size_t size;
-	u8 __iomem *local;
-	u8 *peer;
-	dma_addr_t peer_dma;
-	struct dentry *peer_dbg_file;
+	struct dentry *dbgfs_file;
+};
+
+/*
+ * Wrapper structure is used to distinguish the outbound MW peers reference
+ * within the corresponding DebugFS directory IO operation.
+ */
+struct tool_mw_wrap {
+	int pidx;
+	struct tool_mw *mw;
+};
+
+struct tool_msg {
+	int midx;
+	int pidx;
+	struct tool_ctx *tc;
+};
+
+struct tool_spad {
+	int sidx;
+	int pidx;
+	struct tool_ctx *tc;
+};
+
+struct tool_peer {
+	int pidx;
+	struct tool_ctx *tc;
+	int inmw_cnt;
+	struct tool_mw *inmws;
+	int outmw_cnt;
+	struct tool_mw_wrap *outmws;
+	int outmsg_cnt;
+	struct tool_msg *outmsgs;
+	int outspad_cnt;
+	struct tool_spad *outspads;
+	struct dentry *dbgfs_dir;
 };
 
 struct tool_ctx {
 	struct ntb_dev *ntb;
-	struct dentry *dbgfs;
 	wait_queue_head_t link_wq;
-	int mw_count;
-	struct tool_mw mws[MAX_MWS];
+	wait_queue_head_t db_wq;
+	wait_queue_head_t msg_wq;
+	int outmw_cnt;
+	struct tool_mw *outmws;
+	int peer_cnt;
+	struct tool_peer *peers;
+	int inmsg_cnt;
+	struct tool_msg *inmsgs;
+	int inspad_cnt;
+	struct tool_spad *inspads;
+	struct dentry *dbgfs_dir;
 };
 
-#define SPAD_FNAME_SIZE 0x10
-#define INT_PTR(x) ((void *)(unsigned long)x)
-#define PTR_INT(x) ((int)(unsigned long)x)
-
 #define TOOL_FOPS_RDWR(__name, __read, __write) \
 	const struct file_operations __name = {	\
 		.owner = THIS_MODULE,		\
@@ -157,6 +277,15 @@ struct tool_ctx {
 		.write = __write,		\
 	}
 
+#define TOOL_BUF_LEN 32
+
+static struct dentry *tool_dbgfs_topdir;
+
+/*==============================================================================
+ *                               NTB events handlers
+ *==============================================================================
+ */
+
 static void tool_link_event(void *ctx)
 {
 	struct tool_ctx *tc = ctx;
@@ -182,580 +311,576 @@ static void tool_db_event(void *ctx, int vec)
 
 	dev_dbg(&tc->ntb->dev, "doorbell vec %d mask %#llx bits %#llx\n",
 		vec, db_mask, db_bits);
+
+	wake_up(&tc->db_wq);
+}
+
+static void tool_msg_event(void *ctx)
+{
+	struct tool_ctx *tc = ctx;
+	u64 msg_sts;
+
+	msg_sts = ntb_msg_read_sts(tc->ntb);
+
+	dev_dbg(&tc->ntb->dev, "message bits %#llx\n", msg_sts);
+
+	wake_up(&tc->msg_wq);
 }
 
 static const struct ntb_ctx_ops tool_ops = {
 	.link_event = tool_link_event,
 	.db_event = tool_db_event,
+	.msg_event = tool_msg_event
 };
 
-static ssize_t tool_dbfn_read(struct tool_ctx *tc, char __user *ubuf,
-			      size_t size, loff_t *offp,
-			      u64 (*db_read_fn)(struct ntb_dev *))
+/*==============================================================================
+ *                        Common read/write methods
+ *==============================================================================
+ */
+
+static ssize_t tool_fn_read(struct tool_ctx *tc, char __user *ubuf,
+			    size_t size, loff_t *offp,
+			    u64 (*fn_read)(struct ntb_dev *))
 {
 	size_t buf_size;
-	char *buf;
-	ssize_t pos, rc;
+	char buf[TOOL_BUF_LEN];
+	ssize_t pos;
 
-	if (!db_read_fn)
+	if (!fn_read)
 		return -EINVAL;
 
-	buf_size = min_t(size_t, size, 0x20);
-
-	buf = kmalloc(buf_size, GFP_KERNEL);
-	if (!buf)
-		return -ENOMEM;
-
-	pos = scnprintf(buf, buf_size, "%#llx\n",
-			db_read_fn(tc->ntb));
+	buf_size = min(size, sizeof(buf));
 
-	rc = simple_read_from_buffer(ubuf, size, offp, buf, pos);
+	pos = scnprintf(buf, buf_size, "%#llx\n", fn_read(tc->ntb));
 
-	kfree(buf);
-
-	return rc;
+	return simple_read_from_buffer(ubuf, size, offp, buf, pos);
 }
 
-static ssize_t tool_dbfn_write(struct tool_ctx *tc,
-			       const char __user *ubuf,
-			       size_t size, loff_t *offp,
-			       int (*db_set_fn)(struct ntb_dev *, u64),
-			       int (*db_clear_fn)(struct ntb_dev *, u64))
+static ssize_t tool_fn_write(struct tool_ctx *tc,
+			     const char __user *ubuf,
+			     size_t size, loff_t *offp,
+			     int (*fn_set)(struct ntb_dev *, u64),
+			     int (*fn_clear)(struct ntb_dev *, u64))
 {
-	u64 db_bits;
 	char *buf, cmd;
-	ssize_t rc;
+	ssize_t ret;
+	u64 bits;
 	int n;
 
 	buf = kmalloc(size + 1, GFP_KERNEL);
 	if (!buf)
 		return -ENOMEM;
 
-	rc = simple_write_to_buffer(buf, size, offp, ubuf, size);
-	if (rc < 0) {
+	ret = simple_write_to_buffer(buf, size, offp, ubuf, size);
+	if (ret < 0) {
 		kfree(buf);
-		return rc;
+		return ret;
 	}
 
 	buf[size] = 0;
 
-	n = sscanf(buf, "%c %lli", &cmd, &db_bits);
+	n = sscanf(buf, "%c %lli", &cmd, &bits);
 
 	kfree(buf);
 
 	if (n != 2) {
-		rc = -EINVAL;
+		ret = -EINVAL;
 	} else if (cmd == 's') {
-		if (!db_set_fn)
-			rc = -EINVAL;
+		if (!fn_set)
+			ret = -EINVAL;
 		else
-			rc = db_set_fn(tc->ntb, db_bits);
+			ret = fn_set(tc->ntb, bits);
 	} else if (cmd == 'c') {
-		if (!db_clear_fn)
-			rc = -EINVAL;
+		if (!fn_clear)
+			ret = -EINVAL;
 		else
-			rc = db_clear_fn(tc->ntb, db_bits);
+			ret = fn_clear(tc->ntb, bits);
 	} else {
-		rc = -EINVAL;
+		ret = -EINVAL;
 	}
 
-	return rc ? : size;
+	return ret ? : size;
 }
 
-static ssize_t tool_spadfn_read(struct tool_ctx *tc, char __user *ubuf,
-				size_t size, loff_t *offp,
-				u32 (*spad_read_fn)(struct ntb_dev *, int))
-{
-	size_t buf_size;
-	char *buf;
-	ssize_t pos, rc;
-	int i, spad_count;
-
-	if (!spad_read_fn)
-		return -EINVAL;
-
-	spad_count = ntb_spad_count(tc->ntb);
+/*==============================================================================
+ *                            Port read/write methods
+ *==============================================================================
+ */
 
-	/*
-	 * We multiply the number of spads by 15 to get the buffer size
-	 * this is from 3 for the %d, 10 for the largest hex value
-	 * (0x00000000) and 2 for the tab and line feed.
-	 */
-	buf_size = min_t(size_t, size, spad_count * 15);
+static ssize_t tool_port_read(struct file *filep, char __user *ubuf,
+			      size_t size, loff_t *offp)
+{
+	struct tool_ctx *tc = filep->private_data;
+	char buf[TOOL_BUF_LEN];
+	int pos;
 
-	buf = kmalloc(buf_size, GFP_KERNEL);
-	if (!buf)
-		return -ENOMEM;
+	pos = scnprintf(buf, sizeof(buf), "%d\n", ntb_port_number(tc->ntb));
 
-	pos = 0;
+	return simple_read_from_buffer(ubuf, size, offp, buf, pos);
+}
 
-	for (i = 0; i < spad_count; ++i) {
-		pos += scnprintf(buf + pos, buf_size - pos, "%d\t%#x\n",
-				 i, spad_read_fn(tc->ntb, i));
-	}
+static TOOL_FOPS_RDWR(tool_port_fops,
+		      tool_port_read,
+		      NULL);
 
-	rc = simple_read_from_buffer(ubuf, size, offp, buf, pos);
+static ssize_t tool_peer_port_read(struct file *filep, char __user *ubuf,
+				   size_t size, loff_t *offp)
+{
+	struct tool_peer *peer = filep->private_data;
+	struct tool_ctx *tc = peer->tc;
+	char buf[TOOL_BUF_LEN];
+	int pos;
 
-	kfree(buf);
+	pos = scnprintf(buf, sizeof(buf), "%d\n",
+		ntb_peer_port_number(tc->ntb, peer->pidx));
 
-	return rc;
+	return simple_read_from_buffer(ubuf, size, offp, buf, pos);
 }
 
-static ssize_t tool_spadfn_write(struct tool_ctx *tc,
-				 const char __user *ubuf,
-				 size_t size, loff_t *offp,
-				 int (*spad_write_fn)(struct ntb_dev *,
-						      int, u32))
+static TOOL_FOPS_RDWR(tool_peer_port_fops,
+		      tool_peer_port_read,
+		      NULL);
+
+static int tool_init_peers(struct tool_ctx *tc)
 {
-	int spad_idx;
-	u32 spad_val;
-	char *buf, *buf_ptr;
-	int pos, n;
-	ssize_t rc;
-
-	if (!spad_write_fn) {
-		dev_dbg(&tc->ntb->dev, "no spad write fn\n");
-		return -EINVAL;
-	}
+	int pidx;
 
-	buf = kmalloc(size + 1, GFP_KERNEL);
-	if (!buf)
+	tc->peer_cnt = ntb_peer_port_count(tc->ntb);
+	tc->peers = devm_kcalloc(&tc->ntb->dev, tc->peer_cnt,
+				 sizeof(*tc->peers), GFP_KERNEL);
+	if (tc->peers == NULL)
 		return -ENOMEM;
 
-	rc = simple_write_to_buffer(buf, size, offp, ubuf, size);
-	if (rc < 0) {
-		kfree(buf);
-		return rc;
-	}
-
-	buf[size] = 0;
-	buf_ptr = buf;
-	n = sscanf(buf_ptr, "%d %i%n", &spad_idx, &spad_val, &pos);
-	while (n == 2) {
-		buf_ptr += pos;
-		rc = spad_write_fn(tc->ntb, spad_idx, spad_val);
-		if (rc)
-			break;
-
-		n = sscanf(buf_ptr, "%d %i%n", &spad_idx, &spad_val, &pos);
+	for (pidx = 0; pidx < tc->peer_cnt; pidx++) {
+		tc->peers[pidx].pidx = pidx;
+		tc->peers[pidx].tc = tc;
 	}
 
-	if (n < 0)
-		rc = n;
-
-	kfree(buf);
-
-	return rc ? : size;
+	return 0;
 }
 
-static ssize_t tool_db_read(struct file *filep, char __user *ubuf,
-			    size_t size, loff_t *offp)
-{
-	struct tool_ctx *tc = filep->private_data;
-
-	return tool_dbfn_read(tc, ubuf, size, offp,
-			      tc->ntb->ops->db_read);
-}
+/*==============================================================================
+ *                       Link state read/write methods
+ *==============================================================================
+ */
 
-static ssize_t tool_db_write(struct file *filep, const char __user *ubuf,
-			     size_t size, loff_t *offp)
+static ssize_t tool_link_write(struct file *filep, const char __user *ubuf,
+			       size_t size, loff_t *offp)
 {
 	struct tool_ctx *tc = filep->private_data;
+	bool val;
+	int ret;
 
-	return tool_dbfn_write(tc, ubuf, size, offp,
-			       tc->ntb->ops->db_set,
-			       tc->ntb->ops->db_clear);
-}
+	ret = kstrtobool_from_user(ubuf, size, &val);
+	if (ret)
+		return ret;
 
-static TOOL_FOPS_RDWR(tool_db_fops,
-		      tool_db_read,
-		      tool_db_write);
+	if (val)
+		ret = ntb_link_enable(tc->ntb, NTB_SPEED_AUTO, NTB_WIDTH_AUTO);
+	else
+		ret = ntb_link_disable(tc->ntb);
 
-static ssize_t tool_mask_read(struct file *filep, char __user *ubuf,
-			      size_t size, loff_t *offp)
-{
-	struct tool_ctx *tc = filep->private_data;
+	if (ret)
+		return ret;
 
-	return tool_dbfn_read(tc, ubuf, size, offp,
-			      tc->ntb->ops->db_read_mask);
+	return size;
 }
 
-static ssize_t tool_mask_write(struct file *filep, const char __user *ubuf,
-			       size_t size, loff_t *offp)
+static TOOL_FOPS_RDWR(tool_link_fops,
+		      NULL,
+		      tool_link_write);
+
+static ssize_t tool_peer_link_read(struct file *filep, char __user *ubuf,
+				   size_t size, loff_t *offp)
 {
-	struct tool_ctx *tc = filep->private_data;
+	struct tool_peer *peer = filep->private_data;
+	struct tool_ctx *tc = peer->tc;
+	char buf[3];
 
-	return tool_dbfn_write(tc, ubuf, size, offp,
-			       tc->ntb->ops->db_set_mask,
-			       tc->ntb->ops->db_clear_mask);
+	if (ntb_link_is_up(tc->ntb, NULL, NULL) & BIT(peer->pidx))
+		buf[0] = 'Y';
+	else
+		buf[0] = 'N';
+	buf[1] = '\n';
+	buf[2] = '\0';
+
+	return simple_read_from_buffer(ubuf, size, offp, buf, 3);
 }
 
-static TOOL_FOPS_RDWR(tool_mask_fops,
-		      tool_mask_read,
-		      tool_mask_write);
+static TOOL_FOPS_RDWR(tool_peer_link_fops,
+		      tool_peer_link_read,
+		      NULL);
 
-static ssize_t tool_peer_db_read(struct file *filep, char __user *ubuf,
-				 size_t size, loff_t *offp)
+static ssize_t tool_peer_link_event_write(struct file *filep,
+					  const char __user *ubuf,
+					  size_t size, loff_t *offp)
 {
-	struct tool_ctx *tc = filep->private_data;
+	struct tool_peer *peer = filep->private_data;
+	struct tool_ctx *tc = peer->tc;
+	u64 link_msk;
+	bool val;
+	int ret;
 
-	return tool_dbfn_read(tc, ubuf, size, offp,
-			      tc->ntb->ops->peer_db_read);
-}
+	ret = kstrtobool_from_user(ubuf, size, &val);
+	if (ret)
+		return ret;
 
-static ssize_t tool_peer_db_write(struct file *filep, const char __user *ubuf,
-				  size_t size, loff_t *offp)
-{
-	struct tool_ctx *tc = filep->private_data;
+	link_msk = BIT_ULL_MASK(peer->pidx);
+
+	if (wait_event_interruptible(tc->link_wq,
+		!!(ntb_link_is_up(tc->ntb, NULL, NULL) & link_msk) == val))
+		return -ERESTART;
 
-	return tool_dbfn_write(tc, ubuf, size, offp,
-			       tc->ntb->ops->peer_db_set,
-			       tc->ntb->ops->peer_db_clear);
+	return size;
 }
 
-static TOOL_FOPS_RDWR(tool_peer_db_fops,
-		      tool_peer_db_read,
-		      tool_peer_db_write);
+static TOOL_FOPS_RDWR(tool_peer_link_event_fops,
+		      NULL,
+		      tool_peer_link_event_write);
 
-static ssize_t tool_peer_mask_read(struct file *filep, char __user *ubuf,
-				   size_t size, loff_t *offp)
+/*==============================================================================
+ *                  Memory windows read/write/setting methods
+ *==============================================================================
+ */
+
+static ssize_t tool_mw_read(struct file *filep, char __user *ubuf,
+			    size_t size, loff_t *offp)
 {
-	struct tool_ctx *tc = filep->private_data;
+	struct tool_mw *inmw = filep->private_data;
+
+	if (inmw->mm_base == NULL)
+		return -ENXIO;
 
-	return tool_dbfn_read(tc, ubuf, size, offp,
-			      tc->ntb->ops->peer_db_read_mask);
+	return simple_read_from_buffer(ubuf, size, offp,
+				       inmw->mm_base, inmw->size);
 }
 
-static ssize_t tool_peer_mask_write(struct file *filep, const char __user *ubuf,
-				    size_t size, loff_t *offp)
+static ssize_t tool_mw_write(struct file *filep, const char __user *ubuf,
+			     size_t size, loff_t *offp)
 {
-	struct tool_ctx *tc = filep->private_data;
+	struct tool_mw *inmw = filep->private_data;
+
+	if (inmw->mm_base == NULL)
+		return -ENXIO;
 
-	return tool_dbfn_write(tc, ubuf, size, offp,
-			       tc->ntb->ops->peer_db_set_mask,
-			       tc->ntb->ops->peer_db_clear_mask);
+	return simple_write_to_buffer(inmw->mm_base, inmw->size, offp,
+				      ubuf, size);
 }
 
-static TOOL_FOPS_RDWR(tool_peer_mask_fops,
-		      tool_peer_mask_read,
-		      tool_peer_mask_write);
+static TOOL_FOPS_RDWR(tool_mw_fops,
+		      tool_mw_read,
+		      tool_mw_write);
 
-static ssize_t tool_spad_read(struct file *filep, char __user *ubuf,
-			      size_t size, loff_t *offp)
+static int tool_setup_mw(struct tool_ctx *tc, int pidx, int widx,
+			 size_t req_size)
 {
-	struct tool_ctx *tc = filep->private_data;
+	resource_size_t size, addr_align, size_align;
+	struct tool_mw *inmw = &tc->peers[pidx].inmws[widx];
+	char buf[TOOL_BUF_LEN];
+	int ret;
 
-	return tool_spadfn_read(tc, ubuf, size, offp,
-				tc->ntb->ops->spad_read);
-}
+	if (inmw->mm_base != NULL)
+		return 0;
 
-static ssize_t tool_spad_write(struct file *filep, const char __user *ubuf,
-			       size_t size, loff_t *offp)
-{
-	struct tool_ctx *tc = filep->private_data;
+	ret = ntb_mw_get_align(tc->ntb, pidx, widx, &addr_align,
+				&size_align, &size);
+	if (ret)
+		return ret;
+
+	inmw->size = min_t(resource_size_t, req_size, size);
+	inmw->size = round_up(inmw->size, addr_align);
+	inmw->size = round_up(inmw->size, size_align);
+	inmw->mm_base = dma_alloc_coherent(&tc->ntb->dev, inmw->size,
+					   &inmw->dma_base, GFP_KERNEL);
+	if (!inmw->mm_base)
+		return -ENOMEM;
 
-	return tool_spadfn_write(tc, ubuf, size, offp,
-				 tc->ntb->ops->spad_write);
-}
+	if (!IS_ALIGNED(inmw->dma_base, addr_align)) {
+		ret = -ENOMEM;
+		goto err_free_dma;
+	}
 
-static TOOL_FOPS_RDWR(tool_spad_fops,
-		      tool_spad_read,
-		      tool_spad_write);
+	ret = ntb_mw_set_trans(tc->ntb, pidx, widx, inmw->dma_base, inmw->size);
+	if (ret)
+		goto err_free_dma;
 
-static u32 ntb_tool_peer_spad_read(struct ntb_dev *ntb, int sidx)
-{
-	return ntb_peer_spad_read(ntb, PIDX, sidx);
-}
+	snprintf(buf, sizeof(buf), "mw%d", widx);
+	inmw->dbgfs_file = debugfs_create_file(buf, 0600,
+					       tc->peers[pidx].dbgfs_dir, inmw,
+					       &tool_mw_fops);
 
-static ssize_t tool_peer_spad_read(struct file *filep, char __user *ubuf,
-				   size_t size, loff_t *offp)
-{
-	struct tool_ctx *tc = filep->private_data;
+	return 0;
 
-	return tool_spadfn_read(tc, ubuf, size, offp, ntb_tool_peer_spad_read);
-}
+err_free_dma:
+	dma_free_coherent(&tc->ntb->dev, inmw->size, inmw->mm_base,
+			  inmw->dma_base);
+	inmw->mm_base = NULL;
+	inmw->dma_base = 0;
+	inmw->size = 0;
 
-static int ntb_tool_peer_spad_write(struct ntb_dev *ntb, int sidx, u32 val)
-{
-	return ntb_peer_spad_write(ntb, PIDX, sidx, val);
+	return ret;
 }
 
-static ssize_t tool_peer_spad_write(struct file *filep, const char __user *ubuf,
-				    size_t size, loff_t *offp)
+static void tool_free_mw(struct tool_ctx *tc, int pidx, int widx)
 {
-	struct tool_ctx *tc = filep->private_data;
-
-	return tool_spadfn_write(tc, ubuf, size, offp,
-				 ntb_tool_peer_spad_write);
-}
-
-static TOOL_FOPS_RDWR(tool_peer_spad_fops,
-		      tool_peer_spad_read,
-		      tool_peer_spad_write);
+	struct tool_mw *inmw = &tc->peers[pidx].inmws[widx];
 
-static ssize_t tool_link_read(struct file *filep, char __user *ubuf,
-			      size_t size, loff_t *offp)
-{
-	struct tool_ctx *tc = filep->private_data;
-	char buf[3];
+	debugfs_remove(inmw->dbgfs_file);
 
-	buf[0] = ntb_link_is_up(tc->ntb, NULL, NULL) ? 'Y' : 'N';
-	buf[1] = '\n';
-	buf[2] = '\0';
+	if (inmw->mm_base != NULL) {
+		ntb_mw_clear_trans(tc->ntb, pidx, widx);
+		dma_free_coherent(&tc->ntb->dev, inmw->size,
+				  inmw->mm_base, inmw->dma_base);
+	}
 
-	return simple_read_from_buffer(ubuf, size, offp, buf, 2);
+	inmw->mm_base = NULL;
+	inmw->dma_base = 0;
+	inmw->size = 0;
+	inmw->dbgfs_file = NULL;
 }
 
-static ssize_t tool_link_write(struct file *filep, const char __user *ubuf,
-			       size_t size, loff_t *offp)
+static ssize_t tool_mw_trans_read(struct file *filep, char __user *ubuf,
+				  size_t size, loff_t *offp)
 {
-	struct tool_ctx *tc = filep->private_data;
-	char buf[32];
+	struct tool_mw *inmw = filep->private_data;
+	resource_size_t addr_align;
+	resource_size_t size_align;
+	resource_size_t size_max;
+	ssize_t ret, off = 0;
 	size_t buf_size;
-	bool val;
-	int rc;
+	char *buf;
 
-	buf_size = min(size, (sizeof(buf) - 1));
-	if (copy_from_user(buf, ubuf, buf_size))
-		return -EFAULT;
+	buf_size = min_t(size_t, size, 512);
 
-	buf[buf_size] = '\0';
+	buf = kmalloc(buf_size, GFP_KERNEL);
+	if (!buf)
+		return -ENOMEM;
 
-	rc = strtobool(buf, &val);
-	if (rc)
-		return rc;
+	ret = ntb_mw_get_align(inmw->tc->ntb, inmw->pidx, inmw->widx,
+			       &addr_align, &size_align, &size_max);
+	if (ret)
+		return ret;
 
-	if (val)
-		rc = ntb_link_enable(tc->ntb, NTB_SPEED_AUTO, NTB_WIDTH_AUTO);
-	else
-		rc = ntb_link_disable(tc->ntb);
+	off += scnprintf(buf + off, buf_size - off,
+			 "Inbound MW     \t%d\n",
+			 inmw->widx);
 
-	if (rc)
-		return rc;
+	off += scnprintf(buf + off, buf_size - off,
+			 "Port           \t%d (%d)\n",
+			 ntb_peer_port_number(inmw->tc->ntb, inmw->pidx),
+			 inmw->pidx);
 
-	return size;
-}
+	off += scnprintf(buf + off, buf_size - off,
+			 "Window Address \t0x%pK\n", inmw->mm_base);
 
-static TOOL_FOPS_RDWR(tool_link_fops,
-		      tool_link_read,
-		      tool_link_write);
+	off += scnprintf(buf + off, buf_size - off,
+			 "DMA Address    \t%pad\n",
+			 &inmw->dma_base);
 
-static ssize_t tool_link_event_write(struct file *filep,
-				     const char __user *ubuf,
-				     size_t size, loff_t *offp)
-{
-	struct tool_ctx *tc = filep->private_data;
-	char buf[32];
-	size_t buf_size;
-	bool val;
-	int rc;
+	off += scnprintf(buf + off, buf_size - off,
+			 "Window Size    \t%pa[p]\n",
+			 &inmw->size);
 
-	buf_size = min(size, (sizeof(buf) - 1));
-	if (copy_from_user(buf, ubuf, buf_size))
-		return -EFAULT;
+	off += scnprintf(buf + off, buf_size - off,
+			 "Alignment      \t%pa[p]\n",
+			 &addr_align);
 
-	buf[buf_size] = '\0';
+	off += scnprintf(buf + off, buf_size - off,
+			 "Size Alignment \t%pa[p]\n",
+			 &size_align);
+
+	off += scnprintf(buf + off, buf_size - off,
+			 "Size Max       \t%pa[p]\n",
+			 &size_max);
 
-	rc = strtobool(buf, &val);
-	if (rc)
-		return rc;
+	ret = simple_read_from_buffer(ubuf, size, offp, buf, off);
+	kfree(buf);
 
-	if (wait_event_interruptible(tc->link_wq,
-		ntb_link_is_up(tc->ntb, NULL, NULL) == val))
-		return -ERESTART;
+	return ret;
+}
+
+static ssize_t tool_mw_trans_write(struct file *filep, const char __user *ubuf,
+				   size_t size, loff_t *offp)
+{
+	struct tool_mw *inmw = filep->private_data;
+	unsigned int val;
+	int ret;
+
+	ret = kstrtouint_from_user(ubuf, size, 0, &val);
+	if (ret)
+		return ret;
+
+	tool_free_mw(inmw->tc, inmw->pidx, inmw->widx);
+	if (val) {
+		ret = tool_setup_mw(inmw->tc, inmw->pidx, inmw->widx, val);
+		if (ret)
+			return ret;
+	}
 
 	return size;
 }
 
-static TOOL_FOPS_RDWR(tool_link_event_fops,
-		      NULL,
-		      tool_link_event_write);
+static TOOL_FOPS_RDWR(tool_mw_trans_fops,
+		      tool_mw_trans_read,
+		      tool_mw_trans_write);
 
-static ssize_t tool_mw_read(struct file *filep, char __user *ubuf,
-			    size_t size, loff_t *offp)
+static ssize_t tool_peer_mw_read(struct file *filep, char __user *ubuf,
+				 size_t size, loff_t *offp)
 {
-	struct tool_mw *mw = filep->private_data;
-	ssize_t rc;
+	struct tool_mw *outmw = filep->private_data;
 	loff_t pos = *offp;
+	ssize_t ret;
 	void *buf;
 
-	if (mw->local == NULL)
+	if (outmw->io_base == NULL)
 		return -EIO;
-	if (pos < 0)
-		return -EINVAL;
-	if (pos >= mw->win_size || !size)
+
+	if (pos >= outmw->size || !size)
 		return 0;
-	if (size > mw->win_size - pos)
-		size = mw->win_size - pos;
+
+	if (size > outmw->size - pos)
+		size = outmw->size - pos;
 
 	buf = kmalloc(size, GFP_KERNEL);
 	if (!buf)
 		return -ENOMEM;
 
-	memcpy_fromio(buf, mw->local + pos, size);
-	rc = copy_to_user(ubuf, buf, size);
-	if (rc == size) {
-		rc = -EFAULT;
+	memcpy_fromio(buf, outmw->io_base + pos, size);
+	ret = copy_to_user(ubuf, buf, size);
+	if (ret == size) {
+		ret = -EFAULT;
 		goto err_free;
 	}
 
-	size -= rc;
+	size -= ret;
 	*offp = pos + size;
-	rc = size;
+	ret = size;
 
 err_free:
 	kfree(buf);
 
-	return rc;
+	return ret;
 }
 
-static ssize_t tool_mw_write(struct file *filep, const char __user *ubuf,
-			     size_t size, loff_t *offp)
+static ssize_t tool_peer_mw_write(struct file *filep, const char __user *ubuf,
+				  size_t size, loff_t *offp)
 {
-	struct tool_mw *mw = filep->private_data;
-	ssize_t rc;
+	struct tool_mw *outmw = filep->private_data;
+	ssize_t ret;
 	loff_t pos = *offp;
 	void *buf;
 
-	if (pos < 0)
-		return -EINVAL;
-	if (pos >= mw->win_size || !size)
+	if (outmw->io_base == NULL)
+		return -EIO;
+
+	if (pos >= outmw->size || !size)
 		return 0;
-	if (size > mw->win_size - pos)
-		size = mw->win_size - pos;
+	if (size > outmw->size - pos)
+		size = outmw->size - pos;
 
 	buf = kmalloc(size, GFP_KERNEL);
 	if (!buf)
 		return -ENOMEM;
 
-	rc = copy_from_user(buf, ubuf, size);
-	if (rc == size) {
-		rc = -EFAULT;
+	ret = copy_from_user(buf, ubuf, size);
+	if (ret == size) {
+		ret = -EFAULT;
 		goto err_free;
 	}
 
-	size -= rc;
+	size -= ret;
 	*offp = pos + size;
-	rc = size;
+	ret = size;
 
-	memcpy_toio(mw->local + pos, buf, size);
+	memcpy_toio(outmw->io_base + pos, buf, size);
 
 err_free:
 	kfree(buf);
 
-	return rc;
-}
-
-static TOOL_FOPS_RDWR(tool_mw_fops,
-		      tool_mw_read,
-		      tool_mw_write);
-
-static ssize_t tool_peer_mw_read(struct file *filep, char __user *ubuf,
-				 size_t size, loff_t *offp)
-{
-	struct tool_mw *mw = filep->private_data;
-
-	if (!mw->peer)
-		return -ENXIO;
-
-	return simple_read_from_buffer(ubuf, size, offp, mw->peer, mw->size);
-}
-
-static ssize_t tool_peer_mw_write(struct file *filep, const char __user *ubuf,
-				  size_t size, loff_t *offp)
-{
-	struct tool_mw *mw = filep->private_data;
-
-	if (!mw->peer)
-		return -ENXIO;
-
-	return simple_write_to_buffer(mw->peer, mw->size, offp, ubuf, size);
+	return ret;
 }
 
 static TOOL_FOPS_RDWR(tool_peer_mw_fops,
 		      tool_peer_mw_read,
 		      tool_peer_mw_write);
 
-static int tool_setup_mw(struct tool_ctx *tc, int idx, size_t req_size)
+static int tool_setup_peer_mw(struct tool_ctx *tc, int pidx, int widx,
+			      u64 req_addr, size_t req_size)
 {
-	int rc;
-	struct tool_mw *mw = &tc->mws[idx];
-	resource_size_t size, align_addr, align_size;
-	char buf[16];
+	struct tool_mw *outmw = &tc->outmws[widx];
+	resource_size_t map_size;
+	phys_addr_t map_base;
+	char buf[TOOL_BUF_LEN];
+	int ret;
 
-	if (mw->peer)
+	if (outmw->io_base != NULL)
 		return 0;
 
-	rc = ntb_mw_get_align(tc->ntb, PIDX, idx, &align_addr,
-				&align_size, &size);
-	if (rc)
-		return rc;
+	ret = ntb_peer_mw_get_addr(tc->ntb, widx, &map_base, &map_size);
+	if (ret)
+		return ret;
 
-	mw->size = min_t(resource_size_t, req_size, size);
-	mw->size = round_up(mw->size, align_addr);
-	mw->size = round_up(mw->size, align_size);
-	mw->peer = dma_alloc_coherent(&tc->ntb->pdev->dev, mw->size,
-				      &mw->peer_dma, GFP_KERNEL);
+	ret = ntb_peer_mw_set_trans(tc->ntb, pidx, widx, req_addr, req_size);
+	if (ret)
+		return ret;
 
-	if (!mw->peer || !IS_ALIGNED(mw->peer_dma, align_addr))
-		return -ENOMEM;
+	outmw->io_base = ioremap_wc(map_base, map_size);
+	if (outmw->io_base == NULL) {
+		ret = -EFAULT;
+		goto err_clear_trans;
+	}
 
-	rc = ntb_mw_set_trans(tc->ntb, PIDX, idx, mw->peer_dma, mw->size);
-	if (rc)
-		goto err_free_dma;
+	outmw->tr_base = req_addr;
+	outmw->size = req_size;
+	outmw->pidx = pidx;
 
-	snprintf(buf, sizeof(buf), "peer_mw%d", idx);
-	mw->peer_dbg_file = debugfs_create_file(buf, S_IRUSR | S_IWUSR,
-						mw->tc->dbgfs, mw,
-						&tool_peer_mw_fops);
+	snprintf(buf, sizeof(buf), "peer_mw%d", widx);
+	outmw->dbgfs_file = debugfs_create_file(buf, 0600,
+					       tc->peers[pidx].dbgfs_dir, outmw,
+					       &tool_peer_mw_fops);
 
 	return 0;
 
-err_free_dma:
-	dma_free_coherent(&tc->ntb->pdev->dev, mw->size,
-			  mw->peer,
-			  mw->peer_dma);
-	mw->peer = NULL;
-	mw->peer_dma = 0;
-	mw->size = 0;
-
-	return rc;
+err_clear_trans:
+	ntb_peer_mw_clear_trans(tc->ntb, pidx, widx);
+
+	return ret;
 }
 
-static void tool_free_mw(struct tool_ctx *tc, int idx)
+static void tool_free_peer_mw(struct tool_ctx *tc, int widx)
 {
-	struct tool_mw *mw = &tc->mws[idx];
+	struct tool_mw *outmw = &tc->outmws[widx];
 
-	if (mw->peer) {
-		ntb_mw_clear_trans(tc->ntb, PIDX, idx);
-		dma_free_coherent(&tc->ntb->pdev->dev, mw->size,
-				  mw->peer,
-				  mw->peer_dma);
-	}
+	debugfs_remove(outmw->dbgfs_file);
 
-	mw->peer = NULL;
-	mw->peer_dma = 0;
-
-	debugfs_remove(mw->peer_dbg_file);
+	if (outmw->io_base != NULL) {
+		iounmap(tc->outmws[widx].io_base);
+		ntb_peer_mw_clear_trans(tc->ntb, outmw->pidx, widx);
+	}
 
-	mw->peer_dbg_file = NULL;
+	outmw->io_base = NULL;
+	outmw->tr_base = 0;
+	outmw->size = 0;
+	outmw->pidx = -1;
+	outmw->dbgfs_file = NULL;
 }
 
-static ssize_t tool_peer_mw_trans_read(struct file *filep,
-				       char __user *ubuf,
-				       size_t size, loff_t *offp)
+static ssize_t tool_peer_mw_trans_read(struct file *filep, char __user *ubuf,
+					size_t size, loff_t *offp)
 {
-	struct tool_mw *mw = filep->private_data;
-
-	char *buf;
+	struct tool_mw_wrap *outmw_wrap = filep->private_data;
+	struct tool_mw *outmw = outmw_wrap->mw;
+	resource_size_t map_size;
+	phys_addr_t map_base;
+	ssize_t off = 0;
 	size_t buf_size;
-	ssize_t ret, off = 0;
+	char *buf;
+	int ret;
 
-	phys_addr_t base;
-	resource_size_t mw_size;
-	resource_size_t align_addr = 0;
-	resource_size_t align_size = 0;
-	resource_size_t max_size = 0;
+	ret = ntb_peer_mw_get_addr(outmw->tc->ntb, outmw->widx,
+				  &map_base, &map_size);
+	if (ret)
+		return ret;
 
 	buf_size = min_t(size_t, size, 512);
 
@@ -763,43 +888,37 @@ static ssize_t tool_peer_mw_trans_read(struct file *filep,
 	if (!buf)
 		return -ENOMEM;
 
-	ntb_mw_get_align(mw->tc->ntb, PIDX, mw->idx,
-			 &align_addr, &align_size, &max_size);
-	ntb_peer_mw_get_addr(mw->tc->ntb, mw->idx, &base, &mw_size);
-
 	off += scnprintf(buf + off, buf_size - off,
-			 "Peer MW %d Information:\n", mw->idx);
+			 "Outbound MW:        \t%d\n", outmw->widx);
 
-	off += scnprintf(buf + off, buf_size - off,
-			 "Physical Address      \t%pa[p]\n",
-			 &base);
-
-	off += scnprintf(buf + off, buf_size - off,
-			 "Window Size           \t%lld\n",
-			 (unsigned long long)mw_size);
+	if (outmw->io_base != NULL) {
+		off += scnprintf(buf + off, buf_size - off,
+			"Port attached       \t%d (%d)\n",
+			ntb_peer_port_number(outmw->tc->ntb, outmw->pidx),
+			outmw->pidx);
+	} else {
+		off += scnprintf(buf + off, buf_size - off,
+				 "Port attached       \t-1 (-1)\n");
+	}
 
 	off += scnprintf(buf + off, buf_size - off,
-			 "Alignment             \t%lld\n",
-			 (unsigned long long)align_addr);
+			 "Virtual address     \t0x%pK\n", outmw->io_base);
 
 	off += scnprintf(buf + off, buf_size - off,
-			 "Size Alignment        \t%lld\n",
-			 (unsigned long long)align_size);
+			 "Phys Address        \t%pa[p]\n", &map_base);
 
 	off += scnprintf(buf + off, buf_size - off,
-			 "Size Max              \t%lld\n",
-			 (unsigned long long)max_size);
+			 "Mapping Size        \t%pa[p]\n", &map_size);
 
 	off += scnprintf(buf + off, buf_size - off,
-			 "Ready                 \t%c\n",
-			 (mw->peer) ? 'Y' : 'N');
+			 "Translation Address \t0x%016llx\n", outmw->tr_base);
 
 	off += scnprintf(buf + off, buf_size - off,
-			 "Allocated Size       \t%zd\n",
-			 (mw->peer) ? (size_t)mw->size : 0);
+			 "Window Size         \t%pa[p]\n", &outmw->size);
 
 	ret = simple_read_from_buffer(ubuf, size, offp, buf, off);
 	kfree(buf);
+
 	return ret;
 }
 
@@ -807,12 +926,12 @@ static ssize_t tool_peer_mw_trans_write(struct file *filep,
 					const char __user *ubuf,
 					size_t size, loff_t *offp)
 {
-	struct tool_mw *mw = filep->private_data;
-
-	char buf[32];
-	size_t buf_size;
-	unsigned long long val;
-	int rc;
+	struct tool_mw_wrap *outmw_wrap = filep->private_data;
+	struct tool_mw *outmw = outmw_wrap->mw;
+	size_t buf_size, wsize;
+	char buf[TOOL_BUF_LEN];
+	int ret, n;
+	u64 addr;
 
 	buf_size = min(size, (sizeof(buf) - 1));
 	if (copy_from_user(buf, ubuf, buf_size))
@@ -820,16 +939,17 @@ static ssize_t tool_peer_mw_trans_write(struct file *filep,
 
 	buf[buf_size] = '\0';
 
-	rc = kstrtoull(buf, 0, &val);
-	if (rc)
-		return rc;
-
-	tool_free_mw(mw->tc, mw->idx);
-	if (val)
-		rc = tool_setup_mw(mw->tc, mw->idx, val);
+	n = sscanf(buf, "%lli:%zi", &addr, &wsize);
+	if (n != 2)
+		return -EINVAL;
 
-	if (rc)
-		return rc;
+	tool_free_peer_mw(outmw->tc, outmw->widx);
+	if (wsize) {
+		ret = tool_setup_peer_mw(outmw->tc, outmw_wrap->pidx,
+					 outmw->widx, addr, wsize);
+		if (ret)
+			return ret;
+	}
 
 	return size;
 }
@@ -838,195 +958,734 @@ static TOOL_FOPS_RDWR(tool_peer_mw_trans_fops,
 		      tool_peer_mw_trans_read,
 		      tool_peer_mw_trans_write);
 
-static int tool_init_mw(struct tool_ctx *tc, int idx)
+static int tool_init_mws(struct tool_ctx *tc)
 {
-	struct tool_mw *mw = &tc->mws[idx];
-	phys_addr_t base;
-	int rc;
-
-	rc = ntb_peer_mw_get_addr(tc->ntb, idx, &base, &mw->win_size);
-	if (rc)
-		return rc;
-
-	mw->tc = tc;
-	mw->idx = idx;
-	mw->local = ioremap_wc(base, mw->win_size);
-	if (!mw->local)
-		return -EFAULT;
+	int widx, pidx;
+
+	/* Initialize outbound memory windows */
+	tc->outmw_cnt = ntb_peer_mw_count(tc->ntb);
+	tc->outmws = devm_kcalloc(&tc->ntb->dev, tc->outmw_cnt,
+				  sizeof(*tc->outmws), GFP_KERNEL);
+	if (tc->outmws == NULL)
+		return -ENOMEM;
+
+	for (widx = 0; widx < tc->outmw_cnt; widx++) {
+		tc->outmws[widx].widx = widx;
+		tc->outmws[widx].pidx = -1;
+		tc->outmws[widx].tc = tc;
+	}
+
+	/* Initialize inbound memory windows and outbound MWs wrapper */
+	for (pidx = 0; pidx < tc->peer_cnt; pidx++) {
+		tc->peers[pidx].inmw_cnt = ntb_mw_count(tc->ntb, pidx);
+		tc->peers[pidx].inmws =
+			devm_kcalloc(&tc->ntb->dev, tc->peers[pidx].inmw_cnt,
+				    sizeof(*tc->peers[pidx].inmws), GFP_KERNEL);
+		if (tc->peers[pidx].inmws == NULL)
+			return -ENOMEM;
+
+		for (widx = 0; widx < tc->peers[pidx].inmw_cnt; widx++) {
+			tc->peers[pidx].inmws[widx].widx = widx;
+			tc->peers[pidx].inmws[widx].pidx = pidx;
+			tc->peers[pidx].inmws[widx].tc = tc;
+		}
+
+		tc->peers[pidx].outmw_cnt = ntb_peer_mw_count(tc->ntb);
+		tc->peers[pidx].outmws =
+			devm_kcalloc(&tc->ntb->dev, tc->peers[pidx].outmw_cnt,
+				   sizeof(*tc->peers[pidx].outmws), GFP_KERNEL);
+
+		for (widx = 0; widx < tc->peers[pidx].outmw_cnt; widx++) {
+			tc->peers[pidx].outmws[widx].pidx = pidx;
+			tc->peers[pidx].outmws[widx].mw = &tc->outmws[widx];
+		}
+	}
 
 	return 0;
 }
 
-static void tool_free_mws(struct tool_ctx *tc)
+static void tool_clear_mws(struct tool_ctx *tc)
 {
-	int i;
+	int widx, pidx;
 
-	for (i = 0; i < tc->mw_count; i++) {
-		tool_free_mw(tc, i);
+	/* Free outbound memory windows */
+	for (widx = 0; widx < tc->outmw_cnt; widx++)
+		tool_free_peer_mw(tc, widx);
 
-		if (tc->mws[i].local)
-			iounmap(tc->mws[i].local);
+	/* Free outbound memory windows */
+	for (pidx = 0; pidx < tc->peer_cnt; pidx++)
+		for (widx = 0; widx < tc->peers[pidx].inmw_cnt; widx++)
+			tool_free_mw(tc, pidx, widx);
+}
 
-		tc->mws[i].local = NULL;
-	}
+/*==============================================================================
+ *                       Doorbell read/write methods
+ *==============================================================================
+ */
+
+static ssize_t tool_db_read(struct file *filep, char __user *ubuf,
+			    size_t size, loff_t *offp)
+{
+	struct tool_ctx *tc = filep->private_data;
+
+	return tool_fn_read(tc, ubuf, size, offp, tc->ntb->ops->db_read);
 }
 
-static void tool_setup_dbgfs(struct tool_ctx *tc)
+static ssize_t tool_db_write(struct file *filep, const char __user *ubuf,
+			     size_t size, loff_t *offp)
 {
-	int i;
+	struct tool_ctx *tc = filep->private_data;
 
-	/* This modules is useless without dbgfs... */
-	if (!tool_dbgfs) {
-		tc->dbgfs = NULL;
-		return;
+	return tool_fn_write(tc, ubuf, size, offp, tc->ntb->ops->db_set,
+			     tc->ntb->ops->db_clear);
+}
+
+static TOOL_FOPS_RDWR(tool_db_fops,
+		      tool_db_read,
+		      tool_db_write);
+
+static ssize_t tool_db_valid_mask_read(struct file *filep, char __user *ubuf,
+				       size_t size, loff_t *offp)
+{
+	struct tool_ctx *tc = filep->private_data;
+
+	return tool_fn_read(tc, ubuf, size, offp, tc->ntb->ops->db_valid_mask);
+}
+
+static TOOL_FOPS_RDWR(tool_db_valid_mask_fops,
+		      tool_db_valid_mask_read,
+		      NULL);
+
+static ssize_t tool_db_mask_read(struct file *filep, char __user *ubuf,
+				 size_t size, loff_t *offp)
+{
+	struct tool_ctx *tc = filep->private_data;
+
+	return tool_fn_read(tc, ubuf, size, offp, tc->ntb->ops->db_read_mask);
+}
+
+static ssize_t tool_db_mask_write(struct file *filep, const char __user *ubuf,
+			       size_t size, loff_t *offp)
+{
+	struct tool_ctx *tc = filep->private_data;
+
+	return tool_fn_write(tc, ubuf, size, offp, tc->ntb->ops->db_set_mask,
+			     tc->ntb->ops->db_clear_mask);
+}
+
+static TOOL_FOPS_RDWR(tool_db_mask_fops,
+		      tool_db_mask_read,
+		      tool_db_mask_write);
+
+static ssize_t tool_peer_db_read(struct file *filep, char __user *ubuf,
+				 size_t size, loff_t *offp)
+{
+	struct tool_ctx *tc = filep->private_data;
+
+	return tool_fn_read(tc, ubuf, size, offp, tc->ntb->ops->peer_db_read);
+}
+
+static ssize_t tool_peer_db_write(struct file *filep, const char __user *ubuf,
+				  size_t size, loff_t *offp)
+{
+	struct tool_ctx *tc = filep->private_data;
+
+	return tool_fn_write(tc, ubuf, size, offp, tc->ntb->ops->peer_db_set,
+			     tc->ntb->ops->peer_db_clear);
+}
+
+static TOOL_FOPS_RDWR(tool_peer_db_fops,
+		      tool_peer_db_read,
+		      tool_peer_db_write);
+
+static ssize_t tool_peer_db_mask_read(struct file *filep, char __user *ubuf,
+				   size_t size, loff_t *offp)
+{
+	struct tool_ctx *tc = filep->private_data;
+
+	return tool_fn_read(tc, ubuf, size, offp,
+			    tc->ntb->ops->peer_db_read_mask);
+}
+
+static ssize_t tool_peer_db_mask_write(struct file *filep,
+				       const char __user *ubuf,
+				       size_t size, loff_t *offp)
+{
+	struct tool_ctx *tc = filep->private_data;
+
+	return tool_fn_write(tc, ubuf, size, offp,
+			     tc->ntb->ops->peer_db_set_mask,
+			     tc->ntb->ops->peer_db_clear_mask);
+}
+
+static TOOL_FOPS_RDWR(tool_peer_db_mask_fops,
+		      tool_peer_db_mask_read,
+		      tool_peer_db_mask_write);
+
+static ssize_t tool_db_event_write(struct file *filep,
+				   const char __user *ubuf,
+				   size_t size, loff_t *offp)
+{
+	struct tool_ctx *tc = filep->private_data;
+	u64 val;
+	int ret;
+
+	ret = kstrtou64_from_user(ubuf, size, 0, &val);
+	if (ret)
+		return ret;
+
+	if (wait_event_interruptible(tc->db_wq, ntb_db_read(tc->ntb) == val))
+		return -ERESTART;
+
+	return size;
+}
+
+static TOOL_FOPS_RDWR(tool_db_event_fops,
+		      NULL,
+		      tool_db_event_write);
+
+/*==============================================================================
+ *                       Scratchpads read/write methods
+ *==============================================================================
+ */
+
+static ssize_t tool_spad_read(struct file *filep, char __user *ubuf,
+			      size_t size, loff_t *offp)
+{
+	struct tool_spad *spad = filep->private_data;
+	char buf[TOOL_BUF_LEN];
+	ssize_t pos;
+
+	if (!spad->tc->ntb->ops->spad_read)
+		return -EINVAL;
+
+	pos = scnprintf(buf, sizeof(buf), "%#x\n",
+		ntb_spad_read(spad->tc->ntb, spad->sidx));
+
+	return simple_read_from_buffer(ubuf, size, offp, buf, pos);
+}
+
+static ssize_t tool_spad_write(struct file *filep, const char __user *ubuf,
+			       size_t size, loff_t *offp)
+{
+	struct tool_spad *spad = filep->private_data;
+	u32 val;
+	int ret;
+
+	if (!spad->tc->ntb->ops->spad_write) {
+		dev_dbg(&spad->tc->ntb->dev, "no spad write fn\n");
+		return -EINVAL;
 	}
 
-	tc->dbgfs = debugfs_create_dir(dev_name(&tc->ntb->dev),
-				       tool_dbgfs);
-	if (!tc->dbgfs)
-		return;
+	ret = kstrtou32_from_user(ubuf, size, 0, &val);
+	if (ret)
+		return ret;
 
-	debugfs_create_file("db", S_IRUSR | S_IWUSR, tc->dbgfs,
-			    tc, &tool_db_fops);
+	ret = ntb_spad_write(spad->tc->ntb, spad->sidx, val);
 
-	debugfs_create_file("mask", S_IRUSR | S_IWUSR, tc->dbgfs,
-			    tc, &tool_mask_fops);
+	return ret ?: size;
+}
 
-	debugfs_create_file("peer_db", S_IRUSR | S_IWUSR, tc->dbgfs,
-			    tc, &tool_peer_db_fops);
+static TOOL_FOPS_RDWR(tool_spad_fops,
+		      tool_spad_read,
+		      tool_spad_write);
+
+static ssize_t tool_peer_spad_read(struct file *filep, char __user *ubuf,
+				   size_t size, loff_t *offp)
+{
+	struct tool_spad *spad = filep->private_data;
+	char buf[TOOL_BUF_LEN];
+	ssize_t pos;
 
-	debugfs_create_file("peer_mask", S_IRUSR | S_IWUSR, tc->dbgfs,
-			    tc, &tool_peer_mask_fops);
+	if (!spad->tc->ntb->ops->peer_spad_read)
+		return -EINVAL;
 
-	debugfs_create_file("spad", S_IRUSR | S_IWUSR, tc->dbgfs,
-			    tc, &tool_spad_fops);
+	pos = scnprintf(buf, sizeof(buf), "%#x\n",
+		ntb_peer_spad_read(spad->tc->ntb, spad->pidx, spad->sidx));
 
-	debugfs_create_file("peer_spad", S_IRUSR | S_IWUSR, tc->dbgfs,
-			    tc, &tool_peer_spad_fops);
+	return simple_read_from_buffer(ubuf, size, offp, buf, pos);
+}
 
-	debugfs_create_file("link", S_IRUSR | S_IWUSR, tc->dbgfs,
-			    tc, &tool_link_fops);
+static ssize_t tool_peer_spad_write(struct file *filep, const char __user *ubuf,
+				    size_t size, loff_t *offp)
+{
+	struct tool_spad *spad = filep->private_data;
+	u32 val;
+	int ret;
+
+	if (!spad->tc->ntb->ops->peer_spad_write) {
+		dev_dbg(&spad->tc->ntb->dev, "no spad write fn\n");
+		return -EINVAL;
+	}
+
+	ret = kstrtou32_from_user(ubuf, size, 0, &val);
+	if (ret)
+		return ret;
 
-	debugfs_create_file("link_event", S_IWUSR, tc->dbgfs,
-			    tc, &tool_link_event_fops);
+	ret = ntb_peer_spad_write(spad->tc->ntb, spad->pidx, spad->sidx, val);
 
-	for (i = 0; i < tc->mw_count; i++) {
-		char buf[30];
+	return ret ?: size;
+}
+
+static TOOL_FOPS_RDWR(tool_peer_spad_fops,
+		      tool_peer_spad_read,
+		      tool_peer_spad_write);
 
-		snprintf(buf, sizeof(buf), "mw%d", i);
-		debugfs_create_file(buf, S_IRUSR | S_IWUSR, tc->dbgfs,
-				    &tc->mws[i], &tool_mw_fops);
+static int tool_init_spads(struct tool_ctx *tc)
+{
+	int sidx, pidx;
 
-		snprintf(buf, sizeof(buf), "peer_trans%d", i);
-		debugfs_create_file(buf, S_IRUSR | S_IWUSR, tc->dbgfs,
-				    &tc->mws[i], &tool_peer_mw_trans_fops);
+	/* Initialize inbound scratchpad structures */
+	tc->inspad_cnt = ntb_spad_count(tc->ntb);
+	tc->inspads = devm_kcalloc(&tc->ntb->dev, tc->inspad_cnt,
+				   sizeof(*tc->inspads), GFP_KERNEL);
+	if (tc->inspads == NULL)
+		return -ENOMEM;
+
+	for (sidx = 0; sidx < tc->inspad_cnt; sidx++) {
+		tc->inspads[sidx].sidx = sidx;
+		tc->inspads[sidx].pidx = -1;
+		tc->inspads[sidx].tc = tc;
 	}
+
+	/* Initialize outbound scratchpad structures */
+	for (pidx = 0; pidx < tc->peer_cnt; pidx++) {
+		tc->peers[pidx].outspad_cnt = ntb_spad_count(tc->ntb);
+		tc->peers[pidx].outspads =
+			devm_kcalloc(&tc->ntb->dev, tc->peers[pidx].outspad_cnt,
+				sizeof(*tc->peers[pidx].outspads), GFP_KERNEL);
+		if (tc->peers[pidx].outspads == NULL)
+			return -ENOMEM;
+
+		for (sidx = 0; sidx < tc->peers[pidx].outspad_cnt; sidx++) {
+			tc->peers[pidx].outspads[sidx].sidx = sidx;
+			tc->peers[pidx].outspads[sidx].pidx = pidx;
+			tc->peers[pidx].outspads[sidx].tc = tc;
+		}
+	}
+
+	return 0;
 }
 
-static int tool_probe(struct ntb_client *self, struct ntb_dev *ntb)
+/*==============================================================================
+ *                       Messages read/write methods
+ *==============================================================================
+ */
+
+static ssize_t tool_inmsg_read(struct file *filep, char __user *ubuf,
+			       size_t size, loff_t *offp)
 {
-	struct tool_ctx *tc;
-	int rc;
-	int i;
+	struct tool_msg *msg = filep->private_data;
+	char buf[TOOL_BUF_LEN];
+	ssize_t pos;
+	u32 data;
+	int pidx;
+
+	data = ntb_msg_read(msg->tc->ntb, &pidx, msg->midx);
+
+	pos = scnprintf(buf, sizeof(buf), "0x%08x<-%d\n", data, pidx);
+
+	return simple_read_from_buffer(ubuf, size, offp, buf, pos);
+}
+
+static TOOL_FOPS_RDWR(tool_inmsg_fops,
+		      tool_inmsg_read,
+		      NULL);
+
+static ssize_t tool_outmsg_write(struct file *filep,
+				 const char __user *ubuf,
+				 size_t size, loff_t *offp)
+{
+	struct tool_msg *msg = filep->private_data;
+	u32 val;
+	int ret;
+
+	ret = kstrtou32_from_user(ubuf, size, 0, &val);
+	if (ret)
+		return ret;
+
+	ret = ntb_peer_msg_write(msg->tc->ntb, msg->pidx, msg->midx, val);
+
+	return ret ? : size;
+}
+
+static TOOL_FOPS_RDWR(tool_outmsg_fops,
+		      NULL,
+		      tool_outmsg_write);
+
+static ssize_t tool_msg_sts_read(struct file *filep, char __user *ubuf,
+				 size_t size, loff_t *offp)
+{
+	struct tool_ctx *tc = filep->private_data;
+
+	return tool_fn_read(tc, ubuf, size, offp, tc->ntb->ops->msg_read_sts);
+}
+
+static ssize_t tool_msg_sts_write(struct file *filep, const char __user *ubuf,
+				  size_t size, loff_t *offp)
+{
+	struct tool_ctx *tc = filep->private_data;
+
+	return tool_fn_write(tc, ubuf, size, offp, NULL,
+			     tc->ntb->ops->msg_clear_sts);
+}
+
+static TOOL_FOPS_RDWR(tool_msg_sts_fops,
+		      tool_msg_sts_read,
+		      tool_msg_sts_write);
+
+static ssize_t tool_msg_inbits_read(struct file *filep, char __user *ubuf,
+				    size_t size, loff_t *offp)
+{
+	struct tool_ctx *tc = filep->private_data;
+
+	return tool_fn_read(tc, ubuf, size, offp, tc->ntb->ops->msg_inbits);
+}
+
+static TOOL_FOPS_RDWR(tool_msg_inbits_fops,
+		      tool_msg_inbits_read,
+		      NULL);
+
+static ssize_t tool_msg_outbits_read(struct file *filep, char __user *ubuf,
+				     size_t size, loff_t *offp)
+{
+	struct tool_ctx *tc = filep->private_data;
+
+	return tool_fn_read(tc, ubuf, size, offp, tc->ntb->ops->msg_outbits);
+}
+
+static TOOL_FOPS_RDWR(tool_msg_outbits_fops,
+		      tool_msg_outbits_read,
+		      NULL);
+
+static ssize_t tool_msg_mask_write(struct file *filep, const char __user *ubuf,
+				   size_t size, loff_t *offp)
+{
+	struct tool_ctx *tc = filep->private_data;
+
+	return tool_fn_write(tc, ubuf, size, offp,
+			     tc->ntb->ops->msg_set_mask,
+			     tc->ntb->ops->msg_clear_mask);
+}
+
+static TOOL_FOPS_RDWR(tool_msg_mask_fops,
+		      NULL,
+		      tool_msg_mask_write);
+
+static ssize_t tool_msg_event_write(struct file *filep,
+				    const char __user *ubuf,
+				    size_t size, loff_t *offp)
+{
+	struct tool_ctx *tc = filep->private_data;
+	u64 val;
+	int ret;
+
+	ret = kstrtou64_from_user(ubuf, size, 0, &val);
+	if (ret)
+		return ret;
+
+	if (wait_event_interruptible(tc->msg_wq,
+		ntb_msg_read_sts(tc->ntb) == val))
+		return -ERESTART;
 
-	if (!ntb->ops->mw_set_trans) {
-		dev_dbg(&ntb->dev, "need inbound MW based NTB API\n");
-		rc = -EINVAL;
-		goto err_tc;
+	return size;
+}
+
+static TOOL_FOPS_RDWR(tool_msg_event_fops,
+		      NULL,
+		      tool_msg_event_write);
+
+static int tool_init_msgs(struct tool_ctx *tc)
+{
+	int midx, pidx;
+
+	/* Initialize inbound message structures */
+	tc->inmsg_cnt = ntb_msg_count(tc->ntb);
+	tc->inmsgs = devm_kcalloc(&tc->ntb->dev, tc->inmsg_cnt,
+				   sizeof(*tc->inmsgs), GFP_KERNEL);
+	if (tc->inmsgs == NULL)
+		return -ENOMEM;
+
+	for (midx = 0; midx < tc->inmsg_cnt; midx++) {
+		tc->inmsgs[midx].midx = midx;
+		tc->inmsgs[midx].pidx = -1;
+		tc->inmsgs[midx].tc = tc;
 	}
 
-	if (ntb_spad_count(ntb) < 1) {
-		dev_dbg(&ntb->dev, "no enough scratchpads\n");
-		rc = -EINVAL;
-		goto err_tc;
+	/* Initialize outbound message structures */
+	for (pidx = 0; pidx < tc->peer_cnt; pidx++) {
+		tc->peers[pidx].outmsg_cnt = ntb_msg_count(tc->ntb);
+		tc->peers[pidx].outmsgs =
+			devm_kcalloc(&tc->ntb->dev, tc->peers[pidx].outmsg_cnt,
+				sizeof(*tc->peers[pidx].outmsgs), GFP_KERNEL);
+		if (tc->peers[pidx].outmsgs == NULL)
+			return -ENOMEM;
+
+		for (midx = 0; midx < tc->peers[pidx].outmsg_cnt; midx++) {
+			tc->peers[pidx].outmsgs[midx].midx = midx;
+			tc->peers[pidx].outmsgs[midx].pidx = pidx;
+			tc->peers[pidx].outmsgs[midx].tc = tc;
+		}
 	}
 
+	return 0;
+}
+
+/*==============================================================================
+ *                          Initialization methods
+ *==============================================================================
+ */
+
+static struct tool_ctx *tool_create_data(struct ntb_dev *ntb)
+{
+	struct tool_ctx *tc;
+
+	tc = devm_kzalloc(&ntb->dev, sizeof(*tc), GFP_KERNEL);
+	if (tc == NULL)
+		return ERR_PTR(-ENOMEM);
+
+	tc->ntb = ntb;
+	init_waitqueue_head(&tc->link_wq);
+	init_waitqueue_head(&tc->db_wq);
+	init_waitqueue_head(&tc->msg_wq);
+
 	if (ntb_db_is_unsafe(ntb))
 		dev_dbg(&ntb->dev, "doorbell is unsafe\n");
 
 	if (ntb_spad_is_unsafe(ntb))
 		dev_dbg(&ntb->dev, "scratchpad is unsafe\n");
 
-	if (ntb_peer_port_count(ntb) != NTB_DEF_PEER_CNT)
-		dev_warn(&ntb->dev, "multi-port NTB is unsupported\n");
+	return tc;
+}
+
+static void tool_clear_data(struct tool_ctx *tc)
+{
+	wake_up(&tc->link_wq);
+	wake_up(&tc->db_wq);
+	wake_up(&tc->msg_wq);
+}
+
+static int tool_init_ntb(struct tool_ctx *tc)
+{
+	return ntb_set_ctx(tc->ntb, tc, &tool_ops);
+}
+
+static void tool_clear_ntb(struct tool_ctx *tc)
+{
+	ntb_clear_ctx(tc->ntb);
+	ntb_link_disable(tc->ntb);
+}
 
-	tc = kzalloc(sizeof(*tc), GFP_KERNEL);
-	if (!tc) {
-		rc = -ENOMEM;
-		goto err_tc;
+static void tool_setup_dbgfs(struct tool_ctx *tc)
+{
+	int pidx, widx, sidx, midx;
+	char buf[TOOL_BUF_LEN];
+
+	/* This modules is useless without dbgfs... */
+	if (!tool_dbgfs_topdir) {
+		tc->dbgfs_dir = NULL;
+		return;
 	}
 
-	tc->ntb = ntb;
-	init_waitqueue_head(&tc->link_wq);
+	tc->dbgfs_dir = debugfs_create_dir(dev_name(&tc->ntb->dev),
+					   tool_dbgfs_topdir);
+	if (!tc->dbgfs_dir)
+		return;
+
+	debugfs_create_file("port", 0600, tc->dbgfs_dir,
+			    tc, &tool_port_fops);
+
+	debugfs_create_file("link", 0600, tc->dbgfs_dir,
+			    tc, &tool_link_fops);
+
+	debugfs_create_file("db", 0600, tc->dbgfs_dir,
+			    tc, &tool_db_fops);
+
+	debugfs_create_file("db_valid_mask", 0600, tc->dbgfs_dir,
+			    tc, &tool_db_valid_mask_fops);
+
+	debugfs_create_file("db_mask", 0600, tc->dbgfs_dir,
+			    tc, &tool_db_mask_fops);
+
+	debugfs_create_file("db_event", 0600, tc->dbgfs_dir,
+			    tc, &tool_db_event_fops);
 
-	tc->mw_count = min(ntb_peer_mw_count(tc->ntb), MAX_MWS);
-	for (i = 0; i < tc->mw_count; i++) {
-		rc = tool_init_mw(tc, i);
-		if (rc)
-			goto err_ctx;
+	debugfs_create_file("peer_db", 0600, tc->dbgfs_dir,
+			    tc, &tool_peer_db_fops);
+
+	debugfs_create_file("peer_db_mask", 0600, tc->dbgfs_dir,
+			    tc, &tool_peer_db_mask_fops);
+
+	if (tc->inspad_cnt != 0) {
+		for (sidx = 0; sidx < tc->inspad_cnt; sidx++) {
+			snprintf(buf, sizeof(buf), "spad%d", sidx);
+
+			debugfs_create_file(buf, 0600, tc->dbgfs_dir,
+					   &tc->inspads[sidx], &tool_spad_fops);
+		}
 	}
 
-	tool_setup_dbgfs(tc);
+	if (tc->inmsg_cnt != 0) {
+		for (midx = 0; midx < tc->inmsg_cnt; midx++) {
+			snprintf(buf, sizeof(buf), "msg%d", midx);
+			debugfs_create_file(buf, 0600, tc->dbgfs_dir,
+					   &tc->inmsgs[midx], &tool_inmsg_fops);
+		}
+
+		debugfs_create_file("msg_sts", 0600, tc->dbgfs_dir,
+				    tc, &tool_msg_sts_fops);
+
+		debugfs_create_file("msg_inbits", 0600, tc->dbgfs_dir,
+				    tc, &tool_msg_inbits_fops);
+
+		debugfs_create_file("msg_outbits", 0600, tc->dbgfs_dir,
+				    tc, &tool_msg_outbits_fops);
+
+		debugfs_create_file("msg_mask", 0600, tc->dbgfs_dir,
+				    tc, &tool_msg_mask_fops);
+
+		debugfs_create_file("msg_event", 0600, tc->dbgfs_dir,
+				    tc, &tool_msg_event_fops);
+	}
+
+	for (pidx = 0; pidx < tc->peer_cnt; pidx++) {
+		snprintf(buf, sizeof(buf), "peer%d", pidx);
+		tc->peers[pidx].dbgfs_dir =
+			debugfs_create_dir(buf, tc->dbgfs_dir);
+
+		debugfs_create_file("port", 0600,
+				    tc->peers[pidx].dbgfs_dir,
+				    &tc->peers[pidx], &tool_peer_port_fops);
+
+		debugfs_create_file("link", 0200,
+				    tc->peers[pidx].dbgfs_dir,
+				    &tc->peers[pidx], &tool_peer_link_fops);
+
+		debugfs_create_file("link_event", 0200,
+				  tc->peers[pidx].dbgfs_dir,
+				  &tc->peers[pidx], &tool_peer_link_event_fops);
+
+		for (widx = 0; widx < tc->peers[pidx].inmw_cnt; widx++) {
+			snprintf(buf, sizeof(buf), "mw_trans%d", widx);
+			debugfs_create_file(buf, 0600,
+					    tc->peers[pidx].dbgfs_dir,
+					    &tc->peers[pidx].inmws[widx],
+					    &tool_mw_trans_fops);
+		}
+
+		for (widx = 0; widx < tc->peers[pidx].outmw_cnt; widx++) {
+			snprintf(buf, sizeof(buf), "peer_mw_trans%d", widx);
+			debugfs_create_file(buf, 0600,
+					    tc->peers[pidx].dbgfs_dir,
+					    &tc->peers[pidx].outmws[widx],
+					    &tool_peer_mw_trans_fops);
+		}
+
+		for (sidx = 0; sidx < tc->peers[pidx].outspad_cnt; sidx++) {
+			snprintf(buf, sizeof(buf), "spad%d", sidx);
+
+			debugfs_create_file(buf, 0600,
+					    tc->peers[pidx].dbgfs_dir,
+					    &tc->peers[pidx].outspads[sidx],
+					    &tool_peer_spad_fops);
+		}
+
+		for (midx = 0; midx < tc->peers[pidx].outmsg_cnt; midx++) {
+			snprintf(buf, sizeof(buf), "msg%d", midx);
+			debugfs_create_file(buf, 0600,
+					    tc->peers[pidx].dbgfs_dir,
+					    &tc->peers[pidx].outmsgs[midx],
+					    &tool_outmsg_fops);
+		}
+	}
+}
+
+static void tool_clear_dbgfs(struct tool_ctx *tc)
+{
+	debugfs_remove_recursive(tc->dbgfs_dir);
+}
+
+static int tool_probe(struct ntb_client *self, struct ntb_dev *ntb)
+{
+	struct tool_ctx *tc;
+	int ret;
 
-	rc = ntb_set_ctx(ntb, tc, &tool_ops);
-	if (rc)
-		goto err_ctx;
+	tc = tool_create_data(ntb);
+	if (IS_ERR(tc))
+		return PTR_ERR(tc);
 
-	ntb_link_enable(ntb, NTB_SPEED_AUTO, NTB_WIDTH_AUTO);
-	ntb_link_event(ntb);
+	ret = tool_init_peers(tc);
+	if (ret != 0)
+		goto err_clear_data;
+
+	ret = tool_init_mws(tc);
+	if (ret != 0)
+		goto err_clear_data;
+
+	ret = tool_init_spads(tc);
+	if (ret != 0)
+		goto err_clear_mws;
+
+	ret = tool_init_msgs(tc);
+	if (ret != 0)
+		goto err_clear_mws;
+
+	ret = tool_init_ntb(tc);
+	if (ret != 0)
+		goto err_clear_mws;
+
+	tool_setup_dbgfs(tc);
 
 	return 0;
 
-err_ctx:
-	tool_free_mws(tc);
-	debugfs_remove_recursive(tc->dbgfs);
-	kfree(tc);
-err_tc:
-	return rc;
+err_clear_mws:
+	tool_clear_mws(tc);
+
+err_clear_data:
+	tool_clear_data(tc);
+
+	return ret;
 }
 
 static void tool_remove(struct ntb_client *self, struct ntb_dev *ntb)
 {
 	struct tool_ctx *tc = ntb->ctx;
 
-	tool_free_mws(tc);
+	tool_clear_dbgfs(tc);
+
+	tool_clear_ntb(tc);
 
-	ntb_clear_ctx(ntb);
-	ntb_link_disable(ntb);
+	tool_clear_mws(tc);
 
-	debugfs_remove_recursive(tc->dbgfs);
-	kfree(tc);
+	tool_clear_data(tc);
 }
 
 static struct ntb_client tool_client = {
 	.ops = {
 		.probe = tool_probe,
 		.remove = tool_remove,
-	},
+	}
 };
 
 static int __init tool_init(void)
 {
-	int rc;
+	int ret;
 
 	if (debugfs_initialized())
-		tool_dbgfs = debugfs_create_dir(KBUILD_MODNAME, NULL);
-
-	rc = ntb_register_client(&tool_client);
-	if (rc)
-		goto err_client;
+		tool_dbgfs_topdir = debugfs_create_dir(KBUILD_MODNAME, NULL);
 
-	return 0;
+	ret = ntb_register_client(&tool_client);
+	if (ret)
+		debugfs_remove_recursive(tool_dbgfs_topdir);
 
-err_client:
-	debugfs_remove_recursive(tool_dbgfs);
-	return rc;
+	return ret;
 }
 module_init(tool_init);
 
 static void __exit tool_exit(void)
 {
 	ntb_unregister_client(&tool_client);
-	debugfs_remove_recursive(tool_dbgfs);
+	debugfs_remove_recursive(tool_dbgfs_topdir);
 }
 module_exit(tool_exit);
+
-- 
2.12.0

[PATCH v3 06/15] NTB: ntb_perf: Add full multi-port NTB API support

[Serge Semin]

Former NTB Performance driver could only work with NTB devices, which
got Scratchpads available and had just two ports. Since there are
devices, which don't have Scratchpads and got more than two peer
ports, the performance measuring tool needs to be rewritten. This
patch adds the ability to test any available NTB peer.
Additionally it allows to set NTB memory windows up using any
available data exchange interface: Scratchpad or Message registers.
Some cleanups are also added here.

Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
---

Changelog v1:
- Alter interface in compliance with multi-port API
- Create Scratchpads and Message compliant NTB link init process
- Limit DebugFS access methods to prevent the driver failure

Changelog v2:
- Remove driver Author/Description/License macros
- Replace magic numbers with macros
- Fix global index calc error for devices with highest port index
- Fix invalid scratchpad selection in send_msg algorithm
- Fix bytes order translation in message recv method
- Use local global index to select an inbound MW
- Add commands send/recv/exec debug prints
- Call ntb_mw_get_align when link is supposed to be up

Changelog v3:
- Remove contacts info from the driver header
- Add perf_cmd_recv return value comment
- Replace DebugFS buf size with macro

 drivers/ntb/test/ntb_perf.c | 1825 +++++++++++++++++++++++++++++--------------
 1 file changed, 1221 insertions(+), 604 deletions(-)

diff --git a/drivers/ntb/test/ntb_perf.c b/drivers/ntb/test/ntb_perf.c
index 427112cf101a..9081a326721e 100644
--- a/drivers/ntb/test/ntb_perf.c
+++ b/drivers/ntb/test/ntb_perf.c
@@ -5,6 +5,7 @@
  *   GPL LICENSE SUMMARY
  *
  *   Copyright(c) 2015 Intel Corporation. All rights reserved.
+ *   Copyright(c) 2017 T-Platforms. All Rights Reserved.
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of version 2 of the GNU General Public License as
@@ -13,6 +14,7 @@
  *   BSD LICENSE
  *
  *   Copyright(c) 2015 Intel Corporation. All rights reserved.
+ *   Copyright(c) 2017 T-Platforms. All Rights Reserved.
  *
  *   Redistribution and use in source and binary forms, with or without
  *   modification, are permitted provided that the following conditions
@@ -40,860 +42,1475 @@
  *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *   PCIe NTB Perf Linux driver
+ * PCIe NTB Perf Linux driver
+ */
+
+/*
+ * How to use this tool, by example.
+ *
+ * Assuming $DBG_DIR is something like:
+ * '/sys/kernel/debug/ntb_perf/0000:00:03.0'
+ * Suppose aside from local device there is at least one remote device
+ * connected to NTB with index 0.
+ *-----------------------------------------------------------------------------
+ * Eg: install driver with specified chunk/total orders and dma-enabled flag
+ *
+ * root@self# insmod ntb_perf.ko chunk_order=19 total_order=28 use_dma
+ *-----------------------------------------------------------------------------
+ * Eg: check NTB ports (index) and MW mapping information
+ *
+ * root@self# cat $DBG_DIR/info
+ *-----------------------------------------------------------------------------
+ * Eg: start performance test with peer (index 0) and get the test metrics
+ *
+ * root@self# echo 0 > $DBG_DIR/run
+ * root@self# cat $DBG_DIR/run
  */
 
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/kthread.h>
-#include <linux/time.h>
-#include <linux/timer.h>
+#include <linux/sched.h>
+#include <linux/wait.h>
 #include <linux/dma-mapping.h>
+#include <linux/dmaengine.h>
 #include <linux/pci.h>
+#include <linux/ktime.h>
 #include <linux/slab.h>
-#include <linux/spinlock.h>
-#include <linux/debugfs.h>
-#include <linux/dmaengine.h>
 #include <linux/delay.h>
 #include <linux/sizes.h>
+#include <linux/workqueue.h>
+#include <linux/debugfs.h>
+#include <linux/random.h>
 #include <linux/ntb.h>
-#include <linux/mutex.h>
 
 #define DRIVER_NAME		"ntb_perf"
-#define DRIVER_DESCRIPTION	"PCIe NTB Performance Measurement Tool"
-
-#define DRIVER_LICENSE		"Dual BSD/GPL"
-#define DRIVER_VERSION		"1.0"
-#define DRIVER_AUTHOR		"Dave Jiang <dave.jiang@intel.com>"
-
-#define PERF_LINK_DOWN_TIMEOUT	10
-#define PERF_VERSION		0xffff0001
-#define MAX_THREADS		32
-#define MAX_TEST_SIZE		SZ_1M
-#define MAX_SRCS		32
-#define DMA_OUT_RESOURCE_TO	msecs_to_jiffies(50)
-#define DMA_RETRIES		20
-#define SZ_4G			(1ULL << 32)
-#define MAX_SEG_ORDER		20 /* no larger than 1M for kmalloc buffer */
-#define PIDX			NTB_DEF_PEER_IDX
-
-MODULE_LICENSE(DRIVER_LICENSE);
+#define DRIVER_VERSION		"2.0"
+
+MODULE_LICENSE("Dual BSD/GPL");
 MODULE_VERSION(DRIVER_VERSION);
-MODULE_AUTHOR(DRIVER_AUTHOR);
-MODULE_DESCRIPTION(DRIVER_DESCRIPTION);
+MODULE_AUTHOR("Dave Jiang <dave.jiang@intel.com>");
+MODULE_DESCRIPTION("PCIe NTB Performance Measurement Tool");
+
+#define MAX_THREADS_CNT		32
+#define DEF_THREADS_CNT		1
+#define MAX_CHUNK_SIZE		SZ_1M
+#define MAX_CHUNK_ORDER		20 /* no larger than 1M */
 
-static struct dentry *perf_debugfs_dir;
+#define DMA_TRIES		100
+#define DMA_MDELAY		10
+
+#define MSG_TRIES		500
+#define MSG_UDELAY_LOW		1000
+#define MSG_UDELAY_HIGH		2000
+
+#define PERF_BUF_LEN 1024
 
 static unsigned long max_mw_size;
 module_param(max_mw_size, ulong, 0644);
-MODULE_PARM_DESC(max_mw_size, "Limit size of large memory windows");
+MODULE_PARM_DESC(max_mw_size, "Upper limit of memory window size");
 
-static unsigned int seg_order = 19; /* 512K */
-module_param(seg_order, uint, 0644);
-MODULE_PARM_DESC(seg_order, "size order [2^n] of buffer segment for testing");
+static unsigned char chunk_order = 19; /* 512K */
+module_param(chunk_order, byte, 0644);
+MODULE_PARM_DESC(chunk_order, "Data chunk order [2^n] to transfer");
 
-static unsigned int run_order = 32; /* 4G */
-module_param(run_order, uint, 0644);
-MODULE_PARM_DESC(run_order, "size order [2^n] of total data to transfer");
+static unsigned char total_order = 30; /* 1G */
+module_param(total_order, byte, 0644);
+MODULE_PARM_DESC(total_order, "Total data order [2^n] to transfer");
 
 static bool use_dma; /* default to 0 */
 module_param(use_dma, bool, 0644);
-MODULE_PARM_DESC(use_dma, "Using DMA engine to measure performance");
-
-static bool on_node = true; /* default to 1 */
-module_param(on_node, bool, 0644);
-MODULE_PARM_DESC(on_node, "Run threads only on NTB device node (default: true)");
-
-struct perf_mw {
-	phys_addr_t	phys_addr;
-	resource_size_t	phys_size;
-	void __iomem	*vbase;
-	size_t		xlat_size;
-	size_t		buf_size;
-	void		*virt_addr;
-	dma_addr_t	dma_addr;
+MODULE_PARM_DESC(use_dma, "Use DMA engine to measure performance");
+
+/*==============================================================================
+ *                         Perf driver data definition
+ *==============================================================================
+ */
+
+enum perf_cmd {
+	PERF_CMD_INVAL = -1,/* invalid spad command */
+	PERF_CMD_SSIZE = 0, /* send out buffer size */
+	PERF_CMD_RSIZE = 1, /* recv in  buffer size */
+	PERF_CMD_SXLAT = 2, /* send in  buffer xlat */
+	PERF_CMD_RXLAT = 3, /* recv out buffer xlat */
+	PERF_CMD_CLEAR = 4, /* clear allocated memory */
+	PERF_STS_DONE  = 5, /* init is done */
+	PERF_STS_LNKUP = 6, /* link up state flag */
 };
 
 struct perf_ctx;
 
-struct pthr_ctx {
-	struct task_struct	*thread;
-	struct perf_ctx		*perf;
-	atomic_t		dma_sync;
-	struct dma_chan		*dma_chan;
-	int			dma_prep_err;
-	int			src_idx;
-	void			*srcs[MAX_SRCS];
-	wait_queue_head_t       *wq;
-	int			status;
-	u64			copied;
-	u64			diff_us;
+struct perf_peer {
+	struct perf_ctx	*perf;
+	int pidx;
+	int gidx;
+
+	/* Outbound MW params */
+	u64 outbuf_xlat;
+	resource_size_t outbuf_size;
+	void __iomem *outbuf;
+
+	/* Inbound MW params */
+	dma_addr_t inbuf_xlat;
+	resource_size_t inbuf_size;
+	void		*inbuf;
+
+	/* NTB connection setup service */
+	struct work_struct	service;
+	unsigned long		sts;
 };
+#define to_peer_service(__work) \
+	container_of(__work, struct perf_peer, service)
 
-struct perf_ctx {
-	struct ntb_dev		*ntb;
-	spinlock_t		db_lock;
-	struct perf_mw		mw;
-	bool			link_is_up;
-	struct delayed_work	link_work;
-	wait_queue_head_t	link_wq;
-	u8			perf_threads;
-	/* mutex ensures only one set of threads run at once */
-	struct mutex		run_mutex;
-	struct pthr_ctx		pthr_ctx[MAX_THREADS];
-	atomic_t		tsync;
-	atomic_t                tdone;
+struct perf_thread {
+	struct perf_ctx *perf;
+	int tidx;
+
+	/* DMA-based test sync parameters */
+	atomic_t dma_sync;
+	wait_queue_head_t dma_wait;
+	struct dma_chan *dma_chan;
+
+	/* Data source and measured statistics */
+	void *src;
+	u64 copied;
+	ktime_t duration;
+	int status;
+	struct work_struct work;
 };
+#define to_thread_work(__work) \
+	container_of(__work, struct perf_thread, work)
 
-enum {
-	VERSION = 0,
-	MW_SZ_HIGH,
-	MW_SZ_LOW,
-	MAX_SPAD
+struct perf_ctx {
+	struct ntb_dev *ntb;
+
+	/* Global device index and peers descriptors */
+	int gidx;
+	int pcnt;
+	struct perf_peer *peers;
+
+	/* Performance measuring work-threads interface */
+	unsigned long busy_flag;
+	wait_queue_head_t twait;
+	atomic_t tsync;
+	u8 tcnt;
+	struct perf_peer *test_peer;
+	struct perf_thread threads[MAX_THREADS_CNT];
+
+	/* Scratchpad/Message IO operations */
+	int (*cmd_send)(struct perf_peer *peer, enum perf_cmd cmd, u64 data);
+	int (*cmd_recv)(struct perf_ctx *perf, int *pidx, enum perf_cmd *cmd,
+			u64 *data);
+
+	struct dentry *dbgfs_dir;
 };
 
+/*
+ * Scratchpads-base commands interface
+ */
+#define PERF_SPAD_CNT(_pcnt) \
+	(3*((_pcnt) + 1))
+#define PERF_SPAD_CMD(_gidx) \
+	(3*(_gidx))
+#define PERF_SPAD_LDATA(_gidx) \
+	(3*(_gidx) + 1)
+#define PERF_SPAD_HDATA(_gidx) \
+	(3*(_gidx) + 2)
+#define PERF_SPAD_NOTIFY(_gidx) \
+	(BIT_ULL(_gidx))
+
+/*
+ * Messages-base commands interface
+ */
+#define PERF_MSG_CNT		3
+#define PERF_MSG_CMD		0
+#define PERF_MSG_LDATA		1
+#define PERF_MSG_HDATA		2
+
+/*==============================================================================
+ *                           Static data declarations
+ *==============================================================================
+ */
+
+static struct dentry *perf_dbgfs_topdir;
+
+static struct workqueue_struct *perf_wq __read_mostly;
+
+/*==============================================================================
+ *                  NTB cross-link commands execution service
+ *==============================================================================
+ */
+
+static void perf_terminate_test(struct perf_ctx *perf);
+
+static inline bool perf_link_is_up(struct perf_peer *peer)
+{
+	u64 link;
+
+	link = ntb_link_is_up(peer->perf->ntb, NULL, NULL);
+	return !!(link & BIT_ULL_MASK(peer->pidx));
+}
+
+static int perf_spad_cmd_send(struct perf_peer *peer, enum perf_cmd cmd,
+			      u64 data)
+{
+	struct perf_ctx *perf = peer->perf;
+	int try;
+	u32 sts;
+
+	dev_dbg(&perf->ntb->dev, "CMD send: %d 0x%llx\n", cmd, data);
+
+	/*
+	 * Perform predefined number of attempts before give up.
+	 * We are sending the data to the port specific scratchpad, so
+	 * to prevent a multi-port access race-condition. Additionally
+	 * there is no need in local locking since only thread-safe
+	 * service work is using this method.
+	 */
+	for (try = 0; try < MSG_TRIES; try++) {
+		if (!perf_link_is_up(peer))
+			return -ENOLINK;
+
+		sts = ntb_peer_spad_read(perf->ntb, peer->pidx,
+					 PERF_SPAD_CMD(perf->gidx));
+		if (le32_to_cpu(sts) != PERF_CMD_INVAL) {
+			usleep_range(MSG_UDELAY_LOW, MSG_UDELAY_HIGH);
+			continue;
+		}
+
+		ntb_peer_spad_write(perf->ntb, peer->pidx,
+				    PERF_SPAD_LDATA(perf->gidx),
+				    cpu_to_le32(lower_32_bits(data)));
+		ntb_peer_spad_write(perf->ntb, peer->pidx,
+				    PERF_SPAD_HDATA(perf->gidx),
+				    cpu_to_le32(upper_32_bits(data)));
+		mmiowb();
+		ntb_peer_spad_write(perf->ntb, peer->pidx,
+				    PERF_SPAD_CMD(perf->gidx),
+				    cpu_to_le32(cmd));
+		mmiowb();
+		ntb_peer_db_set(perf->ntb, PERF_SPAD_NOTIFY(peer->gidx));
+
+		dev_dbg(&perf->ntb->dev, "DB ring peer %#llx\n",
+			PERF_SPAD_NOTIFY(peer->gidx));
+
+		break;
+	}
+
+	return try < MSG_TRIES ? 0 : -EAGAIN;
+}
+
+static int perf_spad_cmd_recv(struct perf_ctx *perf, int *pidx,
+			      enum perf_cmd *cmd, u64 *data)
+{
+	struct perf_peer *peer;
+	u32 val;
+
+	ntb_db_clear(perf->ntb, PERF_SPAD_NOTIFY(perf->gidx));
+
+	/*
+	 * We start scanning all over, since cleared DB may have been set
+	 * by any peer. Yes, it makes peer with smaller index being
+	 * serviced with greater priority, but it's convenient for spad
+	 * and message code unification and simplicity.
+	 */
+	for (*pidx = 0; *pidx < perf->pcnt; (*pidx)++) {
+		peer = &perf->peers[*pidx];
+
+		if (!perf_link_is_up(peer))
+			continue;
+
+		val = ntb_spad_read(perf->ntb, PERF_SPAD_CMD(peer->gidx));
+		val = le32_to_cpu(val);
+		if (val == PERF_CMD_INVAL)
+			continue;
+
+		*cmd = val;
+
+		val = ntb_spad_read(perf->ntb, PERF_SPAD_LDATA(peer->gidx));
+		*data = le32_to_cpu(val);
+
+		val = ntb_spad_read(perf->ntb, PERF_SPAD_HDATA(peer->gidx));
+		*data |= (u64)le32_to_cpu(val) << 32;
+
+		/* Next command can be retrieved from now */
+		ntb_spad_write(perf->ntb, PERF_SPAD_CMD(peer->gidx),
+			       cpu_to_le32(PERF_CMD_INVAL));
+
+		dev_dbg(&perf->ntb->dev, "CMD recv: %d 0x%llx\n", *cmd, *data);
+
+		return 0;
+	}
+
+	return -ENODATA;
+}
+
+static int perf_msg_cmd_send(struct perf_peer *peer, enum perf_cmd cmd,
+			     u64 data)
+{
+	struct perf_ctx *perf = peer->perf;
+	int try, ret;
+	u64 outbits;
+
+	dev_dbg(&perf->ntb->dev, "CMD send: %d 0x%llx\n", cmd, data);
+
+	/*
+	 * Perform predefined number of attempts before give up. Message
+	 * registers are free of race-condition problem when accessed
+	 * from different ports, so we don't need splitting registers
+	 * by global device index. We also won't have local locking,
+	 * since the method is used from service work only.
+	 */
+	outbits = ntb_msg_outbits(perf->ntb);
+	for (try = 0; try < MSG_TRIES; try++) {
+		if (!perf_link_is_up(peer))
+			return -ENOLINK;
+
+		ret = ntb_msg_clear_sts(perf->ntb, outbits);
+		if (ret)
+			return ret;
+
+		ntb_peer_msg_write(perf->ntb, peer->pidx, PERF_MSG_LDATA,
+			      cpu_to_le32(lower_32_bits(data)));
+
+		if (ntb_msg_read_sts(perf->ntb) & outbits) {
+			usleep_range(MSG_UDELAY_LOW, MSG_UDELAY_HIGH);
+			continue;
+		}
+
+		ntb_peer_msg_write(perf->ntb, peer->pidx, PERF_MSG_HDATA,
+			      cpu_to_le32(upper_32_bits(data)));
+		mmiowb();
+
+		/* This call shall trigger peer message event */
+		ntb_peer_msg_write(perf->ntb, peer->pidx, PERF_MSG_CMD,
+			      cpu_to_le32(cmd));
+
+		break;
+	}
+
+	return try < MSG_TRIES ? 0 : -EAGAIN;
+}
+
+static int perf_msg_cmd_recv(struct perf_ctx *perf, int *pidx,
+			     enum perf_cmd *cmd, u64 *data)
+{
+	u64 inbits;
+	u32 val;
+
+	inbits = ntb_msg_inbits(perf->ntb);
+
+	if (hweight64(ntb_msg_read_sts(perf->ntb) & inbits) < 3)
+		return -ENODATA;
+
+	val = ntb_msg_read(perf->ntb, pidx, PERF_MSG_CMD);
+	*cmd = le32_to_cpu(val);
+
+	val = ntb_msg_read(perf->ntb, pidx, PERF_MSG_LDATA);
+	*data = le32_to_cpu(val);
+
+	val = ntb_msg_read(perf->ntb, pidx, PERF_MSG_HDATA);
+	*data |= (u64)le32_to_cpu(val) << 32;
+
+	/* Next command can be retrieved from now */
+	ntb_msg_clear_sts(perf->ntb, inbits);
+
+	dev_dbg(&perf->ntb->dev, "CMD recv: %d 0x%llx\n", *cmd, *data);
+
+	return 0;
+}
+
+static int perf_cmd_send(struct perf_peer *peer, enum perf_cmd cmd, u64 data)
+{
+	struct perf_ctx *perf = peer->perf;
+
+	if (cmd == PERF_CMD_SSIZE || cmd == PERF_CMD_SXLAT)
+		return perf->cmd_send(peer, cmd, data);
+
+	dev_err(&perf->ntb->dev, "Send invalid command\n");
+	return -EINVAL;
+}
+
+static int perf_cmd_exec(struct perf_peer *peer, enum perf_cmd cmd)
+{
+	switch (cmd) {
+	case PERF_CMD_SSIZE:
+	case PERF_CMD_RSIZE:
+	case PERF_CMD_SXLAT:
+	case PERF_CMD_RXLAT:
+	case PERF_CMD_CLEAR:
+		break;
+	default:
+		dev_err(&peer->perf->ntb->dev, "Exec invalid command\n");
+		return -EINVAL;
+	}
+
+	/* No need of memory barrier, since bit ops have invernal lock */
+	set_bit(cmd, &peer->sts);
+
+	dev_dbg(&peer->perf->ntb->dev, "CMD exec: %d\n", cmd);
+
+	(void)queue_work(system_highpri_wq, &peer->service);
+
+	return 0;
+}
+
+static int perf_cmd_recv(struct perf_ctx *perf)
+{
+	struct perf_peer *peer;
+	int ret, pidx, cmd;
+	u64 data;
+
+	while (!(ret = perf->cmd_recv(perf, &pidx, &cmd, &data))) {
+		peer = &perf->peers[pidx];
+
+		switch (cmd) {
+		case PERF_CMD_SSIZE:
+			peer->inbuf_size = data;
+			return perf_cmd_exec(peer, PERF_CMD_RSIZE);
+		case PERF_CMD_SXLAT:
+			peer->outbuf_xlat = data;
+			return perf_cmd_exec(peer, PERF_CMD_RXLAT);
+		default:
+			dev_err(&perf->ntb->dev, "Recv invalid command\n");
+			return -EINVAL;
+		}
+	}
+
+	/* Return 0 if no data left to process, otherwise an error */
+	return ret == -ENODATA ? 0 : ret;
+}
+
 static void perf_link_event(void *ctx)
 {
 	struct perf_ctx *perf = ctx;
+	struct perf_peer *peer;
+	bool lnk_up;
+	int pidx;
 
-	if (ntb_link_is_up(perf->ntb, NULL, NULL) == 1) {
-		schedule_delayed_work(&perf->link_work, 2*HZ);
-	} else {
-		dev_dbg(&perf->ntb->pdev->dev, "link down\n");
+	for (pidx = 0; pidx < perf->pcnt; pidx++) {
+		peer = &perf->peers[pidx];
 
-		if (!perf->link_is_up)
-			cancel_delayed_work_sync(&perf->link_work);
+		lnk_up = perf_link_is_up(peer);
 
-		perf->link_is_up = false;
+		if (lnk_up &&
+		    !test_and_set_bit(PERF_STS_LNKUP, &peer->sts)) {
+			perf_cmd_exec(peer, PERF_CMD_SSIZE);
+		} else if (!lnk_up &&
+			   test_and_clear_bit(PERF_STS_LNKUP, &peer->sts)) {
+			perf_cmd_exec(peer, PERF_CMD_CLEAR);
+		}
 	}
 }
 
 static void perf_db_event(void *ctx, int vec)
 {
 	struct perf_ctx *perf = ctx;
-	u64 db_bits, db_mask;
 
-	db_mask = ntb_db_vector_mask(perf->ntb, vec);
-	db_bits = ntb_db_read(perf->ntb);
+	dev_dbg(&perf->ntb->dev, "DB vec %d mask %#llx bits %#llx\n", vec,
+		ntb_db_vector_mask(perf->ntb, vec), ntb_db_read(perf->ntb));
+
+	/* Just receive all available commands */
+	(void)perf_cmd_recv(perf);
+}
+
+static void perf_msg_event(void *ctx)
+{
+	struct perf_ctx *perf = ctx;
+
+	dev_dbg(&perf->ntb->dev, "Msg status bits %#llx\n",
+		ntb_msg_read_sts(perf->ntb));
 
-	dev_dbg(&perf->ntb->dev, "doorbell vec %d mask %#llx bits %#llx\n",
-		vec, db_mask, db_bits);
+	/* Messages are only sent one-by-one */
+	(void)perf_cmd_recv(perf);
 }
 
 static const struct ntb_ctx_ops perf_ops = {
 	.link_event = perf_link_event,
 	.db_event = perf_db_event,
+	.msg_event = perf_msg_event
 };
 
-static void perf_copy_callback(void *data)
+static void perf_free_outbuf(struct perf_peer *peer)
+{
+	(void)ntb_peer_mw_clear_trans(peer->perf->ntb, peer->pidx, peer->gidx);
+}
+
+static int perf_setup_outbuf(struct perf_peer *peer)
 {
-	struct pthr_ctx *pctx = data;
+	struct perf_ctx *perf = peer->perf;
+	int ret;
+
+	/* Outbuf size can be unaligned due to custom max_mw_size */
+	ret = ntb_peer_mw_set_trans(perf->ntb, peer->pidx, peer->gidx,
+				    peer->outbuf_xlat, peer->outbuf_size);
+	if (ret) {
+		dev_err(&perf->ntb->dev, "Failed to set outbuf translation\n");
+		return ret;
+	}
 
-	atomic_dec(&pctx->dma_sync);
+	/* Initialization is finally done */
+	set_bit(PERF_STS_DONE, &peer->sts);
+
+	return 0;
 }
 
-static ssize_t perf_copy(struct pthr_ctx *pctx, char __iomem *dst,
-			 char *src, size_t size)
+static void perf_free_inbuf(struct perf_peer *peer)
 {
-	struct perf_ctx *perf = pctx->perf;
-	struct dma_async_tx_descriptor *txd;
-	struct dma_chan *chan = pctx->dma_chan;
-	struct dma_device *device;
-	struct dmaengine_unmap_data *unmap;
-	dma_cookie_t cookie;
-	size_t src_off, dst_off;
-	struct perf_mw *mw = &perf->mw;
-	void __iomem *vbase;
-	void __iomem *dst_vaddr;
-	dma_addr_t dst_phys;
-	int retries = 0;
+	if (!peer->inbuf)
+		return;
 
-	if (!use_dma) {
-		memcpy_toio(dst, src, size);
-		return size;
+	(void)ntb_mw_clear_trans(peer->perf->ntb, peer->pidx, peer->gidx);
+	dma_free_coherent(&peer->perf->ntb->dev, peer->inbuf_size,
+			  peer->inbuf, peer->inbuf_xlat);
+	peer->inbuf = NULL;
+}
+
+static int perf_setup_inbuf(struct perf_peer *peer)
+{
+	resource_size_t xlat_align, size_align, size_max;
+	struct perf_ctx *perf = peer->perf;
+	int ret;
+
+	/* Get inbound MW parameters */
+	ret = ntb_mw_get_align(perf->ntb, peer->pidx, perf->gidx,
+			       &xlat_align, &size_align, &size_max);
+	if (ret) {
+		dev_err(&perf->ntb->dev, "Couldn't get inbuf restrictions\n");
+		return ret;
 	}
 
-	if (!chan) {
-		dev_err(&perf->ntb->dev, "DMA engine does not exist\n");
+	if (peer->inbuf_size > size_max) {
+		dev_err(&perf->ntb->dev, "Too big inbuf size %pa > %pa\n",
+			&peer->inbuf_size, &size_max);
 		return -EINVAL;
 	}
 
-	device = chan->device;
-	src_off = (uintptr_t)src & ~PAGE_MASK;
-	dst_off = (uintptr_t __force)dst & ~PAGE_MASK;
-
-	if (!is_dma_copy_aligned(device, src_off, dst_off, size))
-		return -ENODEV;
+	peer->inbuf_size = round_up(peer->inbuf_size, size_align);
 
-	vbase = mw->vbase;
-	dst_vaddr = dst;
-	dst_phys = mw->phys_addr + (dst_vaddr - vbase);
+	perf_free_inbuf(peer);
 
-	unmap = dmaengine_get_unmap_data(device->dev, 1, GFP_NOWAIT);
-	if (!unmap)
+	peer->inbuf = dma_alloc_coherent(&perf->ntb->dev, peer->inbuf_size,
+					 &peer->inbuf_xlat, GFP_KERNEL);
+	if (!peer->inbuf) {
+		dev_err(&perf->ntb->dev, "Failed to alloc inbuf of %pa\n",
+			&peer->inbuf_size);
 		return -ENOMEM;
+	}
+	if (!IS_ALIGNED(peer->inbuf_xlat, xlat_align)) {
+		dev_err(&perf->ntb->dev, "Unaligned inbuf allocated\n");
+		goto err_free_inbuf;
+	}
 
-	unmap->len = size;
-	unmap->addr[0] = dma_map_page(device->dev, virt_to_page(src),
-				      src_off, size, DMA_TO_DEVICE);
-	if (dma_mapping_error(device->dev, unmap->addr[0]))
-		goto err_get_unmap;
+	ret = ntb_mw_set_trans(perf->ntb, peer->pidx, peer->gidx,
+			       peer->inbuf_xlat, peer->inbuf_size);
+	if (ret) {
+		dev_err(&perf->ntb->dev, "Failed to set inbuf translation\n");
+		goto err_free_inbuf;
+	}
 
-	unmap->to_cnt = 1;
+	/*
+	 * We submit inbuf xlat transmission cmd for execution here to follow
+	 * the code architecture, even though this method is called from service
+	 * work itself so the command will be executed right after it returns.
+	 */
+	(void)perf_cmd_exec(peer, PERF_CMD_SXLAT);
 
-	do {
-		txd = device->device_prep_dma_memcpy(chan, dst_phys,
-						     unmap->addr[0],
-						     size, DMA_PREP_INTERRUPT);
-		if (!txd) {
-			set_current_state(TASK_INTERRUPTIBLE);
-			schedule_timeout(DMA_OUT_RESOURCE_TO);
-		}
-	} while (!txd && (++retries < DMA_RETRIES));
+	return 0;
 
-	if (!txd) {
-		pctx->dma_prep_err++;
-		goto err_get_unmap;
-	}
+err_free_inbuf:
+	perf_free_inbuf(peer);
 
-	txd->callback = perf_copy_callback;
-	txd->callback_param = pctx;
-	dma_set_unmap(txd, unmap);
+	return ret;
+}
 
-	cookie = dmaengine_submit(txd);
-	if (dma_submit_error(cookie))
-		goto err_set_unmap;
+static void perf_service_work(struct work_struct *work)
+{
+	struct perf_peer *peer = to_peer_service(work);
 
-	dmaengine_unmap_put(unmap);
+	if (test_and_clear_bit(PERF_CMD_SSIZE, &peer->sts))
+		perf_cmd_send(peer, PERF_CMD_SSIZE, peer->outbuf_size);
 
-	atomic_inc(&pctx->dma_sync);
-	dma_async_issue_pending(chan);
+	if (test_and_clear_bit(PERF_CMD_RSIZE, &peer->sts))
+		perf_setup_inbuf(peer);
 
-	return size;
+	if (test_and_clear_bit(PERF_CMD_SXLAT, &peer->sts))
+		perf_cmd_send(peer, PERF_CMD_SXLAT, peer->inbuf_xlat);
 
-err_set_unmap:
-	dmaengine_unmap_put(unmap);
-err_get_unmap:
-	dmaengine_unmap_put(unmap);
-	return 0;
-}
+	if (test_and_clear_bit(PERF_CMD_RXLAT, &peer->sts))
+		perf_setup_outbuf(peer);
 
-static int perf_move_data(struct pthr_ctx *pctx, char __iomem *dst, char *src,
-			  u64 buf_size, u64 win_size, u64 total)
-{
-	int chunks, total_chunks, i;
-	int copied_chunks = 0;
-	u64 copied = 0, result;
-	char __iomem *tmp = dst;
-	u64 perf, diff_us;
-	ktime_t kstart, kstop, kdiff;
-	unsigned long last_sleep = jiffies;
-
-	chunks = div64_u64(win_size, buf_size);
-	total_chunks = div64_u64(total, buf_size);
-	kstart = ktime_get();
-
-	for (i = 0; i < total_chunks; i++) {
-		result = perf_copy(pctx, tmp, src, buf_size);
-		copied += result;
-		copied_chunks++;
-		if (copied_chunks == chunks) {
-			tmp = dst;
-			copied_chunks = 0;
-		} else
-			tmp += buf_size;
-
-		/* Probably should schedule every 5s to prevent soft hang. */
-		if (unlikely((jiffies - last_sleep) > 5 * HZ)) {
-			last_sleep = jiffies;
-			set_current_state(TASK_INTERRUPTIBLE);
-			schedule_timeout(1);
+	if (test_and_clear_bit(PERF_CMD_CLEAR, &peer->sts)) {
+		clear_bit(PERF_STS_DONE, &peer->sts);
+		if (test_bit(0, &peer->perf->busy_flag) &&
+		    peer == peer->perf->test_peer) {
+			dev_warn(&peer->perf->ntb->dev,
+				"Freeing while test on-fly\n");
+			perf_terminate_test(peer->perf);
 		}
+		perf_free_outbuf(peer);
+		perf_free_inbuf(peer);
+	}
+}
+
+static int perf_init_service(struct perf_ctx *perf)
+{
+	u64 mask;
 
-		if (unlikely(kthread_should_stop()))
-			break;
+	if (ntb_peer_mw_count(perf->ntb) < perf->pcnt + 1) {
+		dev_err(&perf->ntb->dev, "Not enough memory windows\n");
+		return -EINVAL;
 	}
 
-	if (use_dma) {
-		pr_debug("%s: All DMA descriptors submitted\n", current->comm);
-		while (atomic_read(&pctx->dma_sync) != 0) {
-			if (kthread_should_stop())
-				break;
-			msleep(20);
-		}
+	if (ntb_msg_count(perf->ntb) >= PERF_MSG_CNT) {
+		perf->cmd_send = perf_msg_cmd_send;
+		perf->cmd_recv = perf_msg_cmd_recv;
+
+		dev_dbg(&perf->ntb->dev, "Message service initialized\n");
+
+		return 0;
 	}
 
-	kstop = ktime_get();
-	kdiff = ktime_sub(kstop, kstart);
-	diff_us = ktime_to_us(kdiff);
+	dev_dbg(&perf->ntb->dev, "Message service unsupported\n");
 
-	pr_debug("%s: copied %llu bytes\n", current->comm, copied);
+	mask = GENMASK_ULL(perf->pcnt, 0);
+	if (ntb_spad_count(perf->ntb) >= PERF_SPAD_CNT(perf->pcnt) &&
+	    (ntb_db_valid_mask(perf->ntb) & mask) == mask) {
+		perf->cmd_send = perf_spad_cmd_send;
+		perf->cmd_recv = perf_spad_cmd_recv;
 
-	pr_debug("%s: lasted %llu usecs\n", current->comm, diff_us);
+		dev_dbg(&perf->ntb->dev, "Scratchpad service initialized\n");
 
-	perf = div64_u64(copied, diff_us);
+		return 0;
+	}
 
-	pr_debug("%s: MBytes/s: %llu\n", current->comm, perf);
+	dev_dbg(&perf->ntb->dev, "Scratchpad service unsupported\n");
 
-	pctx->copied = copied;
-	pctx->diff_us = diff_us;
+	dev_err(&perf->ntb->dev, "Command services unsupported\n");
 
-	return 0;
+	return -EINVAL;
 }
 
-static bool perf_dma_filter_fn(struct dma_chan *chan, void *node)
+static int perf_enable_service(struct perf_ctx *perf)
 {
-	/* Is the channel required to be on the same node as the device? */
-	if (!on_node)
-		return true;
+	u64 mask, incmd_bit;
+	int ret, sidx, scnt;
 
-	return dev_to_node(&chan->dev->device) == (int)(unsigned long)node;
-}
+	mask = ntb_db_valid_mask(perf->ntb);
+	(void)ntb_db_set_mask(perf->ntb, mask);
 
-static int ntb_perf_thread(void *data)
-{
-	struct pthr_ctx *pctx = data;
-	struct perf_ctx *perf = pctx->perf;
-	struct pci_dev *pdev = perf->ntb->pdev;
-	struct perf_mw *mw = &perf->mw;
-	char __iomem *dst;
-	u64 win_size, buf_size, total;
-	void *src;
-	int rc, node, i;
-	struct dma_chan *dma_chan = NULL;
+	ret = ntb_set_ctx(perf->ntb, perf, &perf_ops);
+	if (ret)
+		return ret;
 
-	pr_debug("kthread %s starting...\n", current->comm);
+	if (perf->cmd_send == perf_msg_cmd_send) {
+		u64 inbits, outbits;
 
-	node = on_node ? dev_to_node(&pdev->dev) : NUMA_NO_NODE;
+		inbits = ntb_msg_inbits(perf->ntb);
+		outbits = ntb_msg_outbits(perf->ntb);
+		(void)ntb_msg_set_mask(perf->ntb, inbits | outbits);
 
-	if (use_dma && !pctx->dma_chan) {
-		dma_cap_mask_t dma_mask;
+		incmd_bit = BIT_ULL(__ffs64(inbits));
+		ret = ntb_msg_clear_mask(perf->ntb, incmd_bit);
 
-		dma_cap_zero(dma_mask);
-		dma_cap_set(DMA_MEMCPY, dma_mask);
-		dma_chan = dma_request_channel(dma_mask, perf_dma_filter_fn,
-					       (void *)(unsigned long)node);
-		if (!dma_chan) {
-			pr_warn("%s: cannot acquire DMA channel, quitting\n",
-				current->comm);
-			return -ENODEV;
-		}
-		pctx->dma_chan = dma_chan;
+		dev_dbg(&perf->ntb->dev, "MSG sts unmasked %#llx\n", incmd_bit);
+	} else {
+		scnt = ntb_spad_count(perf->ntb);
+		for (sidx = 0; sidx < scnt; sidx++)
+			ntb_spad_write(perf->ntb, sidx, PERF_CMD_INVAL);
+		incmd_bit = PERF_SPAD_NOTIFY(perf->gidx);
+		ret = ntb_db_clear_mask(perf->ntb, incmd_bit);
+
+		dev_dbg(&perf->ntb->dev, "DB bits unmasked %#llx\n", incmd_bit);
+	}
+	if (ret) {
+		ntb_clear_ctx(perf->ntb);
+		return ret;
 	}
 
-	for (i = 0; i < MAX_SRCS; i++) {
-		pctx->srcs[i] = kmalloc_node(MAX_TEST_SIZE, GFP_KERNEL, node);
-		if (!pctx->srcs[i]) {
-			rc = -ENOMEM;
-			goto err;
-		}
+	ntb_link_enable(perf->ntb, NTB_SPEED_AUTO, NTB_WIDTH_AUTO);
+	/* Might be not necessary */
+	ntb_link_event(perf->ntb);
+
+	return 0;
+}
+
+static void perf_disable_service(struct perf_ctx *perf)
+{
+	int pidx;
+
+	ntb_link_disable(perf->ntb);
+
+	if (perf->cmd_send == perf_msg_cmd_send) {
+		u64 inbits;
+
+		inbits = ntb_msg_inbits(perf->ntb);
+		(void)ntb_msg_set_mask(perf->ntb, inbits);
+	} else {
+		(void)ntb_db_set_mask(perf->ntb, PERF_SPAD_NOTIFY(perf->gidx));
 	}
 
-	win_size = mw->phys_size;
-	buf_size = 1ULL << seg_order;
-	total = 1ULL << run_order;
+	ntb_clear_ctx(perf->ntb);
 
-	if (buf_size > MAX_TEST_SIZE)
-		buf_size = MAX_TEST_SIZE;
+	for (pidx = 0; pidx < perf->pcnt; pidx++)
+		perf_cmd_exec(&perf->peers[pidx], PERF_CMD_CLEAR);
 
-	dst = (char __iomem *)mw->vbase;
+	for (pidx = 0; pidx < perf->pcnt; pidx++)
+		flush_work(&perf->peers[pidx].service);
+}
 
-	atomic_inc(&perf->tsync);
-	while (atomic_read(&perf->tsync) != perf->perf_threads)
-		schedule();
+/*==============================================================================
+ *                      Performance measuring work-thread
+ *==============================================================================
+ */
 
-	src = pctx->srcs[pctx->src_idx];
-	pctx->src_idx = (pctx->src_idx + 1) & (MAX_SRCS - 1);
+static void perf_dma_copy_callback(void *data)
+{
+	struct perf_thread *pthr = data;
 
-	rc = perf_move_data(pctx, dst, src, buf_size, win_size, total);
+	atomic_dec(&pthr->dma_sync);
+	wake_up(&pthr->dma_wait);
+}
 
-	atomic_dec(&perf->tsync);
+static int perf_copy_chunk(struct perf_thread *pthr,
+			   void __iomem *dst, void *src, size_t len)
+{
+	struct dma_async_tx_descriptor *tx;
+	struct dmaengine_unmap_data *unmap;
+	struct device *dma_dev;
+	int try, ret = 0;
 
-	if (rc < 0) {
-		pr_err("%s: failed\n", current->comm);
-		rc = -ENXIO;
-		goto err;
+	if (!use_dma) {
+		memcpy_toio(dst, src, len);
+		goto ret_check_tsync;
 	}
 
-	for (i = 0; i < MAX_SRCS; i++) {
-		kfree(pctx->srcs[i]);
-		pctx->srcs[i] = NULL;
+	dma_dev = pthr->dma_chan->device->dev;
+
+	if (!is_dma_copy_aligned(pthr->dma_chan->device, offset_in_page(src),
+				 offset_in_page(dst), len))
+		return -EIO;
+
+	unmap = dmaengine_get_unmap_data(dma_dev, 2, GFP_NOWAIT);
+	if (!unmap)
+		return -ENOMEM;
+
+	unmap->len = len;
+	unmap->addr[0] = dma_map_page(dma_dev, virt_to_page(src),
+		offset_in_page(src), len, DMA_TO_DEVICE);
+	if (dma_mapping_error(dma_dev, unmap->addr[0])) {
+		ret = -EIO;
+		goto err_free_resource;
 	}
+	unmap->to_cnt = 1;
 
-	atomic_inc(&perf->tdone);
-	wake_up(pctx->wq);
-	rc = 0;
-	goto done;
+	unmap->addr[1] = dma_map_page(dma_dev, virt_to_page(dst),
+		offset_in_page(dst), len, DMA_FROM_DEVICE);
+	if (dma_mapping_error(dma_dev, unmap->addr[1])) {
+		ret = -EIO;
+		goto err_free_resource;
+	}
+	unmap->from_cnt = 1;
 
-err:
-	for (i = 0; i < MAX_SRCS; i++) {
-		kfree(pctx->srcs[i]);
-		pctx->srcs[i] = NULL;
+	do {
+		tx = dmaengine_prep_dma_memcpy(pthr->dma_chan, unmap->addr[1],
+			unmap->addr[0], len, DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
+		if (!tx)
+			msleep(DMA_MDELAY);
+	} while (!tx && (try++ < DMA_TRIES));
+
+	if (!tx) {
+		ret = -EIO;
+		goto err_free_resource;
 	}
 
-	if (dma_chan) {
-		dma_release_channel(dma_chan);
-		pctx->dma_chan = NULL;
+	tx->callback = perf_dma_copy_callback;
+	tx->callback_param = pthr;
+	dma_set_unmap(tx, unmap);
+
+	if (dma_submit_error(dmaengine_submit(tx))) {
+		dmaengine_unmap_put(unmap);
+		goto err_free_resource;
 	}
 
-done:
-	/* Wait until we are told to stop */
-	for (;;) {
-		set_current_state(TASK_INTERRUPTIBLE);
-		if (kthread_should_stop())
-			break;
-		schedule();
+	dmaengine_unmap_put(unmap);
+
+	atomic_inc(&pthr->dma_sync);
+	dma_async_issue_pending(pthr->dma_chan);
+
+ret_check_tsync:
+	return likely(atomic_read(&pthr->perf->tsync) > 0) ? 0 : -EINTR;
+
+err_free_resource:
+	dmaengine_unmap_put(unmap);
+
+	return ret;
+}
+
+static bool perf_dma_filter(struct dma_chan *chan, void *data)
+{
+	struct perf_ctx *perf = data;
+	int node;
+
+	node = dev_to_node(&perf->ntb->dev);
+
+	return node == NUMA_NO_NODE || node == dev_to_node(chan->device->dev);
+}
+
+static int perf_init_test(struct perf_thread *pthr)
+{
+	struct perf_ctx *perf = pthr->perf;
+	dma_cap_mask_t dma_mask;
+
+	pthr->src = kmalloc_node(perf->test_peer->outbuf_size, GFP_KERNEL,
+				 dev_to_node(&perf->ntb->dev));
+	if (!pthr->src)
+		return -ENOMEM;
+
+	get_random_bytes(pthr->src, perf->test_peer->outbuf_size);
+
+	if (!use_dma)
+		return 0;
+
+	dma_cap_zero(dma_mask);
+	dma_cap_set(DMA_MEMCPY, dma_mask);
+	pthr->dma_chan = dma_request_channel(dma_mask, perf_dma_filter, perf);
+	if (!pthr->dma_chan) {
+		dev_err(&perf->ntb->dev, "%d: Failed to get DMA channel\n",
+			pthr->tidx);
+		atomic_dec(&perf->tsync);
+		wake_up(&perf->twait);
+		kfree(pthr->src);
+		return -ENODEV;
 	}
-	__set_current_state(TASK_RUNNING);
 
-	return rc;
+	atomic_set(&pthr->dma_sync, 0);
+
+	return 0;
 }
 
-static void perf_free_mw(struct perf_ctx *perf)
+static int perf_run_test(struct perf_thread *pthr)
 {
-	struct perf_mw *mw = &perf->mw;
-	struct pci_dev *pdev = perf->ntb->pdev;
+	struct perf_peer *peer = pthr->perf->test_peer;
+	struct perf_ctx *perf = pthr->perf;
+	void __iomem *flt_dst, *bnd_dst;
+	u64 total_size, chunk_size;
+	void *flt_src;
+	int ret = 0;
+
+	total_size = 1ULL << total_order;
+	chunk_size = 1ULL << chunk_order;
+	chunk_size = min_t(u64, peer->outbuf_size, chunk_size);
+
+	flt_src = pthr->src;
+	bnd_dst = peer->outbuf + peer->outbuf_size;
+	flt_dst = peer->outbuf;
+
+	pthr->duration = ktime_get();
+
+	/* Copied field is cleared on test launch stage */
+	while (pthr->copied < total_size) {
+		ret = perf_copy_chunk(pthr, flt_dst, flt_src, chunk_size);
+		if (ret) {
+			dev_err(&perf->ntb->dev, "%d: Got error %d on test\n",
+				pthr->tidx, ret);
+			return ret;
+		}
 
-	if (!mw->virt_addr)
-		return;
+		pthr->copied += chunk_size;
+
+		flt_dst += chunk_size;
+		flt_src += chunk_size;
+		if (flt_dst >= bnd_dst || flt_dst < peer->outbuf) {
+			flt_dst = peer->outbuf;
+			flt_src = pthr->src;
+		}
 
-	ntb_mw_clear_trans(perf->ntb, PIDX, 0);
-	dma_free_coherent(&pdev->dev, mw->buf_size,
-			  mw->virt_addr, mw->dma_addr);
-	mw->xlat_size = 0;
-	mw->buf_size = 0;
-	mw->virt_addr = NULL;
+		/* Give up CPU to give a chance for other threads to use it */
+		schedule();
+	}
+
+	return 0;
 }
 
-static int perf_set_mw(struct perf_ctx *perf, resource_size_t size)
+static int perf_sync_test(struct perf_thread *pthr)
 {
-	struct perf_mw *mw = &perf->mw;
-	size_t xlat_size, buf_size;
-	resource_size_t	xlat_align;
-	resource_size_t	xlat_align_size;
-	int rc;
+	struct perf_ctx *perf = pthr->perf;
 
-	if (!size)
-		return -EINVAL;
+	if (!use_dma)
+		goto no_dma_ret;
 
-	rc = ntb_mw_get_align(perf->ntb, PIDX, 0, &xlat_align,
-			      &xlat_align_size, NULL);
-	if (rc)
-		return rc;
+	wait_event(pthr->dma_wait,
+		   (atomic_read(&pthr->dma_sync) == 0 ||
+		    atomic_read(&perf->tsync) < 0));
 
-	xlat_size = round_up(size, xlat_align_size);
-	buf_size = round_up(size, xlat_align);
+	if (atomic_read(&perf->tsync) < 0)
+		return -EINTR;
 
-	if (mw->xlat_size == xlat_size)
-		return 0;
+no_dma_ret:
+	pthr->duration = ktime_sub(ktime_get(), pthr->duration);
 
-	if (mw->buf_size)
-		perf_free_mw(perf);
+	dev_dbg(&perf->ntb->dev, "%d: copied %llu bytes\n",
+		pthr->tidx, pthr->copied);
 
-	mw->xlat_size = xlat_size;
-	mw->buf_size = buf_size;
+	dev_dbg(&perf->ntb->dev, "%d: lasted %llu usecs\n",
+		pthr->tidx, ktime_to_us(pthr->duration));
+
+	dev_dbg(&perf->ntb->dev, "%d: %llu MBytes/s\n", pthr->tidx,
+		div64_u64(pthr->copied, ktime_to_us(pthr->duration)));
+
+	return 0;
+}
+
+static void perf_clear_test(struct perf_thread *pthr)
+{
+	struct perf_ctx *perf = pthr->perf;
+
+	if (!use_dma)
+		goto no_dma_notify;
+
+	/*
+	 * If test finished without errors, termination isn't needed.
+	 * We call it anyway just to be sure of the transfers completion.
+	 */
+	(void)dmaengine_terminate_sync(pthr->dma_chan);
+
+	dma_release_channel(pthr->dma_chan);
+
+no_dma_notify:
+	atomic_dec(&perf->tsync);
+	wake_up(&perf->twait);
+	kfree(pthr->src);
+}
 
-	mw->virt_addr = dma_alloc_coherent(&perf->ntb->pdev->dev, buf_size,
-					   &mw->dma_addr, GFP_KERNEL);
-	if (!mw->virt_addr) {
-		mw->xlat_size = 0;
-		mw->buf_size = 0;
+static void perf_thread_work(struct work_struct *work)
+{
+	struct perf_thread *pthr = to_thread_work(work);
+	int ret;
+
+	/*
+	 * Perform stages in compliance with use_dma flag value.
+	 * Test status is changed only if error happened, otherwise
+	 * status -ENODATA is kept while test is on-fly. Results
+	 * synchronization is performed only if test fininshed
+	 * without an error or interruption.
+	 */
+	ret = perf_init_test(pthr);
+	if (ret) {
+		pthr->status = ret;
+		return;
 	}
 
-	rc = ntb_mw_set_trans(perf->ntb, PIDX, 0, mw->dma_addr, mw->xlat_size);
-	if (rc) {
-		dev_err(&perf->ntb->dev, "Unable to set mw0 translation\n");
-		perf_free_mw(perf);
-		return -EIO;
+	ret = perf_run_test(pthr);
+	if (ret) {
+		pthr->status = ret;
+		goto err_clear_test;
 	}
 
-	return 0;
+	pthr->status = perf_sync_test(pthr);
+
+err_clear_test:
+	perf_clear_test(pthr);
 }
 
-static void perf_link_work(struct work_struct *work)
+static int perf_set_tcnt(struct perf_ctx *perf, u8 tcnt)
 {
-	struct perf_ctx *perf =
-		container_of(work, struct perf_ctx, link_work.work);
-	struct ntb_dev *ndev = perf->ntb;
-	struct pci_dev *pdev = ndev->pdev;
-	u32 val;
-	u64 size;
-	int rc;
+	if (tcnt == 0 || tcnt > MAX_THREADS_CNT)
+		return -EINVAL;
 
-	dev_dbg(&perf->ntb->pdev->dev, "%s called\n", __func__);
+	if (test_and_set_bit_lock(0, &perf->busy_flag))
+		return -EBUSY;
+
+	perf->tcnt = tcnt;
+
+	clear_bit_unlock(0, &perf->busy_flag);
 
-	size = perf->mw.phys_size;
+	return 0;
+}
 
-	if (max_mw_size && size > max_mw_size)
-		size = max_mw_size;
+static void perf_terminate_test(struct perf_ctx *perf)
+{
+	int tidx;
 
-	ntb_peer_spad_write(ndev, PIDX, MW_SZ_HIGH, upper_32_bits(size));
-	ntb_peer_spad_write(ndev, PIDX, MW_SZ_LOW, lower_32_bits(size));
-	ntb_peer_spad_write(ndev, PIDX, VERSION, PERF_VERSION);
+	atomic_set(&perf->tsync, -1);
+	wake_up(&perf->twait);
 
-	/* now read what peer wrote */
-	val = ntb_spad_read(ndev, VERSION);
-	if (val != PERF_VERSION) {
-		dev_dbg(&pdev->dev, "Remote version = %#x\n", val);
-		goto out;
+	for (tidx = 0; tidx < MAX_THREADS_CNT; tidx++) {
+		wake_up(&perf->threads[tidx].dma_wait);
+		cancel_work_sync(&perf->threads[tidx].work);
 	}
+}
+
+static int perf_submit_test(struct perf_peer *peer)
+{
+	struct perf_ctx *perf = peer->perf;
+	struct perf_thread *pthr;
+	int tidx, ret;
 
-	val = ntb_spad_read(ndev, MW_SZ_HIGH);
-	size = (u64)val << 32;
+	if (!test_bit(PERF_STS_DONE, &peer->sts))
+		return -ENOLINK;
 
-	val = ntb_spad_read(ndev, MW_SZ_LOW);
-	size |= val;
+	if (test_and_set_bit_lock(0, &perf->busy_flag))
+		return -EBUSY;
 
-	dev_dbg(&pdev->dev, "Remote MW size = %#llx\n", size);
+	perf->test_peer = peer;
+	atomic_set(&perf->tsync, perf->tcnt);
 
-	rc = perf_set_mw(perf, size);
-	if (rc)
-		goto out1;
+	for (tidx = 0; tidx < MAX_THREADS_CNT; tidx++) {
+		pthr = &perf->threads[tidx];
 
-	perf->link_is_up = true;
-	wake_up(&perf->link_wq);
+		pthr->status = -ENODATA;
+		pthr->copied = 0;
+		pthr->duration = ktime_set(0, 0);
+		if (tidx < perf->tcnt)
+			(void)queue_work(perf_wq, &pthr->work);
+	}
 
-	return;
+	ret = wait_event_interruptible(perf->twait,
+				       atomic_read(&perf->tsync) <= 0);
+	if (ret == -ERESTARTSYS) {
+		perf_terminate_test(perf);
+		ret = -EINTR;
+	}
 
-out1:
-	perf_free_mw(perf);
+	clear_bit_unlock(0, &perf->busy_flag);
 
-out:
-	if (ntb_link_is_up(ndev, NULL, NULL) == 1)
-		schedule_delayed_work(&perf->link_work,
-				      msecs_to_jiffies(PERF_LINK_DOWN_TIMEOUT));
+	return ret;
 }
 
-static int perf_setup_mw(struct ntb_dev *ntb, struct perf_ctx *perf)
+static int perf_read_stats(struct perf_ctx *perf, char *buf,
+			   size_t size, ssize_t *pos)
 {
-	struct perf_mw *mw;
-	int rc;
+	struct perf_thread *pthr;
+	int tidx;
+
+	if (test_and_set_bit_lock(0, &perf->busy_flag))
+		return -EBUSY;
 
-	mw = &perf->mw;
+	(*pos) += scnprintf(buf + *pos, size - *pos,
+		"    Peer %d test statistics:\n", perf->test_peer->pidx);
 
-	rc = ntb_peer_mw_get_addr(ntb, 0, &mw->phys_addr, &mw->phys_size);
-	if (rc)
-		return rc;
+	for (tidx = 0; tidx < MAX_THREADS_CNT; tidx++) {
+		pthr = &perf->threads[tidx];
 
-	perf->mw.vbase = ioremap_wc(mw->phys_addr, mw->phys_size);
-	if (!mw->vbase)
-		return -ENOMEM;
+		if (pthr->status == -ENODATA)
+			continue;
+
+		if (pthr->status) {
+			(*pos) += scnprintf(buf + *pos, size - *pos,
+				"%d: error status %d\n", tidx, pthr->status);
+			continue;
+		}
+
+		(*pos) += scnprintf(buf + *pos, size - *pos,
+			"%d: copied %llu bytes in %llu usecs, %llu MBytes/s\n",
+			tidx, pthr->copied, ktime_to_us(pthr->duration),
+			div64_u64(pthr->copied, ktime_to_us(pthr->duration)));
+	}
+
+	clear_bit_unlock(0, &perf->busy_flag);
 
 	return 0;
 }
 
-static ssize_t debugfs_run_read(struct file *filp, char __user *ubuf,
-				size_t count, loff_t *offp)
+static void perf_init_threads(struct perf_ctx *perf)
 {
-	struct perf_ctx *perf = filp->private_data;
+	struct perf_thread *pthr;
+	int tidx;
+
+	perf->tcnt = DEF_THREADS_CNT;
+	perf->test_peer = &perf->peers[0];
+	init_waitqueue_head(&perf->twait);
+
+	for (tidx = 0; tidx < MAX_THREADS_CNT; tidx++) {
+		pthr = &perf->threads[tidx];
+
+		pthr->perf = perf;
+		pthr->tidx = tidx;
+		pthr->status = -ENODATA;
+		init_waitqueue_head(&pthr->dma_wait);
+		INIT_WORK(&pthr->work, perf_thread_work);
+	}
+}
+
+static void perf_clear_threads(struct perf_ctx *perf)
+{
+	perf_terminate_test(perf);
+}
+
+/*==============================================================================
+ *                               DebugFS nodes
+ *==============================================================================
+ */
+
+static ssize_t perf_dbgfs_read_info(struct file *filep, char __user *ubuf,
+				    size_t size, loff_t *offp)
+{
+	struct perf_ctx *perf = filep->private_data;
+	struct perf_peer *peer;
+	size_t buf_size;
+	ssize_t pos = 0;
+	int ret, pidx;
 	char *buf;
-	ssize_t ret, out_off = 0;
-	struct pthr_ctx *pctx;
-	int i;
-	u64 rate;
 
-	if (!perf)
-		return 0;
+	buf_size = min_t(size_t, size, 0x1000U);
 
-	buf = kmalloc(1024, GFP_KERNEL);
+	buf = kmalloc(buf_size, GFP_KERNEL);
 	if (!buf)
 		return -ENOMEM;
 
-	if (mutex_is_locked(&perf->run_mutex)) {
-		out_off = scnprintf(buf, 64, "running\n");
-		goto read_from_buf;
+	pos += scnprintf(buf + pos, buf_size - pos,
+		"    Performance measuring tool info:\n\n");
+
+	pos += scnprintf(buf + pos, buf_size - pos,
+		"Local port %d, Global index %d\n", ntb_port_number(perf->ntb),
+		perf->gidx);
+	pos += scnprintf(buf + pos, buf_size - pos, "Test status: ");
+	if (test_bit(0, &perf->busy_flag)) {
+		pos += scnprintf(buf + pos, buf_size - pos,
+			"on-fly with port %d (%d)\n",
+			ntb_peer_port_number(perf->ntb, perf->test_peer->pidx),
+			perf->test_peer->pidx);
+	} else {
+		pos += scnprintf(buf + pos, buf_size - pos, "idle\n");
 	}
 
-	for (i = 0; i < MAX_THREADS; i++) {
-		pctx = &perf->pthr_ctx[i];
+	for (pidx = 0; pidx < perf->pcnt; pidx++) {
+		peer = &perf->peers[pidx];
+
+		pos += scnprintf(buf + pos, buf_size - pos,
+			"Port %d (%d), Global index %d:\n",
+			ntb_peer_port_number(perf->ntb, peer->pidx), peer->pidx,
+			peer->gidx);
+
+		pos += scnprintf(buf + pos, buf_size - pos,
+			"\tLink status: %s\n",
+			test_bit(PERF_STS_LNKUP, &peer->sts) ? "up" : "down");
+
+		pos += scnprintf(buf + pos, buf_size - pos,
+			"\tOut buffer addr 0x%pK\n", peer->outbuf);
 
-		if (pctx->status == -ENODATA)
-			break;
+		pos += scnprintf(buf + pos, buf_size - pos,
+			"\tOut buffer size %pa\n", &peer->outbuf_size);
 
-		if (pctx->status) {
-			out_off += scnprintf(buf + out_off, 1024 - out_off,
-					    "%d: error %d\n", i,
-					    pctx->status);
+		pos += scnprintf(buf + pos, buf_size - pos,
+			"\tOut buffer xlat 0x%016llx[p]\n", peer->outbuf_xlat);
+
+		if (!peer->inbuf) {
+			pos += scnprintf(buf + pos, buf_size - pos,
+				"\tIn buffer addr: unallocated\n");
 			continue;
 		}
 
-		rate = div64_u64(pctx->copied, pctx->diff_us);
-		out_off += scnprintf(buf + out_off, 1024 - out_off,
-			"%d: copied %llu bytes in %llu usecs, %llu MBytes/s\n",
-			i, pctx->copied, pctx->diff_us, rate);
+		pos += scnprintf(buf + pos, buf_size - pos,
+			"\tIn buffer addr 0x%pK\n", peer->inbuf);
+
+		pos += scnprintf(buf + pos, buf_size - pos,
+			"\tIn buffer size %pa\n", &peer->inbuf_size);
+
+		pos += scnprintf(buf + pos, buf_size - pos,
+			"\tIn buffer xlat %pad[p]\n", &peer->inbuf_xlat);
 	}
 
-read_from_buf:
-	ret = simple_read_from_buffer(ubuf, count, offp, buf, out_off);
+	ret = simple_read_from_buffer(ubuf, size, offp, buf, pos);
 	kfree(buf);
 
 	return ret;
 }
 
-static void threads_cleanup(struct perf_ctx *perf)
+static const struct file_operations perf_dbgfs_info = {
+	.open = simple_open,
+	.read = perf_dbgfs_read_info
+};
+
+static ssize_t perf_dbgfs_read_run(struct file *filep, char __user *ubuf,
+				   size_t size, loff_t *offp)
 {
-	struct pthr_ctx *pctx;
-	int i;
+	struct perf_ctx *perf = filep->private_data;
+	ssize_t ret, pos = 0;
+	char *buf;
 
-	for (i = 0; i < MAX_THREADS; i++) {
-		pctx = &perf->pthr_ctx[i];
-		if (pctx->thread) {
-			pctx->status = kthread_stop(pctx->thread);
-			pctx->thread = NULL;
-		}
-	}
-}
+	buf = kmalloc(PERF_BUF_LEN, GFP_KERNEL);
+	if (!buf)
+		return -ENOMEM;
 
-static void perf_clear_thread_status(struct perf_ctx *perf)
-{
-	int i;
+	ret = perf_read_stats(perf, buf, PERF_BUF_LEN, &pos);
+	if (ret)
+		goto err_free;
+
+	ret = simple_read_from_buffer(ubuf, size, offp, buf, pos);
+err_free:
+	kfree(buf);
 
-	for (i = 0; i < MAX_THREADS; i++)
-		perf->pthr_ctx[i].status = -ENODATA;
+	return ret;
 }
 
-static ssize_t debugfs_run_write(struct file *filp, const char __user *ubuf,
-				 size_t count, loff_t *offp)
+static ssize_t perf_dbgfs_write_run(struct file *filep, const char __user *ubuf,
+				    size_t size, loff_t *offp)
 {
-	struct perf_ctx *perf = filp->private_data;
-	int node, i;
-	DECLARE_WAIT_QUEUE_HEAD(wq);
+	struct perf_ctx *perf = filep->private_data;
+	struct perf_peer *peer;
+	int pidx, ret;
 
-	if (wait_event_interruptible(perf->link_wq, perf->link_is_up))
-		return -ENOLINK;
+	ret = kstrtoint_from_user(ubuf, size, 0, &pidx);
+	if (ret)
+		return ret;
 
-	if (perf->perf_threads == 0)
+	if (pidx < 0 || pidx >= perf->pcnt)
 		return -EINVAL;
 
-	if (!mutex_trylock(&perf->run_mutex))
-		return -EBUSY;
+	peer = &perf->peers[pidx];
 
-	perf_clear_thread_status(perf);
+	ret = perf_submit_test(peer);
+	if (ret)
+		return ret;
 
-	if (perf->perf_threads > MAX_THREADS) {
-		perf->perf_threads = MAX_THREADS;
-		pr_info("Reset total threads to: %u\n", MAX_THREADS);
-	}
+	return size;
+}
 
-	/* no greater than 1M */
-	if (seg_order > MAX_SEG_ORDER) {
-		seg_order = MAX_SEG_ORDER;
-		pr_info("Fix seg_order to %u\n", seg_order);
-	}
+static const struct file_operations perf_dbgfs_run = {
+	.open = simple_open,
+	.read = perf_dbgfs_read_run,
+	.write = perf_dbgfs_write_run
+};
 
-	if (run_order < seg_order) {
-		run_order = seg_order;
-		pr_info("Fix run_order to %u\n", run_order);
-	}
+static ssize_t perf_dbgfs_read_tcnt(struct file *filep, char __user *ubuf,
+				    size_t size, loff_t *offp)
+{
+	struct perf_ctx *perf = filep->private_data;
+	char buf[8];
+	ssize_t pos;
 
-	node = on_node ? dev_to_node(&perf->ntb->pdev->dev)
-		       : NUMA_NO_NODE;
-	atomic_set(&perf->tdone, 0);
+	pos = scnprintf(buf, sizeof(buf), "%hhu\n", perf->tcnt);
 
-	/* launch kernel thread */
-	for (i = 0; i < perf->perf_threads; i++) {
-		struct pthr_ctx *pctx;
+	return simple_read_from_buffer(ubuf, size, offp, buf, pos);
+}
 
-		pctx = &perf->pthr_ctx[i];
-		atomic_set(&pctx->dma_sync, 0);
-		pctx->perf = perf;
-		pctx->wq = &wq;
-		pctx->thread =
-			kthread_create_on_node(ntb_perf_thread,
-					       (void *)pctx,
-					       node, "ntb_perf %d", i);
-		if (IS_ERR(pctx->thread)) {
-			pctx->thread = NULL;
-			goto err;
-		} else {
-			wake_up_process(pctx->thread);
-		}
-	}
+static ssize_t perf_dbgfs_write_tcnt(struct file *filep,
+				     const char __user *ubuf,
+				     size_t size, loff_t *offp)
+{
+	struct perf_ctx *perf = filep->private_data;
+	int ret;
+	u8 val;
 
-	wait_event_interruptible(wq,
-		atomic_read(&perf->tdone) == perf->perf_threads);
+	ret = kstrtou8_from_user(ubuf, size, 0, &val);
+	if (ret)
+		return ret;
 
-	threads_cleanup(perf);
-	mutex_unlock(&perf->run_mutex);
-	return count;
+	ret = perf_set_tcnt(perf, val);
+	if (ret)
+		return ret;
 
-err:
-	threads_cleanup(perf);
-	mutex_unlock(&perf->run_mutex);
-	return -ENXIO;
+	return size;
 }
 
-static const struct file_operations ntb_perf_debugfs_run = {
-	.owner = THIS_MODULE,
+static const struct file_operations perf_dbgfs_tcnt = {
 	.open = simple_open,
-	.read = debugfs_run_read,
-	.write = debugfs_run_write,
+	.read = perf_dbgfs_read_tcnt,
+	.write = perf_dbgfs_write_tcnt
 };
 
-static int perf_debugfs_setup(struct perf_ctx *perf)
+static void perf_setup_dbgfs(struct perf_ctx *perf)
 {
 	struct pci_dev *pdev = perf->ntb->pdev;
-	struct dentry *debugfs_node_dir;
-	struct dentry *debugfs_run;
-	struct dentry *debugfs_threads;
-	struct dentry *debugfs_seg_order;
-	struct dentry *debugfs_run_order;
-	struct dentry *debugfs_use_dma;
-	struct dentry *debugfs_on_node;
-
-	if (!debugfs_initialized())
-		return -ENODEV;
 
-	/* Assumpion: only one NTB device in the system */
-	if (!perf_debugfs_dir) {
-		perf_debugfs_dir = debugfs_create_dir(KBUILD_MODNAME, NULL);
-		if (!perf_debugfs_dir)
-			return -ENODEV;
-	}
-
-	debugfs_node_dir = debugfs_create_dir(pci_name(pdev),
-					      perf_debugfs_dir);
-	if (!debugfs_node_dir)
-		goto err;
-
-	debugfs_run = debugfs_create_file("run", S_IRUSR | S_IWUSR,
-					  debugfs_node_dir, perf,
-					  &ntb_perf_debugfs_run);
-	if (!debugfs_run)
-		goto err;
-
-	debugfs_threads = debugfs_create_u8("threads", S_IRUSR | S_IWUSR,
-					    debugfs_node_dir,
-					    &perf->perf_threads);
-	if (!debugfs_threads)
-		goto err;
-
-	debugfs_seg_order = debugfs_create_u32("seg_order", 0600,
-					       debugfs_node_dir,
-					       &seg_order);
-	if (!debugfs_seg_order)
-		goto err;
-
-	debugfs_run_order = debugfs_create_u32("run_order", 0600,
-					       debugfs_node_dir,
-					       &run_order);
-	if (!debugfs_run_order)
-		goto err;
-
-	debugfs_use_dma = debugfs_create_bool("use_dma", 0600,
-					       debugfs_node_dir,
-					       &use_dma);
-	if (!debugfs_use_dma)
-		goto err;
-
-	debugfs_on_node = debugfs_create_bool("on_node", 0600,
-					      debugfs_node_dir,
-					      &on_node);
-	if (!debugfs_on_node)
-		goto err;
+	perf->dbgfs_dir = debugfs_create_dir(pci_name(pdev), perf_dbgfs_topdir);
+	if (!perf->dbgfs_dir) {
+		dev_warn(&perf->ntb->dev, "DebugFS unsupported\n");
+		return;
+	}
+
+	debugfs_create_file("info", 0600, perf->dbgfs_dir, perf,
+			    &perf_dbgfs_info);
 
-	return 0;
+	debugfs_create_file("run", 0600, perf->dbgfs_dir, perf,
+			    &perf_dbgfs_run);
 
-err:
-	debugfs_remove_recursive(perf_debugfs_dir);
-	perf_debugfs_dir = NULL;
-	return -ENODEV;
+	debugfs_create_file("threads_count", 0600, perf->dbgfs_dir, perf,
+			    &perf_dbgfs_tcnt);
+
+	/* They are made read-only for test exec safety and integrity */
+	debugfs_create_u8("chunk_order", 0500, perf->dbgfs_dir, &chunk_order);
+
+	debugfs_create_u8("total_order", 0500, perf->dbgfs_dir, &total_order);
+
+	debugfs_create_bool("use_dma", 0500, perf->dbgfs_dir, &use_dma);
 }
 
-static int perf_probe(struct ntb_client *client, struct ntb_dev *ntb)
+static void perf_clear_dbgfs(struct perf_ctx *perf)
+{
+	debugfs_remove_recursive(perf->dbgfs_dir);
+}
+
+/*==============================================================================
+ *                        Basic driver initialization
+ *==============================================================================
+ */
+
+static struct perf_ctx *perf_create_data(struct ntb_dev *ntb)
 {
-	struct pci_dev *pdev = ntb->pdev;
 	struct perf_ctx *perf;
-	int node;
-	int rc = 0;
 
-	if (ntb_spad_count(ntb) < MAX_SPAD) {
-		dev_err(&ntb->dev, "Not enough scratch pad registers for %s",
-			DRIVER_NAME);
-		return -EIO;
-	}
+	perf = devm_kzalloc(&ntb->dev, sizeof(*perf), GFP_KERNEL);
+	if (!perf)
+		return ERR_PTR(-ENOMEM);
 
-	if (!ntb->ops->mw_set_trans) {
-		dev_err(&ntb->dev, "Need inbound MW based NTB API\n");
-		return -EINVAL;
+	perf->pcnt = ntb_peer_port_count(ntb);
+	perf->peers = devm_kcalloc(&ntb->dev, perf->pcnt, sizeof(*perf->peers),
+				  GFP_KERNEL);
+	if (!perf->peers)
+		return ERR_PTR(-ENOMEM);
+
+	perf->ntb = ntb;
+
+	return perf;
+}
+
+static int perf_setup_peer_mw(struct perf_peer *peer)
+{
+	struct perf_ctx *perf = peer->perf;
+	phys_addr_t phys_addr;
+	int ret;
+
+	/* Get outbound MW parameters and map it */
+	ret = ntb_peer_mw_get_addr(perf->ntb, peer->gidx, &phys_addr,
+				   &peer->outbuf_size);
+	if (ret)
+		return ret;
+
+	peer->outbuf = devm_ioremap_wc(&perf->ntb->dev, phys_addr,
+					peer->outbuf_size);
+	if (!peer->outbuf)
+		return -ENOMEM;
+
+	if (max_mw_size && peer->outbuf_size > max_mw_size) {
+		peer->outbuf_size = max_mw_size;
+		dev_warn(&peer->perf->ntb->dev,
+			"Peer %d outbuf reduced to %#llx\n", peer->pidx,
+			peer->outbuf_size);
 	}
 
-	if (ntb_peer_port_count(ntb) != NTB_DEF_PEER_CNT)
-		dev_warn(&ntb->dev, "Multi-port NTB devices unsupported\n");
+	return 0;
+}
 
-	node = on_node ? dev_to_node(&pdev->dev) : NUMA_NO_NODE;
-	perf = kzalloc_node(sizeof(*perf), GFP_KERNEL, node);
-	if (!perf) {
-		rc = -ENOMEM;
-		goto err_perf;
+static int perf_init_peers(struct perf_ctx *perf)
+{
+	struct perf_peer *peer;
+	int pidx, lport, ret;
+
+	lport = ntb_port_number(perf->ntb);
+	perf->gidx = -1;
+	for (pidx = 0; pidx < perf->pcnt; pidx++) {
+		peer = &perf->peers[pidx];
+
+		peer->perf = perf;
+		peer->pidx = pidx;
+		if (lport < ntb_peer_port_number(perf->ntb, pidx)) {
+			if (perf->gidx == -1)
+				perf->gidx = pidx;
+			peer->gidx = pidx + 1;
+		} else {
+			peer->gidx = pidx;
+		}
+		INIT_WORK(&peer->service, perf_service_work);
 	}
+	if (perf->gidx == -1)
+		perf->gidx = pidx;
 
-	perf->ntb = ntb;
-	perf->perf_threads = 1;
-	atomic_set(&perf->tsync, 0);
-	mutex_init(&perf->run_mutex);
-	spin_lock_init(&perf->db_lock);
-	perf_setup_mw(ntb, perf);
-	init_waitqueue_head(&perf->link_wq);
-	INIT_DELAYED_WORK(&perf->link_work, perf_link_work);
+	for (pidx = 0; pidx < perf->pcnt; pidx++) {
+		ret = perf_setup_peer_mw(&perf->peers[pidx]);
+		if (ret)
+			return ret;
+	}
+
+	dev_dbg(&perf->ntb->dev, "Global port index %d\n", perf->gidx);
+
+	return 0;
+}
 
-	rc = ntb_set_ctx(ntb, perf, &perf_ops);
-	if (rc)
-		goto err_ctx;
+static int perf_probe(struct ntb_client *client, struct ntb_dev *ntb)
+{
+	struct perf_ctx *perf;
+	int ret;
 
-	perf->link_is_up = false;
-	ntb_link_enable(ntb, NTB_SPEED_AUTO, NTB_WIDTH_AUTO);
-	ntb_link_event(ntb);
+	perf = perf_create_data(ntb);
+	if (IS_ERR(perf))
+		return PTR_ERR(perf);
 
-	rc = perf_debugfs_setup(perf);
-	if (rc)
-		goto err_ctx;
+	ret = perf_init_peers(perf);
+	if (ret)
+		return ret;
 
-	perf_clear_thread_status(perf);
+	perf_init_threads(perf);
 
-	return 0;
+	ret = perf_init_service(perf);
+	if (ret)
+		return ret;
 
-err_ctx:
-	cancel_delayed_work_sync(&perf->link_work);
-	kfree(perf);
-err_perf:
-	return rc;
+	ret = perf_enable_service(perf);
+	if (ret)
+		return ret;
+
+	perf_setup_dbgfs(perf);
+
+	return 0;
 }
 
 static void perf_remove(struct ntb_client *client, struct ntb_dev *ntb)
 {
 	struct perf_ctx *perf = ntb->ctx;
-	int i;
 
-	dev_dbg(&perf->ntb->dev, "%s called\n", __func__);
+	perf_clear_dbgfs(perf);
 
-	mutex_lock(&perf->run_mutex);
+	perf_disable_service(perf);
 
-	cancel_delayed_work_sync(&perf->link_work);
+	perf_clear_threads(perf);
+}
 
-	ntb_clear_ctx(ntb);
-	ntb_link_disable(ntb);
+static struct ntb_client perf_client = {
+	.ops = {
+		.probe = perf_probe,
+		.remove = perf_remove
+	}
+};
 
-	debugfs_remove_recursive(perf_debugfs_dir);
-	perf_debugfs_dir = NULL;
+static int __init perf_init(void)
+{
+	int ret;
 
-	if (use_dma) {
-		for (i = 0; i < MAX_THREADS; i++) {
-			struct pthr_ctx *pctx = &perf->pthr_ctx[i];
+	if (chunk_order > MAX_CHUNK_ORDER) {
+		chunk_order = MAX_CHUNK_ORDER;
+		pr_info("Chunk order reduced to %hhu\n", chunk_order);
+	}
 
-			if (pctx->dma_chan)
-				dma_release_channel(pctx->dma_chan);
-		}
+	if (total_order < chunk_order) {
+		total_order = chunk_order;
+		pr_info("Total data order reduced to %hhu\n", total_order);
 	}
 
-	kfree(perf);
+	perf_wq = alloc_workqueue("perf_wq", WQ_UNBOUND | WQ_SYSFS, 0);
+	if (!perf_wq)
+		return -ENOMEM;
+
+	if (debugfs_initialized())
+		perf_dbgfs_topdir = debugfs_create_dir(KBUILD_MODNAME, NULL);
+
+	ret = ntb_register_client(&perf_client);
+	if (ret) {
+		debugfs_remove_recursive(perf_dbgfs_topdir);
+		destroy_workqueue(perf_wq);
+	}
+
+	return ret;
 }
+module_init(perf_init);
+
+static void __exit perf_exit(void)
+{
+	ntb_unregister_client(&perf_client);
+	debugfs_remove_recursive(perf_dbgfs_topdir);
+	destroy_workqueue(perf_wq);
+}
+module_exit(perf_exit);
 
-static struct ntb_client perf_client = {
-	.ops = {
-		.probe = perf_probe,
-		.remove = perf_remove,
-	},
-};
-module_ntb_client(perf_client);
-- 
2.12.0

[PATCH v3 07/15] NTB: ntb_test: Safely use paths with whitespace

[Serge Semin]

If some of variables like LOC/REM or LOCAL_*/REMOTE_* got
whitespaces, the script may fail with syntax error.

Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
---
 tools/testing/selftests/ntb/ntb_test.sh | 62 ++++++++++++++++-----------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/tools/testing/selftests/ntb/ntb_test.sh b/tools/testing/selftests/ntb/ntb_test.sh
index 5fc7ad359e21..a8647ad891eb 100755
--- a/tools/testing/selftests/ntb/ntb_test.sh
+++ b/tools/testing/selftests/ntb/ntb_test.sh
@@ -87,7 +87,7 @@ set -e
 
 function _modprobe()
 {
-        modprobe "$@"
+	modprobe "$@"
 
 	if [[ "$REMOTE_HOST" != "" ]]; then
 		ssh "$REMOTE_HOST" modprobe "$@"
@@ -274,13 +274,13 @@ function pingpong_test()
 
 	echo "Running ping pong tests on: $(basename $LOC) / $(basename $REM)"
 
-	LOC_START=$(read_file $LOC/count)
-	REM_START=$(read_file $REM/count)
+	LOC_START=$(read_file "$LOC/count")
+	REM_START=$(read_file "$REM/count")
 
 	sleep 7
 
-	LOC_END=$(read_file $LOC/count)
-	REM_END=$(read_file $REM/count)
+	LOC_END=$(read_file "$LOC/count")
+	REM_END=$(read_file "$REM/count")
 
 	if [[ $LOC_START == $LOC_END ]] || [[ $REM_START == $REM_END ]]; then
 		echo "Ping pong counter not incrementing!" >&2
@@ -304,15 +304,15 @@ function perf_test()
 		max_mw_size=$MAX_MW_SIZE use_dma=$USE_DMA
 
 	echo "Running local perf test $WITH DMA"
-	write_file "" $LOCAL_PERF/run
+	write_file "" "$LOCAL_PERF/run"
 	echo -n "  "
-	read_file $LOCAL_PERF/run
+	read_file "$LOCAL_PERF/run"
 	echo "  Passed"
 
 	echo "Running remote perf test $WITH DMA"
-	write_file "" $REMOTE_PERF/run
+	write_file "" "$REMOTE_PERF/run"
 	echo -n "  "
-	read_file $REMOTE_PERF/run
+	read_file "$REMOTE_PERF/run"
 	echo "  Passed"
 
 	_modprobe -r ntb_perf
@@ -320,39 +320,39 @@ function perf_test()
 
 function ntb_tool_tests()
 {
-	LOCAL_TOOL=$DEBUGFS/ntb_tool/$LOCAL_DEV
-	REMOTE_TOOL=$REMOTE_HOST:$DEBUGFS/ntb_tool/$REMOTE_DEV
+	LOCAL_TOOL="$DEBUGFS/ntb_tool/$LOCAL_DEV"
+	REMOTE_TOOL="$REMOTE_HOST:$DEBUGFS/ntb_tool/$REMOTE_DEV"
 
 	echo "Starting ntb_tool tests..."
 
 	_modprobe ntb_tool
 
-	write_file Y $LOCAL_TOOL/link_event
-	write_file Y $REMOTE_TOOL/link_event
+	write_file "Y" "$LOCAL_TOOL/link_event"
+	write_file "Y" "$REMOTE_TOOL/link_event"
 
-	link_test $LOCAL_TOOL $REMOTE_TOOL
-	link_test $REMOTE_TOOL $LOCAL_TOOL
+	link_test "$LOCAL_TOOL" "$REMOTE_TOOL"
+	link_test "$REMOTE_TOOL" "$LOCAL_TOOL"
 
 	#Ensure the link is up on both sides before continuing
-	write_file Y $LOCAL_TOOL/link_event
-	write_file Y $REMOTE_TOOL/link_event
+	write_file "Y" "$LOCAL_TOOL/link_event"
+	write_file "Y" "$REMOTE_TOOL/link_event"
 
-	for PEER_TRANS in $(ls $LOCAL_TOOL/peer_trans*); do
+	for PEER_TRANS in $(ls "$LOCAL_TOOL"/peer_trans*); do
 		PT=$(basename $PEER_TRANS)
-		write_file $MW_SIZE $LOCAL_TOOL/$PT
-		write_file $MW_SIZE $REMOTE_TOOL/$PT
+		write_file $MW_SIZE "$LOCAL_TOOL/$PT"
+		write_file $MW_SIZE "$REMOTE_TOOL/$PT"
 	done
 
-	doorbell_test $LOCAL_TOOL $REMOTE_TOOL
-	doorbell_test $REMOTE_TOOL $LOCAL_TOOL
-	scratchpad_test $LOCAL_TOOL $REMOTE_TOOL
-	scratchpad_test $REMOTE_TOOL $LOCAL_TOOL
+	doorbell_test "$LOCAL_TOOL" "$REMOTE_TOOL"
+	doorbell_test "$REMOTE_TOOL" "$LOCAL_TOOL"
+	scratchpad_test "$LOCAL_TOOL" "$REMOTE_TOOL"
+	scratchpad_test "$REMOTE_TOOL" "$LOCAL_TOOL"
 
-	for MW in $(ls $LOCAL_TOOL/mw*); do
+	for MW in $(ls "$LOCAL_TOOL"/mw*); do
 		MW=$(basename $MW)
 
-		mw_test $MW $LOCAL_TOOL $REMOTE_TOOL
-		mw_test $MW $REMOTE_TOOL $LOCAL_TOOL
+		mw_test $MW "$LOCAL_TOOL" "$REMOTE_TOOL"
+		mw_test $MW "$REMOTE_TOOL" "$LOCAL_TOOL"
 	done
 
 	_modprobe -r ntb_tool
@@ -360,8 +360,8 @@ function ntb_tool_tests()
 
 function ntb_pingpong_tests()
 {
-	LOCAL_PP=$DEBUGFS/ntb_pingpong/$LOCAL_DEV
-	REMOTE_PP=$REMOTE_HOST:$DEBUGFS/ntb_pingpong/$REMOTE_DEV
+	LOCAL_PP="$DEBUGFS/ntb_pingpong/$LOCAL_DEV"
+	REMOTE_PP="$REMOTE_HOST:$DEBUGFS/ntb_pingpong/$REMOTE_DEV"
 
 	echo "Starting ntb_pingpong tests..."
 
@@ -374,8 +374,8 @@ function ntb_pingpong_tests()
 
 function ntb_perf_tests()
 {
-	LOCAL_PERF=$DEBUGFS/ntb_perf/$LOCAL_DEV
-	REMOTE_PERF=$REMOTE_HOST:$DEBUGFS/ntb_perf/$REMOTE_DEV
+	LOCAL_PERF="$DEBUGFS/ntb_perf/$LOCAL_DEV"
+	REMOTE_PERF="$REMOTE_HOST:$DEBUGFS/ntb_perf/$REMOTE_DEV"
 
 	echo "Starting ntb_perf tests..."
 
-- 
2.12.0

[PATCH v3 08/15] NTB: ntb_test: Add ntb_tool port tests

[Serge Semin]

Multi-port interface is now available in ntb_tool driver. According
to the new NTB API, there might be more than two devices connected over
NTB. It means each device can have multiple freely enumerated ports.
Each port got index assigned by NTB hardware driver. This test is
performed to determine the local and peer ports as well as their indexes.

Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
---
 tools/testing/selftests/ntb/ntb_test.sh | 52 +++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/tools/testing/selftests/ntb/ntb_test.sh b/tools/testing/selftests/ntb/ntb_test.sh
index a8647ad891eb..541ba70ad640 100755
--- a/tools/testing/selftests/ntb/ntb_test.sh
+++ b/tools/testing/selftests/ntb/ntb_test.sh
@@ -127,6 +127,56 @@ function write_file()
 	fi
 }
 
+function check_file()
+{
+	split_remote $1
+
+	if [[ "$REMOTE" != "" ]]; then
+		ssh "$REMOTE" "[[ -e ${VPATH} ]]"
+	else
+		[[ -e ${VPATH} ]]
+	fi
+}
+
+function find_pidx()
+{
+	PORT=$1
+	PPATH=$2
+
+	for ((i = 0; i < 64; i++)); do
+		PEER_DIR="$PPATH/peer$i"
+
+		check_file ${PEER_DIR} || break
+
+		PEER_PORT=$(read_file "${PEER_DIR}/port")
+		if [[ ${PORT} -eq $PEER_PORT ]]; then
+			echo $i
+			return 0
+		fi
+	done
+
+	return 1
+}
+
+function port_test()
+{
+	LOC=$1
+	REM=$2
+
+	echo "Running port tests on: $(basename $LOC) / $(basename $REM)"
+
+	LOCAL_PORT=$(read_file "$LOC/port")
+	REMOTE_PORT=$(read_file "$REM/port")
+
+	LOCAL_PIDX=$(find_pidx ${REMOTE_PORT} "$LOC")
+	REMOTE_PIDX=$(find_pidx ${LOCAL_PORT} "$REM")
+
+	echo "Local port ${LOCAL_PORT} with index ${REMOTE_PIDX} on remote host"
+	echo "Peer port ${REMOTE_PORT} with index ${LOCAL_PIDX} on local host"
+
+	echo "  Passed"
+}
+
 function link_test()
 {
 	LOC=$1
@@ -327,6 +377,8 @@ function ntb_tool_tests()
 
 	_modprobe ntb_tool
 
+	port_test "$LOCAL_TOOL" "$REMOTE_TOOL"
+
 	write_file "Y" "$LOCAL_TOOL/link_event"
 	write_file "Y" "$REMOTE_TOOL/link_event"
 
-- 
2.12.0

[PATCH v3 09/15] NTB: ntb_test: Update ntb_tool link tests

[Serge Semin]

Link Up and Down methods are used to change NTB link settings on
local side only for multi-port devices. Link is considered up
only if both sides local and peer set it up. Intel/AMD hardware
acts a bit different by assigning the Primary and Secondary roles,
so Primary device only is able to change the link state. Such behaviour
should be reflected in the test code.

Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
---

Changelog v3:
- Redirect errors to /dev/null instead of /dev/nulle

 tools/testing/selftests/ntb/ntb_test.sh | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/tools/testing/selftests/ntb/ntb_test.sh b/tools/testing/selftests/ntb/ntb_test.sh
index 541ba70ad640..a3942f31c057 100755
--- a/tools/testing/selftests/ntb/ntb_test.sh
+++ b/tools/testing/selftests/ntb/ntb_test.sh
@@ -138,6 +138,11 @@ function check_file()
 	fi
 }
 
+function subdirname()
+{
+	echo $(basename $(dirname $1)) 2> /dev/null
+}
+
 function find_pidx()
 {
 	PORT=$1
@@ -183,9 +188,9 @@ function link_test()
 	REM=$2
 	EXP=0
 
-	echo "Running link tests on: $(basename $LOC) / $(basename $REM)"
+	echo "Running link tests on: $(subdirname $LOC) / $(subdirname $REM)"
 
-	if ! write_file "N" "$LOC/link" 2> /dev/null; then
+	if ! write_file "N" "$LOC/../link" 2> /dev/null; then
 		echo "  Unsupported"
 		return
 	fi
@@ -193,12 +198,11 @@ function link_test()
 	write_file "N" "$LOC/link_event"
 
 	if [[ $(read_file "$REM/link") != "N" ]]; then
-		echo "Expected remote link to be down in $REM/link" >&2
+		echo "Expected link to be down in $REM/link" >&2
 		exit -1
 	fi
 
-	write_file "Y" "$LOC/link"
-	write_file "Y" "$LOC/link_event"
+	write_file "Y" "$LOC/../link"
 
 	echo "  Passed"
 }
@@ -379,15 +383,15 @@ function ntb_tool_tests()
 
 	port_test "$LOCAL_TOOL" "$REMOTE_TOOL"
 
-	write_file "Y" "$LOCAL_TOOL/link_event"
-	write_file "Y" "$REMOTE_TOOL/link_event"
+	LOCAL_PEER_TOOL="$LOCAL_TOOL/peer$LOCAL_PIDX"
+	REMOTE_PEER_TOOL="$REMOTE_TOOL/peer$REMOTE_PIDX"
 
-	link_test "$LOCAL_TOOL" "$REMOTE_TOOL"
-	link_test "$REMOTE_TOOL" "$LOCAL_TOOL"
+	link_test "$LOCAL_PEER_TOOL" "$REMOTE_PEER_TOOL"
+	link_test "$REMOTE_PEER_TOOL" "$LOCAL_PEER_TOOL"
 
 	#Ensure the link is up on both sides before continuing
-	write_file "Y" "$LOCAL_TOOL/link_event"
-	write_file "Y" "$REMOTE_TOOL/link_event"
+	write_file "Y" "$LOCAL_PEER_TOOL/link_event"
+	write_file "Y" "$REMOTE_PEER_TOOL/link_event"
 
 	for PEER_TRANS in $(ls "$LOCAL_TOOL"/peer_trans*); do
 		PT=$(basename $PEER_TRANS)
-- 
2.12.0

[PATCH v3 10/15] NTB: ntb_test: Update ntb_tool DB tests

[Serge Semin]

DB interface of ntb_tool driver hasn't been changed much, but
db_valid_mask DebugFS file has still been added. In this case
it's much better to test all valid DB bits instead of using
the predefined mask, which may be incorrect in general.

Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
---
 tools/testing/selftests/ntb/ntb_test.sh | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/tools/testing/selftests/ntb/ntb_test.sh b/tools/testing/selftests/ntb/ntb_test.sh
index a3942f31c057..ec2e51183f8d 100755
--- a/tools/testing/selftests/ntb/ntb_test.sh
+++ b/tools/testing/selftests/ntb/ntb_test.sh
@@ -18,7 +18,6 @@ LIST_DEVS=FALSE
 
 DEBUGFS=${DEBUGFS-/sys/kernel/debug}
 
-DB_BITMASK=0x7FFF
 PERF_RUN_ORDER=32
 MAX_MW_SIZE=0
 RUN_DMA_TESTS=
@@ -39,7 +38,6 @@ function show_help()
 	echo "be highly recommended."
 	echo
 	echo "Options:"
-	echo "  -b BITMASK      doorbell clear bitmask for ntb_tool"
 	echo "  -C              don't cleanup ntb modules on exit"
 	echo "  -d              run dma tests"
 	echo "  -h              show this help message"
@@ -56,7 +54,6 @@ function parse_args()
 	OPTIND=0
 	while getopts "b:Cdhlm:r:p:w:" opt; do
 		case "$opt" in
-		b)  DB_BITMASK=${OPTARG} ;;
 		C)  DONT_CLEANUP=1 ;;
 		d)  RUN_DMA_TESTS=1 ;;
 		h)  show_help; exit 0 ;;
@@ -215,21 +212,30 @@ function doorbell_test()
 
 	echo "Running db tests on: $(basename $LOC) / $(basename $REM)"
 
-	write_file "c $DB_BITMASK" "$REM/db"
+	DB_VALID_MASK=$(read_file "$LOC/db_valid_mask")
 
-	for ((i=1; i <= 8; i++)); do
-		let DB=$(read_file "$REM/db") || true
-		if [[ "$DB" != "$EXP" ]]; then
+	write_file "c $DB_VALID_MASK" "$REM/db"
+
+	for ((i = 0; i < 64; i++)); do
+		DB=$(read_file "$REM/db")
+		if [[ "$DB" -ne "$EXP" ]]; then
 			echo "Doorbell doesn't match expected value $EXP " \
 			     "in $REM/db" >&2
 			exit -1
 		fi
 
-		let "MASK=1 << ($i-1)" || true
-		let "EXP=$EXP | $MASK" || true
+		let "MASK = (1 << $i) & $DB_VALID_MASK" || true
+		let "EXP = $EXP | $MASK" || true
+
 		write_file "s $MASK" "$LOC/peer_db"
 	done
 
+	write_file "c $DB_VALID_MASK" "$REM/db_mask"
+	write_file $DB_VALID_MASK "$REM/db_event"
+	write_file "s $DB_VALID_MASK" "$REM/db_mask"
+
+	write_file "c $DB_VALID_MASK" "$REM/db"
+
 	echo "  Passed"
 }
 
@@ -393,14 +399,15 @@ function ntb_tool_tests()
 	write_file "Y" "$LOCAL_PEER_TOOL/link_event"
 	write_file "Y" "$REMOTE_PEER_TOOL/link_event"
 
+	doorbell_test "$LOCAL_TOOL" "$REMOTE_TOOL"
+	doorbell_test "$REMOTE_TOOL" "$LOCAL_TOOL"
+
 	for PEER_TRANS in $(ls "$LOCAL_TOOL"/peer_trans*); do
 		PT=$(basename $PEER_TRANS)
 		write_file $MW_SIZE "$LOCAL_TOOL/$PT"
 		write_file $MW_SIZE "$REMOTE_TOOL/$PT"
 	done
 
-	doorbell_test "$LOCAL_TOOL" "$REMOTE_TOOL"
-	doorbell_test "$REMOTE_TOOL" "$LOCAL_TOOL"
 	scratchpad_test "$LOCAL_TOOL" "$REMOTE_TOOL"
 	scratchpad_test "$REMOTE_TOOL" "$LOCAL_TOOL"
 
-- 
2.12.0

[PATCH v3 11/15] NTB: ntb_test: Update ntb_tool Scratchpad tests

[Serge Semin]

Scratchpad NTB API has changed so has the ntb_tool driver. Outbound
Scratchpad DebugFS files have been moved to peer specific directories.
Each scratchpad is now available via separate file. The test code
has been accordingly altered.

Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
---
 tools/testing/selftests/ntb/ntb_test.sh | 43 ++++++++++++++++++++-------------
 1 file changed, 26 insertions(+), 17 deletions(-)

diff --git a/tools/testing/selftests/ntb/ntb_test.sh b/tools/testing/selftests/ntb/ntb_test.sh
index ec2e51183f8d..06b9b156a6fc 100755
--- a/tools/testing/selftests/ntb/ntb_test.sh
+++ b/tools/testing/selftests/ntb/ntb_test.sh
@@ -239,35 +239,44 @@ function doorbell_test()
 	echo "  Passed"
 }
 
-function read_spad()
+function get_files_count()
 {
-       VPATH=$1
-       IDX=$2
+	NAME=$1
+	LOC=$2
+
+	split_remote $LOC
 
-       ROW=($(read_file "$VPATH" | grep -e "^$IDX"))
-       let VAL=${ROW[1]} || true
-       echo $VAL
+	if [[ "$REMOTE" == "" ]]; then
+		echo $(ls -1 "$LOC"/${NAME}* 2>/dev/null | wc -l)
+	else
+		echo $(ssh "$REMOTE" "ls -1 \"$VPATH\"/${NAME}* | \
+		       wc -l" 2> /dev/null)
+	fi
 }
 
 function scratchpad_test()
 {
 	LOC=$1
 	REM=$2
-	CNT=$(read_file "$LOC/spad" | wc -l)
 
-	echo "Running spad tests on: $(basename $LOC) / $(basename $REM)"
+	echo "Running spad tests on: $(subdirname $LOC) / $(subdirname $REM)"
+
+	CNT=$(get_files_count "spad" "$LOC")
+
+	if [[ $CNT -eq 0 ]]; then
+		echo "  Unsupported"
+		return
+	fi
 
 	for ((i = 0; i < $CNT; i++)); do
 		VAL=$RANDOM
-		write_file "$i $VAL" "$LOC/peer_spad"
-		RVAL=$(read_spad "$REM/spad" $i)
+		write_file "$VAL" "$LOC/spad$i"
+		RVAL=$(read_file "$REM/../spad$i")
 
-		if [[ "$VAL" != "$RVAL" ]]; then
-			echo "Scratchpad doesn't match expected value $VAL " \
-			     "in $REM/spad, got $RVAL" >&2
+		if [[ "$VAL" -ne "$RVAL" ]]; then
+			echo "Scratchpad $i value $RVAL doesn't match $VAL" >&2
 			exit -1
 		fi
-
 	done
 
 	echo "  Passed"
@@ -402,15 +411,15 @@ function ntb_tool_tests()
 	doorbell_test "$LOCAL_TOOL" "$REMOTE_TOOL"
 	doorbell_test "$REMOTE_TOOL" "$LOCAL_TOOL"
 
+	scratchpad_test "$LOCAL_PEER_TOOL" "$REMOTE_PEER_TOOL"
+	scratchpad_test "$REMOTE_PEER_TOOL" "$LOCAL_PEER_TOOL"
+
 	for PEER_TRANS in $(ls "$LOCAL_TOOL"/peer_trans*); do
 		PT=$(basename $PEER_TRANS)
 		write_file $MW_SIZE "$LOCAL_TOOL/$PT"
 		write_file $MW_SIZE "$REMOTE_TOOL/$PT"
 	done
 
-	scratchpad_test "$LOCAL_TOOL" "$REMOTE_TOOL"
-	scratchpad_test "$REMOTE_TOOL" "$LOCAL_TOOL"
-
 	for MW in $(ls "$LOCAL_TOOL"/mw*); do
 		MW=$(basename $MW)
 
-- 
2.12.0

[PATCH v3 12/15] NTB: ntb_test: Add ntb_tool Message tests

[Serge Semin]

Messages NTB API is now available. ntb_tool driver has been altered
to perform messages send and receive operation. The test of messages
read/write to/from peer device has been added to the script.

Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
---
 tools/testing/selftests/ntb/ntb_test.sh | 37 +++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/tools/testing/selftests/ntb/ntb_test.sh b/tools/testing/selftests/ntb/ntb_test.sh
index 06b9b156a6fc..849191fd2308 100755
--- a/tools/testing/selftests/ntb/ntb_test.sh
+++ b/tools/testing/selftests/ntb/ntb_test.sh
@@ -282,6 +282,40 @@ function scratchpad_test()
 	echo "  Passed"
 }
 
+function message_test()
+{
+	LOC=$1
+	REM=$2
+
+	echo "Running msg tests on: $(subdirname $LOC) / $(subdirname $REM)"
+
+	CNT=$(get_files_count "msg" "$LOC")
+
+	if [[ $CNT -eq 0 ]]; then
+		echo "  Unsupported"
+		return
+	fi
+
+	MSG_OUTBITS_MASK=$(read_file "$LOC/../msg_inbits")
+	MSG_INBITS_MASK=$(read_file "$REM/../msg_inbits")
+
+	write_file "c $MSG_OUTBITS_MASK" "$LOC/../msg_sts"
+	write_file "c $MSG_INBITS_MASK" "$REM/../msg_sts"
+
+	for ((i = 0; i < $CNT; i++)); do
+		VAL=$RANDOM
+		write_file "$VAL" "$LOC/msg$i"
+		RVAL=$(read_file "$REM/../msg$i")
+
+		if [[ "$VAL" -ne "${RVAL%%<-*}" ]]; then
+			echo "Message $i value $RVAL doesn't match $VAL" >&2
+			exit -1
+		fi
+	done
+
+	echo "  Passed"
+}
+
 function write_mw()
 {
 	split_remote $2
@@ -414,6 +448,9 @@ function ntb_tool_tests()
 	scratchpad_test "$LOCAL_PEER_TOOL" "$REMOTE_PEER_TOOL"
 	scratchpad_test "$REMOTE_PEER_TOOL" "$LOCAL_PEER_TOOL"
 
+	message_test "$LOCAL_PEER_TOOL" "$REMOTE_PEER_TOOL"
+	message_test "$REMOTE_PEER_TOOL" "$LOCAL_PEER_TOOL"
+
 	for PEER_TRANS in $(ls "$LOCAL_TOOL"/peer_trans*); do
 		PT=$(basename $PEER_TRANS)
 		write_file $MW_SIZE "$LOCAL_TOOL/$PT"
-- 
2.12.0

[PATCH v3 13/15] NTB: ntb_test: Update ntb_tool MW tests

[Serge Semin]

There are devices (like IDT PCIe switches), which outbound MWs xlat address
is setup on peer side. In this case local side is supposed to allocate
a memory buffer and somehow deliver the xlat DMA address to peer so one
could set the outbound MW up. The MW test is altered so to support both
previous Intel/AMD and new IDT-like devices.

Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
---
 tools/testing/selftests/ntb/ntb_test.sh | 89 +++++++++++++++++++++++++--------
 1 file changed, 68 insertions(+), 21 deletions(-)

diff --git a/tools/testing/selftests/ntb/ntb_test.sh b/tools/testing/selftests/ntb/ntb_test.sh
index 849191fd2308..2dea126c85eb 100755
--- a/tools/testing/selftests/ntb/ntb_test.sh
+++ b/tools/testing/selftests/ntb/ntb_test.sh
@@ -43,7 +43,9 @@ function show_help()
 	echo "  -h              show this help message"
 	echo "  -l              list available local and remote PCI ids"
 	echo "  -r REMOTE_HOST  specify the remote's hostname to connect"
-        echo "                  to for the test (using ssh)"
+	echo "                  to for the test (using ssh)"
+	echo "  -m MW_SIZE      memory window size for ntb_tool"
+	echo "                  (default: $MW_SIZE)"
 	echo "  -p NUM          ntb_perf run order (default: $PERF_RUN_ORDER)"
 	echo "  -w max_mw_size  maxmium memory window size"
 	echo
@@ -316,6 +318,32 @@ function message_test()
 	echo "  Passed"
 }
 
+function get_number()
+{
+	KEY=$1
+
+	sed -n "s/^\(${KEY}\)[ \t]*\(0x[0-9a-fA-F]*\)\(\[p\]\)\?$/\2/p"
+}
+
+function mw_alloc()
+{
+	IDX=$1
+	LOC=$2
+	REM=$3
+
+	write_file $MW_SIZE "$LOC/mw_trans$IDX"
+
+	INB_MW=$(read_file "$LOC/mw_trans$IDX")
+	MW_ALIGNED_SIZE=$(echo "$INB_MW" | get_number "Window Size")
+	MW_DMA_ADDR=$(echo "$INB_MW" | get_number "DMA Address")
+
+	write_file "$MW_DMA_ADDR:$(($MW_ALIGNED_SIZE))" "$REM/peer_mw_trans$IDX"
+
+	if [[ $MW_SIZE -ne $MW_ALIGNED_SIZE ]]; then
+		echo "MW $IDX size aligned to $MW_ALIGNED_SIZE"
+	fi
+}
+
 function write_mw()
 {
 	split_remote $2
@@ -328,17 +356,15 @@ function write_mw()
 	fi
 }
 
-function mw_test()
+function mw_check()
 {
 	IDX=$1
 	LOC=$2
 	REM=$3
 
-	echo "Running $IDX tests on: $(basename $LOC) / $(basename $REM)"
-
-	write_mw "$LOC/$IDX"
+	write_mw "$LOC/mw$IDX"
 
-	split_remote "$LOC/$IDX"
+	split_remote "$LOC/mw$IDX"
 	if [[ "$REMOTE" == "" ]]; then
 		A=$VPATH
 	else
@@ -346,7 +372,7 @@ function mw_test()
 		ssh "$REMOTE" cat "$VPATH" > "$A"
 	fi
 
-	split_remote "$REM/peer_$IDX"
+	split_remote "$REM/peer_mw$IDX"
 	if [[ "$REMOTE" == "" ]]; then
 		B=$VPATH
 	else
@@ -354,7 +380,7 @@ function mw_test()
 		ssh "$REMOTE" cat "$VPATH" > "$B"
 	fi
 
-	cmp -n $MW_SIZE "$A" "$B"
+	cmp -n $MW_ALIGNED_SIZE "$A" "$B"
 	if [[ $? != 0 ]]; then
 		echo "Memory window $MW did not match!" >&2
 	fi
@@ -366,8 +392,39 @@ function mw_test()
 	if [[ "$B" == "/tmp/*" ]]; then
 		rm "$B"
 	fi
+}
+
+function mw_free()
+{
+	IDX=$1
+	LOC=$2
+	REM=$3
+
+	write_file "$MW_DMA_ADDR:0" "$REM/peer_mw_trans$IDX"
+
+	write_file 0 "$LOC/mw_trans$IDX"
+}
+
+function mw_test()
+{
+	LOC=$1
+	REM=$2
+
+	CNT=$(get_files_count "mw_trans" "$LOC")
+
+	for ((i = 0; i < $CNT; i++)); do
+		echo "Running mw$i tests on: $(subdirname $LOC) / " \
+		     "$(subdirname $REM)"
+
+		mw_alloc $i $LOC $REM
+
+		mw_check $i $LOC $REM
+
+		mw_free $i $LOC  $REM
+
+		echo "  Passed"
+	done
 
-	echo "  Passed"
 }
 
 function pingpong_test()
@@ -451,18 +508,8 @@ function ntb_tool_tests()
 	message_test "$LOCAL_PEER_TOOL" "$REMOTE_PEER_TOOL"
 	message_test "$REMOTE_PEER_TOOL" "$LOCAL_PEER_TOOL"
 
-	for PEER_TRANS in $(ls "$LOCAL_TOOL"/peer_trans*); do
-		PT=$(basename $PEER_TRANS)
-		write_file $MW_SIZE "$LOCAL_TOOL/$PT"
-		write_file $MW_SIZE "$REMOTE_TOOL/$PT"
-	done
-
-	for MW in $(ls "$LOCAL_TOOL"/mw*); do
-		MW=$(basename $MW)
-
-		mw_test $MW "$LOCAL_TOOL" "$REMOTE_TOOL"
-		mw_test $MW "$REMOTE_TOOL" "$LOCAL_TOOL"
-	done
+	mw_test "$LOCAL_PEER_TOOL" "$REMOTE_PEER_TOOL"
+	mw_test "$REMOTE_PEER_TOOL" "$LOCAL_PEER_TOOL"
 
 	_modprobe -r ntb_tool
 }
-- 
2.12.0

[PATCH v3 14/15] NTB: ntb_test: Update ntb_perf tests

[Serge Semin]

ntb_perf driver has been also updated so to have the multi-port
interface support. User now must specify what peer port is going
to be used to perform the test.

Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
---
 tools/testing/selftests/ntb/ntb_test.sh | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/tools/testing/selftests/ntb/ntb_test.sh b/tools/testing/selftests/ntb/ntb_test.sh
index 2dea126c85eb..08cbfbbc7029 100755
--- a/tools/testing/selftests/ntb/ntb_test.sh
+++ b/tools/testing/selftests/ntb/ntb_test.sh
@@ -39,15 +39,16 @@ function show_help()
 	echo
 	echo "Options:"
 	echo "  -C              don't cleanup ntb modules on exit"
-	echo "  -d              run dma tests"
 	echo "  -h              show this help message"
 	echo "  -l              list available local and remote PCI ids"
 	echo "  -r REMOTE_HOST  specify the remote's hostname to connect"
 	echo "                  to for the test (using ssh)"
 	echo "  -m MW_SIZE      memory window size for ntb_tool"
 	echo "                  (default: $MW_SIZE)"
-	echo "  -p NUM          ntb_perf run order (default: $PERF_RUN_ORDER)"
-	echo "  -w max_mw_size  maxmium memory window size"
+	echo "  -d              run dma tests for ntb_perf"
+	echo "  -p ORDER        total data order for ntb_perf"
+	echo "                  (default: $PERF_RUN_ORDER)"
+	echo "  -w MAX_MW_SIZE  maxmium memory window size for ntb_perf"
 	echo
 }
 
@@ -460,17 +461,17 @@ function perf_test()
 		WITH="without"
 	fi
 
-	_modprobe ntb_perf run_order=$PERF_RUN_ORDER \
+	_modprobe ntb_perf total_order=$PERF_RUN_ORDER \
 		max_mw_size=$MAX_MW_SIZE use_dma=$USE_DMA
 
 	echo "Running local perf test $WITH DMA"
-	write_file "" "$LOCAL_PERF/run"
+	write_file "$LOCAL_PIDX" "$LOCAL_PERF/run"
 	echo -n "  "
 	read_file "$LOCAL_PERF/run"
 	echo "  Passed"
 
 	echo "Running remote perf test $WITH DMA"
-	write_file "" "$REMOTE_PERF/run"
+	write_file "$REMOTE_PIDX" "$REMOTE_PERF/run"
 	echo -n "  "
 	read_file "$REMOTE_PERF/run"
 	echo "  Passed"
-- 
2.12.0

[PATCH v3 15/15] NTB: ntb_hw_idt: Set NTB_TOPO_SWITCH topology

[Serge Semin]

Since Switchtec patch there has been a new topology added to
the NTB API. It's called NTB_TOPO_SWITCH and dedicated for
PCIe switch chips. Even though topo field isn't used within the
IDT driver much, lets set it for the sake of unification.

Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
---
 drivers/ntb/hw/idt/ntb_hw_idt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/ntb/hw/idt/ntb_hw_idt.c b/drivers/ntb/hw/idt/ntb_hw_idt.c
index 93d4c9d2a9ad..8d98872d0983 100644
--- a/drivers/ntb/hw/idt/ntb_hw_idt.c
+++ b/drivers/ntb/hw/idt/ntb_hw_idt.c
@@ -2070,7 +2070,7 @@ static int idt_register_device(struct idt_ntb_dev *ndev)
 
 	/* Initialize the rest of NTB device structure and register it */
 	ndev->ntb.ops = &idt_ntb_ops;
-	ndev->ntb.topo = NTB_TOPO_PRI;
+	ndev->ntb.topo = NTB_TOPO_SWITCH;
 
 	ret = ntb_register_device(&ndev->ntb);
 	if (ret != 0) {
-- 
2.12.0

Re: [PATCH v3 00/15] NTB: Add full multi-port API support to the test drivers

[Logan Gunthorpe]

Please be kind to your reviewers and list all your changes in the cover 
letter.

Also, your Sergey.Semin@t-platforms.ru email which was CC'd doesn't seem 
to work for me so I've dropped it from my responses.

Thanks,

Logan

On 05/12/17 03:39 PM, Serge Semin wrote:
> The multi-port NTB API was introduced in kernel 4.13 as well as the
> first driver for the true multi-port devices of IDT PCIe-switches
> series. But the test drivers still were left almost unchanged. Yes,
> they didn't fail being used with new NTB API, but they only worked
> with two-ports NTB devices. This patchset is intended to fix the
> issue by amending the NTB test drivers and script so they would be
> fully compatible with multi-port NTB API.
> 
> Additionally I found a few NTB subsystem issues while developing the
> submitted patches. So they are also fixed in this patchset.
> 
> Serge Semin (15):
>    NTB: Rename NTB messaging API methods
>    NTB: Set dma mask and dma coherent mask to NTB devices
>    NTB: Fix UB/bug in ntb_mw_get_align()
>    NTB: ntb_pp: Add full multi-port NTB API support
>    NTB: ntb_tool: Add full multi-port NTB API support
>    NTB: ntb_perf: Add full multi-port NTB API support
>    NTB: ntb_test: Safely use paths with whitespace
>    NTB: ntb_test: Add ntb_tool port tests
>    NTB: ntb_test: Update ntb_tool link tests
>    NTB: ntb_test: Update ntb_tool DB tests
>    NTB: ntb_test: Update ntb_tool Scratchpad tests
>    NTB: ntb_test: Add ntb_tool Message tests
>    NTB: ntb_test: Update ntb_tool MW tests
>    NTB: ntb_test: Update ntb_perf tests
>    NTB: ntb_hw_idt: Set NTB_TOPO_SWITCH topology
> 
>   drivers/ntb/hw/amd/ntb_hw_amd.c         |    4 +
>   drivers/ntb/hw/idt/ntb_hw_idt.c         |   37 +-
>   drivers/ntb/hw/intel/ntb_hw_intel.c     |    4 +
>   drivers/ntb/ntb.c                       |    1 -
>   drivers/ntb/test/ntb_perf.c             | 1825 +++++++++++++++++++++----------
>   drivers/ntb/test/ntb_pingpong.c         |  450 +++++---
>   drivers/ntb/test/ntb_tool.c             | 1823 ++++++++++++++++++++----------
>   include/linux/ntb.h                     |   36 +-
>   tools/testing/selftests/ntb/ntb_test.sh |  307 ++++--
>   9 files changed, 3022 insertions(+), 1465 deletions(-)
> 

[PATCH v4 00/15] NTB: Add full multi-port API support to the test drivers

[Serge Semin]

The multi-port NTB API was introduced in kernel 4.13 as well as the
first driver for the true multi-port devices of IDT PCIe-switches
series. But the test drivers still were left almost unchanged. Yes,
they didn't fail being used with new NTB API, but they only worked
with two-ports NTB devices. This patchset is intended to fix the
issue by amending the NTB test drivers and script so they would be
fully compatible with multi-port NTB API.

Additionally I found a few NTB subsystem issues while developing the
submitted patches. So they are also fixed in this patchset.

The patchset is applied on top of the recent Jon Mason's repo state:
https://github.com/jonmason/ntb
Particularly the "ntb/ntb-next" branch is used. The last commit hash
had been:
commit <c47963de5204> ("ntb_hw_switchtec: Force down the link before")

Serge Semin (15):
  NTB: Rename NTB messaging API methods
  NTB: Set dma mask and dma coherent mask to NTB devices
  NTB: Fix UB/bug in ntb_mw_get_align()
  NTB: ntb_pp: Add full multi-port NTB API support
  NTB: ntb_tool: Add full multi-port NTB API support
  NTB: ntb_perf: Add full multi-port NTB API support
  NTB: ntb_test: Safely use paths with whitespace
  NTB: ntb_test: Add ntb_tool port tests
  NTB: ntb_test: Update ntb_tool link tests
  NTB: ntb_test: Update ntb_tool DB tests
  NTB: ntb_test: Update ntb_tool Scratchpad tests
  NTB: ntb_test: Add ntb_tool Message tests
  NTB: ntb_test: Update ntb_tool MW tests
  NTB: ntb_test: Update ntb_perf tests
  NTB: ntb_hw_idt: Set NTB_TOPO_SWITCH topology

 drivers/ntb/hw/amd/ntb_hw_amd.c         |    4 +
 drivers/ntb/hw/idt/ntb_hw_idt.c         |   37 +-
 drivers/ntb/hw/intel/ntb_hw_intel.c     |    4 +
 drivers/ntb/ntb.c                       |    1 -
 drivers/ntb/test/ntb_perf.c             | 1820 +++++++++++++++++++++----------
 drivers/ntb/test/ntb_pingpong.c         |  447 +++++---
 drivers/ntb/test/ntb_tool.c             | 1820 +++++++++++++++++++++----------
 include/linux/ntb.h                     |   36 +-
 tools/testing/selftests/ntb/ntb_test.sh |  307 ++++--
 9 files changed, 3018 insertions(+), 1458 deletions(-)

-- 
2.12.0

[PATCH v4 01/15] NTB: Rename NTB messaging API methods

[Serge Semin]

There is a common methods signature form used over all the NTB API
like functions naming scheme, arguments names and order, etc.
Recently added NTB messaging API IO callbacks were named a bit
different so should be renamed to be in compliance with the rest
of the API.

Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
---
 drivers/ntb/hw/idt/ntb_hw_idt.c | 27 ++++++++++++---------------
 include/linux/ntb.h             | 34 ++++++++++++++++------------------
 2 files changed, 28 insertions(+), 33 deletions(-)

diff --git a/drivers/ntb/hw/idt/ntb_hw_idt.c b/drivers/ntb/hw/idt/ntb_hw_idt.c
index 0cd79f367f7c..24040317bb9c 100644
--- a/drivers/ntb/hw/idt/ntb_hw_idt.c
+++ b/drivers/ntb/hw/idt/ntb_hw_idt.c
@@ -1744,20 +1744,19 @@ static int idt_ntb_msg_clear_mask(struct ntb_dev *ntb, u64 mask_bits)
  * idt_ntb_msg_read() - read message register with specified index
  *			(NTB API callback)
  * @ntb:	NTB device context.
- * @midx:	Message register index
  * @pidx:	OUT - Port index of peer device a message retrieved from
- * @msg:	OUT - Data
+ * @midx:	Message register index
  *
  * Read data from the specified message register and source register.
  *
- * Return: zero on success, negative error if invalid argument passed.
+ * Return: inbound message register value.
  */
-static int idt_ntb_msg_read(struct ntb_dev *ntb, int midx, int *pidx, u32 *msg)
+static u32 idt_ntb_msg_read(struct ntb_dev *ntb, int *pidx, int midx)
 {
 	struct idt_ntb_dev *ndev = to_ndev_ntb(ntb);
 
 	if (midx < 0 || IDT_MSG_CNT <= midx)
-		return -EINVAL;
+		return ~(u32)0;
 
 	/* Retrieve source port index of the message */
 	if (pidx != NULL) {
@@ -1772,18 +1771,15 @@ static int idt_ntb_msg_read(struct ntb_dev *ntb, int midx, int *pidx, u32 *msg)
 	}
 
 	/* Retrieve data of the corresponding message register */
-	if (msg != NULL)
-		*msg = idt_nt_read(ndev, ntdata_tbl.msgs[midx].in);
-
-	return 0;
+	return idt_nt_read(ndev, ntdata_tbl.msgs[midx].in);
 }
 
 /*
- * idt_ntb_msg_write() - write data to the specified message register
- *			 (NTB API callback)
+ * idt_ntb_peer_msg_write() - write data to the specified message register
+ *			      (NTB API callback)
  * @ntb:	NTB device context.
- * @midx:	Message register index
  * @pidx:	Port index of peer device a message being sent to
+ * @midx:	Message register index
  * @msg:	Data to send
  *
  * Just try to send data to a peer. Message status register should be
@@ -1791,7 +1787,8 @@ static int idt_ntb_msg_read(struct ntb_dev *ntb, int midx, int *pidx, u32 *msg)
  *
  * Return: zero on success, negative error if invalid argument passed.
  */
-static int idt_ntb_msg_write(struct ntb_dev *ntb, int midx, int pidx, u32 msg)
+static int idt_ntb_peer_msg_write(struct ntb_dev *ntb, int pidx, int midx,
+				  u32 msg)
 {
 	struct idt_ntb_dev *ndev = to_ndev_ntb(ntb);
 	unsigned long irqflags;
@@ -2058,7 +2055,7 @@ static const struct ntb_dev_ops idt_ntb_ops = {
 	.msg_set_mask		= idt_ntb_msg_set_mask,
 	.msg_clear_mask		= idt_ntb_msg_clear_mask,
 	.msg_read		= idt_ntb_msg_read,
-	.msg_write		= idt_ntb_msg_write
+	.peer_msg_write		= idt_ntb_peer_msg_write
 };
 
 /*
@@ -2269,7 +2266,7 @@ static ssize_t idt_dbgfs_info_read(struct file *filp, char __user *ubuf,
 		 "Message data:\n");
 	for (idx = 0; idx < IDT_MSG_CNT; idx++) {
 		int src;
-		(void)idt_ntb_msg_read(&ndev->ntb, idx, &src, &data);
+		data = idt_ntb_msg_read(&ndev->ntb, &src, idx);
 		off += scnprintf(strbuf + off, size - off,
 			"\t%hhu. 0x%08x from peer %hhu (Port %hhu)\n",
 			idx, data, src, ndev->peers[src].port);
diff --git a/include/linux/ntb.h b/include/linux/ntb.h
index ea3be7275a5e..21b1826a0953 100644
--- a/include/linux/ntb.h
+++ b/include/linux/ntb.h
@@ -253,7 +253,7 @@ static inline int ntb_ctx_ops_is_valid(const struct ntb_ctx_ops *ops)
  * @msg_set_mask:	See ntb_msg_set_mask().
  * @msg_clear_mask:	See ntb_msg_clear_mask().
  * @msg_read:		See ntb_msg_read().
- * @msg_write:		See ntb_msg_write().
+ * @peer_msg_write:	See ntb_peer_msg_write().
  */
 struct ntb_dev_ops {
 	int (*port_number)(struct ntb_dev *ntb);
@@ -324,8 +324,8 @@ struct ntb_dev_ops {
 	int (*msg_clear_sts)(struct ntb_dev *ntb, u64 sts_bits);
 	int (*msg_set_mask)(struct ntb_dev *ntb, u64 mask_bits);
 	int (*msg_clear_mask)(struct ntb_dev *ntb, u64 mask_bits);
-	int (*msg_read)(struct ntb_dev *ntb, int midx, int *pidx, u32 *msg);
-	int (*msg_write)(struct ntb_dev *ntb, int midx, int pidx, u32 msg);
+	u32 (*msg_read)(struct ntb_dev *ntb, int *pidx, int midx);
+	int (*peer_msg_write)(struct ntb_dev *ntb, int pidx, int midx, u32 msg);
 };
 
 static inline int ntb_dev_ops_is_valid(const struct ntb_dev_ops *ops)
@@ -387,7 +387,7 @@ static inline int ntb_dev_ops_is_valid(const struct ntb_dev_ops *ops)
 		/* !ops->msg_set_mask == !ops->msg_count	&& */
 		/* !ops->msg_clear_mask == !ops->msg_count	&& */
 		!ops->msg_read == !ops->msg_count		&&
-		!ops->msg_write == !ops->msg_count		&&
+		!ops->peer_msg_write == !ops->msg_count		&&
 		1;
 }
 
@@ -1462,31 +1462,29 @@ static inline int ntb_msg_clear_mask(struct ntb_dev *ntb, u64 mask_bits)
 }
 
 /**
- * ntb_msg_read() - read message register with specified index
+ * ntb_msg_read() - read inbound message register with specified index
  * @ntb:	NTB device context.
- * @midx:	Message register index
  * @pidx:	OUT - Port index of peer device a message retrieved from
- * @msg:	OUT - Data
+ * @midx:	Message register index
  *
  * Read data from the specified message register. Source port index of a
  * message is retrieved as well.
  *
- * Return: Zero on success, otherwise a negative error number.
+ * Return: The value of the inbound message register.
  */
-static inline int ntb_msg_read(struct ntb_dev *ntb, int midx, int *pidx,
-			       u32 *msg)
+static inline u32 ntb_msg_read(struct ntb_dev *ntb, int *pidx, int midx)
 {
 	if (!ntb->ops->msg_read)
-		return -EINVAL;
+		return ~(u32)0;
 
-	return ntb->ops->msg_read(ntb, midx, pidx, msg);
+	return ntb->ops->msg_read(ntb, pidx, midx);
 }
 
 /**
- * ntb_msg_write() - write data to the specified message register
+ * ntb_peer_msg_write() - write data to the specified peer message register
  * @ntb:	NTB device context.
- * @midx:	Message register index
  * @pidx:	Port index of peer device a message being sent to
+ * @midx:	Message register index
  * @msg:	Data to send
  *
  * Send data to a specified peer device using the defined message register.
@@ -1495,13 +1493,13 @@ static inline int ntb_msg_read(struct ntb_dev *ntb, int midx, int *pidx,
  *
  * Return: Zero on success, otherwise a negative error number.
  */
-static inline int ntb_msg_write(struct ntb_dev *ntb, int midx, int pidx,
-				u32 msg)
+static inline int ntb_peer_msg_write(struct ntb_dev *ntb, int pidx, int midx,
+				     u32 msg)
 {
-	if (!ntb->ops->msg_write)
+	if (!ntb->ops->peer_msg_write)
 		return -EINVAL;
 
-	return ntb->ops->msg_write(ntb, midx, pidx, msg);
+	return ntb->ops->peer_msg_write(ntb, pidx, midx, msg);
 }
 
 #endif
-- 
2.12.0

[PATCH v4 02/15] NTB: Set dma mask and dma coherent mask to NTB devices

[Serge Semin]

The dma_mask and dma_coherent_mask fields of the NTB struct device
weren't initialized in hardware drivers. In fact it should be done
instead of PCIe interface usage, since NTB clients are supposed to
use NTB API and left unaware of real hardware implementation.
In addition to that ntb_device_register() method shouldn't clear
the passed ntb_dev structure, since it dma_mask is initialized
by hardware drivers.

Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
---
 drivers/ntb/hw/amd/ntb_hw_amd.c     | 4 ++++
 drivers/ntb/hw/idt/ntb_hw_idt.c     | 8 +++++++-
 drivers/ntb/hw/intel/ntb_hw_intel.c | 4 ++++
 drivers/ntb/ntb.c                   | 1 -
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/drivers/ntb/hw/amd/ntb_hw_amd.c b/drivers/ntb/hw/amd/ntb_hw_amd.c
index f0788aae05c9..3cfa46876239 100644
--- a/drivers/ntb/hw/amd/ntb_hw_amd.c
+++ b/drivers/ntb/hw/amd/ntb_hw_amd.c
@@ -1020,6 +1020,10 @@ static int amd_ntb_init_pci(struct amd_ntb_dev *ndev,
 			goto err_dma_mask;
 		dev_warn(&pdev->dev, "Cannot DMA consistent highmem\n");
 	}
+	rc = dma_coerce_mask_and_coherent(&ndev->ntb.dev,
+					  dma_get_mask(&pdev->dev));
+	if (rc)
+		goto err_dma_mask;
 
 	ndev->self_mmio = pci_iomap(pdev, 0, 0);
 	if (!ndev->self_mmio) {
diff --git a/drivers/ntb/hw/idt/ntb_hw_idt.c b/drivers/ntb/hw/idt/ntb_hw_idt.c
index 24040317bb9c..93d4c9d2a9ad 100644
--- a/drivers/ntb/hw/idt/ntb_hw_idt.c
+++ b/drivers/ntb/hw/idt/ntb_hw_idt.c
@@ -2426,7 +2426,7 @@ static int idt_init_pci(struct idt_ntb_dev *ndev)
 	struct pci_dev *pdev = ndev->ntb.pdev;
 	int ret;
 
-	/* Initialize the bit mask of DMA */
+	/* Initialize the bit mask of PCI/NTB DMA */
 	ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(64));
 	if (ret != 0) {
 		ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
@@ -2447,6 +2447,12 @@ static int idt_init_pci(struct idt_ntb_dev *ndev)
 		dev_warn(&pdev->dev,
 			"Cannot set consistent DMA highmem bit mask\n");
 	}
+	ret = dma_coerce_mask_and_coherent(&ndev->ntb.dev,
+					   dma_get_mask(&pdev->dev));
+	if (ret != 0) {
+		dev_err(&pdev->dev, "Failed to set NTB device DMA bit mask\n");
+		return ret;
+	}
 
 	/*
 	 * Enable the device advanced error reporting. It's not critical to
diff --git a/drivers/ntb/hw/intel/ntb_hw_intel.c b/drivers/ntb/hw/intel/ntb_hw_intel.c
index 341a3d5baa3f..156b45cd4a19 100644
--- a/drivers/ntb/hw/intel/ntb_hw_intel.c
+++ b/drivers/ntb/hw/intel/ntb_hw_intel.c
@@ -2334,6 +2334,10 @@ static int intel_ntb_init_pci(struct intel_ntb_dev *ndev, struct pci_dev *pdev)
 			goto err_dma_mask;
 		dev_warn(&pdev->dev, "Cannot DMA consistent highmem\n");
 	}
+	rc = dma_coerce_mask_and_coherent(&ndev->ntb.dev,
+					  dma_get_mask(&pdev->dev));
+	if (rc)
+		goto err_dma_mask;
 
 	ndev->self_mmio = pci_iomap(pdev, 0, 0);
 	if (!ndev->self_mmio) {
diff --git a/drivers/ntb/ntb.c b/drivers/ntb/ntb.c
index bdcd59b13c1f..2581ab724c34 100644
--- a/drivers/ntb/ntb.c
+++ b/drivers/ntb/ntb.c
@@ -111,7 +111,6 @@ int ntb_register_device(struct ntb_dev *ntb)
 
 	init_completion(&ntb->released);
 
-	memset(&ntb->dev, 0, sizeof(ntb->dev));
 	ntb->dev.bus = &ntb_bus;
 	ntb->dev.parent = &ntb->pdev->dev;
 	ntb->dev.release = ntb_dev_release;
-- 
2.12.0

[PATCH v4 03/15] NTB: Fix UB/bug in ntb_mw_get_align()

[Serge Semin]

Simple (1 << pidx) operation causes undefined behaviour when
pidx >= 32. It must be casted to u64 to match the actual return
value of ntb_link_is_up() method, so to have all the possible
peer indexes covered and to get rid of undefined behaviour.
Additionally there are special macros in "linux/bitops.h" to perform
the bit-set-shift operations, so it's recommended to have them used
for proper bit setting.

Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
Reviewed-by: Logan Gunthorpe <logang@deltatee.com>
---
 include/linux/ntb.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/linux/ntb.h b/include/linux/ntb.h
index 21b1826a0953..181d16601dd9 100644
--- a/include/linux/ntb.h
+++ b/include/linux/ntb.h
@@ -767,7 +767,7 @@ static inline int ntb_mw_get_align(struct ntb_dev *ntb, int pidx, int widx,
 				   resource_size_t *size_align,
 				   resource_size_t *size_max)
 {
-	if (!(ntb_link_is_up(ntb, NULL, NULL) & (1 << pidx)))
+	if (!(ntb_link_is_up(ntb, NULL, NULL) & BIT_ULL(pidx)))
 		return -ENOTCONN;
 
 	return ntb->ops->mw_get_align(ntb, pidx, widx, addr_align, size_align,
-- 
2.12.0

[PATCH v4 04/15] NTB: ntb_pp: Add full multi-port NTB API support

[Serge Semin]

Current Ping Pong driver can't truly work with multi-port devices.
Additionally it requires the Scratchpad registers being available
on NTB device. This patches rewrites the driver so one would
perform the cyclic Ping-Pong algorithm around all the available
NTB peers and makes it working with NTB hardware, which doesn't
support Scratchpads, but such alternative as NTB Message register.
Additional cleanups are also added here.

Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
---
Changelog v1:
- Add Multi-port API support
- Use NTB Message registers if available
- Ping-pong now works like cyclic ping around all the peers

Changelog v2:
- Remove driver Author/Description/Version macros

Changelog v3:
- Remove contacts from the driver header
- Discard spin_lock/unlocks around debug prints
- Print error if neither Msg and Spads available

 drivers/ntb/test/ntb_pingpong.c | 447 +++++++++++++++++++++++++---------------
 1 file changed, 282 insertions(+), 165 deletions(-)

diff --git a/drivers/ntb/test/ntb_pingpong.c b/drivers/ntb/test/ntb_pingpong.c
index e700873e03fb..65865e460ab8 100644
--- a/drivers/ntb/test/ntb_pingpong.c
+++ b/drivers/ntb/test/ntb_pingpong.c
@@ -1,10 +1,11 @@
 /*
- * This file is provided under a dual BSD/GPLv2 license.  When using or
+ *   This file is provided under a dual BSD/GPLv2 license.  When using or
  *   redistributing this file, you may do so under either license.
  *
  *   GPL LICENSE SUMMARY
  *
  *   Copyright (C) 2015 EMC Corporation. All Rights Reserved.
+ *   Copyright (C) 2017 T-Platforms. All Rights Reserved.
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of version 2 of the GNU General Public License as
@@ -18,6 +19,7 @@
  *   BSD LICENSE
  *
  *   Copyright (C) 2015 EMC Corporation. All Rights Reserved.
+ *   Copyright (C) 2017 T-Platforms. All Rights Reserved.
  *
  *   Redistribution and use in source and binary forms, with or without
  *   modification, are permitted provided that the following conditions
@@ -46,36 +48,45 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * PCIe NTB Pingpong Linux driver
- *
- * Contact Information:
- * Allen Hubbe <Allen.Hubbe@emc.com>
  */
 
-/* Note: load this module with option 'dyndbg=+p' */
+/*
+ * How to use this tool, by example.
+ *
+ * Assuming $DBG_DIR is something like:
+ * '/sys/kernel/debug/ntb_perf/0000:00:03.0'
+ * Suppose aside from local device there is at least one remote device
+ * connected to NTB with index 0.
+ *-----------------------------------------------------------------------------
+ * Eg: install driver with specified delay between doorbell event and response
+ *
+ * root@self# insmod ntb_pingpong.ko delay_ms=1000
+ *-----------------------------------------------------------------------------
+ * Eg: get number of ping-pong cycles performed
+ *
+ * root@self# cat $DBG_DIR/count
+ */
 
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/device.h>
+#include <linux/bitops.h>
 
-#include <linux/dma-mapping.h>
 #include <linux/pci.h>
 #include <linux/slab.h>
-#include <linux/spinlock.h>
+#include <linux/hrtimer.h>
 #include <linux/debugfs.h>
 
 #include <linux/ntb.h>
 
-#define DRIVER_NAME			"ntb_pingpong"
-#define DRIVER_DESCRIPTION		"PCIe NTB Simple Pingpong Client"
-
-#define DRIVER_VERSION			"1.0"
-#define DRIVER_RELDATE			"24 March 2015"
-#define DRIVER_AUTHOR			"Allen Hubbe <Allen.Hubbe@emc.com>"
+#define DRIVER_NAME		"ntb_pingpong"
+#define DRIVER_VERSION		"2.0"
 
 MODULE_LICENSE("Dual BSD/GPL");
 MODULE_VERSION(DRIVER_VERSION);
-MODULE_AUTHOR(DRIVER_AUTHOR);
-MODULE_DESCRIPTION(DRIVER_DESCRIPTION);
+MODULE_AUTHOR("Allen Hubbe <Allen.Hubbe@emc.com>");
+MODULE_DESCRIPTION("PCIe NTB Simple Pingpong Client");
 
 static unsigned int unsafe;
 module_param(unsafe, uint, 0644);
@@ -85,237 +96,343 @@ static unsigned int delay_ms = 1000;
 module_param(delay_ms, uint, 0644);
 MODULE_PARM_DESC(delay_ms, "Milliseconds to delay the response to peer");
 
-static unsigned long db_init = 0x7;
-module_param(db_init, ulong, 0644);
-MODULE_PARM_DESC(db_init, "Initial doorbell bits to ring on the peer");
-
-/* Only two-ports NTB devices are supported */
-#define PIDX		NTB_DEF_PEER_IDX
-
 struct pp_ctx {
-	struct ntb_dev			*ntb;
-	u64				db_bits;
-	/* synchronize access to db_bits by ping and pong */
-	spinlock_t			db_lock;
-	struct timer_list		db_timer;
-	unsigned long			db_delay;
-	struct dentry			*debugfs_node_dir;
-	struct dentry			*debugfs_count;
-	atomic_t			count;
+	struct ntb_dev *ntb;
+	struct hrtimer timer;
+	u64 in_db;
+	u64 out_db;
+	int out_pidx;
+	u64 nmask;
+	u64 pmask;
+	atomic_t count;
+	spinlock_t lock;
+	struct dentry *dbgfs_dir;
 };
+#define to_pp_timer(__timer) \
+	container_of(__timer, struct pp_ctx, timer)
 
-static struct dentry *pp_debugfs_dir;
+static struct dentry *pp_dbgfs_topdir;
 
-static void pp_ping(struct timer_list *t)
+static int pp_find_next_peer(struct pp_ctx *pp)
 {
-	struct pp_ctx *pp = from_timer(pp, t, db_timer);
-	unsigned long irqflags;
-	u64 db_bits, db_mask;
-	u32 spad_rd, spad_wr;
+	u64 link, out_db;
+	int pidx;
+
+	link = ntb_link_is_up(pp->ntb, NULL, NULL);
+
+	/* Find next available peer */
+	if (link & pp->nmask) {
+		pidx = __ffs64(link & pp->nmask);
+		out_db = BIT_ULL(pidx + 1);
+	} else if (link & pp->pmask) {
+		pidx = __ffs64(link & pp->pmask);
+		out_db = BIT_ULL(pidx);
+	} else {
+		return -ENODEV;
+	}
 
-	spin_lock_irqsave(&pp->db_lock, irqflags);
-	{
-		db_mask = ntb_db_valid_mask(pp->ntb);
-		db_bits = ntb_db_read(pp->ntb);
+	spin_lock(&pp->lock);
+	pp->out_pidx = pidx;
+	pp->out_db = out_db;
+	spin_unlock(&pp->lock);
 
-		if (db_bits) {
-			dev_dbg(&pp->ntb->dev,
-				"Masked pongs %#llx\n",
-				db_bits);
-			ntb_db_clear(pp->ntb, db_bits);
-		}
+	return 0;
+}
 
-		db_bits = ((pp->db_bits | db_bits) << 1) & db_mask;
+static void pp_setup(struct pp_ctx *pp)
+{
+	int ret;
 
-		if (!db_bits)
-			db_bits = db_init;
+	ntb_db_set_mask(pp->ntb, pp->in_db);
 
-		spad_rd = ntb_spad_read(pp->ntb, 0);
-		spad_wr = spad_rd + 1;
+	hrtimer_cancel(&pp->timer);
 
-		dev_dbg(&pp->ntb->dev,
-			"Ping bits %#llx read %#x write %#x\n",
-			db_bits, spad_rd, spad_wr);
+	ret = pp_find_next_peer(pp);
+	if (ret == -ENODEV) {
+		dev_dbg(&pp->ntb->dev, "Got no peers, so cancel\n");
+		return;
+	}
 
-		ntb_peer_spad_write(pp->ntb, PIDX, 0, spad_wr);
-		ntb_peer_db_set(pp->ntb, db_bits);
-		ntb_db_clear_mask(pp->ntb, db_mask);
+	dev_dbg(&pp->ntb->dev, "Ping-pong started with port %d, db %#llx\n",
+		ntb_peer_port_number(pp->ntb, pp->out_pidx), pp->out_db);
 
-		pp->db_bits = 0;
-	}
-	spin_unlock_irqrestore(&pp->db_lock, irqflags);
+	hrtimer_start(&pp->timer, ms_to_ktime(delay_ms), HRTIMER_MODE_REL);
 }
 
-static void pp_link_event(void *ctx)
+static void pp_clear(struct pp_ctx *pp)
 {
-	struct pp_ctx *pp = ctx;
+	hrtimer_cancel(&pp->timer);
 
-	if (ntb_link_is_up(pp->ntb, NULL, NULL) == 1) {
-		dev_dbg(&pp->ntb->dev, "link is up\n");
-		pp_ping(&pp->db_timer);
-	} else {
-		dev_dbg(&pp->ntb->dev, "link is down\n");
-		del_timer(&pp->db_timer);
-	}
+	ntb_db_set_mask(pp->ntb, pp->in_db);
+
+	dev_dbg(&pp->ntb->dev, "Ping-pong cancelled\n");
 }
 
-static void pp_db_event(void *ctx, int vec)
+static void pp_ping(struct pp_ctx *pp)
 {
-	struct pp_ctx *pp = ctx;
-	u64 db_bits, db_mask;
-	unsigned long irqflags;
+	u32 count;
 
-	spin_lock_irqsave(&pp->db_lock, irqflags);
-	{
-		db_mask = ntb_db_vector_mask(pp->ntb, vec);
-		db_bits = db_mask & ntb_db_read(pp->ntb);
-		ntb_db_set_mask(pp->ntb, db_mask);
-		ntb_db_clear(pp->ntb, db_bits);
+	count = atomic_read(&pp->count);
 
-		pp->db_bits |= db_bits;
+	spin_lock(&pp->lock);
+	ntb_peer_spad_write(pp->ntb, pp->out_pidx, 0, count);
+	ntb_peer_msg_write(pp->ntb, pp->out_pidx, 0, count);
 
-		mod_timer(&pp->db_timer, jiffies + pp->db_delay);
+	dev_dbg(&pp->ntb->dev, "Ping port %d spad %#x, msg %#x\n",
+		ntb_peer_port_number(pp->ntb, pp->out_pidx), count, count);
 
-		dev_dbg(&pp->ntb->dev,
-			"Pong vec %d bits %#llx\n",
-			vec, db_bits);
-		atomic_inc(&pp->count);
-	}
-	spin_unlock_irqrestore(&pp->db_lock, irqflags);
+	ntb_peer_db_set(pp->ntb, pp->out_db);
+	ntb_db_clear_mask(pp->ntb, pp->in_db);
+	spin_unlock(&pp->lock);
 }
 
-static int pp_debugfs_setup(struct pp_ctx *pp)
+static void pp_pong(struct pp_ctx *pp)
 {
-	struct pci_dev *pdev = pp->ntb->pdev;
+	u32 msg_data = -1, spad_data = -1;
+	int pidx = 0;
 
-	if (!pp_debugfs_dir)
-		return -ENODEV;
+	/* Read pong data */
+	spad_data = ntb_spad_read(pp->ntb, 0);
+	msg_data = ntb_msg_read(pp->ntb, &pidx, 0);
+	ntb_msg_clear_sts(pp->ntb, -1);
 
-	pp->debugfs_node_dir = debugfs_create_dir(pci_name(pdev),
-						  pp_debugfs_dir);
-	if (!pp->debugfs_node_dir)
-		return -ENODEV;
+	/*
+	 * Scratchpad and message data may differ, since message register can't
+	 * be rewritten unless status is cleared. Additionally either of them
+	 * might be unsupported
+	 */
+	dev_dbg(&pp->ntb->dev, "Pong spad %#x, msg %#x (port %d)\n",
+		spad_data, msg_data, ntb_peer_port_number(pp->ntb, pidx));
 
-	pp->debugfs_count = debugfs_create_atomic_t("count", S_IRUSR | S_IWUSR,
-						    pp->debugfs_node_dir,
-						    &pp->count);
-	if (!pp->debugfs_count)
-		return -ENODEV;
+	atomic_inc(&pp->count);
 
-	return 0;
+	ntb_db_set_mask(pp->ntb, pp->in_db);
+	ntb_db_clear(pp->ntb, pp->in_db);
+
+	hrtimer_start(&pp->timer, ms_to_ktime(delay_ms), HRTIMER_MODE_REL);
+}
+
+static enum hrtimer_restart pp_timer_func(struct hrtimer *t)
+{
+	struct pp_ctx *pp = to_pp_timer(t);
+
+	pp_ping(pp);
+
+	return HRTIMER_NORESTART;
+}
+
+static void pp_link_event(void *ctx)
+{
+	struct pp_ctx *pp = ctx;
+
+	pp_setup(pp);
+}
+
+static void pp_db_event(void *ctx, int vec)
+{
+	struct pp_ctx *pp = ctx;
+
+	pp_pong(pp);
 }
 
 static const struct ntb_ctx_ops pp_ops = {
 	.link_event = pp_link_event,
-	.db_event = pp_db_event,
+	.db_event = pp_db_event
 };
 
-static int pp_probe(struct ntb_client *client,
-		    struct ntb_dev *ntb)
+static int pp_check_ntb(struct ntb_dev *ntb)
 {
-	struct pp_ctx *pp;
-	int rc;
+	u64 pmask;
 
 	if (ntb_db_is_unsafe(ntb)) {
-		dev_dbg(&ntb->dev, "doorbell is unsafe\n");
-		if (!unsafe) {
-			rc = -EINVAL;
-			goto err_pp;
-		}
-	}
-
-	if (ntb_spad_count(ntb) < 1) {
-		dev_dbg(&ntb->dev, "no enough scratchpads\n");
-		rc = -EINVAL;
-		goto err_pp;
+		dev_dbg(&ntb->dev, "Doorbell is unsafe\n");
+		if (!unsafe)
+			return -EINVAL;
 	}
 
 	if (ntb_spad_is_unsafe(ntb)) {
-		dev_dbg(&ntb->dev, "scratchpad is unsafe\n");
-		if (!unsafe) {
-			rc = -EINVAL;
-			goto err_pp;
-		}
+		dev_dbg(&ntb->dev, "Scratchpad is unsafe\n");
+		if (!unsafe)
+			return -EINVAL;
 	}
 
-	if (ntb_peer_port_count(ntb) != NTB_DEF_PEER_CNT)
-		dev_warn(&ntb->dev, "multi-port NTB is unsupported\n");
+	pmask = GENMASK_ULL(ntb_peer_port_count(ntb), 0);
+	if ((ntb_db_valid_mask(ntb) & pmask) != pmask) {
+		dev_err(&ntb->dev, "Unsupported DB configuration\n");
+		return -EINVAL;
+	}
 
-	pp = kmalloc(sizeof(*pp), GFP_KERNEL);
-	if (!pp) {
-		rc = -ENOMEM;
-		goto err_pp;
+	if (ntb_spad_count(ntb) < 1 && ntb_msg_count(ntb) < 1) {
+		dev_err(&ntb->dev, "Scratchpads and messages unsupported\n");
+		return -EINVAL;
+	} else if (ntb_spad_count(ntb) < 1) {
+		dev_dbg(&ntb->dev, "Scratchpads unsupported\n");
+	} else if (ntb_msg_count(ntb) < 1) {
+		dev_dbg(&ntb->dev, "Messages unsupported\n");
 	}
 
+	return 0;
+}
+
+static struct pp_ctx *pp_create_data(struct ntb_dev *ntb)
+{
+	struct pp_ctx *pp;
+
+	pp = devm_kzalloc(&ntb->dev, sizeof(*pp), GFP_KERNEL);
+	if (!pp)
+		return ERR_PTR(-ENOMEM);
+
 	pp->ntb = ntb;
-	pp->db_bits = 0;
 	atomic_set(&pp->count, 0);
-	spin_lock_init(&pp->db_lock);
-	timer_setup(&pp->db_timer, pp_ping, 0);
-	pp->db_delay = msecs_to_jiffies(delay_ms);
+	spin_lock_init(&pp->lock);
+	hrtimer_init(&pp->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
+	pp->timer.function = pp_timer_func;
+
+	return pp;
+}
+
+static void pp_init_flds(struct pp_ctx *pp)
+{
+	int pidx, lport, pcnt;
+
+	/* Find global port index */
+	lport = ntb_port_number(pp->ntb);
+	pcnt = ntb_peer_port_count(pp->ntb);
+	for (pidx = 0; pidx < pcnt; pidx++) {
+		if (lport < ntb_peer_port_number(pp->ntb, pidx))
+			break;
+	}
 
-	rc = ntb_set_ctx(ntb, pp, &pp_ops);
-	if (rc)
-		goto err_ctx;
+	pp->in_db = BIT_ULL(pidx);
+	pp->pmask = GENMASK_ULL(pidx, 0) >> 1;
+	pp->nmask = GENMASK_ULL(pcnt - 1, pidx);
 
-	rc = pp_debugfs_setup(pp);
-	if (rc)
-		goto err_ctx;
+	dev_dbg(&pp->ntb->dev, "Inbound db %#llx, prev %#llx, next %#llx\n",
+		pp->in_db, pp->pmask, pp->nmask);
+}
+
+static int pp_mask_events(struct pp_ctx *pp)
+{
+	u64 db_mask, msg_mask;
+	int ret;
+
+	db_mask = ntb_db_valid_mask(pp->ntb);
+	ret = ntb_db_set_mask(pp->ntb, db_mask);
+	if (ret)
+		return ret;
 
-	ntb_link_enable(ntb, NTB_SPEED_AUTO, NTB_WIDTH_AUTO);
-	ntb_link_event(ntb);
+	/* Skip message events masking if unsupported */
+	if (ntb_msg_count(pp->ntb) < 1)
+		return 0;
+
+	msg_mask = ntb_msg_outbits(pp->ntb) | ntb_msg_inbits(pp->ntb);
+	return ntb_msg_set_mask(pp->ntb, msg_mask);
+}
+
+static int pp_setup_ctx(struct pp_ctx *pp)
+{
+	int ret;
+
+	ret = ntb_set_ctx(pp->ntb, pp, &pp_ops);
+	if (ret)
+		return ret;
+
+	ntb_link_enable(pp->ntb, NTB_SPEED_AUTO, NTB_WIDTH_AUTO);
+	/* Might be not necessary */
+	ntb_link_event(pp->ntb);
 
 	return 0;
+}
+
+static void pp_clear_ctx(struct pp_ctx *pp)
+{
+	ntb_link_disable(pp->ntb);
 
-err_ctx:
-	kfree(pp);
-err_pp:
-	return rc;
+	ntb_clear_ctx(pp->ntb);
 }
 
-static void pp_remove(struct ntb_client *client,
-		      struct ntb_dev *ntb)
+static void pp_setup_dbgfs(struct pp_ctx *pp)
+{
+	struct pci_dev *pdev = pp->ntb->pdev;
+	void *ret;
+
+	pp->dbgfs_dir = debugfs_create_dir(pci_name(pdev), pp_dbgfs_topdir);
+
+	ret = debugfs_create_atomic_t("count", 0600, pp->dbgfs_dir, &pp->count);
+	if (!ret)
+		dev_warn(&pp->ntb->dev, "DebugFS unsupported\n");
+}
+
+static void pp_clear_dbgfs(struct pp_ctx *pp)
+{
+	debugfs_remove_recursive(pp->dbgfs_dir);
+}
+
+static int pp_probe(struct ntb_client *client, struct ntb_dev *ntb)
+{
+	struct pp_ctx *pp;
+	int ret;
+
+	ret = pp_check_ntb(ntb);
+	if (ret)
+		return ret;
+
+	pp = pp_create_data(ntb);
+	if (IS_ERR(pp))
+		return PTR_ERR(pp);
+
+	pp_init_flds(pp);
+
+	ret = pp_mask_events(pp);
+	if (ret)
+		return ret;
+
+	ret = pp_setup_ctx(pp);
+	if (ret)
+		return ret;
+
+	pp_setup_dbgfs(pp);
+
+	return 0;
+}
+
+static void pp_remove(struct ntb_client *client, struct ntb_dev *ntb)
 {
 	struct pp_ctx *pp = ntb->ctx;
 
-	debugfs_remove_recursive(pp->debugfs_node_dir);
+	pp_clear_dbgfs(pp);
 
-	ntb_clear_ctx(ntb);
-	del_timer_sync(&pp->db_timer);
-	ntb_link_disable(ntb);
+	pp_clear_ctx(pp);
 
-	kfree(pp);
+	pp_clear(pp);
 }
 
 static struct ntb_client pp_client = {
 	.ops = {
 		.probe = pp_probe,
-		.remove = pp_remove,
-	},
+		.remove = pp_remove
+	}
 };
 
 static int __init pp_init(void)
 {
-	int rc;
+	int ret;
 
 	if (debugfs_initialized())
-		pp_debugfs_dir = debugfs_create_dir(KBUILD_MODNAME, NULL);
+		pp_dbgfs_topdir = debugfs_create_dir(KBUILD_MODNAME, NULL);
 
-	rc = ntb_register_client(&pp_client);
-	if (rc)
-		goto err_client;
+	ret = ntb_register_client(&pp_client);
+	if (ret)
+		debugfs_remove_recursive(pp_dbgfs_topdir);
 
-	return 0;
-
-err_client:
-	debugfs_remove_recursive(pp_debugfs_dir);
-	return rc;
+	return ret;
 }
 module_init(pp_init);
 
 static void __exit pp_exit(void)
 {
 	ntb_unregister_client(&pp_client);
-	debugfs_remove_recursive(pp_debugfs_dir);
+	debugfs_remove_recursive(pp_dbgfs_topdir);
 }
 module_exit(pp_exit);
+
-- 
2.12.0

[PATCH v4 05/15] NTB: ntb_tool: Add full multi-port NTB API support

[Serge Semin]

Former NTB Debugging tool driver supported only the limited
functionality of the recently updated NTB API, which is now available
to work with the truly NTB multi-port devices and devices, which
got NTB Message registers instead of Scratchpads. This patch
fully rewrites the driver so one would fully expose all the new
NTB API interfaces. Particularly it concerns the Message registers,
peer ports API, NTB link settings. Additional cleanups are also added
here.

Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
---
Changelog v1:
- Alter interface in compliance with multi-port API
- Move Message/MW/Port/Link settings to a specific directory

Changelog v2:
- Remove driver Author/Description/License macros
- Return error if ntb_mw_get_align called while link is down
- Add db_valid_mask DebugFS file
- Add msg_inbits/msg_outbits DebugFS files

Changelog v3:
- Remove contacts info from the driver header
- Add descriptive comments for the MW-related structures
- Replace on-stack bufs sizes with macro

 drivers/ntb/test/ntb_tool.c | 1820 +++++++++++++++++++++++++++++--------------
 1 file changed, 1240 insertions(+), 580 deletions(-)

diff --git a/drivers/ntb/test/ntb_tool.c b/drivers/ntb/test/ntb_tool.c
index e490bbc8726c..920fc9b161b0 100644
--- a/drivers/ntb/test/ntb_tool.c
+++ b/drivers/ntb/test/ntb_tool.c
@@ -5,6 +5,7 @@
  *   GPL LICENSE SUMMARY
  *
  *   Copyright (C) 2015 EMC Corporation. All Rights Reserved.
+ *   Copyright (C) 2017 T-Platforms All Rights Reserved.
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of version 2 of the GNU General Public License as
@@ -18,6 +19,7 @@
  *   BSD LICENSE
  *
  *   Copyright (C) 2015 EMC Corporation. All Rights Reserved.
+ *   Copyright (C) 2017 T-Platforms All Rights Reserved.
  *
  *   Redistribution and use in source and binary forms, with or without
  *   modification, are permitted provided that the following conditions
@@ -46,9 +48,6 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * PCIe NTB Debugging Tool Linux driver
- *
- * Contact Information:
- * Allen Hubbe <Allen.Hubbe@emc.com>
  */
 
 /*
@@ -56,42 +55,125 @@
  *
  * Assuming $DBG_DIR is something like:
  * '/sys/kernel/debug/ntb_tool/0000:00:03.0'
+ * Suppose aside from local device there is at least one remote device
+ * connected to NTB with index 0.
+ *-----------------------------------------------------------------------------
+ * Eg: check local/peer device information.
+ *
+ * # Get local device port number
+ * root@self# cat $DBG_DIR/port
+ *
+ * # Check local device functionality
+ * root@self# ls $DBG_DIR
+ * db            msg1          msg_sts     peer4/        port
+ * db_event      msg2          peer0/      peer5/        spad0
+ * db_mask       msg3          peer1/      peer_db       spad1
+ * link          msg_event     peer2/      peer_db_mask  spad2
+ * msg0          msg_mask      peer3/      peer_spad     spad3
+ * # As one can see it supports:
+ * # 1) four inbound message registers
+ * # 2) four inbound scratchpads
+ * # 3) up to six peer devices
+ *
+ * # Check peer device port number
+ * root@self# cat $DBG_DIR/peer0/port
  *
- * Eg: check if clearing the doorbell mask generates an interrupt.
+ * # Check peer device(s) functionality to be used
+ * root@self# ls $DBG_DIR/peer0
+ * link             mw_trans0       mw_trans6        port
+ * link_event       mw_trans1       mw_trans7        spad0
+ * msg0             mw_trans2       peer_mw_trans0   spad1
+ * msg1             mw_trans3       peer_mw_trans1   spad2
+ * msg2             mw_trans4       peer_mw_trans2   spad3
+ * msg3             mw_trans5       peer_mw_trans3
+ * # As one can see we got:
+ * # 1) four outbound message registers
+ * # 2) four outbound scratchpads
+ * # 3) eight inbound memory windows
+ * # 4) four outbound memory windows
+ *-----------------------------------------------------------------------------
+ * Eg: NTB link tests
  *
- * # Check the link status
- * root@self# cat $DBG_DIR/link
+ * # Set local link up/down
+ * root@self# echo Y > $DBG_DIR/link
+ * root@self# echo N > $DBG_DIR/link
  *
- * # Block until the link is up
- * root@self# echo Y > $DBG_DIR/link_event
+ * # Check if link with peer device is up/down:
+ * root@self# cat $DBG_DIR/peer0/link
  *
- * # Set the doorbell mask
- * root@self# echo 's 1' > $DBG_DIR/mask
+ * # Block until the link is up/down
+ * root@self# echo Y > $DBG_DIR/peer0/link_event
+ * root@self# echo N > $DBG_DIR/peer0/link_event
+ *-----------------------------------------------------------------------------
+ * Eg: Doorbell registers tests (some functionality might be absent)
  *
- * # Ring the doorbell from the peer
+ * # Set/clear/get local doorbell
+ * root@self# echo 's 1' > $DBG_DIR/db
+ * root@self# echo 'c 1' > $DBG_DIR/db
+ * root@self# cat  $DBG_DIR/db
+ *
+ * # Set/clear/get local doorbell mask
+ * root@self# echo 's 1' > $DBG_DIR/db_mask
+ * root@self# echo 'c 1' > $DBG_DIR/db_mask
+ * root@self# cat $DBG_DIR/db_mask
+ *
+ * # Ring/clear/get peer doorbell
  * root@peer# echo 's 1' > $DBG_DIR/peer_db
+ * root@peer# echo 'c 1' > $DBG_DIR/peer_db
+ * root@peer# cat $DBG_DIR/peer_db
+ *
+ * # Set/clear/get peer doorbell mask
+ * root@self# echo 's 1' > $DBG_DIR/peer_db_mask
+ * root@self# echo 'c 1' > $DBG_DIR/peer_db_mask
+ * root@self# cat $DBG_DIR/peer_db_mask
+ *
+ * # Block until local doorbell is set with specified value
+ * root@self# echo 1 > $DBG_DIR/db_event
+ *-----------------------------------------------------------------------------
+ * Eg: Message registers tests (functionality might be absent)
  *
- * # Clear the doorbell mask
- * root@self# echo 'c 1' > $DBG_DIR/mask
+ * # Set/clear/get in/out message registers status
+ * root@self# echo 's 1' > $DBG_DIR/msg_sts
+ * root@self# echo 'c 1' > $DBG_DIR/msg_sts
+ * root@self# cat $DBG_DIR/msg_sts
  *
- * Observe debugging output in dmesg or your console.  You should see a
- * doorbell event triggered by clearing the mask.  If not, this may indicate an
- * issue with the hardware that needs to be worked around in the driver.
+ * # Set/clear in/out message registers mask
+ * root@self# echo 's 1' > $DBG_DIR/msg_mask
+ * root@self# echo 'c 1' > $DBG_DIR/msg_mask
  *
- * Eg: read and write scratchpad registers
+ * # Get inbound message register #0 value and source of port index
+ * root@self# cat  $DBG_DIR/msg0
  *
- * root@peer# echo '0 0x01010101 1 0x7f7f7f7f' > $DBG_DIR/peer_spad
+ * # Send some data to peer over outbound message register #0
+ * root@self# echo 0x01020304 > $DBG_DIR/peer0/msg0
+ *-----------------------------------------------------------------------------
+ * Eg: Scratchpad registers tests (functionality might be absent)
  *
- * root@self# cat $DBG_DIR/spad
+ * # Write/read to/from local scratchpad register #0
+ * root@peer# echo 0x01020304 > $DBG_DIR/spad0
+ * root@peer# cat $DBG_DIR/spad0
  *
- * Observe that spad 0 and 1 have the values set by the peer.
+ * # Write/read to/from peer scratchpad register #0
+ * root@peer# echo 0x01020304 > $DBG_DIR/peer0/spad0
+ * root@peer# cat $DBG_DIR/peer0/spad0
+ *-----------------------------------------------------------------------------
+ * Eg: Memory windows tests
  *
- * # Check the memory window translation info
- * cat $DBG_DIR/peer_trans0
+ * # Create inbound memory window buffer of specified size/get its base address
+ * root@peer# echo 16384 > $DBG_DIR/peer0/mw_trans0
+ * root@peer# cat $DBG_DIR/peer0/mw_trans0
  *
- * # Setup a 16k memory window buffer
- * echo 16384 > $DBG_DIR/peer_trans0
+ * # Write/read data to/from inbound memory window
+ * root@peer# echo Hello > $DBG_DIR/peer0/mw0
+ * root@peer# head -c 7 $DBG_DIR/peer0/mw0
  *
+ * # Map outbound memory window/check it settings (on peer device)
+ * root@peer# echo 0xADD0BA5E:16384 > $DBG_DIR/peer0/peer_mw_trans0
+ * root@peer# cat $DBG_DIR/peer0/peer_mw_trans0
+ *
+ * # Write/read data to/from outbound memory window (on peer device)
+ * root@peer# echo olleH > $DBG_DIR/peer0/peer_mw0
+ * root@peer# head -c 7 $DBG_DIR/peer0/peer_mw0
  */
 
 #include <linux/init.h>
@@ -106,48 +188,87 @@
 
 #include <linux/ntb.h>
 
-#define DRIVER_NAME			"ntb_tool"
-#define DRIVER_DESCRIPTION		"PCIe NTB Debugging Tool"
-
-#define DRIVER_VERSION			"1.0"
-#define DRIVER_RELDATE			"22 April 2015"
-#define DRIVER_AUTHOR			"Allen Hubbe <Allen.Hubbe@emc.com>"
+#define DRIVER_NAME		"ntb_tool"
+#define DRIVER_VERSION		"2.0"
 
 MODULE_LICENSE("Dual BSD/GPL");
 MODULE_VERSION(DRIVER_VERSION);
-MODULE_AUTHOR(DRIVER_AUTHOR);
-MODULE_DESCRIPTION(DRIVER_DESCRIPTION);
-
-/* It is rare to have hadrware with greater than six MWs */
-#define MAX_MWS	6
-/* Only two-ports devices are supported */
-#define PIDX	NTB_DEF_PEER_IDX
-
-static struct dentry *tool_dbgfs;
+MODULE_AUTHOR("Allen Hubbe <Allen.Hubbe@emc.com>");
+MODULE_DESCRIPTION("PCIe NTB Debugging Tool");
 
+/*
+ * Inbound and outbound memory windows descriptor. Union members selection
+ * depends on the MW type the structure describes. mm_base/dma_base are the
+ * virtual and DMA address of an inbound MW. io_base/tr_base are the MMIO
+ * mapped virtual and xlat addresses of an outbound MW respectively.
+ */
 struct tool_mw {
-	int idx;
+	int widx;
+	int pidx;
 	struct tool_ctx *tc;
-	resource_size_t win_size;
+	union {
+		u8 *mm_base;
+		u8 __iomem *io_base;
+	};
+	union {
+		dma_addr_t dma_base;
+		u64 tr_base;
+	};
 	resource_size_t size;
-	u8 __iomem *local;
-	u8 *peer;
-	dma_addr_t peer_dma;
-	struct dentry *peer_dbg_file;
+	struct dentry *dbgfs_file;
+};
+
+/*
+ * Wrapper structure is used to distinguish the outbound MW peers reference
+ * within the corresponding DebugFS directory IO operation.
+ */
+struct tool_mw_wrap {
+	int pidx;
+	struct tool_mw *mw;
+};
+
+struct tool_msg {
+	int midx;
+	int pidx;
+	struct tool_ctx *tc;
+};
+
+struct tool_spad {
+	int sidx;
+	int pidx;
+	struct tool_ctx *tc;
+};
+
+struct tool_peer {
+	int pidx;
+	struct tool_ctx *tc;
+	int inmw_cnt;
+	struct tool_mw *inmws;
+	int outmw_cnt;
+	struct tool_mw_wrap *outmws;
+	int outmsg_cnt;
+	struct tool_msg *outmsgs;
+	int outspad_cnt;
+	struct tool_spad *outspads;
+	struct dentry *dbgfs_dir;
 };
 
 struct tool_ctx {
 	struct ntb_dev *ntb;
-	struct dentry *dbgfs;
 	wait_queue_head_t link_wq;
-	int mw_count;
-	struct tool_mw mws[MAX_MWS];
+	wait_queue_head_t db_wq;
+	wait_queue_head_t msg_wq;
+	int outmw_cnt;
+	struct tool_mw *outmws;
+	int peer_cnt;
+	struct tool_peer *peers;
+	int inmsg_cnt;
+	struct tool_msg *inmsgs;
+	int inspad_cnt;
+	struct tool_spad *inspads;
+	struct dentry *dbgfs_dir;
 };
 
-#define SPAD_FNAME_SIZE 0x10
-#define INT_PTR(x) ((void *)(unsigned long)x)
-#define PTR_INT(x) ((int)(unsigned long)x)
-
 #define TOOL_FOPS_RDWR(__name, __read, __write) \
 	const struct file_operations __name = {	\
 		.owner = THIS_MODULE,		\
@@ -156,6 +277,15 @@ struct tool_ctx {
 		.write = __write,		\
 	}
 
+#define TOOL_BUF_LEN 32
+
+static struct dentry *tool_dbgfs_topdir;
+
+/*==============================================================================
+ *                               NTB events handlers
+ *==============================================================================
+ */
+
 static void tool_link_event(void *ctx)
 {
 	struct tool_ctx *tc = ctx;
@@ -181,580 +311,576 @@ static void tool_db_event(void *ctx, int vec)
 
 	dev_dbg(&tc->ntb->dev, "doorbell vec %d mask %#llx bits %#llx\n",
 		vec, db_mask, db_bits);
+
+	wake_up(&tc->db_wq);
+}
+
+static void tool_msg_event(void *ctx)
+{
+	struct tool_ctx *tc = ctx;
+	u64 msg_sts;
+
+	msg_sts = ntb_msg_read_sts(tc->ntb);
+
+	dev_dbg(&tc->ntb->dev, "message bits %#llx\n", msg_sts);
+
+	wake_up(&tc->msg_wq);
 }
 
 static const struct ntb_ctx_ops tool_ops = {
 	.link_event = tool_link_event,
 	.db_event = tool_db_event,
+	.msg_event = tool_msg_event
 };
 
-static ssize_t tool_dbfn_read(struct tool_ctx *tc, char __user *ubuf,
-			      size_t size, loff_t *offp,
-			      u64 (*db_read_fn)(struct ntb_dev *))
+/*==============================================================================
+ *                        Common read/write methods
+ *==============================================================================
+ */
+
+static ssize_t tool_fn_read(struct tool_ctx *tc, char __user *ubuf,
+			    size_t size, loff_t *offp,
+			    u64 (*fn_read)(struct ntb_dev *))
 {
 	size_t buf_size;
-	char *buf;
-	ssize_t pos, rc;
+	char buf[TOOL_BUF_LEN];
+	ssize_t pos;
 
-	if (!db_read_fn)
+	if (!fn_read)
 		return -EINVAL;
 
-	buf_size = min_t(size_t, size, 0x20);
-
-	buf = kmalloc(buf_size, GFP_KERNEL);
-	if (!buf)
-		return -ENOMEM;
-
-	pos = scnprintf(buf, buf_size, "%#llx\n",
-			db_read_fn(tc->ntb));
+	buf_size = min(size, sizeof(buf));
 
-	rc = simple_read_from_buffer(ubuf, size, offp, buf, pos);
+	pos = scnprintf(buf, buf_size, "%#llx\n", fn_read(tc->ntb));
 
-	kfree(buf);
-
-	return rc;
+	return simple_read_from_buffer(ubuf, size, offp, buf, pos);
 }
 
-static ssize_t tool_dbfn_write(struct tool_ctx *tc,
-			       const char __user *ubuf,
-			       size_t size, loff_t *offp,
-			       int (*db_set_fn)(struct ntb_dev *, u64),
-			       int (*db_clear_fn)(struct ntb_dev *, u64))
+static ssize_t tool_fn_write(struct tool_ctx *tc,
+			     const char __user *ubuf,
+			     size_t size, loff_t *offp,
+			     int (*fn_set)(struct ntb_dev *, u64),
+			     int (*fn_clear)(struct ntb_dev *, u64))
 {
-	u64 db_bits;
 	char *buf, cmd;
-	ssize_t rc;
+	ssize_t ret;
+	u64 bits;
 	int n;
 
 	buf = kmalloc(size + 1, GFP_KERNEL);
 	if (!buf)
 		return -ENOMEM;
 
-	rc = simple_write_to_buffer(buf, size, offp, ubuf, size);
-	if (rc < 0) {
+	ret = simple_write_to_buffer(buf, size, offp, ubuf, size);
+	if (ret < 0) {
 		kfree(buf);
-		return rc;
+		return ret;
 	}
 
 	buf[size] = 0;
 
-	n = sscanf(buf, "%c %lli", &cmd, &db_bits);
+	n = sscanf(buf, "%c %lli", &cmd, &bits);
 
 	kfree(buf);
 
 	if (n != 2) {
-		rc = -EINVAL;
+		ret = -EINVAL;
 	} else if (cmd == 's') {
-		if (!db_set_fn)
-			rc = -EINVAL;
+		if (!fn_set)
+			ret = -EINVAL;
 		else
-			rc = db_set_fn(tc->ntb, db_bits);
+			ret = fn_set(tc->ntb, bits);
 	} else if (cmd == 'c') {
-		if (!db_clear_fn)
-			rc = -EINVAL;
+		if (!fn_clear)
+			ret = -EINVAL;
 		else
-			rc = db_clear_fn(tc->ntb, db_bits);
+			ret = fn_clear(tc->ntb, bits);
 	} else {
-		rc = -EINVAL;
+		ret = -EINVAL;
 	}
 
-	return rc ? : size;
+	return ret ? : size;
 }
 
-static ssize_t tool_spadfn_read(struct tool_ctx *tc, char __user *ubuf,
-				size_t size, loff_t *offp,
-				u32 (*spad_read_fn)(struct ntb_dev *, int))
-{
-	size_t buf_size;
-	char *buf;
-	ssize_t pos, rc;
-	int i, spad_count;
-
-	if (!spad_read_fn)
-		return -EINVAL;
-
-	spad_count = ntb_spad_count(tc->ntb);
+/*==============================================================================
+ *                            Port read/write methods
+ *==============================================================================
+ */
 
-	/*
-	 * We multiply the number of spads by 15 to get the buffer size
-	 * this is from 3 for the %d, 10 for the largest hex value
-	 * (0x00000000) and 2 for the tab and line feed.
-	 */
-	buf_size = min_t(size_t, size, spad_count * 15);
+static ssize_t tool_port_read(struct file *filep, char __user *ubuf,
+			      size_t size, loff_t *offp)
+{
+	struct tool_ctx *tc = filep->private_data;
+	char buf[TOOL_BUF_LEN];
+	int pos;
 
-	buf = kmalloc(buf_size, GFP_KERNEL);
-	if (!buf)
-		return -ENOMEM;
+	pos = scnprintf(buf, sizeof(buf), "%d\n", ntb_port_number(tc->ntb));
 
-	pos = 0;
+	return simple_read_from_buffer(ubuf, size, offp, buf, pos);
+}
 
-	for (i = 0; i < spad_count; ++i) {
-		pos += scnprintf(buf + pos, buf_size - pos, "%d\t%#x\n",
-				 i, spad_read_fn(tc->ntb, i));
-	}
+static TOOL_FOPS_RDWR(tool_port_fops,
+		      tool_port_read,
+		      NULL);
 
-	rc = simple_read_from_buffer(ubuf, size, offp, buf, pos);
+static ssize_t tool_peer_port_read(struct file *filep, char __user *ubuf,
+				   size_t size, loff_t *offp)
+{
+	struct tool_peer *peer = filep->private_data;
+	struct tool_ctx *tc = peer->tc;
+	char buf[TOOL_BUF_LEN];
+	int pos;
 
-	kfree(buf);
+	pos = scnprintf(buf, sizeof(buf), "%d\n",
+		ntb_peer_port_number(tc->ntb, peer->pidx));
 
-	return rc;
+	return simple_read_from_buffer(ubuf, size, offp, buf, pos);
 }
 
-static ssize_t tool_spadfn_write(struct tool_ctx *tc,
-				 const char __user *ubuf,
-				 size_t size, loff_t *offp,
-				 int (*spad_write_fn)(struct ntb_dev *,
-						      int, u32))
+static TOOL_FOPS_RDWR(tool_peer_port_fops,
+		      tool_peer_port_read,
+		      NULL);
+
+static int tool_init_peers(struct tool_ctx *tc)
 {
-	int spad_idx;
-	u32 spad_val;
-	char *buf, *buf_ptr;
-	int pos, n;
-	ssize_t rc;
-
-	if (!spad_write_fn) {
-		dev_dbg(&tc->ntb->dev, "no spad write fn\n");
-		return -EINVAL;
-	}
+	int pidx;
 
-	buf = kmalloc(size + 1, GFP_KERNEL);
-	if (!buf)
+	tc->peer_cnt = ntb_peer_port_count(tc->ntb);
+	tc->peers = devm_kcalloc(&tc->ntb->dev, tc->peer_cnt,
+				 sizeof(*tc->peers), GFP_KERNEL);
+	if (tc->peers == NULL)
 		return -ENOMEM;
 
-	rc = simple_write_to_buffer(buf, size, offp, ubuf, size);
-	if (rc < 0) {
-		kfree(buf);
-		return rc;
-	}
-
-	buf[size] = 0;
-	buf_ptr = buf;
-	n = sscanf(buf_ptr, "%d %i%n", &spad_idx, &spad_val, &pos);
-	while (n == 2) {
-		buf_ptr += pos;
-		rc = spad_write_fn(tc->ntb, spad_idx, spad_val);
-		if (rc)
-			break;
-
-		n = sscanf(buf_ptr, "%d %i%n", &spad_idx, &spad_val, &pos);
+	for (pidx = 0; pidx < tc->peer_cnt; pidx++) {
+		tc->peers[pidx].pidx = pidx;
+		tc->peers[pidx].tc = tc;
 	}
 
-	if (n < 0)
-		rc = n;
-
-	kfree(buf);
-
-	return rc ? : size;
+	return 0;
 }
 
-static ssize_t tool_db_read(struct file *filep, char __user *ubuf,
-			    size_t size, loff_t *offp)
-{
-	struct tool_ctx *tc = filep->private_data;
-
-	return tool_dbfn_read(tc, ubuf, size, offp,
-			      tc->ntb->ops->db_read);
-}
+/*==============================================================================
+ *                       Link state read/write methods
+ *==============================================================================
+ */
 
-static ssize_t tool_db_write(struct file *filep, const char __user *ubuf,
-			     size_t size, loff_t *offp)
+static ssize_t tool_link_write(struct file *filep, const char __user *ubuf,
+			       size_t size, loff_t *offp)
 {
 	struct tool_ctx *tc = filep->private_data;
+	bool val;
+	int ret;
 
-	return tool_dbfn_write(tc, ubuf, size, offp,
-			       tc->ntb->ops->db_set,
-			       tc->ntb->ops->db_clear);
-}
+	ret = kstrtobool_from_user(ubuf, size, &val);
+	if (ret)
+		return ret;
 
-static TOOL_FOPS_RDWR(tool_db_fops,
-		      tool_db_read,
-		      tool_db_write);
+	if (val)
+		ret = ntb_link_enable(tc->ntb, NTB_SPEED_AUTO, NTB_WIDTH_AUTO);
+	else
+		ret = ntb_link_disable(tc->ntb);
 
-static ssize_t tool_mask_read(struct file *filep, char __user *ubuf,
-			      size_t size, loff_t *offp)
-{
-	struct tool_ctx *tc = filep->private_data;
+	if (ret)
+		return ret;
 
-	return tool_dbfn_read(tc, ubuf, size, offp,
-			      tc->ntb->ops->db_read_mask);
+	return size;
 }
 
-static ssize_t tool_mask_write(struct file *filep, const char __user *ubuf,
-			       size_t size, loff_t *offp)
+static TOOL_FOPS_RDWR(tool_link_fops,
+		      NULL,
+		      tool_link_write);
+
+static ssize_t tool_peer_link_read(struct file *filep, char __user *ubuf,
+				   size_t size, loff_t *offp)
 {
-	struct tool_ctx *tc = filep->private_data;
+	struct tool_peer *peer = filep->private_data;
+	struct tool_ctx *tc = peer->tc;
+	char buf[3];
 
-	return tool_dbfn_write(tc, ubuf, size, offp,
-			       tc->ntb->ops->db_set_mask,
-			       tc->ntb->ops->db_clear_mask);
+	if (ntb_link_is_up(tc->ntb, NULL, NULL) & BIT(peer->pidx))
+		buf[0] = 'Y';
+	else
+		buf[0] = 'N';
+	buf[1] = '\n';
+	buf[2] = '\0';
+
+	return simple_read_from_buffer(ubuf, size, offp, buf, 3);
 }
 
-static TOOL_FOPS_RDWR(tool_mask_fops,
-		      tool_mask_read,
-		      tool_mask_write);
+static TOOL_FOPS_RDWR(tool_peer_link_fops,
+		      tool_peer_link_read,
+		      NULL);
 
-static ssize_t tool_peer_db_read(struct file *filep, char __user *ubuf,
-				 size_t size, loff_t *offp)
+static ssize_t tool_peer_link_event_write(struct file *filep,
+					  const char __user *ubuf,
+					  size_t size, loff_t *offp)
 {
-	struct tool_ctx *tc = filep->private_data;
+	struct tool_peer *peer = filep->private_data;
+	struct tool_ctx *tc = peer->tc;
+	u64 link_msk;
+	bool val;
+	int ret;
 
-	return tool_dbfn_read(tc, ubuf, size, offp,
-			      tc->ntb->ops->peer_db_read);
-}
+	ret = kstrtobool_from_user(ubuf, size, &val);
+	if (ret)
+		return ret;
 
-static ssize_t tool_peer_db_write(struct file *filep, const char __user *ubuf,
-				  size_t size, loff_t *offp)
-{
-	struct tool_ctx *tc = filep->private_data;
+	link_msk = BIT_ULL_MASK(peer->pidx);
+
+	if (wait_event_interruptible(tc->link_wq,
+		!!(ntb_link_is_up(tc->ntb, NULL, NULL) & link_msk) == val))
+		return -ERESTART;
 
-	return tool_dbfn_write(tc, ubuf, size, offp,
-			       tc->ntb->ops->peer_db_set,
-			       tc->ntb->ops->peer_db_clear);
+	return size;
 }
 
-static TOOL_FOPS_RDWR(tool_peer_db_fops,
-		      tool_peer_db_read,
-		      tool_peer_db_write);
+static TOOL_FOPS_RDWR(tool_peer_link_event_fops,
+		      NULL,
+		      tool_peer_link_event_write);
 
-static ssize_t tool_peer_mask_read(struct file *filep, char __user *ubuf,
-				   size_t size, loff_t *offp)
+/*==============================================================================
+ *                  Memory windows read/write/setting methods
+ *==============================================================================
+ */
+
+static ssize_t tool_mw_read(struct file *filep, char __user *ubuf,
+			    size_t size, loff_t *offp)
 {
-	struct tool_ctx *tc = filep->private_data;
+	struct tool_mw *inmw = filep->private_data;
+
+	if (inmw->mm_base == NULL)
+		return -ENXIO;
 
-	return tool_dbfn_read(tc, ubuf, size, offp,
-			      tc->ntb->ops->peer_db_read_mask);
+	return simple_read_from_buffer(ubuf, size, offp,
+				       inmw->mm_base, inmw->size);
 }
 
-static ssize_t tool_peer_mask_write(struct file *filep, const char __user *ubuf,
-				    size_t size, loff_t *offp)
+static ssize_t tool_mw_write(struct file *filep, const char __user *ubuf,
+			     size_t size, loff_t *offp)
 {
-	struct tool_ctx *tc = filep->private_data;
+	struct tool_mw *inmw = filep->private_data;
+
+	if (inmw->mm_base == NULL)
+		return -ENXIO;
 
-	return tool_dbfn_write(tc, ubuf, size, offp,
-			       tc->ntb->ops->peer_db_set_mask,
-			       tc->ntb->ops->peer_db_clear_mask);
+	return simple_write_to_buffer(inmw->mm_base, inmw->size, offp,
+				      ubuf, size);
 }
 
-static TOOL_FOPS_RDWR(tool_peer_mask_fops,
-		      tool_peer_mask_read,
-		      tool_peer_mask_write);
+static TOOL_FOPS_RDWR(tool_mw_fops,
+		      tool_mw_read,
+		      tool_mw_write);
 
-static ssize_t tool_spad_read(struct file *filep, char __user *ubuf,
-			      size_t size, loff_t *offp)
+static int tool_setup_mw(struct tool_ctx *tc, int pidx, int widx,
+			 size_t req_size)
 {
-	struct tool_ctx *tc = filep->private_data;
+	resource_size_t size, addr_align, size_align;
+	struct tool_mw *inmw = &tc->peers[pidx].inmws[widx];
+	char buf[TOOL_BUF_LEN];
+	int ret;
 
-	return tool_spadfn_read(tc, ubuf, size, offp,
-				tc->ntb->ops->spad_read);
-}
+	if (inmw->mm_base != NULL)
+		return 0;
 
-static ssize_t tool_spad_write(struct file *filep, const char __user *ubuf,
-			       size_t size, loff_t *offp)
-{
-	struct tool_ctx *tc = filep->private_data;
+	ret = ntb_mw_get_align(tc->ntb, pidx, widx, &addr_align,
+				&size_align, &size);
+	if (ret)
+		return ret;
+
+	inmw->size = min_t(resource_size_t, req_size, size);
+	inmw->size = round_up(inmw->size, addr_align);
+	inmw->size = round_up(inmw->size, size_align);
+	inmw->mm_base = dma_alloc_coherent(&tc->ntb->dev, inmw->size,
+					   &inmw->dma_base, GFP_KERNEL);
+	if (!inmw->mm_base)
+		return -ENOMEM;
 
-	return tool_spadfn_write(tc, ubuf, size, offp,
-				 tc->ntb->ops->spad_write);
-}
+	if (!IS_ALIGNED(inmw->dma_base, addr_align)) {
+		ret = -ENOMEM;
+		goto err_free_dma;
+	}
 
-static TOOL_FOPS_RDWR(tool_spad_fops,
-		      tool_spad_read,
-		      tool_spad_write);
+	ret = ntb_mw_set_trans(tc->ntb, pidx, widx, inmw->dma_base, inmw->size);
+	if (ret)
+		goto err_free_dma;
 
-static u32 ntb_tool_peer_spad_read(struct ntb_dev *ntb, int sidx)
-{
-	return ntb_peer_spad_read(ntb, PIDX, sidx);
-}
+	snprintf(buf, sizeof(buf), "mw%d", widx);
+	inmw->dbgfs_file = debugfs_create_file(buf, 0600,
+					       tc->peers[pidx].dbgfs_dir, inmw,
+					       &tool_mw_fops);
 
-static ssize_t tool_peer_spad_read(struct file *filep, char __user *ubuf,
-				   size_t size, loff_t *offp)
-{
-	struct tool_ctx *tc = filep->private_data;
+	return 0;
 
-	return tool_spadfn_read(tc, ubuf, size, offp, ntb_tool_peer_spad_read);
-}
+err_free_dma:
+	dma_free_coherent(&tc->ntb->dev, inmw->size, inmw->mm_base,
+			  inmw->dma_base);
+	inmw->mm_base = NULL;
+	inmw->dma_base = 0;
+	inmw->size = 0;
 
-static int ntb_tool_peer_spad_write(struct ntb_dev *ntb, int sidx, u32 val)
-{
-	return ntb_peer_spad_write(ntb, PIDX, sidx, val);
+	return ret;
 }
 
-static ssize_t tool_peer_spad_write(struct file *filep, const char __user *ubuf,
-				    size_t size, loff_t *offp)
+static void tool_free_mw(struct tool_ctx *tc, int pidx, int widx)
 {
-	struct tool_ctx *tc = filep->private_data;
-
-	return tool_spadfn_write(tc, ubuf, size, offp,
-				 ntb_tool_peer_spad_write);
-}
-
-static TOOL_FOPS_RDWR(tool_peer_spad_fops,
-		      tool_peer_spad_read,
-		      tool_peer_spad_write);
+	struct tool_mw *inmw = &tc->peers[pidx].inmws[widx];
 
-static ssize_t tool_link_read(struct file *filep, char __user *ubuf,
-			      size_t size, loff_t *offp)
-{
-	struct tool_ctx *tc = filep->private_data;
-	char buf[3];
+	debugfs_remove(inmw->dbgfs_file);
 
-	buf[0] = ntb_link_is_up(tc->ntb, NULL, NULL) ? 'Y' : 'N';
-	buf[1] = '\n';
-	buf[2] = '\0';
+	if (inmw->mm_base != NULL) {
+		ntb_mw_clear_trans(tc->ntb, pidx, widx);
+		dma_free_coherent(&tc->ntb->dev, inmw->size,
+				  inmw->mm_base, inmw->dma_base);
+	}
 
-	return simple_read_from_buffer(ubuf, size, offp, buf, 2);
+	inmw->mm_base = NULL;
+	inmw->dma_base = 0;
+	inmw->size = 0;
+	inmw->dbgfs_file = NULL;
 }
 
-static ssize_t tool_link_write(struct file *filep, const char __user *ubuf,
-			       size_t size, loff_t *offp)
+static ssize_t tool_mw_trans_read(struct file *filep, char __user *ubuf,
+				  size_t size, loff_t *offp)
 {
-	struct tool_ctx *tc = filep->private_data;
-	char buf[32];
+	struct tool_mw *inmw = filep->private_data;
+	resource_size_t addr_align;
+	resource_size_t size_align;
+	resource_size_t size_max;
+	ssize_t ret, off = 0;
 	size_t buf_size;
-	bool val;
-	int rc;
+	char *buf;
 
-	buf_size = min(size, (sizeof(buf) - 1));
-	if (copy_from_user(buf, ubuf, buf_size))
-		return -EFAULT;
+	buf_size = min_t(size_t, size, 512);
 
-	buf[buf_size] = '\0';
+	buf = kmalloc(buf_size, GFP_KERNEL);
+	if (!buf)
+		return -ENOMEM;
 
-	rc = strtobool(buf, &val);
-	if (rc)
-		return rc;
+	ret = ntb_mw_get_align(inmw->tc->ntb, inmw->pidx, inmw->widx,
+			       &addr_align, &size_align, &size_max);
+	if (ret)
+		return ret;
 
-	if (val)
-		rc = ntb_link_enable(tc->ntb, NTB_SPEED_AUTO, NTB_WIDTH_AUTO);
-	else
-		rc = ntb_link_disable(tc->ntb);
+	off += scnprintf(buf + off, buf_size - off,
+			 "Inbound MW     \t%d\n",
+			 inmw->widx);
 
-	if (rc)
-		return rc;
+	off += scnprintf(buf + off, buf_size - off,
+			 "Port           \t%d (%d)\n",
+			 ntb_peer_port_number(inmw->tc->ntb, inmw->pidx),
+			 inmw->pidx);
 
-	return size;
-}
+	off += scnprintf(buf + off, buf_size - off,
+			 "Window Address \t0x%pK\n", inmw->mm_base);
 
-static TOOL_FOPS_RDWR(tool_link_fops,
-		      tool_link_read,
-		      tool_link_write);
+	off += scnprintf(buf + off, buf_size - off,
+			 "DMA Address    \t%pad\n",
+			 &inmw->dma_base);
 
-static ssize_t tool_link_event_write(struct file *filep,
-				     const char __user *ubuf,
-				     size_t size, loff_t *offp)
-{
-	struct tool_ctx *tc = filep->private_data;
-	char buf[32];
-	size_t buf_size;
-	bool val;
-	int rc;
+	off += scnprintf(buf + off, buf_size - off,
+			 "Window Size    \t%pa[p]\n",
+			 &inmw->size);
 
-	buf_size = min(size, (sizeof(buf) - 1));
-	if (copy_from_user(buf, ubuf, buf_size))
-		return -EFAULT;
+	off += scnprintf(buf + off, buf_size - off,
+			 "Alignment      \t%pa[p]\n",
+			 &addr_align);
 
-	buf[buf_size] = '\0';
+	off += scnprintf(buf + off, buf_size - off,
+			 "Size Alignment \t%pa[p]\n",
+			 &size_align);
+
+	off += scnprintf(buf + off, buf_size - off,
+			 "Size Max       \t%pa[p]\n",
+			 &size_max);
 
-	rc = strtobool(buf, &val);
-	if (rc)
-		return rc;
+	ret = simple_read_from_buffer(ubuf, size, offp, buf, off);
+	kfree(buf);
 
-	if (wait_event_interruptible(tc->link_wq,
-		ntb_link_is_up(tc->ntb, NULL, NULL) == val))
-		return -ERESTART;
+	return ret;
+}
+
+static ssize_t tool_mw_trans_write(struct file *filep, const char __user *ubuf,
+				   size_t size, loff_t *offp)
+{
+	struct tool_mw *inmw = filep->private_data;
+	unsigned int val;
+	int ret;
+
+	ret = kstrtouint_from_user(ubuf, size, 0, &val);
+	if (ret)
+		return ret;
+
+	tool_free_mw(inmw->tc, inmw->pidx, inmw->widx);
+	if (val) {
+		ret = tool_setup_mw(inmw->tc, inmw->pidx, inmw->widx, val);
+		if (ret)
+			return ret;
+	}
 
 	return size;
 }
 
-static TOOL_FOPS_RDWR(tool_link_event_fops,
-		      NULL,
-		      tool_link_event_write);
+static TOOL_FOPS_RDWR(tool_mw_trans_fops,
+		      tool_mw_trans_read,
+		      tool_mw_trans_write);
 
-static ssize_t tool_mw_read(struct file *filep, char __user *ubuf,
-			    size_t size, loff_t *offp)
+static ssize_t tool_peer_mw_read(struct file *filep, char __user *ubuf,
+				 size_t size, loff_t *offp)
 {
-	struct tool_mw *mw = filep->private_data;
-	ssize_t rc;
+	struct tool_mw *outmw = filep->private_data;
 	loff_t pos = *offp;
+	ssize_t ret;
 	void *buf;
 
-	if (mw->local == NULL)
+	if (outmw->io_base == NULL)
 		return -EIO;
-	if (pos < 0)
-		return -EINVAL;
-	if (pos >= mw->win_size || !size)
+
+	if (pos >= outmw->size || !size)
 		return 0;
-	if (size > mw->win_size - pos)
-		size = mw->win_size - pos;
+
+	if (size > outmw->size - pos)
+		size = outmw->size - pos;
 
 	buf = kmalloc(size, GFP_KERNEL);
 	if (!buf)
 		return -ENOMEM;
 
-	memcpy_fromio(buf, mw->local + pos, size);
-	rc = copy_to_user(ubuf, buf, size);
-	if (rc == size) {
-		rc = -EFAULT;
+	memcpy_fromio(buf, outmw->io_base + pos, size);
+	ret = copy_to_user(ubuf, buf, size);
+	if (ret == size) {
+		ret = -EFAULT;
 		goto err_free;
 	}
 
-	size -= rc;
+	size -= ret;
 	*offp = pos + size;
-	rc = size;
+	ret = size;
 
 err_free:
 	kfree(buf);
 
-	return rc;
+	return ret;
 }
 
-static ssize_t tool_mw_write(struct file *filep, const char __user *ubuf,
-			     size_t size, loff_t *offp)
+static ssize_t tool_peer_mw_write(struct file *filep, const char __user *ubuf,
+				  size_t size, loff_t *offp)
 {
-	struct tool_mw *mw = filep->private_data;
-	ssize_t rc;
+	struct tool_mw *outmw = filep->private_data;
+	ssize_t ret;
 	loff_t pos = *offp;
 	void *buf;
 
-	if (pos < 0)
-		return -EINVAL;
-	if (pos >= mw->win_size || !size)
+	if (outmw->io_base == NULL)
+		return -EIO;
+
+	if (pos >= outmw->size || !size)
 		return 0;
-	if (size > mw->win_size - pos)
-		size = mw->win_size - pos;
+	if (size > outmw->size - pos)
+		size = outmw->size - pos;
 
 	buf = kmalloc(size, GFP_KERNEL);
 	if (!buf)
 		return -ENOMEM;
 
-	rc = copy_from_user(buf, ubuf, size);
-	if (rc == size) {
-		rc = -EFAULT;
+	ret = copy_from_user(buf, ubuf, size);
+	if (ret == size) {
+		ret = -EFAULT;
 		goto err_free;
 	}
 
-	size -= rc;
+	size -= ret;
 	*offp = pos + size;
-	rc = size;
+	ret = size;
 
-	memcpy_toio(mw->local + pos, buf, size);
+	memcpy_toio(outmw->io_base + pos, buf, size);
 
 err_free:
 	kfree(buf);
 
-	return rc;
-}
-
-static TOOL_FOPS_RDWR(tool_mw_fops,
-		      tool_mw_read,
-		      tool_mw_write);
-
-static ssize_t tool_peer_mw_read(struct file *filep, char __user *ubuf,
-				 size_t size, loff_t *offp)
-{
-	struct tool_mw *mw = filep->private_data;
-
-	if (!mw->peer)
-		return -ENXIO;
-
-	return simple_read_from_buffer(ubuf, size, offp, mw->peer, mw->size);
-}
-
-static ssize_t tool_peer_mw_write(struct file *filep, const char __user *ubuf,
-				  size_t size, loff_t *offp)
-{
-	struct tool_mw *mw = filep->private_data;
-
-	if (!mw->peer)
-		return -ENXIO;
-
-	return simple_write_to_buffer(mw->peer, mw->size, offp, ubuf, size);
+	return ret;
 }
 
 static TOOL_FOPS_RDWR(tool_peer_mw_fops,
 		      tool_peer_mw_read,
 		      tool_peer_mw_write);
 
-static int tool_setup_mw(struct tool_ctx *tc, int idx, size_t req_size)
+static int tool_setup_peer_mw(struct tool_ctx *tc, int pidx, int widx,
+			      u64 req_addr, size_t req_size)
 {
-	int rc;
-	struct tool_mw *mw = &tc->mws[idx];
-	resource_size_t size, align_addr, align_size;
-	char buf[16];
+	struct tool_mw *outmw = &tc->outmws[widx];
+	resource_size_t map_size;
+	phys_addr_t map_base;
+	char buf[TOOL_BUF_LEN];
+	int ret;
 
-	if (mw->peer)
+	if (outmw->io_base != NULL)
 		return 0;
 
-	rc = ntb_mw_get_align(tc->ntb, PIDX, idx, &align_addr,
-				&align_size, &size);
-	if (rc)
-		return rc;
+	ret = ntb_peer_mw_get_addr(tc->ntb, widx, &map_base, &map_size);
+	if (ret)
+		return ret;
 
-	mw->size = min_t(resource_size_t, req_size, size);
-	mw->size = round_up(mw->size, align_addr);
-	mw->size = round_up(mw->size, align_size);
-	mw->peer = dma_alloc_coherent(&tc->ntb->pdev->dev, mw->size,
-				      &mw->peer_dma, GFP_KERNEL);
+	ret = ntb_peer_mw_set_trans(tc->ntb, pidx, widx, req_addr, req_size);
+	if (ret)
+		return ret;
 
-	if (!mw->peer || !IS_ALIGNED(mw->peer_dma, align_addr))
-		return -ENOMEM;
+	outmw->io_base = ioremap_wc(map_base, map_size);
+	if (outmw->io_base == NULL) {
+		ret = -EFAULT;
+		goto err_clear_trans;
+	}
 
-	rc = ntb_mw_set_trans(tc->ntb, PIDX, idx, mw->peer_dma, mw->size);
-	if (rc)
-		goto err_free_dma;
+	outmw->tr_base = req_addr;
+	outmw->size = req_size;
+	outmw->pidx = pidx;
 
-	snprintf(buf, sizeof(buf), "peer_mw%d", idx);
-	mw->peer_dbg_file = debugfs_create_file(buf, S_IRUSR | S_IWUSR,
-						mw->tc->dbgfs, mw,
-						&tool_peer_mw_fops);
+	snprintf(buf, sizeof(buf), "peer_mw%d", widx);
+	outmw->dbgfs_file = debugfs_create_file(buf, 0600,
+					       tc->peers[pidx].dbgfs_dir, outmw,
+					       &tool_peer_mw_fops);
 
 	return 0;
 
-err_free_dma:
-	dma_free_coherent(&tc->ntb->pdev->dev, mw->size,
-			  mw->peer,
-			  mw->peer_dma);
-	mw->peer = NULL;
-	mw->peer_dma = 0;
-	mw->size = 0;
-
-	return rc;
+err_clear_trans:
+	ntb_peer_mw_clear_trans(tc->ntb, pidx, widx);
+
+	return ret;
 }
 
-static void tool_free_mw(struct tool_ctx *tc, int idx)
+static void tool_free_peer_mw(struct tool_ctx *tc, int widx)
 {
-	struct tool_mw *mw = &tc->mws[idx];
+	struct tool_mw *outmw = &tc->outmws[widx];
 
-	if (mw->peer) {
-		ntb_mw_clear_trans(tc->ntb, PIDX, idx);
-		dma_free_coherent(&tc->ntb->pdev->dev, mw->size,
-				  mw->peer,
-				  mw->peer_dma);
-	}
+	debugfs_remove(outmw->dbgfs_file);
 
-	mw->peer = NULL;
-	mw->peer_dma = 0;
-
-	debugfs_remove(mw->peer_dbg_file);
+	if (outmw->io_base != NULL) {
+		iounmap(tc->outmws[widx].io_base);
+		ntb_peer_mw_clear_trans(tc->ntb, outmw->pidx, widx);
+	}
 
-	mw->peer_dbg_file = NULL;
+	outmw->io_base = NULL;
+	outmw->tr_base = 0;
+	outmw->size = 0;
+	outmw->pidx = -1;
+	outmw->dbgfs_file = NULL;
 }
 
-static ssize_t tool_peer_mw_trans_read(struct file *filep,
-				       char __user *ubuf,
-				       size_t size, loff_t *offp)
+static ssize_t tool_peer_mw_trans_read(struct file *filep, char __user *ubuf,
+					size_t size, loff_t *offp)
 {
-	struct tool_mw *mw = filep->private_data;
-
-	char *buf;
+	struct tool_mw_wrap *outmw_wrap = filep->private_data;
+	struct tool_mw *outmw = outmw_wrap->mw;
+	resource_size_t map_size;
+	phys_addr_t map_base;
+	ssize_t off = 0;
 	size_t buf_size;
-	ssize_t ret, off = 0;
+	char *buf;
+	int ret;
 
-	phys_addr_t base;
-	resource_size_t mw_size;
-	resource_size_t align_addr = 0;
-	resource_size_t align_size = 0;
-	resource_size_t max_size = 0;
+	ret = ntb_peer_mw_get_addr(outmw->tc->ntb, outmw->widx,
+				  &map_base, &map_size);
+	if (ret)
+		return ret;
 
 	buf_size = min_t(size_t, size, 512);
 
@@ -762,43 +888,37 @@ static ssize_t tool_peer_mw_trans_read(struct file *filep,
 	if (!buf)
 		return -ENOMEM;
 
-	ntb_mw_get_align(mw->tc->ntb, PIDX, mw->idx,
-			 &align_addr, &align_size, &max_size);
-	ntb_peer_mw_get_addr(mw->tc->ntb, mw->idx, &base, &mw_size);
-
 	off += scnprintf(buf + off, buf_size - off,
-			 "Peer MW %d Information:\n", mw->idx);
+			 "Outbound MW:        \t%d\n", outmw->widx);
 
-	off += scnprintf(buf + off, buf_size - off,
-			 "Physical Address      \t%pa[p]\n",
-			 &base);
-
-	off += scnprintf(buf + off, buf_size - off,
-			 "Window Size           \t%lld\n",
-			 (unsigned long long)mw_size);
+	if (outmw->io_base != NULL) {
+		off += scnprintf(buf + off, buf_size - off,
+			"Port attached       \t%d (%d)\n",
+			ntb_peer_port_number(outmw->tc->ntb, outmw->pidx),
+			outmw->pidx);
+	} else {
+		off += scnprintf(buf + off, buf_size - off,
+				 "Port attached       \t-1 (-1)\n");
+	}
 
 	off += scnprintf(buf + off, buf_size - off,
-			 "Alignment             \t%lld\n",
-			 (unsigned long long)align_addr);
+			 "Virtual address     \t0x%pK\n", outmw->io_base);
 
 	off += scnprintf(buf + off, buf_size - off,
-			 "Size Alignment        \t%lld\n",
-			 (unsigned long long)align_size);
+			 "Phys Address        \t%pa[p]\n", &map_base);
 
 	off += scnprintf(buf + off, buf_size - off,
-			 "Size Max              \t%lld\n",
-			 (unsigned long long)max_size);
+			 "Mapping Size        \t%pa[p]\n", &map_size);
 
 	off += scnprintf(buf + off, buf_size - off,
-			 "Ready                 \t%c\n",
-			 (mw->peer) ? 'Y' : 'N');
+			 "Translation Address \t0x%016llx\n", outmw->tr_base);
 
 	off += scnprintf(buf + off, buf_size - off,
-			 "Allocated Size       \t%zd\n",
-			 (mw->peer) ? (size_t)mw->size : 0);
+			 "Window Size         \t%pa[p]\n", &outmw->size);
 
 	ret = simple_read_from_buffer(ubuf, size, offp, buf, off);
 	kfree(buf);
+
 	return ret;
 }
 
@@ -806,12 +926,12 @@ static ssize_t tool_peer_mw_trans_write(struct file *filep,
 					const char __user *ubuf,
 					size_t size, loff_t *offp)
 {
-	struct tool_mw *mw = filep->private_data;
-
-	char buf[32];
-	size_t buf_size;
-	unsigned long long val;
-	int rc;
+	struct tool_mw_wrap *outmw_wrap = filep->private_data;
+	struct tool_mw *outmw = outmw_wrap->mw;
+	size_t buf_size, wsize;
+	char buf[TOOL_BUF_LEN];
+	int ret, n;
+	u64 addr;
 
 	buf_size = min(size, (sizeof(buf) - 1));
 	if (copy_from_user(buf, ubuf, buf_size))
@@ -819,16 +939,17 @@ static ssize_t tool_peer_mw_trans_write(struct file *filep,
 
 	buf[buf_size] = '\0';
 
-	rc = kstrtoull(buf, 0, &val);
-	if (rc)
-		return rc;
-
-	tool_free_mw(mw->tc, mw->idx);
-	if (val)
-		rc = tool_setup_mw(mw->tc, mw->idx, val);
+	n = sscanf(buf, "%lli:%zi", &addr, &wsize);
+	if (n != 2)
+		return -EINVAL;
 
-	if (rc)
-		return rc;
+	tool_free_peer_mw(outmw->tc, outmw->widx);
+	if (wsize) {
+		ret = tool_setup_peer_mw(outmw->tc, outmw_wrap->pidx,
+					 outmw->widx, addr, wsize);
+		if (ret)
+			return ret;
+	}
 
 	return size;
 }
@@ -837,195 +958,734 @@ static TOOL_FOPS_RDWR(tool_peer_mw_trans_fops,
 		      tool_peer_mw_trans_read,
 		      tool_peer_mw_trans_write);
 
-static int tool_init_mw(struct tool_ctx *tc, int idx)
+static int tool_init_mws(struct tool_ctx *tc)
 {
-	struct tool_mw *mw = &tc->mws[idx];
-	phys_addr_t base;
-	int rc;
-
-	rc = ntb_peer_mw_get_addr(tc->ntb, idx, &base, &mw->win_size);
-	if (rc)
-		return rc;
-
-	mw->tc = tc;
-	mw->idx = idx;
-	mw->local = ioremap_wc(base, mw->win_size);
-	if (!mw->local)
-		return -EFAULT;
+	int widx, pidx;
+
+	/* Initialize outbound memory windows */
+	tc->outmw_cnt = ntb_peer_mw_count(tc->ntb);
+	tc->outmws = devm_kcalloc(&tc->ntb->dev, tc->outmw_cnt,
+				  sizeof(*tc->outmws), GFP_KERNEL);
+	if (tc->outmws == NULL)
+		return -ENOMEM;
+
+	for (widx = 0; widx < tc->outmw_cnt; widx++) {
+		tc->outmws[widx].widx = widx;
+		tc->outmws[widx].pidx = -1;
+		tc->outmws[widx].tc = tc;
+	}
+
+	/* Initialize inbound memory windows and outbound MWs wrapper */
+	for (pidx = 0; pidx < tc->peer_cnt; pidx++) {
+		tc->peers[pidx].inmw_cnt = ntb_mw_count(tc->ntb, pidx);
+		tc->peers[pidx].inmws =
+			devm_kcalloc(&tc->ntb->dev, tc->peers[pidx].inmw_cnt,
+				    sizeof(*tc->peers[pidx].inmws), GFP_KERNEL);
+		if (tc->peers[pidx].inmws == NULL)
+			return -ENOMEM;
+
+		for (widx = 0; widx < tc->peers[pidx].inmw_cnt; widx++) {
+			tc->peers[pidx].inmws[widx].widx = widx;
+			tc->peers[pidx].inmws[widx].pidx = pidx;
+			tc->peers[pidx].inmws[widx].tc = tc;
+		}
+
+		tc->peers[pidx].outmw_cnt = ntb_peer_mw_count(tc->ntb);
+		tc->peers[pidx].outmws =
+			devm_kcalloc(&tc->ntb->dev, tc->peers[pidx].outmw_cnt,
+				   sizeof(*tc->peers[pidx].outmws), GFP_KERNEL);
+
+		for (widx = 0; widx < tc->peers[pidx].outmw_cnt; widx++) {
+			tc->peers[pidx].outmws[widx].pidx = pidx;
+			tc->peers[pidx].outmws[widx].mw = &tc->outmws[widx];
+		}
+	}
 
 	return 0;
 }
 
-static void tool_free_mws(struct tool_ctx *tc)
+static void tool_clear_mws(struct tool_ctx *tc)
 {
-	int i;
+	int widx, pidx;
 
-	for (i = 0; i < tc->mw_count; i++) {
-		tool_free_mw(tc, i);
+	/* Free outbound memory windows */
+	for (widx = 0; widx < tc->outmw_cnt; widx++)
+		tool_free_peer_mw(tc, widx);
 
-		if (tc->mws[i].local)
-			iounmap(tc->mws[i].local);
+	/* Free outbound memory windows */
+	for (pidx = 0; pidx < tc->peer_cnt; pidx++)
+		for (widx = 0; widx < tc->peers[pidx].inmw_cnt; widx++)
+			tool_free_mw(tc, pidx, widx);
+}
 
-		tc->mws[i].local = NULL;
-	}
+/*==============================================================================
+ *                       Doorbell read/write methods
+ *==============================================================================
+ */
+
+static ssize_t tool_db_read(struct file *filep, char __user *ubuf,
+			    size_t size, loff_t *offp)
+{
+	struct tool_ctx *tc = filep->private_data;
+
+	return tool_fn_read(tc, ubuf, size, offp, tc->ntb->ops->db_read);
 }
 
-static void tool_setup_dbgfs(struct tool_ctx *tc)
+static ssize_t tool_db_write(struct file *filep, const char __user *ubuf,
+			     size_t size, loff_t *offp)
 {
-	int i;
+	struct tool_ctx *tc = filep->private_data;
 
-	/* This modules is useless without dbgfs... */
-	if (!tool_dbgfs) {
-		tc->dbgfs = NULL;
-		return;
+	return tool_fn_write(tc, ubuf, size, offp, tc->ntb->ops->db_set,
+			     tc->ntb->ops->db_clear);
+}
+
+static TOOL_FOPS_RDWR(tool_db_fops,
+		      tool_db_read,
+		      tool_db_write);
+
+static ssize_t tool_db_valid_mask_read(struct file *filep, char __user *ubuf,
+				       size_t size, loff_t *offp)
+{
+	struct tool_ctx *tc = filep->private_data;
+
+	return tool_fn_read(tc, ubuf, size, offp, tc->ntb->ops->db_valid_mask);
+}
+
+static TOOL_FOPS_RDWR(tool_db_valid_mask_fops,
+		      tool_db_valid_mask_read,
+		      NULL);
+
+static ssize_t tool_db_mask_read(struct file *filep, char __user *ubuf,
+				 size_t size, loff_t *offp)
+{
+	struct tool_ctx *tc = filep->private_data;
+
+	return tool_fn_read(tc, ubuf, size, offp, tc->ntb->ops->db_read_mask);
+}
+
+static ssize_t tool_db_mask_write(struct file *filep, const char __user *ubuf,
+			       size_t size, loff_t *offp)
+{
+	struct tool_ctx *tc = filep->private_data;
+
+	return tool_fn_write(tc, ubuf, size, offp, tc->ntb->ops->db_set_mask,
+			     tc->ntb->ops->db_clear_mask);
+}
+
+static TOOL_FOPS_RDWR(tool_db_mask_fops,
+		      tool_db_mask_read,
+		      tool_db_mask_write);
+
+static ssize_t tool_peer_db_read(struct file *filep, char __user *ubuf,
+				 size_t size, loff_t *offp)
+{
+	struct tool_ctx *tc = filep->private_data;
+
+	return tool_fn_read(tc, ubuf, size, offp, tc->ntb->ops->peer_db_read);
+}
+
+static ssize_t tool_peer_db_write(struct file *filep, const char __user *ubuf,
+				  size_t size, loff_t *offp)
+{
+	struct tool_ctx *tc = filep->private_data;
+
+	return tool_fn_write(tc, ubuf, size, offp, tc->ntb->ops->peer_db_set,
+			     tc->ntb->ops->peer_db_clear);
+}
+
+static TOOL_FOPS_RDWR(tool_peer_db_fops,
+		      tool_peer_db_read,
+		      tool_peer_db_write);
+
+static ssize_t tool_peer_db_mask_read(struct file *filep, char __user *ubuf,
+				   size_t size, loff_t *offp)
+{
+	struct tool_ctx *tc = filep->private_data;
+
+	return tool_fn_read(tc, ubuf, size, offp,
+			    tc->ntb->ops->peer_db_read_mask);
+}
+
+static ssize_t tool_peer_db_mask_write(struct file *filep,
+				       const char __user *ubuf,
+				       size_t size, loff_t *offp)
+{
+	struct tool_ctx *tc = filep->private_data;
+
+	return tool_fn_write(tc, ubuf, size, offp,
+			     tc->ntb->ops->peer_db_set_mask,
+			     tc->ntb->ops->peer_db_clear_mask);
+}
+
+static TOOL_FOPS_RDWR(tool_peer_db_mask_fops,
+		      tool_peer_db_mask_read,
+		      tool_peer_db_mask_write);
+
+static ssize_t tool_db_event_write(struct file *filep,
+				   const char __user *ubuf,
+				   size_t size, loff_t *offp)
+{
+	struct tool_ctx *tc = filep->private_data;
+	u64 val;
+	int ret;
+
+	ret = kstrtou64_from_user(ubuf, size, 0, &val);
+	if (ret)
+		return ret;
+
+	if (wait_event_interruptible(tc->db_wq, ntb_db_read(tc->ntb) == val))
+		return -ERESTART;
+
+	return size;
+}
+
+static TOOL_FOPS_RDWR(tool_db_event_fops,
+		      NULL,
+		      tool_db_event_write);
+
+/*==============================================================================
+ *                       Scratchpads read/write methods
+ *==============================================================================
+ */
+
+static ssize_t tool_spad_read(struct file *filep, char __user *ubuf,
+			      size_t size, loff_t *offp)
+{
+	struct tool_spad *spad = filep->private_data;
+	char buf[TOOL_BUF_LEN];
+	ssize_t pos;
+
+	if (!spad->tc->ntb->ops->spad_read)
+		return -EINVAL;
+
+	pos = scnprintf(buf, sizeof(buf), "%#x\n",
+		ntb_spad_read(spad->tc->ntb, spad->sidx));
+
+	return simple_read_from_buffer(ubuf, size, offp, buf, pos);
+}
+
+static ssize_t tool_spad_write(struct file *filep, const char __user *ubuf,
+			       size_t size, loff_t *offp)
+{
+	struct tool_spad *spad = filep->private_data;
+	u32 val;
+	int ret;
+
+	if (!spad->tc->ntb->ops->spad_write) {
+		dev_dbg(&spad->tc->ntb->dev, "no spad write fn\n");
+		return -EINVAL;
 	}
 
-	tc->dbgfs = debugfs_create_dir(dev_name(&tc->ntb->dev),
-				       tool_dbgfs);
-	if (!tc->dbgfs)
-		return;
+	ret = kstrtou32_from_user(ubuf, size, 0, &val);
+	if (ret)
+		return ret;
 
-	debugfs_create_file("db", S_IRUSR | S_IWUSR, tc->dbgfs,
-			    tc, &tool_db_fops);
+	ret = ntb_spad_write(spad->tc->ntb, spad->sidx, val);
 
-	debugfs_create_file("mask", S_IRUSR | S_IWUSR, tc->dbgfs,
-			    tc, &tool_mask_fops);
+	return ret ?: size;
+}
 
-	debugfs_create_file("peer_db", S_IRUSR | S_IWUSR, tc->dbgfs,
-			    tc, &tool_peer_db_fops);
+static TOOL_FOPS_RDWR(tool_spad_fops,
+		      tool_spad_read,
+		      tool_spad_write);
+
+static ssize_t tool_peer_spad_read(struct file *filep, char __user *ubuf,
+				   size_t size, loff_t *offp)
+{
+	struct tool_spad *spad = filep->private_data;
+	char buf[TOOL_BUF_LEN];
+	ssize_t pos;
 
-	debugfs_create_file("peer_mask", S_IRUSR | S_IWUSR, tc->dbgfs,
-			    tc, &tool_peer_mask_fops);
+	if (!spad->tc->ntb->ops->peer_spad_read)
+		return -EINVAL;
 
-	debugfs_create_file("spad", S_IRUSR | S_IWUSR, tc->dbgfs,
-			    tc, &tool_spad_fops);
+	pos = scnprintf(buf, sizeof(buf), "%#x\n",
+		ntb_peer_spad_read(spad->tc->ntb, spad->pidx, spad->sidx));
 
-	debugfs_create_file("peer_spad", S_IRUSR | S_IWUSR, tc->dbgfs,
-			    tc, &tool_peer_spad_fops);
+	return simple_read_from_buffer(ubuf, size, offp, buf, pos);
+}
 
-	debugfs_create_file("link", S_IRUSR | S_IWUSR, tc->dbgfs,
-			    tc, &tool_link_fops);
+static ssize_t tool_peer_spad_write(struct file *filep, const char __user *ubuf,
+				    size_t size, loff_t *offp)
+{
+	struct tool_spad *spad = filep->private_data;
+	u32 val;
+	int ret;
+
+	if (!spad->tc->ntb->ops->peer_spad_write) {
+		dev_dbg(&spad->tc->ntb->dev, "no spad write fn\n");
+		return -EINVAL;
+	}
+
+	ret = kstrtou32_from_user(ubuf, size, 0, &val);
+	if (ret)
+		return ret;
 
-	debugfs_create_file("link_event", S_IWUSR, tc->dbgfs,
-			    tc, &tool_link_event_fops);
+	ret = ntb_peer_spad_write(spad->tc->ntb, spad->pidx, spad->sidx, val);
 
-	for (i = 0; i < tc->mw_count; i++) {
-		char buf[30];
+	return ret ?: size;
+}
+
+static TOOL_FOPS_RDWR(tool_peer_spad_fops,
+		      tool_peer_spad_read,
+		      tool_peer_spad_write);
 
-		snprintf(buf, sizeof(buf), "mw%d", i);
-		debugfs_create_file(buf, S_IRUSR | S_IWUSR, tc->dbgfs,
-				    &tc->mws[i], &tool_mw_fops);
+static int tool_init_spads(struct tool_ctx *tc)
+{
+	int sidx, pidx;
 
-		snprintf(buf, sizeof(buf), "peer_trans%d", i);
-		debugfs_create_file(buf, S_IRUSR | S_IWUSR, tc->dbgfs,
-				    &tc->mws[i], &tool_peer_mw_trans_fops);
+	/* Initialize inbound scratchpad structures */
+	tc->inspad_cnt = ntb_spad_count(tc->ntb);
+	tc->inspads = devm_kcalloc(&tc->ntb->dev, tc->inspad_cnt,
+				   sizeof(*tc->inspads), GFP_KERNEL);
+	if (tc->inspads == NULL)
+		return -ENOMEM;
+
+	for (sidx = 0; sidx < tc->inspad_cnt; sidx++) {
+		tc->inspads[sidx].sidx = sidx;
+		tc->inspads[sidx].pidx = -1;
+		tc->inspads[sidx].tc = tc;
 	}
+
+	/* Initialize outbound scratchpad structures */
+	for (pidx = 0; pidx < tc->peer_cnt; pidx++) {
+		tc->peers[pidx].outspad_cnt = ntb_spad_count(tc->ntb);
+		tc->peers[pidx].outspads =
+			devm_kcalloc(&tc->ntb->dev, tc->peers[pidx].outspad_cnt,
+				sizeof(*tc->peers[pidx].outspads), GFP_KERNEL);
+		if (tc->peers[pidx].outspads == NULL)
+			return -ENOMEM;
+
+		for (sidx = 0; sidx < tc->peers[pidx].outspad_cnt; sidx++) {
+			tc->peers[pidx].outspads[sidx].sidx = sidx;
+			tc->peers[pidx].outspads[sidx].pidx = pidx;
+			tc->peers[pidx].outspads[sidx].tc = tc;
+		}
+	}
+
+	return 0;
 }
 
-static int tool_probe(struct ntb_client *self, struct ntb_dev *ntb)
+/*==============================================================================
+ *                       Messages read/write methods
+ *==============================================================================
+ */
+
+static ssize_t tool_inmsg_read(struct file *filep, char __user *ubuf,
+			       size_t size, loff_t *offp)
 {
-	struct tool_ctx *tc;
-	int rc;
-	int i;
+	struct tool_msg *msg = filep->private_data;
+	char buf[TOOL_BUF_LEN];
+	ssize_t pos;
+	u32 data;
+	int pidx;
+
+	data = ntb_msg_read(msg->tc->ntb, &pidx, msg->midx);
+
+	pos = scnprintf(buf, sizeof(buf), "0x%08x<-%d\n", data, pidx);
+
+	return simple_read_from_buffer(ubuf, size, offp, buf, pos);
+}
+
+static TOOL_FOPS_RDWR(tool_inmsg_fops,
+		      tool_inmsg_read,
+		      NULL);
+
+static ssize_t tool_outmsg_write(struct file *filep,
+				 const char __user *ubuf,
+				 size_t size, loff_t *offp)
+{
+	struct tool_msg *msg = filep->private_data;
+	u32 val;
+	int ret;
+
+	ret = kstrtou32_from_user(ubuf, size, 0, &val);
+	if (ret)
+		return ret;
+
+	ret = ntb_peer_msg_write(msg->tc->ntb, msg->pidx, msg->midx, val);
+
+	return ret ? : size;
+}
+
+static TOOL_FOPS_RDWR(tool_outmsg_fops,
+		      NULL,
+		      tool_outmsg_write);
+
+static ssize_t tool_msg_sts_read(struct file *filep, char __user *ubuf,
+				 size_t size, loff_t *offp)
+{
+	struct tool_ctx *tc = filep->private_data;
+
+	return tool_fn_read(tc, ubuf, size, offp, tc->ntb->ops->msg_read_sts);
+}
+
+static ssize_t tool_msg_sts_write(struct file *filep, const char __user *ubuf,
+				  size_t size, loff_t *offp)
+{
+	struct tool_ctx *tc = filep->private_data;
+
+	return tool_fn_write(tc, ubuf, size, offp, NULL,
+			     tc->ntb->ops->msg_clear_sts);
+}
+
+static TOOL_FOPS_RDWR(tool_msg_sts_fops,
+		      tool_msg_sts_read,
+		      tool_msg_sts_write);
+
+static ssize_t tool_msg_inbits_read(struct file *filep, char __user *ubuf,
+				    size_t size, loff_t *offp)
+{
+	struct tool_ctx *tc = filep->private_data;
+
+	return tool_fn_read(tc, ubuf, size, offp, tc->ntb->ops->msg_inbits);
+}
+
+static TOOL_FOPS_RDWR(tool_msg_inbits_fops,
+		      tool_msg_inbits_read,
+		      NULL);
+
+static ssize_t tool_msg_outbits_read(struct file *filep, char __user *ubuf,
+				     size_t size, loff_t *offp)
+{
+	struct tool_ctx *tc = filep->private_data;
+
+	return tool_fn_read(tc, ubuf, size, offp, tc->ntb->ops->msg_outbits);
+}
+
+static TOOL_FOPS_RDWR(tool_msg_outbits_fops,
+		      tool_msg_outbits_read,
+		      NULL);
+
+static ssize_t tool_msg_mask_write(struct file *filep, const char __user *ubuf,
+				   size_t size, loff_t *offp)
+{
+	struct tool_ctx *tc = filep->private_data;
+
+	return tool_fn_write(tc, ubuf, size, offp,
+			     tc->ntb->ops->msg_set_mask,
+			     tc->ntb->ops->msg_clear_mask);
+}
+
+static TOOL_FOPS_RDWR(tool_msg_mask_fops,
+		      NULL,
+		      tool_msg_mask_write);
+
+static ssize_t tool_msg_event_write(struct file *filep,
+				    const char __user *ubuf,
+				    size_t size, loff_t *offp)
+{
+	struct tool_ctx *tc = filep->private_data;
+	u64 val;
+	int ret;
+
+	ret = kstrtou64_from_user(ubuf, size, 0, &val);
+	if (ret)
+		return ret;
+
+	if (wait_event_interruptible(tc->msg_wq,
+		ntb_msg_read_sts(tc->ntb) == val))
+		return -ERESTART;
 
-	if (!ntb->ops->mw_set_trans) {
-		dev_dbg(&ntb->dev, "need inbound MW based NTB API\n");
-		rc = -EINVAL;
-		goto err_tc;
+	return size;
+}
+
+static TOOL_FOPS_RDWR(tool_msg_event_fops,
+		      NULL,
+		      tool_msg_event_write);
+
+static int tool_init_msgs(struct tool_ctx *tc)
+{
+	int midx, pidx;
+
+	/* Initialize inbound message structures */
+	tc->inmsg_cnt = ntb_msg_count(tc->ntb);
+	tc->inmsgs = devm_kcalloc(&tc->ntb->dev, tc->inmsg_cnt,
+				   sizeof(*tc->inmsgs), GFP_KERNEL);
+	if (tc->inmsgs == NULL)
+		return -ENOMEM;
+
+	for (midx = 0; midx < tc->inmsg_cnt; midx++) {
+		tc->inmsgs[midx].midx = midx;
+		tc->inmsgs[midx].pidx = -1;
+		tc->inmsgs[midx].tc = tc;
 	}
 
-	if (ntb_spad_count(ntb) < 1) {
-		dev_dbg(&ntb->dev, "no enough scratchpads\n");
-		rc = -EINVAL;
-		goto err_tc;
+	/* Initialize outbound message structures */
+	for (pidx = 0; pidx < tc->peer_cnt; pidx++) {
+		tc->peers[pidx].outmsg_cnt = ntb_msg_count(tc->ntb);
+		tc->peers[pidx].outmsgs =
+			devm_kcalloc(&tc->ntb->dev, tc->peers[pidx].outmsg_cnt,
+				sizeof(*tc->peers[pidx].outmsgs), GFP_KERNEL);
+		if (tc->peers[pidx].outmsgs == NULL)
+			return -ENOMEM;
+
+		for (midx = 0; midx < tc->peers[pidx].outmsg_cnt; midx++) {
+			tc->peers[pidx].outmsgs[midx].midx = midx;
+			tc->peers[pidx].outmsgs[midx].pidx = pidx;
+			tc->peers[pidx].outmsgs[midx].tc = tc;
+		}
 	}
 
+	return 0;
+}
+
+/*==============================================================================
+ *                          Initialization methods
+ *==============================================================================
+ */
+
+static struct tool_ctx *tool_create_data(struct ntb_dev *ntb)
+{
+	struct tool_ctx *tc;
+
+	tc = devm_kzalloc(&ntb->dev, sizeof(*tc), GFP_KERNEL);
+	if (tc == NULL)
+		return ERR_PTR(-ENOMEM);
+
+	tc->ntb = ntb;
+	init_waitqueue_head(&tc->link_wq);
+	init_waitqueue_head(&tc->db_wq);
+	init_waitqueue_head(&tc->msg_wq);
+
 	if (ntb_db_is_unsafe(ntb))
 		dev_dbg(&ntb->dev, "doorbell is unsafe\n");
 
 	if (ntb_spad_is_unsafe(ntb))
 		dev_dbg(&ntb->dev, "scratchpad is unsafe\n");
 
-	if (ntb_peer_port_count(ntb) != NTB_DEF_PEER_CNT)
-		dev_warn(&ntb->dev, "multi-port NTB is unsupported\n");
+	return tc;
+}
+
+static void tool_clear_data(struct tool_ctx *tc)
+{
+	wake_up(&tc->link_wq);
+	wake_up(&tc->db_wq);
+	wake_up(&tc->msg_wq);
+}
+
+static int tool_init_ntb(struct tool_ctx *tc)
+{
+	return ntb_set_ctx(tc->ntb, tc, &tool_ops);
+}
+
+static void tool_clear_ntb(struct tool_ctx *tc)
+{
+	ntb_clear_ctx(tc->ntb);
+	ntb_link_disable(tc->ntb);
+}
 
-	tc = kzalloc(sizeof(*tc), GFP_KERNEL);
-	if (!tc) {
-		rc = -ENOMEM;
-		goto err_tc;
+static void tool_setup_dbgfs(struct tool_ctx *tc)
+{
+	int pidx, widx, sidx, midx;
+	char buf[TOOL_BUF_LEN];
+
+	/* This modules is useless without dbgfs... */
+	if (!tool_dbgfs_topdir) {
+		tc->dbgfs_dir = NULL;
+		return;
 	}
 
-	tc->ntb = ntb;
-	init_waitqueue_head(&tc->link_wq);
+	tc->dbgfs_dir = debugfs_create_dir(dev_name(&tc->ntb->dev),
+					   tool_dbgfs_topdir);
+	if (!tc->dbgfs_dir)
+		return;
+
+	debugfs_create_file("port", 0600, tc->dbgfs_dir,
+			    tc, &tool_port_fops);
+
+	debugfs_create_file("link", 0600, tc->dbgfs_dir,
+			    tc, &tool_link_fops);
+
+	debugfs_create_file("db", 0600, tc->dbgfs_dir,
+			    tc, &tool_db_fops);
+
+	debugfs_create_file("db_valid_mask", 0600, tc->dbgfs_dir,
+			    tc, &tool_db_valid_mask_fops);
+
+	debugfs_create_file("db_mask", 0600, tc->dbgfs_dir,
+			    tc, &tool_db_mask_fops);
+
+	debugfs_create_file("db_event", 0600, tc->dbgfs_dir,
+			    tc, &tool_db_event_fops);
 
-	tc->mw_count = min(ntb_peer_mw_count(tc->ntb), MAX_MWS);
-	for (i = 0; i < tc->mw_count; i++) {
-		rc = tool_init_mw(tc, i);
-		if (rc)
-			goto err_ctx;
+	debugfs_create_file("peer_db", 0600, tc->dbgfs_dir,
+			    tc, &tool_peer_db_fops);
+
+	debugfs_create_file("peer_db_mask", 0600, tc->dbgfs_dir,
+			    tc, &tool_peer_db_mask_fops);
+
+	if (tc->inspad_cnt != 0) {
+		for (sidx = 0; sidx < tc->inspad_cnt; sidx++) {
+			snprintf(buf, sizeof(buf), "spad%d", sidx);
+
+			debugfs_create_file(buf, 0600, tc->dbgfs_dir,
+					   &tc->inspads[sidx], &tool_spad_fops);
+		}
 	}
 
-	tool_setup_dbgfs(tc);
+	if (tc->inmsg_cnt != 0) {
+		for (midx = 0; midx < tc->inmsg_cnt; midx++) {
+			snprintf(buf, sizeof(buf), "msg%d", midx);
+			debugfs_create_file(buf, 0600, tc->dbgfs_dir,
+					   &tc->inmsgs[midx], &tool_inmsg_fops);
+		}
+
+		debugfs_create_file("msg_sts", 0600, tc->dbgfs_dir,
+				    tc, &tool_msg_sts_fops);
+
+		debugfs_create_file("msg_inbits", 0600, tc->dbgfs_dir,
+				    tc, &tool_msg_inbits_fops);
+
+		debugfs_create_file("msg_outbits", 0600, tc->dbgfs_dir,
+				    tc, &tool_msg_outbits_fops);
+
+		debugfs_create_file("msg_mask", 0600, tc->dbgfs_dir,
+				    tc, &tool_msg_mask_fops);
+
+		debugfs_create_file("msg_event", 0600, tc->dbgfs_dir,
+				    tc, &tool_msg_event_fops);
+	}
+
+	for (pidx = 0; pidx < tc->peer_cnt; pidx++) {
+		snprintf(buf, sizeof(buf), "peer%d", pidx);
+		tc->peers[pidx].dbgfs_dir =
+			debugfs_create_dir(buf, tc->dbgfs_dir);
+
+		debugfs_create_file("port", 0600,
+				    tc->peers[pidx].dbgfs_dir,
+				    &tc->peers[pidx], &tool_peer_port_fops);
+
+		debugfs_create_file("link", 0200,
+				    tc->peers[pidx].dbgfs_dir,
+				    &tc->peers[pidx], &tool_peer_link_fops);
+
+		debugfs_create_file("link_event", 0200,
+				  tc->peers[pidx].dbgfs_dir,
+				  &tc->peers[pidx], &tool_peer_link_event_fops);
+
+		for (widx = 0; widx < tc->peers[pidx].inmw_cnt; widx++) {
+			snprintf(buf, sizeof(buf), "mw_trans%d", widx);
+			debugfs_create_file(buf, 0600,
+					    tc->peers[pidx].dbgfs_dir,
+					    &tc->peers[pidx].inmws[widx],
+					    &tool_mw_trans_fops);
+		}
+
+		for (widx = 0; widx < tc->peers[pidx].outmw_cnt; widx++) {
+			snprintf(buf, sizeof(buf), "peer_mw_trans%d", widx);
+			debugfs_create_file(buf, 0600,
+					    tc->peers[pidx].dbgfs_dir,
+					    &tc->peers[pidx].outmws[widx],
+					    &tool_peer_mw_trans_fops);
+		}
+
+		for (sidx = 0; sidx < tc->peers[pidx].outspad_cnt; sidx++) {
+			snprintf(buf, sizeof(buf), "spad%d", sidx);
+
+			debugfs_create_file(buf, 0600,
+					    tc->peers[pidx].dbgfs_dir,
+					    &tc->peers[pidx].outspads[sidx],
+					    &tool_peer_spad_fops);
+		}
+
+		for (midx = 0; midx < tc->peers[pidx].outmsg_cnt; midx++) {
+			snprintf(buf, sizeof(buf), "msg%d", midx);
+			debugfs_create_file(buf, 0600,
+					    tc->peers[pidx].dbgfs_dir,
+					    &tc->peers[pidx].outmsgs[midx],
+					    &tool_outmsg_fops);
+		}
+	}
+}
+
+static void tool_clear_dbgfs(struct tool_ctx *tc)
+{
+	debugfs_remove_recursive(tc->dbgfs_dir);
+}
+
+static int tool_probe(struct ntb_client *self, struct ntb_dev *ntb)
+{
+	struct tool_ctx *tc;
+	int ret;
 
-	rc = ntb_set_ctx(ntb, tc, &tool_ops);
-	if (rc)
-		goto err_ctx;
+	tc = tool_create_data(ntb);
+	if (IS_ERR(tc))
+		return PTR_ERR(tc);
 
-	ntb_link_enable(ntb, NTB_SPEED_AUTO, NTB_WIDTH_AUTO);
-	ntb_link_event(ntb);
+	ret = tool_init_peers(tc);
+	if (ret != 0)
+		goto err_clear_data;
+
+	ret = tool_init_mws(tc);
+	if (ret != 0)
+		goto err_clear_data;
+
+	ret = tool_init_spads(tc);
+	if (ret != 0)
+		goto err_clear_mws;
+
+	ret = tool_init_msgs(tc);
+	if (ret != 0)
+		goto err_clear_mws;
+
+	ret = tool_init_ntb(tc);
+	if (ret != 0)
+		goto err_clear_mws;
+
+	tool_setup_dbgfs(tc);
 
 	return 0;
 
-err_ctx:
-	tool_free_mws(tc);
-	debugfs_remove_recursive(tc->dbgfs);
-	kfree(tc);
-err_tc:
-	return rc;
+err_clear_mws:
+	tool_clear_mws(tc);
+
+err_clear_data:
+	tool_clear_data(tc);
+
+	return ret;
 }
 
 static void tool_remove(struct ntb_client *self, struct ntb_dev *ntb)
 {
 	struct tool_ctx *tc = ntb->ctx;
 
-	tool_free_mws(tc);
+	tool_clear_dbgfs(tc);
+
+	tool_clear_ntb(tc);
 
-	ntb_clear_ctx(ntb);
-	ntb_link_disable(ntb);
+	tool_clear_mws(tc);
 
-	debugfs_remove_recursive(tc->dbgfs);
-	kfree(tc);
+	tool_clear_data(tc);
 }
 
 static struct ntb_client tool_client = {
 	.ops = {
 		.probe = tool_probe,
 		.remove = tool_remove,
-	},
+	}
 };
 
 static int __init tool_init(void)
 {
-	int rc;
+	int ret;
 
 	if (debugfs_initialized())
-		tool_dbgfs = debugfs_create_dir(KBUILD_MODNAME, NULL);
-
-	rc = ntb_register_client(&tool_client);
-	if (rc)
-		goto err_client;
+		tool_dbgfs_topdir = debugfs_create_dir(KBUILD_MODNAME, NULL);
 
-	return 0;
+	ret = ntb_register_client(&tool_client);
+	if (ret)
+		debugfs_remove_recursive(tool_dbgfs_topdir);
 
-err_client:
-	debugfs_remove_recursive(tool_dbgfs);
-	return rc;
+	return ret;
 }
 module_init(tool_init);
 
 static void __exit tool_exit(void)
 {
 	ntb_unregister_client(&tool_client);
-	debugfs_remove_recursive(tool_dbgfs);
+	debugfs_remove_recursive(tool_dbgfs_topdir);
 }
 module_exit(tool_exit);
+
-- 
2.12.0

[PATCH v4 06/15] NTB: ntb_perf: Add full multi-port NTB API support

[Serge Semin]

Former NTB Performance driver could only work with NTB devices, which
got Scratchpads available and had just two ports. Since there are
devices, which don't have Scratchpads and got more than two peer
ports, the performance measuring tool needs to be rewritten. This
patch adds the ability to test any available NTB peer.
Additionally it allows to set NTB memory windows up using any
available data exchange interface: Scratchpad or Message registers.
Some cleanups are also added here.

Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
---
Changelog v1:
- Alter interface in compliance with multi-port API
- Create Scratchpads and Message compliant NTB link init process
- Limit DebugFS access methods to prevent the driver failure

Changelog v2:
- Remove driver Author/Description/License macros
- Replace magic numbers with macros
- Fix global index calc error for devices with highest port index
- Fix invalid scratchpad selection in send_msg algorithm
- Fix bytes order translation in message recv method
- Use local global index to select an inbound MW
- Add commands send/recv/exec debug prints
- Call ntb_mw_get_align when link is supposed to be up

Changelog v3:
- Remove contacts info from the driver header
- Add perf_cmd_recv return value comment
- Replace DebugFS buf size with macro

Changelog v4:
- Fix "try" variable uninitialized usage in perf_copy_chunk()

 drivers/ntb/test/ntb_perf.c | 1820 +++++++++++++++++++++++++++++--------------
 1 file changed, 1219 insertions(+), 601 deletions(-)

diff --git a/drivers/ntb/test/ntb_perf.c b/drivers/ntb/test/ntb_perf.c
index 6f6c602d04af..8de72f3fba4d 100644
--- a/drivers/ntb/test/ntb_perf.c
+++ b/drivers/ntb/test/ntb_perf.c
@@ -5,6 +5,7 @@
  *   GPL LICENSE SUMMARY
  *
  *   Copyright(c) 2015 Intel Corporation. All rights reserved.
+ *   Copyright(c) 2017 T-Platforms. All Rights Reserved.
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of version 2 of the GNU General Public License as
@@ -13,6 +14,7 @@
  *   BSD LICENSE
  *
  *   Copyright(c) 2015 Intel Corporation. All rights reserved.
+ *   Copyright(c) 2017 T-Platforms. All Rights Reserved.
  *
  *   Redistribution and use in source and binary forms, with or without
  *   modification, are permitted provided that the following conditions
@@ -40,859 +42,1475 @@
  *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *   PCIe NTB Perf Linux driver
+ * PCIe NTB Perf Linux driver
+ */
+
+/*
+ * How to use this tool, by example.
+ *
+ * Assuming $DBG_DIR is something like:
+ * '/sys/kernel/debug/ntb_perf/0000:00:03.0'
+ * Suppose aside from local device there is at least one remote device
+ * connected to NTB with index 0.
+ *-----------------------------------------------------------------------------
+ * Eg: install driver with specified chunk/total orders and dma-enabled flag
+ *
+ * root@self# insmod ntb_perf.ko chunk_order=19 total_order=28 use_dma
+ *-----------------------------------------------------------------------------
+ * Eg: check NTB ports (index) and MW mapping information
+ *
+ * root@self# cat $DBG_DIR/info
+ *-----------------------------------------------------------------------------
+ * Eg: start performance test with peer (index 0) and get the test metrics
+ *
+ * root@self# echo 0 > $DBG_DIR/run
+ * root@self# cat $DBG_DIR/run
  */
 
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/kthread.h>
-#include <linux/time.h>
-#include <linux/timer.h>
+#include <linux/sched.h>
+#include <linux/wait.h>
 #include <linux/dma-mapping.h>
+#include <linux/dmaengine.h>
 #include <linux/pci.h>
+#include <linux/ktime.h>
 #include <linux/slab.h>
-#include <linux/spinlock.h>
-#include <linux/debugfs.h>
-#include <linux/dmaengine.h>
 #include <linux/delay.h>
 #include <linux/sizes.h>
+#include <linux/workqueue.h>
+#include <linux/debugfs.h>
+#include <linux/random.h>
 #include <linux/ntb.h>
-#include <linux/mutex.h>
 
 #define DRIVER_NAME		"ntb_perf"
-#define DRIVER_DESCRIPTION	"PCIe NTB Performance Measurement Tool"
-
-#define DRIVER_VERSION		"1.0"
-#define DRIVER_AUTHOR		"Dave Jiang <dave.jiang@intel.com>"
-
-#define PERF_LINK_DOWN_TIMEOUT	10
-#define PERF_VERSION		0xffff0001
-#define MAX_THREADS		32
-#define MAX_TEST_SIZE		SZ_1M
-#define MAX_SRCS		32
-#define DMA_OUT_RESOURCE_TO	msecs_to_jiffies(50)
-#define DMA_RETRIES		20
-#define SZ_4G			(1ULL << 32)
-#define MAX_SEG_ORDER		20 /* no larger than 1M for kmalloc buffer */
-#define PIDX			NTB_DEF_PEER_IDX
+#define DRIVER_VERSION		"2.0"
 
 MODULE_LICENSE("Dual BSD/GPL");
 MODULE_VERSION(DRIVER_VERSION);
-MODULE_AUTHOR(DRIVER_AUTHOR);
-MODULE_DESCRIPTION(DRIVER_DESCRIPTION);
+MODULE_AUTHOR("Dave Jiang <dave.jiang@intel.com>");
+MODULE_DESCRIPTION("PCIe NTB Performance Measurement Tool");
+
+#define MAX_THREADS_CNT		32
+#define DEF_THREADS_CNT		1
+#define MAX_CHUNK_SIZE		SZ_1M
+#define MAX_CHUNK_ORDER		20 /* no larger than 1M */
+
+#define DMA_TRIES		100
+#define DMA_MDELAY		10
 
-static struct dentry *perf_debugfs_dir;
+#define MSG_TRIES		500
+#define MSG_UDELAY_LOW		1000
+#define MSG_UDELAY_HIGH		2000
+
+#define PERF_BUF_LEN 1024
 
 static unsigned long max_mw_size;
 module_param(max_mw_size, ulong, 0644);
-MODULE_PARM_DESC(max_mw_size, "Limit size of large memory windows");
+MODULE_PARM_DESC(max_mw_size, "Upper limit of memory window size");
 
-static unsigned int seg_order = 19; /* 512K */
-module_param(seg_order, uint, 0644);
-MODULE_PARM_DESC(seg_order, "size order [2^n] of buffer segment for testing");
+static unsigned char chunk_order = 19; /* 512K */
+module_param(chunk_order, byte, 0644);
+MODULE_PARM_DESC(chunk_order, "Data chunk order [2^n] to transfer");
 
-static unsigned int run_order = 32; /* 4G */
-module_param(run_order, uint, 0644);
-MODULE_PARM_DESC(run_order, "size order [2^n] of total data to transfer");
+static unsigned char total_order = 30; /* 1G */
+module_param(total_order, byte, 0644);
+MODULE_PARM_DESC(total_order, "Total data order [2^n] to transfer");
 
 static bool use_dma; /* default to 0 */
 module_param(use_dma, bool, 0644);
-MODULE_PARM_DESC(use_dma, "Using DMA engine to measure performance");
-
-static bool on_node = true; /* default to 1 */
-module_param(on_node, bool, 0644);
-MODULE_PARM_DESC(on_node, "Run threads only on NTB device node (default: true)");
-
-struct perf_mw {
-	phys_addr_t	phys_addr;
-	resource_size_t	phys_size;
-	void __iomem	*vbase;
-	size_t		xlat_size;
-	size_t		buf_size;
-	void		*virt_addr;
-	dma_addr_t	dma_addr;
+MODULE_PARM_DESC(use_dma, "Use DMA engine to measure performance");
+
+/*==============================================================================
+ *                         Perf driver data definition
+ *==============================================================================
+ */
+
+enum perf_cmd {
+	PERF_CMD_INVAL = -1,/* invalid spad command */
+	PERF_CMD_SSIZE = 0, /* send out buffer size */
+	PERF_CMD_RSIZE = 1, /* recv in  buffer size */
+	PERF_CMD_SXLAT = 2, /* send in  buffer xlat */
+	PERF_CMD_RXLAT = 3, /* recv out buffer xlat */
+	PERF_CMD_CLEAR = 4, /* clear allocated memory */
+	PERF_STS_DONE  = 5, /* init is done */
+	PERF_STS_LNKUP = 6, /* link up state flag */
 };
 
 struct perf_ctx;
 
-struct pthr_ctx {
-	struct task_struct	*thread;
-	struct perf_ctx		*perf;
-	atomic_t		dma_sync;
-	struct dma_chan		*dma_chan;
-	int			dma_prep_err;
-	int			src_idx;
-	void			*srcs[MAX_SRCS];
-	wait_queue_head_t       *wq;
-	int			status;
-	u64			copied;
-	u64			diff_us;
+struct perf_peer {
+	struct perf_ctx	*perf;
+	int pidx;
+	int gidx;
+
+	/* Outbound MW params */
+	u64 outbuf_xlat;
+	resource_size_t outbuf_size;
+	void __iomem *outbuf;
+
+	/* Inbound MW params */
+	dma_addr_t inbuf_xlat;
+	resource_size_t inbuf_size;
+	void		*inbuf;
+
+	/* NTB connection setup service */
+	struct work_struct	service;
+	unsigned long		sts;
 };
+#define to_peer_service(__work) \
+	container_of(__work, struct perf_peer, service)
 
-struct perf_ctx {
-	struct ntb_dev		*ntb;
-	spinlock_t		db_lock;
-	struct perf_mw		mw;
-	bool			link_is_up;
-	struct delayed_work	link_work;
-	wait_queue_head_t	link_wq;
-	u8			perf_threads;
-	/* mutex ensures only one set of threads run at once */
-	struct mutex		run_mutex;
-	struct pthr_ctx		pthr_ctx[MAX_THREADS];
-	atomic_t		tsync;
-	atomic_t                tdone;
+struct perf_thread {
+	struct perf_ctx *perf;
+	int tidx;
+
+	/* DMA-based test sync parameters */
+	atomic_t dma_sync;
+	wait_queue_head_t dma_wait;
+	struct dma_chan *dma_chan;
+
+	/* Data source and measured statistics */
+	void *src;
+	u64 copied;
+	ktime_t duration;
+	int status;
+	struct work_struct work;
 };
+#define to_thread_work(__work) \
+	container_of(__work, struct perf_thread, work)
 
-enum {
-	VERSION = 0,
-	MW_SZ_HIGH,
-	MW_SZ_LOW,
-	MAX_SPAD
+struct perf_ctx {
+	struct ntb_dev *ntb;
+
+	/* Global device index and peers descriptors */
+	int gidx;
+	int pcnt;
+	struct perf_peer *peers;
+
+	/* Performance measuring work-threads interface */
+	unsigned long busy_flag;
+	wait_queue_head_t twait;
+	atomic_t tsync;
+	u8 tcnt;
+	struct perf_peer *test_peer;
+	struct perf_thread threads[MAX_THREADS_CNT];
+
+	/* Scratchpad/Message IO operations */
+	int (*cmd_send)(struct perf_peer *peer, enum perf_cmd cmd, u64 data);
+	int (*cmd_recv)(struct perf_ctx *perf, int *pidx, enum perf_cmd *cmd,
+			u64 *data);
+
+	struct dentry *dbgfs_dir;
 };
 
+/*
+ * Scratchpads-base commands interface
+ */
+#define PERF_SPAD_CNT(_pcnt) \
+	(3*((_pcnt) + 1))
+#define PERF_SPAD_CMD(_gidx) \
+	(3*(_gidx))
+#define PERF_SPAD_LDATA(_gidx) \
+	(3*(_gidx) + 1)
+#define PERF_SPAD_HDATA(_gidx) \
+	(3*(_gidx) + 2)
+#define PERF_SPAD_NOTIFY(_gidx) \
+	(BIT_ULL(_gidx))
+
+/*
+ * Messages-base commands interface
+ */
+#define PERF_MSG_CNT		3
+#define PERF_MSG_CMD		0
+#define PERF_MSG_LDATA		1
+#define PERF_MSG_HDATA		2
+
+/*==============================================================================
+ *                           Static data declarations
+ *==============================================================================
+ */
+
+static struct dentry *perf_dbgfs_topdir;
+
+static struct workqueue_struct *perf_wq __read_mostly;
+
+/*==============================================================================
+ *                  NTB cross-link commands execution service
+ *==============================================================================
+ */
+
+static void perf_terminate_test(struct perf_ctx *perf);
+
+static inline bool perf_link_is_up(struct perf_peer *peer)
+{
+	u64 link;
+
+	link = ntb_link_is_up(peer->perf->ntb, NULL, NULL);
+	return !!(link & BIT_ULL_MASK(peer->pidx));
+}
+
+static int perf_spad_cmd_send(struct perf_peer *peer, enum perf_cmd cmd,
+			      u64 data)
+{
+	struct perf_ctx *perf = peer->perf;
+	int try;
+	u32 sts;
+
+	dev_dbg(&perf->ntb->dev, "CMD send: %d 0x%llx\n", cmd, data);
+
+	/*
+	 * Perform predefined number of attempts before give up.
+	 * We are sending the data to the port specific scratchpad, so
+	 * to prevent a multi-port access race-condition. Additionally
+	 * there is no need in local locking since only thread-safe
+	 * service work is using this method.
+	 */
+	for (try = 0; try < MSG_TRIES; try++) {
+		if (!perf_link_is_up(peer))
+			return -ENOLINK;
+
+		sts = ntb_peer_spad_read(perf->ntb, peer->pidx,
+					 PERF_SPAD_CMD(perf->gidx));
+		if (le32_to_cpu(sts) != PERF_CMD_INVAL) {
+			usleep_range(MSG_UDELAY_LOW, MSG_UDELAY_HIGH);
+			continue;
+		}
+
+		ntb_peer_spad_write(perf->ntb, peer->pidx,
+				    PERF_SPAD_LDATA(perf->gidx),
+				    cpu_to_le32(lower_32_bits(data)));
+		ntb_peer_spad_write(perf->ntb, peer->pidx,
+				    PERF_SPAD_HDATA(perf->gidx),
+				    cpu_to_le32(upper_32_bits(data)));
+		mmiowb();
+		ntb_peer_spad_write(perf->ntb, peer->pidx,
+				    PERF_SPAD_CMD(perf->gidx),
+				    cpu_to_le32(cmd));
+		mmiowb();
+		ntb_peer_db_set(perf->ntb, PERF_SPAD_NOTIFY(peer->gidx));
+
+		dev_dbg(&perf->ntb->dev, "DB ring peer %#llx\n",
+			PERF_SPAD_NOTIFY(peer->gidx));
+
+		break;
+	}
+
+	return try < MSG_TRIES ? 0 : -EAGAIN;
+}
+
+static int perf_spad_cmd_recv(struct perf_ctx *perf, int *pidx,
+			      enum perf_cmd *cmd, u64 *data)
+{
+	struct perf_peer *peer;
+	u32 val;
+
+	ntb_db_clear(perf->ntb, PERF_SPAD_NOTIFY(perf->gidx));
+
+	/*
+	 * We start scanning all over, since cleared DB may have been set
+	 * by any peer. Yes, it makes peer with smaller index being
+	 * serviced with greater priority, but it's convenient for spad
+	 * and message code unification and simplicity.
+	 */
+	for (*pidx = 0; *pidx < perf->pcnt; (*pidx)++) {
+		peer = &perf->peers[*pidx];
+
+		if (!perf_link_is_up(peer))
+			continue;
+
+		val = ntb_spad_read(perf->ntb, PERF_SPAD_CMD(peer->gidx));
+		val = le32_to_cpu(val);
+		if (val == PERF_CMD_INVAL)
+			continue;
+
+		*cmd = val;
+
+		val = ntb_spad_read(perf->ntb, PERF_SPAD_LDATA(peer->gidx));
+		*data = le32_to_cpu(val);
+
+		val = ntb_spad_read(perf->ntb, PERF_SPAD_HDATA(peer->gidx));
+		*data |= (u64)le32_to_cpu(val) << 32;
+
+		/* Next command can be retrieved from now */
+		ntb_spad_write(perf->ntb, PERF_SPAD_CMD(peer->gidx),
+			       cpu_to_le32(PERF_CMD_INVAL));
+
+		dev_dbg(&perf->ntb->dev, "CMD recv: %d 0x%llx\n", *cmd, *data);
+
+		return 0;
+	}
+
+	return -ENODATA;
+}
+
+static int perf_msg_cmd_send(struct perf_peer *peer, enum perf_cmd cmd,
+			     u64 data)
+{
+	struct perf_ctx *perf = peer->perf;
+	int try, ret;
+	u64 outbits;
+
+	dev_dbg(&perf->ntb->dev, "CMD send: %d 0x%llx\n", cmd, data);
+
+	/*
+	 * Perform predefined number of attempts before give up. Message
+	 * registers are free of race-condition problem when accessed
+	 * from different ports, so we don't need splitting registers
+	 * by global device index. We also won't have local locking,
+	 * since the method is used from service work only.
+	 */
+	outbits = ntb_msg_outbits(perf->ntb);
+	for (try = 0; try < MSG_TRIES; try++) {
+		if (!perf_link_is_up(peer))
+			return -ENOLINK;
+
+		ret = ntb_msg_clear_sts(perf->ntb, outbits);
+		if (ret)
+			return ret;
+
+		ntb_peer_msg_write(perf->ntb, peer->pidx, PERF_MSG_LDATA,
+			      cpu_to_le32(lower_32_bits(data)));
+
+		if (ntb_msg_read_sts(perf->ntb) & outbits) {
+			usleep_range(MSG_UDELAY_LOW, MSG_UDELAY_HIGH);
+			continue;
+		}
+
+		ntb_peer_msg_write(perf->ntb, peer->pidx, PERF_MSG_HDATA,
+			      cpu_to_le32(upper_32_bits(data)));
+		mmiowb();
+
+		/* This call shall trigger peer message event */
+		ntb_peer_msg_write(perf->ntb, peer->pidx, PERF_MSG_CMD,
+			      cpu_to_le32(cmd));
+
+		break;
+	}
+
+	return try < MSG_TRIES ? 0 : -EAGAIN;
+}
+
+static int perf_msg_cmd_recv(struct perf_ctx *perf, int *pidx,
+			     enum perf_cmd *cmd, u64 *data)
+{
+	u64 inbits;
+	u32 val;
+
+	inbits = ntb_msg_inbits(perf->ntb);
+
+	if (hweight64(ntb_msg_read_sts(perf->ntb) & inbits) < 3)
+		return -ENODATA;
+
+	val = ntb_msg_read(perf->ntb, pidx, PERF_MSG_CMD);
+	*cmd = le32_to_cpu(val);
+
+	val = ntb_msg_read(perf->ntb, pidx, PERF_MSG_LDATA);
+	*data = le32_to_cpu(val);
+
+	val = ntb_msg_read(perf->ntb, pidx, PERF_MSG_HDATA);
+	*data |= (u64)le32_to_cpu(val) << 32;
+
+	/* Next command can be retrieved from now */
+	ntb_msg_clear_sts(perf->ntb, inbits);
+
+	dev_dbg(&perf->ntb->dev, "CMD recv: %d 0x%llx\n", *cmd, *data);
+
+	return 0;
+}
+
+static int perf_cmd_send(struct perf_peer *peer, enum perf_cmd cmd, u64 data)
+{
+	struct perf_ctx *perf = peer->perf;
+
+	if (cmd == PERF_CMD_SSIZE || cmd == PERF_CMD_SXLAT)
+		return perf->cmd_send(peer, cmd, data);
+
+	dev_err(&perf->ntb->dev, "Send invalid command\n");
+	return -EINVAL;
+}
+
+static int perf_cmd_exec(struct perf_peer *peer, enum perf_cmd cmd)
+{
+	switch (cmd) {
+	case PERF_CMD_SSIZE:
+	case PERF_CMD_RSIZE:
+	case PERF_CMD_SXLAT:
+	case PERF_CMD_RXLAT:
+	case PERF_CMD_CLEAR:
+		break;
+	default:
+		dev_err(&peer->perf->ntb->dev, "Exec invalid command\n");
+		return -EINVAL;
+	}
+
+	/* No need of memory barrier, since bit ops have invernal lock */
+	set_bit(cmd, &peer->sts);
+
+	dev_dbg(&peer->perf->ntb->dev, "CMD exec: %d\n", cmd);
+
+	(void)queue_work(system_highpri_wq, &peer->service);
+
+	return 0;
+}
+
+static int perf_cmd_recv(struct perf_ctx *perf)
+{
+	struct perf_peer *peer;
+	int ret, pidx, cmd;
+	u64 data;
+
+	while (!(ret = perf->cmd_recv(perf, &pidx, &cmd, &data))) {
+		peer = &perf->peers[pidx];
+
+		switch (cmd) {
+		case PERF_CMD_SSIZE:
+			peer->inbuf_size = data;
+			return perf_cmd_exec(peer, PERF_CMD_RSIZE);
+		case PERF_CMD_SXLAT:
+			peer->outbuf_xlat = data;
+			return perf_cmd_exec(peer, PERF_CMD_RXLAT);
+		default:
+			dev_err(&perf->ntb->dev, "Recv invalid command\n");
+			return -EINVAL;
+		}
+	}
+
+	/* Return 0 if no data left to process, otherwise an error */
+	return ret == -ENODATA ? 0 : ret;
+}
+
 static void perf_link_event(void *ctx)
 {
 	struct perf_ctx *perf = ctx;
+	struct perf_peer *peer;
+	bool lnk_up;
+	int pidx;
 
-	if (ntb_link_is_up(perf->ntb, NULL, NULL) == 1) {
-		schedule_delayed_work(&perf->link_work, 2*HZ);
-	} else {
-		dev_dbg(&perf->ntb->pdev->dev, "link down\n");
+	for (pidx = 0; pidx < perf->pcnt; pidx++) {
+		peer = &perf->peers[pidx];
 
-		if (!perf->link_is_up)
-			cancel_delayed_work_sync(&perf->link_work);
+		lnk_up = perf_link_is_up(peer);
 
-		perf->link_is_up = false;
+		if (lnk_up &&
+		    !test_and_set_bit(PERF_STS_LNKUP, &peer->sts)) {
+			perf_cmd_exec(peer, PERF_CMD_SSIZE);
+		} else if (!lnk_up &&
+			   test_and_clear_bit(PERF_STS_LNKUP, &peer->sts)) {
+			perf_cmd_exec(peer, PERF_CMD_CLEAR);
+		}
 	}
 }
 
 static void perf_db_event(void *ctx, int vec)
 {
 	struct perf_ctx *perf = ctx;
-	u64 db_bits, db_mask;
 
-	db_mask = ntb_db_vector_mask(perf->ntb, vec);
-	db_bits = ntb_db_read(perf->ntb);
+	dev_dbg(&perf->ntb->dev, "DB vec %d mask %#llx bits %#llx\n", vec,
+		ntb_db_vector_mask(perf->ntb, vec), ntb_db_read(perf->ntb));
+
+	/* Just receive all available commands */
+	(void)perf_cmd_recv(perf);
+}
+
+static void perf_msg_event(void *ctx)
+{
+	struct perf_ctx *perf = ctx;
+
+	dev_dbg(&perf->ntb->dev, "Msg status bits %#llx\n",
+		ntb_msg_read_sts(perf->ntb));
 
-	dev_dbg(&perf->ntb->dev, "doorbell vec %d mask %#llx bits %#llx\n",
-		vec, db_mask, db_bits);
+	/* Messages are only sent one-by-one */
+	(void)perf_cmd_recv(perf);
 }
 
 static const struct ntb_ctx_ops perf_ops = {
 	.link_event = perf_link_event,
 	.db_event = perf_db_event,
+	.msg_event = perf_msg_event
 };
 
-static void perf_copy_callback(void *data)
+static void perf_free_outbuf(struct perf_peer *peer)
+{
+	(void)ntb_peer_mw_clear_trans(peer->perf->ntb, peer->pidx, peer->gidx);
+}
+
+static int perf_setup_outbuf(struct perf_peer *peer)
 {
-	struct pthr_ctx *pctx = data;
+	struct perf_ctx *perf = peer->perf;
+	int ret;
+
+	/* Outbuf size can be unaligned due to custom max_mw_size */
+	ret = ntb_peer_mw_set_trans(perf->ntb, peer->pidx, peer->gidx,
+				    peer->outbuf_xlat, peer->outbuf_size);
+	if (ret) {
+		dev_err(&perf->ntb->dev, "Failed to set outbuf translation\n");
+		return ret;
+	}
+
+	/* Initialization is finally done */
+	set_bit(PERF_STS_DONE, &peer->sts);
 
-	atomic_dec(&pctx->dma_sync);
+	return 0;
 }
 
-static ssize_t perf_copy(struct pthr_ctx *pctx, char __iomem *dst,
-			 char *src, size_t size)
+static void perf_free_inbuf(struct perf_peer *peer)
 {
-	struct perf_ctx *perf = pctx->perf;
-	struct dma_async_tx_descriptor *txd;
-	struct dma_chan *chan = pctx->dma_chan;
-	struct dma_device *device;
-	struct dmaengine_unmap_data *unmap;
-	dma_cookie_t cookie;
-	size_t src_off, dst_off;
-	struct perf_mw *mw = &perf->mw;
-	void __iomem *vbase;
-	void __iomem *dst_vaddr;
-	dma_addr_t dst_phys;
-	int retries = 0;
+	if (!peer->inbuf)
+		return;
 
-	if (!use_dma) {
-		memcpy_toio(dst, src, size);
-		return size;
+	(void)ntb_mw_clear_trans(peer->perf->ntb, peer->pidx, peer->gidx);
+	dma_free_coherent(&peer->perf->ntb->dev, peer->inbuf_size,
+			  peer->inbuf, peer->inbuf_xlat);
+	peer->inbuf = NULL;
+}
+
+static int perf_setup_inbuf(struct perf_peer *peer)
+{
+	resource_size_t xlat_align, size_align, size_max;
+	struct perf_ctx *perf = peer->perf;
+	int ret;
+
+	/* Get inbound MW parameters */
+	ret = ntb_mw_get_align(perf->ntb, peer->pidx, perf->gidx,
+			       &xlat_align, &size_align, &size_max);
+	if (ret) {
+		dev_err(&perf->ntb->dev, "Couldn't get inbuf restrictions\n");
+		return ret;
 	}
 
-	if (!chan) {
-		dev_err(&perf->ntb->dev, "DMA engine does not exist\n");
+	if (peer->inbuf_size > size_max) {
+		dev_err(&perf->ntb->dev, "Too big inbuf size %pa > %pa\n",
+			&peer->inbuf_size, &size_max);
 		return -EINVAL;
 	}
 
-	device = chan->device;
-	src_off = (uintptr_t)src & ~PAGE_MASK;
-	dst_off = (uintptr_t __force)dst & ~PAGE_MASK;
+	peer->inbuf_size = round_up(peer->inbuf_size, size_align);
 
-	if (!is_dma_copy_aligned(device, src_off, dst_off, size))
-		return -ENODEV;
-
-	vbase = mw->vbase;
-	dst_vaddr = dst;
-	dst_phys = mw->phys_addr + (dst_vaddr - vbase);
+	perf_free_inbuf(peer);
 
-	unmap = dmaengine_get_unmap_data(device->dev, 1, GFP_NOWAIT);
-	if (!unmap)
+	peer->inbuf = dma_alloc_coherent(&perf->ntb->dev, peer->inbuf_size,
+					 &peer->inbuf_xlat, GFP_KERNEL);
+	if (!peer->inbuf) {
+		dev_err(&perf->ntb->dev, "Failed to alloc inbuf of %pa\n",
+			&peer->inbuf_size);
 		return -ENOMEM;
+	}
+	if (!IS_ALIGNED(peer->inbuf_xlat, xlat_align)) {
+		dev_err(&perf->ntb->dev, "Unaligned inbuf allocated\n");
+		goto err_free_inbuf;
+	}
 
-	unmap->len = size;
-	unmap->addr[0] = dma_map_page(device->dev, virt_to_page(src),
-				      src_off, size, DMA_TO_DEVICE);
-	if (dma_mapping_error(device->dev, unmap->addr[0]))
-		goto err_get_unmap;
+	ret = ntb_mw_set_trans(perf->ntb, peer->pidx, peer->gidx,
+			       peer->inbuf_xlat, peer->inbuf_size);
+	if (ret) {
+		dev_err(&perf->ntb->dev, "Failed to set inbuf translation\n");
+		goto err_free_inbuf;
+	}
 
-	unmap->to_cnt = 1;
+	/*
+	 * We submit inbuf xlat transmission cmd for execution here to follow
+	 * the code architecture, even though this method is called from service
+	 * work itself so the command will be executed right after it returns.
+	 */
+	(void)perf_cmd_exec(peer, PERF_CMD_SXLAT);
 
-	do {
-		txd = device->device_prep_dma_memcpy(chan, dst_phys,
-						     unmap->addr[0],
-						     size, DMA_PREP_INTERRUPT);
-		if (!txd) {
-			set_current_state(TASK_INTERRUPTIBLE);
-			schedule_timeout(DMA_OUT_RESOURCE_TO);
-		}
-	} while (!txd && (++retries < DMA_RETRIES));
+	return 0;
 
-	if (!txd) {
-		pctx->dma_prep_err++;
-		goto err_get_unmap;
-	}
+err_free_inbuf:
+	perf_free_inbuf(peer);
 
-	txd->callback = perf_copy_callback;
-	txd->callback_param = pctx;
-	dma_set_unmap(txd, unmap);
+	return ret;
+}
 
-	cookie = dmaengine_submit(txd);
-	if (dma_submit_error(cookie))
-		goto err_set_unmap;
+static void perf_service_work(struct work_struct *work)
+{
+	struct perf_peer *peer = to_peer_service(work);
 
-	dmaengine_unmap_put(unmap);
+	if (test_and_clear_bit(PERF_CMD_SSIZE, &peer->sts))
+		perf_cmd_send(peer, PERF_CMD_SSIZE, peer->outbuf_size);
 
-	atomic_inc(&pctx->dma_sync);
-	dma_async_issue_pending(chan);
+	if (test_and_clear_bit(PERF_CMD_RSIZE, &peer->sts))
+		perf_setup_inbuf(peer);
 
-	return size;
+	if (test_and_clear_bit(PERF_CMD_SXLAT, &peer->sts))
+		perf_cmd_send(peer, PERF_CMD_SXLAT, peer->inbuf_xlat);
 
-err_set_unmap:
-	dmaengine_unmap_put(unmap);
-err_get_unmap:
-	dmaengine_unmap_put(unmap);
-	return 0;
-}
+	if (test_and_clear_bit(PERF_CMD_RXLAT, &peer->sts))
+		perf_setup_outbuf(peer);
 
-static int perf_move_data(struct pthr_ctx *pctx, char __iomem *dst, char *src,
-			  u64 buf_size, u64 win_size, u64 total)
-{
-	int chunks, total_chunks, i;
-	int copied_chunks = 0;
-	u64 copied = 0, result;
-	char __iomem *tmp = dst;
-	u64 perf, diff_us;
-	ktime_t kstart, kstop, kdiff;
-	unsigned long last_sleep = jiffies;
-
-	chunks = div64_u64(win_size, buf_size);
-	total_chunks = div64_u64(total, buf_size);
-	kstart = ktime_get();
-
-	for (i = 0; i < total_chunks; i++) {
-		result = perf_copy(pctx, tmp, src, buf_size);
-		copied += result;
-		copied_chunks++;
-		if (copied_chunks == chunks) {
-			tmp = dst;
-			copied_chunks = 0;
-		} else
-			tmp += buf_size;
-
-		/* Probably should schedule every 5s to prevent soft hang. */
-		if (unlikely((jiffies - last_sleep) > 5 * HZ)) {
-			last_sleep = jiffies;
-			set_current_state(TASK_INTERRUPTIBLE);
-			schedule_timeout(1);
+	if (test_and_clear_bit(PERF_CMD_CLEAR, &peer->sts)) {
+		clear_bit(PERF_STS_DONE, &peer->sts);
+		if (test_bit(0, &peer->perf->busy_flag) &&
+		    peer == peer->perf->test_peer) {
+			dev_warn(&peer->perf->ntb->dev,
+				"Freeing while test on-fly\n");
+			perf_terminate_test(peer->perf);
 		}
+		perf_free_outbuf(peer);
+		perf_free_inbuf(peer);
+	}
+}
 
-		if (unlikely(kthread_should_stop()))
-			break;
+static int perf_init_service(struct perf_ctx *perf)
+{
+	u64 mask;
+
+	if (ntb_peer_mw_count(perf->ntb) < perf->pcnt + 1) {
+		dev_err(&perf->ntb->dev, "Not enough memory windows\n");
+		return -EINVAL;
 	}
 
-	if (use_dma) {
-		pr_debug("%s: All DMA descriptors submitted\n", current->comm);
-		while (atomic_read(&pctx->dma_sync) != 0) {
-			if (kthread_should_stop())
-				break;
-			msleep(20);
-		}
+	if (ntb_msg_count(perf->ntb) >= PERF_MSG_CNT) {
+		perf->cmd_send = perf_msg_cmd_send;
+		perf->cmd_recv = perf_msg_cmd_recv;
+
+		dev_dbg(&perf->ntb->dev, "Message service initialized\n");
+
+		return 0;
 	}
 
-	kstop = ktime_get();
-	kdiff = ktime_sub(kstop, kstart);
-	diff_us = ktime_to_us(kdiff);
+	dev_dbg(&perf->ntb->dev, "Message service unsupported\n");
 
-	pr_debug("%s: copied %llu bytes\n", current->comm, copied);
+	mask = GENMASK_ULL(perf->pcnt, 0);
+	if (ntb_spad_count(perf->ntb) >= PERF_SPAD_CNT(perf->pcnt) &&
+	    (ntb_db_valid_mask(perf->ntb) & mask) == mask) {
+		perf->cmd_send = perf_spad_cmd_send;
+		perf->cmd_recv = perf_spad_cmd_recv;
 
-	pr_debug("%s: lasted %llu usecs\n", current->comm, diff_us);
+		dev_dbg(&perf->ntb->dev, "Scratchpad service initialized\n");
 
-	perf = div64_u64(copied, diff_us);
+		return 0;
+	}
 
-	pr_debug("%s: MBytes/s: %llu\n", current->comm, perf);
+	dev_dbg(&perf->ntb->dev, "Scratchpad service unsupported\n");
 
-	pctx->copied = copied;
-	pctx->diff_us = diff_us;
+	dev_err(&perf->ntb->dev, "Command services unsupported\n");
 
-	return 0;
+	return -EINVAL;
 }
 
-static bool perf_dma_filter_fn(struct dma_chan *chan, void *node)
+static int perf_enable_service(struct perf_ctx *perf)
 {
-	/* Is the channel required to be on the same node as the device? */
-	if (!on_node)
-		return true;
+	u64 mask, incmd_bit;
+	int ret, sidx, scnt;
 
-	return dev_to_node(&chan->dev->device) == (int)(unsigned long)node;
-}
+	mask = ntb_db_valid_mask(perf->ntb);
+	(void)ntb_db_set_mask(perf->ntb, mask);
 
-static int ntb_perf_thread(void *data)
-{
-	struct pthr_ctx *pctx = data;
-	struct perf_ctx *perf = pctx->perf;
-	struct pci_dev *pdev = perf->ntb->pdev;
-	struct perf_mw *mw = &perf->mw;
-	char __iomem *dst;
-	u64 win_size, buf_size, total;
-	void *src;
-	int rc, node, i;
-	struct dma_chan *dma_chan = NULL;
+	ret = ntb_set_ctx(perf->ntb, perf, &perf_ops);
+	if (ret)
+		return ret;
 
-	pr_debug("kthread %s starting...\n", current->comm);
+	if (perf->cmd_send == perf_msg_cmd_send) {
+		u64 inbits, outbits;
 
-	node = on_node ? dev_to_node(&pdev->dev) : NUMA_NO_NODE;
+		inbits = ntb_msg_inbits(perf->ntb);
+		outbits = ntb_msg_outbits(perf->ntb);
+		(void)ntb_msg_set_mask(perf->ntb, inbits | outbits);
 
-	if (use_dma && !pctx->dma_chan) {
-		dma_cap_mask_t dma_mask;
+		incmd_bit = BIT_ULL(__ffs64(inbits));
+		ret = ntb_msg_clear_mask(perf->ntb, incmd_bit);
 
-		dma_cap_zero(dma_mask);
-		dma_cap_set(DMA_MEMCPY, dma_mask);
-		dma_chan = dma_request_channel(dma_mask, perf_dma_filter_fn,
-					       (void *)(unsigned long)node);
-		if (!dma_chan) {
-			pr_warn("%s: cannot acquire DMA channel, quitting\n",
-				current->comm);
-			return -ENODEV;
-		}
-		pctx->dma_chan = dma_chan;
+		dev_dbg(&perf->ntb->dev, "MSG sts unmasked %#llx\n", incmd_bit);
+	} else {
+		scnt = ntb_spad_count(perf->ntb);
+		for (sidx = 0; sidx < scnt; sidx++)
+			ntb_spad_write(perf->ntb, sidx, PERF_CMD_INVAL);
+		incmd_bit = PERF_SPAD_NOTIFY(perf->gidx);
+		ret = ntb_db_clear_mask(perf->ntb, incmd_bit);
+
+		dev_dbg(&perf->ntb->dev, "DB bits unmasked %#llx\n", incmd_bit);
+	}
+	if (ret) {
+		ntb_clear_ctx(perf->ntb);
+		return ret;
 	}
 
-	for (i = 0; i < MAX_SRCS; i++) {
-		pctx->srcs[i] = kmalloc_node(MAX_TEST_SIZE, GFP_KERNEL, node);
-		if (!pctx->srcs[i]) {
-			rc = -ENOMEM;
-			goto err;
-		}
+	ntb_link_enable(perf->ntb, NTB_SPEED_AUTO, NTB_WIDTH_AUTO);
+	/* Might be not necessary */
+	ntb_link_event(perf->ntb);
+
+	return 0;
+}
+
+static void perf_disable_service(struct perf_ctx *perf)
+{
+	int pidx;
+
+	ntb_link_disable(perf->ntb);
+
+	if (perf->cmd_send == perf_msg_cmd_send) {
+		u64 inbits;
+
+		inbits = ntb_msg_inbits(perf->ntb);
+		(void)ntb_msg_set_mask(perf->ntb, inbits);
+	} else {
+		(void)ntb_db_set_mask(perf->ntb, PERF_SPAD_NOTIFY(perf->gidx));
 	}
 
-	win_size = mw->phys_size;
-	buf_size = 1ULL << seg_order;
-	total = 1ULL << run_order;
+	ntb_clear_ctx(perf->ntb);
 
-	if (buf_size > MAX_TEST_SIZE)
-		buf_size = MAX_TEST_SIZE;
+	for (pidx = 0; pidx < perf->pcnt; pidx++)
+		perf_cmd_exec(&perf->peers[pidx], PERF_CMD_CLEAR);
 
-	dst = (char __iomem *)mw->vbase;
+	for (pidx = 0; pidx < perf->pcnt; pidx++)
+		flush_work(&perf->peers[pidx].service);
+}
 
-	atomic_inc(&perf->tsync);
-	while (atomic_read(&perf->tsync) != perf->perf_threads)
-		schedule();
+/*==============================================================================
+ *                      Performance measuring work-thread
+ *==============================================================================
+ */
 
-	src = pctx->srcs[pctx->src_idx];
-	pctx->src_idx = (pctx->src_idx + 1) & (MAX_SRCS - 1);
+static void perf_dma_copy_callback(void *data)
+{
+	struct perf_thread *pthr = data;
 
-	rc = perf_move_data(pctx, dst, src, buf_size, win_size, total);
+	atomic_dec(&pthr->dma_sync);
+	wake_up(&pthr->dma_wait);
+}
 
-	atomic_dec(&perf->tsync);
+static int perf_copy_chunk(struct perf_thread *pthr,
+			   void __iomem *dst, void *src, size_t len)
+{
+	struct dma_async_tx_descriptor *tx;
+	struct dmaengine_unmap_data *unmap;
+	struct device *dma_dev;
+	int try = 0, ret = 0;
 
-	if (rc < 0) {
-		pr_err("%s: failed\n", current->comm);
-		rc = -ENXIO;
-		goto err;
+	if (!use_dma) {
+		memcpy_toio(dst, src, len);
+		goto ret_check_tsync;
 	}
 
-	for (i = 0; i < MAX_SRCS; i++) {
-		kfree(pctx->srcs[i]);
-		pctx->srcs[i] = NULL;
+	dma_dev = pthr->dma_chan->device->dev;
+
+	if (!is_dma_copy_aligned(pthr->dma_chan->device, offset_in_page(src),
+				 offset_in_page(dst), len))
+		return -EIO;
+
+	unmap = dmaengine_get_unmap_data(dma_dev, 2, GFP_NOWAIT);
+	if (!unmap)
+		return -ENOMEM;
+
+	unmap->len = len;
+	unmap->addr[0] = dma_map_page(dma_dev, virt_to_page(src),
+		offset_in_page(src), len, DMA_TO_DEVICE);
+	if (dma_mapping_error(dma_dev, unmap->addr[0])) {
+		ret = -EIO;
+		goto err_free_resource;
 	}
+	unmap->to_cnt = 1;
 
-	atomic_inc(&perf->tdone);
-	wake_up(pctx->wq);
-	rc = 0;
-	goto done;
+	unmap->addr[1] = dma_map_page(dma_dev, virt_to_page(dst),
+		offset_in_page(dst), len, DMA_FROM_DEVICE);
+	if (dma_mapping_error(dma_dev, unmap->addr[1])) {
+		ret = -EIO;
+		goto err_free_resource;
+	}
+	unmap->from_cnt = 1;
 
-err:
-	for (i = 0; i < MAX_SRCS; i++) {
-		kfree(pctx->srcs[i]);
-		pctx->srcs[i] = NULL;
+	do {
+		tx = dmaengine_prep_dma_memcpy(pthr->dma_chan, unmap->addr[1],
+			unmap->addr[0], len, DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
+		if (!tx)
+			msleep(DMA_MDELAY);
+	} while (!tx && (try++ < DMA_TRIES));
+
+	if (!tx) {
+		ret = -EIO;
+		goto err_free_resource;
 	}
 
-	if (dma_chan) {
-		dma_release_channel(dma_chan);
-		pctx->dma_chan = NULL;
+	tx->callback = perf_dma_copy_callback;
+	tx->callback_param = pthr;
+	dma_set_unmap(tx, unmap);
+
+	if (dma_submit_error(dmaengine_submit(tx))) {
+		dmaengine_unmap_put(unmap);
+		goto err_free_resource;
 	}
 
-done:
-	/* Wait until we are told to stop */
-	for (;;) {
-		set_current_state(TASK_INTERRUPTIBLE);
-		if (kthread_should_stop())
-			break;
-		schedule();
+	dmaengine_unmap_put(unmap);
+
+	atomic_inc(&pthr->dma_sync);
+	dma_async_issue_pending(pthr->dma_chan);
+
+ret_check_tsync:
+	return likely(atomic_read(&pthr->perf->tsync) > 0) ? 0 : -EINTR;
+
+err_free_resource:
+	dmaengine_unmap_put(unmap);
+
+	return ret;
+}
+
+static bool perf_dma_filter(struct dma_chan *chan, void *data)
+{
+	struct perf_ctx *perf = data;
+	int node;
+
+	node = dev_to_node(&perf->ntb->dev);
+
+	return node == NUMA_NO_NODE || node == dev_to_node(chan->device->dev);
+}
+
+static int perf_init_test(struct perf_thread *pthr)
+{
+	struct perf_ctx *perf = pthr->perf;
+	dma_cap_mask_t dma_mask;
+
+	pthr->src = kmalloc_node(perf->test_peer->outbuf_size, GFP_KERNEL,
+				 dev_to_node(&perf->ntb->dev));
+	if (!pthr->src)
+		return -ENOMEM;
+
+	get_random_bytes(pthr->src, perf->test_peer->outbuf_size);
+
+	if (!use_dma)
+		return 0;
+
+	dma_cap_zero(dma_mask);
+	dma_cap_set(DMA_MEMCPY, dma_mask);
+	pthr->dma_chan = dma_request_channel(dma_mask, perf_dma_filter, perf);
+	if (!pthr->dma_chan) {
+		dev_err(&perf->ntb->dev, "%d: Failed to get DMA channel\n",
+			pthr->tidx);
+		atomic_dec(&perf->tsync);
+		wake_up(&perf->twait);
+		kfree(pthr->src);
+		return -ENODEV;
 	}
-	__set_current_state(TASK_RUNNING);
 
-	return rc;
+	atomic_set(&pthr->dma_sync, 0);
+
+	return 0;
 }
 
-static void perf_free_mw(struct perf_ctx *perf)
+static int perf_run_test(struct perf_thread *pthr)
 {
-	struct perf_mw *mw = &perf->mw;
-	struct pci_dev *pdev = perf->ntb->pdev;
+	struct perf_peer *peer = pthr->perf->test_peer;
+	struct perf_ctx *perf = pthr->perf;
+	void __iomem *flt_dst, *bnd_dst;
+	u64 total_size, chunk_size;
+	void *flt_src;
+	int ret = 0;
+
+	total_size = 1ULL << total_order;
+	chunk_size = 1ULL << chunk_order;
+	chunk_size = min_t(u64, peer->outbuf_size, chunk_size);
+
+	flt_src = pthr->src;
+	bnd_dst = peer->outbuf + peer->outbuf_size;
+	flt_dst = peer->outbuf;
+
+	pthr->duration = ktime_get();
+
+	/* Copied field is cleared on test launch stage */
+	while (pthr->copied < total_size) {
+		ret = perf_copy_chunk(pthr, flt_dst, flt_src, chunk_size);
+		if (ret) {
+			dev_err(&perf->ntb->dev, "%d: Got error %d on test\n",
+				pthr->tidx, ret);
+			return ret;
+		}
 
-	if (!mw->virt_addr)
-		return;
+		pthr->copied += chunk_size;
+
+		flt_dst += chunk_size;
+		flt_src += chunk_size;
+		if (flt_dst >= bnd_dst || flt_dst < peer->outbuf) {
+			flt_dst = peer->outbuf;
+			flt_src = pthr->src;
+		}
 
-	ntb_mw_clear_trans(perf->ntb, PIDX, 0);
-	dma_free_coherent(&pdev->dev, mw->buf_size,
-			  mw->virt_addr, mw->dma_addr);
-	mw->xlat_size = 0;
-	mw->buf_size = 0;
-	mw->virt_addr = NULL;
+		/* Give up CPU to give a chance for other threads to use it */
+		schedule();
+	}
+
+	return 0;
 }
 
-static int perf_set_mw(struct perf_ctx *perf, resource_size_t size)
+static int perf_sync_test(struct perf_thread *pthr)
 {
-	struct perf_mw *mw = &perf->mw;
-	size_t xlat_size, buf_size;
-	resource_size_t	xlat_align;
-	resource_size_t	xlat_align_size;
-	int rc;
+	struct perf_ctx *perf = pthr->perf;
 
-	if (!size)
-		return -EINVAL;
+	if (!use_dma)
+		goto no_dma_ret;
 
-	rc = ntb_mw_get_align(perf->ntb, PIDX, 0, &xlat_align,
-			      &xlat_align_size, NULL);
-	if (rc)
-		return rc;
+	wait_event(pthr->dma_wait,
+		   (atomic_read(&pthr->dma_sync) == 0 ||
+		    atomic_read(&perf->tsync) < 0));
 
-	xlat_size = round_up(size, xlat_align_size);
-	buf_size = round_up(size, xlat_align);
+	if (atomic_read(&perf->tsync) < 0)
+		return -EINTR;
 
-	if (mw->xlat_size == xlat_size)
-		return 0;
+no_dma_ret:
+	pthr->duration = ktime_sub(ktime_get(), pthr->duration);
 
-	if (mw->buf_size)
-		perf_free_mw(perf);
+	dev_dbg(&perf->ntb->dev, "%d: copied %llu bytes\n",
+		pthr->tidx, pthr->copied);
 
-	mw->xlat_size = xlat_size;
-	mw->buf_size = buf_size;
+	dev_dbg(&perf->ntb->dev, "%d: lasted %llu usecs\n",
+		pthr->tidx, ktime_to_us(pthr->duration));
+
+	dev_dbg(&perf->ntb->dev, "%d: %llu MBytes/s\n", pthr->tidx,
+		div64_u64(pthr->copied, ktime_to_us(pthr->duration)));
+
+	return 0;
+}
+
+static void perf_clear_test(struct perf_thread *pthr)
+{
+	struct perf_ctx *perf = pthr->perf;
+
+	if (!use_dma)
+		goto no_dma_notify;
+
+	/*
+	 * If test finished without errors, termination isn't needed.
+	 * We call it anyway just to be sure of the transfers completion.
+	 */
+	(void)dmaengine_terminate_sync(pthr->dma_chan);
+
+	dma_release_channel(pthr->dma_chan);
+
+no_dma_notify:
+	atomic_dec(&perf->tsync);
+	wake_up(&perf->twait);
+	kfree(pthr->src);
+}
 
-	mw->virt_addr = dma_alloc_coherent(&perf->ntb->pdev->dev, buf_size,
-					   &mw->dma_addr, GFP_KERNEL);
-	if (!mw->virt_addr) {
-		mw->xlat_size = 0;
-		mw->buf_size = 0;
+static void perf_thread_work(struct work_struct *work)
+{
+	struct perf_thread *pthr = to_thread_work(work);
+	int ret;
+
+	/*
+	 * Perform stages in compliance with use_dma flag value.
+	 * Test status is changed only if error happened, otherwise
+	 * status -ENODATA is kept while test is on-fly. Results
+	 * synchronization is performed only if test fininshed
+	 * without an error or interruption.
+	 */
+	ret = perf_init_test(pthr);
+	if (ret) {
+		pthr->status = ret;
+		return;
 	}
 
-	rc = ntb_mw_set_trans(perf->ntb, PIDX, 0, mw->dma_addr, mw->xlat_size);
-	if (rc) {
-		dev_err(&perf->ntb->dev, "Unable to set mw0 translation\n");
-		perf_free_mw(perf);
-		return -EIO;
+	ret = perf_run_test(pthr);
+	if (ret) {
+		pthr->status = ret;
+		goto err_clear_test;
 	}
 
-	return 0;
+	pthr->status = perf_sync_test(pthr);
+
+err_clear_test:
+	perf_clear_test(pthr);
 }
 
-static void perf_link_work(struct work_struct *work)
+static int perf_set_tcnt(struct perf_ctx *perf, u8 tcnt)
 {
-	struct perf_ctx *perf =
-		container_of(work, struct perf_ctx, link_work.work);
-	struct ntb_dev *ndev = perf->ntb;
-	struct pci_dev *pdev = ndev->pdev;
-	u32 val;
-	u64 size;
-	int rc;
+	if (tcnt == 0 || tcnt > MAX_THREADS_CNT)
+		return -EINVAL;
 
-	dev_dbg(&perf->ntb->pdev->dev, "%s called\n", __func__);
+	if (test_and_set_bit_lock(0, &perf->busy_flag))
+		return -EBUSY;
+
+	perf->tcnt = tcnt;
+
+	clear_bit_unlock(0, &perf->busy_flag);
 
-	size = perf->mw.phys_size;
+	return 0;
+}
 
-	if (max_mw_size && size > max_mw_size)
-		size = max_mw_size;
+static void perf_terminate_test(struct perf_ctx *perf)
+{
+	int tidx;
 
-	ntb_peer_spad_write(ndev, PIDX, MW_SZ_HIGH, upper_32_bits(size));
-	ntb_peer_spad_write(ndev, PIDX, MW_SZ_LOW, lower_32_bits(size));
-	ntb_peer_spad_write(ndev, PIDX, VERSION, PERF_VERSION);
+	atomic_set(&perf->tsync, -1);
+	wake_up(&perf->twait);
 
-	/* now read what peer wrote */
-	val = ntb_spad_read(ndev, VERSION);
-	if (val != PERF_VERSION) {
-		dev_dbg(&pdev->dev, "Remote version = %#x\n", val);
-		goto out;
+	for (tidx = 0; tidx < MAX_THREADS_CNT; tidx++) {
+		wake_up(&perf->threads[tidx].dma_wait);
+		cancel_work_sync(&perf->threads[tidx].work);
 	}
+}
+
+static int perf_submit_test(struct perf_peer *peer)
+{
+	struct perf_ctx *perf = peer->perf;
+	struct perf_thread *pthr;
+	int tidx, ret;
 
-	val = ntb_spad_read(ndev, MW_SZ_HIGH);
-	size = (u64)val << 32;
+	if (!test_bit(PERF_STS_DONE, &peer->sts))
+		return -ENOLINK;
 
-	val = ntb_spad_read(ndev, MW_SZ_LOW);
-	size |= val;
+	if (test_and_set_bit_lock(0, &perf->busy_flag))
+		return -EBUSY;
 
-	dev_dbg(&pdev->dev, "Remote MW size = %#llx\n", size);
+	perf->test_peer = peer;
+	atomic_set(&perf->tsync, perf->tcnt);
 
-	rc = perf_set_mw(perf, size);
-	if (rc)
-		goto out1;
+	for (tidx = 0; tidx < MAX_THREADS_CNT; tidx++) {
+		pthr = &perf->threads[tidx];
 
-	perf->link_is_up = true;
-	wake_up(&perf->link_wq);
+		pthr->status = -ENODATA;
+		pthr->copied = 0;
+		pthr->duration = ktime_set(0, 0);
+		if (tidx < perf->tcnt)
+			(void)queue_work(perf_wq, &pthr->work);
+	}
 
-	return;
+	ret = wait_event_interruptible(perf->twait,
+				       atomic_read(&perf->tsync) <= 0);
+	if (ret == -ERESTARTSYS) {
+		perf_terminate_test(perf);
+		ret = -EINTR;
+	}
 
-out1:
-	perf_free_mw(perf);
+	clear_bit_unlock(0, &perf->busy_flag);
 
-out:
-	if (ntb_link_is_up(ndev, NULL, NULL) == 1)
-		schedule_delayed_work(&perf->link_work,
-				      msecs_to_jiffies(PERF_LINK_DOWN_TIMEOUT));
+	return ret;
 }
 
-static int perf_setup_mw(struct ntb_dev *ntb, struct perf_ctx *perf)
+static int perf_read_stats(struct perf_ctx *perf, char *buf,
+			   size_t size, ssize_t *pos)
 {
-	struct perf_mw *mw;
-	int rc;
+	struct perf_thread *pthr;
+	int tidx;
+
+	if (test_and_set_bit_lock(0, &perf->busy_flag))
+		return -EBUSY;
 
-	mw = &perf->mw;
+	(*pos) += scnprintf(buf + *pos, size - *pos,
+		"    Peer %d test statistics:\n", perf->test_peer->pidx);
 
-	rc = ntb_peer_mw_get_addr(ntb, 0, &mw->phys_addr, &mw->phys_size);
-	if (rc)
-		return rc;
+	for (tidx = 0; tidx < MAX_THREADS_CNT; tidx++) {
+		pthr = &perf->threads[tidx];
 
-	perf->mw.vbase = ioremap_wc(mw->phys_addr, mw->phys_size);
-	if (!mw->vbase)
-		return -ENOMEM;
+		if (pthr->status == -ENODATA)
+			continue;
+
+		if (pthr->status) {
+			(*pos) += scnprintf(buf + *pos, size - *pos,
+				"%d: error status %d\n", tidx, pthr->status);
+			continue;
+		}
+
+		(*pos) += scnprintf(buf + *pos, size - *pos,
+			"%d: copied %llu bytes in %llu usecs, %llu MBytes/s\n",
+			tidx, pthr->copied, ktime_to_us(pthr->duration),
+			div64_u64(pthr->copied, ktime_to_us(pthr->duration)));
+	}
+
+	clear_bit_unlock(0, &perf->busy_flag);
 
 	return 0;
 }
 
-static ssize_t debugfs_run_read(struct file *filp, char __user *ubuf,
-				size_t count, loff_t *offp)
+static void perf_init_threads(struct perf_ctx *perf)
 {
-	struct perf_ctx *perf = filp->private_data;
+	struct perf_thread *pthr;
+	int tidx;
+
+	perf->tcnt = DEF_THREADS_CNT;
+	perf->test_peer = &perf->peers[0];
+	init_waitqueue_head(&perf->twait);
+
+	for (tidx = 0; tidx < MAX_THREADS_CNT; tidx++) {
+		pthr = &perf->threads[tidx];
+
+		pthr->perf = perf;
+		pthr->tidx = tidx;
+		pthr->status = -ENODATA;
+		init_waitqueue_head(&pthr->dma_wait);
+		INIT_WORK(&pthr->work, perf_thread_work);
+	}
+}
+
+static void perf_clear_threads(struct perf_ctx *perf)
+{
+	perf_terminate_test(perf);
+}
+
+/*==============================================================================
+ *                               DebugFS nodes
+ *==============================================================================
+ */
+
+static ssize_t perf_dbgfs_read_info(struct file *filep, char __user *ubuf,
+				    size_t size, loff_t *offp)
+{
+	struct perf_ctx *perf = filep->private_data;
+	struct perf_peer *peer;
+	size_t buf_size;
+	ssize_t pos = 0;
+	int ret, pidx;
 	char *buf;
-	ssize_t ret, out_off = 0;
-	struct pthr_ctx *pctx;
-	int i;
-	u64 rate;
 
-	if (!perf)
-		return 0;
+	buf_size = min_t(size_t, size, 0x1000U);
 
-	buf = kmalloc(1024, GFP_KERNEL);
+	buf = kmalloc(buf_size, GFP_KERNEL);
 	if (!buf)
 		return -ENOMEM;
 
-	if (mutex_is_locked(&perf->run_mutex)) {
-		out_off = scnprintf(buf, 64, "running\n");
-		goto read_from_buf;
+	pos += scnprintf(buf + pos, buf_size - pos,
+		"    Performance measuring tool info:\n\n");
+
+	pos += scnprintf(buf + pos, buf_size - pos,
+		"Local port %d, Global index %d\n", ntb_port_number(perf->ntb),
+		perf->gidx);
+	pos += scnprintf(buf + pos, buf_size - pos, "Test status: ");
+	if (test_bit(0, &perf->busy_flag)) {
+		pos += scnprintf(buf + pos, buf_size - pos,
+			"on-fly with port %d (%d)\n",
+			ntb_peer_port_number(perf->ntb, perf->test_peer->pidx),
+			perf->test_peer->pidx);
+	} else {
+		pos += scnprintf(buf + pos, buf_size - pos, "idle\n");
 	}
 
-	for (i = 0; i < MAX_THREADS; i++) {
-		pctx = &perf->pthr_ctx[i];
+	for (pidx = 0; pidx < perf->pcnt; pidx++) {
+		peer = &perf->peers[pidx];
+
+		pos += scnprintf(buf + pos, buf_size - pos,
+			"Port %d (%d), Global index %d:\n",
+			ntb_peer_port_number(perf->ntb, peer->pidx), peer->pidx,
+			peer->gidx);
+
+		pos += scnprintf(buf + pos, buf_size - pos,
+			"\tLink status: %s\n",
+			test_bit(PERF_STS_LNKUP, &peer->sts) ? "up" : "down");
+
+		pos += scnprintf(buf + pos, buf_size - pos,
+			"\tOut buffer addr 0x%pK\n", peer->outbuf);
 
-		if (pctx->status == -ENODATA)
-			break;
+		pos += scnprintf(buf + pos, buf_size - pos,
+			"\tOut buffer size %pa\n", &peer->outbuf_size);
 
-		if (pctx->status) {
-			out_off += scnprintf(buf + out_off, 1024 - out_off,
-					    "%d: error %d\n", i,
-					    pctx->status);
+		pos += scnprintf(buf + pos, buf_size - pos,
+			"\tOut buffer xlat 0x%016llx[p]\n", peer->outbuf_xlat);
+
+		if (!peer->inbuf) {
+			pos += scnprintf(buf + pos, buf_size - pos,
+				"\tIn buffer addr: unallocated\n");
 			continue;
 		}
 
-		rate = div64_u64(pctx->copied, pctx->diff_us);
-		out_off += scnprintf(buf + out_off, 1024 - out_off,
-			"%d: copied %llu bytes in %llu usecs, %llu MBytes/s\n",
-			i, pctx->copied, pctx->diff_us, rate);
+		pos += scnprintf(buf + pos, buf_size - pos,
+			"\tIn buffer addr 0x%pK\n", peer->inbuf);
+
+		pos += scnprintf(buf + pos, buf_size - pos,
+			"\tIn buffer size %pa\n", &peer->inbuf_size);
+
+		pos += scnprintf(buf + pos, buf_size - pos,
+			"\tIn buffer xlat %pad[p]\n", &peer->inbuf_xlat);
 	}
 
-read_from_buf:
-	ret = simple_read_from_buffer(ubuf, count, offp, buf, out_off);
+	ret = simple_read_from_buffer(ubuf, size, offp, buf, pos);
 	kfree(buf);
 
 	return ret;
 }
 
-static void threads_cleanup(struct perf_ctx *perf)
+static const struct file_operations perf_dbgfs_info = {
+	.open = simple_open,
+	.read = perf_dbgfs_read_info
+};
+
+static ssize_t perf_dbgfs_read_run(struct file *filep, char __user *ubuf,
+				   size_t size, loff_t *offp)
 {
-	struct pthr_ctx *pctx;
-	int i;
+	struct perf_ctx *perf = filep->private_data;
+	ssize_t ret, pos = 0;
+	char *buf;
 
-	for (i = 0; i < MAX_THREADS; i++) {
-		pctx = &perf->pthr_ctx[i];
-		if (pctx->thread) {
-			pctx->status = kthread_stop(pctx->thread);
-			pctx->thread = NULL;
-		}
-	}
-}
+	buf = kmalloc(PERF_BUF_LEN, GFP_KERNEL);
+	if (!buf)
+		return -ENOMEM;
 
-static void perf_clear_thread_status(struct perf_ctx *perf)
-{
-	int i;
+	ret = perf_read_stats(perf, buf, PERF_BUF_LEN, &pos);
+	if (ret)
+		goto err_free;
+
+	ret = simple_read_from_buffer(ubuf, size, offp, buf, pos);
+err_free:
+	kfree(buf);
 
-	for (i = 0; i < MAX_THREADS; i++)
-		perf->pthr_ctx[i].status = -ENODATA;
+	return ret;
 }
 
-static ssize_t debugfs_run_write(struct file *filp, const char __user *ubuf,
-				 size_t count, loff_t *offp)
+static ssize_t perf_dbgfs_write_run(struct file *filep, const char __user *ubuf,
+				    size_t size, loff_t *offp)
 {
-	struct perf_ctx *perf = filp->private_data;
-	int node, i;
-	DECLARE_WAIT_QUEUE_HEAD(wq);
+	struct perf_ctx *perf = filep->private_data;
+	struct perf_peer *peer;
+	int pidx, ret;
 
-	if (wait_event_interruptible(perf->link_wq, perf->link_is_up))
-		return -ENOLINK;
+	ret = kstrtoint_from_user(ubuf, size, 0, &pidx);
+	if (ret)
+		return ret;
 
-	if (perf->perf_threads == 0)
+	if (pidx < 0 || pidx >= perf->pcnt)
 		return -EINVAL;
 
-	if (!mutex_trylock(&perf->run_mutex))
-		return -EBUSY;
+	peer = &perf->peers[pidx];
 
-	perf_clear_thread_status(perf);
+	ret = perf_submit_test(peer);
+	if (ret)
+		return ret;
 
-	if (perf->perf_threads > MAX_THREADS) {
-		perf->perf_threads = MAX_THREADS;
-		pr_info("Reset total threads to: %u\n", MAX_THREADS);
-	}
+	return size;
+}
 
-	/* no greater than 1M */
-	if (seg_order > MAX_SEG_ORDER) {
-		seg_order = MAX_SEG_ORDER;
-		pr_info("Fix seg_order to %u\n", seg_order);
-	}
+static const struct file_operations perf_dbgfs_run = {
+	.open = simple_open,
+	.read = perf_dbgfs_read_run,
+	.write = perf_dbgfs_write_run
+};
 
-	if (run_order < seg_order) {
-		run_order = seg_order;
-		pr_info("Fix run_order to %u\n", run_order);
-	}
+static ssize_t perf_dbgfs_read_tcnt(struct file *filep, char __user *ubuf,
+				    size_t size, loff_t *offp)
+{
+	struct perf_ctx *perf = filep->private_data;
+	char buf[8];
+	ssize_t pos;
 
-	node = on_node ? dev_to_node(&perf->ntb->pdev->dev)
-		       : NUMA_NO_NODE;
-	atomic_set(&perf->tdone, 0);
+	pos = scnprintf(buf, sizeof(buf), "%hhu\n", perf->tcnt);
 
-	/* launch kernel thread */
-	for (i = 0; i < perf->perf_threads; i++) {
-		struct pthr_ctx *pctx;
+	return simple_read_from_buffer(ubuf, size, offp, buf, pos);
+}
 
-		pctx = &perf->pthr_ctx[i];
-		atomic_set(&pctx->dma_sync, 0);
-		pctx->perf = perf;
-		pctx->wq = &wq;
-		pctx->thread =
-			kthread_create_on_node(ntb_perf_thread,
-					       (void *)pctx,
-					       node, "ntb_perf %d", i);
-		if (IS_ERR(pctx->thread)) {
-			pctx->thread = NULL;
-			goto err;
-		} else {
-			wake_up_process(pctx->thread);
-		}
-	}
+static ssize_t perf_dbgfs_write_tcnt(struct file *filep,
+				     const char __user *ubuf,
+				     size_t size, loff_t *offp)
+{
+	struct perf_ctx *perf = filep->private_data;
+	int ret;
+	u8 val;
 
-	wait_event_interruptible(wq,
-		atomic_read(&perf->tdone) == perf->perf_threads);
+	ret = kstrtou8_from_user(ubuf, size, 0, &val);
+	if (ret)
+		return ret;
 
-	threads_cleanup(perf);
-	mutex_unlock(&perf->run_mutex);
-	return count;
+	ret = perf_set_tcnt(perf, val);
+	if (ret)
+		return ret;
 
-err:
-	threads_cleanup(perf);
-	mutex_unlock(&perf->run_mutex);
-	return -ENXIO;
+	return size;
 }
 
-static const struct file_operations ntb_perf_debugfs_run = {
-	.owner = THIS_MODULE,
+static const struct file_operations perf_dbgfs_tcnt = {
 	.open = simple_open,
-	.read = debugfs_run_read,
-	.write = debugfs_run_write,
+	.read = perf_dbgfs_read_tcnt,
+	.write = perf_dbgfs_write_tcnt
 };
 
-static int perf_debugfs_setup(struct perf_ctx *perf)
+static void perf_setup_dbgfs(struct perf_ctx *perf)
 {
 	struct pci_dev *pdev = perf->ntb->pdev;
-	struct dentry *debugfs_node_dir;
-	struct dentry *debugfs_run;
-	struct dentry *debugfs_threads;
-	struct dentry *debugfs_seg_order;
-	struct dentry *debugfs_run_order;
-	struct dentry *debugfs_use_dma;
-	struct dentry *debugfs_on_node;
-
-	if (!debugfs_initialized())
-		return -ENODEV;
 
-	/* Assumpion: only one NTB device in the system */
-	if (!perf_debugfs_dir) {
-		perf_debugfs_dir = debugfs_create_dir(KBUILD_MODNAME, NULL);
-		if (!perf_debugfs_dir)
-			return -ENODEV;
-	}
-
-	debugfs_node_dir = debugfs_create_dir(pci_name(pdev),
-					      perf_debugfs_dir);
-	if (!debugfs_node_dir)
-		goto err;
-
-	debugfs_run = debugfs_create_file("run", S_IRUSR | S_IWUSR,
-					  debugfs_node_dir, perf,
-					  &ntb_perf_debugfs_run);
-	if (!debugfs_run)
-		goto err;
-
-	debugfs_threads = debugfs_create_u8("threads", S_IRUSR | S_IWUSR,
-					    debugfs_node_dir,
-					    &perf->perf_threads);
-	if (!debugfs_threads)
-		goto err;
-
-	debugfs_seg_order = debugfs_create_u32("seg_order", 0600,
-					       debugfs_node_dir,
-					       &seg_order);
-	if (!debugfs_seg_order)
-		goto err;
-
-	debugfs_run_order = debugfs_create_u32("run_order", 0600,
-					       debugfs_node_dir,
-					       &run_order);
-	if (!debugfs_run_order)
-		goto err;
-
-	debugfs_use_dma = debugfs_create_bool("use_dma", 0600,
-					       debugfs_node_dir,
-					       &use_dma);
-	if (!debugfs_use_dma)
-		goto err;
-
-	debugfs_on_node = debugfs_create_bool("on_node", 0600,
-					      debugfs_node_dir,
-					      &on_node);
-	if (!debugfs_on_node)
-		goto err;
+	perf->dbgfs_dir = debugfs_create_dir(pci_name(pdev), perf_dbgfs_topdir);
+	if (!perf->dbgfs_dir) {
+		dev_warn(&perf->ntb->dev, "DebugFS unsupported\n");
+		return;
+	}
+
+	debugfs_create_file("info", 0600, perf->dbgfs_dir, perf,
+			    &perf_dbgfs_info);
 
-	return 0;
+	debugfs_create_file("run", 0600, perf->dbgfs_dir, perf,
+			    &perf_dbgfs_run);
 
-err:
-	debugfs_remove_recursive(perf_debugfs_dir);
-	perf_debugfs_dir = NULL;
-	return -ENODEV;
+	debugfs_create_file("threads_count", 0600, perf->dbgfs_dir, perf,
+			    &perf_dbgfs_tcnt);
+
+	/* They are made read-only for test exec safety and integrity */
+	debugfs_create_u8("chunk_order", 0500, perf->dbgfs_dir, &chunk_order);
+
+	debugfs_create_u8("total_order", 0500, perf->dbgfs_dir, &total_order);
+
+	debugfs_create_bool("use_dma", 0500, perf->dbgfs_dir, &use_dma);
 }
 
-static int perf_probe(struct ntb_client *client, struct ntb_dev *ntb)
+static void perf_clear_dbgfs(struct perf_ctx *perf)
+{
+	debugfs_remove_recursive(perf->dbgfs_dir);
+}
+
+/*==============================================================================
+ *                        Basic driver initialization
+ *==============================================================================
+ */
+
+static struct perf_ctx *perf_create_data(struct ntb_dev *ntb)
 {
-	struct pci_dev *pdev = ntb->pdev;
 	struct perf_ctx *perf;
-	int node;
-	int rc = 0;
 
-	if (ntb_spad_count(ntb) < MAX_SPAD) {
-		dev_err(&ntb->dev, "Not enough scratch pad registers for %s",
-			DRIVER_NAME);
-		return -EIO;
-	}
+	perf = devm_kzalloc(&ntb->dev, sizeof(*perf), GFP_KERNEL);
+	if (!perf)
+		return ERR_PTR(-ENOMEM);
 
-	if (!ntb->ops->mw_set_trans) {
-		dev_err(&ntb->dev, "Need inbound MW based NTB API\n");
-		return -EINVAL;
+	perf->pcnt = ntb_peer_port_count(ntb);
+	perf->peers = devm_kcalloc(&ntb->dev, perf->pcnt, sizeof(*perf->peers),
+				  GFP_KERNEL);
+	if (!perf->peers)
+		return ERR_PTR(-ENOMEM);
+
+	perf->ntb = ntb;
+
+	return perf;
+}
+
+static int perf_setup_peer_mw(struct perf_peer *peer)
+{
+	struct perf_ctx *perf = peer->perf;
+	phys_addr_t phys_addr;
+	int ret;
+
+	/* Get outbound MW parameters and map it */
+	ret = ntb_peer_mw_get_addr(perf->ntb, peer->gidx, &phys_addr,
+				   &peer->outbuf_size);
+	if (ret)
+		return ret;
+
+	peer->outbuf = devm_ioremap_wc(&perf->ntb->dev, phys_addr,
+					peer->outbuf_size);
+	if (!peer->outbuf)
+		return -ENOMEM;
+
+	if (max_mw_size && peer->outbuf_size > max_mw_size) {
+		peer->outbuf_size = max_mw_size;
+		dev_warn(&peer->perf->ntb->dev,
+			"Peer %d outbuf reduced to %#llx\n", peer->pidx,
+			peer->outbuf_size);
 	}
 
-	if (ntb_peer_port_count(ntb) != NTB_DEF_PEER_CNT)
-		dev_warn(&ntb->dev, "Multi-port NTB devices unsupported\n");
+	return 0;
+}
 
-	node = on_node ? dev_to_node(&pdev->dev) : NUMA_NO_NODE;
-	perf = kzalloc_node(sizeof(*perf), GFP_KERNEL, node);
-	if (!perf) {
-		rc = -ENOMEM;
-		goto err_perf;
+static int perf_init_peers(struct perf_ctx *perf)
+{
+	struct perf_peer *peer;
+	int pidx, lport, ret;
+
+	lport = ntb_port_number(perf->ntb);
+	perf->gidx = -1;
+	for (pidx = 0; pidx < perf->pcnt; pidx++) {
+		peer = &perf->peers[pidx];
+
+		peer->perf = perf;
+		peer->pidx = pidx;
+		if (lport < ntb_peer_port_number(perf->ntb, pidx)) {
+			if (perf->gidx == -1)
+				perf->gidx = pidx;
+			peer->gidx = pidx + 1;
+		} else {
+			peer->gidx = pidx;
+		}
+		INIT_WORK(&peer->service, perf_service_work);
 	}
+	if (perf->gidx == -1)
+		perf->gidx = pidx;
 
-	perf->ntb = ntb;
-	perf->perf_threads = 1;
-	atomic_set(&perf->tsync, 0);
-	mutex_init(&perf->run_mutex);
-	spin_lock_init(&perf->db_lock);
-	perf_setup_mw(ntb, perf);
-	init_waitqueue_head(&perf->link_wq);
-	INIT_DELAYED_WORK(&perf->link_work, perf_link_work);
+	for (pidx = 0; pidx < perf->pcnt; pidx++) {
+		ret = perf_setup_peer_mw(&perf->peers[pidx]);
+		if (ret)
+			return ret;
+	}
+
+	dev_dbg(&perf->ntb->dev, "Global port index %d\n", perf->gidx);
+
+	return 0;
+}
 
-	rc = ntb_set_ctx(ntb, perf, &perf_ops);
-	if (rc)
-		goto err_ctx;
+static int perf_probe(struct ntb_client *client, struct ntb_dev *ntb)
+{
+	struct perf_ctx *perf;
+	int ret;
 
-	perf->link_is_up = false;
-	ntb_link_enable(ntb, NTB_SPEED_AUTO, NTB_WIDTH_AUTO);
-	ntb_link_event(ntb);
+	perf = perf_create_data(ntb);
+	if (IS_ERR(perf))
+		return PTR_ERR(perf);
 
-	rc = perf_debugfs_setup(perf);
-	if (rc)
-		goto err_ctx;
+	ret = perf_init_peers(perf);
+	if (ret)
+		return ret;
 
-	perf_clear_thread_status(perf);
+	perf_init_threads(perf);
 
-	return 0;
+	ret = perf_init_service(perf);
+	if (ret)
+		return ret;
 
-err_ctx:
-	cancel_delayed_work_sync(&perf->link_work);
-	kfree(perf);
-err_perf:
-	return rc;
+	ret = perf_enable_service(perf);
+	if (ret)
+		return ret;
+
+	perf_setup_dbgfs(perf);
+
+	return 0;
 }
 
 static void perf_remove(struct ntb_client *client, struct ntb_dev *ntb)
 {
 	struct perf_ctx *perf = ntb->ctx;
-	int i;
 
-	dev_dbg(&perf->ntb->dev, "%s called\n", __func__);
+	perf_clear_dbgfs(perf);
 
-	mutex_lock(&perf->run_mutex);
+	perf_disable_service(perf);
 
-	cancel_delayed_work_sync(&perf->link_work);
+	perf_clear_threads(perf);
+}
 
-	ntb_clear_ctx(ntb);
-	ntb_link_disable(ntb);
+static struct ntb_client perf_client = {
+	.ops = {
+		.probe = perf_probe,
+		.remove = perf_remove
+	}
+};
 
-	debugfs_remove_recursive(perf_debugfs_dir);
-	perf_debugfs_dir = NULL;
+static int __init perf_init(void)
+{
+	int ret;
 
-	if (use_dma) {
-		for (i = 0; i < MAX_THREADS; i++) {
-			struct pthr_ctx *pctx = &perf->pthr_ctx[i];
+	if (chunk_order > MAX_CHUNK_ORDER) {
+		chunk_order = MAX_CHUNK_ORDER;
+		pr_info("Chunk order reduced to %hhu\n", chunk_order);
+	}
 
-			if (pctx->dma_chan)
-				dma_release_channel(pctx->dma_chan);
-		}
+	if (total_order < chunk_order) {
+		total_order = chunk_order;
+		pr_info("Total data order reduced to %hhu\n", total_order);
 	}
 
-	kfree(perf);
+	perf_wq = alloc_workqueue("perf_wq", WQ_UNBOUND | WQ_SYSFS, 0);
+	if (!perf_wq)
+		return -ENOMEM;
+
+	if (debugfs_initialized())
+		perf_dbgfs_topdir = debugfs_create_dir(KBUILD_MODNAME, NULL);
+
+	ret = ntb_register_client(&perf_client);
+	if (ret) {
+		debugfs_remove_recursive(perf_dbgfs_topdir);
+		destroy_workqueue(perf_wq);
+	}
+
+	return ret;
 }
+module_init(perf_init);
+
+static void __exit perf_exit(void)
+{
+	ntb_unregister_client(&perf_client);
+	debugfs_remove_recursive(perf_dbgfs_topdir);
+	destroy_workqueue(perf_wq);
+}
+module_exit(perf_exit);
 
-static struct ntb_client perf_client = {
-	.ops = {
-		.probe = perf_probe,
-		.remove = perf_remove,
-	},
-};
-module_ntb_client(perf_client);
-- 
2.12.0

[PATCH v4 07/15] NTB: ntb_test: Safely use paths with whitespace

[Serge Semin]

If some of variables like LOC/REM or LOCAL_*/REMOTE_* got
whitespaces, the script may fail with syntax error.

Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
Acked-by: Logan Gunthorpe <logang@deltatee.com>
Fixes: a9c59ef77458 ("ntb_test: Add a selftest script for the NTB subsystem")
---
 tools/testing/selftests/ntb/ntb_test.sh | 62 ++++++++++++++++-----------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/tools/testing/selftests/ntb/ntb_test.sh b/tools/testing/selftests/ntb/ntb_test.sh
index 5fc7ad359e21..a8647ad891eb 100755
--- a/tools/testing/selftests/ntb/ntb_test.sh
+++ b/tools/testing/selftests/ntb/ntb_test.sh
@@ -87,7 +87,7 @@ set -e
 
 function _modprobe()
 {
-        modprobe "$@"
+	modprobe "$@"
 
 	if [[ "$REMOTE_HOST" != "" ]]; then
 		ssh "$REMOTE_HOST" modprobe "$@"
@@ -274,13 +274,13 @@ function pingpong_test()
 
 	echo "Running ping pong tests on: $(basename $LOC) / $(basename $REM)"
 
-	LOC_START=$(read_file $LOC/count)
-	REM_START=$(read_file $REM/count)
+	LOC_START=$(read_file "$LOC/count")
+	REM_START=$(read_file "$REM/count")
 
 	sleep 7
 
-	LOC_END=$(read_file $LOC/count)
-	REM_END=$(read_file $REM/count)
+	LOC_END=$(read_file "$LOC/count")
+	REM_END=$(read_file "$REM/count")
 
 	if [[ $LOC_START == $LOC_END ]] || [[ $REM_START == $REM_END ]]; then
 		echo "Ping pong counter not incrementing!" >&2
@@ -304,15 +304,15 @@ function perf_test()
 		max_mw_size=$MAX_MW_SIZE use_dma=$USE_DMA
 
 	echo "Running local perf test $WITH DMA"
-	write_file "" $LOCAL_PERF/run
+	write_file "" "$LOCAL_PERF/run"
 	echo -n "  "
-	read_file $LOCAL_PERF/run
+	read_file "$LOCAL_PERF/run"
 	echo "  Passed"
 
 	echo "Running remote perf test $WITH DMA"
-	write_file "" $REMOTE_PERF/run
+	write_file "" "$REMOTE_PERF/run"
 	echo -n "  "
-	read_file $REMOTE_PERF/run
+	read_file "$REMOTE_PERF/run"
 	echo "  Passed"
 
 	_modprobe -r ntb_perf
@@ -320,39 +320,39 @@ function perf_test()
 
 function ntb_tool_tests()
 {
-	LOCAL_TOOL=$DEBUGFS/ntb_tool/$LOCAL_DEV
-	REMOTE_TOOL=$REMOTE_HOST:$DEBUGFS/ntb_tool/$REMOTE_DEV
+	LOCAL_TOOL="$DEBUGFS/ntb_tool/$LOCAL_DEV"
+	REMOTE_TOOL="$REMOTE_HOST:$DEBUGFS/ntb_tool/$REMOTE_DEV"
 
 	echo "Starting ntb_tool tests..."
 
 	_modprobe ntb_tool
 
-	write_file Y $LOCAL_TOOL/link_event
-	write_file Y $REMOTE_TOOL/link_event
+	write_file "Y" "$LOCAL_TOOL/link_event"
+	write_file "Y" "$REMOTE_TOOL/link_event"
 
-	link_test $LOCAL_TOOL $REMOTE_TOOL
-	link_test $REMOTE_TOOL $LOCAL_TOOL
+	link_test "$LOCAL_TOOL" "$REMOTE_TOOL"
+	link_test "$REMOTE_TOOL" "$LOCAL_TOOL"
 
 	#Ensure the link is up on both sides before continuing
-	write_file Y $LOCAL_TOOL/link_event
-	write_file Y $REMOTE_TOOL/link_event
+	write_file "Y" "$LOCAL_TOOL/link_event"
+	write_file "Y" "$REMOTE_TOOL/link_event"
 
-	for PEER_TRANS in $(ls $LOCAL_TOOL/peer_trans*); do
+	for PEER_TRANS in $(ls "$LOCAL_TOOL"/peer_trans*); do
 		PT=$(basename $PEER_TRANS)
-		write_file $MW_SIZE $LOCAL_TOOL/$PT
-		write_file $MW_SIZE $REMOTE_TOOL/$PT
+		write_file $MW_SIZE "$LOCAL_TOOL/$PT"
+		write_file $MW_SIZE "$REMOTE_TOOL/$PT"
 	done
 
-	doorbell_test $LOCAL_TOOL $REMOTE_TOOL
-	doorbell_test $REMOTE_TOOL $LOCAL_TOOL
-	scratchpad_test $LOCAL_TOOL $REMOTE_TOOL
-	scratchpad_test $REMOTE_TOOL $LOCAL_TOOL
+	doorbell_test "$LOCAL_TOOL" "$REMOTE_TOOL"
+	doorbell_test "$REMOTE_TOOL" "$LOCAL_TOOL"
+	scratchpad_test "$LOCAL_TOOL" "$REMOTE_TOOL"
+	scratchpad_test "$REMOTE_TOOL" "$LOCAL_TOOL"
 
-	for MW in $(ls $LOCAL_TOOL/mw*); do
+	for MW in $(ls "$LOCAL_TOOL"/mw*); do
 		MW=$(basename $MW)
 
-		mw_test $MW $LOCAL_TOOL $REMOTE_TOOL
-		mw_test $MW $REMOTE_TOOL $LOCAL_TOOL
+		mw_test $MW "$LOCAL_TOOL" "$REMOTE_TOOL"
+		mw_test $MW "$REMOTE_TOOL" "$LOCAL_TOOL"
 	done
 
 	_modprobe -r ntb_tool
@@ -360,8 +360,8 @@ function ntb_tool_tests()
 
 function ntb_pingpong_tests()
 {
-	LOCAL_PP=$DEBUGFS/ntb_pingpong/$LOCAL_DEV
-	REMOTE_PP=$REMOTE_HOST:$DEBUGFS/ntb_pingpong/$REMOTE_DEV
+	LOCAL_PP="$DEBUGFS/ntb_pingpong/$LOCAL_DEV"
+	REMOTE_PP="$REMOTE_HOST:$DEBUGFS/ntb_pingpong/$REMOTE_DEV"
 
 	echo "Starting ntb_pingpong tests..."
 
@@ -374,8 +374,8 @@ function ntb_pingpong_tests()
 
 function ntb_perf_tests()
 {
-	LOCAL_PERF=$DEBUGFS/ntb_perf/$LOCAL_DEV
-	REMOTE_PERF=$REMOTE_HOST:$DEBUGFS/ntb_perf/$REMOTE_DEV
+	LOCAL_PERF="$DEBUGFS/ntb_perf/$LOCAL_DEV"
+	REMOTE_PERF="$REMOTE_HOST:$DEBUGFS/ntb_perf/$REMOTE_DEV"
 
 	echo "Starting ntb_perf tests..."
 
-- 
2.12.0

[PATCH v4 08/15] NTB: ntb_test: Add ntb_tool port tests

[Serge Semin]

Multi-port interface is now available in ntb_tool driver. According
to the new NTB API, there might be more than two devices connected over
NTB. It means each device can have multiple freely enumerated ports.
Each port got index assigned by NTB hardware driver. This test is
performed to determine the local and peer ports as well as their indexes.

Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
---
 tools/testing/selftests/ntb/ntb_test.sh | 52 +++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/tools/testing/selftests/ntb/ntb_test.sh b/tools/testing/selftests/ntb/ntb_test.sh
index a8647ad891eb..541ba70ad640 100755
--- a/tools/testing/selftests/ntb/ntb_test.sh
+++ b/tools/testing/selftests/ntb/ntb_test.sh
@@ -127,6 +127,56 @@ function write_file()
 	fi
 }
 
+function check_file()
+{
+	split_remote $1
+
+	if [[ "$REMOTE" != "" ]]; then
+		ssh "$REMOTE" "[[ -e ${VPATH} ]]"
+	else
+		[[ -e ${VPATH} ]]
+	fi
+}
+
+function find_pidx()
+{
+	PORT=$1
+	PPATH=$2
+
+	for ((i = 0; i < 64; i++)); do
+		PEER_DIR="$PPATH/peer$i"
+
+		check_file ${PEER_DIR} || break
+
+		PEER_PORT=$(read_file "${PEER_DIR}/port")
+		if [[ ${PORT} -eq $PEER_PORT ]]; then
+			echo $i
+			return 0
+		fi
+	done
+
+	return 1
+}
+
+function port_test()
+{
+	LOC=$1
+	REM=$2
+
+	echo "Running port tests on: $(basename $LOC) / $(basename $REM)"
+
+	LOCAL_PORT=$(read_file "$LOC/port")
+	REMOTE_PORT=$(read_file "$REM/port")
+
+	LOCAL_PIDX=$(find_pidx ${REMOTE_PORT} "$LOC")
+	REMOTE_PIDX=$(find_pidx ${LOCAL_PORT} "$REM")
+
+	echo "Local port ${LOCAL_PORT} with index ${REMOTE_PIDX} on remote host"
+	echo "Peer port ${REMOTE_PORT} with index ${LOCAL_PIDX} on local host"
+
+	echo "  Passed"
+}
+
 function link_test()
 {
 	LOC=$1
@@ -327,6 +377,8 @@ function ntb_tool_tests()
 
 	_modprobe ntb_tool
 
+	port_test "$LOCAL_TOOL" "$REMOTE_TOOL"
+
 	write_file "Y" "$LOCAL_TOOL/link_event"
 	write_file "Y" "$REMOTE_TOOL/link_event"
 
-- 
2.12.0

[PATCH v4 09/15] NTB: ntb_test: Update ntb_tool link tests

[Serge Semin]

Link Up and Down methods are used to change NTB link settings on
local side only for multi-port devices. Link is considered up
only if both sides local and peer set it up. Intel/AMD hardware
acts a bit different by assigning the Primary and Secondary roles,
so Primary device only is able to change the link state. Such behaviour
should be reflected in the test code.

Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
---
Changelog v3:
- Redirect errors to /dev/null instead of /dev/nulle

 tools/testing/selftests/ntb/ntb_test.sh | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/tools/testing/selftests/ntb/ntb_test.sh b/tools/testing/selftests/ntb/ntb_test.sh
index 541ba70ad640..a3942f31c057 100755
--- a/tools/testing/selftests/ntb/ntb_test.sh
+++ b/tools/testing/selftests/ntb/ntb_test.sh
@@ -138,6 +138,11 @@ function check_file()
 	fi
 }
 
+function subdirname()
+{
+	echo $(basename $(dirname $1)) 2> /dev/null
+}
+
 function find_pidx()
 {
 	PORT=$1
@@ -183,9 +188,9 @@ function link_test()
 	REM=$2
 	EXP=0
 
-	echo "Running link tests on: $(basename $LOC) / $(basename $REM)"
+	echo "Running link tests on: $(subdirname $LOC) / $(subdirname $REM)"
 
-	if ! write_file "N" "$LOC/link" 2> /dev/null; then
+	if ! write_file "N" "$LOC/../link" 2> /dev/null; then
 		echo "  Unsupported"
 		return
 	fi
@@ -193,12 +198,11 @@ function link_test()
 	write_file "N" "$LOC/link_event"
 
 	if [[ $(read_file "$REM/link") != "N" ]]; then
-		echo "Expected remote link to be down in $REM/link" >&2
+		echo "Expected link to be down in $REM/link" >&2
 		exit -1
 	fi
 
-	write_file "Y" "$LOC/link"
-	write_file "Y" "$LOC/link_event"
+	write_file "Y" "$LOC/../link"
 
 	echo "  Passed"
 }
@@ -379,15 +383,15 @@ function ntb_tool_tests()
 
 	port_test "$LOCAL_TOOL" "$REMOTE_TOOL"
 
-	write_file "Y" "$LOCAL_TOOL/link_event"
-	write_file "Y" "$REMOTE_TOOL/link_event"
+	LOCAL_PEER_TOOL="$LOCAL_TOOL/peer$LOCAL_PIDX"
+	REMOTE_PEER_TOOL="$REMOTE_TOOL/peer$REMOTE_PIDX"
 
-	link_test "$LOCAL_TOOL" "$REMOTE_TOOL"
-	link_test "$REMOTE_TOOL" "$LOCAL_TOOL"
+	link_test "$LOCAL_PEER_TOOL" "$REMOTE_PEER_TOOL"
+	link_test "$REMOTE_PEER_TOOL" "$LOCAL_PEER_TOOL"
 
 	#Ensure the link is up on both sides before continuing
-	write_file "Y" "$LOCAL_TOOL/link_event"
-	write_file "Y" "$REMOTE_TOOL/link_event"
+	write_file "Y" "$LOCAL_PEER_TOOL/link_event"
+	write_file "Y" "$REMOTE_PEER_TOOL/link_event"
 
 	for PEER_TRANS in $(ls "$LOCAL_TOOL"/peer_trans*); do
 		PT=$(basename $PEER_TRANS)
-- 
2.12.0

[PATCH v4 10/15] NTB: ntb_test: Update ntb_tool DB tests

[Serge Semin]

DB interface of ntb_tool driver hasn't been changed much, but
db_valid_mask DebugFS file has still been added. In this case
it's much better to test all valid DB bits instead of using
the predefined mask, which may be incorrect in general.

Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
---
 tools/testing/selftests/ntb/ntb_test.sh | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/tools/testing/selftests/ntb/ntb_test.sh b/tools/testing/selftests/ntb/ntb_test.sh
index a3942f31c057..ec2e51183f8d 100755
--- a/tools/testing/selftests/ntb/ntb_test.sh
+++ b/tools/testing/selftests/ntb/ntb_test.sh
@@ -18,7 +18,6 @@ LIST_DEVS=FALSE
 
 DEBUGFS=${DEBUGFS-/sys/kernel/debug}
 
-DB_BITMASK=0x7FFF
 PERF_RUN_ORDER=32
 MAX_MW_SIZE=0
 RUN_DMA_TESTS=
@@ -39,7 +38,6 @@ function show_help()
 	echo "be highly recommended."
 	echo
 	echo "Options:"
-	echo "  -b BITMASK      doorbell clear bitmask for ntb_tool"
 	echo "  -C              don't cleanup ntb modules on exit"
 	echo "  -d              run dma tests"
 	echo "  -h              show this help message"
@@ -56,7 +54,6 @@ function parse_args()
 	OPTIND=0
 	while getopts "b:Cdhlm:r:p:w:" opt; do
 		case "$opt" in
-		b)  DB_BITMASK=${OPTARG} ;;
 		C)  DONT_CLEANUP=1 ;;
 		d)  RUN_DMA_TESTS=1 ;;
 		h)  show_help; exit 0 ;;
@@ -215,21 +212,30 @@ function doorbell_test()
 
 	echo "Running db tests on: $(basename $LOC) / $(basename $REM)"
 
-	write_file "c $DB_BITMASK" "$REM/db"
+	DB_VALID_MASK=$(read_file "$LOC/db_valid_mask")
 
-	for ((i=1; i <= 8; i++)); do
-		let DB=$(read_file "$REM/db") || true
-		if [[ "$DB" != "$EXP" ]]; then
+	write_file "c $DB_VALID_MASK" "$REM/db"
+
+	for ((i = 0; i < 64; i++)); do
+		DB=$(read_file "$REM/db")
+		if [[ "$DB" -ne "$EXP" ]]; then
 			echo "Doorbell doesn't match expected value $EXP " \
 			     "in $REM/db" >&2
 			exit -1
 		fi
 
-		let "MASK=1 << ($i-1)" || true
-		let "EXP=$EXP | $MASK" || true
+		let "MASK = (1 << $i) & $DB_VALID_MASK" || true
+		let "EXP = $EXP | $MASK" || true
+
 		write_file "s $MASK" "$LOC/peer_db"
 	done
 
+	write_file "c $DB_VALID_MASK" "$REM/db_mask"
+	write_file $DB_VALID_MASK "$REM/db_event"
+	write_file "s $DB_VALID_MASK" "$REM/db_mask"
+
+	write_file "c $DB_VALID_MASK" "$REM/db"
+
 	echo "  Passed"
 }
 
@@ -393,14 +399,15 @@ function ntb_tool_tests()
 	write_file "Y" "$LOCAL_PEER_TOOL/link_event"
 	write_file "Y" "$REMOTE_PEER_TOOL/link_event"
 
+	doorbell_test "$LOCAL_TOOL" "$REMOTE_TOOL"
+	doorbell_test "$REMOTE_TOOL" "$LOCAL_TOOL"
+
 	for PEER_TRANS in $(ls "$LOCAL_TOOL"/peer_trans*); do
 		PT=$(basename $PEER_TRANS)
 		write_file $MW_SIZE "$LOCAL_TOOL/$PT"
 		write_file $MW_SIZE "$REMOTE_TOOL/$PT"
 	done
 
-	doorbell_test "$LOCAL_TOOL" "$REMOTE_TOOL"
-	doorbell_test "$REMOTE_TOOL" "$LOCAL_TOOL"
 	scratchpad_test "$LOCAL_TOOL" "$REMOTE_TOOL"
 	scratchpad_test "$REMOTE_TOOL" "$LOCAL_TOOL"
 
-- 
2.12.0

[PATCH v4 11/15] NTB: ntb_test: Update ntb_tool Scratchpad tests

[Serge Semin]

Scratchpad NTB API has changed so has the ntb_tool driver. Outbound
Scratchpad DebugFS files have been moved to peer specific directories.
Each scratchpad is now available via separate file. The test code
has been accordingly altered.

Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
---
 tools/testing/selftests/ntb/ntb_test.sh | 43 ++++++++++++++++++++-------------
 1 file changed, 26 insertions(+), 17 deletions(-)

diff --git a/tools/testing/selftests/ntb/ntb_test.sh b/tools/testing/selftests/ntb/ntb_test.sh
index ec2e51183f8d..06b9b156a6fc 100755
--- a/tools/testing/selftests/ntb/ntb_test.sh
+++ b/tools/testing/selftests/ntb/ntb_test.sh
@@ -239,35 +239,44 @@ function doorbell_test()
 	echo "  Passed"
 }
 
-function read_spad()
+function get_files_count()
 {
-       VPATH=$1
-       IDX=$2
+	NAME=$1
+	LOC=$2
+
+	split_remote $LOC
 
-       ROW=($(read_file "$VPATH" | grep -e "^$IDX"))
-       let VAL=${ROW[1]} || true
-       echo $VAL
+	if [[ "$REMOTE" == "" ]]; then
+		echo $(ls -1 "$LOC"/${NAME}* 2>/dev/null | wc -l)
+	else
+		echo $(ssh "$REMOTE" "ls -1 \"$VPATH\"/${NAME}* | \
+		       wc -l" 2> /dev/null)
+	fi
 }
 
 function scratchpad_test()
 {
 	LOC=$1
 	REM=$2
-	CNT=$(read_file "$LOC/spad" | wc -l)
 
-	echo "Running spad tests on: $(basename $LOC) / $(basename $REM)"
+	echo "Running spad tests on: $(subdirname $LOC) / $(subdirname $REM)"
+
+	CNT=$(get_files_count "spad" "$LOC")
+
+	if [[ $CNT -eq 0 ]]; then
+		echo "  Unsupported"
+		return
+	fi
 
 	for ((i = 0; i < $CNT; i++)); do
 		VAL=$RANDOM
-		write_file "$i $VAL" "$LOC/peer_spad"
-		RVAL=$(read_spad "$REM/spad" $i)
+		write_file "$VAL" "$LOC/spad$i"
+		RVAL=$(read_file "$REM/../spad$i")
 
-		if [[ "$VAL" != "$RVAL" ]]; then
-			echo "Scratchpad doesn't match expected value $VAL " \
-			     "in $REM/spad, got $RVAL" >&2
+		if [[ "$VAL" -ne "$RVAL" ]]; then
+			echo "Scratchpad $i value $RVAL doesn't match $VAL" >&2
 			exit -1
 		fi
-
 	done
 
 	echo "  Passed"
@@ -402,15 +411,15 @@ function ntb_tool_tests()
 	doorbell_test "$LOCAL_TOOL" "$REMOTE_TOOL"
 	doorbell_test "$REMOTE_TOOL" "$LOCAL_TOOL"
 
+	scratchpad_test "$LOCAL_PEER_TOOL" "$REMOTE_PEER_TOOL"
+	scratchpad_test "$REMOTE_PEER_TOOL" "$LOCAL_PEER_TOOL"
+
 	for PEER_TRANS in $(ls "$LOCAL_TOOL"/peer_trans*); do
 		PT=$(basename $PEER_TRANS)
 		write_file $MW_SIZE "$LOCAL_TOOL/$PT"
 		write_file $MW_SIZE "$REMOTE_TOOL/$PT"
 	done
 
-	scratchpad_test "$LOCAL_TOOL" "$REMOTE_TOOL"
-	scratchpad_test "$REMOTE_TOOL" "$LOCAL_TOOL"
-
 	for MW in $(ls "$LOCAL_TOOL"/mw*); do
 		MW=$(basename $MW)
 
-- 
2.12.0

[PATCH v4 12/15] NTB: ntb_test: Add ntb_tool Message tests

[Serge Semin]

Messages NTB API is now available. ntb_tool driver has been altered
to perform messages send and receive operation. The test of messages
read/write to/from peer device has been added to the script.

Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
---
 tools/testing/selftests/ntb/ntb_test.sh | 37 +++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/tools/testing/selftests/ntb/ntb_test.sh b/tools/testing/selftests/ntb/ntb_test.sh
index 06b9b156a6fc..849191fd2308 100755
--- a/tools/testing/selftests/ntb/ntb_test.sh
+++ b/tools/testing/selftests/ntb/ntb_test.sh
@@ -282,6 +282,40 @@ function scratchpad_test()
 	echo "  Passed"
 }
 
+function message_test()
+{
+	LOC=$1
+	REM=$2
+
+	echo "Running msg tests on: $(subdirname $LOC) / $(subdirname $REM)"
+
+	CNT=$(get_files_count "msg" "$LOC")
+
+	if [[ $CNT -eq 0 ]]; then
+		echo "  Unsupported"
+		return
+	fi
+
+	MSG_OUTBITS_MASK=$(read_file "$LOC/../msg_inbits")
+	MSG_INBITS_MASK=$(read_file "$REM/../msg_inbits")
+
+	write_file "c $MSG_OUTBITS_MASK" "$LOC/../msg_sts"
+	write_file "c $MSG_INBITS_MASK" "$REM/../msg_sts"
+
+	for ((i = 0; i < $CNT; i++)); do
+		VAL=$RANDOM
+		write_file "$VAL" "$LOC/msg$i"
+		RVAL=$(read_file "$REM/../msg$i")
+
+		if [[ "$VAL" -ne "${RVAL%%<-*}" ]]; then
+			echo "Message $i value $RVAL doesn't match $VAL" >&2
+			exit -1
+		fi
+	done
+
+	echo "  Passed"
+}
+
 function write_mw()
 {
 	split_remote $2
@@ -414,6 +448,9 @@ function ntb_tool_tests()
 	scratchpad_test "$LOCAL_PEER_TOOL" "$REMOTE_PEER_TOOL"
 	scratchpad_test "$REMOTE_PEER_TOOL" "$LOCAL_PEER_TOOL"
 
+	message_test "$LOCAL_PEER_TOOL" "$REMOTE_PEER_TOOL"
+	message_test "$REMOTE_PEER_TOOL" "$LOCAL_PEER_TOOL"
+
 	for PEER_TRANS in $(ls "$LOCAL_TOOL"/peer_trans*); do
 		PT=$(basename $PEER_TRANS)
 		write_file $MW_SIZE "$LOCAL_TOOL/$PT"
-- 
2.12.0

[PATCH v4 13/15] NTB: ntb_test: Update ntb_tool MW tests

[Serge Semin]

There are devices (like IDT PCIe switches), which outbound MWs xlat address
is setup on peer side. In this case local side is supposed to allocate
a memory buffer and somehow deliver the xlat DMA address to peer so one
could set the outbound MW up. The MW test is altered so to support both
previous Intel/AMD and new IDT-like devices.

Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
---
 tools/testing/selftests/ntb/ntb_test.sh | 89 +++++++++++++++++++++++++--------
 1 file changed, 68 insertions(+), 21 deletions(-)

diff --git a/tools/testing/selftests/ntb/ntb_test.sh b/tools/testing/selftests/ntb/ntb_test.sh
index 849191fd2308..2dea126c85eb 100755
--- a/tools/testing/selftests/ntb/ntb_test.sh
+++ b/tools/testing/selftests/ntb/ntb_test.sh
@@ -43,7 +43,9 @@ function show_help()
 	echo "  -h              show this help message"
 	echo "  -l              list available local and remote PCI ids"
 	echo "  -r REMOTE_HOST  specify the remote's hostname to connect"
-        echo "                  to for the test (using ssh)"
+	echo "                  to for the test (using ssh)"
+	echo "  -m MW_SIZE      memory window size for ntb_tool"
+	echo "                  (default: $MW_SIZE)"
 	echo "  -p NUM          ntb_perf run order (default: $PERF_RUN_ORDER)"
 	echo "  -w max_mw_size  maxmium memory window size"
 	echo
@@ -316,6 +318,32 @@ function message_test()
 	echo "  Passed"
 }
 
+function get_number()
+{
+	KEY=$1
+
+	sed -n "s/^\(${KEY}\)[ \t]*\(0x[0-9a-fA-F]*\)\(\[p\]\)\?$/\2/p"
+}
+
+function mw_alloc()
+{
+	IDX=$1
+	LOC=$2
+	REM=$3
+
+	write_file $MW_SIZE "$LOC/mw_trans$IDX"
+
+	INB_MW=$(read_file "$LOC/mw_trans$IDX")
+	MW_ALIGNED_SIZE=$(echo "$INB_MW" | get_number "Window Size")
+	MW_DMA_ADDR=$(echo "$INB_MW" | get_number "DMA Address")
+
+	write_file "$MW_DMA_ADDR:$(($MW_ALIGNED_SIZE))" "$REM/peer_mw_trans$IDX"
+
+	if [[ $MW_SIZE -ne $MW_ALIGNED_SIZE ]]; then
+		echo "MW $IDX size aligned to $MW_ALIGNED_SIZE"
+	fi
+}
+
 function write_mw()
 {
 	split_remote $2
@@ -328,17 +356,15 @@ function write_mw()
 	fi
 }
 
-function mw_test()
+function mw_check()
 {
 	IDX=$1
 	LOC=$2
 	REM=$3
 
-	echo "Running $IDX tests on: $(basename $LOC) / $(basename $REM)"
-
-	write_mw "$LOC/$IDX"
+	write_mw "$LOC/mw$IDX"
 
-	split_remote "$LOC/$IDX"
+	split_remote "$LOC/mw$IDX"
 	if [[ "$REMOTE" == "" ]]; then
 		A=$VPATH
 	else
@@ -346,7 +372,7 @@ function mw_test()
 		ssh "$REMOTE" cat "$VPATH" > "$A"
 	fi
 
-	split_remote "$REM/peer_$IDX"
+	split_remote "$REM/peer_mw$IDX"
 	if [[ "$REMOTE" == "" ]]; then
 		B=$VPATH
 	else
@@ -354,7 +380,7 @@ function mw_test()
 		ssh "$REMOTE" cat "$VPATH" > "$B"
 	fi
 
-	cmp -n $MW_SIZE "$A" "$B"
+	cmp -n $MW_ALIGNED_SIZE "$A" "$B"
 	if [[ $? != 0 ]]; then
 		echo "Memory window $MW did not match!" >&2
 	fi
@@ -366,8 +392,39 @@ function mw_test()
 	if [[ "$B" == "/tmp/*" ]]; then
 		rm "$B"
 	fi
+}
+
+function mw_free()
+{
+	IDX=$1
+	LOC=$2
+	REM=$3
+
+	write_file "$MW_DMA_ADDR:0" "$REM/peer_mw_trans$IDX"
+
+	write_file 0 "$LOC/mw_trans$IDX"
+}
+
+function mw_test()
+{
+	LOC=$1
+	REM=$2
+
+	CNT=$(get_files_count "mw_trans" "$LOC")
+
+	for ((i = 0; i < $CNT; i++)); do
+		echo "Running mw$i tests on: $(subdirname $LOC) / " \
+		     "$(subdirname $REM)"
+
+		mw_alloc $i $LOC $REM
+
+		mw_check $i $LOC $REM
+
+		mw_free $i $LOC  $REM
+
+		echo "  Passed"
+	done
 
-	echo "  Passed"
 }
 
 function pingpong_test()
@@ -451,18 +508,8 @@ function ntb_tool_tests()
 	message_test "$LOCAL_PEER_TOOL" "$REMOTE_PEER_TOOL"
 	message_test "$REMOTE_PEER_TOOL" "$LOCAL_PEER_TOOL"
 
-	for PEER_TRANS in $(ls "$LOCAL_TOOL"/peer_trans*); do
-		PT=$(basename $PEER_TRANS)
-		write_file $MW_SIZE "$LOCAL_TOOL/$PT"
-		write_file $MW_SIZE "$REMOTE_TOOL/$PT"
-	done
-
-	for MW in $(ls "$LOCAL_TOOL"/mw*); do
-		MW=$(basename $MW)
-
-		mw_test $MW "$LOCAL_TOOL" "$REMOTE_TOOL"
-		mw_test $MW "$REMOTE_TOOL" "$LOCAL_TOOL"
-	done
+	mw_test "$LOCAL_PEER_TOOL" "$REMOTE_PEER_TOOL"
+	mw_test "$REMOTE_PEER_TOOL" "$LOCAL_PEER_TOOL"
 
 	_modprobe -r ntb_tool
 }
-- 
2.12.0

[PATCH v4 14/15] NTB: ntb_test: Update ntb_perf tests

[Serge Semin]

ntb_perf driver has been also updated so to have the multi-port
interface support. User now must specify what peer port is going
to be used to perform the test.

Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
---
 tools/testing/selftests/ntb/ntb_test.sh | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/tools/testing/selftests/ntb/ntb_test.sh b/tools/testing/selftests/ntb/ntb_test.sh
index 2dea126c85eb..08cbfbbc7029 100755
--- a/tools/testing/selftests/ntb/ntb_test.sh
+++ b/tools/testing/selftests/ntb/ntb_test.sh
@@ -39,15 +39,16 @@ function show_help()
 	echo
 	echo "Options:"
 	echo "  -C              don't cleanup ntb modules on exit"
-	echo "  -d              run dma tests"
 	echo "  -h              show this help message"
 	echo "  -l              list available local and remote PCI ids"
 	echo "  -r REMOTE_HOST  specify the remote's hostname to connect"
 	echo "                  to for the test (using ssh)"
 	echo "  -m MW_SIZE      memory window size for ntb_tool"
 	echo "                  (default: $MW_SIZE)"
-	echo "  -p NUM          ntb_perf run order (default: $PERF_RUN_ORDER)"
-	echo "  -w max_mw_size  maxmium memory window size"
+	echo "  -d              run dma tests for ntb_perf"
+	echo "  -p ORDER        total data order for ntb_perf"
+	echo "                  (default: $PERF_RUN_ORDER)"
+	echo "  -w MAX_MW_SIZE  maxmium memory window size for ntb_perf"
 	echo
 }
 
@@ -460,17 +461,17 @@ function perf_test()
 		WITH="without"
 	fi
 
-	_modprobe ntb_perf run_order=$PERF_RUN_ORDER \
+	_modprobe ntb_perf total_order=$PERF_RUN_ORDER \
 		max_mw_size=$MAX_MW_SIZE use_dma=$USE_DMA
 
 	echo "Running local perf test $WITH DMA"
-	write_file "" "$LOCAL_PERF/run"
+	write_file "$LOCAL_PIDX" "$LOCAL_PERF/run"
 	echo -n "  "
 	read_file "$LOCAL_PERF/run"
 	echo "  Passed"
 
 	echo "Running remote perf test $WITH DMA"
-	write_file "" "$REMOTE_PERF/run"
+	write_file "$REMOTE_PIDX" "$REMOTE_PERF/run"
 	echo -n "  "
 	read_file "$REMOTE_PERF/run"
 	echo "  Passed"
-- 
2.12.0

[PATCH v4 15/15] NTB: ntb_hw_idt: Set NTB_TOPO_SWITCH topology

[Serge Semin]

Since Switchtec patch there has been a new topology added to
the NTB API. It's called NTB_TOPO_SWITCH and dedicated for
PCIe switch chips. Even though topo field isn't used within the
IDT driver much, lets set it for the sake of unification.

Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
---
 drivers/ntb/hw/idt/ntb_hw_idt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/ntb/hw/idt/ntb_hw_idt.c b/drivers/ntb/hw/idt/ntb_hw_idt.c
index 93d4c9d2a9ad..8d98872d0983 100644
--- a/drivers/ntb/hw/idt/ntb_hw_idt.c
+++ b/drivers/ntb/hw/idt/ntb_hw_idt.c
@@ -2070,7 +2070,7 @@ static int idt_register_device(struct idt_ntb_dev *ndev)
 
 	/* Initialize the rest of NTB device structure and register it */
 	ndev->ntb.ops = &idt_ntb_ops;
-	ndev->ntb.topo = NTB_TOPO_PRI;
+	ndev->ntb.topo = NTB_TOPO_SWITCH;
 
 	ret = ntb_register_device(&ndev->ntb);
 	if (ret != 0) {
-- 
2.12.0

Re: [PATCH v4 00/15] NTB: Add full multi-port API support to the test drivers

[Jon Mason]

On Wed, Dec 06, 2017 at 05:31:51PM +0300, Serge Semin wrote:
> The multi-port NTB API was introduced in kernel 4.13 as well as the
> first driver for the true multi-port devices of IDT PCIe-switches
> series. But the test drivers still were left almost unchanged. Yes,
> they didn't fail being used with new NTB API, but they only worked
> with two-ports NTB devices. This patchset is intended to fix the
> issue by amending the NTB test drivers and script so they would be
> fully compatible with multi-port NTB API.
> 
> Additionally I found a few NTB subsystem issues while developing the
> submitted patches. So they are also fixed in this patchset.
> 
> The patchset is applied on top of the recent Jon Mason's repo state:
> https://github.com/jonmason/ntb
> Particularly the "ntb/ntb-next" branch is used. The last commit hash
> had been:
> commit <c47963de5204> ("ntb_hw_switchtec: Force down the link before")

Series applied to ntb-next.

Thanks,
Jon

> 
> Serge Semin (15):
>   NTB: Rename NTB messaging API methods
>   NTB: Set dma mask and dma coherent mask to NTB devices
>   NTB: Fix UB/bug in ntb_mw_get_align()
>   NTB: ntb_pp: Add full multi-port NTB API support
>   NTB: ntb_tool: Add full multi-port NTB API support
>   NTB: ntb_perf: Add full multi-port NTB API support
>   NTB: ntb_test: Safely use paths with whitespace
>   NTB: ntb_test: Add ntb_tool port tests
>   NTB: ntb_test: Update ntb_tool link tests
>   NTB: ntb_test: Update ntb_tool DB tests
>   NTB: ntb_test: Update ntb_tool Scratchpad tests
>   NTB: ntb_test: Add ntb_tool Message tests
>   NTB: ntb_test: Update ntb_tool MW tests
>   NTB: ntb_test: Update ntb_perf tests
>   NTB: ntb_hw_idt: Set NTB_TOPO_SWITCH topology
> 
>  drivers/ntb/hw/amd/ntb_hw_amd.c         |    4 +
>  drivers/ntb/hw/idt/ntb_hw_idt.c         |   37 +-
>  drivers/ntb/hw/intel/ntb_hw_intel.c     |    4 +
>  drivers/ntb/ntb.c                       |    1 -
>  drivers/ntb/test/ntb_perf.c             | 1820 +++++++++++++++++++++----------
>  drivers/ntb/test/ntb_pingpong.c         |  447 +++++---
>  drivers/ntb/test/ntb_tool.c             | 1820 +++++++++++++++++++++----------
>  include/linux/ntb.h                     |   36 +-
>  tools/testing/selftests/ntb/ntb_test.sh |  307 ++++--
>  9 files changed, 3018 insertions(+), 1458 deletions(-)
> 
> -- 
> 2.12.0
>