IB/mlx5: Add support to dropless RQ

RQs that were configured for "delay drop" will prevent packet drops
when their WQEs are depleted.
Marking an RQ to be drop-less is done by setting delay_drop_en in RQ
context using CREATE_RQ command.

Since this feature is globally activated/deactivated by using the
SET_DELAY_DROP command on all the marked RQs, we activated/deactivated
it according to the number of RQs with 'delay_drop' enabled.

When timeout is expired, then the feature is deactivated. Therefore
the driver handles the delay drop timeout event and reactivate it.

Signed-off-by: Maor Gottlieb <maorg@mellanox.com>
Reviewed-by: Yishai Hadas <yishaih@mellanox.com>
Signed-off-by: Leon Romanovsky <leon@kernel.org>
Signed-off-by: Doug Ledford <dledford@redhat.com>

diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c
index a903728627f1d0f5ee3caa0939270785b23405ca..ad4b12decc23f4baef07c354c0247eb01e78cd30 100644 (file)
--- a/drivers/infiniband/hw/mlx5/main.c
+++ b/drivers/infiniband/hw/mlx5/main.c
@@ -697,6 +697,10 @@ static int mlx5_ib_query_device(struct ib_device *ibdev,
                props->device_cap_flags |= IB_DEVICE_UD_TSO;
        }
 
+       if (MLX5_CAP_GEN(dev->mdev, rq_delay_drop) &&
+           MLX5_CAP_GEN(dev->mdev, general_notification_event))
+               props->raw_packet_caps |= IB_RAW_PACKET_CAP_DELAY_DROP;
+
        if (MLX5_CAP_GEN(dev->mdev, eth_net_offloads) &&
            MLX5_CAP_ETH(dev->mdev, scatter_fcs)) {
                /* Legacy bit to support old userspace libraries */
@@ -2752,6 +2756,24 @@ static void mlx5_ib_handle_internal_error(struct mlx5_ib_dev *ibdev)
        spin_unlock_irqrestore(&ibdev->reset_flow_resource_lock, flags);
 }
 
+static void delay_drop_handler(struct work_struct *work)
+{
+       int err;
+       struct mlx5_ib_delay_drop *delay_drop =
+               container_of(work, struct mlx5_ib_delay_drop,
+                            delay_drop_work);
+
+       mutex_lock(&delay_drop->lock);
+       err = mlx5_core_set_delay_drop(delay_drop->dev->mdev,
+                                      delay_drop->timeout);
+       if (err) {
+               mlx5_ib_warn(delay_drop->dev, "Failed to set delay drop, timeout=%u\n",
+                            delay_drop->timeout);
+               delay_drop->activate = false;
+       }
+       mutex_unlock(&delay_drop->lock);
+}
+
 static void mlx5_ib_event(struct mlx5_core_dev *dev, void *context,
                          enum mlx5_dev_event event, unsigned long param)
 {
@@ -2804,8 +2826,11 @@ static void mlx5_ib_event(struct mlx5_core_dev *dev, void *context,
                ibev.event = IB_EVENT_CLIENT_REREGISTER;
                port = (u8)param;
                break;
+       case MLX5_DEV_EVENT_DELAY_DROP_TIMEOUT:
+               schedule_work(&ibdev->delay_drop.delay_drop_work);
+               goto out;
        default:
-               return;
+               goto out;
        }
 
        ibev.device           = &ibdev->ib_dev;
@@ -2813,7 +2838,7 @@ static void mlx5_ib_event(struct mlx5_core_dev *dev, void *context,
 
        if (port < 1 || port > ibdev->num_ports) {
                mlx5_ib_warn(ibdev, "warning: event on port %d\n", port);
-               return;
+               goto out;
        }
 
        if (ibdev->ib_active)
@@ -2821,6 +2846,9 @@ static void mlx5_ib_event(struct mlx5_core_dev *dev, void *context,
 
        if (fatal)
                ibdev->ib_active = false;
+
+out:
+       return;
 }
 
 static int set_has_smi_cap(struct mlx5_ib_dev *dev)
@@ -3623,6 +3651,26 @@ mlx5_ib_alloc_rdma_netdev(struct ib_device *hca,
        return netdev;
 }
 
+static void cancel_delay_drop(struct mlx5_ib_dev *dev)
+{
+       if (!(dev->ib_dev.attrs.raw_packet_caps & IB_RAW_PACKET_CAP_DELAY_DROP))
+               return;
+
+       cancel_work_sync(&dev->delay_drop.delay_drop_work);
+}
+
+static void init_delay_drop(struct mlx5_ib_dev *dev)
+{
+       if (!(dev->ib_dev.attrs.raw_packet_caps & IB_RAW_PACKET_CAP_DELAY_DROP))
+               return;
+
+       mutex_init(&dev->delay_drop.lock);
+       dev->delay_drop.dev = dev;
+       dev->delay_drop.activate = false;
+       dev->delay_drop.timeout = MLX5_MAX_DELAY_DROP_TIMEOUT_MS * 1000;
+       INIT_WORK(&dev->delay_drop.delay_drop_work, delay_drop_handler);
+}
+
 static void *mlx5_ib_add(struct mlx5_core_dev *mdev)
 {
        struct mlx5_ib_dev *dev;
@@ -3862,11 +3910,13 @@ static void *mlx5_ib_add(struct mlx5_core_dev *mdev)
        if (err)
                goto err_dev;
 
+       init_delay_drop(dev);
+
        for (i = 0; i < ARRAY_SIZE(mlx5_class_attributes); i++) {
                err = device_create_file(&dev->ib_dev.dev,
                                         mlx5_class_attributes[i]);
                if (err)
-                       goto err_umrc;
+                       goto err_delay_drop;
        }
 
        if ((MLX5_CAP_GEN(mdev, port_type) == MLX5_CAP_PORT_TYPE_ETH) &&
@@ -3877,7 +3927,8 @@ static void *mlx5_ib_add(struct mlx5_core_dev *mdev)
 
        return dev;
 
-err_umrc:
+err_delay_drop:
+       cancel_delay_drop(dev);
        destroy_umrc_res(dev);
 
 err_dev:
@@ -3924,6 +3975,7 @@ static void mlx5_ib_remove(struct mlx5_core_dev *mdev, void *context)
        struct mlx5_ib_dev *dev = context;
        enum rdma_link_layer ll = mlx5_ib_port_link_layer(&dev->ib_dev, 1);
 
+       cancel_delay_drop(dev);
        mlx5_remove_netdev_notifier(dev);
        ib_unregister_device(&dev->ib_dev);
        mlx5_free_bfreg(dev->mdev, &dev->fp_bfreg);

diff --git a/drivers/infiniband/hw/mlx5/mlx5_ib.h b/drivers/infiniband/hw/mlx5/mlx5_ib.h
index f0682f383b521655da2ba1121640d096da3a928d..097f12dc65a648f410c53879b3ae6c86ecae941f 100644 (file)
--- a/drivers/infiniband/hw/mlx5/mlx5_ib.h
+++ b/drivers/infiniband/hw/mlx5/mlx5_ib.h
@@ -247,6 +247,10 @@ struct mlx5_ib_wq {
        void                   *qend;
 };
 
+enum mlx5_ib_wq_flags {
+       MLX5_IB_WQ_FLAGS_DELAY_DROP = 0x1,
+};
+
 struct mlx5_ib_rwq {
        struct ib_wq            ibwq;
        struct mlx5_core_qp     core_qp;
@@ -264,6 +268,7 @@ struct mlx5_ib_rwq {
        u32                     wqe_count;
        u32                     wqe_shift;
        int                     wq_sig;
+       u32                     create_flags; /* Use enum mlx5_ib_wq_flags */
 };
 
 enum {
@@ -652,6 +657,19 @@ struct mlx5_ib_dbg_cc_params {
        struct mlx5_ib_dbg_param        params[MLX5_IB_DBG_CC_MAX];
 };
 
+enum {
+       MLX5_MAX_DELAY_DROP_TIMEOUT_MS = 100,
+};
+
+struct mlx5_ib_delay_drop {
+       struct mlx5_ib_dev     *dev;
+       struct work_struct      delay_drop_work;
+       /* serialize setting of delay drop */
+       struct mutex            lock;
+       u32                     timeout;
+       bool                    activate;
+};
+
 struct mlx5_ib_dev {
        struct ib_device                ib_dev;
        struct mlx5_core_dev            *mdev;
@@ -688,6 +706,7 @@ struct mlx5_ib_dev {
        struct mlx5_ib_port     *port;
        struct mlx5_sq_bfreg    bfreg;
        struct mlx5_sq_bfreg    fp_bfreg;
+       struct mlx5_ib_delay_drop       delay_drop;
        struct mlx5_ib_dbg_cc_params    *dbg_cc_params;
 
        /* protect the user_td */

diff --git a/drivers/infiniband/hw/mlx5/qp.c b/drivers/infiniband/hw/mlx5/qp.c
index 0889ff367c8625f694346136c22bd510d2dea2a7..939553d5c25f48d933e3329c92b7cbb640746cb1 100644 (file)
--- a/drivers/infiniband/hw/mlx5/qp.c
+++ b/drivers/infiniband/hw/mlx5/qp.c
@@ -4597,6 +4597,24 @@ static void mlx5_ib_wq_event(struct mlx5_core_qp *core_qp, int type)
        }
 }
 
+static int set_delay_drop(struct mlx5_ib_dev *dev)
+{
+       int err = 0;
+
+       mutex_lock(&dev->delay_drop.lock);
+       if (dev->delay_drop.activate)
+               goto out;
+
+       err = mlx5_core_set_delay_drop(dev->mdev, dev->delay_drop.timeout);
+       if (err)
+               goto out;
+
+       dev->delay_drop.activate = true;
+out:
+       mutex_unlock(&dev->delay_drop.lock);
+       return err;
+}
+
 static int  create_rq(struct mlx5_ib_rwq *rwq, struct ib_pd *pd,
                      struct ib_wq_init_attr *init_attr)
 {
@@ -4651,9 +4669,28 @@ static int  create_rq(struct mlx5_ib_rwq *rwq, struct ib_pd *pd,
                }
                MLX5_SET(rqc, rqc, scatter_fcs, 1);
        }
+       if (init_attr->create_flags & IB_WQ_FLAGS_DELAY_DROP) {
+               if (!(dev->ib_dev.attrs.raw_packet_caps &
+                     IB_RAW_PACKET_CAP_DELAY_DROP)) {
+                       mlx5_ib_dbg(dev, "Delay drop is not supported\n");
+                       err = -EOPNOTSUPP;
+                       goto out;
+               }
+               MLX5_SET(rqc, rqc, delay_drop_en, 1);
+       }
        rq_pas0 = (__be64 *)MLX5_ADDR_OF(wq, wq, pas);
        mlx5_ib_populate_pas(dev, rwq->umem, rwq->page_shift, rq_pas0, 0);
        err = mlx5_core_create_rq_tracked(dev->mdev, in, inlen, &rwq->core_qp);
+       if (!err && init_attr->create_flags & IB_WQ_FLAGS_DELAY_DROP) {
+               err = set_delay_drop(dev);
+               if (err) {
+                       mlx5_ib_warn(dev, "Failed to enable delay drop err=%d\n",
+                                    err);
+                       mlx5_core_destroy_rq_tracked(dev->mdev, &rwq->core_qp);
+               } else {
+                       rwq->create_flags |= MLX5_IB_WQ_FLAGS_DELAY_DROP;
+               }
+       }
 out:
        kvfree(in);
        return err;

diff --git a/include/linux/mlx5/mlx5_ifc.h b/include/linux/mlx5/mlx5_ifc.h
index 4bc57647fad8794c9d8cd2ed942b77262586d5fd..f350688a12fa81722e38717307efd5b170f54384 100644 (file)
--- a/include/linux/mlx5/mlx5_ifc.h
+++ b/include/linux/mlx5/mlx5_ifc.h
@@ -2519,7 +2519,7 @@ enum {
 
 struct mlx5_ifc_rqc_bits {
        u8         rlky[0x1];
-       u8         reserved_at_1[0x1];
+       u8         delay_drop_en[0x1];
        u8         scatter_fcs[0x1];
        u8         vsd[0x1];
        u8         mem_rq_type[0x4];