From nobody Wed Dec 17 07:31:33 2025 Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) (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 17A125477C for ; Wed, 8 May 2024 07:42:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715154179; cv=none; b=kX8Qm4n6A6MKtOZncRyCIAae1V03bJ8d+2kWrm5DHgrauKWTw9AONFrcQN8K+3rvQrLXI+w1G2FEJtAxe5SE3AQ5+O1U1BWncpSmhQHHxIyW5fgB0a+Ntp78GtzcpYfsrbKvHOLR1D37xil7EMMmxKjQryQCXdFpWyJIqhTkmWI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715154179; c=relaxed/simple; bh=fkmGnp5H4sYk5AcEucbfVYS4PjNz7ma3EYQ0ecKZnDQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mLK/rOScRuWVPSF8o2BZW53zwXhOWnYERyU7RV8wH03TTzfWotpfCW+tB8c3zDpMBgRB84pVblwNYOwf+R6sj7m/nN3Bi/k1SxDv9zfayI50Ii/bnxhmKIXTh1tITSM1gXQjHr/APAkcoeeWfs1rupmnSG23iH7hlxCIUsIffHQ= 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=H80IqcB0; arc=none smtp.client-ip=209.85.210.171 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="H80IqcB0" Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-6f457853950so411489b3a.0 for ; Wed, 08 May 2024 00:42:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1715154177; x=1715758977; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=0eIYrOQ3BkMXJCk6zuaDE2ECawMW63bMTlaOVOjCrZU=; b=H80IqcB0FwAB6hHdI88P8f4QJKwvMn7A8p8g+5vrIdknVDA/UZYCXoA0/q3VfdU/CB 1+DZjgHppFXLxXZPGrkvqpJ9uPMySdsXHIqx7fS3aesMhyAoiV8/VWnBQb9DXk4EniMg W0RDcxB+4dGF3xwJtv0vHPRqYmofKxCHMjSxs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715154177; x=1715758977; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0eIYrOQ3BkMXJCk6zuaDE2ECawMW63bMTlaOVOjCrZU=; b=Iib26geL6ydpAa6rWSndT3OByQqk42fd54UxtxWD6AGYcAMqyBSJBuMqddrMJOufvP Qak1lzDcQJfjGEKYiVHjhvevxjCVg8VIWBzgA+d/ImiSZkhEg9ZiUIvVvMeetBt2Oold X7W+DRPY+h6TStGdq8x5ANV2/evj2WxGuB1tOEZfBntfoOXL0UDCkwsbd+MJ7Qz4woMB FMvQMsqhqeM5RKAk8dXEY5asXnrgiAoXryItvtufbSYgcdsYKiplcxXOz5Fni7ntWvbs SUjYedG44lcZfCPZi+0vgIGU6cNPnPym2/lb4qL9//8fttKG/CTIdCN8792Z29x17e9a qlBw== X-Gm-Message-State: AOJu0Yz8xOESa9MZ0PfIjTrXz4Vl4tO2E0n/eUXPgT03G4guOlAveifO mTa4alP5+aRlu3iiBsl05Om70MGP+6w+XaU6ke+HGVxVL7SQttzaV5WVTzL1Xg== X-Google-Smtp-Source: AGHT+IHQgia9i24967sF+3KEw6udtuPb13bMRjWKcpvNAJbkVABQfoU1gdDD8sgKiYoXBBzsmpfN/Q== X-Received: by 2002:a17:90a:bd05:b0:2b4:32c0:d7d7 with SMTP id 98e67ed59e1d1-2b5bc2ad5b0mr7051893a91.16.1715154177470; Wed, 08 May 2024 00:42:57 -0700 (PDT) Received: from tigerii.tok.corp.google.com ([2401:fa00:8f:203:ad4d:5f6c:6699:2da4]) by smtp.gmail.com with ESMTPSA id l5-20020a17090aec0500b002b328adaa40sm780011pjy.17.2024.05.08.00.42.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 May 2024 00:42:56 -0700 (PDT) From: Sergey Senozhatsky To: Andrew Morton , Minchan Kim Cc: linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, Sergey Senozhatsky Subject: [PATCHv3 09/19] zram: check that backends array has at least one backend Date: Wed, 8 May 2024 16:42:02 +0900 Message-ID: <20240508074223.652784-10-senozhatsky@chromium.org> X-Mailer: git-send-email 2.45.0.rc1.225.g2a3ae87e7f-goog In-Reply-To: <20240508074223.652784-1-senozhatsky@chromium.org> References: <20240508074223.652784-1-senozhatsky@chromium.org> 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" Make sure that backends array has anything apart from the sentinel NULL value. We also select LZO_BACKEND if none backends were selected. Signed-off-by: Sergey Senozhatsky --- drivers/block/zram/Kconfig | 19 +++++++++++++------ drivers/block/zram/zcomp.c | 8 ++++++++ 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/drivers/block/zram/Kconfig b/drivers/block/zram/Kconfig index 1e0e7e5910b8..6aea609b795c 100644 --- a/drivers/block/zram/Kconfig +++ b/drivers/block/zram/Kconfig @@ -14,12 +14,6 @@ config ZRAM =20 See Documentation/admin-guide/blockdev/zram.rst for more information. =20 -config ZRAM_BACKEND_LZO - bool "lzo and lzo-rle compression support" - depends on ZRAM - select LZO_COMPRESS - select LZO_DECOMPRESS - config ZRAM_BACKEND_LZ4 bool "lz4 compression support" depends on ZRAM @@ -50,6 +44,19 @@ config ZRAM_BACKEND_842 select 842_COMPRESS select 842_DECOMPRESS =20 +config ZRAM_BACKEND_FORCE_LZO + depends on ZRAM + def_bool !ZRAM_BACKEND_LZ4 && !ZRAM_BACKEND_LZ4HC && \ + !ZRAM_BACKEND_ZSTD && !ZRAM_BACKEND_DEFLATE && \ + !ZRAM_BACKEND_842 + +config ZRAM_BACKEND_LZO + bool "lzo and lzo-rle compression support" if !ZRAM_BACKEND_FORCE_LZO + depends on ZRAM + default ZRAM_BACKEND_FORCE_LZO + select LZO_COMPRESS + select LZO_DECOMPRESS + choice prompt "Default zram compressor" default ZRAM_DEF_COMP_LZORLE diff --git a/drivers/block/zram/zcomp.c b/drivers/block/zram/zcomp.c index 2a38126f4da3..d49791f724e9 100644 --- a/drivers/block/zram/zcomp.c +++ b/drivers/block/zram/zcomp.c @@ -209,6 +209,14 @@ struct zcomp *zcomp_create(const char *alg) struct zcomp *comp; int error; =20 + /* + * The backends array has a sentinel NULL value, so the minimum + * size is 1. In order to be valid the array, apart from the + * sentinel NULL element, should have at least one compression + * backend selected. + */ + BUILD_BUG_ON(ARRAY_SIZE(backends) <=3D 1); + comp =3D kzalloc(sizeof(struct zcomp), GFP_KERNEL); if (!comp) return ERR_PTR(-ENOMEM); --=20 2.45.0.rc1.225.g2a3ae87e7f-goog