From nobody Mon Jan 23 22:12:28 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 4P148r2wNzz2t10p; Mon, 23 Jan 2023 22:12:28 +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 4P148r24CJz3N9S; Mon, 23 Jan 2023 22:12:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674511948; 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=4C+fRVo/90zui5AMMlzOQiP40LEGHI4UBMTRpBqfPFo=; b=qzwMy9S3NrFXXvIae4nsxc76o3lRyTTJ7M1d49dGHNCZ2Cbb7WGjnkTR1tB4HE5AJGQYzB 2RXb1nxicELikPT75XEpPvMkc3q63J//Lnz8gI9ZfAZ5YwjFkbVPmHMLMpBPUVee6cD7Hi /w/7d43PZUYoskyJbDASbPBq94mkjlGNyoEQDOn2Xw6gj2uw18K/it4IhCUHMlOeNMatKC PeMXaizaW2iUXDfsCWjJP6WVZg+HW6huXjdlzUCb52vTg/ag10YuMgZWkysOzJfVTc3hXo S/nSLjSmEcTL1/oVEVCWZDjQf6S744SSd5bxe7z+Kcjv7OmMqomszDnhWwRAEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674511948; 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=4C+fRVo/90zui5AMMlzOQiP40LEGHI4UBMTRpBqfPFo=; b=W9GcnDFwKOocnGNH9k0q6nb2Cuw1G4KVJp6tJvdiAFQmKcZDRZB/Y6n0aTrI8dJlsBoktt jV/WDG90lNLqVbDw4P2ovQNJRcu+ZwH8asx9YKWR+OapDI6+nUHFTVO5nU8/7g7XYHnB2z eKuRA8bb6eTBMUj3nr8mD2Ih1hS4vY3lvUcsCxWa8yJWTjflhMhloewvqXZofbvs+RR3ws mLYd8G4EkXgd4VqcKKNtsm6a5zYgfSNtcgpDfEqNSiGDnD/SW6wSrGn8QQyed/0Qb4RWDK 4nbF48Okgs4n4uwhzP6gSZFwaOzJFFL7W7mFFJKH3/ed7RBtax7BCCLfzp1wnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674511948; a=rsa-sha256; cv=none; b=MD2Gg0ivzxlMDGc5K3hp2s7rzybRlGSvieN1snMO2wnmDo1Qaw1JRYp3FOiYt+aW40xNwq BqM0EbZYqJeH222QNdycmasV/H++sfVkGUmBck14/NkeENnPee85YQNgjJ4EfWD7O1aZpf dm/sR8CoG7c81L49xwoiDpykXE4MKOnf4i3roF5DHdlc9uVhqtGgEMozgw3olKPt/WDo5+ lpdSPGjWpaByP/VxfxS6Rol7dF5Ws8e8B1Y6AqicjNK/rCSgXkaj9QQAXYSY5pglCMSlTo u7n4i77lbIy2JImFJSFFCIZB5hevE2UWCgKjklndQrfsawMcEdWIgDaYMHk4ew== 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 4P148r19ZNzlm6; Mon, 23 Jan 2023 22:12:28 +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 30NMCSIO017496; Mon, 23 Jan 2023 22:12:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30NMCSxq017495; Mon, 23 Jan 2023 22:12:28 GMT (envelope-from git) Date: Mon, 23 Jan 2023 22:12:28 GMT Message-Id: <202301232212.30NMCSxq017495@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: a9dcee4334b2 - stable/13 - ifp: add if_setdescr() / if_freedesrt() methods 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: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a9dcee4334b26c41ee3ce78ccb48d61ce21bc4f4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=a9dcee4334b26c41ee3ce78ccb48d61ce21bc4f4 commit a9dcee4334b26c41ee3ce78ccb48d61ce21bc4f4 Author: Alexander V. Chernikov AuthorDate: 2022-09-24 19:37:29 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-01-23 22:10:07 +0000 ifp: add if_setdescr() / if_freedesrt() methods Add methods for setting and removing the description from the interface, so the external users can manage it without using ioctl API. MFC after: 2 weeks (cherry picked from commit 9a7c520a7811a036a8140effb352f44ad5640c0e) --- sys/net/if.c | 30 +++++++++++++++++++++--------- sys/net/if_var.h | 2 ++ 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/sys/net/if.c b/sys/net/if.c index 7423c4963f57..813525c2e7bd 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -703,7 +703,7 @@ if_free_internal(struct ifnet *ifp) for (int i = 0; i < IFCOUNTERS; i++) counter_u64_free(ifp->if_counters[i]); - free(ifp->if_description, M_IFDESCR); + if_freedescr(ifp->if_description); free(ifp->if_hw_addr, M_IFADDR); free(ifp, M_IFNET); } @@ -2486,7 +2486,7 @@ ifhwioctl(u_long cmd, struct ifnet *ifp, caddr_t data, struct thread *td) int new_flags, temp_flags; size_t namelen, onamelen; size_t descrlen; - char *descrbuf, *odescrbuf; + char *descrbuf; char new_name[IFNAMSIZ]; struct ifaddr *ifa; struct sockaddr_dl *sdl; @@ -2578,18 +2578,13 @@ ifhwioctl(u_long cmd, struct ifnet *ifp, caddr_t data, struct thread *td) error = copyin(ifr_buffer_get_buffer(ifr), descrbuf, ifr_buffer_get_length(ifr) - 1); if (error) { - free(descrbuf, M_IFDESCR); + if_freedescr(descrbuf); break; } } - sx_xlock(&ifdescr_sx); - odescrbuf = ifp->if_description; - ifp->if_description = descrbuf; - sx_xunlock(&ifdescr_sx); - + if_setdescr(ifp, descrbuf); getmicrotime(&ifp->if_lastchange); - free(odescrbuf, M_IFDESCR); break; case SIOCGIFFIB: @@ -4157,6 +4152,23 @@ if_getcapenable(if_t ifp) return ((struct ifnet *)ifp)->if_capenable; } +void +if_setdescr(if_t ifp, char *descrbuf) +{ + sx_xlock(&ifdescr_sx); + char *odescrbuf = ifp->if_description; + ifp->if_description = descrbuf; + sx_xunlock(&ifdescr_sx); + + if_freedescr(odescrbuf); +} + +void +if_freedescr(char *descrbuf) +{ + free(descrbuf, M_IFDESCR); +} + /* * This is largely undesirable because it ties ifnet to a device, but does * provide flexiblity for an embedded product vendor. Should be used with diff --git a/sys/net/if_var.h b/sys/net/if_var.h index 48da169fd1d6..6738f00a4f08 100644 --- a/sys/net/if_var.h +++ b/sys/net/if_var.h @@ -708,6 +708,8 @@ int if_setcapenable(if_t ifp, int capenable); int if_setcapenablebit(if_t ifp, int setcap, int clearcap); int if_getcapenable(if_t ifp); const char *if_getdname(if_t ifp); +void if_setdescr(if_t ifp, char *descrbuf); +void if_freedescr(char *descrbuf); int if_setdev(if_t ifp, void *dev); int if_setdrvflagbits(if_t ifp, int if_setflags, int clear_flags); int if_getdrvflags(if_t ifp);