From nobody Thu Apr 10 23:18:43 2025 Received: from out162-62-58-216.mail.qq.com (out162-62-58-216.mail.qq.com [162.62.58.216]) (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 9B59B23F422 for ; Thu, 3 Apr 2025 07:22:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=162.62.58.216 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743664938; cv=none; b=CzopxGneYGr8vpUNUojVeq01wzSKOy3x4D8vmJyJOzy/rDbPLfLCyfI5eUjWuW4WVp1kkyHMU/Ch9PIdeGhsaNkWjSNZ9IBnHvKKRmZgc1aUrVZxoiCIaaL3UGUxuen6L03S4KC+rRJJ1fn++ukHfPSP7dThrwLJ6rO7dCLBZfA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743664938; c=relaxed/simple; bh=NXx5pxLC6aaOP2AVJLWfudGvIXmwCOmjaLb7zV77ijA=; h=Message-ID:From:To:Cc:Subject:Date:In-Reply-To:References: MIME-Version; b=KktUriL9b4q6luh25g1eANXpOZlJHCGimupgqPksuniAVtJPOyZVGifU4GvhO0SXkdrG9jOPMoph/mHgGLty6R9WQ6c/7ecqXmQBKIJ6AX9gmbdv3NR5uMu187p5O2M6cGdPrqEXgmXSax50LCJLgLEM2ZC5zR0NxTbvwN0inzc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=qq.com; spf=pass smtp.mailfrom=qq.com; dkim=pass (1024-bit key) header.d=qq.com header.i=@qq.com header.b=rBgFL2ep; arc=none smtp.client-ip=162.62.58.216 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=qq.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=qq.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=qq.com header.i=@qq.com header.b="rBgFL2ep" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1743664931; bh=j0n1Yn3xof12J7AxPVd/N/p9DVfFFk4LYiLYsi1jpSA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=rBgFL2epG/z2EvmdOrwjuQmuU4D3Q8q6NPWCqKSI+5PvLFizenWT3GdLBQ5IHDVjo lrOIIHxv8j7l31IobYoJfAIsg4MlibFkku2zdmrNCeSkcIRG50vhqWur9M7UccNyum cnnTd8VblyfWU6hcz7kn1bLgO5AgR1SbsLw6ZvjY= Received: from localhost.localdomain ([116.128.244.169]) by newxmesmtplogicsvrszb21-0.qq.com (NewEsmtp) with SMTP id 58993ED0; Thu, 03 Apr 2025 15:22:09 +0800 X-QQ-mid: xmsmtpt1743664929twng37n1l Message-ID: X-QQ-XMAILINFO: NbgegmlEc3Ju7Zkxg19jQiwymA8b/D1+rGpbVhMXwqQJIzhunSWITcF7isi/kn pQw21NUCkn119uoUrI5VVK2QxAabcVMoRi/tTIxt1llpDQOtvnq79kqfbayeiT9hb0S+a0zMVyo/ m3CT1pZ+4Ipznr6b+QkND4FxvlpDnzfMTnIVbZyDoTBmBeUzWylaE9ZazguOO4lDSmMZd2SPHgvf F+yrh+b0wQxsSMq8giDAaTuqjUihxerNX6A59JA9ic5a274eTkG5ovUkbVkXqhhAVJ2w+n3DlMrC 4FXwiQKsYhDlm5oZUK51qtwEteFV6TAJILL0ZJGI/WaTmPfL9Eco15Fd3GF2FrH689n2c12t6SXf ue0dbuO5BXXZ+OMvljyd01kG2QDYf/HLncRqMu+ZbpMU+7UJje3n3LsVLgefapa2DPvNjZW4wzVt nwe09ztePNWiM68g6+6zmuTawCBvalN0orm87R29O3lUcbDKWIMKtrgwUFr6o5K/WdJKJujZr8Yp 14P5ZDyB04R6q0bnkNMTQ+XS1Rd4bFYA0YQoEcE/X67vNN6xaeHMDt23Vl8Zw1eTAfGqCc9smLug PNIwbED4e4ubUpa6Gb2R7DjIvPn15y57v9CWVJ1FVknc1WgVKmYGeMlVpCNeTdpB8aY7/Lw3krzR aoF0pNO/MAo1GKbCfc062BRFqOomOR/Iczh3yWmf01sJfXMoip1vwLRkZDKAchnrU8Po9nNgvUi5 cAUn3MmabtljVGUZ7EN+ZCK716UmGCt4r516/WInkkpexh/O1zjhZ1p1GFeskfCN5pkr81pxI+eO Aln6slBSSSMUw5oTjyFrt7OqUB4KlCAR55jK2tTl5t4SiMIpK79zcg6M7N7YSxZ2JbC0nEPGP2js TfsKaanD6B9KgQCIoPPc9hfgxIMjOLG8vrv8xCPkaSe06kMeZqgrxX/0Ly9iTPScYQfhGyRGPKmZ QIr7lO5LSLYIxcO/+fo+l3IBRit8ZnuHdqcoyWz3KqMiRhkML2hjqVkw+4Ql3SxqMDEiXYpsgqEp m7FwihmoAUEg7ZoLmWqOexwMQPlpk= X-QQ-XMRINFO: NI4Ajvh11aEj8Xl/2s1/T8w= From: Yaxiong Tian To: kbusch@kernel.org, axboe@kernel.dk, hch@lst.de, sagi@grimberg.me, chaitanyak@nvidia.com Cc: linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org, Yaxiong Tian , Chaitanya Kulkarni Subject: [PATCH v4 1/3] nvme: Add warning for PST table memory allocation failure in nvme_configure_apst Date: Thu, 3 Apr 2025 15:22:07 +0800 X-OQ-MSGID: <20250403072207.1208116-1-iambestgod@qq.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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" From: Yaxiong Tian Currently the function fails silently on PST table memory allocation failur= e. Add warning messages to improve error visibility. Reviewed-by: Chaitanya Kulkarni Signed-off-by: Yaxiong Tian --- drivers/nvme/host/core.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index c2d89fac86c5..eca0d0d2c2b4 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -2678,8 +2678,11 @@ static int nvme_configure_apst(struct nvme_ctrl *ctr= l) } =20 table =3D kzalloc(sizeof(*table), GFP_KERNEL); - if (!table) + if (!table) { + dev_warn(ctrl->device, + "Failed to allocate pst table; not using APST\n"); return 0; + } =20 if (!ctrl->apst_enabled || ctrl->ps_max_latency_us =3D=3D 0) { /* Turn off APST. */ --=20 2.25.1 From nobody Thu Apr 10 23:18:43 2025 Received: from xmbghk7.mail.qq.com (xmbghk7.mail.qq.com [43.163.128.46]) (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 D558C23F422 for ; Thu, 3 Apr 2025 07:27:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=43.163.128.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743665254; cv=none; b=JYsOwiAGc5Kif4bj8DZ8EL9EdvMGuzUNX7I0JdLB6tH5HdYXbum7++V85PZlEwRGdxaUlaJdgI+ajbj44fIH9ehCp7XDAU0Ko6oWJBQYwTbjaQh0dfBg490zATXIpmHe5t9oA56p4FTGZHIpBsQaQBrBh9tnL+QhGCyO3Mr8BFo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743665254; c=relaxed/simple; bh=xUhfi3gUw/QjVJbcUhIpWx5w9OxwRdvISb3WEdQ4YAY=; h=Message-ID:From:To:Cc:Subject:Date:In-Reply-To:References: MIME-Version; b=ua4RqFdzole/JGaBasvVKqplFAnpx32VbVhdjsA159GBUMhzvJO2BMU0dJc+9fNXwAUwG5Re14iV7I+k7NcRWbXSiksKHzLkApiseF3OUbahMXaZxyBPS2fgqFGLhBef/i/kb31OX+DKwSaukxTu3G9XHSg+fpKzmr/gCKx0gdw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=qq.com; spf=pass smtp.mailfrom=qq.com; dkim=pass (1024-bit key) header.d=qq.com header.i=@qq.com header.b=UVQvVpKP; arc=none smtp.client-ip=43.163.128.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=qq.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=qq.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=qq.com header.i=@qq.com header.b="UVQvVpKP" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1743664939; bh=PEO11pdJTf99eBXLbA9i5RAduuXXjkaH7AWwQjlYo8k=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=UVQvVpKP3Oa8O8BGJjaQ7rkxDhtAyGmMBbZhObZxjaaHitUoyvaSkcO2t/EBxY2F2 Ypp9k/g1Miu30r94NeVYIZH2ip7vv56725u1kpI6Iaw6W5aP+jl1O1A8fj4+p+Z8BJ WzIwAaaTddhWP+l1z+DVo8CQWk+zRuVqOYOD9i+4= Received: from localhost.localdomain ([116.128.244.169]) by newxmesmtplogicsvrsza29-0.qq.com (NewEsmtp) with SMTP id 591AD8D9; Thu, 03 Apr 2025 15:22:17 +0800 X-QQ-mid: xmsmtpt1743664937toxqeymfr Message-ID: X-QQ-XMAILINFO: M+5cKLn0wXDtul2pnIgRndmKtcEfFHQLBP08+4LFHc7zPPxdtnlrz4wvl7nTIT Rcjd0i88/nIHeEkSVNC0bpHFcHp8mhcum5U+4+4LclAz/b0suif5RLln11sekyn7gu/NLEBIqrAj rbOXfPrqC1E3RqFRCxLGhFmqyp7OaXI044ef7i4dO6mvMKH3Ei3ccB3dfC2DIjyaz04JaBdGCchO HOYAwmlkWOVU2bXvDnOkId2XQi+jvKkfDj4WwSa7JEXQu5ODF8vgbuBMPq867RiQAvjfZpLEsnfc noWCenxCK/6fGFt5M5z16OblloX95lIbxy/lAjvFH0gANR/67TGN24UrCeR+WIHAatHyDOaH5Whn vjhPlvNeVeZC+r4tTmvbk3ydIfD3MaiU6qXnlO+g/JdoNJpoJVoNcLV1Azl5pUyOEn1djpABVnvs I+eer28ymaHAWK5FCiAuIlagt+I6agcw7Z5dYc7J53vbwsaEO0m3AkwmSS2CmL2ZRI7p1mOg2p3w ZRJYsyoQJ4Ci1itDnJw5TXek7gAWmRm/R0Aj+/uTOUr22yRhPWubsO3Nxbnhs2y58RSJM0rkkZwS Fdgk5aJv2SE44b8uSOjMWQc1RuPQXiIVaPaZJnlXIO4mund+3ksO2f1QlmHJJSdtgNpddT3bW4El QaTECJPjpFMcP+EGOdOX7rs5aTVHHKhYcQkj1YUP9MIYY2KC9ssUWekIIYGKPFlNSLq6+fmo648F 6LuOOMuPnAWJ42LF5vW7X+fztiNyIU4hjfx9UE6JzNYFQWLg4TYf995AMkBvvMNt1cHDT7dQcEIJ gjF3WZG98JPlrN6xUnTkd9c5WJwp5OsOjRcTMTycO2mJVOAVD2Qx8Xcg8I6O6rLN9HjGAWzrDwGD q3kt1WvJwRf7c9Bl1K39cyuO3NMpSmG5mLIHVFPWk4lb5TPInA/8NSz16DgI8VdzFXV4KyQFJ8iD qrhb6Ocubv4/1vm7SewotkoA20BI5coNxn4ruX/CmfaNuwXSR6Bn5Ye7JvENBcJLoI4QJPvhQJTo 9tkoZXBQ== X-QQ-XMRINFO: OWPUhxQsoeAVDbp3OJHYyFg= From: Yaxiong Tian To: kbusch@kernel.org, axboe@kernel.dk, hch@lst.de, sagi@grimberg.me, chaitanyak@nvidia.com Cc: linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org, Yaxiong Tian , Chaitanya Kulkarni Subject: [PATCH v4 2/3] nvme: add sysfs interface for APST table updates Date: Thu, 3 Apr 2025 15:22:16 +0800 X-OQ-MSGID: <20250403072216.1208677-1-iambestgod@qq.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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" From: Yaxiong Tian In desktop systems, users can choose between power-saving mode and performance mode. These two modes involve different trade-offs between NVMe performance and power efficiency, thus requiring dynamic updates to AP= ST. Currently, the APST (Autonomous Power State Transition) table can only be updated during module initialization via module parameters or indirectly by setting QoS latency requirements. This patch adds a direct sysfs interface to allow dynamic updates to the APST table at runtime. The new sysfs entry is created at: /sys/class/nvme//apst_update This provides more flexibility in power management tuning without requiring module reload or QoS latency changes. Example usage: update nvme module parameters. echo 1 > /sys/class/nvme/nvme0/apst_update Reviewed-by: Chaitanya Kulkarni Signed-off-by: Yaxiong Tian --- drivers/nvme/host/core.c | 9 +++++++-- drivers/nvme/host/nvme.h | 2 ++ drivers/nvme/host/sysfs.c | 24 ++++++++++++++++++++++++ 3 files changed, 33 insertions(+), 2 deletions(-) diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index eca0d0d2c2b4..19438da102e5 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -2654,7 +2654,7 @@ static bool nvme_apst_get_transition_time(u64 total_l= atency, * * Users can set ps_max_latency_us to zero to turn off APST. */ -static int nvme_configure_apst(struct nvme_ctrl *ctrl) +int nvme_configure_apst(struct nvme_ctrl *ctrl) { struct nvme_feat_auto_pst *table; unsigned apste =3D 0; @@ -2779,8 +2779,11 @@ static void nvme_set_latency_tolerance(struct device= *dev, s32 val) =20 if (ctrl->ps_max_latency_us !=3D latency) { ctrl->ps_max_latency_us =3D latency; - if (nvme_ctrl_state(ctrl) =3D=3D NVME_CTRL_LIVE) + if (nvme_ctrl_state(ctrl) =3D=3D NVME_CTRL_LIVE) { + mutex_lock(&ctrl->apst_lock); nvme_configure_apst(ctrl); + mutex_unlock(&ctrl->apst_lock); + } } } =20 @@ -4853,6 +4856,8 @@ int nvme_init_ctrl(struct nvme_ctrl *ctrl, struct dev= ice *dev, ctrl->ka_cmd.common.opcode =3D nvme_admin_keep_alive; ctrl->ka_last_check_time =3D jiffies; =20 + mutex_init(&ctrl->apst_lock); + BUILD_BUG_ON(NVME_DSM_MAX_RANGES * sizeof(struct nvme_dsm_range) > PAGE_SIZE); ctrl->discard_page =3D alloc_page(GFP_KERNEL); diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h index 51e078642127..7f8e10f5bf7a 100644 --- a/drivers/nvme/host/nvme.h +++ b/drivers/nvme/host/nvme.h @@ -385,6 +385,7 @@ struct nvme_ctrl { key_serial_t tls_pskid; =20 /* Power saving configuration */ + struct mutex apst_lock; u64 ps_max_latency_us; bool apst_enabled; =20 @@ -828,6 +829,7 @@ void nvme_unfreeze(struct nvme_ctrl *ctrl); void nvme_wait_freeze(struct nvme_ctrl *ctrl); int nvme_wait_freeze_timeout(struct nvme_ctrl *ctrl, long timeout); void nvme_start_freeze(struct nvme_ctrl *ctrl); +int nvme_configure_apst(struct nvme_ctrl *ctrl); =20 static inline enum req_op nvme_req_op(struct nvme_command *cmd) { diff --git a/drivers/nvme/host/sysfs.c b/drivers/nvme/host/sysfs.c index 6d31226f7a4f..20146eb4c671 100644 --- a/drivers/nvme/host/sysfs.c +++ b/drivers/nvme/host/sysfs.c @@ -684,6 +684,29 @@ static DEVICE_ATTR(dhchap_ctrl_secret, S_IRUGO | S_IWU= SR, nvme_ctrl_dhchap_ctrl_secret_show, nvme_ctrl_dhchap_ctrl_secret_store); #endif =20 +static ssize_t apst_update_store(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t size) +{ + struct nvme_ctrl *ctrl =3D dev_get_drvdata(dev); + bool bool_data =3D false; + int err; + + err =3D kstrtobool(buf, &bool_data); + + if (err) + return err; + + if (bool_data && nvme_ctrl_state(ctrl) =3D=3D NVME_CTRL_LIVE) { + mutex_lock(&ctrl->apst_lock); + nvme_configure_apst(ctrl); + mutex_unlock(&ctrl->apst_lock); + } + + return size; +} +static DEVICE_ATTR_WO(apst_update); + static struct attribute *nvme_dev_attrs[] =3D { &dev_attr_reset_controller.attr, &dev_attr_rescan_controller.attr, @@ -712,6 +735,7 @@ static struct attribute *nvme_dev_attrs[] =3D { &dev_attr_dhchap_ctrl_secret.attr, #endif &dev_attr_adm_passthru_err_log_enabled.attr, + &dev_attr_apst_update.attr, NULL }; =20 --=20 2.25.1 From nobody Thu Apr 10 23:18:43 2025 Received: from xmbghk7.mail.qq.com (xmbghk7.mail.qq.com [43.163.128.46]) (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 5CE43241139 for ; Thu, 3 Apr 2025 07:35:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=43.163.128.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743665763; cv=none; b=OMNryJNy1GxpG/cER9WAoSps9M6F3fzh2wOL+igUORAk9Z6938DAebV9ZEXTpDsnxnnKdWPsMh/U+4WX7ZqY2zdF6nr9zFiaTp01wGGSM0v2u0yhKqzvwRop4epjWKSCJB8pFpv+dQkk6TxQEqtG/UWDYvKtvNTCdN7tEF6CdPU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743665763; c=relaxed/simple; bh=ltWoWX7Mu7x+lPl36hL447GpCEWPhHjZVYkHkR2L6vs=; h=Message-ID:From:To:Cc:Subject:Date:In-Reply-To:References: MIME-Version; b=NHEpvYiRf8f9L6KR90xR+vTsJpDGYi4DrNfsM3uMlPuaJQajV7Z9GgnxRnasA9+O/NDFIwPsM1ZoJJ2kA71luCqOmDehl3V7OKnCuX17JfTdz9PSS6C0HEgjsplPwnhZHt9r7ht6gjvi5repCiKqqqArbxcNWleBHfWLkXK1i04= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=qq.com; spf=pass smtp.mailfrom=qq.com; dkim=pass (1024-bit key) header.d=qq.com header.i=@qq.com header.b=Cv5XRfCt; arc=none smtp.client-ip=43.163.128.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=qq.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=qq.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=qq.com header.i=@qq.com header.b="Cv5XRfCt" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1743665753; bh=CQjxyMm42s533cft5gR6e75CqVkywADkjZjFWbmTt8E=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Cv5XRfCtCtSLU4xMnj6iAeGaMCTBbdZmc4bg5iBX51SiSi1zH7axO69CPHze3zy/g CgDY1itlyd5gJB6fhMJChdV1jgPUH0sopDpQ/VxlrJfOFeYDVNkrVYWkcOtXx2vqrq E3PJ36BdYW8wGjkGTShhls76Sv+br6Vittu+fJhw= Received: from localhost.localdomain ([116.128.244.169]) by newxmesmtplogicsvrsza36-0.qq.com (NewEsmtp) with SMTP id 59A3AEE8; Thu, 03 Apr 2025 15:22:26 +0800 X-QQ-mid: xmsmtpt1743664946t87kxi3vy Message-ID: X-QQ-XMAILINFO: MZtEYADUG4AgKlJdiKWyCWh3m7Uj1elCf2fIuSzZhap9yIAAAEvhMbuMC+TC8Q BFl3AOybv+wVMAk1baX/4zID/N9jA1gUnMKh32v7hgpuySrY8UVVEhH8ZuILPIjh5vXFHkdg2Xkm eh12quqSoKwb05nRx7gtSun9Cnp229yPoq6ACvdm0BhUBT4kxkv9CDmIPtAA2NMVuKO9Rac8TBDy V8iHibelb0QWTetIxXu7TFJN9aF5ZpwlW0odh334+iFLtL7sgzlZflEw7Wkd42SUOeIwrGb2Q2dN 9CSTcZZDngyB6Qic21PNRm6AyGg2tXjC73hpennEhYFyYdZ1h+jvAKYJ9Xs7IQjOmZryQ0fgMo8E btpra4Uk0s9kdkgloSS0CkyBUVK03Mx5Ff4ngcuBp/9NUDMt+CwGOZMSKIfz/h5qaWdUDQjsricO A0Hx32jhYjnGkZZUb8+JH60Rs14uPGUsA6KLwfKJY3nLI8kzxGjkk6Su8VYBoqdELF4yJfGBwyFR Xe0zzl6j2q7z/vnT6eshP4gxinQ5GGwVNzNtW/oJPpccsg4P89IRSp02nsvXY/BLkRohuiI5+K+X aOEK7Xo6JZvdvEO32K8ulBOjLzdVaBfsBYxU6sXbpCCmfoCOOJBlGYv2GXQxntBl0nS83CJkc9Jb LASx24Kwx1ZxQxTxMhdaM2eI7zzghIR0aqpA1fMv7fr6t6oPi+lCSW1vBnHEbgmHYxkRNyh0PSyv 3G1iNnPrmsuROZAvAjIoV2tiwDm43RgDuuYcxGdrzUYeGZMzHUTKghR123EIZr+UcdI91QlBpJSx 0n55wJvEbtidd3VybjETiCEXlfCO3DSFBIQq/Y8npob+uWpJWgv8xw0I+CLFGFZx0GfSt1zrUwz7 JJ8C3KSCBvw3PTN6auttkmKfCGz4H62z49sxp0wwrBfDLjssNjj4A8kZfB1eUcPPUXtGUluI0k2u RXpMwUu9U4+wT8i8Q+4K9MxhVbAN0ayjC6UYJimWmVLnh0i5GwnoFabpTCoLESTrmt9vw2hE0KGF 6OLdQshA== X-QQ-XMRINFO: NS+P29fieYNw95Bth2bWPxk= From: Yaxiong Tian To: kbusch@kernel.org, axboe@kernel.dk, hch@lst.de, sagi@grimberg.me, chaitanyak@nvidia.com Cc: linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org, Yaxiong Tian , Chaitanya Kulkarni Subject: [PATCH v4 3/3] nvme: add per-controller sysfs interface for APST configuration Date: Thu, 3 Apr 2025 15:22:25 +0800 X-OQ-MSGID: <20250403072225.1209213-1-iambestgod@qq.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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" From: Yaxiong Tian Currently, APST (Autonomous Power State Transition) parameters are configured as module parameters affecting all controllers uniformly, This lacks flexibility for heterogeneous systems. This patch introduces per-controller sysfs attributes under each NVMe controller's sysfs directory: - apst_primary_timeout_ms - apst_secondary_timeout_ms - apst_primary_latency_tol_us - apst_secondary_latency_tol_us The attributes allow runtime configuration of: Timeout values for primary/secondary states. The existing module parameters are retained for backward compatibility but now only serve as default values for new controllers. Reviewed-by: Chaitanya Kulkarni Signed-off-by: Yaxiong Tian --- drivers/nvme/host/core.c | 16 ++++++++++------ drivers/nvme/host/nvme.h | 4 ++++ drivers/nvme/host/sysfs.c | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 52 insertions(+), 6 deletions(-) diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index 19438da102e5..f6ef73ed88e6 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -2608,22 +2608,22 @@ static int nvme_configure_host_options(struct nvme_= ctrl *ctrl) * timeout value is returned and the matching tolerance index (1 or 2) is * reported. */ -static bool nvme_apst_get_transition_time(u64 total_latency, +static bool nvme_apst_get_transition_time(struct nvme_ctrl *ctrl, u64 tota= l_latency, u64 *transition_time, unsigned *last_index) { - if (total_latency <=3D apst_primary_latency_tol_us) { + if (total_latency <=3D ctrl->apst_primary_latency_tol_us) { if (*last_index =3D=3D 1) return false; *last_index =3D 1; - *transition_time =3D apst_primary_timeout_ms; + *transition_time =3D ctrl->apst_primary_timeout_ms; return true; } if (apst_secondary_timeout_ms && - total_latency <=3D apst_secondary_latency_tol_us) { + total_latency <=3D ctrl->apst_secondary_latency_tol_us) { if (*last_index <=3D 2) return false; *last_index =3D 2; - *transition_time =3D apst_secondary_timeout_ms; + *transition_time =3D ctrl->apst_secondary_timeout_ms; return true; } return false; @@ -2729,7 +2729,7 @@ int nvme_configure_apst(struct nvme_ctrl *ctrl) * for higher power states. */ if (apst_primary_timeout_ms && apst_primary_latency_tol_us) { - if (!nvme_apst_get_transition_time(total_latency_us, + if (!nvme_apst_get_transition_time(ctrl, total_latency_us, &transition_ms, &last_lt_index)) continue; } else { @@ -4857,6 +4857,10 @@ int nvme_init_ctrl(struct nvme_ctrl *ctrl, struct de= vice *dev, ctrl->ka_last_check_time =3D jiffies; =20 mutex_init(&ctrl->apst_lock); + ctrl->apst_primary_timeout_ms =3D apst_primary_timeout_ms; + ctrl->apst_secondary_timeout_ms =3D apst_secondary_timeout_ms; + ctrl->apst_primary_latency_tol_us =3D apst_primary_latency_tol_us; + ctrl->apst_secondary_latency_tol_us =3D apst_secondary_latency_tol_us; =20 BUILD_BUG_ON(NVME_DSM_MAX_RANGES * sizeof(struct nvme_dsm_range) > PAGE_SIZE); diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h index 7f8e10f5bf7a..ed9afc3c6781 100644 --- a/drivers/nvme/host/nvme.h +++ b/drivers/nvme/host/nvme.h @@ -387,6 +387,10 @@ struct nvme_ctrl { /* Power saving configuration */ struct mutex apst_lock; u64 ps_max_latency_us; + u64 apst_primary_timeout_ms; + u64 apst_secondary_timeout_ms; + u64 apst_primary_latency_tol_us; + u64 apst_secondary_latency_tol_us; bool apst_enabled; =20 /* PCIe only: */ diff --git a/drivers/nvme/host/sysfs.c b/drivers/nvme/host/sysfs.c index 20146eb4c671..77912e95aff8 100644 --- a/drivers/nvme/host/sysfs.c +++ b/drivers/nvme/host/sysfs.c @@ -684,6 +684,39 @@ static DEVICE_ATTR(dhchap_ctrl_secret, S_IRUGO | S_IWU= SR, nvme_ctrl_dhchap_ctrl_secret_show, nvme_ctrl_dhchap_ctrl_secret_store); #endif =20 +#define nvme_apst_show_and_store_function(field) \ +static ssize_t field##_show(struct device *dev, \ + struct device_attribute *attr, char *buf) \ +{ \ + struct nvme_ctrl *ctrl =3D dev_get_drvdata(dev); \ +\ + return sysfs_emit(buf, "%llu\n", ctrl->field); \ +} \ + \ +static ssize_t field##_store(struct device *dev, \ + struct device_attribute *attr, \ + const char *buf, size_t size) \ +{ \ + struct nvme_ctrl *ctrl =3D dev_get_drvdata(dev); \ + u64 data =3D 0; \ + int err; \ +\ + err =3D kstrtou64(buf, 0, &data); \ + if (err < 0) \ + return err; \ + \ + mutex_lock(&ctrl->apst_lock); \ + ctrl->field =3D data; \ + mutex_unlock(&ctrl->apst_lock); \ + return size; \ +} \ +static DEVICE_ATTR_RW(field); + +nvme_apst_show_and_store_function(apst_primary_timeout_ms); +nvme_apst_show_and_store_function(apst_secondary_timeout_ms); +nvme_apst_show_and_store_function(apst_primary_latency_tol_us); +nvme_apst_show_and_store_function(apst_secondary_latency_tol_us); + static ssize_t apst_update_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t size) @@ -735,6 +768,11 @@ static struct attribute *nvme_dev_attrs[] =3D { &dev_attr_dhchap_ctrl_secret.attr, #endif &dev_attr_adm_passthru_err_log_enabled.attr, + + &dev_attr_apst_primary_timeout_ms.attr, + &dev_attr_apst_secondary_timeout_ms.attr, + &dev_attr_apst_primary_latency_tol_us.attr, + &dev_attr_apst_secondary_latency_tol_us.attr, &dev_attr_apst_update.attr, NULL }; --=20 2.25.1