From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id CBEBAA0093 for ; Wed, 20 May 2020 14:48:33 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id BD9E71C295; Wed, 20 May 2020 14:48:33 +0200 (CEST) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by dpdk.org (Postfix) with ESMTP id E51F51C295 for ; Wed, 20 May 2020 14:48:31 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589978911; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=Xu4kFw12IVDF8bCqMfmZ0uwQl8WLZ5kCOoQqW4iS7KE=; b=hUDbNeYAeabiJvNzt3/AduJ4PY+14y9GedoyFWF0o0A51qt9IUuS91jFBcI/c4N3lEer40 nJFGuhocKY8vhuxWRCzII78pAwwE3clhdZMS/w56442JBR+vY0AC145ts4L2GPoYmqDC6g v9mnv4SkB19IoNVwu6g17vUEklZ6e6I= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-39-ykhHSoEANYGHSg2Ugfufww-1; Wed, 20 May 2020 08:48:26 -0400 X-MC-Unique: ykhHSoEANYGHSg2Ugfufww-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8CFB98014D7; Wed, 20 May 2020 12:48:24 +0000 (UTC) Received: from [10.33.36.190] (unknown [10.33.36.190]) by smtp.corp.redhat.com (Postfix) with ESMTP id A9E53702EA; Wed, 20 May 2020 12:48:22 +0000 (UTC) To: "Wangxiaoyun (Cloud)" , luca.boccassi@gmail.com Cc: dpdk stable , luoxingyu@huawei.com, yin.yinshi@huawei.com, luoxianjun@huawei.com, zhouguoyang@huawei.com References: <20200519125804.104349-1-luca.boccassi@gmail.com> <20200519130549.112823-1-luca.boccassi@gmail.com> <20200519130549.112823-67-luca.boccassi@gmail.com> From: Kevin Traynor Autocrypt: addr=ktraynor@redhat.com; keydata= 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 Message-ID: <8f42e751-6ff1-293c-91c4-1b0833bba815@redhat.com> Date: Wed, 20 May 2020 13:48:21 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.5.0 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=gbk Content-Transfer-Encoding: 8bit Subject: Re: [dpdk-stable] patch 'net/hinic/base: fix PF firmware hot-active problem' has been queued to stable release 19.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" On 20/05/2020 13:29, Wangxiaoyun (Cloud) wrote: > Hi Luca Boccassi, > > These patches should be pushed to stable release 19.11.3 as follows: > 1) net/hinic: fix snprintf length --fixed by Kevin Traynor > 2) net/hinic: fix repeating log and length check --fixed by Kevin Traynor These 2 ^ are already in the queue. Checked backport email yesterday and there was only metadata changes - so should be no issues with them. > 3) net/hinic: alloc IO memory with socketid > 4) net/hinic: fix LRO problems > > For hotupdate problem fixes, which needs the following 2 patches: > 5）net/hinic/base: fix hotupdate firmware problem > 6）net/hinic/base: fix PF firmware hotactive problem > But I found the patch 6) may conflict with other patches, should I push a > new patch about patch 6) with 19.11 stable branch? > > And the other two patches also need to push to stable release: > 7) net/hinic: the queues resource free problem fixes > 8) net/hinic: the pkt len updates of mbuf fixes > > Thanks. > Xiaoyun Wang > > 在 2020/5/19 21:03, luca.boccassi@gmail.com 写道: >> Hi, >> >> FYI, your patch has been queued to stable release 19.11.3 >> >> Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. >> It will be pushed if I get no objections before 05/21/20. So please >> shout if anyone has objections. >> >> Also note that after the patch there's a diff of the upstream commit vs the >> patch applied to the branch. This will indicate if there was any rebasing >> needed to apply to the stable branch. If there were code changes for rebasing >> (ie: not only metadata diffs), please double check that the rebase was >> correctly done. >> >> Thanks. >> >> Luca Boccassi >> >> --- >> >From 11d98470395eff60937bbdff411b19f6ac00f76f Mon Sep 17 00:00:00 2001 >> From: Xiaoyun Wang >> Date: Fri, 10 Apr 2020 17:21:45 +0800 >> Subject: [PATCH] net/hinic/base: fix PF firmware hot-active problem >> >> [ upstream commit 036b61d85e4d1c45ac497a367c765ad463d2debf ] >> >> When FW is hotactive which means updating the FW but not needs >> to reboot OS, FW returns HINIC_DEV_BUSY_ACTIVE_FW for pf driver >> because firmware is being reinitialized, at which point the cmdq >> initialization that relies on the fw channel will fail, so driver >> should reinit the cmdq when port start. >> >> Fixes: 0194313b2df6 ("net/hinic/base: fix port start during FW hot update") >> >> Signed-off-by: Xiaoyun Wang >> --- >> drivers/net/hinic/base/hinic_pmd_cmdq.c | 7 +++-- >> drivers/net/hinic/base/hinic_pmd_hwdev.c | 4 +-- >> drivers/net/hinic/base/hinic_pmd_mgmt.c | 38 +++++++++++++----------- >> drivers/net/hinic/base/hinic_pmd_mgmt.h | 2 ++ >> drivers/net/hinic/base/hinic_pmd_nicio.c | 2 +- >> 5 files changed, 31 insertions(+), 22 deletions(-) >> >> diff --git a/drivers/net/hinic/base/hinic_pmd_cmdq.c b/drivers/net/hinic/base/hinic_pmd_cmdq.c >> index 685498ec2f..2e98b9c286 100644 >> --- a/drivers/net/hinic/base/hinic_pmd_cmdq.c >> +++ b/drivers/net/hinic/base/hinic_pmd_cmdq.c >> @@ -440,9 +440,12 @@ static int hinic_set_cmdq_ctxts(struct hinic_hwdev *hwdev) >> cmdq_ctxt, in_size, NULL, >> NULL, 0); >> if (err) { >> - if (err == HINIC_MBOX_PF_BUSY_ACTIVE_FW) >> + if (err == HINIC_MBOX_PF_BUSY_ACTIVE_FW || >> + err == HINIC_DEV_BUSY_ACTIVE_FW) { >> cmdqs->status |= HINIC_CMDQ_SET_FAIL; >> - PMD_DRV_LOG(ERR, "Set cmdq ctxt failed"); >> + PMD_DRV_LOG(ERR, "PF or VF fw is hot active"); >> + } >> + PMD_DRV_LOG(ERR, "Set cmdq ctxt failed, err: %d", err); >> return -EFAULT; >> } >> } >> diff --git a/drivers/net/hinic/base/hinic_pmd_hwdev.c b/drivers/net/hinic/base/hinic_pmd_hwdev.c >> index cf2a9701f2..fc11ecd7a4 100644 >> --- a/drivers/net/hinic/base/hinic_pmd_hwdev.c >> +++ b/drivers/net/hinic/base/hinic_pmd_hwdev.c >> @@ -529,7 +529,7 @@ static int hinic_vf_rx_tx_flush(struct hinic_hwdev *hwdev) >> >> err = hinic_reinit_cmdq_ctxts(hwdev); >> if (err) >> - PMD_DRV_LOG(WARNING, "Reinit cmdq failed"); >> + PMD_DRV_LOG(WARNING, "Reinit cmdq failed when vf flush"); >> >> return err; >> } >> @@ -587,7 +587,7 @@ static int hinic_pf_rx_tx_flush(struct hinic_hwdev *hwdev) >> >> err = hinic_reinit_cmdq_ctxts(hwdev); >> if (err) >> - PMD_DRV_LOG(WARNING, "Reinit cmdq failed"); >> + PMD_DRV_LOG(WARNING, "Reinit cmdq failed when pf flush"); >> >> return 0; >> } >> diff --git a/drivers/net/hinic/base/hinic_pmd_mgmt.c b/drivers/net/hinic/base/hinic_pmd_mgmt.c >> index eee50a80d1..ea79c300af 100644 >> --- a/drivers/net/hinic/base/hinic_pmd_mgmt.c >> +++ b/drivers/net/hinic/base/hinic_pmd_mgmt.c >> @@ -248,6 +248,19 @@ static void free_msg_buf(struct hinic_msg_pf_to_mgmt *pf_to_mgmt) >> free_recv_msg(&pf_to_mgmt->recv_msg_from_mgmt); >> } >> >> +static int hinic_get_mgmt_channel_status(void *hwdev) >> +{ >> + struct hinic_hwif *hwif = ((struct hinic_hwdev *)hwdev)->hwif; >> + u32 val; >> + >> + if (hinic_func_type((struct hinic_hwdev *)hwdev) == TYPE_VF) >> + return false; >> + >> + val = hinic_hwif_read_reg(hwif, HINIC_ICPL_RESERVD_ADDR); >> + >> + return HINIC_GET_MGMT_CHANNEL_STATUS(val, MGMT_CHANNEL_STATUS); >> +} >> + >> /** >> * send_msg_to_mgmt_async - send async message >> * @pf_to_mgmt: PF to MGMT channel >> @@ -309,6 +322,14 @@ static int send_msg_to_mgmt_sync(struct hinic_msg_pf_to_mgmt *pf_to_mgmt, >> u64 header; >> u16 cmd_size = mgmt_msg_len(msg_len); >> >> + /* If fw is hot active, return failed */ >> + if (hinic_get_mgmt_channel_status(pf_to_mgmt->hwdev)) { >> + if (mod == HINIC_MOD_COMM || mod == HINIC_MOD_L2NIC) >> + return HINIC_DEV_BUSY_ACTIVE_FW; >> + else >> + return -EBUSY; >> + } >> + >> if (direction == HINIC_MSG_RESPONSE) >> prepare_header(pf_to_mgmt, &header, msg_len, mod, ack_type, >> direction, cmd, resp_msg_id); >> @@ -462,19 +483,6 @@ unlock_sync_msg: >> return err; >> } >> >> -static int hinic_get_mgmt_channel_status(void *hwdev) >> -{ >> - struct hinic_hwif *hwif = ((struct hinic_hwdev *)hwdev)->hwif; >> - u32 val; >> - >> - if (hinic_func_type((struct hinic_hwdev *)hwdev) == TYPE_VF) >> - return false; >> - >> - val = hinic_hwif_read_reg(hwif, HINIC_ICPL_RESERVD_ADDR); >> - >> - return HINIC_GET_MGMT_CHANNEL_STATUS(val, MGMT_CHANNEL_STATUS); >> -} >> - >> int hinic_msg_to_mgmt_sync(void *hwdev, enum hinic_mod_type mod, u8 cmd, >> void *buf_in, u16 in_size, >> void *buf_out, u16 *out_size, u32 timeout) >> @@ -484,10 +492,6 @@ int hinic_msg_to_mgmt_sync(void *hwdev, enum hinic_mod_type mod, u8 cmd, >> if (!hwdev || in_size > HINIC_MSG_TO_MGMT_MAX_LEN) >> return -EINVAL; >> >> - /* If status is hot upgrading, don't send message to mgmt */ >> - if (hinic_get_mgmt_channel_status(hwdev)) >> - return -EPERM; >> - >> if (hinic_func_type(hwdev) == TYPE_VF) { >> rc = hinic_mbox_to_pf(hwdev, mod, cmd, buf_in, in_size, >> buf_out, out_size, timeout); >> diff --git a/drivers/net/hinic/base/hinic_pmd_mgmt.h b/drivers/net/hinic/base/hinic_pmd_mgmt.h >> index cc18843bf8..52b319ead4 100644 >> --- a/drivers/net/hinic/base/hinic_pmd_mgmt.h >> +++ b/drivers/net/hinic/base/hinic_pmd_mgmt.h >> @@ -34,6 +34,8 @@ >> #define HINIC_MSG_HEADER_P2P_IDX_MASK 0xF >> #define HINIC_MSG_HEADER_MSG_ID_MASK 0x3FF >> >> +#define HINIC_DEV_BUSY_ACTIVE_FW 0xFE >> + >> #define HINIC_MSG_HEADER_GET(val, member) \ >> (((val) >> HINIC_MSG_HEADER_##member##_SHIFT) & \ >> HINIC_MSG_HEADER_##member##_MASK) >> diff --git a/drivers/net/hinic/base/hinic_pmd_nicio.c b/drivers/net/hinic/base/hinic_pmd_nicio.c >> index 31a13fbdcf..d3e8f2e74d 100644 >> --- a/drivers/net/hinic/base/hinic_pmd_nicio.c >> +++ b/drivers/net/hinic/base/hinic_pmd_nicio.c >> @@ -536,7 +536,7 @@ int hinic_init_qp_ctxts(struct hinic_hwdev *hwdev) >> if (hwdev->cmdqs->status & HINIC_CMDQ_SET_FAIL) { >> err = hinic_reinit_cmdq_ctxts(hwdev); >> if (err) { >> - PMD_DRV_LOG(ERR, "Reinit cmdq context failed, rc: %d\n", >> + PMD_DRV_LOG(ERR, "Reinit cmdq context failed when dev start, err: %d", >> err); >> return err; >> } >> >