From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C753EC3A59E for ; Mon, 26 Aug 2019 08:43:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A071F2087E for ; Mon, 26 Aug 2019 08:43:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729487AbfHZInh convert rfc822-to-8bit (ORCPT ); Mon, 26 Aug 2019 04:43:37 -0400 Received: from szxga01-in.huawei.com ([45.249.212.187]:3951 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727228AbfHZInh (ORCPT ); Mon, 26 Aug 2019 04:43:37 -0400 Received: from DGGEML401-HUB.china.huawei.com (unknown [172.30.72.55]) by Forcepoint Email with ESMTP id E7AE158D2314C111FE6E; Mon, 26 Aug 2019 16:43:34 +0800 (CST) Received: from DGGEML424-HUB.china.huawei.com (10.1.199.41) by DGGEML401-HUB.china.huawei.com (10.3.17.32) with Microsoft SMTP Server (TLS) id 14.3.439.0; Mon, 26 Aug 2019 16:43:34 +0800 Received: from DGGEML522-MBX.china.huawei.com ([169.254.7.69]) by dggeml424-hub.china.huawei.com ([10.1.199.41]) with mapi id 14.03.0439.000; Mon, 26 Aug 2019 16:43:24 +0800 From: liweihang To: Leon Romanovsky , oulijun CC: "linux-rdma@vger.kernel.org" , "jgg@ziepe.ca" , "dledford@redhat.com" , Linuxarm Subject: RE: [PATCH for-next 1/9] RDMA/hns: Refactor cmd init and mode selection for hip08 Thread-Topic: [PATCH for-next 1/9] RDMA/hns: Refactor cmd init and mode selection for hip08 Thread-Index: AQHVWES2z/H3yppXpk+S7enpXbi+lqcNHyDQ Date: Mon, 26 Aug 2019 08:43:25 +0000 Message-ID: References: <1566393276-42555-1-git-send-email-oulijun@huawei.com> <1566393276-42555-2-git-send-email-oulijun@huawei.com> <20190821171928.GB27741@mtr-leonro.mtl.com> In-Reply-To: <20190821171928.GB27741@mtr-leonro.mtl.com> Accept-Language: zh-CN, en-US Content-Language: zh-CN X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.40.168.149] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 8BIT MIME-Version: 1.0 X-CFilter-Loop: Reflected Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org > -----Original Message----- > From: Linuxarm [mailto:linuxarm-bounces@huawei.com] On Behalf Of Leon > Romanovsky > Sent: Thursday, August 22, 2019 1:19 AM > To: oulijun > Cc: linux-rdma@vger.kernel.org; jgg@ziepe.ca; dledford@redhat.com; > Linuxarm > Subject: Re: [PATCH for-next 1/9] RDMA/hns: Refactor cmd init and mode > selection for hip08 > > On Wed, Aug 21, 2019 at 09:14:28PM +0800, Lijun Ou wrote: > > From: Yixian Liu > > > > This patch refactor the initialization of cmd, and also for the cmd > > mode selection on event and poll mode. > > > > Signed-off-by: Yixian Liu > > Signed-off-by: Lang Chen > > --- > > drivers/infiniband/hw/hns/hns_roce_cmd.c | 14 ++++---------- > > drivers/infiniband/hw/hns/hns_roce_main.c | 18 ++++++++---------- > > 2 files changed, 12 insertions(+), 20 deletions(-) > > > > diff --git a/drivers/infiniband/hw/hns/hns_roce_cmd.c > > b/drivers/infiniband/hw/hns/hns_roce_cmd.c > > index ade26fa..547002f 100644 > > --- a/drivers/infiniband/hw/hns/hns_roce_cmd.c > > +++ b/drivers/infiniband/hw/hns/hns_roce_cmd.c > > @@ -251,23 +251,17 @@ int hns_roce_cmd_use_events(struct > hns_roce_dev *hr_dev) > > hr_cmd->token_mask = 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); > > + if (hr_cmd->use_events) { > > Ensure that hr_cmd->context == NULL in places where it shouldn't be kfreed > and remove this "if (hr_cmd->use_events)". > > Thanks > . Hi Leon, Thanks for your advice, will remove above judgement in v2. > > > > + kfree(hr_cmd->context); > > + hr_cmd->use_events = 0; > > + } > > } > > > > struct hns_roce_cmd_mailbox > > diff --git a/drivers/infiniband/hw/hns/hns_roce_main.c > > b/drivers/infiniband/hw/hns/hns_roce_main.c > > index 1b757cc..f3b2f67 100644 > > --- a/drivers/infiniband/hw/hns/hns_roce_main.c > > +++ b/drivers/infiniband/hw/hns/hns_roce_main.c > > @@ -902,6 +902,7 @@ int hns_roce_init(struct hns_roce_dev *hr_dev) > > goto error_failed_cmd_init; > > } > > > > + /* EQ depends on poll mode, event mode depends on EQ */ > > ret = hr_dev->hw->init_eq(hr_dev); > > if (ret) { > > dev_err(dev, "eq init failed!\n"); > > @@ -911,8 +912,9 @@ int hns_roce_init(struct hns_roce_dev *hr_dev) > > if (hr_dev->cmd_mod) { > > ret = hns_roce_cmd_use_events(hr_dev); > > if (ret) { > > - dev_err(dev, "Switch to event-driven cmd failed!\n"); > > - goto error_failed_use_event; > > + dev_warn(dev, > > + "Cmd event mode failed, set back to > poll!\n"); > > + hns_roce_cmd_use_polling(hr_dev); > > } > > } > > > > @@ -928,12 +930,10 @@ int hns_roce_init(struct hns_roce_dev *hr_dev) > > goto error_failed_setup_hca; > > } > > > > - if (hr_dev->hw->hw_init) { > > - ret = hr_dev->hw->hw_init(hr_dev); > > - if (ret) { > > - dev_err(dev, "hw_init failed!\n"); > > - goto error_failed_engine_init; > > - } > > + ret = hr_dev->hw->hw_init(hr_dev); > > + if (ret) { > > + dev_err(dev, "hw_init failed!\n"); > > + goto error_failed_engine_init; > > } > > > > ret = hns_roce_register_device(hr_dev); @@ -955,8 +955,6 @@ int > > hns_roce_init(struct hns_roce_dev *hr_dev) > > error_failed_init_hem: > > if (hr_dev->cmd_mod) > > hns_roce_cmd_use_polling(hr_dev); > > - > > -error_failed_use_event: > > hr_dev->hw->cleanup_eq(hr_dev); > > > > error_failed_eq_table: > > -- > > 2.8.1 > > > _______________________________________________ > Linuxarm mailing list > Linuxarm@huawei.com > http://hulk.huawei.com/mailman/listinfo/linuxarm