From patchwork Fri Nov 11 07:08:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ziyang Xuan X-Patchwork-Id: 18507 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp588565wru; Thu, 10 Nov 2022 23:11:41 -0800 (PST) X-Google-Smtp-Source: AA0mqf6tJbbXGKLk+CmJLkN3E8Cr8tGUJBcI6qdvowec4V+ouAG4vKMV/k8wrXCxsEZqMfGDutbx X-Received: by 2002:a05:6a00:1c84:b0:569:92fa:cbbc with SMTP id y4-20020a056a001c8400b0056992facbbcmr1306885pfw.77.1668150701429; Thu, 10 Nov 2022 23:11:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668150701; cv=none; d=google.com; s=arc-20160816; b=w4XWVzLj6cmx44oB7eb4yEswpyD3mkSSN9DpgPdqwEPTCuFrdOhyAQwkwgn/zfw4ct zIWVb6q5zpR+pL4lTCtw+dDdxeTamk6A51jwdKT4xOTy0I/pextQH36MzUY16CTJdOnR TUVDvpTzDcAkswZGAzAySeVXow4YvkSuVPNxpYtuWHVCjfveajel0mxdPEvEBrp+918y AGwkEnvzNTKKcYQx1OOyp2h8QbS214F44m9AxWan5w8l1+RABXgk0c6IuITderJ5bEcO 58rKyLUeJSs/cYKSDy3UToIuMI3KTmYD+95WRVRA0wPamROG6IxmYWkiOHAFVwKF0tAd v9mg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:to:from; bh=7xNP4Ahn3d5vR9qYzCd9fiplkvDapHIcHUciKdWFfSo=; b=IcPQIfZg0AUOTKsrD/aUrbzJubVpJ9h/O1NsVFAHLtC3RwyDP5l+scFFbDn5sdJ8bd AhbzzaLCrc/dPxklZhdzNmq2regsOiP65jwv5TJtLTdgix+tL06l7jq+3k4IAAqKZnMa Q2woHje28gVvqniHvdvt708Vm3ceM/hSKmtI9MHhgvo5ET4LLqb8ABV7n0ZaTAbHzea5 cmZcsk8ItbxIRCF0i0KLFdLoWwXaFUzHsIqVBTWpXATDmNSCFGPkXyJs9vMmmYkLpBrB DsKE7zu194tOuD6Vpdv6txrOhvAQtRDrIzygNqStw7yJrzywdeaaJEyrfdh+sUISy7V+ 6a7g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k5-20020a170902760500b001786b70f913si1579807pll.164.2022.11.10.23.11.28; Thu, 10 Nov 2022 23:11:41 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233004AbiKKHIs (ORCPT + 99 others); Fri, 11 Nov 2022 02:08:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47042 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233176AbiKKHIk (ORCPT ); Fri, 11 Nov 2022 02:08:40 -0500 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0E630BF7F; Thu, 10 Nov 2022 23:08:32 -0800 (PST) Received: from canpemm500006.china.huawei.com (unknown [172.30.72.53]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4N7qYD1nsKz15MX1; Fri, 11 Nov 2022 15:08:16 +0800 (CST) Received: from localhost.localdomain (10.175.104.82) by canpemm500006.china.huawei.com (7.192.105.130) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Fri, 11 Nov 2022 15:08:30 +0800 From: Ziyang Xuan To: , , , , , , , , Subject: [PATCH net 1/4] octeon_ep: delete unnecessary napi rollback under set_queues_err in octep_open() Date: Fri, 11 Nov 2022 15:08:27 +0800 Message-ID: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [10.175.104.82] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To canpemm500006.china.huawei.com (7.192.105.130) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749182789849158509?= X-GMAIL-MSGID: =?utf-8?q?1749182789849158509?= octep_napi_add() and octep_napi_enable() are all after netif_set_real_num_{tx,rx}_queues() in octep_open(), so it is unnecessary napi rollback under set_queues_err. Delete them to fix it. Fixes: 37d79d059606 ("octeon_ep: add Tx/Rx processing and interrupt support") Signed-off-by: Ziyang Xuan --- drivers/net/ethernet/marvell/octeon_ep/octep_main.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/net/ethernet/marvell/octeon_ep/octep_main.c b/drivers/net/ethernet/marvell/octeon_ep/octep_main.c index 9089adcb75f9..7985a748fafe 100644 --- a/drivers/net/ethernet/marvell/octeon_ep/octep_main.c +++ b/drivers/net/ethernet/marvell/octeon_ep/octep_main.c @@ -527,8 +527,6 @@ static int octep_open(struct net_device *netdev) return 0; set_queues_err: - octep_napi_disable(oct); - octep_napi_delete(oct); octep_clean_irqs(oct); setup_irq_err: octep_free_oqs(oct); From patchwork Fri Nov 11 07:08:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ziyang Xuan X-Patchwork-Id: 18509 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp589212wru; Thu, 10 Nov 2022 23:13:27 -0800 (PST) X-Google-Smtp-Source: AA0mqf7OTEw80UTDwlCVix4OfyphEJWcr590b4pxOL4AgxqoDHPzlCmyB4I+iZazqVtkTVXLq+Uw X-Received: by 2002:a17:903:22d2:b0:172:9db6:3c5 with SMTP id y18-20020a17090322d200b001729db603c5mr1291636plg.110.1668150807526; Thu, 10 Nov 2022 23:13:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668150807; cv=none; d=google.com; s=arc-20160816; b=boGaC39yEe3rkHsM6gPUqUyoaLC8XXPPND2GEBcRSeN1+fiAxamJ2qfuLw5FbwWykk kvPtuXAnx3s33y7V/kuWowiisPWb3kiDuOTKiszzuRlbY4v+c7bEYodrmn5t4jlwn5Rd 87uXHTNMKZrKzpSnjTXwExCiN7ITI2lcftPUUGNlOrCXVGAW/wzUhkg/tb3nRYwGTPHW GAvJ+Q9iqAJOcy+Cr4nCuiapzoHGfeAjLGw+wk4aYLn/N4Das0/Hfl2cfwiVHBzaBTNA GP8HyEHoqSowvUqwWd3g7f5x8eBWgCejT9HykpuASyGt5RCwgln/tGOYPY+UhJX/9GJa 8iag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:to:from; bh=mbUy28BPcxJAhSNZO1/+JJECcaHhrXAJCQ2W2T/8D1U=; b=KShNANbd1PhnfRcJINnUVGV1FmgtukfZLoJCkzqH6rc5OsvxwqpkHViyPW2nRtIO0W y6hIr//rl37wrOMnJraZOLL8lSTeM9DB0xhK1LVxn92MGJxQIOEgv3UWEfyyEsV+1lHi ODWDygQ8iUeUhU3oqMTK+HtbnqfEx+bDnMQVTty3tPvUtEuV9ZveAb8yhcOH42+jUnzD oex7u7geZvio5mnO3Spw3UJul59wqv7oiqNa37b9ISi4GhRzt8ah9bxKElQw5Ijx+We6 r/yWv7PlDB89lB5gyWKzKaSoL1/CL/LdnQjZm5FC7FG31yXQ0DewldE4EWajmIIdUitk +ZJg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m184-20020a633fc1000000b0046eb0e2db57si1644200pga.518.2022.11.10.23.13.14; Thu, 10 Nov 2022 23:13:27 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233151AbiKKHJN (ORCPT + 99 others); Fri, 11 Nov 2022 02:09:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47116 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233202AbiKKHJB (ORCPT ); Fri, 11 Nov 2022 02:09:01 -0500 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3F240716E7; Thu, 10 Nov 2022 23:08:53 -0800 (PST) Received: from canpemm500006.china.huawei.com (unknown [172.30.72.53]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4N7qYb4FdjzmVGh; Fri, 11 Nov 2022 15:08:35 +0800 (CST) Received: from localhost.localdomain (10.175.104.82) by canpemm500006.china.huawei.com (7.192.105.130) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Fri, 11 Nov 2022 15:08:50 +0800 From: Ziyang Xuan To: , , , , , , , , Subject: [PATCH net 2/4] octeon_ep: ensure octep_get_link_status() successfully before octep_link_up() Date: Fri, 11 Nov 2022 15:08:47 +0800 Message-ID: <7e653ae15e1368ff33435da7c6df94d5e5d4fad0.1668150074.git.william.xuanziyang@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [10.175.104.82] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To canpemm500006.china.huawei.com (7.192.105.130) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749182901150760502?= X-GMAIL-MSGID: =?utf-8?q?1749182901150760502?= octep_get_link_status() can fail because send mbox message failed, then octep_get_link_status() will return ret less than 0. Excute octep_link_up() as long as ret is not equal to 0 in octep_open() now. That is not correct. The value type of link.state is enum octep_ctrl_net_state. Positive value represents up. Excute octep_link_up() when ret is bigger than 0. Fixes: 862cd659a6fb ("octeon_ep: Add driver framework and device initialization") Signed-off-by: Ziyang Xuan --- drivers/net/ethernet/marvell/octeon_ep/octep_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/marvell/octeon_ep/octep_main.c b/drivers/net/ethernet/marvell/octeon_ep/octep_main.c index 7985a748fafe..546bcebf4462 100644 --- a/drivers/net/ethernet/marvell/octeon_ep/octep_main.c +++ b/drivers/net/ethernet/marvell/octeon_ep/octep_main.c @@ -521,7 +521,7 @@ static int octep_open(struct net_device *netdev) octep_oq_dbell_init(oct); ret = octep_get_link_status(oct); - if (ret) + if (ret > 0) octep_link_up(netdev); return 0; From patchwork Fri Nov 11 07:09:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ziyang Xuan X-Patchwork-Id: 18508 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp589007wru; Thu, 10 Nov 2022 23:12:56 -0800 (PST) X-Google-Smtp-Source: AA0mqf6q63EXKBXT/2GDoQXANengJ3vRYc7G+t3tDw8k4sdrC71znW2Cqysi0tICwvI2fB6hr+Kc X-Received: by 2002:a63:501e:0:b0:464:85db:29c with SMTP id e30-20020a63501e000000b0046485db029cmr507252pgb.600.1668150776348; Thu, 10 Nov 2022 23:12:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668150776; cv=none; d=google.com; s=arc-20160816; b=vEf1s2VnATQlDk6MoM1wow6m9tfBDUJIH5BuhwsnhyYIAOAz5nhdnuYEgcJ/cDs1E8 43qpQu1YiBrsYp4B/SJF+QpBPhvDbfIpA7KyVFT4Fbgk/u6HBWcFVn68i8hBRS/fsLph jxiAMvstEhBti4IL3WEmSHA6PKnwczlZtoQVoCtcVbwEkvJCHrHMouEpyH84Euk1ZxYd +rg63nc5uUcU1PMyXOC/u3vc1etfeZlqlyxnh2v9W56nZ0yie5JFkCSLZH+37PgGX/zJ O1Xn8IPadgbUg2ujvIQy1HCflZ+/2qVm3BKAU55duLE0DunDaCAfOOY9FfhkuNXNb2vJ M/Jw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:to:from; bh=wb71QJz6wD+QXFRyDngo3oF7jpyMls9VkyC3zoZddOk=; b=gr2NnUCrlQgqGCl6mwRObM5LmBlFiTthnhECTv3r60C51is/537N2XybHvitQoXUG9 X83zuS/sahsmmLJU3QzL4gIpROuA3OBlgmyi2IgUMZBVaDf7CDpHKaGlnhmGFeL5Zxm0 yZXntq/enMc7cddjbK+CK2mUtcQfSuRotFFJvQXi15rcpsRbNgFqOk5iJTBGidkwgn1H m6Okj5tEVxOSPCm4DrM2cVgzsNFSezJe15EaUfpkAP4Mx8/eN0l5RcnpKjJ8jbA5f5H1 k2cwQ3AH54b62nHOn5u057DQftP8aCfS2bj3edEmhUKqTqJGdgipVIBmFQF94gV2N7y8 lYDw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u9-20020a63d349000000b0047063e55de3si1489027pgi.711.2022.11.10.23.12.42; Thu, 10 Nov 2022 23:12:56 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233077AbiKKHJf (ORCPT + 99 others); Fri, 11 Nov 2022 02:09:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47722 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233170AbiKKHJ3 (ORCPT ); Fri, 11 Nov 2022 02:09:29 -0500 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0189318351; Thu, 10 Nov 2022 23:09:28 -0800 (PST) Received: from canpemm500006.china.huawei.com (unknown [172.30.72.57]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4N7qZL6kZnzRp9n; Fri, 11 Nov 2022 15:09:14 +0800 (CST) Received: from localhost.localdomain (10.175.104.82) by canpemm500006.china.huawei.com (7.192.105.130) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Fri, 11 Nov 2022 15:09:26 +0800 From: Ziyang Xuan To: , , , , , , , , Subject: [PATCH net 3/4] octeon_ep: fix potential memory leak in octep_device_setup() Date: Fri, 11 Nov 2022 15:09:23 +0800 Message-ID: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [10.175.104.82] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To canpemm500006.china.huawei.com (7.192.105.130) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749182868769907532?= X-GMAIL-MSGID: =?utf-8?q?1749182868769907532?= When occur unsupported_dev and mbox init errors, it did not free oct->conf and iounmap() oct->mmio[i].hw_addr. That would trigger memory leak problem. Add kfree() for oct->conf and iounmap() for oct->mmio[i].hw_addr under unsupported_dev and mbox init errors to fix the problem. Fixes: 862cd659a6fb ("octeon_ep: Add driver framework and device initialization") Signed-off-by: Ziyang Xuan --- drivers/net/ethernet/marvell/octeon_ep/octep_main.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/marvell/octeon_ep/octep_main.c b/drivers/net/ethernet/marvell/octeon_ep/octep_main.c index 546bcebf4462..53f288c32238 100644 --- a/drivers/net/ethernet/marvell/octeon_ep/octep_main.c +++ b/drivers/net/ethernet/marvell/octeon_ep/octep_main.c @@ -956,7 +956,7 @@ int octep_device_setup(struct octep_device *oct) ret = octep_ctrl_mbox_init(ctrl_mbox); if (ret) { dev_err(&pdev->dev, "Failed to initialize control mbox\n"); - return -1; + goto unsupported_dev; } oct->ctrl_mbox_ifstats_offset = OCTEP_CTRL_MBOX_SZ(ctrl_mbox->h2fq.elem_sz, ctrl_mbox->h2fq.elem_cnt, @@ -966,6 +966,10 @@ int octep_device_setup(struct octep_device *oct) return 0; unsupported_dev: + for (i = 0; i < OCTEP_MMIO_REGIONS; i++) + iounmap(oct->mmio[i].hw_addr); + + kfree(oct->conf); return -1; } From patchwork Fri Nov 11 07:09:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ziyang Xuan X-Patchwork-Id: 18510 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp589536wru; Thu, 10 Nov 2022 23:14:21 -0800 (PST) X-Google-Smtp-Source: AA0mqf6ezXDM0waKkLeyHSxWnN09pS47XnDZTgLhYlFEOJS2iN9kQY9xQTQLWS1CA2WiWPKWUWKw X-Received: by 2002:a17:907:c282:b0:78d:36d7:92ae with SMTP id tk2-20020a170907c28200b0078d36d792aemr901942ejc.113.1668150861075; Thu, 10 Nov 2022 23:14:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668150861; cv=none; d=google.com; s=arc-20160816; b=EqfFgdx6JglSFtp1CawF6Skx6EQA7AHBV5tN1K7wmuIM8xCX9ssaTWoETyxeYYSOkd hhiIjSeqSxvg0DDEXQcsRZ28p92/9r15pCk67qJLEHP7jlmMZXPwM/WBQUcqpWGJddKF oD8cb51PKvtwIKWF/Vm1VNOIyqo1qsP+VabQ5Wad6gS1nVCbBNDDcU0qGUDjby0255+9 AiF6hPtkwAugBSUa7SFtBVtZfbDxD+n4aX3xvt/R3csOePgL0iFbEC+ThYOV2/gwtRd6 01ClX00VBpObOOCbVYcDQS5NKorZvol49XQ+R4A3m02G03CIeU2u29Dq5tVcSTyX3HtO jnKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:to:from; bh=43k/EOibONny7Ylxo/zWQk6HVg60hoYkg4dzMkX9YxA=; b=ovD6hM7djFLMOL5WP+QUyM/3Tl83X4U6FHLyrIOlVUwHwxgJSkg2Qcqs/+G1ugeSCe h1+le005vLuTKPkplCR1RYe+PViqq/eLYVgVmZOq2FJ0umRqpiyRLA43b4WUYWFoHXai q1WxkDXVHB/MGY7B/ZSgzfWk7vdu8iYuyZo5UKjWQu+UFqJJeDp57vblvBiPAI7z6/J4 lV1XLNS4N5TKJkT0TyrE4bK/IE1+CQDaCh07DxJ74Bhin6cu91ISbCGRTrmw9g9jQ41g q8zj2box1ZLZcKPTmM9i7b7jatDtEF7yF2edpt1sDZEnmp3a3uMQuvQwYz4JAL2LU2D9 gLxg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id nc33-20020a1709071c2100b0078d9db99f5esi1727483ejc.39.2022.11.10.23.13.56; Thu, 10 Nov 2022 23:14:21 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233159AbiKKHJp (ORCPT + 99 others); Fri, 11 Nov 2022 02:09:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47988 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233171AbiKKHJn (ORCPT ); Fri, 11 Nov 2022 02:09:43 -0500 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B647918383; Thu, 10 Nov 2022 23:09:40 -0800 (PST) Received: from canpemm500006.china.huawei.com (unknown [172.30.72.55]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4N7qZJ5vkXzHvgZ; Fri, 11 Nov 2022 15:09:12 +0800 (CST) Received: from localhost.localdomain (10.175.104.82) by canpemm500006.china.huawei.com (7.192.105.130) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Fri, 11 Nov 2022 15:09:38 +0800 From: Ziyang Xuan To: , , , , , , , , Subject: [PATCH net 4/4] octeon_ep: ensure get mac address successfully before eth_hw_addr_set() Date: Fri, 11 Nov 2022 15:09:35 +0800 Message-ID: <223ee27c25cc506b8d49c87e8a95b06c6eb2b971.1668150074.git.william.xuanziyang@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [10.175.104.82] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To canpemm500006.china.huawei.com (7.192.105.130) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749182957331481011?= X-GMAIL-MSGID: =?utf-8?q?1749182957331481011?= octep_get_mac_addr() can fail because send mbox message failed. If this happens, octep_dev->mac_addr will be zero. It should not continue to initialize. Add exception handling for octep_get_mac_addr() to fix it. Fixes: 862cd659a6fb ("octeon_ep: Add driver framework and device initialization") Signed-off-by: Ziyang Xuan --- drivers/net/ethernet/marvell/octeon_ep/octep_main.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/marvell/octeon_ep/octep_main.c b/drivers/net/ethernet/marvell/octeon_ep/octep_main.c index 53f288c32238..b45dd7f04e21 100644 --- a/drivers/net/ethernet/marvell/octeon_ep/octep_main.c +++ b/drivers/net/ethernet/marvell/octeon_ep/octep_main.c @@ -1072,7 +1072,11 @@ static int octep_probe(struct pci_dev *pdev, const struct pci_device_id *ent) netdev->max_mtu = OCTEP_MAX_MTU; netdev->mtu = OCTEP_DEFAULT_MTU; - octep_get_mac_addr(octep_dev, octep_dev->mac_addr); + err = octep_get_mac_addr(octep_dev, octep_dev->mac_addr); + if (err) { + dev_err(&pdev->dev, "Failed to get mac address\n"); + goto register_dev_err; + } eth_hw_addr_set(netdev, octep_dev->mac_addr); err = register_netdev(netdev);