Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/2222814/?format=api
{ "id": 2222814, "url": "http://patchwork.ozlabs.org/api/patches/2222814/?format=api", "web_url": "http://patchwork.ozlabs.org/project/linux-cifs-client/patch/20260413190713.283939-7-ematsumiya@suse.de/", "project": { "id": 12, "url": "http://patchwork.ozlabs.org/api/projects/12/?format=api", "name": "Linux CIFS Client", "link_name": "linux-cifs-client", "list_id": "linux-cifs.vger.kernel.org", "list_email": "linux-cifs@vger.kernel.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20260413190713.283939-7-ematsumiya@suse.de>", "list_archive_url": null, "date": "2026-04-13T19:07:12", "name": "[7/8] smb: client: compress: add compress/common.h", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "b228501e3c3f1e3353b82eb309b2d5f9e8b606c9", "submitter": { "id": 78375, "url": "http://patchwork.ozlabs.org/api/people/78375/?format=api", "name": "Enzo Matsumiya", "email": "ematsumiya@suse.de" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/linux-cifs-client/patch/20260413190713.283939-7-ematsumiya@suse.de/mbox/", "series": [ { "id": 499741, "url": "http://patchwork.ozlabs.org/api/series/499741/?format=api", "web_url": "http://patchwork.ozlabs.org/project/linux-cifs-client/list/?series=499741", "date": "2026-04-13T19:07:09", "name": "[1/8] smb: client: compress: fix buffer overrun in lz77_compress()", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/499741/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/2222814/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2222814/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "\n <linux-cifs+bounces-10781-incoming=patchwork.ozlabs.org@vger.kernel.org>", "X-Original-To": [ "incoming@patchwork.ozlabs.org", "linux-cifs@vger.kernel.org" ], "Delivered-To": "patchwork-incoming@legolas.ozlabs.org", "Authentication-Results": [ "legolas.ozlabs.org;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256\n header.s=susede2_rsa header.b=bTbZ3gbA;\n\tdkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256\n header.s=susede2_ed25519 header.b=0SPkAgx2;\n\tdkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de\n header.a=rsa-sha256 header.s=susede2_rsa header.b=NcUANBbJ;\n\tdkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256\n header.s=susede2_ed25519 header.b=AIXi4aLV;\n\tdkim-atps=neutral", "legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org\n (client-ip=172.232.135.74; helo=sto.lore.kernel.org;\n envelope-from=linux-cifs+bounces-10781-incoming=patchwork.ozlabs.org@vger.kernel.org;\n receiver=patchwork.ozlabs.org)", "smtp.subspace.kernel.org;\n\tdkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de\n header.b=\"bTbZ3gbA\";\n\tdkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de\n header.b=\"0SPkAgx2\";\n\tdkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de\n header.b=\"NcUANBbJ\";\n\tdkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de\n header.b=\"AIXi4aLV\"", "smtp.subspace.kernel.org;\n arc=none smtp.client-ip=195.135.223.131", "smtp.subspace.kernel.org;\n dmarc=pass (p=none dis=none) header.from=suse.de", "smtp.subspace.kernel.org;\n spf=pass smtp.mailfrom=suse.de", "smtp-out2.suse.de;\n\tnone" ], "Received": [ "from sto.lore.kernel.org (sto.lore.kernel.org [172.232.135.74])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fvcPc1JL8z1y2d\n\tfor <incoming@patchwork.ozlabs.org>; Tue, 14 Apr 2026 05:08:20 +1000 (AEST)", "from smtp.subspace.kernel.org (conduit.subspace.kernel.org\n [100.90.174.1])\n\tby sto.lore.kernel.org (Postfix) with ESMTP id 8F2E430164D4\n\tfor <incoming@patchwork.ozlabs.org>; Mon, 13 Apr 2026 19:08:17 +0000 (UTC)", "from localhost.localdomain (localhost.localdomain [127.0.0.1])\n\tby smtp.subspace.kernel.org (Postfix) with ESMTP id 83ADF3909A8;\n\tMon, 13 Apr 2026 19:08:14 +0000 (UTC)", "from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))\n\t(No client certificate requested)\n\tby smtp.subspace.kernel.org (Postfix) with ESMTPS id 91D971A3166\n\tfor <linux-cifs@vger.kernel.org>; Mon, 13 Apr 2026 19:08:12 +0000 (UTC)", "from imap1.dmz-prg2.suse.org (unknown [10.150.64.97])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest\n SHA256)\n\t(No client certificate requested)\n\tby smtp-out2.suse.de (Postfix) with ESMTPS id B40795BDAF;\n\tMon, 13 Apr 2026 19:08:09 +0000 (UTC)", "from imap1.dmz-prg2.suse.org (localhost [127.0.0.1])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest\n SHA256)\n\t(No client certificate requested)\n\tby imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 3E5964B03B;\n\tMon, 13 Apr 2026 19:08:09 +0000 (UTC)", "from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167])\n\tby imap1.dmz-prg2.suse.org with ESMTPSA\n\tid g8cDAhk/3WnCEAAAD6G6ig\n\t(envelope-from <ematsumiya@suse.de>); Mon, 13 Apr 2026 19:08:09 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;\n\tt=1776107294; cv=none;\n b=NcwgX2XulJByDALWw1uOkSNSPH6H2zRQKAodnckK6vUfUZZI9bATpPvMesikODfNH6kKX3KGI5R8RMKcmbyHyTgzhLXCN7OwheNkvMp9HBxocymg6Yl3IDdL5tw9dGJcmspFnv1XF5sDgUVXX9/K/2aLegaGoVFgla0+eAGZYS8=", "ARC-Message-Signature": "i=1; a=rsa-sha256; d=subspace.kernel.org;\n\ts=arc-20240116; t=1776107294; c=relaxed/simple;\n\tbh=4+RkreMOvZuxypCaW1yXrBr02YOT1YhvDj59vJulC94=;\n\th=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:\n\t MIME-Version;\n b=TU+WivxZRHTA4CdEyookfr9Hwg3qsfffowAwPBIP4C0HXcQKrIAlHGvsIbuw1hvF1D8vGCGozB4wxwxAkV+Wvk/aWt1lfw3VgJ/eZ+KXp73RVxr0MY7IUxHopurFBIiKQtrqGjQcCwgQlCnEJfSai7PsGcN6kxk08BM8GDKeS7w=", "ARC-Authentication-Results": "i=1; smtp.subspace.kernel.org;\n dmarc=pass (p=none dis=none) header.from=suse.de;\n spf=pass smtp.mailfrom=suse.de;\n dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de\n header.b=bTbZ3gbA;\n dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de\n header.b=0SPkAgx2;\n dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de\n header.b=NcUANBbJ;\n dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de\n header.b=AIXi4aLV; arc=none smtp.client-ip=195.135.223.131", "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de;\n s=susede2_rsa;\n\tt=1776107290;\n h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc:\n\t mime-version:mime-version:\n\t content-transfer-encoding:content-transfer-encoding:\n\t in-reply-to:in-reply-to:references:references;\n\tbh=3k55yAzWZIw33nLNRF0CyfO2FfP+cQLaZgYmgyXg+do=;\n\tb=bTbZ3gbAmkGJbB3wmkP9qhU67IIJyY3T0VfLEBJI0Rl2YEu7AE53u7Qh3IGQY5ebjWrF+e\n\tr1bh2IlL9XHtUjAw4SNlOGRkwnfBqVzE+Ae89rQkPxRhc0mGJTjT17sPjMbb2GdNThrfhM\n\tzesy5/bYZQYk9tSqKqbvEZqCEJpEXF8=", "v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de;\n\ts=susede2_ed25519; t=1776107290;\n\th=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc:\n\t mime-version:mime-version:\n\t content-transfer-encoding:content-transfer-encoding:\n\t in-reply-to:in-reply-to:references:references;\n\tbh=3k55yAzWZIw33nLNRF0CyfO2FfP+cQLaZgYmgyXg+do=;\n\tb=0SPkAgx2gNVNgF8XhD/rv5+I1x+28DOWYFCX+kP6HdbNbiaI+a506uKi6S4BhDhckf/PcD\n\tD2DstH7aNtKkZWAQ==", "v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de;\n s=susede2_rsa;\n\tt=1776107289;\n h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc:\n\t mime-version:mime-version:\n\t content-transfer-encoding:content-transfer-encoding:\n\t in-reply-to:in-reply-to:references:references;\n\tbh=3k55yAzWZIw33nLNRF0CyfO2FfP+cQLaZgYmgyXg+do=;\n\tb=NcUANBbJCbao6KYj7zL0rzwbj3PMtKub9phhv49pY2frQ8nP5k7E9aJaFcnyT0DpHqRb3b\n\tXvppZwmgPk9nVApxCn1AWMpos2gxmRJKcKTVOoKNlYZgHCRezc20ElXCSJhrmWqLd8XQVF\n\tqRp+vEVYBfuWGW5QqXmOvdvik0QYznE=", "v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de;\n\ts=susede2_ed25519; t=1776107289;\n\th=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc:\n\t mime-version:mime-version:\n\t content-transfer-encoding:content-transfer-encoding:\n\t in-reply-to:in-reply-to:references:references;\n\tbh=3k55yAzWZIw33nLNRF0CyfO2FfP+cQLaZgYmgyXg+do=;\n\tb=AIXi4aLV/xSBGOUdR39dr+3kZq+cp3zqMbeLcwb3jjT7q0zTQla0Ule/XlcDM/HNA/ZSq4\n\tm831atH/s+V9DvBg==" ], "From": "Enzo Matsumiya <ematsumiya@suse.de>", "To": "linux-cifs@vger.kernel.org", "Cc": "smfrench@gmail.com,\n\tpc@manguebit.com,\n\tronniesahlberg@gmail.com,\n\tsprasad@microsoft.com,\n\ttom@talpey.com,\n\tbharathsm@microsoft.com,\n\thenrique.carvalho@suse.com", "Subject": "[PATCH 7/8] smb: client: compress: add compress/common.h", "Date": "Mon, 13 Apr 2026 16:07:12 -0300", "Message-ID": "<20260413190713.283939-7-ematsumiya@suse.de>", "X-Mailer": "git-send-email 2.53.0", "In-Reply-To": "<20260413190713.283939-1-ematsumiya@suse.de>", "References": "<20260413190713.283939-1-ematsumiya@suse.de>", "Precedence": "bulk", "X-Mailing-List": "linux-cifs@vger.kernel.org", "List-Id": "<linux-cifs.vger.kernel.org>", "List-Subscribe": "<mailto:linux-cifs+subscribe@vger.kernel.org>", "List-Unsubscribe": "<mailto:linux-cifs+unsubscribe@vger.kernel.org>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "X-Spam-Score": "-2.80", "X-Spam-Level": "", "X-Spamd-Result": "default: False [-2.80 / 50.00];\n\tBAYES_HAM(-3.00)[100.00%];\n\tNEURAL_HAM_LONG(-1.00)[-1.000];\n\tMID_CONTAINS_FROM(1.00)[];\n\tR_MISSING_CHARSET(0.50)[];\n\tNEURAL_HAM_SHORT(-0.20)[-0.999];\n\tMIME_GOOD(-0.10)[text/plain];\n\tTO_MATCH_ENVRCPT_ALL(0.00)[];\n\tFUZZY_RATELIMITED(0.00)[rspamd.com];\n\tFROM_HAS_DN(0.00)[];\n\tRCVD_VIA_SMTP_AUTH(0.00)[];\n\tFREEMAIL_CC(0.00)[gmail.com,manguebit.com,microsoft.com,talpey.com,suse.com];\n\tARC_NA(0.00)[];\n\tTO_DN_NONE(0.00)[];\n\tRCVD_TLS_ALL(0.00)[];\n\tFROM_EQ_ENVFROM(0.00)[];\n\tRCVD_COUNT_TWO(0.00)[2];\n\tRCPT_COUNT_SEVEN(0.00)[8];\n\tDBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:mid,suse.de:email];\n\tMIME_TRACE(0.00)[0:+];\n\tDKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519];\n\tFREEMAIL_ENVRCPT(0.00)[gmail.com]", "X-Spam-Flag": "NO" }, "content": "Add compress/common.h to aggregate helpers and definitions that will be\nshared with other compression algorithms.\n\nAlso add a few build time checks for proper support.\n\nChanges:\n- update affected call paths in compress/lz77.c\n\nSigned-off-by: Enzo Matsumiya <ematsumiya@suse.de>\n---\n fs/smb/client/compress/common.h | 152 ++++++++++++++++++++++++++++++++\n fs/smb/client/compress/lz77.c | 122 +++++--------------------\n 2 files changed, 175 insertions(+), 99 deletions(-)\n create mode 100644 fs/smb/client/compress/common.h", "diff": "diff --git a/fs/smb/client/compress/common.h b/fs/smb/client/compress/common.h\nnew file mode 100644\nindex 000000000000..b5ccf5debd22\n--- /dev/null\n+++ b/fs/smb/client/compress/common.h\n@@ -0,0 +1,152 @@\n+/* SPDX-License-Identifier: GPL-2.0-only */\n+/*\n+ * Copyright (C) 2026, SUSE LLC\n+ *\n+ * Authors: Enzo Matsumiya <ematsumiya@suse.de>\n+ *\n+ * Common helpers and definitions for compression/decompression.\n+ *\n+ * Naming convention:\n+ * - smb_compress_*:\tMS-SMB2 related API\n+ * - compress_*:\tCompression internals\n+ * - <alg>_*:\t\tCompression algorithm specifics\n+ *\n+ * Upper case for macros and constants, lower case for everything else.\n+ */\n+#ifndef _COMPRESS_COMMON_H\n+#define _COMPRESS_COMMON_H\n+\n+#include <linux/kernel.h>\n+#include <linux/count_zeros.h>\n+#include <linux/string.h>\n+#include <linux/sizes.h>\n+#include <linux/slab.h>\n+\n+/*\n+ * Build time checks/asserts.\n+ * These are assumptions/expectations for all algorithms implemented.\n+ */\n+#ifndef __LITTLE_ENDIAN /* TODO */\n+# error \"SMB3 compression is only supported on little endian architectures\"\n+#endif /* !__LITTLE_ENDIAN */\n+\n+#if BITS_PER_LONG < 64 /* TODO */\n+# error \"SMB3 compression is only supported on 64-bit architectures\"\n+#endif /* BITS_PER_LONG < 64 */\n+\n+/* Build time double checks (probably unnecessary) */\n+static_assert(sizeof(u16) == 2);\n+static_assert(sizeof(u32) == 4);\n+static_assert(sizeof(u64) == 8);\n+static_assert(sizeof(size_t) == 8);\n+\n+#ifdef CONFIG_CIFS_DEBUG2\n+# define COMPRESS_DEBUG\n+#endif /* CONFIG_CIFS_DEBUG2 */\n+\n+#define COMPRESS_LOG_FMT\t\"CIFS: %s:%d %s(): \"\n+\n+#ifdef COMPRESS_DEBUG\n+# define compress_log(fmt, ...) \\\n+\tpr_err(COMPRESS_LOG_FMT fmt, __FILE__, __LINE__, __func__, ## __VA_ARGS__)\n+\n+/* Make sure to handle assertion failures! */\n+# define COMPRESS_ASSERT(cond) \\\n+\t!WARN_ONCE(!(cond), COMPRESS_LOG_FMT \"assertion failed: %s\\n\", \\\n+\t\t __FILE__, __LINE__, __func__, #cond)\n+#else /* COMPRESS_DEBUG */\n+# define compress_log(...)\n+/* XXX: should not fail silently on non-debug? */\n+# define COMPRESS_ASSERT(cond)\tlikely(cond)\n+#endif /* !COMPRESS_DEBUG */\n+\n+/*\n+ * Memory ops helpers.\n+ */\n+#undef MEM_UNALIGNED_READ\n+#undef MEM_UNALIGNED_WRITE\n+\n+/* Read prefetch */\n+#define MEM_PREFETCH(ptr)\t\t__builtin_prefetch((ptr), 0, 3)\n+\n+#ifdef CONFIG_X86\n+# define MEM_UNALIGNED_READ(ptr, t)\t(*(const t *)(ptr))\n+# define MEM_UNALIGNED_WRITE(ptr, v, t)\t(*(t *)(ptr) = (t)(v))\n+#else\n+# include <linux/unaligned.h>\n+# define MEM_UNALIGNED_READ(ptr, t)\tget_unaligned((const t *)(ptr))\n+# define MEM_UNALIGNED_WRITE(ptr, v, t)\tput_unaligned((v), (t *)(ptr))\n+#endif /* !CONFIG_X86 */\n+\n+#define mem_read8(ptr)\t\t\tMEM_UNALIGNED_READ(ptr, u8)\n+#define mem_read16(ptr)\t\t\tMEM_UNALIGNED_READ(ptr, u16)\n+#define mem_read32(ptr)\t\t\tMEM_UNALIGNED_READ(ptr, u32)\n+#define mem_read64(ptr)\t\t\tMEM_UNALIGNED_READ(ptr, u64)\n+#define mem_write8(ptr, v)\t\tMEM_UNALIGNED_WRITE(ptr, v, u8)\n+#define mem_write16(ptr, v)\t\tMEM_UNALIGNED_WRITE(ptr, v, u16)\n+#define mem_write32(ptr, v)\t\tMEM_UNALIGNED_WRITE(ptr, v, u32)\n+/* mem_write64() not implemented because it's not used anywhere. */\n+\n+/*\n+ * COMPRESS_RSTEP_SIZE:\t\tNumber of bytes to read from input buffer for hashing and initial\n+ *\t\t\t\tmatch check (default 4 bytes).\n+ * COMPRESS_MSTEP_SIZE:\t\tNumber of bytes to extend-compare a found match (default 8 bytes).\n+ */\n+#define COMPRESS_RSTEP_SIZE\tsizeof(u32)\n+#define COMPRESS_MSTEP_SIZE\tsizeof(u64)\n+\n+static __always_inline size_t mem_match_len(const void *match, const void *cur, const void *end)\n+{\n+\tconst void *start = cur;\n+\n+\t/* Callers must ensure @cur + COMPRESS_MSTEP_SIZE < @end. */\n+\tdo {\n+\t\tconst u64 diff = mem_read64(cur) ^ mem_read64(match);\n+\n+\t\tif (!diff) {\n+\t\t\tcur += COMPRESS_MSTEP_SIZE;\n+\t\t\tmatch += COMPRESS_MSTEP_SIZE;\n+\n+\t\t\tcontinue;\n+\t\t}\n+\n+\t\t/* This computes the number of common bytes in @diff. */\n+\t\tcur += count_trailing_zeros(diff) >> 3;\n+\n+\t\treturn (cur - start);\n+\t} while (likely(cur + COMPRESS_MSTEP_SIZE <= end));\n+\n+\t/* Fallback to byte-by-byte comparison for last bytes (< COMPRESS_MSTEP_SIZE). */\n+\twhile (cur < end && mem_read8(match) == mem_read8(cur)) {\n+\t\tcur++;\n+\t\tmatch++;\n+\t}\n+\n+\treturn (cur - start);\n+}\n+\n+/*\n+ * Hashing\n+ *\n+ * Same for all algorithms.\n+ *\n+ * XXX: these are fixed for now, might make them tunables in the future.\n+ */\n+\n+/*\n+ * COMPRESS_HASH_LOG:\t\tilog2 hash size (recommended to be 13 - 18, default 15)\n+ * COMPRESS_HASH_SIZE:\t\tHashtable size (default is 32k (1 << COMPRESS_HASH_LOG))).\n+ */\n+#define COMPRESS_HASH_LOG\t15\n+#define COMPRESS_HASH_SIZE\t(1U << COMPRESS_HASH_LOG)\n+\n+static __always_inline u32 compress_hash(const u32 v)\n+{\n+\treturn ((v ^ 0x9E3779B9U) * 0x85EBCA6BU) >> (32 - COMPRESS_HASH_LOG);\n+}\n+\n+static __always_inline u32 compress_hash_ptr(const void *ptr)\n+{\n+\treturn compress_hash(mem_read32(ptr));\n+}\n+#endif /* _COMPRESS_COMMON_H */\ndiff --git a/fs/smb/client/compress/lz77.c b/fs/smb/client/compress/lz77.c\nindex 7365d0f97396..d8c73f7f7483 100644\n--- a/fs/smb/client/compress/lz77.c\n+++ b/fs/smb/client/compress/lz77.c\n@@ -11,19 +11,13 @@\n #include <linux/count_zeros.h>\n #include <linux/unaligned.h>\n \n+#include \"common.h\"\n #include \"lz77.h\"\n \n /*\n * Compression parameters.\n *\n * LZ77_MATCH_MAX_DIST:\t\tFarthest back a match can be from current position (can be 1 - 8K).\n- * LZ77_HASH_LOG:\n- * LZ77_HASH_SIZE:\t\tilog2 hash size (recommended to be 13 - 18, default 15 (hash size\n- *\t\t\t\t32k)).\n- * LZ77_RSTEP_SIZE:\t\tNumber of bytes to read from input buffer for hashing and initial\n- *\t\t\t\tmatch check (default 4 bytes, this effectivelly makes this the min\n- *\t\t\t\tmatch len).\n- * LZ77_MSTEP_SIZE:\t\tNumber of bytes to extend-compare a found match (default 8 bytes).\n * LZ77_SKIP_TRIGGER:\t\tilog2 value for adaptive skipping, i.e. to progressively skip input\n *\t\t\t\tbytes when we can't find matches. Default is 4.\n *\t\t\t\tHigher values (>0) will decrease compression time, but will result\n@@ -31,75 +25,10 @@\n *\t\t\t\tcompression ratio (more matches found), but will increase time.\n */\n #define LZ77_MATCH_MAX_DIST\tSZ_8K\n-#define LZ77_HASH_LOG\t\t15\n-#define LZ77_HASH_SIZE\t\t(1 << LZ77_HASH_LOG)\n-#define LZ77_RSTEP_SIZE\t\tsizeof(u32)\n-#define LZ77_MSTEP_SIZE\t\tsizeof(u64)\n #define LZ77_SKIP_TRIGGER\t4\n \n-#define LZ77_PREFETCH(ptr)\t__builtin_prefetch((ptr), 0, 3)\n #define LZ77_FLAG_MAX\t\t32\n \n-static __always_inline u8 lz77_read8(const u8 *ptr)\n-{\n-\treturn get_unaligned(ptr);\n-}\n-\n-static __always_inline u32 lz77_read32(const u32 *ptr)\n-{\n-\treturn get_unaligned(ptr);\n-}\n-\n-static __always_inline u64 lz77_read64(const u64 *ptr)\n-{\n-\treturn get_unaligned(ptr);\n-}\n-\n-static __always_inline void lz77_write8(u8 *ptr, u8 v)\n-{\n-\tput_unaligned(v, ptr);\n-}\n-\n-static __always_inline void lz77_write16(u16 *ptr, u16 v)\n-{\n-\tput_unaligned_le16(v, ptr);\n-}\n-\n-static __always_inline void lz77_write32(u32 *ptr, u32 v)\n-{\n-\tput_unaligned_le32(v, ptr);\n-}\n-\n-static __always_inline u32 lz77_match_len(const void *match, const void *cur, const void *end)\n-{\n-\tconst void *start = cur;\n-\n-\t/* Safe for a do/while because otherwise we wouldn't reach here from the main loop. */\n-\tdo {\n-\t\tconst u64 diff = lz77_read64(cur) ^ lz77_read64(match);\n-\n-\t\tif (!diff) {\n-\t\t\tcur += LZ77_MSTEP_SIZE;\n-\t\t\tmatch += LZ77_MSTEP_SIZE;\n-\n-\t\t\tcontinue;\n-\t\t}\n-\n-\t\t/* This computes the number of common bytes in @diff. */\n-\t\tcur += count_trailing_zeros(diff) >> 3;\n-\n-\t\treturn (cur - start);\n-\t} while (likely(cur + LZ77_MSTEP_SIZE <= end));\n-\n-\t/* Fallback to byte-by-byte comparison for last <8 bytes. */\n-\twhile (cur < end && lz77_read8(cur) == lz77_read8(match)) {\n-\t\tcur++;\n-\t\tmatch++;\n-\t}\n-\n-\treturn (cur - start);\n-}\n-\n /**\n * lz77_encode_match() - Match encoding.\n * @dst:\tcompressed buffer\n@@ -120,24 +49,24 @@ static __always_inline void *lz77_encode_match(void *dst, void **nib, u16 dist,\n \tdist <<= 3;\n \n \tif (len < 7) {\n-\t\tlz77_write16(dst, dist + len);\n+\t\tmem_write16(dst, dist + len);\n \n \t\treturn dst + sizeof(u16);\n \t}\n \n \tdist |= 7;\n-\tlz77_write16(dst, dist);\n+\tmem_write16(dst, dist);\n \tdst += sizeof(u16);\n \tlen -= 7;\n \n \tif (!*nib) {\n-\t\tlz77_write8(dst, umin(len, 15));\n+\t\tmem_write8(dst, umin(len, 15));\n \t\t*nib = dst;\n \t\tdst++;\n \t} else {\n \t\tu8 *b = *nib;\n \n-\t\tlz77_write8(b, *b | umin(len, 15) << 4);\n+\t\tmem_write8(b, *b | umin(len, 15) << 4);\n \t\t*nib = NULL;\n \t}\n \n@@ -146,23 +75,23 @@ static __always_inline void *lz77_encode_match(void *dst, void **nib, u16 dist,\n \n \tlen -= 15;\n \tif (len < 255) {\n-\t\tlz77_write8(dst, len);\n+\t\tmem_write8(dst, len);\n \n \t\treturn dst + 1;\n \t}\n \n-\tlz77_write8(dst, 0xff);\n+\tmem_write8(dst, 0xff);\n \tdst++;\n \tlen += 7 + 15;\n \tif (len <= 0xffff) {\n-\t\tlz77_write16(dst, len);\n+\t\tmem_write16(dst, len);\n \n \t\treturn dst + sizeof(u16);\n \t}\n \n-\tlz77_write16(dst, 0);\n+\tmem_write16(dst, 0);\n \tdst += sizeof(u16);\n-\tlz77_write32(dst, len);\n+\tmem_write32(dst, len);\n \n \treturn dst + sizeof(u32);\n }\n@@ -200,7 +129,7 @@ static __always_inline void *lz77_encode_literals(const void *start, const void\n \t\t*f <<= len;\n \t\t*fc += len;\n \t\tif (*fc == LZ77_FLAG_MAX) {\n-\t\t\tlz77_write32(*fp, *f);\n+\t\t\tmem_write32(*fp, *f);\n \t\t\t*fc = 0;\n \t\t\t*fp = dst;\n \t\t\tdst += sizeof(u32);\n@@ -210,11 +139,6 @@ static __always_inline void *lz77_encode_literals(const void *start, const void\n \treturn dst;\n }\n \n-static __always_inline u32 lz77_hash(const u32 v)\n-{\n-\treturn ((v ^ 0x9E3779B9) * 0x85EBCA6B) >> (32 - LZ77_HASH_LOG);\n-}\n-\n noinline int lz77_compress(const void *src, const u32 slen, void *dst, u32 *dlen)\n {\n \tconst void *srcp, *rlim, *end, *anchor;\n@@ -228,25 +152,25 @@ noinline int lz77_compress(const void *src, const u32 slen, void *dst, u32 *dlen\n \n \tsrcp = anchor = src;\n \tend = srcp + slen; /* absolute end */\n-\trlim = end - LZ77_MSTEP_SIZE; /* read limit (for lz77_match_len()) */\n+\trlim = end - COMPRESS_MSTEP_SIZE; /* read limit (for mem_match_len()) */\n \tdstp = dst;\n \tflag_pos = dstp;\n \tdstp += sizeof(u32);\n \tnib = NULL;\n \n-\thtable = kvcalloc(LZ77_HASH_SIZE, sizeof(*htable), GFP_KERNEL);\n+\thtable = kvcalloc(COMPRESS_HASH_SIZE, sizeof(*htable), GFP_KERNEL);\n \tif (!htable)\n \t\treturn -ENOMEM;\n \n-\tLZ77_PREFETCH(srcp + LZ77_RSTEP_SIZE);\n+\tMEM_PREFETCH(srcp + COMPRESS_RSTEP_SIZE);\n \n \t/*\n \t * Adjust @srcp so we don't get a false positive match on first iteration.\n \t * Then prepare hash for first loop iteration (don't advance @srcp again).\n \t */\n-\thash = lz77_hash(lz77_read32(srcp++));\n+\thash = compress_hash_ptr(srcp++);\n \thtable[hash] = 0;\n-\thash = lz77_hash(lz77_read32(srcp));\n+\thash = compress_hash_ptr(srcp);\n \n \t/*\n \t * Main loop.\n@@ -278,11 +202,11 @@ noinline int lz77_compress(const void *src, const u32 slen, void *dst, u32 *dlen\n \t\t\tif (unlikely(next > rlim))\n \t\t\t\tgoto out;\n \n-\t\t\thash = lz77_hash(lz77_read32(next));\n+\t\t\thash = compress_hash_ptr(next);\n \t\t\tmatch = src + htable[cur_hash];\n \t\t\thtable[cur_hash] = srcp - src;\n \t\t} while (likely(match + LZ77_MATCH_MAX_DIST < srcp) ||\n-\t\t\t lz77_read32(match) != lz77_read32(srcp));\n+\t\t\t mem_read32(match) != mem_read32(srcp));\n \n \t\t/*\n \t\t * Match found. Warm/cold path; begin parsing @srcp and writing to @dstp:\n@@ -295,17 +219,17 @@ noinline int lz77_compress(const void *src, const u32 slen, void *dst, u32 *dlen\n \t\t * redundantly compute it again in lz77_match_len() than to adjust pointers/len.\n \t\t */\n \t\tdstp = lz77_encode_literals(anchor, srcp, dstp, &flag, &flag_count, &flag_pos);\n-\t\tlen = lz77_match_len(match, srcp, end);\n+\t\tlen = mem_match_len(match, srcp, end);\n \t\tdstp = lz77_encode_match(dstp, &nib, srcp - match, len);\n \t\tsrcp += len;\n \t\tanchor = srcp;\n \n-\t\tLZ77_PREFETCH(srcp);\n+\t\tMEM_PREFETCH(srcp);\n \n \t\tflag = (flag << 1) | 1;\n \t\tflag_count++;\n \t\tif (flag_count == LZ77_FLAG_MAX) {\n-\t\t\tlz77_write32(flag_pos, flag);\n+\t\t\tmem_write32(flag_pos, flag);\n \t\t\tflag_count = 0;\n \t\t\tflag_pos = dstp;\n \t\t\tdstp += sizeof(u32);\n@@ -315,7 +239,7 @@ noinline int lz77_compress(const void *src, const u32 slen, void *dst, u32 *dlen\n \t\t\tbreak;\n \n \t\t/* Prepare for next loop. */\n-\t\thash = lz77_hash(lz77_read32(srcp));\n+\t\thash = compress_hash_ptr(srcp);\n \t} while (srcp < end);\n out:\n \tdstp = lz77_encode_literals(anchor, end, dstp, &flag, &flag_count, &flag_pos);\n@@ -323,7 +247,7 @@ noinline int lz77_compress(const void *src, const u32 slen, void *dst, u32 *dlen\n \tflag_count = LZ77_FLAG_MAX - flag_count;\n \tflag <<= flag_count;\n \tflag |= (1UL << flag_count) - 1;\n-\tlz77_write32(flag_pos, flag);\n+\tmem_write32(flag_pos, flag);\n \n \t*dlen = dstp - dst;\n \tkvfree(htable);\n", "prefixes": [ "7/8" ] }