From patchwork Wed Oct 19 23:02:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Paul E. McKenney" X-Patchwork-Id: 5924 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp576250wrs; Wed, 19 Oct 2022 16:04:45 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7FzPFyk8T4E3qfinxaxjVAAHqwnBoO3CccKTmjE9Z/SjYfjqChX2vESdEmbNMiRm9punk+ X-Received: by 2002:a05:6402:26d5:b0:45d:8d93:d5be with SMTP id x21-20020a05640226d500b0045d8d93d5bemr9513621edd.13.1666220685439; Wed, 19 Oct 2022 16:04:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666220685; cv=none; d=google.com; s=arc-20160816; b=PjZZkvW2dWzowhWC3c6mk+ygZS+lNBF2KWIzBW3ImaqTHROqXOE0csKiYujTKXFNvB N2MnTuNYbVisDPIsU+KMKh2ITA2wxrChXga16hNwVNg8K2sX1jVWCbmBeOQsxtjrGKwh B1my+iYLj2fk5BRo75MnFJY2z1Tg622hJ9I1+cPClVVH3mMI/nQvEx4YyMrqf9yS15wY gLgTVfgIGncWvlNnXTKgiH/IjFwH3U+fz7c5g3xkVICf+Txe2UWyuv9HnKVnIOcEk7Fz AF1BSAf1McUYXufx3XzTgnvJ9kUAhsBaTMexzfEKj3gJMuKoWWSNbZ6eigrhNgpzmzQ3 obRQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=IA/MpJ8YdZV62wIt+a9tZkqpB6iKFpvP1FswvIrrNRM=; b=uU1ZCPUAm69FCp9aytyOxLeg4fBIy9PfzDGEZkYlmmuR5E0cO69HJkOjPJL1N1Jo+c totb0/laU9yZfu1lBWEoAC3SlYiqKlLzoRIJkDMeouGmqRqD67ngt0tql/MbyUFBUT/j JrAif5qXHX1VWTbAethLc/stEAVgUbvh05wpFBdPZJKQt6tDjMmi8KbYAhChFg9gmFWS 4SbTnUX2U+2LLKBOAUWP4Sxkr1hjTfpuSnyAjESN4jh+hjh3zJNppmxoF011l8+5KEN4 HaJ9rkEmA9IKIvYjfPxHDc6NKelzuLbaDyYnLifau+jMJ+bX6EzePT1c7TLL7Hpk6Wq+ YNFg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=WhG4U6UC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id hz2-20020a1709072ce200b00790058488dcsi7992096ejc.48.2022.10.19.16.04.20; Wed, 19 Oct 2022 16:04:45 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=WhG4U6UC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231516AbiJSXDK (ORCPT + 99 others); Wed, 19 Oct 2022 19:03:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33024 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231539AbiJSXCm (ORCPT ); Wed, 19 Oct 2022 19:02:42 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 28D111D20DE; Wed, 19 Oct 2022 16:02:28 -0700 (PDT) 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 dfw.source.kernel.org (Postfix) with ESMTPS id 290F4619EF; Wed, 19 Oct 2022 23:02:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8DA11C43146; Wed, 19 Oct 2022 23:02:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1666220528; bh=53szEup4hjdcWI9Azzzq4yiaAkzJ587FLazGGLmL35A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WhG4U6UCinBnXe16hT7wyq9VdsjvWs58hsfo0agBdGhinwDXsVImyfnBtXxkN+4vN D29up0IyrPFqCrCnF77qJkRfVDp6zdftgKFx4bhy7P4ViUWLtJDrebFIV7LJuZfVw8 op8ubtBmgJJzHAtCcYqgmch0K8+4aMBRGxvhncuWFfM9YAired30QvZeaFRFOO75PX iU5hsYo2LdHefazQZrGJeTJTythxLoiSYVyEP7zw7a7jQqoTaHBYCf0+mBtD0tWlV6 T/pq/QxIABFNw6D5ntPc0cLf5dGSgQHd6cw4huhk05qoNlOlHmTjxbR7HWajjMZzBR zibkwiYlm6wnA== Received: by paulmck-ThinkPad-P17-Gen-1.home (Postfix, from userid 1000) id F41FA5C0AC5; Wed, 19 Oct 2022 16:02:07 -0700 (PDT) From: "Paul E. McKenney" To: rcu@vger.kernel.org Cc: linux-kernel@vger.kernel.org, kernel-team@fb.com, rostedt@goodmis.org, "Paul E. McKenney" Subject: [PATCH v3 rcu 7/8] rcutorture: Avoid torture.sh compressing identical files Date: Wed, 19 Oct 2022 16:02:05 -0700 Message-Id: <20221019230206.2501794-7-paulmck@kernel.org> X-Mailer: git-send-email 2.31.1.189.g2e36527f23 In-Reply-To: <20221019230203.GA2501612@paulmck-ThinkPad-P17-Gen-1> References: <20221019230203.GA2501612@paulmck-ThinkPad-P17-Gen-1> MIME-Version: 1.0 X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747159021368560185?= X-GMAIL-MSGID: =?utf-8?q?1747159021368560185?= Currently, torture.sh will compress the vmlinux files for KASAN and KCSAN runs. But it will compress all of the files, including those copied verbatim by the kvm-again.sh script. Compression takes around ten minutes, so this is not a good thing. This commit therefore compresses only one of a given set of identical vmlinux files, and then hard-links it to the directories produced by kvm-again.sh. Signed-off-by: Paul E. McKenney --- .../selftests/rcutorture/bin/torture.sh | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/rcutorture/bin/torture.sh b/tools/testing/selftests/rcutorture/bin/torture.sh index b376688fe280a..fc63539377147 100755 --- a/tools/testing/selftests/rcutorture/bin/torture.sh +++ b/tools/testing/selftests/rcutorture/bin/torture.sh @@ -536,7 +536,10 @@ if test -n "$tdir" && test $compress_concurrency -gt 0 then # KASAN vmlinux files can approach 1GB in size, so compress them. echo Looking for K[AC]SAN files to compress: `date` > "$tdir/log-xz" 2>&1 - find "$tdir" -type d -name '*-k[ac]san' -print > $T/xz-todo + find "$tdir" -type d -name '*-k[ac]san' -print > $T/xz-todo-all + find "$tdir" -type f -name 're-run' -print | sed -e 's,/re-run,,' | + grep -e '-k[ac]san$' > $T/xz-todo-copy + sort $T/xz-todo-all $T/xz-todo-copy | uniq -u > $T/xz-todo ncompresses=0 batchno=1 if test -s $T/xz-todo @@ -568,6 +571,22 @@ then echo Waiting for final batch $batchno of $ncompresses compressions `date` | tee -a "$tdir/log-xz" | tee -a $T/log fi wait + if test -s $T/xz-todo-copy + then + echo Linking vmlinux.xz files to re-use scenarios `date` | tee -a "$tdir/log-xz" | tee -a $T/log + dirstash="`pwd`" + for i in `cat $T/xz-todo-copy` + do + cd $i + find "$i" -name vmlinux -print > $T/xz-todo-copy-vmlinux + for v in `cat $T/xz-todo-copy-vmlinux` + do + rm -f "$v" + cp -l "$i/$v".xz "`dirname "$v"`" + done + cd "$dirstash" + done + fi echo Size after compressing $n2compress files: `du -sh $tdir | awk '{ print $1 }'` `date` 2>&1 | tee -a "$tdir/log-xz" | tee -a $T/log echo Total duration `get_starttime_duration $starttime`. | tee -a $T/log else