Re: [PATCH v10 06/22] IB/hns: Add initial cmd operation
On 2016/6/22 12:54, Leon Romanovsky wrote: On Tue, Jun 21, 2016 at 09:01:57PM +0800, Wei Hu (Xavier) wrote: On 2016/6/21 19:28, Leon Romanovsky wrote: On Tue, Jun 21, 2016 at 06:50:51PM +0800, Wei Hu (Xavier) wrote: On 2016/6/20 21:33, Leon Romanovsky wrote: On Thu, Jun 16, 2016 at 10:35:14PM +0800, Lijun Ou wrote: This patch added the operation for cmd, and added some functions for initializing eq table and selecting cmd mode. Signed-off-by: Wei Hu Signed-off-by: Nenglong Zhao Signed-off-by: Lijun Ou --- PATCH v9/v8/v7/v6: - No change over the PATCH v5 PATCH v5: - The initial patch which was redesigned based on the second patch in PATCH v4 --- <...> +#define CMD_MAX_NUM32 + +int hns_roce_cmd_init(struct hns_roce_dev *hr_dev) +{ + struct device *dev = &hr_dev->pdev->dev; + + mutex_init(&hr_dev->cmd.hcr_mutex); + sema_init(&hr_dev->cmd.poll_sem, 1); + hr_dev->cmd.use_events = 0; + hr_dev->cmd.toggle = 1; + hr_dev->cmd.max_cmds = CMD_MAX_NUM; <...> + for (hr_cmd->token_mask = 1; hr_cmd->token_mask < hr_cmd->max_cmds; +hr_cmd->token_mask <<= 1) + ; + --hr_cmd->token_mask; It doesn't look that you dynamically change max_cmds supported. Why do you need to calculate token_mask dynamically? Hi, Leon 1. The four lines above are in the function named hns_roce_cmd_use_events. and now this function is only called once in hns_roce_probe. 2. In hns_roce_cmd_use_events, we use these 4 lines to achieve the value of hr_cmd->token_mask according to hr_cmd->max_cmds dynamically, then we only define one marco for hr_cmd->max_cmds as below: #define CMD_MAX_NUM 32 And it looks more flexible. It is called over engineering. I would recommend to you to remove it. We don't need over complicated code which is executed once with need to maintain with zero benefit. The other places need such simplification too. Hi, Leon We will modify this place as below: In hns_roce_hw_v1.c(for hip06 soc) file: void hns_roce_v1_profile(struct hns_roce_dev *hr_dev) { caps->max_cmds = 32; } In hns_roce_cmd.c file: int hns_roce_cmd_init(struct hns_roce_dev *hr_dev) { hr_dev->cmd.max_cmds = hr_dev->caps->max_cmds; } Can you give more suggestions? I would be happy to do it if I had enough time to review this code. General suggestion will be to ask yourself, if value is going to be changed during the runtime. In case the answer is no, there is no room to additional logic which translate constant to different value which will be other constant. You should do it across all the patchset. So, in this specific case, the proposed change is not enough, you are not solving an issue, but hiding it. Thanks We will modify this place as below: #define CMD_TOKEN_MASK 0x1f hr_cmd->token_mask = CMD_TOKEN_MASK; delete these four lines: for (hr_cmd->token_mask = 1; hr_cmd->token_mask < hr_cmd->max_cmds; hr_cmd->token_mask <<= 1) ; --hr_cmd->token_mask; Thanks Regards Wei Hu Regards Wei Hu
Re: [PATCH v10 06/22] IB/hns: Add initial cmd operation
On Tue, Jun 21, 2016 at 09:01:57PM +0800, Wei Hu (Xavier) wrote: > > > On 2016/6/21 19:28, Leon Romanovsky wrote: > >On Tue, Jun 21, 2016 at 06:50:51PM +0800, Wei Hu (Xavier) wrote: > >> > >>On 2016/6/20 21:33, Leon Romanovsky wrote: > >>>On Thu, Jun 16, 2016 at 10:35:14PM +0800, Lijun Ou wrote: > This patch added the operation for cmd, and added some functions > for initializing eq table and selecting cmd mode. > > Signed-off-by: Wei Hu > Signed-off-by: Nenglong Zhao > Signed-off-by: Lijun Ou > --- > PATCH v9/v8/v7/v6: > - No change over the PATCH v5 > > PATCH v5: > - The initial patch which was redesigned based on the second patch > in PATCH v4 > --- > >>><...> > >>> > +#define CMD_MAX_NUM 32 > + > +int hns_roce_cmd_init(struct hns_roce_dev *hr_dev) > +{ > + struct device *dev = &hr_dev->pdev->dev; > + > + mutex_init(&hr_dev->cmd.hcr_mutex); > + sema_init(&hr_dev->cmd.poll_sem, 1); > + hr_dev->cmd.use_events = 0; > + hr_dev->cmd.toggle = 1; > + hr_dev->cmd.max_cmds = CMD_MAX_NUM; > >>><...> > >>> > + for (hr_cmd->token_mask = 1; hr_cmd->token_mask < hr_cmd->max_cmds; > + hr_cmd->token_mask <<= 1) > + ; > + --hr_cmd->token_mask; > >>>It doesn't look that you dynamically change max_cmds supported. > >>>Why do you need to calculate token_mask dynamically? > >>Hi, Leon > >> > >> 1. The four lines above are in the function named > >>hns_roce_cmd_use_events. > >> and now this function is only called once in hns_roce_probe. > >> 2. In hns_roce_cmd_use_events, > >> we use these 4 lines to achieve the value of hr_cmd->token_mask > >>according to hr_cmd->max_cmds dynamically, > >> then we only define one marco for hr_cmd->max_cmds as below: > >> > >>#define CMD_MAX_NUM 32 > >> > >>And it looks more flexible. > >It is called over engineering. > >I would recommend to you to remove it. > > > >We don't need over complicated code which is executed > >once with need to maintain with zero benefit. > > > >The other places need such simplification too. > Hi, Leon > > We will modify this place as below: > In hns_roce_hw_v1.c(for hip06 soc) file: > > void hns_roce_v1_profile(struct hns_roce_dev *hr_dev) > { > > caps->max_cmds = 32; > > } > > In hns_roce_cmd.c file: > > int hns_roce_cmd_init(struct hns_roce_dev *hr_dev) > { > >hr_dev->cmd.max_cmds = hr_dev->caps->max_cmds; > > } > >Can you give more suggestions? I would be happy to do it if I had enough time to review this code. General suggestion will be to ask yourself, if value is going to be changed during the runtime. In case the answer is no, there is no room to additional logic which translate constant to different value which will be other constant. You should do it across all the patchset. So, in this specific case, the proposed change is not enough, you are not solving an issue, but hiding it. Thanks > > > Regards > Wei Hu > >>Regards > >>Wei Hu > >> > >> > >> > > signature.asc Description: Digital signature
Re: [PATCH v10 06/22] IB/hns: Add initial cmd operation
On 2016/6/21 19:28, Leon Romanovsky wrote: On Tue, Jun 21, 2016 at 06:50:51PM +0800, Wei Hu (Xavier) wrote: On 2016/6/20 21:33, Leon Romanovsky wrote: On Thu, Jun 16, 2016 at 10:35:14PM +0800, Lijun Ou wrote: This patch added the operation for cmd, and added some functions for initializing eq table and selecting cmd mode. Signed-off-by: Wei Hu Signed-off-by: Nenglong Zhao Signed-off-by: Lijun Ou --- PATCH v9/v8/v7/v6: - No change over the PATCH v5 PATCH v5: - The initial patch which was redesigned based on the second patch in PATCH v4 --- <...> +#define CMD_MAX_NUM32 + +int hns_roce_cmd_init(struct hns_roce_dev *hr_dev) +{ + struct device *dev = &hr_dev->pdev->dev; + + mutex_init(&hr_dev->cmd.hcr_mutex); + sema_init(&hr_dev->cmd.poll_sem, 1); + hr_dev->cmd.use_events = 0; + hr_dev->cmd.toggle = 1; + hr_dev->cmd.max_cmds = CMD_MAX_NUM; <...> + for (hr_cmd->token_mask = 1; hr_cmd->token_mask < hr_cmd->max_cmds; +hr_cmd->token_mask <<= 1) + ; + --hr_cmd->token_mask; It doesn't look that you dynamically change max_cmds supported. Why do you need to calculate token_mask dynamically? Hi, Leon 1. The four lines above are in the function named hns_roce_cmd_use_events. and now this function is only called once in hns_roce_probe. 2. In hns_roce_cmd_use_events, we use these 4 lines to achieve the value of hr_cmd->token_mask according to hr_cmd->max_cmds dynamically, then we only define one marco for hr_cmd->max_cmds as below: #define CMD_MAX_NUM 32 And it looks more flexible. It is called over engineering. I would recommend to you to remove it. We don't need over complicated code which is executed once with need to maintain with zero benefit. The other places need such simplification too. Hi, Leon We will modify this place as below: In hns_roce_hw_v1.c(for hip06 soc) file: void hns_roce_v1_profile(struct hns_roce_dev *hr_dev) { caps->max_cmds = 32; } In hns_roce_cmd.c file: int hns_roce_cmd_init(struct hns_roce_dev *hr_dev) { hr_dev->cmd.max_cmds = hr_dev->caps->max_cmds; } Can you give more suggestions? Regards Wei Hu Regards Wei Hu
Re: [PATCH v10 06/22] IB/hns: Add initial cmd operation
On Tue, Jun 21, 2016 at 06:50:51PM +0800, Wei Hu (Xavier) wrote: > > > On 2016/6/20 21:33, Leon Romanovsky wrote: > >On Thu, Jun 16, 2016 at 10:35:14PM +0800, Lijun Ou wrote: > >>This patch added the operation for cmd, and added some functions > >>for initializing eq table and selecting cmd mode. > >> > >>Signed-off-by: Wei Hu > >>Signed-off-by: Nenglong Zhao > >>Signed-off-by: Lijun Ou > >>--- > >>PATCH v9/v8/v7/v6: > >>- No change over the PATCH v5 > >> > >>PATCH v5: > >>- The initial patch which was redesigned based on the second patch > >> in PATCH v4 > >>--- > ><...> > > > >>+#define CMD_MAX_NUM32 > >>+ > >>+int hns_roce_cmd_init(struct hns_roce_dev *hr_dev) > >>+{ > >>+ struct device *dev = &hr_dev->pdev->dev; > >>+ > >>+ mutex_init(&hr_dev->cmd.hcr_mutex); > >>+ sema_init(&hr_dev->cmd.poll_sem, 1); > >>+ hr_dev->cmd.use_events = 0; > >>+ hr_dev->cmd.toggle = 1; > >>+ hr_dev->cmd.max_cmds = CMD_MAX_NUM; > ><...> > > > >>+ for (hr_cmd->token_mask = 1; hr_cmd->token_mask < hr_cmd->max_cmds; > >>+hr_cmd->token_mask <<= 1) > >>+ ; > >>+ --hr_cmd->token_mask; > >It doesn't look that you dynamically change max_cmds supported. > >Why do you need to calculate token_mask dynamically? > Hi, Leon > > 1. The four lines above are in the function named > hns_roce_cmd_use_events. > and now this function is only called once in hns_roce_probe. > 2. In hns_roce_cmd_use_events, > we use these 4 lines to achieve the value of hr_cmd->token_mask > according to hr_cmd->max_cmds dynamically, > then we only define one marco for hr_cmd->max_cmds as below: > > #define CMD_MAX_NUM 32 > >And it looks more flexible. It is called over engineering. I would recommend to you to remove it. We don't need over complicated code which is executed once with need to maintain with zero benefit. The other places need such simplification too. > > Regards > Wei Hu > > > signature.asc Description: Digital signature
Re: [PATCH v10 06/22] IB/hns: Add initial cmd operation
On 2016/6/20 21:33, Leon Romanovsky wrote: On Thu, Jun 16, 2016 at 10:35:14PM +0800, Lijun Ou wrote: This patch added the operation for cmd, and added some functions for initializing eq table and selecting cmd mode. Signed-off-by: Wei Hu Signed-off-by: Nenglong Zhao Signed-off-by: Lijun Ou --- PATCH v9/v8/v7/v6: - No change over the PATCH v5 PATCH v5: - The initial patch which was redesigned based on the second patch in PATCH v4 --- <...> +#define CMD_MAX_NUM32 + +int hns_roce_cmd_init(struct hns_roce_dev *hr_dev) +{ + struct device *dev = &hr_dev->pdev->dev; + + mutex_init(&hr_dev->cmd.hcr_mutex); + sema_init(&hr_dev->cmd.poll_sem, 1); + hr_dev->cmd.use_events = 0; + hr_dev->cmd.toggle = 1; + hr_dev->cmd.max_cmds = CMD_MAX_NUM; <...> + for (hr_cmd->token_mask = 1; hr_cmd->token_mask < hr_cmd->max_cmds; +hr_cmd->token_mask <<= 1) + ; + --hr_cmd->token_mask; It doesn't look that you dynamically change max_cmds supported. Why do you need to calculate token_mask dynamically? Hi, Leon 1. The four lines above are in the function named hns_roce_cmd_use_events. and now this function is only called once in hns_roce_probe. 2. In hns_roce_cmd_use_events, we use these 4 lines to achieve the value of hr_cmd->token_mask according to hr_cmd->max_cmds dynamically, then we only define one marco for hr_cmd->max_cmds as below: #define CMD_MAX_NUM 32 And it looks more flexible. Regards Wei Hu
Re: [PATCH v10 06/22] IB/hns: Add initial cmd operation
On Thu, Jun 16, 2016 at 10:35:14PM +0800, Lijun Ou wrote: > This patch added the operation for cmd, and added some functions > for initializing eq table and selecting cmd mode. > > Signed-off-by: Wei Hu > Signed-off-by: Nenglong Zhao > Signed-off-by: Lijun Ou > --- > PATCH v9/v8/v7/v6: > - No change over the PATCH v5 > > PATCH v5: > - The initial patch which was redesigned based on the second patch > in PATCH v4 > --- <...> > +#define CMD_MAX_NUM 32 > + > +int hns_roce_cmd_init(struct hns_roce_dev *hr_dev) > +{ > + struct device *dev = &hr_dev->pdev->dev; > + > + mutex_init(&hr_dev->cmd.hcr_mutex); > + sema_init(&hr_dev->cmd.poll_sem, 1); > + hr_dev->cmd.use_events = 0; > + hr_dev->cmd.toggle = 1; > + hr_dev->cmd.max_cmds = CMD_MAX_NUM; <...> > + for (hr_cmd->token_mask = 1; hr_cmd->token_mask < hr_cmd->max_cmds; > + hr_cmd->token_mask <<= 1) > + ; > + --hr_cmd->token_mask; It doesn't look that you dynamically change max_cmds supported. Why do you need to calculate token_mask dynamically? signature.asc Description: Digital signature
[PATCH v10 06/22] IB/hns: Add initial cmd operation
This patch added the operation for cmd, and added some functions for initializing eq table and selecting cmd mode. Signed-off-by: Wei Hu Signed-off-by: Nenglong Zhao Signed-off-by: Lijun Ou --- PATCH v9/v8/v7/v6: - No change over the PATCH v5 PATCH v5: - The initial patch which was redesigned based on the second patch in PATCH v4 --- --- drivers/infiniband/hw/hns/hns_roce_cmd.c| 117 drivers/infiniband/hw/hns/hns_roce_cmd.h| 42 ++ drivers/infiniband/hw/hns/hns_roce_common.h | 2 + drivers/infiniband/hw/hns/hns_roce_device.h | 41 ++ drivers/infiniband/hw/hns/hns_roce_main.c | 13 5 files changed, 215 insertions(+) create mode 100644 drivers/infiniband/hw/hns/hns_roce_cmd.c create mode 100644 drivers/infiniband/hw/hns/hns_roce_cmd.h diff --git a/drivers/infiniband/hw/hns/hns_roce_cmd.c b/drivers/infiniband/hw/hns/hns_roce_cmd.c new file mode 100644 index 000..64e84fe --- /dev/null +++ b/drivers/infiniband/hw/hns/hns_roce_cmd.c @@ -0,0 +1,117 @@ +/* + * Copyright (c) 2016 Hisilicon Limited. + * + * This software is available to you under a choice of one of two + * licenses. You may choose to be licensed under the terms of the GNU + * General Public License (GPL) Version 2, available from the file + * COPYING in the main directory of this source tree, or the + * OpenIB.org BSD license below: + * + * Redistribution and use in source and binary forms, with or + * without modification, are permitted provided that the following + * conditions are met: + * + * - Redistributions of source code must retain the above + *copyright notice, this list of conditions and the following + *disclaimer. + * + * - Redistributions in binary form must reproduce the above + *copyright notice, this list of conditions and the following + *disclaimer in the documentation and/or other materials + *provided with the distribution. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "hns_roce_common.h" +#include "hns_roce_device.h" +#include "hns_roce_cmd.h" + +#define CMD_MAX_NUM32 + +int hns_roce_cmd_init(struct hns_roce_dev *hr_dev) +{ + struct device *dev = &hr_dev->pdev->dev; + + mutex_init(&hr_dev->cmd.hcr_mutex); + sema_init(&hr_dev->cmd.poll_sem, 1); + hr_dev->cmd.use_events = 0; + hr_dev->cmd.toggle = 1; + hr_dev->cmd.max_cmds = CMD_MAX_NUM; + hr_dev->cmd.hcr = hr_dev->reg_base + ROCEE_MB1_REG; + hr_dev->cmd.pool = dma_pool_create("hns_roce_cmd", dev, + HNS_ROCE_MAILBOX_SIZE, + HNS_ROCE_MAILBOX_SIZE, 0); + if (!hr_dev->cmd.pool) + return -ENOMEM; + + return 0; +} + +void hns_roce_cmd_cleanup(struct hns_roce_dev *hr_dev) +{ + dma_pool_destroy(hr_dev->cmd.pool); +} + +int hns_roce_cmd_use_events(struct hns_roce_dev *hr_dev) +{ + struct hns_roce_cmdq *hr_cmd = &hr_dev->cmd; + int i; + + hr_cmd->context = kmalloc(hr_cmd->max_cmds * + sizeof(struct hns_roce_cmd_context), + GFP_KERNEL); + if (!hr_cmd->context) + return -ENOMEM; + + for (i = 0; i < hr_cmd->max_cmds; ++i) { + hr_cmd->context[i].token = i; + hr_cmd->context[i].next = i + 1; + } + + hr_cmd->context[hr_cmd->max_cmds - 1].next = -1; + hr_cmd->free_head = 0; + + sema_init(&hr_cmd->event_sem, hr_cmd->max_cmds); + spin_lock_init(&hr_cmd->context_lock); + + for (hr_cmd->token_mask = 1; hr_cmd->token_mask < hr_cmd->max_cmds; +hr_cmd->token_mask <<= 1) + ; + --hr_cmd->token_mask; + hr_cmd->use_events = 1; + + down(&hr_cmd->poll_sem); + + return 0; +} + +void hns_roce_cmd_use_polling(struct hns_roce_dev *hr_dev) +{ + struct hns_roce_cmdq *hr_cmd = &hr_dev->cmd; + int i; + + hr_cmd->use_events = 0; + + for (i = 0; i < hr_cmd->max_cmds; ++i) + down(&hr_cmd->event_sem); + + kfree(hr_cmd->context); + up(&hr_cmd->poll_sem); +} diff --git a/drivers/infiniband/hw/hns/hns_roce_cmd.h b/drivers/infiniband/hw/hns/hns_roce_cmd.h new file mode 100644 index 000..ff8e62d --- /dev/null +++ b/drivers/infiniband/hw/hns/hns_roce_cmd.h @@ -0,0 +1,42 @@ +/* + * Copyr