mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Mikhail Zaslonko <zaslonko@linux.ibm.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: LKML <linux-kernel@vger.kernel.org>,
	Heiko Carstens <hca@linux.ibm.com>,
	Vasily Gorbik <gor@linux.ibm.com>,
	Ilya Leoshkevich <iii@linux.ibm.com>,
	Mikhail Zaslonko <zaslonko@linux.ibm.com>
Subject: [PATCH 8/8] lib/zlib: DFLTCC always switch to software inflate for Z_PACKET_FLUSH option
Date: Thu, 26 Jan 2023 14:14:28 +0100	[thread overview]
Message-ID: <20230126131428.1222214-9-zaslonko@linux.ibm.com> (raw)
In-Reply-To: <20230126131428.1222214-1-zaslonko@linux.ibm.com>

Since hardware inflate does not support Z_PACKET_FLUSH option
(used exclusively by kernel PPP driver), always switch to
software like we already do for Z_BLOCK flush option.
Without this patch, PPP might get Z_DATA_ERROR return code from
zlib_inflate() and disable zlib compression for the packets.

Signed-off-by: Mikhail Zaslonko <zaslonko@linux.ibm.com>
Acked-by: Ilya Leoshkevich <iii@linux.ibm.com>
---
 lib/zlib_dfltcc/dfltcc_inflate.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/zlib_dfltcc/dfltcc_inflate.c b/lib/zlib_dfltcc/dfltcc_inflate.c
index 5786030c6dc2..437cd34c8490 100644
--- a/lib/zlib_dfltcc/dfltcc_inflate.c
+++ b/lib/zlib_dfltcc/dfltcc_inflate.c
@@ -95,8 +95,10 @@ dfltcc_inflate_action dfltcc_inflate(
     struct dfltcc_param_v0 *param = &dfltcc_state->param;
     dfltcc_cc cc;
 
-    if (flush == Z_BLOCK) {
-        /* DFLTCC does not support stopping on block boundaries */
+    if (flush == Z_BLOCK || flush == Z_PACKET_FLUSH) {
+        /* DFLTCC does not support stopping on block boundaries (Z_BLOCK flush option)
+         * as well as the use of Z_PACKET_FLUSH option (used exclusively by PPP driver)
+         */
         if (dfltcc_inflate_disable(strm)) {
             *ret = Z_STREAM_ERROR;
             return DFLTCC_INFLATE_BREAK;
-- 
2.34.1


  parent reply	other threads:[~2023-01-26 13:15 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-01-26 13:14 [PATCH 0/8] lib/zlib: Set of s390 DFLTCC related patches for kernel zlib Mikhail Zaslonko
2023-01-26 13:14 ` [PATCH 1/8] lib/zlib: Adjust offset calculation for dfltcc_state Mikhail Zaslonko
2023-01-26 13:14 ` [PATCH 2/8] lib/zlib: Implement switching between DFLTCC and software Mikhail Zaslonko
2023-01-26 13:14 ` [PATCH 3/8] lib/zlib: Fix DFLTCC not flushing EOBS when creating raw streams Mikhail Zaslonko
2023-01-26 13:14 ` [PATCH 4/8] lib/zlib: Fix DFLTCC ignoring flush modes when avail_in == 0 Mikhail Zaslonko
2023-01-26 13:14 ` [PATCH 5/8] lib/zlib: DFLTCC not writing header bits when avail_out " Mikhail Zaslonko
2023-01-26 13:14 ` [PATCH 6/8] lib/zlib: Split deflate and inflate states for DFLTCC Mikhail Zaslonko
2023-01-26 13:14 ` [PATCH 7/8] lib/zlib: DFLTCC support inflate with small window Mikhail Zaslonko
2023-01-26 13:14 ` Mikhail Zaslonko [this message]
2023-01-26 23:16 ` [PATCH 0/8] lib/zlib: Set of s390 DFLTCC related patches for kernel zlib Andrew Morton

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230126131428.1222214-9-zaslonko@linux.ibm.com \
    --to=zaslonko@linux.ibm.com \
    --cc=akpm@linux-foundation.org \
    --cc=gor@linux.ibm.com \
    --cc=hca@linux.ibm.com \
    --cc=iii@linux.ibm.com \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®