Linux-RDMA Archive on lore.kernel.org
 help / color / Atom feed
From: Zhu Yanjun <zyjzyj2000@gmail.com>
To: Yanjun Zhu <yanjunz@mellanox.com>,
	linux-rdma@vger.kernel.org, Doug Ledford <dledford@redhat.com>,
	Kamal Heib <kamalheib1@gmail.com>, Jason Gunthorpe <jgg@ziepe.ca>
Subject: Re: FW: [PATCH for-next] RDMA/rxe: Remove pkey table
Date: Wed, 22 Jul 2020 10:09:04 +0800
Message-ID: <CAD=hENePPVzfaC_YtCL1izsFSi+U_T=0m18MujARznsWbj=q5g@mail.gmail.com> (raw)
In-Reply-To: <AM6PR05MB6263CFB337190B1740CDF4B7D8780@AM6PR05MB6263.eurprd05.prod.outlook.com>

On Tue, Jul 21, 2020 at 7:28 PM Yanjun Zhu <yanjunz@mellanox.com> wrote:
>
>
>
> -----Original Message-----
> From: Kamal Heib <kamalheib1@gmail.com>
> Sent: Tuesday, July 21, 2020 6:16 PM
> To: linux-rdma@vger.kernel.org
> Cc: Yanjun Zhu <yanjunz@mellanox.com>; Doug Ledford <dledford@redhat.com>; Jason Gunthorpe <jgg@ziepe.ca>; Kamal Heib <kamalheib1@gmail.com>
> Subject: [PATCH for-next] RDMA/rxe: Remove pkey table
>
> The RoCE spec require from RoCE devices to support only the defualt pkey, While the rxe driver maintain a 64 enties pkey table and use only the first entry. With that said remove the maintaing of the pkey table and used the default pkey when needed.
>

Hi Kamal

After this patch is applied, do you make tests with SoftRoCE and mlx hardware?

The SoftRoCE should work well with the mlx hardware.

Zhu Yanjun

> Fixes: 8700e3e7c485 ("Soft RoCE driver")
> Signed-off-by: Kamal Heib <kamalheib1@gmail.com>
> ---
>  drivers/infiniband/sw/rxe/rxe.c       | 34 +++------------------------
>  drivers/infiniband/sw/rxe/rxe_param.h |  4 ++--  drivers/infiniband/sw/rxe/rxe_recv.c  | 29 ++++-------------------
>  drivers/infiniband/sw/rxe/rxe_req.c   |  5 +---
>  drivers/infiniband/sw/rxe/rxe_verbs.c | 17 +++-----------  drivers/infiniband/sw/rxe/rxe_verbs.h |  1 -
>  6 files changed, 13 insertions(+), 77 deletions(-)
>
> diff --git a/drivers/infiniband/sw/rxe/rxe.c b/drivers/infiniband/sw/rxe/rxe.c index efcb72c92be6..907203afbd99 100644
> --- a/drivers/infiniband/sw/rxe/rxe.c
> +++ b/drivers/infiniband/sw/rxe/rxe.c
> @@ -40,14 +40,6 @@ MODULE_AUTHOR("Bob Pearson, Frank Zago, John Groves, Kamal Heib");  MODULE_DESCRIPTION("Soft RDMA transport");  MODULE_LICENSE("Dual BSD/GPL");
>
> -/* free resources for all ports on a device */ -static void rxe_cleanup_ports(struct rxe_dev *rxe) -{
> -       kfree(rxe->port.pkey_tbl);
> -       rxe->port.pkey_tbl = NULL;
> -
> -}
> -
>  /* free resources for a rxe device all objects created for this device must
>   * have been destroyed
>   */
> @@ -66,8 +58,6 @@ void rxe_dealloc(struct ib_device *ib_dev)
>         rxe_pool_cleanup(&rxe->mc_grp_pool);
>         rxe_pool_cleanup(&rxe->mc_elem_pool);
>
> -       rxe_cleanup_ports(rxe);
> -
>         if (rxe->tfm)
>                 crypto_free_shash(rxe->tfm);
>  }
> @@ -139,25 +129,14 @@ static void rxe_init_port_param(struct rxe_port *port)
>  /* initialize port state, note IB convention that HCA ports are always
>   * numbered from 1
>   */
> -static int rxe_init_ports(struct rxe_dev *rxe)
> +static void rxe_init_ports(struct rxe_dev *rxe)
>  {
>         struct rxe_port *port = &rxe->port;
>
>         rxe_init_port_param(port);
> -
> -       port->pkey_tbl = kcalloc(port->attr.pkey_tbl_len,
> -                       sizeof(*port->pkey_tbl), GFP_KERNEL);
> -
> -       if (!port->pkey_tbl)
> -               return -ENOMEM;
> -
> -       port->pkey_tbl[0] = 0xffff;
>         addrconf_addr_eui48((unsigned char *)&port->port_guid,
>                             rxe->ndev->dev_addr);
> -
>         spin_lock_init(&port->port_lock);
> -
> -       return 0;
>  }
>
>  /* init pools of managed objects */
> @@ -247,13 +226,11 @@ static int rxe_init(struct rxe_dev *rxe)
>         /* init default device parameters */
>         rxe_init_device_param(rxe);
>
> -       err = rxe_init_ports(rxe);
> -       if (err)
> -               goto err1;
> +       rxe_init_ports(rxe);
>
>         err = rxe_init_pools(rxe);
>         if (err)
> -               goto err2;
> +               return err;
>
>         /* init pending mmap list */
>         spin_lock_init(&rxe->mmap_offset_lock);
> @@ -263,11 +240,6 @@ static int rxe_init(struct rxe_dev *rxe)
>         mutex_init(&rxe->usdev_lock);
>
>         return 0;
> -
> -err2:
> -       rxe_cleanup_ports(rxe);
> -err1:
> -       return err;
>  }
>
>  void rxe_set_mtu(struct rxe_dev *rxe, unsigned int ndev_mtu) diff --git a/drivers/infiniband/sw/rxe/rxe_param.h b/drivers/infiniband/sw/rxe/rxe_param.h
> index 99e9d8ba9767..2f381aeafcb5 100644
> --- a/drivers/infiniband/sw/rxe/rxe_param.h
> +++ b/drivers/infiniband/sw/rxe/rxe_param.h
> @@ -100,7 +100,7 @@ enum rxe_device_param {
>         RXE_MAX_SRQ_SGE                 = 27,
>         RXE_MIN_SRQ_SGE                 = 1,
>         RXE_MAX_FMR_PAGE_LIST_LEN       = 512,
> -       RXE_MAX_PKEYS                   = 64,
> +       RXE_MAX_PKEYS                   = 1,
>         RXE_LOCAL_CA_ACK_DELAY          = 15,
>
>         RXE_MAX_UCONTEXT                = 512,
> @@ -148,7 +148,7 @@ enum rxe_port_param {
>         RXE_PORT_INIT_TYPE_REPLY        = 0,
>         RXE_PORT_ACTIVE_WIDTH           = IB_WIDTH_1X,
>         RXE_PORT_ACTIVE_SPEED           = 1,
> -       RXE_PORT_PKEY_TBL_LEN           = 64,
> +       RXE_PORT_PKEY_TBL_LEN           = 1,
>         RXE_PORT_PHYS_STATE             = IB_PORT_PHYS_STATE_POLLING,
>         RXE_PORT_SUBNET_PREFIX          = 0xfe80000000000000ULL,
>  };
> diff --git a/drivers/infiniband/sw/rxe/rxe_recv.c b/drivers/infiniband/sw/rxe/rxe_recv.c
> index 46e111c218fd..7e123d3c4d09 100644
> --- a/drivers/infiniband/sw/rxe/rxe_recv.c
> +++ b/drivers/infiniband/sw/rxe/rxe_recv.c
> @@ -101,36 +101,15 @@ static void set_qkey_viol_cntr(struct rxe_port *port)  static int check_keys(struct rxe_dev *rxe, struct rxe_pkt_info *pkt,
>                       u32 qpn, struct rxe_qp *qp)
>  {
> -       int i;
> -       int found_pkey = 0;
>         struct rxe_port *port = &rxe->port;
>         u16 pkey = bth_pkey(pkt);
>
>         pkt->pkey_index = 0;
>
> -       if (qpn == 1) {
> -               for (i = 0; i < port->attr.pkey_tbl_len; i++) {
> -                       if (pkey_match(pkey, port->pkey_tbl[i])) {
> -                               pkt->pkey_index = i;
> -                               found_pkey = 1;
> -                               break;
> -                       }
> -               }
> -
> -               if (!found_pkey) {
> -                       pr_warn_ratelimited("bad pkey = 0x%x\n", pkey);
> -                       set_bad_pkey_cntr(port);
> -                       goto err1;
> -               }
> -       } else {
> -               if (unlikely(!pkey_match(pkey,
> -                                        port->pkey_tbl[qp->attr.pkey_index]
> -                                       ))) {
> -                       pr_warn_ratelimited("bad pkey = 0x%0x\n", pkey);
> -                       set_bad_pkey_cntr(port);
> -                       goto err1;
> -               }
> -               pkt->pkey_index = qp->attr.pkey_index;
> +       if (!pkey_match(pkey, IB_DEFAULT_PKEY_FULL)) {
> +               pr_warn_ratelimited("bad pkey = 0x%x\n", pkey);
> +               set_bad_pkey_cntr(port);
> +               goto err1;
>         }
>
>         if ((qp_type(qp) == IB_QPT_UD || qp_type(qp) == IB_QPT_GSI) && diff --git a/drivers/infiniband/sw/rxe/rxe_req.c b/drivers/infiniband/sw/rxe/rxe_req.c
> index e5031172c019..34df2b55e650 100644
> --- a/drivers/infiniband/sw/rxe/rxe_req.c
> +++ b/drivers/infiniband/sw/rxe/rxe_req.c
> @@ -381,7 +381,6 @@ static struct sk_buff *init_req_packet(struct rxe_qp *qp,
>                                        struct rxe_pkt_info *pkt)
>  {
>         struct rxe_dev          *rxe = to_rdev(qp->ibqp.device);
> -       struct rxe_port         *port = &rxe->port;
>         struct sk_buff          *skb;
>         struct rxe_send_wr      *ibwr = &wqe->wr;
>         struct rxe_av           *av;
> @@ -419,9 +418,7 @@ static struct sk_buff *init_req_packet(struct rxe_qp *qp,
>                         (pkt->mask & (RXE_WRITE_MASK | RXE_IMMDT_MASK)) ==
>                         (RXE_WRITE_MASK | RXE_IMMDT_MASK));
>
> -       pkey = (qp_type(qp) == IB_QPT_GSI) ?
> -                port->pkey_tbl[ibwr->wr.ud.pkey_index] :
> -                port->pkey_tbl[qp->attr.pkey_index];
> +       pkey = IB_DEFAULT_PKEY_FULL;
>
>         qp_num = (pkt->mask & RXE_DETH_MASK) ? ibwr->wr.ud.remote_qpn :
>                                          qp->attr.dest_qp_num;
> diff --git a/drivers/infiniband/sw/rxe/rxe_verbs.c b/drivers/infiniband/sw/rxe/rxe_verbs.c
> index 74f071003690..779458ddd422 100644
> --- a/drivers/infiniband/sw/rxe/rxe_verbs.c
> +++ b/drivers/infiniband/sw/rxe/rxe_verbs.c
> @@ -83,22 +83,11 @@ static int rxe_query_port(struct ib_device *dev,  static int rxe_query_pkey(struct ib_device *device,
>                           u8 port_num, u16 index, u16 *pkey)  {
> -       struct rxe_dev *rxe = to_rdev(device);
> -       struct rxe_port *port;
> -
> -       port = &rxe->port;
> -
> -       if (unlikely(index >= port->attr.pkey_tbl_len)) {
> -               dev_warn(device->dev.parent, "invalid index = %d\n",
> -                        index);
> -               goto err1;
> -       }
> +       if (index > 0)
> +               return -EINVAL;
>
> -       *pkey = port->pkey_tbl[index];
> +       *pkey = IB_DEFAULT_PKEY_FULL;
>         return 0;
> -
> -err1:
> -       return -EINVAL;
>  }
>
>  static int rxe_modify_device(struct ib_device *dev, diff --git a/drivers/infiniband/sw/rxe/rxe_verbs.h b/drivers/infiniband/sw/rxe/rxe_verbs.h
> index 92de39c4a7c1..c664c7f36ab5 100644
> --- a/drivers/infiniband/sw/rxe/rxe_verbs.h
> +++ b/drivers/infiniband/sw/rxe/rxe_verbs.h
> @@ -371,7 +371,6 @@ struct rxe_mc_elem {
>
>  struct rxe_port {
>         struct ib_port_attr     attr;
> -       u16                     *pkey_tbl;
>         __be64                  port_guid;
>         __be64                  subnet_prefix;
>         spinlock_t              port_lock; /* guard port */
> --
> 2.25.4
>

  parent reply index

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-21 10:16 Kamal Heib
     [not found] ` <AM6PR05MB6263CFB337190B1740CDF4B7D8780@AM6PR05MB6263.eurprd05.prod.outlook.com>
2020-07-22  2:09   ` Zhu Yanjun [this message]
2020-07-23  5:57     ` FW: " Kamal Heib
2020-07-23  6:58       ` Zhu Yanjun
2020-07-23  7:25         ` Kamal Heib
2020-07-23 13:08           ` Zhu Yanjun
2020-07-23 13:15             ` Jason Gunthorpe
2020-07-23 15:15               ` Zhu Yanjun
2020-07-28  8:35                 ` Kamal Heib
2020-07-28 13:21                   ` Zhu Yanjun
2020-07-28 13:44                     ` Kamal Heib
2020-07-28 15:46                       ` Zhu Yanjun
2020-07-28 17:42                         ` Kamal Heib
2020-07-28 23:45                           ` Zhu Yanjun
2020-07-29  1:36                             ` Mark Bloch
2020-07-31 19:22 ` Jason Gunthorpe

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CAD=hENePPVzfaC_YtCL1izsFSi+U_T=0m18MujARznsWbj=q5g@mail.gmail.com' \
    --to=zyjzyj2000@gmail.com \
    --cc=dledford@redhat.com \
    --cc=jgg@ziepe.ca \
    --cc=kamalheib1@gmail.com \
    --cc=linux-rdma@vger.kernel.org \
    --cc=yanjunz@mellanox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Linux-RDMA Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-rdma/0 linux-rdma/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-rdma linux-rdma/ https://lore.kernel.org/linux-rdma \
		linux-rdma@vger.kernel.org
	public-inbox-index linux-rdma

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-rdma


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git