From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6ED9DA0C47; Tue, 6 Jul 2021 14:47:20 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 550294128B; Tue, 6 Jul 2021 14:47:20 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 9752B41262 for ; Tue, 6 Jul 2021 14:47:18 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1625575638; 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: in-reply-to:in-reply-to:references:references; bh=Gb6Qk1naq/3MJpYwXnxJpShU7r7OPKhQcyfqt5UsnWI=; b=Z0k1sUb+h+0n4Aq9RMMj2XEBr9o8462hVQE2PeHoE3zHFDuP4J4+brmAmeuUgE7aorgN3h kcJB08VrEeNOfLYF4WsY9mboE+PoMlQ83Guhf5qtUl/vTmu3spIcXTYaWIpxWoKn0Qe1ee gKjyh4aDl+3AtE+pfOFdrIwjr/qzA9Q= Received: from mail-vs1-f72.google.com (mail-vs1-f72.google.com [209.85.217.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-550-QsZZ0ChHOeyPvYPwktqhaQ-1; Tue, 06 Jul 2021 08:47:16 -0400 X-MC-Unique: QsZZ0ChHOeyPvYPwktqhaQ-1 Received: by mail-vs1-f72.google.com with SMTP id i123-20020a6722810000b029025b7f69ef9aso4711068vsi.22 for ; Tue, 06 Jul 2021 05:47:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=Gb6Qk1naq/3MJpYwXnxJpShU7r7OPKhQcyfqt5UsnWI=; b=Ohl7HYUpDuolKaVp1+ccvYYd1Sc3oM/aodrU0Ml0uo6QJkuSXA8UzJ7n6gEhBOdnTa VyaTPmfjOpUt57KgHXQmS97AZ4jydooI+DmytPoQPUZ/4pjKU86gqaJxFZsXmbJqIiB9 4CJr68PR1JDUJMSuH3lPSGRluGjG0xD1qlnSlPw5kV/SE9F+fX0h4zO8CLls/gILsi/4 IXS1qVhDwYhK0I0O65A0o75Uu+rACAtiy74cFd7AqXgEK7+XMZ8T3xL9sUvwJBf71pYl 0Yti65THCh82PmVfoUAEQi522u46M5JaMjh7CK8pJvs9lQklFZN8S/0N9stgYMT/iwgI IuMQ== X-Gm-Message-State: AOAM533OJZY6fXPHKF9laGES59ZVeUnnQA7mkSvEs3rJCzQZxRUQMJXf Z3Ik1Tt5U6QT6fN9U8Q6peSNYoYFTtia8mp2pIDVLBzQpmgNJ3is9IHzU00Ra7xp3BgzvprNILI tAsBhdal8iShKS3zEm8I= X-Received: by 2002:a05:6102:3196:: with SMTP id c22mr7154653vsh.27.1625575636314; Tue, 06 Jul 2021 05:47:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwTvLpnZ8Xb3hs3pR5DPnr852NdG+wHodjfSmJFLriFCU5vDEO7LbNu51g32TSWpRLCQQgZb+0dmntffPYdlXw= X-Received: by 2002:a05:6102:3196:: with SMTP id c22mr7154631vsh.27.1625575636048; Tue, 06 Jul 2021 05:47:16 -0700 (PDT) MIME-Version: 1.0 References: <20210706085643.5088-1-david.marchand@redhat.com> In-Reply-To: From: David Marchand Date: Tue, 6 Jul 2021 14:47:04 +0200 Message-ID: To: "Wang, Haiyue" Cc: "dev@dpdk.org" , "stable@dpdk.org" , "Yang, Qiming" , "Zhang, Qi Z" , "Stillwell Jr, Paul M" Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=dmarchan@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="UTF-8" Subject: Re: [dpdk-dev] [PATCH] net/ice: fix memzone leak when firmware is missing X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" On Tue, Jul 6, 2021 at 2:41 PM Wang, Haiyue wrote: > > diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c > > index 09e38590e5..f85c7cc8da 100644 > > --- a/drivers/net/ice/ice_ethdev.c > > +++ b/drivers/net/ice/ice_ethdev.c > > @@ -2085,7 +2085,7 @@ ice_dev_init(struct rte_eth_dev *dev) > > if (ad->devargs.safe_mode_support == 0) { > > PMD_INIT_LOG(ERR, "Failed to load the DDP package," > > "Use safe-mode-support=1 to enter Safe Mode"); > > - return ret; > > + goto err_init_fw; > > } > > > > PMD_INIT_LOG(WARNING, "Failed to load the DDP package," > > @@ -2175,6 +2175,8 @@ ice_dev_init(struct rte_eth_dev *dev) > > rte_free(dev->data->mac_addrs); > > dev->data->mac_addrs = NULL; > > err_init_mac: > > + ice_free_hw_tbls(hw); > > +err_init_fw: > > ice_sched_cleanup_all(hw); > > rte_free(hw->port_info); > > ice_shutdown_all_ctrlq(hw); > > The function 'ice_deinit_hw' should be used. ;-) > > https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/net/ethernet/intel/ice/ice_main.c#n4508 Well I was inspired by ice_dev_close(), so I guess this code too could use some cleanup but I don't have the hw anymore to test this change. I'll trust you and simply update ice_dev_init. > > diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c > index 09e38590e5..c777474468 100644 > --- a/drivers/net/ice/ice_ethdev.c > +++ b/drivers/net/ice/ice_ethdev.c > @@ -2085,7 +2085,7 @@ ice_dev_init(struct rte_eth_dev *dev) > if (ad->devargs.safe_mode_support == 0) { > PMD_INIT_LOG(ERR, "Failed to load the DDP package," > "Use safe-mode-support=1 to enter Safe Mode"); > - return ret; > + goto err_init_fw; > } > > PMD_INIT_LOG(WARNING, "Failed to load the DDP package," > @@ -2175,10 +2175,9 @@ ice_dev_init(struct rte_eth_dev *dev) > rte_free(dev->data->mac_addrs); > dev->data->mac_addrs = NULL; > err_init_mac: > - ice_sched_cleanup_all(hw); > - rte_free(hw->port_info); > - ice_shutdown_all_ctrlq(hw); > rte_free(pf->proto_xtr); > +err_init_fw: In such a case a single label should be enough, right? > + ice_deinit_hw(hw); > > return ret; > } -- David Marchand