IB/cma: Add default RoCE TOS to CMA configfs

Add new entry to the RDMA-CM configfs that allows users
to select default TOS for RDMA-CM QPs.

This is useful for users that want to control the TOS for legacy
applications without changing their code.

Application that sets the TOS explicitly using the rdma_set_option
API will continue to work as expected, meaning overriding the configfs
value.

CC: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Majd Dibbiny <majd@mellanox.com>
Reviewed-by: Moni Shoua <monis@mellanox.com>
Signed-off-by: Leon Romanovsky <leon@kernel.org>
Signed-off-by: Doug Ledford <dledford@redhat.com>

diff --git a/Documentation/ABI/testing/configfs-rdma_cm b/Documentation/ABI/testing/configfs-rdma_cm
index 5c389aaf5291eb44daf4c35b10e8bbca31cc32b8..74f9506f42e7ac09d7cae24592cf29113725b9dc 100644 (file)
--- a/Documentation/ABI/testing/configfs-rdma_cm
+++ b/Documentation/ABI/testing/configfs-rdma_cm
@@ -20,3 +20,11 @@ Description:         RDMA-CM based connections from HCA <hca> at port <port-num>
                will be initiated with this RoCE type as default.
                The possible RoCE types are either "IB/RoCE v1" or "RoCE v2".
                This parameter has RW access.
+
+What:          /config/rdma_cm/<hca>/ports/<port-num>/default_roce_tos
+Date:          February 7, 2017
+KernelVersion:  4.11.0
+Description:   RDMA-CM QPs from HCA <hca> at port <port-num>
+               will be created with this TOS as default.
+               This can be overridden by using the rdma_set_option API.
+               The possible RoCE TOS values are 0-255.

diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
index 9c93e2fa969bf05bc9018664f3f36c353e7ca653..f98ec19a851a8e3c90b068acd236ace6e9265c84 100644 (file)
--- a/drivers/infiniband/core/cma.c
+++ b/drivers/infiniband/core/cma.c
@@ -198,6 +198,7 @@ struct cma_device {
        atomic_t                refcount;
        struct list_head        id_list;
        enum ib_gid_type        *default_gid_type;
+       u8                      *default_roce_tos;
 };
 
 struct rdma_bind_list {
@@ -295,6 +296,25 @@ int cma_set_default_gid_type(struct cma_device *cma_dev,
        return 0;
 }
 
+int cma_get_default_roce_tos(struct cma_device *cma_dev, unsigned int port)
+{
+       if (!rdma_is_port_valid(cma_dev->device, port))
+               return -EINVAL;
+
+       return cma_dev->default_roce_tos[port - rdma_start_port(cma_dev->device)];
+}
+
+int cma_set_default_roce_tos(struct cma_device *cma_dev, unsigned int port,
+                            u8 default_roce_tos)
+{
+       if (!rdma_is_port_valid(cma_dev->device, port))
+               return -EINVAL;
+
+       cma_dev->default_roce_tos[port - rdma_start_port(cma_dev->device)] =
+                default_roce_tos;
+
+       return 0;
+}
 struct ib_device *cma_get_ib_dev(struct cma_device *cma_dev)
 {
        return cma_dev->device;
@@ -341,6 +361,7 @@ struct rdma_id_private {
        u32                     options;
        u8                      srq;
        u8                      tos;
+       bool                    tos_set;
        u8                      reuseaddr;
        u8                      afonly;
        enum ib_gid_type        gid_type;
@@ -780,6 +801,7 @@ struct rdma_cm_id *rdma_create_id(struct net *net,
        id_priv->id.event_handler = event_handler;
        id_priv->id.ps = ps;
        id_priv->id.qp_type = qp_type;
+       id_priv->tos_set = false;
        spin_lock_init(&id_priv->lock);
        mutex_init(&id_priv->qp_mutex);
        init_completion(&id_priv->comp);
@@ -2271,6 +2293,7 @@ void rdma_set_service_type(struct rdma_cm_id *id, int tos)
 
        id_priv = container_of(id, struct rdma_id_private, id);
        id_priv->tos = (u8) tos;
+       id_priv->tos_set = true;
 }
 EXPORT_SYMBOL(rdma_set_service_type);
 
@@ -2507,6 +2530,9 @@ static int cma_resolve_iboe_route(struct rdma_id_private *id_priv)
        struct cma_work *work;
        int ret;
        struct net_device *ndev = NULL;
+       u8 default_roce_tos = id_priv->cma_dev->default_roce_tos[id_priv->id.port_num -
+                                       rdma_start_port(id_priv->cma_dev->device)];
+       u8 tos = id_priv->tos_set ? id_priv->tos : default_roce_tos;
 
 
        work = kzalloc(sizeof *work, GFP_KERNEL);
@@ -2580,7 +2606,8 @@ static int cma_resolve_iboe_route(struct rdma_id_private *id_priv)
        route->path_rec->reversible = 1;
        route->path_rec->pkey = cpu_to_be16(0xffff);
        route->path_rec->mtu_selector = IB_SA_EQ;
-       route->path_rec->sl = iboe_tos_to_sl(ndev, id_priv->tos);
+       route->path_rec->sl = iboe_tos_to_sl(ndev, tos);
+       route->path_rec->traffic_class = tos;
        route->path_rec->mtu = iboe_get_mtu(ndev->mtu);
        route->path_rec->rate_selector = IB_SA_EQ;
        route->path_rec->rate = iboe_get_rate(ndev);
@@ -4304,15 +4331,21 @@ static void cma_add_one(struct ib_device *device)
        cma_dev->default_gid_type = kcalloc(device->phys_port_cnt,
                                            sizeof(*cma_dev->default_gid_type),
                                            GFP_KERNEL);
-       if (!cma_dev->default_gid_type) {
-               kfree(cma_dev);
-               return;
-       }
+       if (!cma_dev->default_gid_type)
+               goto free_cma_dev;
+
+       cma_dev->default_roce_tos = kcalloc(device->phys_port_cnt,
+                                           sizeof(*cma_dev->default_roce_tos),
+                                           GFP_KERNEL);
+       if (!cma_dev->default_roce_tos)
+               goto free_gid_type;
+
        for (i = rdma_start_port(device); i <= rdma_end_port(device); i++) {
                supported_gids = roce_gid_type_mask_support(device, i);
                WARN_ON(!supported_gids);
                cma_dev->default_gid_type[i - rdma_start_port(device)] =
                        find_first_bit(&supported_gids, BITS_PER_LONG);
+               cma_dev->default_roce_tos[i - rdma_start_port(device)] = 0;
        }
 
        init_completion(&cma_dev->comp);
@@ -4325,6 +4358,16 @@ static void cma_add_one(struct ib_device *device)
        list_for_each_entry(id_priv, &listen_any_list, list)
                cma_listen_on_dev(id_priv, cma_dev);
        mutex_unlock(&lock);
+
+       return;
+
+free_gid_type:
+       kfree(cma_dev->default_gid_type);
+
+free_cma_dev:
+       kfree(cma_dev);
+
+       return;
 }
 
 static int cma_remove_id_dev(struct rdma_id_private *id_priv)
@@ -4393,6 +4436,7 @@ static void cma_remove_one(struct ib_device *device, void *client_data)
        mutex_unlock(&lock);
 
        cma_process_remove(cma_dev);
+       kfree(cma_dev->default_roce_tos);
        kfree(cma_dev->default_gid_type);
        kfree(cma_dev);
 }

diff --git a/drivers/infiniband/core/cma_configfs.c b/drivers/infiniband/core/cma_configfs.c
index 41573df1d9fcc6aae2b219918418bd1cb1f9bcc3..54076a3e800767fc659420a91f61a84e566f63c6 100644 (file)
--- a/drivers/infiniband/core/cma_configfs.c
+++ b/drivers/infiniband/core/cma_configfs.c
@@ -139,8 +139,50 @@ static ssize_t default_roce_mode_store(struct config_item *item,
 
 CONFIGFS_ATTR(, default_roce_mode);
 
+static ssize_t default_roce_tos_show(struct config_item *item, char *buf)
+{
+       struct cma_device *cma_dev;
+       struct cma_dev_port_group *group;
+       ssize_t ret;
+       u8 tos;
+
+       ret = cma_configfs_params_get(item, &cma_dev, &group);
+       if (ret)
+               return ret;
+
+       tos = cma_get_default_roce_tos(cma_dev, group->port_num);
+       cma_configfs_params_put(cma_dev);
+
+       return sprintf(buf, "%u\n", tos);
+}
+
+static ssize_t default_roce_tos_store(struct config_item *item,
+                                     const char *buf, size_t count)
+{
+       struct cma_device *cma_dev;
+       struct cma_dev_port_group *group;
+       ssize_t ret;
+       u8 tos;
+
+       ret = kstrtou8(buf, 0, &tos);
+       if (ret)
+               return ret;
+
+       ret = cma_configfs_params_get(item, &cma_dev, &group);
+       if (ret)
+               return ret;
+
+       ret = cma_set_default_roce_tos(cma_dev, group->port_num, tos);
+       cma_configfs_params_put(cma_dev);
+
+       return ret ? ret : strnlen(buf, count);
+}
+
+CONFIGFS_ATTR(, default_roce_tos);
+
 static struct configfs_attribute *cma_configfs_attributes[] = {
        &attr_default_roce_mode,
+       &attr_default_roce_tos,
        NULL,
 };
 

diff --git a/drivers/infiniband/core/core_priv.h b/drivers/infiniband/core/core_priv.h
index d29372624f3a055719e9592a99094bbc951d9f18..912ab4cd6eae3ff881374375ad8ac267ddcd0bc4 100644 (file)
--- a/drivers/infiniband/core/core_priv.h
+++ b/drivers/infiniband/core/core_priv.h
@@ -62,6 +62,9 @@ int cma_get_default_gid_type(struct cma_device *cma_dev,
 int cma_set_default_gid_type(struct cma_device *cma_dev,
                             unsigned int port,
                             enum ib_gid_type default_gid_type);
+int cma_get_default_roce_tos(struct cma_device *cma_dev, unsigned int port);
+int cma_set_default_roce_tos(struct cma_device *a_dev, unsigned int port,
+                            u8 default_roce_tos);
 struct ib_device *cma_get_ib_dev(struct cma_device *cma_dev);
 
 int  ib_device_register_sysfs(struct ib_device *device,