From nobody Sat Sep 24 20:14:49 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 4MZgGx4Ktlz4dRTF; Sat, 24 Sep 2022 20:14:49 +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 4MZgGx3ZHLz3cy4; Sat, 24 Sep 2022 20:14:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664050489; 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=kTjNaxUcOmKEYJ4wFu8Rvm1McqIlIxF9tarV4I2BzT0=; b=wlBMrklbMXUlhzQbAnVuMrCFC1QoGBn6sIf8x/dgl4sjVpba5I3ZXOLy9mCbhSvNLDo1rp eOBo6wAn1MERI9fOLzT0SjZlcU/geKqLbpsD6gMIaeCKMaS0EnxVBlmi7Vd8WHdAMRVX9l uk2IkuEMmO9AUdkhcbOQZD4PRwVzT0mXjqwxFoUFsIv57Q1YeavDgOBAdIL7HA5x1KirYu 3uAbDtyBbpIDu0Df2+113ytT0BVvXdnX6Yb2Zr54EsT4E48yCJXhyhMHt5Z+Y/YJTB+gaz 3tGxXwt7x9CpYsLrPyCIxMxgiJlNaBtkw0ftoKz76XtA8KcOHd2HOMjYu1VNng== 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 4MZgGx2PdTz1BBl; Sat, 24 Sep 2022 20:14:49 +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 28OKEn9i018933; Sat, 24 Sep 2022 20:14:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28OKEnSp018932; Sat, 24 Sep 2022 20:14:49 GMT (envelope-from git) Date: Sat, 24 Sep 2022 20:14:49 GMT Message-Id: <202209242014.28OKEnSp018932@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: 9a7c520a7811 - main - ifp: add if_setdescr() / if_freedesrt() methods 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: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9a7c520a7811a036a8140effb352f44ad5640c0e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664050489; 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=kTjNaxUcOmKEYJ4wFu8Rvm1McqIlIxF9tarV4I2BzT0=; b=RCMw6mCRX1Peb1avwHbBUTSjVK/OjzTF5SVHXe8NqKpP1jsjzNXT6YUOyd4BuCeRbFsE5J 7HqzjNYPGIpXft/nJNPG+6ZEyF4CLIU+4TNmWxaK6gKQB7+C9jZn3UCVfIwokCnkw6tw+G 2zMPcwoPhJtVRbzCqICNqucktttxMQYIeX3hnkqN/wSsJ8poQ1MDfyuyq6UFIzSN4RP9+2 UE3FZM5CJdJuLyaL+8rqd3rUbrfgohYANpPqOESNf5BTxSmS02TGqXO/3A19cREqMjJ6v5 7ebfNzVranT9SKgXVYuliIEOnOVIm/bx5QXDS0uEUNnnM9Gk6oJWFbtbS8vTCg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664050489; a=rsa-sha256; cv=none; b=gNnvcejEyi4N71KngsLSXx5ish3kM6SfIRFgACjdtiLis3hw152hr6vK0912sM70/yynZQ sF1LyrPXcfMemDssYIV/XwCGpOwF6TXcmdWez68vXtR5wUI/TzyArGgNG5MMLM+1ujdZ7+ Y/gFD5QP7+Feeb+lXOCwkGW1omdHs2K34PZZ0PbSUdM5HfPx+TbkUm9k+PIuGnX0JMcnkE xfUNjRm3g9ycmAWWdjaKMHSotEwFbRUr4LKYiN8mISaCKMbhwKecHjc8KYWiKxlN64hn/k mC9P0OmOt3bRGS/omD8HBebODRTEVyc6NqVNBaoNEjhK/Bx27baCuYBMrZvbvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=9a7c520a7811a036a8140effb352f44ad5640c0e commit 9a7c520a7811a036a8140effb352f44ad5640c0e Author: Alexander V. Chernikov AuthorDate: 2022-09-24 19:37:29 +0000 Commit: Alexander V. Chernikov CommitDate: 2022-09-24 19:42:42 +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 --- 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 ffaf7d004511..7446fb492436 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -653,7 +653,7 @@ if_free_deferred(epoch_context_t ctx) 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); } @@ -2478,7 +2478,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, nvbuflen; - char *descrbuf, *odescrbuf; + char *descrbuf; char new_name[IFNAMSIZ]; char old_name[IFNAMSIZ], strbuf[IFNAMSIZ + 8]; struct ifaddr *ifa; @@ -2615,18 +2615,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: @@ -4267,6 +4262,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 4f138f0368c0..ce36beadcfd5 100644 --- a/sys/net/if_var.h +++ b/sys/net/if_var.h @@ -739,6 +739,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);