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 B15C1C43217 for ; Thu, 13 Oct 2022 15:48:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229582AbiJMPsp (ORCPT ); Thu, 13 Oct 2022 11:48:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39012 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229573AbiJMPso (ORCPT ); Thu, 13 Oct 2022 11:48:44 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6E283EA69E; Thu, 13 Oct 2022 08:48:43 -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 E6873604EF; Thu, 13 Oct 2022 15:48:42 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5051CC433D7; Thu, 13 Oct 2022 15:48:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1665676122; bh=rAZmVAL6ExNw6OlHX6L00sEulTBKcFrkL7bUWwx4WXI=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=RGwn78bMQiSqfX5eqk2h1cxjDeqTBRC6OooilbpwhJtMdVrlIDsdk3wIpdv6EFF43 v/I+dPGdPtmoWsvf7/FAJZYbZzy1cDChphOeE3RQ3zw/pKOzfroQ44nXcgRtQ52iRc QGYxU/1hIitg1Y10TFxpi6xBGQ4ABPMumw+Ta2wdqJRdF16EbpmslmxJCZejd/fsKy QUp4GhFbVXyQUGCK2avxB6QkdI9LpYzWprwyQ430ewie9MBvfHMTjGAiaT9KqLbl/9 s2tLgIcG8pJQiEADJ/nc//Egw6Yww5zqUHIiCm3Btvk3xKK1/+rdukM/Qe8LjWnDww 5YhBsA75SEcFg== Date: Thu, 13 Oct 2022 08:48:41 -0700 From: "Darrick J. Wong" To: Zorro Lang Cc: linux-xfs@vger.kernel.org, fstests@vger.kernel.org Subject: Re: [PATCH v2.1 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> <20221013114446.346ii4nd5i3l77ar@zlang-mailbox> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20221013114446.346ii4nd5i3l77ar@zlang-mailbox> Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org On Thu, Oct 13, 2022 at 07:44:46PM +0800, Zorro Lang wrote: > On Wed, Oct 12, 2022 at 05:19:50PM -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 > > --- > > v2.1: use REPORT_DIR per maintainer suggestion > > --- > > This version looks good to me, > Reviewed-by: Zorro Lang It occurred to me overnight that ./check doesn't export REPORT_DIR, so I'll push out a v2.2 that adds that. Currently the lack of an export doesn't affect anyone, but as soon as any tests want to call _save_coredump they're going to run into that issue. (...and yes, I do have future fuzz tests that will call it from a test in between fuzz field cycles.) --D > > check | 26 ++++++++++++++++++++++---- > > common/rc | 16 ++++++++++++++++ > > 2 files changed, 38 insertions(+), 4 deletions(-) > > > > diff --git a/check b/check > > index d587a70546..29303db1c8 100755 > > --- a/check > > +++ b/check > > @@ -923,11 +923,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 > > @@ -960,6 +968,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..2e1891180a 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="$REPORT_DIR/$seqnum.core.$core_hash" > > + > > + if [ -s "$out_file" ]; then > > + rm -f "$path" > > + return > > + fi > > + rm -f "$out_file" > > + > > + mv "$path" "$out_file" > > +} > > + > > init_rc > > > > ################################################################################ > > >