From nobody Sun Jan 4 09:56:20 2026 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 4dkXrN4B88z6MnHT for ; Sun, 04 Jan 2026 09:56:20 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dkXrN3M0cz4D7j for ; Sun, 04 Jan 2026 09:56:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767520580; 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=r0u8YpWQEcNAhzHo7wcxM5+CF/o2ns1E5rs36YY3I68=; b=tTanfDcAg01ZX4j+pgxb24HxG9zEoF4mBZpTYBWd9TX726XC/WV2h5vjzJn3l7tQHkyraz gtPj4uF8NojXZLq14tH/qrpU5HpP9/WnD8QnHd0fVvCw+n++sDMBw4KynVofAFnsr4CL2E bQQfGLeybEaG/UnCVTlEQPFC+3S8kT465FvX7qw0XErIvh3nIL3nueMzIc1K0p5d+r7O3o +zPctwARs09UXe6O2oMQ6fpYEuNAq9ej/vvhMX8OeMXa7ztdf8z5tBozNVQNDfISPHPiFk sRR41x+kTBsdpuybaBCcDPW+QIvFBDesGyuHoEUlJtYNoTaI4vNJPwCiCrWZRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767520580; 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=r0u8YpWQEcNAhzHo7wcxM5+CF/o2ns1E5rs36YY3I68=; b=a92+kYTBr/Zyfthj6KaAbhy0L/KbVD9gvJk5NtB6aCyGBfGVUQWkooQFXDqFoD42RrXrB8 vNv5bFLMZUCrVoDXVdpc++JnduRp0B1rqPu6yq7LU38rzFbLgZJse9EXxnauBIcVgKsrkc wT5wsb+bnmRNjM/6dYkZGof80LNba7f4jQe+UFmRlvq0u9qZEgO4NkNpjEEb0gE+gG0Tq9 n82fkMJN8RGDSXHKUpYtS0N3rrPB+9t5YDGGqrmLLmkAImFWUy7vZMWdhNUm32HYbU1Npt 7g7eKlWQIrqKCN7ip3boeAQ7W/LxoUQskfAd24SO3JFboqVwFeWqt7d6ceCVcw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767520580; a=rsa-sha256; cv=none; b=dV1S/h0YGAWLtOiazwADrSmz+3Pl4SeAsU8Kls9gxZigZeTfbRtfra1wJaWQcIKlVucfxE G30iHOf1LheoSnhjarBJnKOZYNus5tlIbe6WVHTQJsRhQHPJDjy5La1kgLLyDc5shHa0Ix 7okFLjj3XpeF5cC4JnMiwWLz5tm4zZKvOl5mmvKekTAL4WlsTA1+ziSWPBfHp5W7AzLqYI u2AjrTEad02sc9n/fJIZYKraK/gNeP8qUyxC5HdlaRlL5KUUjBPKt75EF9VZDdtQGT3lHR uAVrHVm48jXedW7t9xzp7kgiM//WuyZ79fkqkI2FObEIUib6JCAAMK+RlLT7QA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dkXrN2xsHzTKC for ; Sun, 04 Jan 2026 09:56:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id df94 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 04 Jan 2026 09:56:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jean-=?utf-8?Q?S=C3=A9bast?==?utf-8?Q?ien P=C3=A9?=dron Subject: git: 43b5a264c6f6 - main - linuxkpi: Add option to skip trailing newline in `lkpi_hex_dump()` 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: dumbbell X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 43b5a264c6f665ac451102d828a8f51307efe626 Auto-Submitted: auto-generated Date: Sun, 04 Jan 2026 09:56:20 +0000 Message-Id: <695a3944.df94.5a521490@gitrepo.freebsd.org> The branch main has been updated by dumbbell: URL: https://cgit.FreeBSD.org/src/commit/?id=43b5a264c6f665ac451102d828a8f51307efe626 commit 43b5a264c6f665ac451102d828a8f51307efe626 Author: Jean-Sébastien Pédron AuthorDate: 2025-08-09 10:28:27 +0000 Commit: Jean-Sébastien Pédron CommitDate: 2026-01-04 09:45:19 +0000 linuxkpi: Add option to skip trailing newline in `lkpi_hex_dump()` This will be useful in the upcoming implementation of `hex_dump_to_buffer()` which doesn't add one. Reviewed by: bz, emaste Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D51844 --- sys/compat/linuxkpi/common/include/linux/printk.h | 4 ++-- sys/compat/linuxkpi/common/include/linux/seq_file.h | 2 +- sys/compat/linuxkpi/common/src/linux_compat.c | 10 ++++++---- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/printk.h b/sys/compat/linuxkpi/common/include/linux/printk.h index d2d197682782..e10656c8a1d0 100644 --- a/sys/compat/linuxkpi/common/include/linux/printk.h +++ b/sys/compat/linuxkpi/common/include/linux/printk.h @@ -48,7 +48,7 @@ int __lkpi_hexdump_printf(void *, const char *, ...) __printflike(2, 3); void lkpi_hex_dump(int(*)(void *, const char *, ...), void *arg1, const char *, const char *, const int, const int, const int, - const void *, size_t, const bool); + const void *, size_t, const bool, const bool); static inline void print_hex_dump(const char *level, const char *prefix_str, @@ -56,7 +56,7 @@ print_hex_dump(const char *level, const char *prefix_str, const void *buf, size_t len, const bool ascii) { lkpi_hex_dump(__lkpi_hexdump_printf, NULL, level, prefix_str, prefix_type, - rowsize, groupsize, buf, len, ascii); + rowsize, groupsize, buf, len, ascii, true); } static inline void diff --git a/sys/compat/linuxkpi/common/include/linux/seq_file.h b/sys/compat/linuxkpi/common/include/linux/seq_file.h index 47da16ab8688..3c7862890c67 100644 --- a/sys/compat/linuxkpi/common/include/linux/seq_file.h +++ b/sys/compat/linuxkpi/common/include/linux/seq_file.h @@ -115,7 +115,7 @@ seq_hex_dump(struct seq_file *m, const char *prefix_str, int prefix_type, int rowsize, int groupsize, const void *buf, size_t len, bool ascii) { lkpi_hex_dump(__lkpi_hexdump_sbuf_printf, m->buf, NULL, prefix_str, prefix_type, - rowsize, groupsize, buf, len, ascii); + rowsize, groupsize, buf, len, ascii, true); } #define file linux_file diff --git a/sys/compat/linuxkpi/common/src/linux_compat.c b/sys/compat/linuxkpi/common/src/linux_compat.c index 03d866260dd9..c2bad1f28eaf 100644 --- a/sys/compat/linuxkpi/common/src/linux_compat.c +++ b/sys/compat/linuxkpi/common/src/linux_compat.c @@ -1894,7 +1894,7 @@ void lkpi_hex_dump(int(*_fpf)(void *, const char *, ...), void *arg1, const char *level, const char *prefix_str, const int prefix_type, const int rowsize, const int groupsize, - const void *buf, size_t len, const bool ascii) + const void *buf, size_t len, const bool ascii, const bool trailing_newline) { typedef const struct { long long value; } __packed *print_64p_t; typedef const struct { uint32_t value; } __packed *print_32p_t; @@ -1978,9 +1978,11 @@ lkpi_hex_dump(int(*_fpf)(void *, const char *, ...), void *arg1, break; } } - ret = _fpf(arg1, "\n"); - if (ret < 0) - break; + if (len > 0 && trailing_newline) { + ret = _fpf(arg1, "\n"); + if (ret < 0) + break; + } } }