From nobody Sat Feb 7 10:08:17 2026 Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1CE047E76C for ; Fri, 2 Feb 2024 09:22:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706865778; cv=none; b=pczRNQZTnJTEPNNbLc+cS7KQl9Wna2Wu5Pnl1w7xoAM+Pbm1Oq6oC/ySv6i8EUl5n+GEApxXY2WLW5eLZxO1O7qrm6BpnkjzbjQ3dBoIemmv4XArdvyjztpyLiL4X+xIzCpyo76FdyMBmal2mi6Cr8qcElFElv8riRRiViUrYXc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706865778; c=relaxed/simple; bh=DPOMrDg4rKNH1QTC6aQIG7HRKerQiIwxkdnyzWqM6hg=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Cc:Content-Type; b=ItigREMIXg7s5EDcqr2eeerIGn9ATfzqvhf3Fxu+GRHrfZyO4LCVCXL6SsWmwSquKlJ5VQ78odXm526U1g1HIYsQ38Um3+Yu1+RxFmL64furc3ghZzUA0/arJkiTJMhkYV8Dxi78KoVtFIEC8+crZVvE7NzpgHh82b7bloeNBig= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--saravanak.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=ToryxPm4; arc=none smtp.client-ip=209.85.128.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--saravanak.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="ToryxPm4" Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-5f38d676cecso35404257b3.0 for ; Fri, 02 Feb 2024 01:22:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1706865776; x=1707470576; darn=vger.kernel.org; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=in2Ntwtloha/e+ZMm1Ao4y84QzaZLhLUFFn+wIIPR3U=; b=ToryxPm4Rt/XKOypwzqHUc/65vVE2cnjQGHjnuz7VGkgKIliukjc6yfQHk01NpGQgA kvN8K1+F9oU4OVOWqB0P97ODKGHXWmLyGTqWpyrs8sVcm2vO0gtZgKo3MbroX/Q88ZTV at3KtoHsweeX6WovQWqhp+liTfNUd+BDdy3zTKHRn1TXoZ53fnAlKsjNEX/5se161Doq oxxRAP6eh41h6WuCdro5HXjdXaMUwJdRwjumPomSZCndbPZCYWR5rojVGzRDP5BWrlud /J2w8BJepDfsX+8XKC6adj9CipJvk5IIKhw5VPyigyfR3JUGfGVMPYPeAeV1rgiVkpJo Nktg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706865776; x=1707470576; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=in2Ntwtloha/e+ZMm1Ao4y84QzaZLhLUFFn+wIIPR3U=; b=JplAT280aZS59M4GirGlIaTFIY2loP+yDvaX0ME2KTSmwsCIYKTtMykhTd1i4/+Cpg rd+qXRWv7hsPWomiLlrgAMrGuMTwPQ8HXLRrgtp3vn93aPW0nZge70m+b1p4IAoUTLdG m/wWdTEH5NV3N02ZSevp9565AhcRazfHILxTexclPDlv97p/R1m9DROoeZqitLaPl8ad QB79zL1q6b/pN01Q6Rwcjgwe+7vJHmZD7L81C1u9Yr/pJQz+jrOrcLF0skJf70tQi2tK UbMoU28Wc9t7GV7W52t40W8NtKab/TldOfidxiYIiJXW+P/hQSzjtlSlrjT5R6p7l3uJ /Vag== X-Gm-Message-State: AOJu0Yy3BDauslqcxLIYltKTXKuBgxxZLJGMventBIH+3nuuSn8vj/Sw Y2AQulVPuIBqIWPOvIWfdtkoa7mdxLS/PoeAIV+wHIPwqBAsPnK+3CfsWCa0ewf90oTGmXcGG+6 KfY/KAp4vUlb5FQ== X-Google-Smtp-Source: AGHT+IEwj1X6GEgoqz6nmFGZy/UDIWH00xbAf8HN/Ko1knPBLnDOwyS/5Rfklz5px+eWUSWStwjYrJ9a/nlb/Ns= X-Received: from saravanak.san.corp.google.com ([2620:15c:2d:3:6f0:da10:9cb3:5b3]) (user=saravanak job=sendgmr) by 2002:a05:6902:2004:b0:dc2:51f6:9168 with SMTP id dh4-20020a056902200400b00dc251f69168mr457589ybb.2.1706865776158; Fri, 02 Feb 2024 01:22:56 -0800 (PST) Date: Fri, 2 Feb 2024 01:22:47 -0800 In-Reply-To: <20240202092250.786276-1-saravanak@google.com> Message-Id: <20240202092250.786276-2-saravanak@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240202092250.786276-1-saravanak@google.com> X-Mailer: git-send-email 2.43.0.594.gd9cf4e227d-goog Subject: [PATCH v1 1/3] driver core: Fix device_link_flag_is_sync_state_only() From: Saravana Kannan To: Greg Kroah-Hartman , "Rafael J. Wysocki" , Saravana Kannan Cc: Xu Yang , kernel-team@android.com, linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" device_link_flag_is_sync_state_only() correctly returns true on the flags of an existing device link that only implements sync_state() functionality. However, it incorrectly and confusingly returns false if it's called with DL_FLAG_SYNC_STATE_ONLY. This bug doesn't manifest in any of the existing calls to this function, but fix this confusing behavior to avoid future bugs. Fixes: 67cad5c67019 ("driver core: fw_devlink: Add DL_FLAG_CYCLE support to= device links") Signed-off-by: Saravana Kannan --- drivers/base/core.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/base/core.c b/drivers/base/core.c index 14d46af40f9a..52215c4c7209 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -284,10 +284,12 @@ static bool device_is_ancestor(struct device *dev, st= ruct device *target) return false; } =20 +#define DL_MARKER_FLAGS (DL_FLAG_INFERRED | \ + DL_FLAG_CYCLE | \ + DL_FLAG_MANAGED) static inline bool device_link_flag_is_sync_state_only(u32 flags) { - return (flags & ~(DL_FLAG_INFERRED | DL_FLAG_CYCLE)) =3D=3D - (DL_FLAG_SYNC_STATE_ONLY | DL_FLAG_MANAGED); + return (flags & ~DL_MARKER_FLAGS) =3D=3D DL_FLAG_SYNC_STATE_ONLY; } =20 /** --=20 2.43.0.594.gd9cf4e227d-goog From nobody Sat Feb 7 10:08:17 2026 Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D6A997F46C for ; Fri, 2 Feb 2024 09:22:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706865781; cv=none; b=NA9S4osFlW1l6yHvkKImDdytA3BiSQUXwfG3fZteqrS5q0VPVtPPoRnjzUu5FNEsUXBYVgLwlYz8ULB+1ZK4YsbjmLelR+gAPTEdrGmMm3bCe0y5Lc4e0wbc1l/WR4tncqs2S2jP7rjgTTjwaODEoidu+QvnZ+mj9dezY5rIozY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706865781; c=relaxed/simple; bh=dd+eXX+dl1OWEzo7/glw3RkA/h5jaC3FxhfWglqWQKw=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Cc:Content-Type; b=DS/h+CtFTSNyLO3a7JGabQnHIITplGg4YlkI7NOb2BKHp2cttJ+OSgmRtTeYZxL8xFVNZZ2MlPD5LE1zMJOQ7RrZ3Lzv8xkkskm6txBVtGVX9ETIkvATjF3QxyKMBhtp5hLbPkjeGLW6AUrtdprI0w7FKsArYMhcY1jYus/GqC8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--saravanak.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=QlLhwlnh; arc=none smtp.client-ip=209.85.128.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--saravanak.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="QlLhwlnh" Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-6041dbb7a78so27870527b3.0 for ; Fri, 02 Feb 2024 01:22:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1706865779; x=1707470579; darn=vger.kernel.org; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=r5YNJyMo7T6ZuM5rJpTOCCSH+s00uoF+8fpfMCUPszE=; b=QlLhwlnh9hb2TZJz08rXJfQ+XYSL6f+3qqJdy8FSI/ut5npFugRGVm5gEUp9Rf6M/S y90rH5mwq8Ux72JtOT0BuNOkq5hR0DRxP5ZRt2jaDA2dyNjEY+iPc2TzpwdH4w8VAFBX xBZRe7kmNAdZLPpE1j0STlkg9ab1y52uETdgtAn+Nn2gmYM+8zD4xcGPXxyh9S/O42hL wEk3Tt+Di5PnCeoa6bzg8ro4UcDIBTO2e4Dpr5UhIAxnwixmGaNWOCK/v4GlTVDPrHa1 8iT549M9gmmtYXMdBONlRlUBApPafiJBdWp9jpbrnI5EVqt7KQX/6ciYqp1LECqaIIC0 sqbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706865779; x=1707470579; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=r5YNJyMo7T6ZuM5rJpTOCCSH+s00uoF+8fpfMCUPszE=; b=h0BMSJAlYqz9UBX+lFEQfNAPXx2pr5SATwot4EDZD/tyTiSQt9JRU5etx9fQekIxYK iocNRwCgf4j8wAqrlCyvCDFFx9/MxSbbrJPc8Ip7vvUSbNTHH9I+mh6EXbZcu3Q4v3MF V0wGRHqyYxH7fujc5+Lqga4MCHYAIVMASxCUvnfarmOLMFtEDGf6wwewA0gVHl0Tpo2t oGCcjHpKRV1bYvFJa57QSlaWOxapxEv2hSWzISSYArWkUtZ85kBgTFph32RmQeEWCR+K ekR30nn+bM39USYF0Z/XPNwHlBFhENnzAYJ/mG1OEdeScaa2Yxy7tr8JV0VfvV/knYI3 HgCw== X-Gm-Message-State: AOJu0Yz51nGDbN6XUaA9mRc3CZM9mzQGOP0fg3zK1ipqsCT+yPGD/u9r qqcWcU1l57epaPtbM0Owu/NEw0w6OFW/Zkl9Ap+q5wDAaK0vjrRsVwp56RrvooaEi3ZZa1dmXC3 ZekCztxfwg7l6lw== X-Google-Smtp-Source: AGHT+IEUswgg/dRMEUK8ShDHmFMeuFJr56NZbrrVmM0GuwsoagVJ8/Goh8qjIinmvSivShznpEP+bOe1TBEexH0= X-Received: from saravanak.san.corp.google.com ([2620:15c:2d:3:6f0:da10:9cb3:5b3]) (user=saravanak job=sendgmr) by 2002:a05:6902:1085:b0:dc6:e5e9:f3af with SMTP id v5-20020a056902108500b00dc6e5e9f3afmr704904ybu.9.1706865778896; Fri, 02 Feb 2024 01:22:58 -0800 (PST) Date: Fri, 2 Feb 2024 01:22:48 -0800 In-Reply-To: <20240202092250.786276-1-saravanak@google.com> Message-Id: <20240202092250.786276-3-saravanak@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240202092250.786276-1-saravanak@google.com> X-Mailer: git-send-email 2.43.0.594.gd9cf4e227d-goog Subject: [PATCH v1 2/3] driver core: fw_devlink: Improve detection of overlapping cycles From: Saravana Kannan To: Greg Kroah-Hartman , "Rafael J. Wysocki" , Saravana Kannan Cc: Xu Yang , kernel-team@android.com, linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" fw_devlink can detect most overlapping/intersecting cycles. However it was missing a few corner cases because of an incorrect optimization logic that tries to avoid repeating cycle detection for devices that are already marked as part of a cycle. Here's an example provided by Xu Yang (edited for clarity): usb +-----+ tcpc | | +-----+ | +--| | |----------->|EP| |--+ | | +--| |EP|<-----------| | |--+ | | B | | | +-----+ | A | | +-----+ | ^ +-----+ | | | | | +-----| C |<--+ | | +-----+ usb-phy Node A (tcpc) will be populated as device 1-0050. Node B (usb) will be populated as device 38100000.usb. Node C (usb-phy) will be populated as device 381f0040.usb-phy. The description below uses the notation: consumer --> supplier child =3D=3D> parent 1. Node C is populated as device C. No cycles detected because cycle detection is only run when a fwnode link is converted to a device link. 2. Node B is populated as device B. As we convert B --> C into a device link we run cycle detection and find and mark the device link/fwnode link cycle: C--> A --> B.EP =3D=3D> B --> C 3. Node A is populated as device A. As we convert C --> A into a device link, we see it's already part of a cycle (from step 2) and don't run cycle detection. Thus we miss detecting the cycle: A --> B.EP =3D=3D> B --> A.EP =3D=3D> A Looking at it another way, A depends on B in one way: A --> B.EP =3D=3D> B But B depends on A in two ways and we only detect the first: B --> C --> A B --> A.EP =3D=3D> A To detect both of these, we remove the incorrect optimization attempt in step 3 and run cycle detection even if the fwnode link from which the device link is being created has already been marked as part of a cycle. Reported-by: Xu Yang Closes: https://lore.kernel.org/lkml/DU2PR04MB8822693748725F85DC0CB86C8C792= @DU2PR04MB8822.eurprd04.prod.outlook.com/ Fixes: 3fb16866b51d ("driver core: fw_devlink: Make cycle detection more ro= bust") Signed-off-by: Saravana Kannan --- drivers/base/core.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/base/core.c b/drivers/base/core.c index 52215c4c7209..e3d666461835 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -2060,9 +2060,14 @@ static int fw_devlink_create_devlink(struct device *= con, =20 /* * SYNC_STATE_ONLY device links don't block probing and supports cycles. - * So cycle detection isn't necessary and shouldn't be done. + * So, one might expect that cycle detection isn't necessary for them. + * However, if the device link was marked as SYNC_STATE_ONLY because + * it's part of a cycle, then we still need to do cycle detection. This + * is because the consumer and supplier might be part of multiple cycles + * and we need to detect all those cycles. */ - if (!(flags & DL_FLAG_SYNC_STATE_ONLY)) { + if (!device_link_flag_is_sync_state_only(flags) || + flags & DL_FLAG_CYCLE) { device_links_write_lock(); if (__fw_devlink_relax_cycles(con, sup_handle)) { __fwnode_link_cycle(link); --=20 2.43.0.594.gd9cf4e227d-goog From nobody Sat Feb 7 10:08:17 2026 Received: from mail-yw1-f202.google.com (mail-yw1-f202.google.com [209.85.128.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 705917F486 for ; Fri, 2 Feb 2024 09:23:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706865784; cv=none; b=u1dSdzCLUnr9kh1IdQkuUJ2pN/DBEeub+JbzxxwJ2NHU258dvvyNeMRJPVXjJCw/u0FqKL1Lij8mAgTi/IfDJFiWLznvwdKcfP4eGud0MrFydlxamNo82O4Cmc3lV+vMiDdVdteURPg6SyxLUvBKNpU2dMSaSLpHgBmLsUYByrI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706865784; c=relaxed/simple; bh=d5iHkLoKQ8sjTlEpS17LaVao7OCj1mW9ysVyF9v8tcQ=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Cc:Content-Type; b=Nn4ous9A+tPOV2snTAnY/ZtL8IQassWBGc52+QRC2alfoO4sPr6RZ3CmS0eTURrTocyEanm/UrENNTffTbBbVKEvjA022RFTAsmsc0E9SIYcroU4cPLQG0G2RHvlLq+ZLkWItzoREh9JfoRHXGK0ONq79WBoAPADPY8kx5UKzes= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--saravanak.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=XAtGc7il; arc=none smtp.client-ip=209.85.128.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--saravanak.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="XAtGc7il" Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-604186a5775so22242957b3.1 for ; Fri, 02 Feb 2024 01:23:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1706865781; x=1707470581; darn=vger.kernel.org; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=daL4XB8bCp+vh8RMiM1+uZyeaTeJtdmdzdYfvAgKrYE=; b=XAtGc7ilxk0h7ynIvyZU5VI8VTyQGZglr2qGTG62aqFdmlLfYwVHLacjD/nhRI9pY9 wJ2ULa7M+xT5sbv0BuARZz+rfqbOCyTO7f/IOS2uYXcQGeyL0cYFEDeJ8CxObozOK5Xq DDMoxqcsyVPpJ3BujiI7kQB92fCdV1eW7cgaX0WGIwlDL0nGAgc/t0gE/O7Re1v/WvVn Y0Ia/1BGoQM12GxVl4meMnBmizOmVVXTZtMiiuC7Nt17b6E0OZ1/vkRDRtvlSvbrCmiu mTUY/8OZ4r3UpNr+JpSoZcrzhBhLLmTcExpwjc9R/MlW8xtYbxU5C+XhRPVOc/4QoPk9 uRNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706865781; x=1707470581; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=daL4XB8bCp+vh8RMiM1+uZyeaTeJtdmdzdYfvAgKrYE=; b=QgtLV4CFvCvhFyIvbghjMdys9iOWKaDUlvQiiROY9Ta03CeA1aN+xK3hXpxWjfoyFU 7+IfonFavwPS1V4Ks7EQMTJZ2FuLCBMNNiMYjWJpt7WIjyPsNCjjHl+G8YZbeNN7PUIk c1UIgG1KJfTsp1Y2E2jvHKCfRsVQt5g5a/s/PO7QyWGrsKIr9vSpLUYJJ0Od2r5SCZKM +q1E+SuzR6PHfOdRdf72y7jNsLn1EicPQtY3ZjenhMqnvTGsO1OJSRU8g3Pens+eNPvk AXJ78fTnppEiSk2lXvAfLx0vdtt/LlnMcVpA+LxQmXDFcIgrOLr5DPk+XlOoL/90RGlT x5FA== X-Gm-Message-State: AOJu0YzwvRuohwA18oN2aO4hWLWz4n08rgwOfd6h7g/HSFdts00uZIHq WI12am1S/PY1/DlwjSKtp50ZsYRj+TO5rfdUeP1lsCBBkpEjMfkfUFsvc0sngJEtgxmWW0l4I6n Cy3EQ0S2XNenarg== X-Google-Smtp-Source: AGHT+IGQPZ+QAI3nTjJcEAtdbpsI/TLmMfcBg/mRbiQVbb6wFyd6SkghlV26g5LFiwyJJT3RiC+0U/pbLbALrzY= X-Received: from saravanak.san.corp.google.com ([2620:15c:2d:3:6f0:da10:9cb3:5b3]) (user=saravanak job=sendgmr) by 2002:a05:690c:2911:b0:5ff:78d0:b4b2 with SMTP id eg17-20020a05690c291100b005ff78d0b4b2mr214000ywb.3.1706865781565; Fri, 02 Feb 2024 01:23:01 -0800 (PST) Date: Fri, 2 Feb 2024 01:22:49 -0800 In-Reply-To: <20240202092250.786276-1-saravanak@google.com> Message-Id: <20240202092250.786276-4-saravanak@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240202092250.786276-1-saravanak@google.com> X-Mailer: git-send-email 2.43.0.594.gd9cf4e227d-goog Subject: [PATCH v1 3/3] driver core: fw_devlink: Improve logs for cycle detection From: Saravana Kannan To: Greg Kroah-Hartman , "Rafael J. Wysocki" , Saravana Kannan Cc: Xu Yang , kernel-team@android.com, linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The links in a cycle are not all logged in a consistent manner or not logged at all. Make them consistent and log all the link in the cycles (even the child =3D=3D> parent dependency) so that it's easier to debug cyc= le detection code. Also, mark the start and end of a cycle so it's easy to tell when multiple cycles are logged back to back. Signed-off-by: Saravana Kannan --- drivers/base/core.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/base/core.c b/drivers/base/core.c index e3d666461835..084d9648e254 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -125,7 +125,7 @@ static void __fwnode_link_del(struct fwnode_link *link) */ static void __fwnode_link_cycle(struct fwnode_link *link) { - pr_debug("%pfwf: Relaxing link with %pfwf\n", + pr_debug("%pfwf: cycle: depends on %pfwf\n", link->consumer, link->supplier); link->flags |=3D FWLINK_FLAG_CYCLE; } @@ -1945,6 +1945,7 @@ static bool __fw_devlink_relax_cycles(struct device *= con, =20 /* Termination condition. */ if (sup_dev =3D=3D con) { + pr_debug("----- cycle: start -----\n"); ret =3D true; goto out; } @@ -1976,8 +1977,11 @@ static bool __fw_devlink_relax_cycles(struct device = *con, else par_dev =3D fwnode_get_next_parent_dev(sup_handle); =20 - if (par_dev && __fw_devlink_relax_cycles(con, par_dev->fwnode)) + if (par_dev && __fw_devlink_relax_cycles(con, par_dev->fwnode)) { + pr_debug("%pfwf: cycle: depends on %pfwf\n", sup_handle, + par_dev->fwnode); ret =3D true; + } =20 if (!sup_dev) goto out; @@ -1993,6 +1997,8 @@ static bool __fw_devlink_relax_cycles(struct device *= con, =20 if (__fw_devlink_relax_cycles(con, dev_link->supplier->fwnode)) { + pr_debug("%pfwf: cycle: depends on %pfwf\n", sup_handle, + dev_link->supplier->fwnode); fw_devlink_relax_link(dev_link); dev_link->flags |=3D DL_FLAG_CYCLE; ret =3D true; @@ -2072,6 +2078,7 @@ static int fw_devlink_create_devlink(struct device *c= on, if (__fw_devlink_relax_cycles(con, sup_handle)) { __fwnode_link_cycle(link); flags =3D fw_devlink_get_flags(link->flags); + pr_debug("----- cycle: end -----\n"); dev_info(con, "Fixed dependency cycle(s) with %pfwf\n", sup_handle); } --=20 2.43.0.594.gd9cf4e227d-goog