From nobody Mon Mar 6 16:35:05 2023 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 4PVkhH1CxJz3w67M; Mon, 6 Mar 2023 16:35:11 +0000 (UTC) (envelope-from rpokala@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PVkhH0WXvz3xWF; Mon, 6 Mar 2023 16:35:11 +0000 (UTC) (envelope-from rpokala@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678120511; 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: in-reply-to:in-reply-to:references:references; bh=xI7JzLh5T76CthAOSUB6s1l5E6zqND0QeeV4wm8pnfg=; b=PL5WEnzv9MpsWSnHPPNNTjbnanvxHF0tFZiFzZbojhXpnayAES9sq1oCw9qKz11szng2Zo Lpyb5c9LV5ZHcRQIPt/Xfhqw6Tzld0QCfgSeb1R13x4ntLxoeSOEbZrqwHYoRQH2H+GYIw FxJmPi3rVxOKD83Y05AvBjDLyCRSlA2XZT1vQi5dIZydkTbQNY8GY4ly72VH8SGXhea0Ds DObjT6v7oqKhON+LvrqWbZcPXXLiNb4908SpTp5N94cv5m1HuWLOEaJ5ULvZPoFIsukjw9 DiNsTRiX5zZsvdbjBJ5NeJ4KRa5LyBYkHxvcI8noMOWsIxzN4j7hAGhNsolyUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678120511; 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: in-reply-to:in-reply-to:references:references; bh=xI7JzLh5T76CthAOSUB6s1l5E6zqND0QeeV4wm8pnfg=; b=OXSAs5e46iXdg47VxTJBGzzafwgobAq5SOWVfDF5u7t7CvL8Mc9T4rRZpybVQC4k7S2CUe AlXkXGGR8YtHuoIzFhHwWCAym+D7HYt89JFvEuKW9GBnGb02nMsG/ZwPjWUHSM94a+rLPZ uLSO53SLo1wqGKq+NR0HkN+MxOTQamtUEEXsHMieHrL41kRqu0OOtyhXYFnKLYicPXWXGU VhaTWoxsoL0H4NvcYOJmbhIl3IrHyEwwKX+E9tEzIZwsEwhAIonSR/bOhwyV03VpOG48Yx xJZgp1KfLPV+N0KiQpBnKtu+fa2CqAuT84BrhabY23RWZpZKmj+48Hf0mSeb3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678120511; a=rsa-sha256; cv=none; b=CNkNh2PQAh3MpzaaT2V6psmJjD/NrPfwMEFI8lQcIsSpwlaa7nXSrzLWkr1zuLsoK+Py7p IsUmcN98bNT1oD+lp+0muQk4TmlBfEL8Q+R6t9PkYEIFG52AcTjcL5/KJMALRxiGNNG2W6 /Zm3lUkIk5caRTCwetf7rq5zqX9bJNwRZsPX9Q+e/XzPhuFtiG6Yizk5Qf65Bkj43UR79L AL1AGu5g8EXES9JhSagm62NHj/iA8/GgGNLlxANldoMbMIud7wxIZfMDwV9ErRzvnISoSA 6fgnMUziQ2xOoy/s59SRh8H9NAYWAxUkgpqobfofnOmvQq9Jr0xSpu9LiigNMw== Received: from [192.168.1.10] (unknown [98.42.164.217]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: rpokala) by smtp.freebsd.org (Postfix) with ESMTPSA id 4PVkhG30HCz18CV; Mon, 6 Mar 2023 16:35:10 +0000 (UTC) (envelope-from rpokala@freebsd.org) User-Agent: Microsoft-MacOutlook/16.70.23021201 Date: Mon, 06 Mar 2023 08:35:05 -0800 Subject: Re: df2b419a4105 - main - ifnet: add if_foreach_sleep() to allow ifnet iterations with sleep. From: Ravi Pokala To: "Alexander V. Chernikov" , , , Message-ID: Thread-Topic: df2b419a4105 - main - ifnet: add if_foreach_sleep() to allow ifnet iterations with sleep. References: <202303061508.326F8TiR076654@gitrepo.freebsd.org> In-Reply-To: <202303061508.326F8TiR076654@gitrepo.freebsd.org> 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: quoted-printable X-ThisMailContainsUnwantedMimeParts: N Hi Alexander, Knowing ~nothing about ifnet, if I were to see 'if_foreach_sleep()', my fir= st thought would be that the loop itself was sleeping between each iteration= , not that the callback was allowed to sleep. Perhaps this should be renamed= to 'if_foreach_sleepable()'? Just a thought. Thanks, Ravi (rpokala@) =EF=BB=BF-----Original Message----- From: > on behalf of "Alexander V. Chernikov" > Date: 2023-03-06, Monday at 07:08 To: >, >, > Subject: git: df2b419a4105 - main - ifnet: add if_foreach_sleep() to allow = ifnet iterations with sleep. The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=3Ddf2b419a4105588384a89a57442ed6= c6ca002455 commit df2b419a4105588384a89a57442ed6c6ca002455 Author: Alexander V. Chernikov > AuthorDate: 2023-03-04 10:09:09 +0000 Commit: Alexander V. Chernikov > CommitDate: 2023-03-06 15:08:08 +0000 ifnet: add if_foreach_sleep() to allow ifnet iterations with sleep. Subscribers: imp, ae, glebius Differential Revision: https://reviews.freebsd.org/D38904 --- sys/net/if.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ sys/net/if_var.h | 2 ++ 2 files changed, 67 insertions(+) diff --git a/sys/net/if.c b/sys/net/if.c index 58711061eb5e..f3ef822178ff 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -4535,6 +4535,71 @@ if_foreach(if_foreach_cb_t cb, void *cb_arg) return (error); } +/* + * Iterates over the list of interfaces, permitting callback function @cb = to sleep. + * Stops iteration if @cb returns non-zero error code. + * Returns the last error code from @cb. + * @match_cb: optional match callback limiting the iteration to only match= ed interfaces + * @match_arg: argument to pass to @match_cb + * @cb: iteration callback + * @cb_arg: argument to pass to @cb + */ +int +if_foreach_sleep(if_foreach_match_t match_cb, void *match_arg, if_foreach_= cb_t cb, + void *cb_arg) +{ + int match_count =3D 0, array_size =3D 16; /* 128 bytes for malloc */ + struct ifnet **match_array =3D NULL; + int error =3D 0; + + MPASS(cb); + + while (true) { + struct ifnet **new_array; + int new_size =3D array_size; + struct epoch_tracker et; + struct ifnet *ifp; + + while (new_size < match_count) + new_size *=3D 2; + new_array =3D malloc(new_size * sizeof(void *), M_TEMP, M_WAITOK); + if (match_array !=3D NULL) + memcpy(new_array, match_array, array_size * sizeof(void *)); + free(match_array, M_TEMP); + match_array =3D new_array; + array_size =3D new_size; + + match_count =3D 0; + NET_EPOCH_ENTER(et); + CK_STAILQ_FOREACH(ifp, &V_ifnet, if_link) { + if (match_cb !=3D NULL && !match_cb(ifp, match_arg)) + continue; + if (match_count < array_size) { + if (if_try_ref(ifp)) + match_array[match_count++] =3D ifp; + } else + match_count++; + } + NET_EPOCH_EXIT(et); + + if (match_count > array_size) { + for (int i =3D 0; i < array_size; i++) + if_rele(match_array[i]); + continue; + } else { + for (int i =3D 0; i < match_count; i++) { + if (error =3D=3D 0) + error =3D cb(match_array[i], cb_arg); + if_rele(match_array[i]); + } + free(match_array, M_TEMP); + break; + } + } + + return (error); +} + u_int if_foreach_lladdr(if_t ifp, iflladdr_cb_t cb, void *cb_arg) { diff --git a/sys/net/if_var.h b/sys/net/if_var.h index c9b2de736d10..3e4d6c883c13 100644 --- a/sys/net/if_var.h +++ b/sys/net/if_var.h @@ -680,7 +680,9 @@ typedef u_int if_addr_cb_t(void *, struct ifaddr *, u_i= nt); u_int if_foreach_addr_type(if_t ifp, int type, if_addr_cb_t cb, void *cb_ar= g); typedef int (*if_foreach_cb_t)(if_t, void *); +typedef bool (*if_foreach_match_t)(if_t, void *); int if_foreach(if_foreach_cb_t, void *); +int if_foreach_sleep(if_foreach_match_t, void *, if_foreach_cb_t, void *); /* Functions */ void if_setinitfn(if_t ifp, if_init_fn_t);