From patchwork Wed Oct 25 08:54:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhijian Li (Fujitsu)" X-Patchwork-Id: 13435730 Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (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 14EB91FD1 for ; Wed, 25 Oct 2023 08:56:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=none X-Greylist: delayed 63 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Wed, 25 Oct 2023 01:56:21 PDT Received: from esa11.hc1455-7.c3s2.iphmx.com (esa11.hc1455-7.c3s2.iphmx.com [207.54.90.137]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D6948129; Wed, 25 Oct 2023 01:56:21 -0700 (PDT) X-IronPort-AV: E=McAfee;i="6600,9927,10873"; a="116857370" X-IronPort-AV: E=Sophos;i="6.03,250,1694703600"; d="scan'208";a="116857370" Received: from unknown (HELO yto-r1.gw.nic.fujitsu.com) ([218.44.52.217]) by esa11.hc1455-7.c3s2.iphmx.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Oct 2023 17:55:16 +0900 Received: from yto-m2.gw.nic.fujitsu.com (yto-nat-yto-m2.gw.nic.fujitsu.com [192.168.83.65]) by yto-r1.gw.nic.fujitsu.com (Postfix) with ESMTP id ED401D9DA6; Wed, 25 Oct 2023 17:55:13 +0900 (JST) Received: from kws-ab4.gw.nic.fujitsu.com (kws-ab4.gw.nic.fujitsu.com [192.51.206.22]) by yto-m2.gw.nic.fujitsu.com (Postfix) with ESMTP id 25CB528E18; Wed, 25 Oct 2023 17:55:13 +0900 (JST) Received: from edo.cn.fujitsu.com (edo.cn.fujitsu.com [10.167.33.5]) by kws-ab4.gw.nic.fujitsu.com (Postfix) with ESMTP id 9D1D71E9CB7; Wed, 25 Oct 2023 17:55:12 +0900 (JST) Received: from FNSTPC.g08.fujitsu.local (unknown [10.167.226.45]) by edo.cn.fujitsu.com (Postfix) with ESMTP id B560E1A0070; Wed, 25 Oct 2023 16:55:11 +0800 (CST) From: Li Zhijian To: alison.schofield@intel.com, vishal.l.verma@intel.com, ira.weiny@intel.com, bwidawsk@kernel.org, dan.j.williams@intel.com, linux-cxl@vger.kernel.org Cc: dave.jiang@intel.com, Jonathan.Cameron@huawei.com, fan.ni@samsung.com, linux-kernel@vger.kernel.org, Li Zhijian Subject: [PATCH] cxl/region: Fix cxl_region_rwsem lock held when returning to user space Date: Wed, 25 Oct 2023 16:54:50 +0800 Message-ID: <20231025085450.2514906-1-lizhijian@fujitsu.com> X-Mailer: git-send-email 2.41.0 Precedence: bulk X-Mailing-List: linux-cxl@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-TM-AS-Product-Ver: IMSS-9.1.0.1417-9.0.0.1002-27956.006 X-TM-AS-User-Approved-Sender: Yes X-TMASE-Version: IMSS-9.1.0.1417-9.0.1002-27956.006 X-TMASE-Result: 10--4.190000-10.000000 X-TMASE-MatchedRID: 1Eu80e4q/YTU2//X4sLSxR1kSRHxj+Z5jkDrBOJwwnRU0vVJesIjQDSg hb/pcAwyDsw5NBgZqd05FeaVnwctxVdvtTbdcIRVupDIC9422DruZ8ZuWMHQFcC5DTEMxpeQfiq 1gj2xET8vYRhsicUjm84WYLmQfXYmSSOWVJeuO1AURSScn+QSXpjDMT0TyDk5+gtHj7OwNO25V9 z3vqk3KvBRmyhQxZi3IbDJrgrtvXK/+8BaAUFJX2CXm9pxxigKAbN3VNSL6ABSCEZ94phmrkPsa ltbXLYI+/pKeoesceTuBxK2U00v/YaT7FRqp0wPAcQrAfBh69vBRLFeH6OJSCTDD+DBjuEw X-TMASE-SNAP-Result: 1.821001.0001-0-1-22:0,33:0,34:0-0 goto out to release cxl_region_rwsem. Fix below warning: ================================================ WARNING: lock held when returning to user space! 6.6.0-rc3-lizhijian+ #213 Not tainted ------------------------------------------------ cxl/673 is leaving the kernel with locks still held! 1 lock held by cxl/673: #0: ffffffffa013b9d0 (cxl_region_rwsem){++++}-{3:3}, at: commit_store+0x7d/0x3e0 [cxl_core] Fixes: d1257d098a5a ("cxl/region: Move cache invalidation before region teardown, and before setup") Signed-off-by: Li Zhijian Reviewed-by: Ira Weiny --- drivers/cxl/core/region.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/cxl/core/region.c b/drivers/cxl/core/region.c index 6d63b8798c29..18da77f8f22b 100644 --- a/drivers/cxl/core/region.c +++ b/drivers/cxl/core/region.c @@ -294,7 +294,7 @@ static ssize_t commit_store(struct device *dev, struct device_attribute *attr, */ rc = cxl_region_invalidate_memregion(cxlr); if (rc) - return rc; + goto out; if (commit) { rc = cxl_region_decode_commit(cxlr);