From: "Wei Hu (Xavier)" <xavier.huwei@huawei.com>
To: <leon@kernel.org>, Lijun Ou <oulijun@huawei.com>
Cc: <dledford@redhat.com>, <sean.hefty@intel.com>,
<hal.rosenstock@gmail.com>, <davem@davemloft.net>,
<jeffrey.t.kirsher@intel.com>, <jiri@mellanox.com>,
<ogerlitz@mellanox.com>, <linux-rdma@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, <netdev@vger.kernel.org>,
<gongyangming@huawei.com>, <xiaokun@huawei.com>,
<tangchaofei@huawei.com>, <haifeng.wei@huawei.com>,
<yisen.zhuang@huawei.com>, <yankejian@huawei.com>,
<charles.chenxin@huawei.com>, <linuxarm@huawei.com>
Subject: Re: [PATCH v9 11/22] IB/hns: Add IB device registration
Date: Sun, 12 Jun 2016 17:41:06 +0800 [thread overview]
Message-ID: <575D2E32.8030109@huawei.com> (raw)
In-Reply-To: <20160609062631.GN3663@leon.nu>
On 2016/6/9 14:26, Leon Romanovsky wrote:
> On Wed, Jun 01, 2016 at 11:37:53PM +0800, Lijun Ou wrote:
>> This patch registered IB device when loaded, and unregistered
>> IB device when removed.
>>
>> Signed-off-by: Wei Hu <xavier.huwei@huawei.com>
>> Signed-off-by: Nenglong Zhao <zhaonenglong@hisilicon.com>
>> Signed-off-by: Lijun Ou <oulijun@huawei.com>
>> ---
>> drivers/infiniband/hw/hns/hns_roce_main.c | 46 +++++++++++++++++++++++++++++++
>> 1 file changed, 46 insertions(+)
>>
>> diff --git a/drivers/infiniband/hw/hns/hns_roce_main.c b/drivers/infiniband/hw/hns/hns_roce_main.c
>> index 7fb0d34..f179a7f 100644
>> --- a/drivers/infiniband/hw/hns/hns_roce_main.c
>> +++ b/drivers/infiniband/hw/hns/hns_roce_main.c
>> @@ -62,6 +62,41 @@
>> #include "hns_roce_device.h"
>> #include "hns_roce_icm.h"
>>
>> +void hns_roce_unregister_device(struct hns_roce_dev *hr_dev)
> You are not calling to this function in this patch.
>
>> +{
>> + ib_unregister_device(&hr_dev->ib_dev);
>> +}
>> +
>> +int hns_roce_register_device(struct hns_roce_dev *hr_dev)
> This function should be static.
>
>> +{
>> + int ret;
>> + struct hns_roce_ib_iboe *iboe = NULL;
>> + struct ib_device *ib_dev = NULL;
>> + struct device *dev = &hr_dev->pdev->dev;
>> +
>> + iboe = &hr_dev->iboe;
>> +
>> + ib_dev = &hr_dev->ib_dev;
>> + strlcpy(ib_dev->name, "hisi_%d", IB_DEVICE_NAME_MAX);
>> +
>> + ib_dev->owner = THIS_MODULE;
>> + ib_dev->node_type = RDMA_NODE_IB_CA;
>> + ib_dev->dma_device = dev;
>> +
>> + ib_dev->phys_port_cnt = hr_dev->caps.num_ports;
>> + ib_dev->local_dma_lkey = hr_dev->caps.reserved_lkey;
>> + ib_dev->num_comp_vectors = hr_dev->caps.num_comp_vectors;
>> + ib_dev->uverbs_abi_ver = 1;
>> +
>> + ret = ib_register_device(ib_dev, NULL);
>> + if (ret) {
>> + dev_err(dev, "ib_register_device failed!\n");
>> + return ret;
>> + }
>> +
>> + return 0;
>> +}
>> +
>> int hns_roce_get_cfg(struct hns_roce_dev *hr_dev)
>> {
>> int i;
>> @@ -363,6 +398,17 @@ static int hns_roce_probe(struct platform_device *pdev)
>> goto error_failed_engine_init;
>> }
>>
>> + ret = hns_roce_register_device(hr_dev);
>> + if (ret) {
>> + dev_err(dev, "register_device failed!\n");
> According to the current code, you will print this error together with
> error line in hns_roce_register_device for the same failure.
>
> "ib_register_device failed!"
> "register_device failed!"
Hi, leon
In this patch [PATCH v9 11/22], there is only one error branch in
funtion named hns_roce_register_device.
In the following patch [PATCH v9 13/22], we add more operation,
there are more
than two error branch in this function as below.
@@ -212,8 +402,27 @@ int hns_roce_register_device(struct hns_roce_dev *hr_dev)
goto error_failed_setup_mtu_gids;
}
spin_lock_init(&iboe->lock);
iboe->nb.notifier_call = hns_roce_netdev_event;
ret = register_netdevice_notifier(&iboe->nb);
if (ret) {
dev_err(dev, "register_netdevice_notifier failed!\n");
goto error_failed_setup_mtu_gids;
}
iboe->nb_inet.notifier_call = hns_roce_inet_event;
ret = register_inetaddr_notifier(&iboe->nb_inet);
if (ret) {
dev_err(dev, "register inet addr notifier failed!\n");
goto error_failed_register_inetaddr_notifier;
}
return 0;
error_failed_register_inetaddr_notifier:
unregister_netdevice_notifier(&iboe->nb);
error_failed_setup_mtu_gids:
ib_unregister_device(ib_dev);
Regards
Wei Hu
>
>> + goto error_failed_register_device;
>> + }
>> +
>> + return 0;
>> +
>> +error_failed_register_device:
>> + hns_roce_engine_exit(hr_dev);
>> +
>> error_failed_engine_init:
>> hns_roce_cleanup_bitmap(hr_dev);
>>
>> --
>> 1.9.1
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2016-06-12 9:48 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-01 15:37 [PATCH v9 00/22] Add HiSilicon RoCE driver Lijun Ou
2016-06-01 15:37 ` [PATCH v9 01/22] net: hns: Add reset function support for " Lijun Ou
2016-06-01 15:37 ` [PATCH v9 02/22] devicetree: bindings: IB: Add binding document for HiSilicon RoCE Lijun Ou
2016-06-01 15:37 ` [PATCH v9 03/22] IB/hns: Add initial main frame driver and get cfg info Lijun Ou
2016-06-09 6:39 ` Leon Romanovsky
2016-06-17 1:29 ` Wei Hu (Xavier)
2016-06-01 15:37 ` [PATCH v9 04/22] IB/hns: Add RoCE engine reset function Lijun Ou
2016-06-01 15:37 ` [PATCH v9 05/22] IB/hns: Add initial profile resource Lijun Ou
2016-06-09 7:01 ` Leon Romanovsky
2016-06-15 1:34 ` oulijun
2016-06-01 15:37 ` [PATCH v9 06/22] IB/hns: Add initial cmd operation Lijun Ou
2016-06-01 15:37 ` [PATCH v9 07/22] IB/hns: Add event queue support Lijun Ou
2016-06-01 15:37 ` [PATCH v9 08/22] IB/hns: Add icm support Lijun Ou
2016-06-09 6:58 ` Leon Romanovsky
2016-06-01 15:37 ` [PATCH v9 09/22] IB/hns: Add hca support Lijun Ou
2016-06-09 7:10 ` Leon Romanovsky
2016-06-17 1:29 ` Wei Hu (Xavier)
2016-06-01 15:37 ` [PATCH v9 10/22] IB/hns: Add process flow to init RoCE engine Lijun Ou
2016-06-01 15:37 ` [PATCH v9 11/22] IB/hns: Add IB device registration Lijun Ou
2016-06-09 6:26 ` Leon Romanovsky
2016-06-12 9:41 ` Wei Hu (Xavier) [this message]
2016-06-13 12:46 ` Leon Romanovsky
2016-06-17 1:25 ` Wei Hu (Xavier)
2016-06-01 15:37 ` [PATCH v9 12/22] IB/hns: Set mtu and gid support Lijun Ou
2016-06-01 15:37 ` [PATCH v9 13/22] IB/hns: Add interface of the protocol stack registration Lijun Ou
2016-06-01 15:37 ` [PATCH v9 14/22] IB/hns: Add operations support for IB device and port Lijun Ou
2016-06-01 15:37 ` [PATCH v9 15/22] IB/hns: Add PD operations support Lijun Ou
2016-06-01 15:37 ` [PATCH v9 16/22] IB/hns: Add ah " Lijun Ou
2016-06-01 15:37 ` [PATCH v9 17/22] IB/hns: Add QP " Lijun Ou
2016-06-01 15:38 ` [PATCH v9 18/22] IB/hns: Add CQ " Lijun Ou
2016-06-01 15:38 ` [PATCH v9 19/22] IB/hns: Add memory region " Lijun Ou
2016-06-01 15:38 ` [PATCH v9 20/22] IB/hns: Add operation for getting immutable port Lijun Ou
2016-06-01 15:38 ` [PATCH v9 21/22] IB/hns: Kconfig and Makefile for RoCE module Lijun Ou
2016-06-01 15:38 ` [PATCH v9 22/22] MAINTAINERS: Add maintainers for HiSilicon RoCE driver Lijun Ou
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=575D2E32.8030109@huawei.com \
--to=xavier.huwei@huawei.com \
--cc=charles.chenxin@huawei.com \
--cc=davem@davemloft.net \
--cc=dledford@redhat.com \
--cc=gongyangming@huawei.com \
--cc=haifeng.wei@huawei.com \
--cc=hal.rosenstock@gmail.com \
--cc=jeffrey.t.kirsher@intel.com \
--cc=jiri@mellanox.com \
--cc=leon@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=linuxarm@huawei.com \
--cc=netdev@vger.kernel.org \
--cc=ogerlitz@mellanox.com \
--cc=oulijun@huawei.com \
--cc=sean.hefty@intel.com \
--cc=tangchaofei@huawei.com \
--cc=xiaokun@huawei.com \
--cc=yankejian@huawei.com \
--cc=yisen.zhuang@huawei.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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).