From nobody Sun Nov 24 14:27:12 2024 Received: from esa6.hgst.iphmx.com (esa6.hgst.iphmx.com [216.71.154.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1309118BC19; Sun, 24 Nov 2024 07:10:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=216.71.154.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732432240; cv=none; b=csQcVvTuZ53NsuSXb7amQ/N8c8AfW7qH4raJRsnLrW03VDRL4pPuoWW+3brI5P0NCpz6eHqhiNSPABhmP8o5IQqKf95VU54LXZ/CK4uL1MY2cn55RH0XdHGc2HhdeW1UFxqTnHUHZsAHCInzXgQweF78uu92amLHsZFFqM0GOjw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732432240; c=relaxed/simple; bh=htKjiie+6Z4Imx7ZVdZmIvCu3LJnp/lNWxgACaPczZ8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=XDaBAPPBh3sceVy+mhXqwvrsiNKVQVv0dVMv1OcHWhlK8iUUt4imVpi4HVhA+2ksDh3Sb4SC65lrF5mjf25STt9JHpwLnHkWsKSlddYKM4ikzCs1z2a5c2Ho8piRTH3Prz425jg8gYr4A6gjpJwmhD8tFSA6hAMm/TdWlm2/QaM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=wdc.com; spf=pass smtp.mailfrom=wdc.com; dkim=pass (2048-bit key) header.d=wdc.com header.i=@wdc.com header.b=h4COrv5D; arc=none smtp.client-ip=216.71.154.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=wdc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=wdc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=wdc.com header.i=@wdc.com header.b="h4COrv5D" DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1732432237; x=1763968237; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=htKjiie+6Z4Imx7ZVdZmIvCu3LJnp/lNWxgACaPczZ8=; b=h4COrv5DtHHNe97WC7PmrTCfQcX8SJ5EptRkXiJ5eO0+D3/pC+fjkWp1 TaAe/VHR2gpyUBzNqNYbZXRgsYDjI1wWfYzZJXvYghENncUJL7jbQ9vS0 der1eA30Ts3nEZiN3ZxmI6rdXbAxNVtyTbj9KhdWjQbFGQWihHvSB6z/D KTkJQlAwHXwOx+KdNEcFL4dwDCHdqfcTidzHETDkuqwr+Wm0R+h2IjKu5 cF0e67207B+YRnr5u21MP6Yp8uKSEu4h3mxILf5hed2R4KOc0jmNUQo/y gkGg9yeRqABvwueulry22YiPZWWhIf2FLzJj39FY4q8oJzVDiP1oX5chA w==; X-CSE-ConnectionGUID: DguoewshQAW/hOHHPzM29Q== X-CSE-MsgGUID: bn9HOHgtQ/arPDC/Go/kxg== X-IronPort-AV: E=Sophos;i="6.12,180,1728921600"; d="scan'208";a="32127835" Received: from h199-255-45-14.hgst.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 24 Nov 2024 15:10:37 +0800 IronPort-SDR: 6742c420_MqbalEIdz5jVR6DSBZmbwFKEqgkKDnRBpZFw0gnosJRCG0L YcYikt8Ue5z7hMn5NMvorDW6uR++aaucR4pMxoQ== Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 23 Nov 2024 22:13:53 -0800 WDCIronportException: Internal Received: from avri-office.ad.shared (HELO avri-office.sdcorp.global.sandisk.com) ([10.45.31.142]) by uls-op-cesaip01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 23 Nov 2024 23:10:36 -0800 From: Avri Altman To: "Martin K . Petersen" Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, Bart Van Assche , Bean Huo , Avri Altman Subject: [PATCH v5 4/4] scsi: ufs: core: Introduce a new clock_scaling lock Date: Sun, 24 Nov 2024 09:08:08 +0200 Message-Id: <20241124070808.194860-5-avri.altman@wdc.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20241124070808.194860-1-avri.altman@wdc.com> References: <20241124070808.194860-1-avri.altman@wdc.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Introduce a new clock scaling lock to serialize access to some of the clock scaling members instead of the host_lock. here also, simplify the code with the guard() macro and co. Reviewed-by: Bart Van Assche Signed-off-by: Avri Altman --- drivers/ufs/core/ufshcd.c | 132 ++++++++++++++++++-------------------- include/ufs/ufshcd.h | 16 +++-- 2 files changed, 71 insertions(+), 77 deletions(-) diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c index b4c8f528c18f..42ce4dff8dd2 100644 --- a/drivers/ufs/core/ufshcd.c +++ b/drivers/ufs/core/ufshcd.c @@ -1452,16 +1452,16 @@ static void ufshcd_clk_scaling_suspend_work(struct = work_struct *work) { struct ufs_hba *hba =3D container_of(work, struct ufs_hba, clk_scaling.suspend_work); - unsigned long irq_flags; =20 - spin_lock_irqsave(hba->host->host_lock, irq_flags); - if (hba->clk_scaling.active_reqs || hba->clk_scaling.is_suspended) { - spin_unlock_irqrestore(hba->host->host_lock, irq_flags); - return; + scoped_guard(spinlock_irqsave, &hba->clk_scaling.lock) + { + if (hba->clk_scaling.active_reqs || + hba->clk_scaling.is_suspended) + return; + + hba->clk_scaling.is_suspended =3D true; + hba->clk_scaling.window_start_t =3D 0; } - hba->clk_scaling.is_suspended =3D true; - hba->clk_scaling.window_start_t =3D 0; - spin_unlock_irqrestore(hba->host->host_lock, irq_flags); =20 devfreq_suspend_device(hba->devfreq); } @@ -1470,15 +1470,13 @@ static void ufshcd_clk_scaling_resume_work(struct w= ork_struct *work) { struct ufs_hba *hba =3D container_of(work, struct ufs_hba, clk_scaling.resume_work); - unsigned long irq_flags; =20 - spin_lock_irqsave(hba->host->host_lock, irq_flags); - if (!hba->clk_scaling.is_suspended) { - spin_unlock_irqrestore(hba->host->host_lock, irq_flags); - return; + scoped_guard(spinlock_irqsave, &hba->clk_scaling.lock) + { + if (!hba->clk_scaling.is_suspended) + return; + hba->clk_scaling.is_suspended =3D false; } - hba->clk_scaling.is_suspended =3D false; - spin_unlock_irqrestore(hba->host->host_lock, irq_flags); =20 devfreq_resume_device(hba->devfreq); } @@ -1492,7 +1490,6 @@ static int ufshcd_devfreq_target(struct device *dev, bool scale_up =3D false, sched_clk_scaling_suspend_work =3D false; struct list_head *clk_list =3D &hba->clk_list_head; struct ufs_clk_info *clki; - unsigned long irq_flags; =20 if (!ufshcd_is_clkscaling_supported(hba)) return -EINVAL; @@ -1513,43 +1510,38 @@ static int ufshcd_devfreq_target(struct device *dev, *freq =3D (unsigned long) clk_round_rate(clki->clk, *freq); } =20 - spin_lock_irqsave(hba->host->host_lock, irq_flags); - if (ufshcd_eh_in_progress(hba)) { - spin_unlock_irqrestore(hba->host->host_lock, irq_flags); - return 0; - } + scoped_guard(spinlock_irqsave, &hba->clk_scaling.lock) + { + if (ufshcd_eh_in_progress(hba)) + return 0; =20 - /* Skip scaling clock when clock scaling is suspended */ - if (hba->clk_scaling.is_suspended) { - spin_unlock_irqrestore(hba->host->host_lock, irq_flags); - dev_warn(hba->dev, "clock scaling is suspended, skip"); - return 0; - } + /* Skip scaling clock when clock scaling is suspended */ + if (hba->clk_scaling.is_suspended) { + dev_warn(hba->dev, "clock scaling is suspended, skip"); + return 0; + } =20 - if (!hba->clk_scaling.active_reqs) - sched_clk_scaling_suspend_work =3D true; + if (!hba->clk_scaling.active_reqs) + sched_clk_scaling_suspend_work =3D true; =20 - if (list_empty(clk_list)) { - spin_unlock_irqrestore(hba->host->host_lock, irq_flags); - goto out; - } + if (list_empty(clk_list)) + goto out; =20 - /* Decide based on the target or rounded-off frequency and update */ - if (hba->use_pm_opp) - scale_up =3D *freq > hba->clk_scaling.target_freq; - else - scale_up =3D *freq =3D=3D clki->max_freq; + /* Decide based on the target or rounded-off frequency and update */ + if (hba->use_pm_opp) + scale_up =3D *freq > hba->clk_scaling.target_freq; + else + scale_up =3D *freq =3D=3D clki->max_freq; =20 - if (!hba->use_pm_opp && !scale_up) - *freq =3D clki->min_freq; + if (!hba->use_pm_opp && !scale_up) + *freq =3D clki->min_freq; =20 - /* Update the frequency */ - if (!ufshcd_is_devfreq_scaling_required(hba, *freq, scale_up)) { - spin_unlock_irqrestore(hba->host->host_lock, irq_flags); - ret =3D 0; - goto out; /* no state change required */ + /* Update the frequency */ + if (!ufshcd_is_devfreq_scaling_required(hba, *freq, scale_up)) { + ret =3D 0; + goto out; /* no state change required */ + } } - spin_unlock_irqrestore(hba->host->host_lock, irq_flags); =20 start =3D ktime_get(); ret =3D ufshcd_devfreq_scale(hba, *freq, scale_up); @@ -1574,7 +1566,6 @@ static int ufshcd_devfreq_get_dev_status(struct devic= e *dev, { struct ufs_hba *hba =3D dev_get_drvdata(dev); struct ufs_clk_scaling *scaling =3D &hba->clk_scaling; - unsigned long flags; ktime_t curr_t; =20 if (!ufshcd_is_clkscaling_supported(hba)) @@ -1582,7 +1573,8 @@ static int ufshcd_devfreq_get_dev_status(struct devic= e *dev, =20 memset(stat, 0, sizeof(*stat)); =20 - spin_lock_irqsave(hba->host->host_lock, flags); + guard(spinlock_irqsave)(&hba->clk_scaling.lock); + curr_t =3D ktime_get(); if (!scaling->window_start_t) goto start_window; @@ -1618,7 +1610,7 @@ static int ufshcd_devfreq_get_dev_status(struct devic= e *dev, scaling->busy_start_t =3D 0; scaling->is_busy_started =3D false; } - spin_unlock_irqrestore(hba->host->host_lock, flags); + return 0; } =20 @@ -1682,19 +1674,19 @@ static void ufshcd_devfreq_remove(struct ufs_hba *h= ba) =20 static void ufshcd_suspend_clkscaling(struct ufs_hba *hba) { - unsigned long flags; bool suspend =3D false; =20 cancel_work_sync(&hba->clk_scaling.suspend_work); cancel_work_sync(&hba->clk_scaling.resume_work); =20 - spin_lock_irqsave(hba->host->host_lock, flags); - if (!hba->clk_scaling.is_suspended) { - suspend =3D true; - hba->clk_scaling.is_suspended =3D true; - hba->clk_scaling.window_start_t =3D 0; + scoped_guard(spinlock_irqsave, &hba->clk_scaling.lock) + { + if (!hba->clk_scaling.is_suspended) { + suspend =3D true; + hba->clk_scaling.is_suspended =3D true; + hba->clk_scaling.window_start_t =3D 0; + } } - spin_unlock_irqrestore(hba->host->host_lock, flags); =20 if (suspend) devfreq_suspend_device(hba->devfreq); @@ -1702,15 +1694,15 @@ static void ufshcd_suspend_clkscaling(struct ufs_hb= a *hba) =20 static void ufshcd_resume_clkscaling(struct ufs_hba *hba) { - unsigned long flags; bool resume =3D false; =20 - spin_lock_irqsave(hba->host->host_lock, flags); - if (hba->clk_scaling.is_suspended) { - resume =3D true; - hba->clk_scaling.is_suspended =3D false; + scoped_guard(spinlock_irqsave, &hba->clk_scaling.lock) + { + if (hba->clk_scaling.is_suspended) { + resume =3D true; + hba->clk_scaling.is_suspended =3D false; + } } - spin_unlock_irqrestore(hba->host->host_lock, flags); =20 if (resume) devfreq_resume_device(hba->devfreq); @@ -1796,6 +1788,8 @@ static void ufshcd_init_clk_scaling(struct ufs_hba *h= ba) INIT_WORK(&hba->clk_scaling.resume_work, ufshcd_clk_scaling_resume_work); =20 + spin_lock_init(&hba->clk_scaling.lock); + hba->clk_scaling.workq =3D alloc_ordered_workqueue( "ufs_clkscaling_%d", WQ_MEM_RECLAIM, hba->host->host_no); =20 @@ -2157,19 +2151,17 @@ static void ufshcd_clk_scaling_start_busy(struct uf= s_hba *hba) { bool queue_resume_work =3D false; ktime_t curr_t =3D ktime_get(); - unsigned long flags; =20 if (!ufshcd_is_clkscaling_supported(hba)) return; =20 - spin_lock_irqsave(hba->host->host_lock, flags); + guard(spinlock_irqsave)(&hba->clk_scaling.lock); + if (!hba->clk_scaling.active_reqs++) queue_resume_work =3D true; =20 - if (!hba->clk_scaling.is_enabled || hba->pm_op_in_progress) { - spin_unlock_irqrestore(hba->host->host_lock, flags); + if (!hba->clk_scaling.is_enabled || hba->pm_op_in_progress) return; - } =20 if (queue_resume_work) queue_work(hba->clk_scaling.workq, @@ -2185,18 +2177,17 @@ static void ufshcd_clk_scaling_start_busy(struct uf= s_hba *hba) hba->clk_scaling.busy_start_t =3D curr_t; hba->clk_scaling.is_busy_started =3D true; } - spin_unlock_irqrestore(hba->host->host_lock, flags); } =20 static void ufshcd_clk_scaling_update_busy(struct ufs_hba *hba) { struct ufs_clk_scaling *scaling =3D &hba->clk_scaling; - unsigned long flags; =20 if (!ufshcd_is_clkscaling_supported(hba)) return; =20 - spin_lock_irqsave(hba->host->host_lock, flags); + guard(spinlock_irqsave)(&hba->clk_scaling.lock); + hba->clk_scaling.active_reqs--; if (!scaling->active_reqs && scaling->is_busy_started) { scaling->tot_busy_t +=3D ktime_to_us(ktime_sub(ktime_get(), @@ -2204,7 +2195,6 @@ static void ufshcd_clk_scaling_update_busy(struct ufs= _hba *hba) scaling->busy_start_t =3D 0; scaling->is_busy_started =3D false; } - spin_unlock_irqrestore(hba->host->host_lock, flags); } =20 static inline int ufshcd_monitor_opcode2dir(u8 opcode) diff --git a/include/ufs/ufshcd.h b/include/ufs/ufshcd.h index b6311069d901..ce7667b020e2 100644 --- a/include/ufs/ufshcd.h +++ b/include/ufs/ufshcd.h @@ -436,6 +436,10 @@ struct ufs_clk_gating { =20 /** * struct ufs_clk_scaling - UFS clock scaling related data + * @workq: workqueue to schedule devfreq suspend/resume work + * @suspend_work: worker to suspend devfreq + * @resume_work: worker to resume devfreq + * @lock: serialize access to some struct ufs_clk_scaling members * @active_reqs: number of requests that are pending. If this is zero when * devfreq ->target() function is called then schedule "suspend_work" to * suspend devfreq. @@ -445,9 +449,6 @@ struct ufs_clk_gating { * @enable_attr: sysfs attribute to enable/disable clock scaling * @saved_pwr_info: UFS power mode may also be changed during scaling and = this * one keeps track of previous power mode. - * @workq: workqueue to schedule devfreq suspend/resume work - * @suspend_work: worker to suspend devfreq - * @resume_work: worker to resume devfreq * @target_freq: frequency requested by devfreq framework * @min_gear: lowest HS gear to scale down to * @is_enabled: tracks if scaling is currently enabled or not, controlled = by @@ -459,15 +460,18 @@ struct ufs_clk_gating { * @is_suspended: tracks if devfreq is suspended or not */ struct ufs_clk_scaling { + struct workqueue_struct *workq; + struct work_struct suspend_work; + struct work_struct resume_work; + + spinlock_t lock; + int active_reqs; unsigned long tot_busy_t; ktime_t window_start_t; ktime_t busy_start_t; struct device_attribute enable_attr; struct ufs_pa_layer_attr saved_pwr_info; - struct workqueue_struct *workq; - struct work_struct suspend_work; - struct work_struct resume_work; unsigned long target_freq; u32 min_gear; bool is_enabled; --=20 2.25.1