From nobody Sat Dec 24 15:30:32 2022 X-Original-To: dev-commits-src-main@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 4NfSfw4k16z1HDGC; Sat, 24 Dec 2022 15:30:32 +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 4NfSfw490jz3Clc; Sat, 24 Dec 2022 15:30:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671895832; 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=/pH8vmA1vf0Hf0VQDS75Q1EM1ELiw3RRpNvYrjbjsZ4=; b=CQPiSaA3557fIbkIY0r484EMNWxlIepyi8G36ZeyULeS2hfRkL2JnPBs1ScvzQI6n0xZd9 oS5os3AwYDXTLlw0lcr4Pxmd37Co1QdUKdCqdF7NgUC3IYzC/cyw7J5ME+F5gD0+ub+HH0 BBmxA1tS3XQkVjI7mXcFZ1Q/sufQDgjmhMur6BINIPaE0RZPKi7YEpMW8HEttmm58peIu4 QlXVsYCZ2PwbJ+EoHR8p11n/uPKKahfCyFJgOzWP6Ie17sJVS4WBfN2w4zyaVFsOPheu2X +kVoc15+UxkCPv2eAOos3QIJaXKRdJy7W8IIK0Nyq4FnUq/BpoL7qLF+sBvkgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671895832; 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=/pH8vmA1vf0Hf0VQDS75Q1EM1ELiw3RRpNvYrjbjsZ4=; b=ap5KcN42Zp/2r8uSLjaFM99l2fkCGjHgd1WHlGdzbwsu+M7nLf6aNNLPtokkbs1/tYxOhO wf4RtFKQFVM033azAj2DSydnd00MVFrGztFRJnTUQatiWeR4j1Alsmjo134fZP8jcCVZZu 8vCOKJdWp8ZtHYLiWinIvX1Qlb/ZcacjPYT7XD+FdD3PFosXWuYVkk9hpUPNPiiHIhIHUY satA2bOgJrzrvPPLg/++ALOeCQsSBWiTdGd3uFPKUAAYZoXGdujQ1/n3ScBMb16EOvzeqz cCyVMZHbH4WUoeog0hbK9YpWDx5aMxqteu7iLOYZ5N893wl4KCTB+FfYZ2reNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671895832; a=rsa-sha256; cv=none; b=PC2sic4QOY+nAHU6Ec8QKWxD5WKL5DtVae4CEQ3qpAGmgwh/Xcl7Z6LqWeAk5eecYgcoWZ LLXkZ3asmbz/BB3IFHkZAkuVg5SlD186RRydDICIVCZYV06fSUSdiAQ3SpEpcnTjMVqhEf QvUbDMkoM+wD5XRxA0/1iFVab2+Vwl2BrdzL9b/Bxhtgvglw7+IOHADy3kwazpVtgsBnTe yBGrjGfCHV3z9a+F+AK0frbCjETD/vYeGwfbsgyp9azQjT9IfJsFCzu6aUSuaLa55GoE5t ZaXa1vjzAnAf31ndUc6WG6/Kst021/CPPwkDf6Spl2o1kZigivIIGdhrcJ+8mA== 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 4NfSfw37hqzJWN; Sat, 24 Dec 2022 15:30:32 +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 2BOFUW3Z083415; Sat, 24 Dec 2022 15:30:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BOFUWkQ083414; Sat, 24 Dec 2022 15:30:32 GMT (envelope-from git) Date: Sat, 24 Dec 2022 15:30:32 GMT Message-Id: <202212241530.2BOFUWkQ083414@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vincenzo Maffione Subject: git: b41818a28a6d - main - monitor: fix cb restore when monitored adapter unregisters List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: b41818a28a6dba6d33076fbb789442308e57a124 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by vmaffione: URL: https://cgit.FreeBSD.org/src/commit/?id=b41818a28a6dba6d33076fbb789442308e57a124 commit b41818a28a6dba6d33076fbb789442308e57a124 Author: Vincenzo Maffione AuthorDate: 2022-12-24 15:28:45 +0000 Commit: Vincenzo Maffione CommitDate: 2022-12-24 15:28:45 +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 --- 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 e05313c1f792..9f94bed056a1 100644 --- a/sys/dev/netmap/netmap_monitor.c +++ b/sys/dev/netmap/netmap_monitor.c @@ -458,6 +458,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]; @@ -470,6 +473,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 */ @@ -490,12 +495,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); } } }