crypto: hisilicon/qm - Put device finding logic into QM

Use struct hisi_qm to maintain device list. Meanwhile, add two external
interface into qm, merge find proper device and create qp into QP alloc
logic, merge release qps into QP free logic.

Signed-off-by: Weili Qian <qianweili@huawei.com>
Signed-off-by: Shukun Tan <tanshukun1@huawei.com>
Reviewed-by: Zhou Wang <wangzhou1@hisilicon.com>
Reviewed-by: Zaibo Xu <xuzaibo@huawei.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/hisilicon/qm.c b/drivers/crypto/hisilicon/qm.c
index 2fa1d1ae0984d20f1e757def5273bfa383829cc9..f795fb557630ba1c232e7dec06a6408791977493 100644 (file)
--- a/drivers/crypto/hisilicon/qm.c
+++ b/drivers/crypto/hisilicon/qm.c
@@ -272,6 +272,12 @@ struct qm_doorbell {
        __le16 priority;
 };
 
+struct hisi_qm_resource {
+       struct hisi_qm *qm;
+       int distance;
+       struct list_head list;
+};
+
 struct hisi_qm_hw_ops {
        int (*get_vft)(struct hisi_qm *qm, u32 *base, u32 *number);
        void (*qm_db)(struct hisi_qm *qm, u16 qn,
@@ -2174,6 +2180,125 @@ void hisi_qm_dev_err_uninit(struct hisi_qm *qm)
 }
 EXPORT_SYMBOL_GPL(hisi_qm_dev_err_uninit);
 
+/**
+ * hisi_qm_free_qps() - free multiple queue pairs.
+ * @qps: The queue pairs need to be freed.
+ * @qp_num: The num of queue pairs.
+ */
+void hisi_qm_free_qps(struct hisi_qp **qps, int qp_num)
+{
+       int i;
+
+       if (!qps || qp_num <= 0)
+               return;
+
+       for (i = qp_num - 1; i >= 0; i--)
+               hisi_qm_release_qp(qps[i]);
+}
+EXPORT_SYMBOL_GPL(hisi_qm_free_qps);
+
+static void free_list(struct list_head *head)
+{
+       struct hisi_qm_resource *res, *tmp;
+
+       list_for_each_entry_safe(res, tmp, head, list) {
+               list_del(&res->list);
+               kfree(res);
+       }
+}
+
+static int hisi_qm_sort_devices(int node, struct list_head *head,
+                               struct hisi_qm_list *qm_list)
+{
+       struct hisi_qm_resource *res, *tmp;
+       struct hisi_qm *qm;
+       struct list_head *n;
+       struct device *dev;
+       int dev_node = 0;
+
+       list_for_each_entry(qm, &qm_list->list, list) {
+               dev = &qm->pdev->dev;
+
+               if (IS_ENABLED(CONFIG_NUMA)) {
+                       dev_node = dev_to_node(dev);
+                       if (dev_node < 0)
+                               dev_node = 0;
+               }
+
+               res = kzalloc(sizeof(*res), GFP_KERNEL);
+               if (!res)
+                       return -ENOMEM;
+
+               res->qm = qm;
+               res->distance = node_distance(dev_node, node);
+               n = head;
+               list_for_each_entry(tmp, head, list) {
+                       if (res->distance < tmp->distance) {
+                               n = &tmp->list;
+                               break;
+                       }
+               }
+               list_add_tail(&res->list, n);
+       }
+
+       return 0;
+}
+
+/**
+ * hisi_qm_alloc_qps_node() - Create multiple queue pairs.
+ * @qm_list: The list of all available devices.
+ * @qp_num: The number of queue pairs need created.
+ * @alg_type: The algorithm type.
+ * @node: The numa node.
+ * @qps: The queue pairs need created.
+ *
+ * This function will sort all available device according to numa distance.
+ * Then try to create all queue pairs from one device, if all devices do
+ * not meet the requirements will return error.
+ */
+int hisi_qm_alloc_qps_node(struct hisi_qm_list *qm_list, int qp_num,
+                          u8 alg_type, int node, struct hisi_qp **qps)
+{
+       struct hisi_qm_resource *tmp;
+       int ret = -ENODEV;
+       LIST_HEAD(head);
+       int i;
+
+       if (!qps || !qm_list || qp_num <= 0)
+               return -EINVAL;
+
+       mutex_lock(&qm_list->lock);
+       if (hisi_qm_sort_devices(node, &head, qm_list)) {
+               mutex_unlock(&qm_list->lock);
+               goto err;
+       }
+
+       list_for_each_entry(tmp, &head, list) {
+               for (i = 0; i < qp_num; i++) {
+                       qps[i] = hisi_qm_create_qp(tmp->qm, alg_type);
+                       if (IS_ERR(qps[i])) {
+                               hisi_qm_free_qps(qps, i);
+                               break;
+                       }
+               }
+
+               if (i == qp_num) {
+                       ret = 0;
+                       break;
+               }
+       }
+
+       mutex_unlock(&qm_list->lock);
+       if (ret)
+               pr_info("Failed to create qps, node[%d], alg[%d], qp[%d]!\n",
+                       node, alg_type, qp_num);
+
+err:
+       free_list(&head);
+       return ret;
+}
+EXPORT_SYMBOL_GPL(hisi_qm_alloc_qps_node);
+
 static pci_ers_result_t qm_dev_err_handle(struct hisi_qm *qm)
 {
        u32 err_sts;

diff --git a/drivers/crypto/hisilicon/qm.h b/drivers/crypto/hisilicon/qm.h
index c72c2e64d04b742d917b7b4facbadca71711bd01..ec5b6f48db6c1f98ea20731dc4e22874a99b8f2f 100644 (file)
--- a/drivers/crypto/hisilicon/qm.h
+++ b/drivers/crypto/hisilicon/qm.h
@@ -145,6 +145,11 @@ struct hisi_qm_err_ini {
        struct hisi_qm_err_info err_info;
 };
 
+struct hisi_qm_list {
+       struct mutex lock;
+       struct list_head list;
+};
+
 struct hisi_qm {
        enum qm_hw_ver ver;
        enum qm_fun_type fun_type;
@@ -156,6 +161,7 @@ struct hisi_qm {
        u32 qp_num;
        u32 qp_in_used;
        u32 ctrl_qp_num;
+       struct list_head list;
 
        struct qm_dma qdma;
        struct qm_sqc *sqc;
@@ -228,6 +234,28 @@ struct hisi_qp {
        struct uacce_queue *uacce_q;
 };
 
+static inline void hisi_qm_init_list(struct hisi_qm_list *qm_list)
+{
+       INIT_LIST_HEAD(&qm_list->list);
+       mutex_init(&qm_list->lock);
+}
+
+static inline void hisi_qm_add_to_list(struct hisi_qm *qm,
+                                      struct hisi_qm_list *qm_list)
+{
+       mutex_lock(&qm_list->lock);
+       list_add_tail(&qm->list, &qm_list->list);
+       mutex_unlock(&qm_list->lock);
+}
+
+static inline void hisi_qm_del_from_list(struct hisi_qm *qm,
+                                        struct hisi_qm_list *qm_list)
+{
+       mutex_lock(&qm_list->lock);
+       list_del(&qm->list);
+       mutex_unlock(&qm_list->lock);
+}
+
 int hisi_qm_init(struct hisi_qm *qm);
 void hisi_qm_uninit(struct hisi_qm *qm);
 int hisi_qm_start(struct hisi_qm *qm);
@@ -258,4 +286,7 @@ struct hisi_acc_sgl_pool *hisi_acc_create_sgl_pool(struct device *dev,
                                                   u32 count, u32 sge_nr);
 void hisi_acc_free_sgl_pool(struct device *dev,
                            struct hisi_acc_sgl_pool *pool);
+int hisi_qm_alloc_qps_node(struct hisi_qm_list *qm_list, int qp_num,
+                          u8 alg_type, int node, struct hisi_qp **qps);
+void hisi_qm_free_qps(struct hisi_qp **qps, int qp_num);
 #endif