Received: by 2002:a05:6a10:7420:0:0:0:0 with SMTP id hk32csp4425457pxb; Mon, 21 Feb 2022 21:13:21 -0800 (PST) X-Google-Smtp-Source: ABdhPJwPX5Bp768TQ/UWmmZam78SRjTm12Dopd3jHb5Lt8l53FpaL3+7kHhuBY0Lj+HU7oOVaKSj X-Received: by 2002:a17:90a:10d6:b0:1bc:48ad:c8c8 with SMTP id b22-20020a17090a10d600b001bc48adc8c8mr2367717pje.149.1645506801038; Mon, 21 Feb 2022 21:13:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645506801; cv=none; d=google.com; s=arc-20160816; b=lAXe6py6uMLIgDiP+HTjXKA0s4HZWYBESPuiOcmfA5UMnwu327l9LYknmyypQQShav e+xdiD5Zm4wnNNSxDhKgvgwGiKkZk351yE3q4TsDjZAIhuU0+9p1j0ECJ/eLVt4jfcqY EiTsOxhfRv6pO1ympzcgmEUp4dim9qkng7vTatl/5CCXMe30YdNMH33BZKnWZxzv6d0Y UEgNnJI1lI6KfCpRXNN53+39IiS1kEssMnyYzjZPELCVjMlre+tITvu7CxUumQQ7eCP4 3mCu/W5bm6WbIlLE9XG5mihSM2ONxjebggIyZ1A+yaFxNXykSYSTxYqNM8IggNEqU3jQ CXvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=sSv0HmTBvPQGGsw5gnGusdRvXA7M0AM7UlCxqCT2e9g=; b=UvFr3t1Q9NebLOMPnpEAc8PJ87svhiQ7gjyahXlkCNccT/Vse5KXPqixC9nboCkn1Q GFoEbZarRmFFcktFs4ejJ/UVmAc+HITv0BVm9wVkUqlsqCmXg10isaFzteEBrfVEYLrF afXowvPMJaB1iXmZ6/YkFpQ/WIDz3m9I4e9HEQieVY9qJUL66ccI3Ma+pjZsPVRESl1A L2/Av3uX/4OSD1YmsS/z7DdGsiK42PIHVexMR2ThKMB/CdoTV0RxETvWWieOyjHhOdvY ZJ0AYVdq2Q+a8CMw2+Pb7+1CxGR4S4WgXZmU4r6WDAKJdh0njw4R0HIwq+VTdbEAEgv5 Oj2Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Nf1SNkmx; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id k12si11641700pfu.23.2022.02.21.21.13.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Feb 2022 21:13:21 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Nf1SNkmx; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 0C3FFDD447; Mon, 21 Feb 2022 20:45:45 -0800 (PST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1350254AbiBUJao (ORCPT + 99 others); Mon, 21 Feb 2022 04:30:44 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:38952 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1349372AbiBUJVS (ORCPT ); Mon, 21 Feb 2022 04:21:18 -0500 Received: from sin.source.kernel.org (sin.source.kernel.org [IPv6:2604:1380:40e1:4800::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 706E531DCC; Mon, 21 Feb 2022 01:08:15 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sin.source.kernel.org (Postfix) with ESMTPS id DC309CE0E88; Mon, 21 Feb 2022 09:08:13 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BCBE4C340EB; Mon, 21 Feb 2022 09:08:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1645434492; bh=OSHo2PJpIYtB2DIHy0v4CkW2SRFnO9seM4Vk8G09WJg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Nf1SNkmxXm38oOWJkXSJedKNwhLnZjZFkietNm5MktQ/jgr6ubH7VrRHrtwOcK/b7 yBEAac3y4UTXX/AybNGk8yKfN/L8A1GuCUSMp3J/3HyMAEJ2eUZ/S9fmyirGBYHhpo BqlKV861Gsbq63DEOOLq9/zVn73Ii0ITYFy91cPA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Yang Xu , Shuah Khan , Sasha Levin Subject: [PATCH 5.15 027/196] selftests/zram: Skip max_comp_streams interface on newer kernel Date: Mon, 21 Feb 2022 09:47:39 +0100 Message-Id: <20220221084931.811963653@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220221084930.872957717@linuxfoundation.org> References: <20220221084930.872957717@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Yang Xu [ Upstream commit fc4eb486a59d70bd35cf1209f0e68c2d8b979193 ] Since commit 43209ea2d17a ("zram: remove max_comp_streams internals"), zram has switched to per-cpu streams. Even kernel still keep this interface for some reasons, but writing to max_comp_stream doesn't take any effect. So skip it on newer kernel ie 4.7. The code that comparing kernel version is from xfstests testsuite ext4/053. Signed-off-by: Yang Xu Signed-off-by: Shuah Khan Signed-off-by: Sasha Levin --- tools/testing/selftests/zram/zram_lib.sh | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/tools/testing/selftests/zram/zram_lib.sh b/tools/testing/selftests/zram/zram_lib.sh index 6f872f266fd11..f47fc0f27e99e 100755 --- a/tools/testing/selftests/zram/zram_lib.sh +++ b/tools/testing/selftests/zram/zram_lib.sh @@ -11,6 +11,9 @@ dev_mounted=-1 # Kselftest framework requirement - SKIP code is 4. ksft_skip=4 +kernel_version=`uname -r | cut -d'.' -f1,2` +kernel_major=${kernel_version%.*} +kernel_minor=${kernel_version#*.} trap INT @@ -25,6 +28,20 @@ check_prereqs() fi } +kernel_gte() +{ + major=${1%.*} + minor=${1#*.} + + if [ $kernel_major -gt $major ]; then + return 0 + elif [[ $kernel_major -eq $major && $kernel_minor -ge $minor ]]; then + return 0 + fi + + return 1 +} + zram_cleanup() { echo "zram cleanup" @@ -86,6 +103,13 @@ zram_max_streams() { echo "set max_comp_streams to zram device(s)" + kernel_gte 4.7 + if [ $? -eq 0 ]; then + echo "The device attribute max_comp_streams was"\ + "deprecated in 4.7" + return 0 + fi + local i=0 for max_s in $zram_max_streams; do local sys_path="/sys/block/zram${i}/max_comp_streams" -- 2.34.1