From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 08339C4332F for ; Wed, 12 Oct 2022 15:51:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229928AbiJLPvG (ORCPT ); Wed, 12 Oct 2022 11:51:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52244 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229560AbiJLPvF (ORCPT ); Wed, 12 Oct 2022 11:51:05 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3BA41DD884; Wed, 12 Oct 2022 08:51:05 -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 BF26361554; Wed, 12 Oct 2022 15:51:04 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 24C3DC433C1; Wed, 12 Oct 2022 15:51:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1665589864; bh=5oiJbk4Wc20uQL+BdtRPcfb6d2I8zHfn7X7Q6GlBoSY=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=Riz9yXenwGbo9sra5ieB5NMpTOy+nJMTJ4Inbc+xZgPKvR8T/x9PtF5OOaAlWzgBG 8uXujJUlrfnPB6b3HMaxMeVqzB5RyDjHi3gHl8gsTcT74Qi73tlWjqLnYkgDEnK975 z73HQfuw7b4YP59riB2OZOmgUO10rmXPJ6xzc94Zzrtv3qJXj2f+ITo9BWwAdY3LlF SKMu+5L4K6w5prOl+GABIpO8LgcoDdO1rP1YjggGGp3IrFHyX6Fo7U8F6IkYXsUmHe pvf+oMfKw0wL+zeAxbde4HdbWQHx5qTlH3jUgudWQjecUFBbuNSWrRGBLcbRrO2guD /uFOvrBHRGQKg== Date: Wed, 12 Oct 2022 08:51:03 -0700 From: "Darrick J. Wong" To: Zorro Lang Cc: guaneryu@gmail.com, linux-xfs@vger.kernel.org, fstests@vger.kernel.org, guan@eryu.me Subject: Re: [PATCH 1/2] check: detect and preserve all coredumps made by a test Message-ID: References: <166553910766.422356.8069826206437666467.stgit@magnolia> <166553911331.422356.4424521847397525024.stgit@magnolia> <20221012154721.gmuzp7inbtqbk73i@zlang-mailbox> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20221012154721.gmuzp7inbtqbk73i@zlang-mailbox> Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org On Wed, Oct 12, 2022 at 11:47:21PM +0800, Zorro Lang wrote: > On Tue, Oct 11, 2022 at 06:45:13PM -0700, Darrick J. Wong wrote: > > From: Darrick J. Wong > > > > If someone sets kernel.core_uses_pid (or kernel.core_pattern), any > > coredumps generated by fstests might have names that are longer than > > just "core". Since the pid isn't all that useful by itself, let's > > record the coredumps by hash when we save them, so that we don't waste > > space storing identical crash dumps. > > > > Signed-off-by: Darrick J. Wong > > --- > > check | 26 ++++++++++++++++++++++---- > > common/rc | 16 ++++++++++++++++ > > 2 files changed, 38 insertions(+), 4 deletions(-) > > > > > > diff --git a/check b/check > > index af23572ccc..654d986b27 100755 > > --- a/check > > +++ b/check > > @@ -913,11 +913,19 @@ function run_section() > > sts=$? > > fi > > > > - if [ -f core ]; then > > - _dump_err_cont "[dumped core]" > > - mv core $RESULT_BASE/$seqnum.core > > + # If someone sets kernel.core_pattern or kernel.core_uses_pid, > > + # coredumps generated by fstests might have a longer name than > > + # just "core". Use globbing to find the most common patterns, > > + # assuming there are no other coredump capture packages set up. > > + local cores=0 > > + for i in core core.*; do > > + test -f "$i" || continue > > + if ((cores++ == 0)); then > > + _dump_err_cont "[dumped core]" > > + fi > > + _save_coredump "$i" > > tc_status="fail" > > - fi > > + done > > > > if [ -f $seqres.notrun ]; then > > $timestamp && _timestamp > > @@ -950,6 +958,16 @@ function run_section() > > # of the check script itself. > > (_adjust_oom_score 250; _check_filesystems) || tc_status="fail" > > _check_dmesg || tc_status="fail" > > + > > + # Save any coredumps from the post-test fs checks > > + for i in core core.*; do > > + test -f "$i" || continue > > + if ((cores++ == 0)); then > > + _dump_err_cont "[dumped core]" > > + fi > > + _save_coredump "$i" > > + tc_status="fail" > > + done > > fi > > > > # Reload the module after each test to check for leaks or > > diff --git a/common/rc b/common/rc > > index d877ac77a0..152b8bb414 100644 > > --- a/common/rc > > +++ b/common/rc > > @@ -4949,6 +4949,22 @@ _create_file_sized() > > return $ret > > } > > > > +_save_coredump() > > +{ > > + local path="$1" > > + > > + local core_hash="$(_md5_checksum "$path")" > > + local out_file="$RESULT_BASE/$seqnum.core.$core_hash" > > I doubt this can work with fstests section, if we use section, the out_file > should be "$RESULT_BASE/$section/....", so I think if we can write this line > as: > > local out_file="$seqres.core.$core_hash" > > Or use $REPORT_DIR? I'll change it to REPORT_DIR. --D > Thanks, > Zorro > > > + > > + if [ -s "$out_file" ]; then > > + rm -f "$path" > > + return > > + fi > > + rm -f "$out_file" > > + > > + mv "$path" "$out_file" > > +} > > + > > init_rc > > > > ################################################################################ > > >