From nobody Wed Feb 5 18:09:22 2025 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 4Yp7Xy6xfCz5n7XT; Wed, 05 Feb 2025 18:09:22 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yp7Xy4hF5z3N7d; Wed, 05 Feb 2025 18:09:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738778962; 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=rRk3LFqD/e1KKnEEW+gzs5ih7yob0KmrmRwCmO5ZALY=; b=ya2630EJyfVErxD3Kqhdri0g9h+BPV5x3oC6Ftnz3b0IYjaEUEo4BONPygxOcD8vDp+y8i 29iRXHWFg4lg1cbZjOY8jaokGCoJtHmVXfLQAZBNwLsulUpTBCI1c0N9iEaSMi+k9Agf2z esXe338XFLaHR/PtTWq/iaVq71B9+MaE5MdjvasTK3Pr0YBPmJBSl+pU3/HrDubzwEdRnD LqmT3yA+DXioSKMNWHa2hjJKH2973FYNqs8DSjwmSJ/EkLRMkM4lfX8TfNCEZlyiZpy/W6 nMsawYJnetOoDlvbQe/5evVrtdKm2k3tSa751bQ0/9w8GFcNJd45cfLplT+VdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738778962; 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=rRk3LFqD/e1KKnEEW+gzs5ih7yob0KmrmRwCmO5ZALY=; b=yDNq9OSgGQiedaUjP1NgdAbcAivXshpQ8gmJuy/k6j8lRkCTMVMOlrsAPVMEbvM+Mm9YWg C+kOpxJcc223eKJLcim/8UtW86NGWJ3u0RTQ01YGTFNV7uDEUOKsXRYNKLnaXG/TbJuTKM y1ZCGXMyyPCCScgOJOMoU/dUe0l1DuLYuJmZLdvHtFsVhwB2HujI202qZvEveW0wVeFUxb +znw46bxlx81Cj0SVbHhtJxlwo9P1njf2KTpn4QHgLIy7H0CjtyykQHQMt25E2ncQNEwTl CzuZUkywpTJfRNBClWLGDCibBwUfKd9uo9eiJ3oXpxzdYbARJBRzMzcFYb602g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738778962; a=rsa-sha256; cv=none; b=QUgqESzWFqQfh/WSRk+sSWfbsAY7EL+IEUOx4Alnb6N2I/Km1mbFhoXfdQpGVcrgUdvLlD 84akpZIYPamrtalkVz7k86XKunYRKSD8/klEwsD0yf3ZAo84aR7CTrS9cJcuzJ7qF2Eyvu mL1N7wpk3Jn7wTu5iB0vejvMaGfdCZI0Wym/LhefNvCp02rnlQ8Q110jufM/e8SOaw2d+E QTM+G2gxVcP5hZhOdnnOFpmZL5xwdQj+v6a0hdoxjaTJGC0WPKNQTwX36vlhryqdB6aM/7 Qs/d8FAGk+YIPF+isc/QzmkNnLA/gJw9hWd+jpARZD9G5EvzwIfS4PCUxHpG+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Yp7Xy4Gq9z134T; Wed, 05 Feb 2025 18:09:22 +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 515I9MAG082605; Wed, 5 Feb 2025 18:09:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515I9McD082602; Wed, 5 Feb 2025 18:09:22 GMT (envelope-from git) Date: Wed, 5 Feb 2025 18:09:22 GMT Message-Id: <202502051809.515I9McD082602@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: ea03febed528 - main - netlink: fix a panic with verbose debugging printfs 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ea03febed52855247691ded13be97125fbf984f3 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=ea03febed52855247691ded13be97125fbf984f3 commit ea03febed52855247691ded13be97125fbf984f3 Author: Gleb Smirnoff AuthorDate: 2025-02-05 18:09:06 +0000 Commit: Gleb Smirnoff CommitDate: 2025-02-05 18:09:06 +0000 netlink: fix a panic with verbose debugging printfs While here improve general debugging of this function. Fixes: 660bd40a598a498ad850911772fcff3f2511875a --- sys/netlink/netlink_domain.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/netlink/netlink_domain.c b/sys/netlink/netlink_domain.c index 7fabb222665e..a7ceae687d86 100644 --- a/sys/netlink/netlink_domain.c +++ b/sys/netlink/netlink_domain.c @@ -557,8 +557,6 @@ nl_sosend(struct socket *so, struct sockaddr *addr, struct uio *uio, MPASS(m == NULL && uio != NULL); - NL_LOG(LOG_DEBUG2, "sending message to kernel"); - if (__predict_false(control != NULL)) { m_freem(control); return (EINVAL); @@ -570,8 +568,6 @@ nl_sosend(struct socket *so, struct sockaddr *addr, struct uio *uio, if (__predict_false(uio->uio_resid < sizeof(struct nlmsghdr))) return (ENOBUFS); /* XXXGL: any better error? */ - NL_LOG(LOG_DEBUG3, "sending message to kernel async processing"); - error = SOCK_IO_SEND_LOCK(so, SBLOCKWAIT(flags)); if (error) return (error); @@ -585,6 +581,8 @@ nl_sosend(struct socket *so, struct sockaddr *addr, struct uio *uio, if (__predict_false(error)) goto out; + NL_LOG(LOG_DEBUG2, "sending message to kernel %u bytes", nb->datalen); + SOCK_SENDBUF_LOCK(so); restart: if (sb->sb_hiwat - sb->sb_ccc >= nb->datalen) { @@ -607,7 +605,7 @@ restart: SOCK_SENDBUF_UNLOCK(so); if (nb == NULL) { - NL_LOG(LOG_DEBUG3, "enqueue %u bytes", nb->datalen); + NL_LOG(LOG_DEBUG3, "success"); NLP_LOCK(nlp); nl_schedule_taskqueue(nlp); NLP_UNLOCK(nlp); @@ -615,8 +613,10 @@ restart: out: SOCK_IO_SEND_UNLOCK(so); - if (nb != NULL) + if (nb != NULL) { + NL_LOG(LOG_DEBUG3, "failure, error %d", error); nl_buf_free(nb); + } return (error); }