From nobody Mon Jan 20 02:40:38 2025 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 4Ybvhm0c5sz5k6dB; Mon, 20 Jan 2025 02:40:40 +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 4Ybvhk5Fx4z3pPr; Mon, 20 Jan 2025 02:40:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737340838; 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=VbDCCV8ICSUrdrvLxgX7T2pZLZlIYxVPyygrlSc8O7c=; b=wTRXMN7U4PIpLkvmkc51wv3l6jP/ELxKdg6ylw9HcU1Ro5zKqksRNpBE4kjxH2ocdMUaBB W0+OUQaE0ipIlUMLMEmJZDN6uBEmiZE7mqXcoFi8fMZzpzLp0Rfsny3GzNDan5yBFw53lZ QYSNwcAiap8hFshobfT7zP17sSjG918tznPK9eKJxbXt22e2zXTtatgbm4dUFLSOGOL3Ky EE1c4uVWYgpNAb1JIFafx79roFO3Gy9AGnJ2j3sJ6XN4+JVa8CqmDD/a2ycT5FJzW6pMNA JjcfTaH22QjYNoWV4AuPyJfQmxptgwFXkskduFNhuUxpMH2mDW4PM2IHi9/3fQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737340838; 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=VbDCCV8ICSUrdrvLxgX7T2pZLZlIYxVPyygrlSc8O7c=; b=a7GYXsIzwIrgx/TsmSEpF5lKpH9TTRcjunS+bkrDi1uNDnMmJ91m2cbQ6hBXIIFvIXlOE8 s/vWLmU/HUBcb19nl9ZSXwMye0uRtQCo6wmEUj++md/OWWYr+BByTN6aGmE4on8ioMNgQe Gzq/4yus/CXmPQ7q6Tka9+DDQb57Ff8yRIgDv5UT6+7aUrDiwP+s0iepv4RdCf0LV+ZyCG LQcQ561R5okInhaELOL8A4A2UzJT1kcoFvTM+K4x7Z87Pl6G+r+ES4FIhrG2JIMTtRFQw0 azWZQ8elfHFuHCtgj2hzuDPmeUt0wKoZLk0O5dSoa+/XkINIMudnmU/m7Usbzg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737340838; a=rsa-sha256; cv=none; b=XC1c3ieUH4CA7PKML8E8Db9ZQFPgWMWNnfvyvGZb2/S12XJyiEmnAo1dV8IlbFjemka6Cs E/NTxNke3n4FKSeUierJL0CXKy2UA3jYkqE+Ry0LY6fFsm7kBj+flXwxoiJWirhzjrb2LY 7aU78O9Fk8ZSnU8KD3u120A9J3Cbt0OtI4LB6ZsPDtZ7Y8+hN3xib3gyV1qJm8VyqO0J4y tgoxF9aH51Bvlq5v16dqXPrIxaPtQx4NEn3RdjkNvch/kpMh1+07u+Ne0T8Mm8mu9norWR r4RRq2OushDPevWlUA63OlUHZfXBXpEKrHmV2llO0g+1r5F2sdqWZMWkbUylUw== 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 4Ybvhk1mlBz1Fxk; Mon, 20 Jan 2025 02:40:38 +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 50K2ecAV071038; Mon, 20 Jan 2025 02:40:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50K2ecB3071024; Mon, 20 Jan 2025 02:40:38 GMT (envelope-from git) Date: Mon, 20 Jan 2025 02:40:38 GMT Message-Id: <202501200240.50K2ecB3071024@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 6e9b6e5dbb84 - stable/14 - mb_unmapped_to_ext(): return error code on error 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6e9b6e5dbb84c0c44930448b7da169a6a351d670 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6e9b6e5dbb84c0c44930448b7da169a6a351d670 commit 6e9b6e5dbb84c0c44930448b7da169a6a351d670 Author: Konstantin Belousov AuthorDate: 2024-12-28 08:30:01 +0000 Commit: Konstantin Belousov CommitDate: 2025-01-20 02:40:09 +0000 mb_unmapped_to_ext(): return error code on error (cherry picked from commit cf322978d73a3ed4958cb64cc4f1b47ceb53a03e) --- sys/kern/kern_mbuf.c | 41 +++++++++++++++++++++++++++-------------- sys/sys/mbuf.h | 2 +- 2 files changed, 28 insertions(+), 15 deletions(-) diff --git a/sys/kern/kern_mbuf.c b/sys/kern/kern_mbuf.c index 002e508e91cc..0a9cb72222c2 100644 --- a/sys/kern/kern_mbuf.c +++ b/sys/kern/kern_mbuf.c @@ -936,8 +936,8 @@ mb_unmapped_free_mext(struct mbuf *m) mb_free_extpg(old_m); } -static struct mbuf * -_mb_unmapped_to_ext(struct mbuf *m) +static int +_mb_unmapped_to_ext(struct mbuf *m, struct mbuf **mres) { struct mbuf *m_new, *top, *prev, *mref; struct sf_buf *sf; @@ -947,9 +947,15 @@ _mb_unmapped_to_ext(struct mbuf *m) u_int ref_inc = 0; M_ASSERTEXTPG(m); + + if (m->m_epg_tls != NULL) { + /* can't convert TLS mbuf */ + m_freem(m); + *mres = NULL; + return (EINVAL); + } + len = m->m_len; - KASSERT(m->m_epg_tls == NULL, ("%s: can't convert TLS mbuf %p", - __func__, m)); /* See if this is the mbuf that holds the embedded refcount. */ if (m->m_ext.ext_flags & EXT_FLAG_EMBREF) { @@ -1047,7 +1053,8 @@ _mb_unmapped_to_ext(struct mbuf *m) atomic_add_int(refcnt, ref_inc); } m_free(m); - return (top); + *mres = top; + return (0); fail: if (ref_inc != 0) { @@ -1064,13 +1071,15 @@ fail: } m_free(m); m_freem(top); - return (NULL); + *mres = NULL; + return (ENOMEM); } -struct mbuf * -mb_unmapped_to_ext(struct mbuf *top) +int +mb_unmapped_to_ext(struct mbuf *top, struct mbuf **mres) { - struct mbuf *m, *next, *prev = NULL; + struct mbuf *m, *m1, *next, *prev = NULL; + int error; prev = NULL; for (m = top; m != NULL; m = next) { @@ -1086,12 +1095,15 @@ mb_unmapped_to_ext(struct mbuf *top) */ prev->m_next = NULL; } - m = _mb_unmapped_to_ext(m); - if (m == NULL) { - m_freem(top); + error = _mb_unmapped_to_ext(m, &m1); + if (error != 0) { + if (top != m) + m_free(top); m_freem(next); - return (NULL); + *mres = NULL; + return (error); } + m = m1; if (prev == NULL) { top = m; } else { @@ -1110,7 +1122,8 @@ mb_unmapped_to_ext(struct mbuf *top) prev = m; } } - return (top); + *mres = top; + return (0); } /* diff --git a/sys/sys/mbuf.h b/sys/sys/mbuf.h index f7925da795cd..941c907e903b 100644 --- a/sys/sys/mbuf.h +++ b/sys/sys/mbuf.h @@ -814,7 +814,7 @@ struct mbuf *mb_alloc_ext_plus_pages(int, int); struct mbuf *mb_mapped_to_unmapped(struct mbuf *, int, int, int, struct mbuf **); int mb_unmapped_compress(struct mbuf *m); -struct mbuf *mb_unmapped_to_ext(struct mbuf *m); +int mb_unmapped_to_ext(struct mbuf *m, struct mbuf **mres); void mb_free_notready(struct mbuf *m, int count); void m_adj(struct mbuf *, int); void m_adj_decap(struct mbuf *, int);