Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.3 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 86EA8C07E95 for ; Fri, 2 Jul 2021 21:27:17 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9AD02613FB for ; Fri, 2 Jul 2021 21:27:16 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9AD02613FB Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A85CB814A4; Fri, 2 Jul 2021 23:27:14 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.b="nw3Xki/7"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 362A081D48; Fri, 2 Jul 2021 23:27:13 +0200 (CEST) Received: from mail-qt1-x82e.google.com (mail-qt1-x82e.google.com [IPv6:2607:f8b0:4864:20::82e]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 9A79380A22 for ; Fri, 2 Jul 2021 23:27:09 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=trini@konsulko.com Received: by mail-qt1-x82e.google.com with SMTP id z12so2586192qtj.3 for ; Fri, 02 Jul 2021 14:27:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=H8D9qcHzbs9rWIqkIFSYWGS0k+mvuZFhS/zcxLhMN1M=; b=nw3Xki/75h9TicEnhKf0fe1Eqq4O88Xpz99v/TfTL7lZSAF5lZozg2S1KqAlknh6aO tUuS1+f7Ue4HgEGdKFOptGR7QEZ/ek54UHahCrWUPcDS9Z0OKsF9J9O3nWCzAInoocWJ abp+wOHvmGGiJurLmD3CxKae0s2MhHcE3flqI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=H8D9qcHzbs9rWIqkIFSYWGS0k+mvuZFhS/zcxLhMN1M=; b=BMak8euVKKZGkaHr7xxAlrAIY8Ff9vK2JeRsMD4Y13+CiyGVeAjAxAbWXi2k3mOoc9 dOxykkAikiN4eMVd3g77MN1PS6soQj5YEhtkM5ps53sE3U0y1oaRkEriuE6QbnDyOesd n+kyVmF9GI6b1QgIY/yTLwie+4jEuAkNMMTtxcn5IhxyiNlhPHHmC1+Jw757yOemhBZ9 r3XjWAQXMMR86qmfPfDkNIVh15faEc00YQwA+xEQf2yO9UMqC9ac+VuxuN8/hWDt4EaU W+t6lHTIuDiJ1Ex6t1/24KwMq6weLcbAp1LMrZNaw6Z6v4Fw7rBIzibPS1vfr5XXuceI BR0w== X-Gm-Message-State: AOAM533+m+j9Fz8iHf9bIIMan4yReB1qysLaYaPc0PZ4/tyw+Ku45XT3 QRF9fyaJu/FW7Sh16sFKtE9vzQ== X-Google-Smtp-Source: ABdhPJzKPj8Pijhqagn5J3euukoFjMZc/L+YI/I5KmWV05LsBlf6Zh5xjHHXHXq+/RLZk781EZri6g== X-Received: by 2002:ac8:698e:: with SMTP id o14mr1677030qtq.171.1625261228334; Fri, 02 Jul 2021 14:27:08 -0700 (PDT) Received: from bill-the-cat (2603-6081-7b01-cbda-447a-194c-2139-e81a.res6.spectrum.com. [2603:6081:7b01:cbda:447a:194c:2139:e81a]) by smtp.gmail.com with ESMTPSA id p64sm1925127qka.114.2021.07.02.14.27.07 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 02 Jul 2021 14:27:07 -0700 (PDT) Date: Fri, 2 Jul 2021 17:27:05 -0400 From: Tom Rini To: Alper Nebi Yasak Cc: u-boot@lists.denx.de, Andy Shevchenko , Heinrich Schuchardt , Akashi Takahiro , Simon Glass Subject: Re: [RFC] Start using guestfish for U-Boot fs tests Message-ID: <20210702212705.GH9516@bill-the-cat> References: <20210702190107.GA9516@bill-the-cat> <9e231ca9-4412-f324-3870-2bc59c9dbed2@gmail.com> <7e27bfdf-0e54-904f-6e0d-d5d6f69798f2@gmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="W1lZOzVoPlD0rjpc" Content-Disposition: inline In-Reply-To: <7e27bfdf-0e54-904f-6e0d-d5d6f69798f2@gmail.com> X-Clacks-Overhead: GNU Terry Pratchett User-Agent: Mutt/1.9.4 (2018-02-28) X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean --W1lZOzVoPlD0rjpc Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Jul 02, 2021 at 11:14:00PM +0300, Alper Nebi Yasak wrote: > On 02/07/2021 23:03, Alper Nebi Yasak wrote: > > On 02/07/2021 22:01, Tom Rini wrote: > >> Hey all, > >> > >> I started taking a look at moving to guestfish to see if this resolves > >> the latest problem I've run in to: > >> https://source.denx.de/u-boot/u-boot/-/jobs/284763#L307 > >> which I think is due to guestmount not being done in time for the test. > >=20 > > That failing test's setup uses virt-make-fs, different from what you're > > changing below. I locally only see that failure for the clang build, and > > it still fails after adding time.sleep(300) after its virt-make-fs > > calls. I don't think it's an issue in the test setup. > >=20 > >> So I started converting things to use guestfish directly: > >> diff --git a/test/py/tests/test_fs/conftest.py b/test/py/tests/test_fs= /conftest.py > >> index 7325486cdb1a..e8899cfdd118 100644 > >> --- a/test/py/tests/test_fs/conftest.py > >> +++ b/test/py/tests/test_fs/conftest.py > >> @@ -265,10 +265,10 @@ def fs_obj_basic(request, u_boot_config): > >> fs_ubtype =3D fstype_to_ubname(fs_type) > >> check_ubconfig(u_boot_config, fs_ubtype) > >> =20 > >> - mount_dir =3D u_boot_config.persistent_data_dir + '/mnt' > >> + data_dir =3D u_boot_config.persistent_data_dir + '/data' > >> =20 > >> - small_file =3D mount_dir + '/' + SMALL_FILE > >> - big_file =3D mount_dir + '/' + BIG_FILE > >> + small_file =3D data_dir + '/' + SMALL_FILE > >> + big_file =3D data_dir + '/' + BIG_FILE > >> =20 > >> try: > >> =20 > >> @@ -279,26 +279,14 @@ def fs_obj_basic(request, u_boot_config): > >> return > >> =20 > >> try: > >> - check_call('mkdir -p %s' % mount_dir, shell=3DTrue) > >> + check_call('mkdir -p %s' % data_dir, shell=3DTrue) > >> except CalledProcessError as err: > >> pytest.skip('Preparing mount folder failed for filesystem: ' = + fs_type + '. {}'.format(err)) > >> call('rm -f %s' % fs_img, shell=3DTrue) > >> return > >> =20 > >> try: > >> - # Mount the image so we can populate it. > >> - mount_fs(fs_type, fs_img, mount_dir) > >> - except CalledProcessError as err: > >> - pytest.skip('Mounting to folder failed for filesystem: ' + fs= _type + '. {}'.format(err)) > >> - call('rmdir %s' % mount_dir, shell=3DTrue) > >> - call('rm -f %s' % fs_img, shell=3DTrue) > >> - return > >> - > >> - try: > >> - # Create a subdirectory. > >> - check_call('mkdir %s/SUBDIR' % mount_dir, shell=3DTrue) > >> - > >> - # Create big file in this image. > >> + # Create big file to copy in to the image. > >> # Note that we work only on the start 1MB, couple MBs in the = 2GB range > >> # and the last 1 MB of the huge 2.5GB file. > >> # So, just put random values only in those areas. > >> @@ -309,10 +297,14 @@ def fs_obj_basic(request, u_boot_config): > >> check_call('dd if=3D/dev/urandom of=3D%s bs=3D1M count=3D1 se= ek=3D2499' > >> % big_file, shell=3DTrue) > >> =20 > >> - # Create a small file in this image. > >> + # Create a small file to copy in to the image. > >> check_call('dd if=3D/dev/urandom of=3D%s bs=3D1M count=3D1' > >> % small_file, shell=3DTrue) > >> =20 > >> + # Copy the files in to the image and add a subdirectory. > >> + # Create a subdirectory. > >> + check_call('guestfish add %s : run : mount /dev/sda / : mkdir= /SUBDIR : copy-in %s %s /' > >> + % (fs_img, big_file, small_file), shell=3DTrue) > >=20 > > It could be faster to do things within guestfish as much as possible, > > instead of preparing the files outside and copying them in. > >=20 > > Also it looks like python bindings are available as python3-guestfs on > > Debian and Ubuntu, just not on pypi.org. > >=20 > >> # Delete the small file copies which possibly are written as = part of a > >> # previous test. > >> # check_call('rm -f "%s.w"' % MB1, shell=3DTrue) > >> @@ -357,13 +349,11 @@ def fs_obj_basic(request, u_boot_config): > >> =20 > >> except CalledProcessError as err: > >> pytest.skip('Setup failed for filesystem: ' + fs_type + '. {}= '.format(err)) > >> - umount_fs(mount_dir) > >> return > >> else: > >> - umount_fs(mount_dir) > >> yield [fs_ubtype, fs_img, md5val] > >> finally: > >> - call('rmdir %s' % mount_dir, shell=3DTrue) > >> + call('rmdir %s' % data_dir, shell=3DTrue) > >> call('rm -f %s' % fs_img, shell=3DTrue) > >> =20 > >> # > >> > >> The problem here is that a test run went from taking about 5 minutes to > >> taking about 17 minutes. I can reduce this to closer to 15 minutes wi= th > >> LIBGUESTFS_BACKEND=3Ddirect and using libguestfs-make-fixed-appliance = to > >> make an appliance we reuse. But that's still too long to be usable. > >> I'm hoping someone has some ideas here on how to improve things. > >=20 > > If libguestfs is falling back to slow emulation because /dev/kvm isn't > > available, maybe it's appropriate to check for that and skip the fs tes= ts... >=20 > Also the User-Mode Linux backend might be worth exploring. Trying to use user-mode-linux under Docker and I'm running in to another round of failures and annoyances. This might be easier with a Debian rather than Ubuntu based container, so I'm not giving up yet, but it's not a trivial switch anyhow. --=20 Tom --W1lZOzVoPlD0rjpc Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGzBAABCgAdFiEEGjx/cOCPqxcHgJu/FHw5/5Y0tywFAmDfhKIACgkQFHw5/5Y0 tyxxDAv/bMpUDqJYtkCWp9LavWqCmGQRE+XTJqe2FF/zacVd/9TDOM5UQVPvOi1X 55/brcz2clWj8EyMD2iqfnSrtU83hp+gle+5Kc65STcU08NM4GaobrFecnGLQ2AJ K+vgsvOfBUf+ZdJQjS/Kd8Xr9WZk9Isz83WzOp29LHebeE7n6WKpBIUxGEnYkrOr 3W2S9M7+QOPS/fB7hhmHFp8bQPETkij4k8T5zc8rDN48XyExKD3MKtfrLnI1YUDM 2eMztuCSBqEDwc8Ph9l967neRFVvYNCZhR2/dPQ46MuNDf4E8fGwNfAXnmvQ1LV4 H413dfDf2+gFbqaIDZjhALYBthSu4ScVsLzz1DpMIhQBzdkLryeE9UYDZ5cMuefu byqBtWjogFixCw2jwtPC4TbyofoPEqLTv8TZBf+F8Tjt7p4ectxSpgYWHyvC+PAT Hr8O/03JmvjEC4zEW7ZICEWSwadNxCkiOTiPemwaTkWKS3sCUL4us7bKwye70KZ5 TTIGNsVW =tW4r -----END PGP SIGNATURE----- --W1lZOzVoPlD0rjpc--