Message ID | 20230803220202.78036-5-robdclark@gmail.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f41:0:b0:3e4:2afc:c1 with SMTP id v1csp1495648vqx; Thu, 3 Aug 2023 17:43:56 -0700 (PDT) X-Google-Smtp-Source: APBJJlE9mf1vy1TSKPdydILxiPn9UF60sNvuXLfM7Ct8CidVT0bLwLC9QE5ZsXKbs4mdSnrsoilg X-Received: by 2002:a17:902:ea04:b0:1b8:a27d:f591 with SMTP id s4-20020a170902ea0400b001b8a27df591mr22019793plg.5.1691109836572; Thu, 03 Aug 2023 17:43:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691109836; cv=none; d=google.com; s=arc-20160816; b=H8uy2GszPSVxNQRKoChe87Tc1AhpPU/ASiD6bRMECHK2euNFfmUKoMM+dWqElGDw2x HssohA1JPKljaTr2Td325tNRruqK64hVUyXA/e7am8umPD42J4TmIQwdIL2nt+MMJmgf nB5PxHbTl8YTuhdQ+537VUmD17rr5DAos3L7efMMdDu+jehqeo9y46oOYDGEDEn/t10y CaXjC4ROPKiRDhTx4B35gaKa106mYmH12kKBNrszqD3osraEN08DjdEENwWcNLpu0x00 +X3TX+mZGpLS8HaigCdNGzh59X30n9ouDSIeF3W6mZco3z/uofU5QHZ86PeOKKr4++tL eDag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=pdIQ5YsNyrlOWXwSuXx23oN8qxRbhtWI4ShbAosGVe0=; fh=NyhHka4W20GJANx950hO6xFCfpVEnVXjLTKxRmeXomg=; b=Jne1RpH1N2ghUa/h6NifQ9WMdjXIFpoHLrMX5S44TkEe4EnT7Ytt6VgEG8gOeBbbL5 wxCPDsuQ3c0lF1nYnsW76D8SpYTTXYrIs3ZXz8vulTMHWXYs9nK7srGEr9ks6hamwpUG jOm1V5xq+OtPWjgKcRElQd2eQL/mPSHzldI1noYV9lhO5dmh5ppMkNWRWMqpOmDHi49x 1kXHIp9vptMFW5WcCRG3Xe7/xkv/SqgBSQKoZwS+KOgKnD762NibnSjy5682WFg0AvEl 6wcrjXozmD9ji61VBkaR8axTbZ+m/S9AHLI0B1l721IlXEQGm5TaGYZ3ZK9TBCaZSwn4 5fnA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=sY6tJHcm; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c8-20020a170903234800b001b25e9a76d7si904542plh.316.2023.08.03.17.43.43; Thu, 03 Aug 2023 17:43:56 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=sY6tJHcm; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232478AbjHCWCk (ORCPT <rfc822;tertiaryakionsight@gmail.com> + 99 others); Thu, 3 Aug 2023 18:02:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53112 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232141AbjHCWCg (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Thu, 3 Aug 2023 18:02:36 -0400 Received: from mail-pf1-x42a.google.com (mail-pf1-x42a.google.com [IPv6:2607:f8b0:4864:20::42a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 38D6E3C16; Thu, 3 Aug 2023 15:02:27 -0700 (PDT) Received: by mail-pf1-x42a.google.com with SMTP id d2e1a72fcca58-68783004143so1069284b3a.2; Thu, 03 Aug 2023 15:02:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1691100146; x=1691704946; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=pdIQ5YsNyrlOWXwSuXx23oN8qxRbhtWI4ShbAosGVe0=; b=sY6tJHcmXKaCE9qCeuSrRxn8tuTREX4eVuSfZvU32Ry0/icJ9OtVDmxhagKAVuyBMG SUlXoizmhVMryD/E8eq5VmhsMaFhtRWTcx8Z3VDUZPEoYMQTd6SkR9z7vso9XLWHYkTS 6G9Ivds6degZQNmEcVjcTyJml6OXTI9ZiM35raRv4xX8Ealp/ILJbHMBVkGxiok4i1jv 79yixE/qNmhB6NESnN2Zw9tQ5znpOqPcsYkko7KoB2AK/a1bDGMh1E4oYnQh8/heHyfO TjaF/icZeS7mS7tCSdKfcxd9dlGz731i4zqGEICpOLuMrrnAaVLJnUCIL9OuxNCX08Xt fC9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691100146; x=1691704946; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=pdIQ5YsNyrlOWXwSuXx23oN8qxRbhtWI4ShbAosGVe0=; b=MqApzZOS6yhBQrX/ndS0QrZiA8QicXBbrVKjDsRdkavgLPUFXcaKkHOFtxbKow7ROj G/X2imbOXIKwI6mWp8og1IZhdvOKjIlu4JBaSfaFK2/AP9rjnuqbMJZgRqL/Gba5BtgP 5TXARwh9aZiw3FpVO7KrW+QlE1HJ8Say8VOuyUUYFiKlBj1ZsJVaCwaKh5OjE8U8MeBH Q3kTdxTHdMk5pucdURgGHIRscJspj1wsLHdvtFK1S5M1nD2P/lfzZxwsl02bDSvDA4Y5 nBDiKl5HUuiuuq+HavuQGHsAfiRjOwR3/sbwH9ZiZ3WkOyiUGJvUVQE87+7oUBU4bhBr hGJg== X-Gm-Message-State: ABy/qLZ/ABKMcMP9oPCTLXzISVUMAzkHdeKFsiwW4+FNWH7FQGPFyVEC wGDYouTpwrrk7qVbbo/EwEA= X-Received: by 2002:a05:6a21:4984:b0:12d:3069:69e1 with SMTP id ax4-20020a056a21498400b0012d306969e1mr16263038pzc.60.1691100145981; Thu, 03 Aug 2023 15:02:25 -0700 (PDT) Received: from localhost ([2a00:79e1:abd:4a00:6c80:7c10:75a0:44f4]) by smtp.gmail.com with ESMTPSA id s1-20020a62e701000000b00666b012baedsm295147pfh.158.2023.08.03.15.02.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Aug 2023 15:02:25 -0700 (PDT) From: Rob Clark <robdclark@gmail.com> To: dri-devel@lists.freedesktop.org Cc: linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, Rob Clark <robdclark@chromium.org>, "Rafael J. Wysocki" <rafael@kernel.org>, Pavel Machek <pavel@ucw.cz>, Len Brown <len.brown@intel.com>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, linux-pm@vger.kernel.org (open list:POWER MANAGEMENT CORE), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v3 4/9] PM / QoS: Decouple request alloc from dev_pm_qos_mtx Date: Thu, 3 Aug 2023 15:01:52 -0700 Message-ID: <20230803220202.78036-5-robdclark@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230803220202.78036-1-robdclark@gmail.com> References: <20230803220202.78036-1-robdclark@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773257187940627842 X-GMAIL-MSGID: 1773257187940627842 |
Series |
drm/msm+PM+icc: Make job_run() reclaim-safe
|
|
Commit Message
Rob Clark
Aug. 3, 2023, 10:01 p.m. UTC
From: Rob Clark <robdclark@chromium.org> Similar to the previous patch, move the allocation out from under dev_pm_qos_mtx, by speculatively doing the allocation and handle any race after acquiring dev_pm_qos_mtx by freeing the redundant allocation. Signed-off-by: Rob Clark <robdclark@chromium.org> --- drivers/base/power/qos.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
Comments
Hi Rob, kernel test robot noticed the following build warnings: https://git-scm.com/docs/git-format-patch#_base_tree_information] url: https://github.com/intel-lab-lkp/linux/commits/Rob-Clark/PM-devfreq-Drop-unneed-locking-to-appease-lockdep/20230804-060505 base: git://anongit.freedesktop.org/drm/drm-misc drm-misc-next patch link: https://lore.kernel.org/r/20230803220202.78036-5-robdclark%40gmail.com patch subject: [PATCH v3 4/9] PM / QoS: Decouple request alloc from dev_pm_qos_mtx config: i386-randconfig-m021-20230730 (https://download.01.org/0day-ci/archive/20230804/202308041725.Npwswh0L-lkp@intel.com/config) compiler: gcc-12 (Debian 12.2.0-14) 12.2.0 reproduce: (https://download.01.org/0day-ci/archive/20230804/202308041725.Npwswh0L-lkp@intel.com/reproduce) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp@intel.com> | Reported-by: Dan Carpenter <dan.carpenter@linaro.org> | Closes: https://lore.kernel.org/r/202308041725.Npwswh0L-lkp@intel.com/ smatch warnings: drivers/base/power/qos.c:973 dev_pm_qos_update_user_latency_tolerance() warn: possible memory leak of 'req' vim +/req +973 drivers/base/power/qos.c 2d984ad132a87c Rafael J. Wysocki 2014-02-11 923 int dev_pm_qos_update_user_latency_tolerance(struct device *dev, s32 val) 2d984ad132a87c Rafael J. Wysocki 2014-02-11 924 { b5ac35ff4296f7 Rob Clark 2023-08-03 925 struct dev_pm_qos_request *req = NULL; 2d984ad132a87c Rafael J. Wysocki 2014-02-11 926 int ret; 2d984ad132a87c Rafael J. Wysocki 2014-02-11 927 211fb32e3a0547 Rob Clark 2023-08-03 928 ret = dev_pm_qos_constraints_ensure_allocated(dev); 211fb32e3a0547 Rob Clark 2023-08-03 929 if (ret) 211fb32e3a0547 Rob Clark 2023-08-03 930 return ret; 211fb32e3a0547 Rob Clark 2023-08-03 931 b5ac35ff4296f7 Rob Clark 2023-08-03 932 if (!dev->power.qos->latency_tolerance_req) b5ac35ff4296f7 Rob Clark 2023-08-03 933 req = kzalloc(sizeof(*req), GFP_KERNEL); b5ac35ff4296f7 Rob Clark 2023-08-03 934 2d984ad132a87c Rafael J. Wysocki 2014-02-11 935 mutex_lock(&dev_pm_qos_mtx); 2d984ad132a87c Rafael J. Wysocki 2014-02-11 936 211fb32e3a0547 Rob Clark 2023-08-03 937 if (!dev->power.qos->latency_tolerance_req) { 2d984ad132a87c Rafael J. Wysocki 2014-02-11 938 if (val < 0) { 80a6f7c79b7822 Andrew Lutomirski 2016-11-29 939 if (val == PM_QOS_LATENCY_TOLERANCE_NO_CONSTRAINT) 80a6f7c79b7822 Andrew Lutomirski 2016-11-29 940 ret = 0; 80a6f7c79b7822 Andrew Lutomirski 2016-11-29 941 else 2d984ad132a87c Rafael J. Wysocki 2014-02-11 942 ret = -EINVAL; 2d984ad132a87c Rafael J. Wysocki 2014-02-11 943 goto out; kfree(req);? 2d984ad132a87c Rafael J. Wysocki 2014-02-11 944 } 2d984ad132a87c Rafael J. Wysocki 2014-02-11 945 if (!req) { 2d984ad132a87c Rafael J. Wysocki 2014-02-11 946 ret = -ENOMEM; 2d984ad132a87c Rafael J. Wysocki 2014-02-11 947 goto out; 2d984ad132a87c Rafael J. Wysocki 2014-02-11 948 } 2d984ad132a87c Rafael J. Wysocki 2014-02-11 949 ret = __dev_pm_qos_add_request(dev, req, DEV_PM_QOS_LATENCY_TOLERANCE, val); 2d984ad132a87c Rafael J. Wysocki 2014-02-11 950 if (ret < 0) { 2d984ad132a87c Rafael J. Wysocki 2014-02-11 951 kfree(req); 2d984ad132a87c Rafael J. Wysocki 2014-02-11 952 goto out; 2d984ad132a87c Rafael J. Wysocki 2014-02-11 953 } 2d984ad132a87c Rafael J. Wysocki 2014-02-11 954 dev->power.qos->latency_tolerance_req = req; 2d984ad132a87c Rafael J. Wysocki 2014-02-11 955 } else { b5ac35ff4296f7 Rob Clark 2023-08-03 956 /* b5ac35ff4296f7 Rob Clark 2023-08-03 957 * If we raced with another thread to allocate the request, b5ac35ff4296f7 Rob Clark 2023-08-03 958 * simply free the redundant allocation and move on. b5ac35ff4296f7 Rob Clark 2023-08-03 959 */ b5ac35ff4296f7 Rob Clark 2023-08-03 960 if (req) b5ac35ff4296f7 Rob Clark 2023-08-03 961 kfree(req); b5ac35ff4296f7 Rob Clark 2023-08-03 962 2d984ad132a87c Rafael J. Wysocki 2014-02-11 963 if (val < 0) { 2d984ad132a87c Rafael J. Wysocki 2014-02-11 964 __dev_pm_qos_drop_user_request(dev, DEV_PM_QOS_LATENCY_TOLERANCE); 2d984ad132a87c Rafael J. Wysocki 2014-02-11 965 ret = 0; 2d984ad132a87c Rafael J. Wysocki 2014-02-11 966 } else { 2d984ad132a87c Rafael J. Wysocki 2014-02-11 967 ret = __dev_pm_qos_update_request(dev->power.qos->latency_tolerance_req, val); 2d984ad132a87c Rafael J. Wysocki 2014-02-11 968 } 2d984ad132a87c Rafael J. Wysocki 2014-02-11 969 } 2d984ad132a87c Rafael J. Wysocki 2014-02-11 970 2d984ad132a87c Rafael J. Wysocki 2014-02-11 971 out: 2d984ad132a87c Rafael J. Wysocki 2014-02-11 972 mutex_unlock(&dev_pm_qos_mtx); 2d984ad132a87c Rafael J. Wysocki 2014-02-11 @973 return ret; 2d984ad132a87c Rafael J. Wysocki 2014-02-11 974 }
diff --git a/drivers/base/power/qos.c b/drivers/base/power/qos.c index f3e0c6b65635..4537d93ddb45 100644 --- a/drivers/base/power/qos.c +++ b/drivers/base/power/qos.c @@ -922,17 +922,19 @@ s32 dev_pm_qos_get_user_latency_tolerance(struct device *dev) */ int dev_pm_qos_update_user_latency_tolerance(struct device *dev, s32 val) { + struct dev_pm_qos_request *req = NULL; int ret; ret = dev_pm_qos_constraints_ensure_allocated(dev); if (ret) return ret; + if (!dev->power.qos->latency_tolerance_req) + req = kzalloc(sizeof(*req), GFP_KERNEL); + mutex_lock(&dev_pm_qos_mtx); if (!dev->power.qos->latency_tolerance_req) { - struct dev_pm_qos_request *req; - if (val < 0) { if (val == PM_QOS_LATENCY_TOLERANCE_NO_CONSTRAINT) ret = 0; @@ -940,7 +942,6 @@ int dev_pm_qos_update_user_latency_tolerance(struct device *dev, s32 val) ret = -EINVAL; goto out; } - req = kzalloc(sizeof(*req), GFP_KERNEL); if (!req) { ret = -ENOMEM; goto out; @@ -952,6 +953,13 @@ int dev_pm_qos_update_user_latency_tolerance(struct device *dev, s32 val) } dev->power.qos->latency_tolerance_req = req; } else { + /* + * If we raced with another thread to allocate the request, + * simply free the redundant allocation and move on. + */ + if (req) + kfree(req); + if (val < 0) { __dev_pm_qos_drop_user_request(dev, DEV_PM_QOS_LATENCY_TOLERANCE); ret = 0;