From nobody Sat Apr 08 19:44:48 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 4Pv5Ks574Kz44nXd; Sat, 8 Apr 2023 19:44: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 4Pv5Ks2623z43kw; Sat, 8 Apr 2023 19:44:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680983089; 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=13sLaudLbXwAWJMtEgGbsRgGiE2cuDhlgCbpj+lU4ig=; b=L04Xa08OLBPGwghy0sTQAWnGkXwUJtyTHb6RoJLLhEJeLf8SkhIfJBie6C9a3s5qGrrTt1 dVMhnjIrhg7gAIIG7DLmwoQExAUnFBpaNY5TwJkQLabGTXTvqoALPzWFnLPh3IL2FFHgsr 4aWQiX/W6b7QGWmYEkr0/QPa9c6c4VzsCsV7JzDk4eSmogRyHAm5qouiE0KOAvtgWLUFBS pLHVeO+0oF5lh2ByFV4LDGgJwSN67LjJY4YxFlQrMohB30KADps6DAOxdE5D2MlBwE7oP8 yLtOswZv1S5X+mwepBVs1WNJYTq5ONapZUTOrmut6AXPzWCbUoOlEgcjWX4YZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680983089; 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=13sLaudLbXwAWJMtEgGbsRgGiE2cuDhlgCbpj+lU4ig=; b=l6vMCuC3Q6xAjOCYpGc54GHoZYeZ/g3b3o1MvG2d9uqxVZnoEBF2h7n+T2riivhkGBtalD D0XGSMbnnh1WQPlqTnif1ao5NGohQRxZpFtFb4hcEYKvL4fAC58WX+qJskOhv+20nD5EGR f6rley+fwjzofCyJq6ZL6qiskyL+5gEn8WYblZVFJqOL6BFSo5h5f+7GY8BPUogdPLgU/o M0MpIhaWgO9gLGU2y/NJz4boIGImfKUUXr2SQ/7CHcsWeVObYcTtXOEJbJnDaZ0mH872AH 4yHELSBdAbvnWNSMfhZeEHGKsRGNEYOIZ8rDREIBSIxY7qulim3zECPuFgMQ+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680983089; a=rsa-sha256; cv=none; b=wfde1THwLR45/Hc/yWa1peLE45SZAzZQLSdyBATaiqpzSHq8wlj43lLWdbnPvISpIi+ETz 2zhAUbMC9eTnhrkM5ZFZjQvxJ5XhwBc74MxX9zdUFghk12/cLrC8RiSJ0C4rVW01Lc0NvU j7IocSEFdURJN9/6NlIgGha3sq+CBFQ+Jx9l4xH4ESY7CmqyyeVloG51dlk9tH64i+c4EN 3rwuvhWBBBATEwc35IAhNeoMnFkF7f38kc1o49XOrz2vKTFkZLeuGb3TJsg/cnpNnmX9UK F8U4fkSMbswXk5+G3uOxr5hD3EdAZqV5JoFBmzJLsUU3Rb5+7Crs2XKK9JrKLw== 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 4Pv5Kr6XdzzfxY; Sat, 8 Apr 2023 19:44:48 +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 338JimRi018672; Sat, 8 Apr 2023 19:44:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 338Jim9e018671; Sat, 8 Apr 2023 19:44:48 GMT (envelope-from git) Date: Sat, 8 Apr 2023 19:44:48 GMT Message-Id: <202304081944.338Jim9e018671@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: d1c4e56772f8 - stable/13 - netlink: make snl(3) scratch buffer growable 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: d1c4e56772f804065d7f06c7a6b9d8accccb9d4a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=d1c4e56772f804065d7f06c7a6b9d8accccb9d4a commit d1c4e56772f804065d7f06c7a6b9d8accccb9d4a Author: Alexander V. Chernikov AuthorDate: 2023-03-08 11:17:43 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-04-08 19:05:34 +0000 netlink: make snl(3) scratch buffer growable Differential Revision: https://reviews.freebsd.org/D38946 MFC after: 2 weeks (cherry picked from commit 0679eb1f39aa798da6c4601bb06bab4c175c4b18) --- sys/netlink/netlink_snl.h | 90 ++++++++++++++++++++++++++++++++++++----------- 1 file changed, 69 insertions(+), 21 deletions(-) diff --git a/sys/netlink/netlink_snl.h b/sys/netlink/netlink_snl.h index d88808ea6d3b..3c63e3f95419 100644 --- a/sys/netlink/netlink_snl.h +++ b/sys/netlink/netlink_snl.h @@ -70,11 +70,31 @@ #define NL_ARRAY_LEN(_a) (sizeof(_a) / sizeof((_a)[0])) struct linear_buffer { - char *base; /* Base allocated memory pointer */ - uint32_t offset; /* Currently used offset */ - uint32_t size; /* Total buffer size */ + char *base; /* Base allocated memory pointer */ + uint32_t offset; /* Currently used offset */ + uint32_t size; /* Total buffer size */ + struct linear_buffer *next; /* Buffer chaining */ }; +static inline struct linear_buffer * +lb_init(uint32_t size) +{ + struct linear_buffer *lb = calloc(1, size); + + if (lb != NULL) { + lb->base = (char *)(lb + 1); + lb->size = size - sizeof(*lb); + } + + return (lb); +} + +static inline void +lb_free(struct linear_buffer *lb) +{ + free(lb); +} + static inline char * lb_allocz(struct linear_buffer *lb, int len) { @@ -101,7 +121,7 @@ struct snl_state { size_t datalen; uint32_t seq; bool init_done; - struct linear_buffer lb; + struct linear_buffer *lb; }; #define SCRATCH_BUFFER_SIZE 1024 @@ -145,6 +165,45 @@ static const struct snl_hdr_parser _name = { \ } +static inline void * +snl_allocz(struct snl_state *ss, int len) +{ + void *data = lb_allocz(ss->lb, len); + + if (data == NULL) { + uint32_t size = ss->lb->size * 2; + + while (size < len + sizeof(struct linear_buffer)) + size *= 2; + + struct linear_buffer *lb = lb_init(size); + + if (lb != NULL) { + lb->next = ss->lb; + ss->lb = lb; + data = lb_allocz(ss->lb, len); + } + } + + return (data); +} + +static inline void +snl_clear_lb(struct snl_state *ss) +{ + struct linear_buffer *lb = ss->lb; + + lb_clear(lb); + lb = lb->next; + ss->lb->next = NULL; + /* Remove all linear bufs except the largest one */ + while (lb != NULL) { + struct linear_buffer *lb_next = lb->next; + lb_free(lb); + lb = lb_next; + } +} + static void snl_free(struct snl_state *ss) { @@ -152,8 +211,10 @@ snl_free(struct snl_state *ss) close(ss->fd); if (ss->buf != NULL) free(ss->buf); - if (ss->lb.base != NULL) - free(ss->lb.base); + if (ss->lb != NULL) { + snl_clear_lb(ss); + lb_free(ss->lb); + } } } @@ -181,9 +242,8 @@ snl_init(struct snl_state *ss, int netlink_family) return (false); } - ss->lb.size = SCRATCH_BUFFER_SIZE; - ss->lb.base = calloc(1, ss->lb.size); - if (ss->lb.base == NULL) { + ss->lb = lb_init(SCRATCH_BUFFER_SIZE); + if (ss->lb == NULL) { snl_free(ss); return (false); } @@ -191,18 +251,6 @@ snl_init(struct snl_state *ss, int netlink_family) return (true); } -static inline void * -snl_allocz(struct snl_state *ss, int len) -{ - return (lb_allocz(&ss->lb, len)); -} - -static inline void -snl_clear_lb(struct snl_state *ss) -{ - lb_clear(&ss->lb); -} - static inline bool snl_send(struct snl_state *ss, void *data, int sz) {