From nobody Fri Jan 27 13:59:05 2023 X-Original-To: dev-commits-src-branches@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 4P3K1j48Ymz3c1rh; Fri, 27 Jan 2023 13:59:05 +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 4P3K1j3N7pz4QSm; Fri, 27 Jan 2023 13:59:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674827945; 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=uRPIYq8VOxyrksuUG8sBOsX3TYol3HQoY19DyRDphRw=; b=WO4s8Nt+++x9bHAwHJgLKYuqsOsSU0QJKgdN4AfcMrn9z3RIVH/T0SuG0Y4MrBTXqmjGqb DYjV1ye7I8I5xWKd+zIfqjaTmi3bViFMRYrO1WjmnRaY+v2KZUvTasnUALt/l4vJoKb+QC VonZs7SlGFGqRtY5jAth3GfTz5esSlGJwks15hDKUsaD50aEKUQuWbP7ubC43+Irgxhq2V Pb0Qht/zNzBIyNZ+1WZtSHdFBDKIjDjhxAn1b0uwLGSRZsbDH26u70+TxZy7lerGmbCmO2 qd+lCm16AN6vugxwxKdLE446uCw9pKwu5FZmmwJ/KuUdCp/XHBOtBM3BleZaIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674827945; 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=uRPIYq8VOxyrksuUG8sBOsX3TYol3HQoY19DyRDphRw=; b=lpz3Yjim4x9tplgh7C+8fD+3DyFDBvS9tuwi3B0mUlK0yB68NHFukKUdtE/fufnPETdAJT Y+yqMqJSHQyhlJMPRZWnCYFe0VifRobKSIlWRQJutsfh67CCZ6R/udpJ5Kh3bTEIR6kIxf 3PgG6e4gPEMgArRBftovSKMjXEFBR8uf9ZUnUTCu4wzQ4L9gajvxl41uWclinsAT/4wbdu evkLlwooYTIM/lst97dS+e4ZOJxyykzWhPlsd7DVOTdP0UlX4TTNHiRlYZ/xlmVIlNtOAu BHShtJ1+KLqPFnGzVm1K4w9VxWlNq+qSeSbimxxYqizt+oopfNvhNnJ1wjADSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674827945; a=rsa-sha256; cv=none; b=eKoZE5+994uYJFiCQ6K/gS1Cj849yZOigObpb5dTtpoXGacUKE3zrImZ+6TLuItaapWe2K 48qNqhuncDCUfYyw2/dYquoE7j7ts+F65r0kBebV8+fGoE1F1A0PC/s5yQyNkqP5+/qJNT fx2ISjiwnW7AFfUfNoeTvpeCMNxVS9+Izzw+8SCIq4BBJb1pj7QpjECNwANs4Aka2bnWzr 2Wk0LWMbJ+72Zz6EcrMxsztSttIHxzTZ2ntiaf3IENcjnqbOrsGm0iMo/5WVsZEIRtihYO s6eP7niAEmYvE4cY5iCuiLpjq23vQJxc4jncoJezsjvwIELpR1cDBlokWYSBFQ== 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 4P3K1j2PJQz19nk; Fri, 27 Jan 2023 13:59:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30RDx5B0057861; Fri, 27 Jan 2023 13:59:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30RDx5G5057860; Fri, 27 Jan 2023 13:59:05 GMT (envelope-from git) Date: Fri, 27 Jan 2023 13:59:05 GMT Message-Id: <202301271359.30RDx5G5057860@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Marcin Wojtas Subject: git: 92761fcc3b40 - stable/13 - ena: Remove timer service re-arm on ena_restore_device failure List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 92761fcc3b406354677f897dedfad9090bbc1bcf Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mw: URL: https://cgit.FreeBSD.org/src/commit/?id=92761fcc3b406354677f897dedfad9090bbc1bcf commit 92761fcc3b406354677f897dedfad9090bbc1bcf Author: David Arinzon AuthorDate: 2022-12-04 10:37:32 +0000 Commit: Marcin Wojtas CommitDate: 2023-01-27 12:08:55 +0000 ena: Remove timer service re-arm on ena_restore_device failure In case the reset sequence fails (ena_destroy_device() followed by ena_restore_device() calls) during ena_restore_device(), the driver resources are being freed. After the clean-up, the timer service is re-armed in order to try and re-initialize the driver state. But, such an attempt would fail given that the resources are freed. Moreover, this would actually cause either the system to fail or a panic. When the driver fails in ena_restore_device() procedure, the only recovery is either unloading and loading the driver or instance reboot. This change removes the timer service re-arm in case of failure in ena_restore_device(). MFC after: 2 weeks Sponsored by: Amazon, Inc. Fixes: 78554d0c707c ("ena: start timer service on attach") (cherry picked from commit c4a85b8d684d3db9dc4d3d01d966130e21390529) --- sys/dev/ena/ena.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/dev/ena/ena.c b/sys/dev/ena/ena.c index 1def02978627..4dcbb709c586 100644 --- a/sys/dev/ena/ena.c +++ b/sys/dev/ena/ena.c @@ -3450,8 +3450,6 @@ err: ENA_FLAG_CLEAR_ATOMIC(ENA_FLAG_ONGOING_RESET, adapter); ena_log(dev, ERR, "Reset attempt failed. Can not reset the device\n"); - ENA_TIMER_RESET(adapter); - return (rc); }