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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 C5AACC43603 for ; Thu, 19 Dec 2019 18:40:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 92CCB24680 for ; Thu, 19 Dec 2019 18:40:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576780845; bh=l/h8r2712rG5mlyOgtU7hkWL61xkjIonKVs5KNoRkQY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=qVb2bT7bR9v/m1cjvClWqrHgI7OC1eyiQ25DjPAZHc5o/utMdFzxkMb6PgBfBCnOY tqtGuwpNufe+w+QhGH+KvMlB/lK6cuDdnB+kUqpJvLn+j9sXu0UvJictd/zFamSK/r vUL30q1gnuDjCp0GOrlpRQZO+KnRdYvB3qIhoOLc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728001AbfLSSko (ORCPT ); Thu, 19 Dec 2019 13:40:44 -0500 Received: from mail.kernel.org ([198.145.29.99]:59548 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728415AbfLSSko (ORCPT ); Thu, 19 Dec 2019 13:40:44 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 13D3124682; Thu, 19 Dec 2019 18:40:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576780843; bh=l/h8r2712rG5mlyOgtU7hkWL61xkjIonKVs5KNoRkQY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=N73oI9xSThMN6aXK5Ps5c66/uxbj4cRQNeftNMRjhVZ0ipfCIHa280oc+Mp2WwR0q +bzxZA0RoDd4+suohIAEZzRYp/mZDbsVkaGJiAb72qvFC2RL2Rn7GVuQkILM4nqYRo LBz5ZednaP/VNK1EmEDgaGcSs4eryvIlJDgt7nSU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Zhenzhong Duan , "Rafael J. Wysocki" Subject: [PATCH 4.4 113/162] cpuidle: Do not unset the driver if it is there already Date: Thu, 19 Dec 2019 19:33:41 +0100 Message-Id: <20191219183214.621732667@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191219183150.477687052@linuxfoundation.org> References: <20191219183150.477687052@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Zhenzhong Duan commit 918c1fe9fbbe46fcf56837ff21f0ef96424e8b29 upstream. Fix __cpuidle_set_driver() to check if any of the CPUs in the mask has a driver different from drv already and, if so, return -EBUSY before updating any cpuidle_drivers per-CPU pointers. Fixes: 82467a5a885d ("cpuidle: simplify multiple driver support") Cc: 3.11+ # 3.11+ Signed-off-by: Zhenzhong Duan [ rjw: Subject & changelog ] Signed-off-by: Rafael J. Wysocki Signed-off-by: Greg Kroah-Hartman --- drivers/cpuidle/driver.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) --- a/drivers/cpuidle/driver.c +++ b/drivers/cpuidle/driver.c @@ -60,24 +60,23 @@ static inline void __cpuidle_unset_drive * __cpuidle_set_driver - set per CPU driver variables for the given driver. * @drv: a valid pointer to a struct cpuidle_driver * - * For each CPU in the driver's cpumask, unset the registered driver per CPU - * to @drv. - * - * Returns 0 on success, -EBUSY if the CPUs have driver(s) already. + * Returns 0 on success, -EBUSY if any CPU in the cpumask have a driver + * different from drv already. */ static inline int __cpuidle_set_driver(struct cpuidle_driver *drv) { int cpu; for_each_cpu(cpu, drv->cpumask) { + struct cpuidle_driver *old_drv; - if (__cpuidle_get_cpu_driver(cpu)) { - __cpuidle_unset_driver(drv); + old_drv = __cpuidle_get_cpu_driver(cpu); + if (old_drv && old_drv != drv) return -EBUSY; - } + } + for_each_cpu(cpu, drv->cpumask) per_cpu(cpuidle_drivers, cpu) = drv; - } return 0; }