From patchwork Mon Oct 19 18:21:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rui Salvaterra X-Patchwork-Id: 1384466 X-Patchwork-Delegate: mail@aparcar.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=bx16Qgkq; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=Hu8iu8T/; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (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) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CFQ9L4Nrpz9sTK for ; Tue, 20 Oct 2020 05:23:02 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=MqK18FuYE+UkB0gHReWXKq8VbNvpSJkR9xEmtndUfnQ=; b=bx16Qgkqa26Xzxhwm4A6mHKoBj eXY+pw7OJbzcERsDBv0IbiQ7XuqssXlOEkKxxY3KQzLMCOIL8RqJi8JUfyIBeCVMcP22b5MJqey7B k2AEIt8W7rYelvEr+RaD5KkpT8qAM43keWaoKISAC/dT3Q4bIyaowYTlVVott6qFWGFaC1pHmAHl9 2dy5oSBILt/lY3PjPGxal+DA1eb+mvZwZSpSx95kwLnnCjZUFhnnYp4fWA2HwBO4zJtXx5YSqGsDW PIIvEpwHln/XzUdpGSYuD4ZQQhx6yiQSWUdwXEKrtBGvTHGezgeClhj6CIAN1swhjht9pl0KJR4j/ XJEgkudg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kUZmg-0001D5-27; Mon, 19 Oct 2020 18:21:26 +0000 Received: from mail-oi1-x241.google.com ([2607:f8b0:4864:20::241]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kUZmd-0001Ch-Io for openwrt-devel@lists.openwrt.org; Mon, 19 Oct 2020 18:21:24 +0000 Received: by mail-oi1-x241.google.com with SMTP id n3so985216oie.1 for ; Mon, 19 Oct 2020 11:21:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=sH4fCWGJGbq/S8XJdg10ucJ/qMJyCl8XCpOTih/aDdA=; b=Hu8iu8T/3WQQ+C7Y6bvHzOJVeGc89dmmkZ4sVz++uiYJMiyNmxiH0N1E70lml485r3 dR8X0ySxAdU3GujlCKzxdTxO0iRcVxnrveVTfgfANf+i2i7TvM2an9vBp541+5W02YF0 xWT1B2zpmC1hLuc6cwMUPwCc0/ZZQsXAYC6P1WqyZ/DnrsskU/ALZAJDB8OGAlMNEtTd jT7nlpY9NNiuxAk4aYXWTXs+jP8jcz2CcW2ArANiWGCUehNS/F6SAAX2ocultpII6jAE KHAkYvVXTqu+t2fSgpaS3dsmAfrDtegBoPburQun/pHYwKPPOjnxR0P3q3YGUmXFbaMu 4qFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=sH4fCWGJGbq/S8XJdg10ucJ/qMJyCl8XCpOTih/aDdA=; b=odVmV6f1uUeRpkIQtCJYxAOoLsUmaYtbPRyCPOCq84gB8AJzaHC3Pwm/jNm7PS93Ww QMNU22gn3fsxmERv2jr6yb0g0jY6WP3mw3nNlUQXkZ9NO2pVAn8wDzuRnX+AfcVjpwZr uNgA+aahjqcUt7EfLv5rVd3iTOaIlMbo2a1kElLuEAO4f1vcz/FjYJLaIhTN0sm/9sFc bEmDIJaFABVdEAnX3rexO2hrSy/8G/D2YhJRJeR4GbJBKavn26IDxpXJcdMGfOuu7g3G xQkKRmagnoNrvwav4MnvGXdWczpgW0icPgWLTi2GKsZHVb1INtnpdq10ifXNNePICZB6 Yb9Q== X-Gm-Message-State: AOAM532fMclybbmIZuA9+B3D3hPKZTemmpU4ggKRbhDFwgeFW3A090si jkH8nZgT9xbbCiMXcB/+hdeYCD3FbsS/ X-Google-Smtp-Source: ABdhPJxXsZt83CdD5k5mauUeXePu4X7oBSDEo/ibDbx3P0g0SrMq2G2Xyt+NNVXbB4njQtl8prh8DA== X-Received: by 2002:aca:918:: with SMTP id 24mr462835oij.179.1603131681525; Mon, 19 Oct 2020 11:21:21 -0700 (PDT) Received: from presler.lan (a95-93-121-164.cpe.netcabo.pt. [95.93.121.164]) by smtp.gmail.com with ESMTPSA id e20sm102961otj.57.2020.10.19.11.21.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Oct 2020 11:21:21 -0700 (PDT) From: Rui Salvaterra To: openwrt-devel@lists.openwrt.org Subject: [PATCH] zram-swap: remove the compression streams settings Date: Mon, 19 Oct 2020 19:21:13 +0100 Message-Id: <20201019182113.958966-1-rsalvaterra@gmail.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201019_142123_666249_00C50365 X-CRM114-Status: GOOD ( 10.63 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:241 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [rsalvaterra[at]gmail.com] -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Rui Salvaterra Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Zram switched to per-cpu compression streams since Linux 4.7 [1]. Drop the irrelevant configuration (no-op). [1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/drivers/block/zram?h=v4.7&id=43209ea2d17aae1540d4e28274e36404f72702f2 Signed-off-by: Rui Salvaterra --- package/system/zram-swap/files/zram.init | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/package/system/zram-swap/files/zram.init b/package/system/zram-swap/files/zram.init index a42f019d92..98e99c0219 100755 --- a/package/system/zram-swap/files/zram.init +++ b/package/system/zram-swap/files/zram.init @@ -98,19 +98,6 @@ zram_comp_algo() fi } -zram_comp_streams() -{ - local dev="$1" - local logical_cpus=$( grep -ci "^processor" /proc/cpuinfo ) - [ $logical_cpus -gt 1 ] || return 1 - local zram_comp_streams="$( uci -q get system.@system[0].zram_comp_streams )" - [ -n "$zram_comp_streams" ] && [ "$zram_comp_streams" -le "$logical_cpus" ] || zram_comp_streams=$logical_cpus - if [ -e /sys/block/$( basename $dev )/max_comp_streams ]; then - logger -s -t zram_comp_streams -p daemon.debug "Set max compression streams to '$zram_comp_streams' for zram '$dev'" - echo $zram_comp_streams > /sys/block/$( basename $dev )/max_comp_streams - fi -} - #print various stats info about zram swap device zram_stats() { @@ -122,7 +109,6 @@ zram_stats() printf "%-25s - %s\n" "Block device" $zdev awk '{ printf "%-25s - %d MiB\n", "Device size", $1/1024/1024 }' <$zdev/disksize printf "%-25s - %s\n" "Compression algo" "$(cat $zdev/comp_algorithm)" - printf "%-25s - %s\n" "Compression streams" "$( cat $zdev/max_comp_streams)" awk 'BEGIN { fmt = "%-25s - %.2f %s\n" fmt2 = "%-25s - %d\n" @@ -180,7 +166,6 @@ start() zram_reset "$zram_dev" "enforcing defaults" zram_comp_algo "$zram_dev" - zram_comp_streams "$zram_dev" echo $(( $zram_size * 1024 * 1024 )) >"/sys/block/$( basename "$zram_dev" )/disksize" /sbin/mkswap "$zram_dev" /sbin/swapon -d $zram_priority "$zram_dev"