From nobody Sat Feb 22 02:51:41 2025 X-Original-To: dev-commits-src-all@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 4Z0BNF3xqGz5ntwn; Sat, 22 Feb 2025 02:51:41 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z0BNF28bXz3n0p; Sat, 22 Feb 2025 02:51:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740192701; 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=AX3665WIw9QzoSMWQTwQDVVz+ti1EFqoHODBQSL3dgY=; b=j0ZUjqtJfxxB/vnYFsPptTfDu1WYrcF4d4/dXFwEUgaOJk9nMyRiJaLSMTDYYV1RowWWIO QFwuyimOkqdbUkJ2GamVla2YjxVDkSeDhiZTQzXttuTykA9iswDFdUfUBOC4srDOgn5ncU aDSAYl2bU6Qau9cOyA1zSTl8Jr14zIFpVWnQZIvkBh9PPj+6mmrPdxXMB40sVoP5fYhk33 7K3tAlYsWk90B/50Nz8xFmUgzNi6HoWkP3FOaz/LcHUUUh1rjwHlFgpLV+RvkeqlQ8+a8p u/d7VX5NH0vVrG5InkMgbyEdZNuQwezYsKK3zxTJ/cSayX+zPROYfuvtxAvTPg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740192701; a=rsa-sha256; cv=none; b=oNcGdIA2FURB9t8oq9vssDnP2PQv1kRVdF6koqvII4nCwfVNiDOZFz9Y+sTXiNHNFxHh9V L6SJSXWAYVxNdTxngIeQ+wF+QT1ApuqqNxakQjxhnS3eCCWEiGMLzHhWhLrmuWKRnP9tZ0 x5Mk3F2oVYiH9Ws1HK2CXoH9rpUDhqVgu/F4YmrD7DxxHLHP2oz0OSkwBID0Mk4BsS2Wjo 4goYjBs29Ev4mJEc4tBRafOwYVGc3Bc7ECE0K8SlFviEykj81TdKw1hk8NpG4Yimwc1cjd x4tmSGj0pfaLfIwxTQPxWcw4SekTb6R2TgU8NycxAWwB6t0dOJwDAepjXRApAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740192701; 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=AX3665WIw9QzoSMWQTwQDVVz+ti1EFqoHODBQSL3dgY=; b=qGhr7umwWz6vXzRTwjb9DPF0kugJpE8OGRveAN4S41nrpGekEXskGKM34g50Lf8qMkilaz IkUHrvJ9HqtCyAqWXpfJ/Blg08hfBWzus7Nv3dwFwad7P2Wn8D6ibKWXRzTJrkv4k4ljWf WrvlxTLwdc8A6Lf7Fztc2jCY655+vXJbxl0/NznGd0oGi6+y2uUFEjfHb6svG4jEKQ2iYp KVYjVwUpMNiRTsHXhnGnu1UEOPxtJgnRF928QQ3TUdl3lGAmNjBMUHz5Ddl3/KbveYjWM7 qZLroMktV8MLXo7kt38fIzctuJUnGTHt/NuetuKQh7/86y+ySVSyejRQbVVhHw== 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 4Z0BNF1Q9hzq52; Sat, 22 Feb 2025 02:51:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51M2pf3W069866; Sat, 22 Feb 2025 02:51:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51M2pfle069863; Sat, 22 Feb 2025 02:51:41 GMT (envelope-from git) Date: Sat, 22 Feb 2025 02:51:41 GMT Message-Id: <202502220251.51M2pfle069863@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 43339e7fc8a0 - stable/14 - bnxt_en: Improve sysctl handler bnxt_dcb_list_app() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 43339e7fc8a0b07a532015878c5e4f5f36ae8400 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=43339e7fc8a0b07a532015878c5e4f5f36ae8400 commit 43339e7fc8a0b07a532015878c5e4f5f36ae8400 Author: Zhenlei Huang AuthorDate: 2025-02-14 10:38:30 +0000 Commit: Zhenlei Huang CommitDate: 2025-02-22 02:50:55 +0000 bnxt_en: Improve sysctl handler bnxt_dcb_list_app() Prefer sbuf_new_for_sysctl() over error-prone manually managed buffer. No functional change intended. Reviewed by: markj Tested by: Daniel Porsch MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D48496 (cherry picked from commit 91bae242bc54856c560557b5ba245df94d570e95) --- sys/dev/bnxt/bnxt_en/bnxt_sysctl.c | 44 +++++++++++++++----------------------- 1 file changed, 17 insertions(+), 27 deletions(-) diff --git a/sys/dev/bnxt/bnxt_en/bnxt_sysctl.c b/sys/dev/bnxt/bnxt_en/bnxt_sysctl.c index 671ceef570f4..5a2e3f656278 100644 --- a/sys/dev/bnxt/bnxt_en/bnxt_sysctl.c +++ b/sys/dev/bnxt/bnxt_en/bnxt_sysctl.c @@ -1872,7 +1872,7 @@ bnxt_pfc_get_string(struct bnxt_softc *softc, char *buf, struct bnxt_ieee_pfc *p buf += sprintf(buf, "none"); } -static char *bnxt_get_tlv_selector_str(uint8_t selector) +static const char *bnxt_get_tlv_selector_str(uint8_t selector) { switch (selector) { case BNXT_IEEE_8021QAZ_APP_SEL_ETHERTYPE: @@ -1887,24 +1887,23 @@ static char *bnxt_get_tlv_selector_str(uint8_t selector) } static void -bnxt_app_tlv_get_string(struct bnxt_softc *softc, char *buf, - struct bnxt_dcb_app *app, int num) +bnxt_app_tlv_get_string(struct sbuf *sb, struct bnxt_dcb_app *app, int num) { - uint32_t i; + int i; - if (!num) { - buf += sprintf(buf, " None"); + if (num == 0) { + sbuf_printf(sb, " None"); return; } - buf += sprintf(buf, "\n"); + sbuf_putc(sb, '\n'); for (i = 0; i < num; i++) { - buf += sprintf(buf, "\tAPP#%0d:\tpri: %d,\tSel: %d,\t%s: %d\n", - i, - app[i].priority, - app[i].selector, - bnxt_get_tlv_selector_str(app[i].selector), - app[i].protocol); + sbuf_printf(sb, "\tAPP#%0d:\tpri: %d,\tSel: %d,\t%s: %d\n", + i, + app[i].priority, + app[i].selector, + bnxt_get_tlv_selector_str(app[i].selector), + app[i].protocol); } } @@ -1937,25 +1936,16 @@ bnxt_ets_get_string(struct bnxt_softc *softc, char *buf) static int bnxt_dcb_list_app(SYSCTL_HANDLER_ARGS) { + struct sbuf sb; struct bnxt_dcb_app app[128] = {0}; struct bnxt_softc *softc = arg1; int rc, num_inputs = 0; - char *buf; - -#define BNXT_APP_TLV_STR_LEN 4096 - buf = malloc(BNXT_APP_TLV_STR_LEN, M_DEVBUF, M_NOWAIT | M_ZERO); - if (!buf) - return ENOMEM; + sbuf_new_for_sysctl(&sb, NULL, 128, req); bnxt_dcb_ieee_listapp(softc, app, nitems(app), &num_inputs); - bnxt_app_tlv_get_string(softc, buf, app, num_inputs); - - rc = sysctl_handle_string(oidp, buf, BNXT_APP_TLV_STR_LEN, req); - if (rc || req->newptr == NULL) - goto end; - -end: - free(buf, M_DEVBUF); + bnxt_app_tlv_get_string(&sb, app, num_inputs); + rc = sbuf_finish(&sb); + sbuf_delete(&sb); return rc; }