From nobody Tue Jul 4 14:00:10 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QwPZ26VWLz4l6Zl; Tue, 4 Jul 2023 14:00:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QwPZ25nQNz3Cjv; Tue, 4 Jul 2023 14:00:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688479210; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z5ekxNPrVC1LTJJ87M6wzC/naXCObwE/2xu7kt9ruH8=; b=Rg1+I/gvdyjhvZKTn3RcNGs1Yvw7z1bu+rRG4Cij1gxOvlcOgOKsFhyYKeIZGc2arIE/hC YTZe1rqtPtuUKpJc1jJ63OL4txBjhMVSzOupUm6auKan0G59DbHQy2waDh+hoDtQVM7npW pDMdqAsgd38Z8U//Mnxr1gH2t4c3eLQevjaL/gzNirkuHoJW3KkKESE/SBk2si+FARdHHr /pZDkz4J298plZslj5Bz3uQqVDUIhOI0gEVl8gWJhM0pzDboGAO5VcvT5DivIT/3Blr8PJ IoomTM8Pj5+fON4wI9CicBfGdDP9xKBxRrtLYFnlfCNvnbxwbKFn9lJRH28srA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688479210; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z5ekxNPrVC1LTJJ87M6wzC/naXCObwE/2xu7kt9ruH8=; b=OKb3hbEWbMBrljoHm0lhjAbNyN04NZDTNs3V/5TnfSOqvdHCUrHBO4eWzyX/49iBq8vNkU dk3hF1hgq779NCNToXZjev63dizwBy3TZg2e/9RF96d7VyTbgdlmFSLnaxTsyMKrag1737 KVP4UI6109xeQ5MFQRmAdTatuMu+CpfEuArr6tQO1ZwnVCBFau2AVrc02qy6H7RJoWZ9OL 4uMq9yYPn89wdak7hOPGErM0wKuz2l+coUSdZLP3UJE+nG+6e1+v0zK4u7NmdE0HmDKZjv 9G0ucB53PBQMhOHfJhOqJjZfH9VT2efdR5R9bc8UpYvdlO+6feFdEvGD5KDS6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688479210; a=rsa-sha256; cv=none; b=TX6xg43omoPWMtsXNGUE29+xgk+/j+QdFxz7owiqSLRZzB/RcnR+MS4VYDecZvX4w3HFSf jzr8D6kRoG5JAjfIUoK1zlURz2fiyIyaK5ez5NMvQ6uVR3yOtOpfJDw5KWG7/sMkrgusBT or2DgcutUhr6ezNoF0NsPZb2A1HuHq4rqj8GJCNPe3M8DCUV1laQVpIkRiVgXJHbGho8MF 2/2aRk02GdtYPinYvuTdKgpGBNFryLyhM9079jfFqvJ2UG/FE88obpbs7yH65S9/hkKL8e RPB24XSCQCvHRMsENcutydW2Z6fLnKbRw+ilJ7nkFWzPQTsydu5F1QO6RzTY4Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QwPZ24hrnzbNP; Tue, 4 Jul 2023 14:00:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 364E0Anw071476; Tue, 4 Jul 2023 14:00:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 364E0AGM071474; Tue, 4 Jul 2023 14:00:10 GMT (envelope-from git) Date: Tue, 4 Jul 2023 14:00:10 GMT Message-Id: <202307041400.364E0AGM071474@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Marcin Wojtas Subject: git: b9e80b5280b7 - main - ena: Initialize statistics before the interface is available List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mw X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b9e80b5280b75f2c641d680245df44b8ff26a7b0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mw: URL: https://cgit.FreeBSD.org/src/commit/?id=b9e80b5280b75f2c641d680245df44b8ff26a7b0 commit b9e80b5280b75f2c641d680245df44b8ff26a7b0 Author: Osama Abboud AuthorDate: 2023-01-18 13:19:07 +0000 Commit: Marcin Wojtas CommitDate: 2023-07-04 13:51:16 +0000 ena: Initialize statistics before the interface is available In [1], the FBSD community exposed a bug in the fbsd/ena driver. Bug description: ---------------- Current function call order is as follows: 1. ena_attach() 1.1. ena_setup_ifnet() 1.1.1. Registration of ena_get_counter() 1.1.2. ether_ifattach(ifp, adapter->mac_addr); 1.2. Statistics allocation and initialization. At point 1.1.2, when ether_ifattach() returns, the interface is available, and stats can be read before they are allocated, leading to kernel panic. Also fixed a potential memory leak by freeing the stats since they were not freed in case the following calls failed. Fix: ---- This commit moves the statistics allocation and initialization to happen before ena_setup_ifnet() [1] https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=268934 Fixes: 9b8d05b8ac78 ("Add support for Amazon Elastic Network Adapter (ENA) NIC") Fixes: 30217e2dff10 ("Rework counting of hardware statistics in ENA driver") MFC after: 2 weeks Sponsored by: Amazon, Inc. --- sys/dev/ena/ena.c | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/sys/dev/ena/ena.c b/sys/dev/ena/ena.c index a4762ce9ebb1..a62b99d5ee1b 100644 --- a/sys/dev/ena/ena.c +++ b/sys/dev/ena/ena.c @@ -3479,6 +3479,15 @@ ena_reset_task(void *arg, int pending) ENA_LOCK_UNLOCK(); } +static void +ena_free_stats(struct ena_adapter *adapter) +{ + ena_free_counters((counter_u64_t *)&adapter->hw_stats, + sizeof(struct ena_hw_stats)); + ena_free_counters((counter_u64_t *)&adapter->dev_stats, + sizeof(struct ena_stats_dev)); + +} /** * ena_attach - Device Initialization Routine * @pdev: device information struct @@ -3656,6 +3665,13 @@ ena_attach(device_t pdev) /* initialize rings basic information */ ena_init_io_rings(adapter); + /* Initialize statistics */ + ena_alloc_counters((counter_u64_t *)&adapter->dev_stats, + sizeof(struct ena_stats_dev)); + ena_alloc_counters((counter_u64_t *)&adapter->hw_stats, + sizeof(struct ena_hw_stats)); + ena_sysctl_add_nodes(adapter); + /* setup network interface */ rc = ena_setup_ifnet(pdev, adapter, &get_feat_ctx); if (unlikely(rc != 0)) { @@ -3677,13 +3693,6 @@ ena_attach(device_t pdev) taskqueue_start_threads(&adapter->metrics_tq, 1, PI_NET, "%s metricsq", device_get_nameunit(adapter->pdev)); - /* Initialize statistics */ - ena_alloc_counters((counter_u64_t *)&adapter->dev_stats, - sizeof(struct ena_stats_dev)); - ena_alloc_counters((counter_u64_t *)&adapter->hw_stats, - sizeof(struct ena_hw_stats)); - ena_sysctl_add_nodes(adapter); - #ifdef DEV_NETMAP rc = ena_netmap_attach(adapter); if (rc != 0) { @@ -3706,6 +3715,7 @@ err_detach: ether_ifdetach(adapter->ifp); #endif /* DEV_NETMAP */ err_msix_free: + ena_free_stats(adapter); ena_com_dev_reset(adapter->ena_dev, ENA_REGS_RESET_INIT_ERR); ena_free_mgmnt_irq(adapter); ena_disable_msix(adapter); @@ -3778,10 +3788,7 @@ ena_detach(device_t pdev) netmap_detach(adapter->ifp); #endif /* DEV_NETMAP */ - ena_free_counters((counter_u64_t *)&adapter->hw_stats, - sizeof(struct ena_hw_stats)); - ena_free_counters((counter_u64_t *)&adapter->dev_stats, - sizeof(struct ena_stats_dev)); + ena_free_stats(adapter); rc = ena_free_rx_dma_tag(adapter); if (unlikely(rc != 0))