From patchwork Fri Feb 2 09:22:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saravana Kannan X-Patchwork-Id: 195737 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:9bc1:b0:106:209c:c626 with SMTP id op1csp307890dyc; Fri, 2 Feb 2024 01:26:56 -0800 (PST) X-Google-Smtp-Source: AGHT+IEk4izyboFH+C7SAcPQIACtIE7fQoBvDVPBrJu8rmFWBuHgx18Voc5mRH5q53l81Ctwqjk3 X-Received: by 2002:a05:620a:a98:b0:783:e3be:9bb4 with SMTP id v24-20020a05620a0a9800b00783e3be9bb4mr5600702qkg.9.1706866015927; Fri, 02 Feb 2024 01:26:55 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706866015; cv=pass; d=google.com; s=arc-20160816; b=1IZ4wzTT1yX9SL8nIRDJurpKkGXBVsHhEOMfoMcW+eGY/m/SkLsb7DvECIi+Yg9yq7 B5/jk9jSzPhWpNV+bFLiz2zvkaqdBmYUL1Ip6h9/poknDCtxJ1TiBbbncFjAuzbh6GUF R120dvZJL2cNRKM8xqzjgqrmIW0KUsZjW1zDR4jSbc23t+T6AE27RgeXuz0F3aj+Venx k+LzRmEVh6KFZQCp+mvNs/fB7PvZaTivmMxJkVytBddw/X0x1BJFYBgHRfkmovEX7c7z hSFEKwIoxlXp1JvFnWTf5kq4mz+unfq1iAySsgDpP43Tvu/2uaB98t+ICRXmHSuugGsd HFmg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=cc:to:from:subject:references:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:in-reply-to:date :dkim-signature; bh=in2Ntwtloha/e+ZMm1Ao4y84QzaZLhLUFFn+wIIPR3U=; fh=K3PnWUpfpvb6dAdEvatP3KNSNtGzaFhTTKxBO7/rxXw=; b=GaJsM7aV/hmHVS2eL9VxTwZAa8qQikX7uJCMBlj4UYoWPjmFQYtF0b6ZhHe47fztR8 9w+jFDAX4iLCXJvGC6MIhHvl1eIrP3ABGVv6b5n58EmRfn8nR4hTd9etlIcLmqhno34N /yxtqSlRQwVmtLmxE0GUwYa0A3G07tuG4WPj7rbUho74/6iynkjuKp4JdP0iOLTfGT2s LyJ4G+AyJUoN9WEr7uCq6rg0JY8CH7A/QqtXeIFZAqbE73P291emiXK6e/r1epy4XJrN H9WL7dMO9E8odGNKNZz953ZEjii6dga0vaDfb2dxRVdaRDYWXp3RBn+KI5lFRduDp/vs qlUA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=ToryxPm4; arc=pass (i=1 spf=pass spfdomain=flex--saravanak.bounces.google.com dkim=pass dkdomain=google.com dmarc=pass fromdomain=google.com); spf=pass (google.com: domain of linux-kernel+bounces-49568-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-49568-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com X-Forwarded-Encrypted: i=1; AJvYcCWO+fJOTj6F/q9ZODRZfVCYIyvWgWu6CQohO+gvuEZNzs6ebu8MRInlv9h9roFZ+YEJMnq+IOPSYHXk+K0fFi4qCvwYZg== Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id y10-20020a37e30a000000b00783fdbe403asi1522094qki.738.2024.02.02.01.26.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Feb 2024 01:26:55 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-49568-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=ToryxPm4; arc=pass (i=1 spf=pass spfdomain=flex--saravanak.bounces.google.com dkim=pass dkdomain=google.com dmarc=pass fromdomain=google.com); spf=pass (google.com: domain of linux-kernel+bounces-49568-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-49568-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 8E1351C26BE4 for ; Fri, 2 Feb 2024 09:26:55 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 5B35E78B7D; Fri, 2 Feb 2024 09:23:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="ToryxPm4" 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 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-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 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1789778739817337628 X-GMAIL-MSGID: 1789778739817337628 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, struct device *target) return false; } +#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)) == - (DL_FLAG_SYNC_STATE_ONLY | DL_FLAG_MANAGED); + return (flags & ~DL_MARKER_FLAGS) == DL_FLAG_SYNC_STATE_ONLY; } /** From patchwork Fri Feb 2 09:22:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saravana Kannan X-Patchwork-Id: 195769 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:9bc1:b0:106:209c:c626 with SMTP id op1csp321976dyc; Fri, 2 Feb 2024 02:03:50 -0800 (PST) X-Google-Smtp-Source: AGHT+IHmoir6Qn0Gl8Cf1NSeXXz/OMI0B5XGzZl7kHr1FL/9vaSYfiajhVu72trXu8phJoG98TLZ X-Received: by 2002:a17:902:da8b:b0:1d9:5749:2706 with SMTP id j11-20020a170902da8b00b001d957492706mr1648348plx.12.1706868230745; Fri, 02 Feb 2024 02:03:50 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706868230; cv=pass; d=google.com; s=arc-20160816; b=aITJAob519yGbF8k8KAG2/5XjbqIYGhaKelu72bMR+oa+kQbDOq9QjdKDxiNv393Wy QNJqFwYdJ+g2KQXCUAbTEBdZVl9PKAVMvT9a+absnV7QPHd/V8Fp4/tU838ZvuoASY/w 7myNP4dFiBrbExnSz4otU0n7lSqT8GfSREJS/Uv0qUZfosKmLRW/2PUqGVmQt/2TO94K cvA/L5ZcjiFiYVfxWXsowufbhfgLO2nHHzFbQw4d4kDqQsw4dx+BO2JkwoM1bjpdAoeO WHSobnGVncT8z2InlrfvyPxhWRD/6aooWZHUZEAtNx6rgC87FbdtB85b2p1D4Emh/+Wb ftvg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=cc:to:from:subject:references:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:in-reply-to:date :dkim-signature; bh=r5YNJyMo7T6ZuM5rJpTOCCSH+s00uoF+8fpfMCUPszE=; fh=u9F0J3Lnj3+xclaIcqCEMVZ+FMA844TmcrNvvsaQ5aI=; b=CC0uASL5TlERUEirg9ZwU3NOkKSHbEvd4M6sIwG7djpeaiqcuZ1y2QSbQ+GVU4q2ya 4Ys+lyEsXHw6mbKn1UcyLdY+42mQWgWC//iWZLxIamw5rrneAHbb2LorH07i603ZtjJ8 pMcBRyh6O+LQJFKa/wSy/G4sZWMX+Q7PjIKLvQG8yjcK5M45xc4JufDbrzB1ja0g8ghe CoyVhN9dLtvzoYiZ6d4GETBN03LrxFw4D2+Lp2RWYZLgzqrlZ58JVsiUFaBvqGUm5jjL lhuAEjf6IrJXJ5orY1G1a9/fxFMFn+V67NmGLz5XFhp4Yw5mBEqXTt2NCqFi6g8sEs2C 5auw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=QlLhwlnh; arc=pass (i=1 spf=pass spfdomain=flex--saravanak.bounces.google.com dkim=pass dkdomain=google.com dmarc=pass fromdomain=google.com); spf=pass (google.com: domain of linux-kernel+bounces-49569-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-49569-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com X-Forwarded-Encrypted: i=1; AJvYcCUgd3dKYUbyq+AXmluzJcb9kdaMKFksFevtgxqa+vB+REkxAjy3MfKVRnflMjXxEmJPt0ZA47ivO9/nMmLxDZ/lQVYaEw== Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [2604:1380:40f1:3f00::1]) by mx.google.com with ESMTPS id e4-20020a17090301c400b001d96381a4bbsi1501108plh.311.2024.02.02.02.03.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Feb 2024 02:03:50 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-49569-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=QlLhwlnh; arc=pass (i=1 spf=pass spfdomain=flex--saravanak.bounces.google.com dkim=pass dkdomain=google.com dmarc=pass fromdomain=google.com); spf=pass (google.com: domain of linux-kernel+bounces-49569-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-49569-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id 5098AB2F9EB for ; Fri, 2 Feb 2024 09:27:15 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 706AA7F7C7; Fri, 2 Feb 2024 09:23:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="QlLhwlnh" 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 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-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 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1789781062091176747 X-GMAIL-MSGID: 1789781062091176747 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 ==> 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 ==> 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 ==> B --> A.EP ==> A Looking at it another way, A depends on B in one way: A --> B.EP ==> B But B depends on A in two ways and we only detect the first: B --> C --> A B --> A.EP ==> 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 robust") 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, /* * 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); From patchwork Fri Feb 2 09:22:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saravana Kannan X-Patchwork-Id: 195747 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:9bc1:b0:106:209c:c626 with SMTP id op1csp311407dyc; Fri, 2 Feb 2024 01:36:26 -0800 (PST) X-Google-Smtp-Source: AGHT+IFz79dVwuFd9vwxZjur9HFwEnrafv5t3QFWMIOLYFirDFVemAsY8YgT2YO2QKij4al3n5qv X-Received: by 2002:a17:906:4ec9:b0:a36:8802:ffc5 with SMTP id i9-20020a1709064ec900b00a368802ffc5mr916259ejv.7.1706866586748; Fri, 02 Feb 2024 01:36:26 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706866586; cv=pass; d=google.com; s=arc-20160816; b=VTFr+3sC7utO4NmXKhf4YL3zEPOQU8d/6doT8tc8OfHudBJF+QpF2K+8U9qIxGRkqN 2xC3wHrtyQIUmzWMpBXOq4LDeZsjLFL+6gG2NoKwTQXdWWLBVYzKDNNl94rG0SLxKLmO 9zfGrLUortD3ReN1JaiOxk/zQUN3f8tPv4uXkKw30K4D+itIA61Y/SGGDWO4ufLtD1Sg gMp7vG03aOyQmXyZVhXMk2xFYF2CS31HBOyTl4N87gK/vXRg+ju4XL8Lk2bLh0ftFsrO NVr7+SrOYbuYm6xzmY8ynTXuShgC4S58mN9uo3rjfoPTTov5liHWHMzA/ufa5EPZ/HMn 8DbA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=cc:to:from:subject:references:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:in-reply-to:date :dkim-signature; bh=daL4XB8bCp+vh8RMiM1+uZyeaTeJtdmdzdYfvAgKrYE=; fh=4w2wMiSyMcedQiW9Y5v1xYyk2Su4Ac3R6ZT9jURT8v0=; b=x6Uydg0j/mmGgF8WG+BX9G5CXlqN9Q5I4Yzrw7xgJIzDC1Xc7p33A8HKIF+J7BRGD0 B5815OtaOeoav1mnMwSZP3c5VGKch0vpIJIoGKtJaFwNrp8fvDD1zV6bYW8GTwqwPZqv uGzzUKiflhCIhjbt1kks5UTdI+k3dRvpdlq4twoyiv/i5Ft5uXIfwLxQA46W3EKaHLOv HL95+/BKCchlQpgxU5I/5L56KtJsPO/ONsdBxqFDrJPEOlnhFRfgqO8MFntreN1X8xLe jtXXm2J5iGMPNjhIx662TahjhucDFuJYwEaPr86v4Y8DPIYhMtq4xFNj9XlUl7zUSTLv GEbw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=XAtGc7il; arc=pass (i=1 spf=pass spfdomain=flex--saravanak.bounces.google.com dkim=pass dkdomain=google.com dmarc=pass fromdomain=google.com); spf=pass (google.com: domain of linux-kernel+bounces-49570-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-49570-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com X-Forwarded-Encrypted: i=1; AJvYcCUY6zBxKsLOHg6IPNwTcPT73xpaiI8mr1VpsZA4qa9CNyRgtJkNsEFALJUBifg+XqOXbZdGnCp1XAGP0f4H6wg2oNvfVA== Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id n17-20020a170906379100b00a36cdcee3desi646205ejc.964.2024.02.02.01.36.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Feb 2024 01:36:26 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-49570-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=XAtGc7il; arc=pass (i=1 spf=pass spfdomain=flex--saravanak.bounces.google.com dkim=pass dkdomain=google.com dmarc=pass fromdomain=google.com); spf=pass (google.com: domain of linux-kernel+bounces-49570-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-49570-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 9862F1F2D285 for ; Fri, 2 Feb 2024 09:27:30 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id C86F07F7DB; Fri, 2 Feb 2024 09:23:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="XAtGc7il" 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 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-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 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1789779338423039264 X-GMAIL-MSGID: 1789779338423039264 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 ==> parent dependency) so that it's easier to debug cycle 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 |= FWLINK_FLAG_CYCLE; } @@ -1945,6 +1945,7 @@ static bool __fw_devlink_relax_cycles(struct device *con, /* Termination condition. */ if (sup_dev == con) { + pr_debug("----- cycle: start -----\n"); ret = true; goto out; } @@ -1976,8 +1977,11 @@ static bool __fw_devlink_relax_cycles(struct device *con, else par_dev = fwnode_get_next_parent_dev(sup_handle); - 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 = true; + } if (!sup_dev) goto out; @@ -1993,6 +1997,8 @@ static bool __fw_devlink_relax_cycles(struct device *con, 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 |= DL_FLAG_CYCLE; ret = true; @@ -2072,6 +2078,7 @@ static int fw_devlink_create_devlink(struct device *con, if (__fw_devlink_relax_cycles(con, sup_handle)) { __fwnode_link_cycle(link); flags = fw_devlink_get_flags(link->flags); + pr_debug("----- cycle: end -----\n"); dev_info(con, "Fixed dependency cycle(s) with %pfwf\n", sup_handle); }