From nobody Sat Dec 31 12:29:17 2022 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 4NkhJY4ZqMz2nM9M; Sat, 31 Dec 2022 12:29:17 +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 4NkhJY3QnYz4Kbg; Sat, 31 Dec 2022 12:29:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672489757; 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=dcJ5yzT7etwcvkzmrZYgUrF+Lgqh66Ku+ADSWk/Lefk=; b=Huz2GOg5xpjNfgZXtVrmwEZW8/54wybajkZKyPdd5IwHVOchjH0J0iuIPXbZgKPpxS+aac eCqAWMDbsJL0e834JWWyXXy9sxv34rb3liNXO/+kct+MWFgIOJmPEBjJAd4u9liQRzkT9l l10+zz0sDbb74WTZ+vUrjhPdKPK239gS0be0lEWPs9f28zNR9lqes7XjL+Y6yA03S+DJh4 KoHDhbNuZJUUYTZn8F1DtHRHXmJlkfkYHoe6XrMvq24vM1fHi23BTacbZyHCCb7zIqxRz/ R+KsGbCFy28yqdDqLQ2R5B5by5+F7KypT+iUwsUn5mV4T0K140RVw9SD9iUDzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672489757; 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=dcJ5yzT7etwcvkzmrZYgUrF+Lgqh66Ku+ADSWk/Lefk=; b=XG+55PKKaOjnRY129UQ1MgyatAOSPQsWEQpsxE0ySyvfgVuZoBlQk8VYT9HEkRvJqi0O4D 1eawTAaZhVXGlJW6yjAKGx7WOCwhbE/2y9SSjp1b8cV/5tYzCMwBbFJhYVirPh2JRzsbtg YIB9ETMVxpDiURIr68d/gBjHJ23o4EoTsDgTA4iKjqYSsib1OAyU1Ku3P+uRmeKuBGzFUU Bfy8QL6vYvFlx4qagvxLUqkiMQS4Z/4u9gnP6CNmwp97f9iEsnSB7DPpaDVrsT73h8zSLy ZLuRccVmmRWQHihHq5Q1yV3KW07omYmK1+IKJz07yO1NwDKxQs8cWdDnJAbwqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672489757; a=rsa-sha256; cv=none; b=VLs8pqWbuiUGt2PSFBLovv8vaWh+dJ2c/yLN6v+2L6E+z582GRyfVO5bnyNUXDHqlFl1My f4hOBzgrGH6PzWvsKqla5/s2QI6UuPj3E+KAvArBF5Jy90uofVPoPhIjz7gztvskYsOO60 8nfV+ZoB3KuACJuArsNAnIHXCzj7Ljgr1z60+HbQ1cVb5lMhY46gti9OENFtJj6RikmgIx UInagnNN/Qy6qJVxJvqCOusOSVo0TOG8Tbgyh3SxIMBYL7g6T264+gYaUaq/z6De7IIOrb 7Dn96E2IvIdA/2sp8ifDP5yK51VsBsmK/RIH+RSySmAOHk4CQDU5UCHLH21GJQ== 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 4NkhJY28w2znSh; Sat, 31 Dec 2022 12:29:17 +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 2BVCTH3N070023; Sat, 31 Dec 2022 12:29:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BVCTHp8070022; Sat, 31 Dec 2022 12:29:17 GMT (envelope-from git) Date: Sat, 31 Dec 2022 12:29:17 GMT Message-Id: <202212311229.2BVCTHp8070022@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Vincenzo Maffione Subject: git: a74ed1442347 - stable/12 - monitor: fix cb restore when monitored adapter unregisters 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: vmaffione X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: a74ed14423470a4ef5dec5dfe0b448994fe6a399 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by vmaffione: URL: https://cgit.FreeBSD.org/src/commit/?id=a74ed14423470a4ef5dec5dfe0b448994fe6a399 commit a74ed14423470a4ef5dec5dfe0b448994fe6a399 Author: Vincenzo Maffione AuthorDate: 2022-12-24 15:28:45 +0000 Commit: Vincenzo Maffione CommitDate: 2022-12-31 12:14:13 +0000 monitor: fix cb restore when monitored adapter unregisters netmap_monitor_stop() called nm_monitor_none() after the head of the zero-copy monitors had been reset, thus thinking that there was nothing left to do. MFC after: 7 days (cherry picked from commit b41818a28a6dba6d33076fbb789442308e57a124) --- sys/dev/netmap/netmap_monitor.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/dev/netmap/netmap_monitor.c b/sys/dev/netmap/netmap_monitor.c index 1f5ff65b3b81..aabf23b0397a 100644 --- a/sys/dev/netmap/netmap_monitor.c +++ b/sys/dev/netmap/netmap_monitor.c @@ -456,6 +456,9 @@ netmap_monitor_stop(struct netmap_adapter *na) struct netmap_zmon_list *z = &kring->zmon_list[t]; u_int j; + if (nm_monitor_none(kring)) + continue; + for (j = 0; j < kring->n_monitors; j++) { struct netmap_kring *mkring = kring->monitors[j]; @@ -468,6 +471,8 @@ netmap_monitor_stop(struct netmap_adapter *na) } kring->monitors[j] = NULL; } + kring->n_monitors = 0; + nm_monitor_dealloc(kring); if (!nm_is_zmon(na)) { /* we are the head of at most one list */ @@ -488,12 +493,7 @@ netmap_monitor_stop(struct netmap_adapter *na) z->prev = NULL; } - if (!nm_monitor_none(kring)) { - - kring->n_monitors = 0; - nm_monitor_dealloc(kring); - nm_monitor_restore_callbacks(kring); - } + nm_monitor_restore_callbacks(kring); } } }