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 X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 D41D0C433E0 for ; Tue, 9 Jun 2020 00:13:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AB1D220775 for ; Tue, 9 Jun 2020 00:13:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591661606; bh=pNG7nCbZTBcfSnQUkieiIrezRj/QK1xnrLnvjIBIVhA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=RW4hwOZccDzCmvVE3I5nTDp2NcOheemMHip7ivZg56u1mLZguqPX/hjw9DuI/WY5n bdJscOwjtOSLnS0CH5rn/Omvw4hL544FPoJRoR4rYD64QqXSw6FVdhxT//uQxUXPSJ uao9ggDw9omsAtTBmQg9doQtiiDY8UBXAE9f8uj0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728844AbgFHXT3 (ORCPT ); Mon, 8 Jun 2020 19:19:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:36806 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730096AbgFHXPq (ORCPT ); Mon, 8 Jun 2020 19:15:46 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 035532076A; Mon, 8 Jun 2020 23:15:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591658146; bh=pNG7nCbZTBcfSnQUkieiIrezRj/QK1xnrLnvjIBIVhA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uTE1BiUwoROoMPnUF1eIhcHRSL3XLglW1PUi/z1W9WeXhpLglMnzWYKmFimq2i/tY zFQa6s6IfTJp7kHLfbTDXgusb6Aab9KNsbIKXeiOrDU6fgD4dmAOMdQVJEfi+yX75r gnvbaLBFAAkpsqnKsw39eA3fliLZFp4JrbzM7lWU= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Saravana Kannan , "Rafael J . Wysocki" , Greg Kroah-Hartman Subject: [PATCH AUTOSEL 5.6 179/606] driver core: Fix handling of SYNC_STATE_ONLY + STATELESS device links Date: Mon, 8 Jun 2020 19:05:04 -0400 Message-Id: <20200608231211.3363633-179-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200608231211.3363633-1-sashal@kernel.org> References: <20200608231211.3363633-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Saravana Kannan commit 44e960490ddf868fc9135151c4a658936e771dc2 upstream. Commit 21c27f06587d ("driver core: Fix SYNC_STATE_ONLY device link implementation") didn't completely fix STATELESS + SYNC_STATE_ONLY handling. What looks like an optimization in that commit is actually a bug that causes an if condition to always take the else path. This prevents reordering of devices in the dpm_list when a DL_FLAG_STATELESS device link is create on top of an existing DL_FLAG_SYNC_STATE_ONLY device link. Fixes: 21c27f06587d ("driver core: Fix SYNC_STATE_ONLY device link implementation") Signed-off-by: Saravana Kannan Cc: stable Reviewed-by: Rafael J. Wysocki Link: https://lore.kernel.org/r/20200520043626.181820-1-saravanak@google.com Signed-off-by: Greg Kroah-Hartman --- drivers/base/core.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/base/core.c b/drivers/base/core.c index 7fb7ffdeb015..68277687c160 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -360,12 +360,14 @@ struct device_link *device_link_add(struct device *consumer, if (flags & DL_FLAG_STATELESS) { kref_get(&link->kref); - link->flags |= DL_FLAG_STATELESS; if (link->flags & DL_FLAG_SYNC_STATE_ONLY && - !(link->flags & DL_FLAG_STATELESS)) + !(link->flags & DL_FLAG_STATELESS)) { + link->flags |= DL_FLAG_STATELESS; goto reorder; - else + } else { + link->flags |= DL_FLAG_STATELESS; goto out; + } } /* -- 2.25.1