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 30092C74A4B for ; Sat, 11 Mar 2023 06:42:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229637AbjCKGmm (ORCPT ); Sat, 11 Mar 2023 01:42:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50124 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229541AbjCKGmk (ORCPT ); Sat, 11 Mar 2023 01:42:40 -0500 Received: from mail-wm1-x330.google.com (mail-wm1-x330.google.com [IPv6:2a00:1450:4864:20::330]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BDC3311CD61 for ; Fri, 10 Mar 2023 22:42:38 -0800 (PST) Received: by mail-wm1-x330.google.com with SMTP id bg16-20020a05600c3c9000b003eb34e21bdfso7577090wmb.0 for ; Fri, 10 Mar 2023 22:42:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1678516956; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=rLCDgBE2CpEpsYEH2GzNb2mRA3Ov/LpZ5EV9ph3pyrE=; b=GJw9guvyr0s5eebXuJrA9NOkpl95WPNpiig/eTGB5Oom88V/Zp6f+dhqK5P/TXiP9I +lME1MquTJSG6dt2pPa57FLIAwj/biU0Qf962U4moIZrFm+oWItD8o5l+Y34iS4LOMOj Dljq872LDn+dRGWMQtNJuQE+g+5Is0J8POfj2Gl0v+5e1j5IJ4rbjOzgMWHRGEgZhsNE 3RL/kxG3uz2rxtrTqxJwBzbtg4LSrZ/ZL9Mg/las7shVi1Poyt9Yz6xxm/+04xdFR1jG IrkPMxmJ5nttDheyrDkTehYfgNS+FJF4Ruv0PMXdmNsYgh1gpy9TOUQ9fl6wHqu01k3y HK0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678516956; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=rLCDgBE2CpEpsYEH2GzNb2mRA3Ov/LpZ5EV9ph3pyrE=; b=6QAvpAlqlzK9mKQ+mznJEd+dGWF54FDk3ndfwfkucvhpYo9TmLhFqRj8bZj3wIKyFt g7N0PeGDyv+bP8ahttFPC1IjfSiUOXW4bIWG0Utu/czblxuZxXb7UJJuQOnhj5Om8YuI 9gNQj/gY4hwHHGw7inr4MmPXWHJVPdu8fuCduYkn7Xp4ShggiAAI7x2N2r/bFOQLM/GN Uf2lVw4Se4waCyHHamiYkhLmOkkxMpmxWSAZTDu/vQSok0xYWq1/USZiOnZawgFr6/Yd ypIs8F2L4CpyoLYVdQ7Rfm9YbCgrHsxGBaEbRa1xCkxCj3YRubKcwahPTuCeXygbhyRd mDGg== X-Gm-Message-State: AO0yUKUR7I81TMvfYatBVMfEiCPdYXcJCmlqSsmPRaBMys0a2FGdz14T SlXlkOlcsvmvH6/FUSx8hSiHUP1Vw1YU2vg4Zd24dw== X-Google-Smtp-Source: AK7set9wYQn7im6e0NM13fx/mhFULhLhun1pudfxqWhKunmEGg+fxkJOhN9RKEAuwsiPqa/qDohJi4l7xBDedI9OZmU= X-Received: by 2002:a05:600c:a382:b0:3eb:2e68:5c76 with SMTP id hn2-20020a05600ca38200b003eb2e685c76mr1461577wmb.3.1678516956022; Fri, 10 Mar 2023 22:42:36 -0800 (PST) MIME-Version: 1.0 References: <20230302013822.1808711-1-sboyd@kernel.org> <20230302013822.1808711-3-sboyd@kernel.org> In-Reply-To: From: David Gow Date: Sat, 11 Mar 2023 14:42:24 +0800 Message-ID: Subject: Re: [PATCH 2/8] of: Enable DTB loading on UML for KUnit tests To: Stephen Boyd Cc: Michael Turquette , linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org, patches@lists.linux.dev, Brendan Higgins , Greg Kroah-Hartman , "Rafael J . Wysocki" , Richard Weinberger , Anton Ivanov , Johannes Berg , Vincent Whitchurch , Rob Herring , Frank Rowand , Christian Marangi , Krzysztof Kozlowski , devicetree@vger.kernel.org, linux-um@lists.infradead.org, linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sat, 11 Mar 2023 at 07:34, Stephen Boyd wrote: > > Quoting David Gow (2023-03-10 00:09:48) > > On Fri, 10 Mar 2023 at 07:19, Stephen Boyd wrote: > > > > > > > > > Hmm. I think you're suggesting that the unit test data be loaded > > > whenever CONFIG_OF=y and CONFIG_KUNIT=y. Then tests can check for > > > CONFIG_OF and skip if it isn't enabled? > > > > > > > More of the opposite: that we should have some way of supporting tests > > which might want to use a DTB other than the built-in one. Mostly for > > non-UML situations where an actual devicetree is needed to even boot > > far enough to get test output (so we wouldn't be able to override it > > with a compiled-in test one). > > Ok, got it. > > > > > I think moving to overlays probably will render this idea obsolete: > > but the thought was to give test code a way to check for the required > > devicetree nodes at runtime, and skip the test if they weren't found. > > That way, the failure mode for trying to boot this on something which > > required another device tree for, e.g., serial, would be "these tests > > are skipped because the wrong device tree is loaded", not "I get no > > output because serial isn't working". > > > > Again, though, it's only really needed for non-UML, and just loading > > overlays as needed should be much more sensible anyway. > > I still have one niggle here. Loading overlays requires > CONFIG_OF_OVERLAY, and the overlay loading API returns -ENOTSUPP when > CONFIG_OF_OVERLAY=n. For now I'm checking for the config being enabled > in each test, but I'm thinking it may be better to simply call > kunit_skip() from the overlay loading function if the config is > disabled. This way tests can simply call the overlay loading function > and we'll halt the test immediately if the config isn't enabled. > That sounds sensible, though there is a potential pitfall. If kunit_skip() is called directly from overlay code, might introduce a dependency on kunit.ko from the DT overlay, which we might not want. The solution there is either to have a kunit wrapper function (so the call is already in kunit.ko), or to have a hook to skip the current test (which probably makes sense to do anyway, but I think the wrapper is the better option). > > > > > > > > > > That being said, I do think that there's probably some sense in > > > > supporting the compiled-in DTB as well (it's definitely simpler than > > > > patching kunit.py to always pass the extra command-line option in, for > > > > example). > > > > But maybe it'd be nice to have the command-line option override the > > > > built-in one if present. > > > > > > Got it. I need to test loading another DTB on the commandline still, but > > > I think this won't be a problem. We'll load the unittest-data DTB even > > > with KUnit on UML, so assuming that works on UML right now it should be > > > unchanged by this series once I resend. > > > > Again, moving to overlays should render this mostly obsolete, no? Or > > am I misunderstanding how the overlay stuff will work? > > Right, overlays make it largely a moot issue. The way the OF unit tests > work today is by grafting a DTB onto the live tree. I'm reusing that > logic to graft a container node target for kunit tests to add their > overlays too. It will be clearer once I post v2. > > > > > One possible future advantage of being able to test with custom DTs at > > boot time would be for fuzzing (provide random DT properties, see what > > happens in the test). We've got some vague plans to support a way of > > passing custom data to tests to support this kind of case (though, if > > we're using overlays, maybe the test could just patch those if we > > wanted to do that). > > Ah ok. I can see someone making a fuzzer that modifies devicetree > properties randomly, e.g. using different strings for clock-names. > > This reminds me of another issue I ran into. I wanted to test adding the > same platform device to the platform bus twice to confirm that the > second device can't be added. That prints a warning, which makes > kunit.py think that the test has failed because it printed a warning. Is > there some way to avoid that? I want something like > > KUNIT_EXPECT_WARNING(test, ) > > so I can test error cases. Hmm... I'd've thought that shouldn't be a problem: kunit.py should ignore most messages during a test, unless it can't find a valid result line. What does the raw KTAP output look like? (You can get it from kunit.py by passing the --raw_output option). That being said, a KUNIT_EXPECT_LOG_MESSAGE() or similar is something we've wanted for a while. I think that the KASAN folks have been working on something similar using console tracepoints: https://lore.kernel.org/all/ebf96ea600050f00ed567e80505ae8f242633640.1666113393.git.andreyknvl@google.com/ Cheers, -- David