From nobody Mon Dec 15 21:31:26 2025 Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 26A5E1DB122 for ; Wed, 15 Jan 2025 07:20:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736925612; cv=none; b=QmqNUMPfQfg32ZIaR+GNJ5jCSMhj29hzs+B5iBsUAXT372pdhBYZ4zEZeI5DHaEkeLX/27+G/O4cuwr6dDKK80sOKCRknjDxEsyG5RTuxeEoXv+SVHFj3ZX6a0kEZujnQktFgBQkTzasjR2w6JYaQ/eg6G/qM6YBzmMd62X/Oeo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736925612; c=relaxed/simple; bh=E8ckDsTaa33V+67aDLnG/L2UB10hN1QCV57TSqonR/U=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=jit646MnzZ4iXArusJfC3qUMJ79NU6W4KG4b0eQvRNBn5GgGM8+TIr8IjDCpIMCgaNI/rAA908n253fSrv9HpQog/kikGV5BLoVPwh8s7mYTFje6CVlPkFQRekRP+BLD5EQYRToa81SLblt7FTd7vUhnNImjEz1lMi3kdgXcM4o= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=oR2dCVdc; arc=none smtp.client-ip=209.85.214.181 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="oR2dCVdc" Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-21a7ed0155cso109828835ad.3 for ; Tue, 14 Jan 2025 23:20:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1736925610; x=1737530410; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=jWst7CEsxoDR+MlmyvYXB6MxmzLdziqPyCsXYSkJ7fo=; b=oR2dCVdctDi3WOEeAcJkXNzDO748PsSn2RcMiLi1xtTap9AEi8mChj3JS+ixm1qrZA SJMMRyFEjXZxlgVqGC/ABfoq2X/hVult1SnvOh8TPKF8lWe3x1kUrSNtfw8u1brDTbxU rzF28SJl2mhk+mrlZGR19nouV5tjyK/gw/cqU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736925610; x=1737530410; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=jWst7CEsxoDR+MlmyvYXB6MxmzLdziqPyCsXYSkJ7fo=; b=CtNajClxFEMNhYURs6pw+IbvIhbqNF6+kPL9p43WKGDqzkIXaEis6aUJBUzFMDJ4Fh O0HkYsDvQIuRs6tIQoeN5yr3F07595sl6N0yEDMrIPiQq64l/Y5oX7NJHXDXujKrA+yZ A1UUCvDcvvNlgCcoS+E5HR+2XR7qBfX04xTyPmGBuQPEHAAYvLxLyXeQGHqtYt/g+dXg u6aE/KzDuEdW9H832x8XYjPUOJb3PFco7Q7WAB1Z2wS08/Ly6SvEw7Tm7FYC5bUUZ7OQ K7t7YVGDNX9vftSrn63JftepyFuft+gdkF0BhyTfUgqeA/7qH+MppeQWa4rvOrcLc1KN e1Jg== X-Forwarded-Encrypted: i=1; AJvYcCWRgps7IAdRZaBCf6C3Xfv2GImaKpQkMkz12RT3xhZneTR23z0B9K28CgVLiTwFdhHd58HtwdBZWgvxx6U=@vger.kernel.org X-Gm-Message-State: AOJu0Yy+G9aGeNFIaa0me3tL6WZGPuSBBau1ycQQ8ygofwx6YjaxyDxC KeFhrO6fEcm2vkf0Mvd1bKElww2zaeN9tzZdsPo6b6I6qzsKCHniJuQbi39dmTZ/CwEE1PEHqRk = X-Gm-Gg: ASbGnctPsm62v6Lrc0B6lEsi/pNXDOVvRO1pSMy3Jeqzz47V6cDeTIintzJztkeYo1H qoivjh/9fP4AGQcgHkktJreGxwRpsbQfcLI6tSuCh10Imz8LdWDwOQucZaBYXVMZCiRanFKRpxX tjNKmX4Qqfq/MAB++/f0eXS27uU3iiAd2BRclLUIAuSY6UvHrpn0YaW3tlx8dJPgZIIWqEOC7N7 tCKgwpabd3gUzzn26Gb+8XfPz8hjcNV3tzVoSHDMh5f80FF699b3E7/FBE= X-Google-Smtp-Source: AGHT+IEup1Svhzkxj5ADbSrGrrC5zT+F+jidXaeQyAEkLBPK4iaHjtUzMBPZBzljTJ3J67vNnrGMTQ== X-Received: by 2002:a05:6a00:2c8d:b0:72d:3c4d:c1ea with SMTP id d2e1a72fcca58-72d3c4dc254mr22273996b3a.7.1736925610412; Tue, 14 Jan 2025 23:20:10 -0800 (PST) Received: from localhost ([2401:fa00:8f:203:2b5b:3224:29a3:d5ab]) by smtp.gmail.com with UTF8SMTPSA id d2e1a72fcca58-72d405484fbsm8399491b3a.22.2025.01.14.23.20.08 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 14 Jan 2025 23:20:10 -0800 (PST) From: Sergey Senozhatsky To: Andrew Morton Cc: Minchan Kim , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Sergey Senozhatsky Subject: [PATCH] zram: remove zcomp_stream_put() from write_incompressible_page() Date: Wed, 15 Jan 2025 16:19:16 +0900 Message-ID: <20250115072003.380567-1-senozhatsky@chromium.org> X-Mailer: git-send-email 2.48.0.rc2.279.g1de40edade-goog Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" We cannot and should not put per-CPU compression stream in write_incompressible_page() because that function never gets any per-CPU streams in the first place. It's zram_write_page() that puts the stream before it calls write_incompressible_page(). Signed-off-by: Sergey Senozhatsky --- drivers/block/zram/zram_drv.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c index 70ecaee25c20..9f5020b077c5 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -1683,7 +1683,6 @@ static int write_incompressible_page(struct zram *zra= m, struct page *page, return PTR_ERR((void *)handle); =20 if (!zram_can_store_page(zram)) { - zcomp_stream_put(zram->comps[ZRAM_PRIMARY_COMP]); zs_free(zram->mem_pool, handle); return -ENOMEM; } --=20 2.48.0.rc2.279.g1de40edade-goog