From nobody Mon Feb 20 14:34:08 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 4PL4g52sPbz3stND; Mon, 20 Feb 2023 14:34:09 +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 4PL4g51Wpzz3vd0; Mon, 20 Feb 2023 14:34:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676903649; 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=KTNPBpvI2zjtC2RwjLnV977tN5rzw/iSGYsxFLwHnfc=; b=WFIRdh/2vTt0SKGyISk7THXDjIxH3HgpqLz7y3Uquy/U22HvbjVa2FE4VbhkGhvT38whOM wFYi6QCTj6GmVpxTZ9Rs3qB48wB+D/B3VXQr6POVx77JIQw5CckmKgNuZee54ZEIZcpooJ XJ51K7gNvN9eb/o8xSuRq2v/5sn6UWS0bnWMaT+ShHEFbPgkPAg28upOfxx9SjpOsq06Wf zTOSfoWeg8egzeW2pH0T7MLMv/PClklSX5nrDbYx3B8XAschRVVxdUGD5hvBvypxxh/r9S Qk6hhxx0HRTwxuY51x6pBDaYw+dKe041Oxw2FST2AUuC3mraIBUIPFVZdMfg8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676903649; 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=KTNPBpvI2zjtC2RwjLnV977tN5rzw/iSGYsxFLwHnfc=; b=BJXoJt48QKsGBKTQQbj3j6fbfxPmPEUOPnere5ggLG3UPRFVfdGT+Ean1oC1WgLiitrGzw Arkf+RnlqHFfnoX6ssKcrRPI8kkmBUEajr4kQE0Rv3Byu6SfmAcBFMuHaDqRKpwQ6OlQM4 49XiqDk4ZIj7nXrulDti8lodxc7oWx8TVyKEGBm1Um4lLwfJi5BVd2mDm55ZnEyklieSPF YQTgNek99EdR0sD96jzRGcJIQUGjRxPzBE2PLeMHD+xVv9lzBT6eH3dNE4EnDOgukhxFiy TxcqgfhdF7RQ4AhgsbMGwaZr7TXTjsSnwjvS2ikyLL3MOlU05+3PlnHYXenEUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676903649; a=rsa-sha256; cv=none; b=Jh40/Ujjg/kr9YFAWeDDZNyDLP+QBPYnMwBM3ucjQR15R6A2IxtnlBRrOKoGvS13cuPz7t Wy/V13Qs/1t5WJr8y1fHZbY0Dt2KMprrBzvjT/guh8mxi0LIA8J6Gkya/37AQKtF0JdR7t 4Efn90LjpGY9NKRzHGnUXejp1JSOazzhz0N/JAGO9NKSRzb6POTH2TH9lJgfgH9f6Jyofy UIR01YkkRne2rlhtkwmFobyjFuzMNkjXgmzAR92AlzdEvr8ztp3JfWw+/WV/T/7LxYKsaK lbSUh50zNzzE8C32NHYZbwDQCxxHBtU30guWepgxMnIts4bLFJ+HC73reCxucg== 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 4PL4g50Tc7zknD; Mon, 20 Feb 2023 14:34:09 +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 31KEY8i4005793; Mon, 20 Feb 2023 14:34:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31KEY8IF005792; Mon, 20 Feb 2023 14:34:08 GMT (envelope-from git) Date: Mon, 20 Feb 2023 14:34:08 GMT Message-Id: <202302201434.31KEY8IF005792@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: 4c1ef49999c6 - stable/13 - netlink: simplify temporary address allocation in rtnl_handle_getlink(). 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: 4c1ef49999c6687905664eecd73ea9473ffe5fda Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=4c1ef49999c6687905664eecd73ea9473ffe5fda commit 4c1ef49999c6687905664eecd73ea9473ffe5fda Author: Alexander V. Chernikov AuthorDate: 2023-02-17 17:57:44 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-02-20 14:33:28 +0000 netlink: simplify temporary address allocation in rtnl_handle_getlink(). MFC after: 3 days (cherry picked from commit 45356a1864c79680c6911b48a18b14a88a7d07fa) --- sys/netlink/route/iface.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/sys/netlink/route/iface.c b/sys/netlink/route/iface.c index 0eafacff4775..96f21a79a369 100644 --- a/sys/netlink/route/iface.c +++ b/sys/netlink/route/iface.c @@ -439,9 +439,8 @@ rtnl_handle_getlink(struct nlmsghdr *hdr, struct nlpcb *nlp, struct nl_pstate *n NL_LOG(LOG_DEBUG2, "Start dump"); - struct ifnet **match_array; - int offset = 0, base_count = 16; /* start with 128 bytes */ - match_array = malloc(base_count * sizeof(void *), M_TEMP, M_NOWAIT); + struct ifnet **match_array = NULL; + int offset = 0, base_count = 0; NLP_LOG(LOG_DEBUG3, nlp, "MATCHING: index=%u type=%d name=%s", attrs.ifi_index, attrs.ifi_type, attrs.ifla_ifname); @@ -452,14 +451,14 @@ rtnl_handle_getlink(struct nlmsghdr *hdr, struct nlpcb *nlp, struct nl_pstate *n if (offset >= base_count) { /* Too many matches, need to reallocate */ struct ifnet **new_array; - int sz = base_count * sizeof(void *); - base_count *= 2; - new_array = malloc(sz * 2, M_TEMP, M_NOWAIT); + /* Start with 128 bytes, do 2x increase on each realloc */ + base_count = (base_count != 0) ? base_count * 2 : 16; + new_array = malloc(base_count * sizeof(void *), M_TEMP, M_NOWAIT); if (new_array == NULL) { error = ENOMEM; break; } - memcpy(new_array, match_array, sz); + memcpy(new_array, match_array, offset * sizeof(void *)); free(match_array, M_TEMP); match_array = new_array; }