From nobody Sat Apr 08 19:44:47 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 4Pv5Kr3FrWz44npx; Sat, 8 Apr 2023 19:44:48 +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 4Pv5Kr1KT3z43hH; Sat, 8 Apr 2023 19:44:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680983088; 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=u9ywsgsDj8caEGjo29Ek5cCO2L/eFTFgdqFoFqgByTQ=; b=VWnjDMgvQko7QwrXpuyP6Gclob7Ox9diyNuO7VPrzOLyEsugkb6/Ze6wJSYVHs397mGl8l chFjEzgSWw4c0+tfVelyf156rRPXdE0oBiSJkpSZSed9qgu1LQFFvnxUDQ4Ju1mGYPxU8L hXz9fOw7U0MXFECfcI+k6NewtQk10tNJ0kgJ1COyz12tjs2RJVdHavJVQg6OW9FU9RMSwu u7sW/kk5Ktgx/t5v4oEcPZXC7ajFK6Y06/IizgSvykg1EkS2whEzUsZMQf9eRNZY3xr/8R f4qMrB5XmK0trFWyZxJcRJm7Z4hQ7ciKaKenAryVr8mO23CWWdcLSWQQpTN6lQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680983088; 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=u9ywsgsDj8caEGjo29Ek5cCO2L/eFTFgdqFoFqgByTQ=; b=JPRzvhKbcg56TqYCMzvVnKhu17qT5LVA153/pqgFN3furjtPRUYczWsddLFlHoUwuxZrpI gK3u060yGw1/A+mFUV83BXElM+IGCIGRMuDPQJkfVT1+w5CqEr5d0CmdDsP1Cs8f+stjZo 9YM3+zP8NUKpZCyBKVraHCSnblcdDu6J5AwJC373B9pdOVWVSS0Ml3da1ROFImXDzzIYp7 8SEdV1HeUKa8RRel+lj97m93PBYhM0E1c6d3pVZe1cmuXmuBc66w8cKFMQBcVzECXX5n5D UTetraQxsz/mZR5reXpRSot9bqcgDBaL+H6Tl+q7R10OxsfPr7cN5zzrrmdztg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680983088; a=rsa-sha256; cv=none; b=actxiH7p5AbxceHnHzyQfoiH+w8erwwN1nZSa0pMCccxUFZ5QAdP1L+Ifj6p0UqSNhXl5Z PnibC3s7AM624qWQvgIUC0dE7OZXSFYcIR/qSp85jK0MlmSOJJ9qbPmLd6L2cUEwPm0xT6 meOSqwMbkof1EereUmjYl4Y75pjP/peK8K1UQI8TtUSCjI13T4KhVfLR6C3aoZCiGNeFlr VfPQA7d0DobKj5aBb0bgi4zVBUJYIJjgCrFdZ3uS8Hhm4+qMg4HNX19JTUIEIXaPHe6UYo 10HKtm5MAwekuNtRQzHTtzhFaZtSPq2ftz0kZKa3Mqf2j1OaRbsEh6XkiFdqKw== 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 4Pv5Kq62xJzfsr; Sat, 8 Apr 2023 19:44:47 +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 338JilgM018646; Sat, 8 Apr 2023 19:44:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 338JilFT018645; Sat, 8 Apr 2023 19:44:47 GMT (envelope-from git) Date: Sat, 8 Apr 2023 19:44:47 GMT Message-Id: <202304081944.338JilFT018645@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: 4826b224097b - stable/13 - netlink: cleanup netlink_writer code 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: 4826b224097b857a161e3910afa77b89eee55c76 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=4826b224097b857a161e3910afa77b89eee55c76 commit 4826b224097b857a161e3910afa77b89eee55c76 Author: Alexander V. Chernikov AuthorDate: 2023-03-07 17:42:27 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-04-08 19:05:26 +0000 netlink: cleanup netlink_writer code * Remove unused nlattr_add_nla() - that's a duplicate of nlattr_add_raw(). * Calculate alignment only once in nlmsg_reserve_data_raw() MFC after: 2 weeks (cherry picked from commit 5c8277ec2588a660f126e1a9866cd65f59336c51) --- sys/netlink/netlink_message_writer.h | 31 ++++++------------------------- 1 file changed, 6 insertions(+), 25 deletions(-) diff --git a/sys/netlink/netlink_message_writer.h b/sys/netlink/netlink_message_writer.h index bb4bb759251a..13acf5add559 100644 --- a/sys/netlink/netlink_message_writer.h +++ b/sys/netlink/netlink_message_writer.h @@ -124,17 +124,19 @@ nlattr_set_len(const struct nl_writer *nw, int off) static inline void * nlmsg_reserve_data_raw(struct nl_writer *nw, size_t sz) { - if (__predict_false(nw->offset + NETLINK_ALIGN(sz) > nw->alloc_len)) { - if (!nlmsg_refill_buffer(nw, NETLINK_ALIGN(sz))) + sz = NETLINK_ALIGN(sz); + + if (__predict_false(nw->offset + sz > nw->alloc_len)) { + if (!nlmsg_refill_buffer(nw, sz)) return (NULL); } void *data_ptr = &nw->data[nw->offset]; - nw->offset += NLMSG_ALIGN(sz); + nw->offset += sz; return (data_ptr); } -#define nlmsg_reserve_object(_ns, _t) ((_t *)nlmsg_reserve_data_raw(_ns, NLA_ALIGN(sizeof(_t)))) +#define nlmsg_reserve_object(_ns, _t) ((_t *)nlmsg_reserve_data_raw(_ns, sizeof(_t))) #define nlmsg_reserve_data(_ns, _sz, _t) ((_t *)nlmsg_reserve_data_raw(_ns, _sz)) static inline int @@ -163,27 +165,6 @@ _nlmsg_reserve_attr(struct nl_writer *nw, uint16_t nla_type, uint16_t sz) } #define nlmsg_reserve_attr(_ns, _at, _t) ((_t *)_nlmsg_reserve_attr(_ns, _at, NLA_ALIGN(sizeof(_t)))) -static inline bool -nlattr_add_nla(struct nl_writer *nw, const struct nlattr *nla_src) -{ - MPASS(nla_src->nla_len >= sizeof(struct nlattr)); - - int required_len = NLA_ALIGN(nla_src->nla_len); - if (__predict_false(nw->offset + required_len > nw->alloc_len)) { - if (!nlmsg_refill_buffer(nw, required_len)) - return (false); - } - - struct nlattr *nla = (struct nlattr *)(&nw->data[nw->offset]); - if ((nla_src->nla_len % 4) != 0) { - /* clear padding bytes */ - bzero((char *)nla + nla_src->nla_len - 4, 4); - } - memcpy(nla, nla_src, nla_src->nla_len); - nw->offset += required_len; - return (true); -} - static inline bool nlattr_add(struct nl_writer *nw, int attr_type, int attr_len, const void *data) {