From patchwork Mon Feb 12 16:30:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Desnoyers X-Patchwork-Id: 13553520 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id A9FA8C4829E for ; Mon, 12 Feb 2024 16:31:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9C2246B0085; Mon, 12 Feb 2024 11:31:07 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 8AC666B0087; Mon, 12 Feb 2024 11:31:07 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 725986B0088; Mon, 12 Feb 2024 11:31:07 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 522946B0085 for ; Mon, 12 Feb 2024 11:31:07 -0500 (EST) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 13D1E1A0928 for ; Mon, 12 Feb 2024 16:31:07 +0000 (UTC) X-FDA: 81783691374.10.F728D92 Received: from smtpout.efficios.com (smtpout.efficios.com [167.114.26.122]) by imf27.hostedemail.com (Postfix) with ESMTP id 0DF3A40009 for ; Mon, 12 Feb 2024 16:31:04 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=efficios.com header.s=smtpout1 header.b=oRgHB71P; spf=pass (imf27.hostedemail.com: domain of mathieu.desnoyers@efficios.com designates 167.114.26.122 as permitted sender) smtp.mailfrom=mathieu.desnoyers@efficios.com; dmarc=pass (policy=none) header.from=efficios.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1707755465; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=B4ilFMr2eFF794YdWWw0DjFvkMffunaWzt7kSkCawqA=; b=f73sTCvD/O10ruqRw+M7Gcl7WWuzmwYz2nIOvZygP2OBEjjtneq0eGPUSdeuPuJgHu+lov qV8FkHzxUWuZUGjqlA9Urc4yJckOArX9ebV2aJ++uW8aAwS9IsDdJ9iTv5u0YeAtwWr68b e03P/yV1YVfhdXy6s2hNa+QGsAsYu74= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1707755465; a=rsa-sha256; cv=none; b=cPRphjnSvE1L6ZTT/EiAdXiSs+0eMyAc+zXR1DoURUGdMYzlk8JrsqmdSIy1pviK4pa77U Ago/2IdMEx4MplCZM9IN6X/PFpZvnjgvwNBsth2sxwtDsJO9bNvPFK+6n2FuxGIX6JFTq2 l1qBzzBEhRoSsqtVVMbke+MQ1VOJjtA= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=efficios.com header.s=smtpout1 header.b=oRgHB71P; spf=pass (imf27.hostedemail.com: domain of mathieu.desnoyers@efficios.com designates 167.114.26.122 as permitted sender) smtp.mailfrom=mathieu.desnoyers@efficios.com; dmarc=pass (policy=none) header.from=efficios.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=efficios.com; s=smtpout1; t=1707755464; bh=ecUyvilxXmAuEa6CVYKrKIA8K8l2tVUUJHjpsI0Te00=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oRgHB71P8SmaCX/tCeZteHX4/MQWsvX38WZLcuAntTjvfEvdxOg7QpPKiM9bQVwyf RsV+U02IEvhJ2YU1a0i36eAEEMIT4JK3BXnzDIqYi2uVGBkSzRpHZVyizYFBrY4wrv yQGWxe/GORBjLpbRChTfuyQZT32Quy4z7G01Z6CTjmK/33sZZz3v44j7hdbznfWTe8 3ZNCtjU8laXZNvJdYxHxQew/vONsjZs/fE1EWjjpmAVIBe4o0HLQ3ouDp0PAKNC/NR leOkRceGOfzokWkAdLU3lPjBl1kaJFjwlYsLTfacQdKe8jagU6YZWvacZYOmSf3Dvt SMemhEKFzt3sA== Received: from thinkos.internal.efficios.com (192-222-143-198.qc.cable.ebox.net [192.222.143.198]) by smtpout.efficios.com (Postfix) with ESMTPSA id 4TYVMC6SRczYQx; Mon, 12 Feb 2024 11:31:03 -0500 (EST) From: Mathieu Desnoyers To: Dan Williams , Arnd Bergmann , Dave Chinner Cc: linux-kernel@vger.kernel.org, Mathieu Desnoyers , Andrew Morton , Linus Torvalds , Vishal Verma , Dave Jiang , Matthew Wilcox , Russell King , linux-arch@vger.kernel.org, linux-cxl@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-xfs@vger.kernel.org, dm-devel@lists.linux.dev, nvdimm@lists.linux.dev, linux-s390@vger.kernel.org, Alasdair Kergon , Mike Snitzer , Mikulas Patocka Subject: [PATCH v5 2/8] nvdimm/pmem: Treat alloc_dax() -EOPNOTSUPP failure as non-fatal Date: Mon, 12 Feb 2024 11:30:55 -0500 Message-Id: <20240212163101.19614-3-mathieu.desnoyers@efficios.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240212163101.19614-1-mathieu.desnoyers@efficios.com> References: <20240212163101.19614-1-mathieu.desnoyers@efficios.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 0DF3A40009 X-Rspam-User: X-Stat-Signature: hssbtobe7b3sj1o89pmiron5ehg7hjx9 X-Rspamd-Server: rspam03 X-HE-Tag: 1707755464-19675 X-HE-Meta: U2FsdGVkX1/3h8atUnd5FTgna+lU6ZVrdLavKHz9WTaUgASJS7GMnnqRBLOYx6EzDBuySAyEgv7IMtxrKk8lEbdlNoND3quJfG4R0BMnj2WW9/Mm/+rq0WC1nJ8Grh6DUiRrloiBrbbWIw4Q1XUydjwbWuq385JM8IbFQfpW7nHIwvEFlX30GLYERvT+tLZlpCQPOQ5W+QGn5WQQNynl3w5Of82KlrtRX1FM8mm4vJL3HGVMYJhXlI6c6MVR5IOm9ZUN6Ww3uDyB8HnrOkTyURKEX1m+TM6MTFcAdbBwGuCE95em3B4dumFtLA3wcCK1Ni5YeWhIL4HcAfROMY7lJZ7VN4aIjiOQ1SeCcxWsm/WH0LBEXsMT4PKo0xjT4kZUpNotzQLARGA7YN5k2sPtZpmWNfSt3n67aYaECLO8hwXYNBW7CqtVOgGu9K4qVTgRqVQk+N0EdHpFcdY1lqGq6U5LWFU39lubwIjDwHfvHCacVPjMl+Xh91ObEcej6c/DOFVFC08AAF0dJhmflawABz15u3ZLlwgQKf+QDICPbfI5yQuCTbJzbq7M35saBJYnFBr7EyWxu7nx+BvaaeZxY1LE/It43BVMtA9H5mfUnwJg6OC6jnOUBCEchahsHeCMYgwuBBasDlyVXad6B3WbJT1baDALRcCJBgCCqOLmnHGQn3dvGrLKQhuBFgPO2upfMpOtTtGS9SZjq1NMxuLoanNJFNXycWZymD/8qEUGjB3p8gS9E7LY6BM4aiE+aWD0S7Labqe52Fy/+pncTTHT9B1H0RYEIhdAXRQo1STniMuLwHdARNKEJqNhpKXvYXnbxr+0HNp00uFmvJxVu9Z/NzGw+Hrng/nXmodK30IRwG1xVXRFMl5ogR04Y3kP4SsmmD/J6q9SENPHlL2px8MhJrCE3XgJ5XH8ziLf3LchQo0RWOW3CkMJX0siH7srfS/HbOcOVinqx0tv4YiyXo3 e6Z9of7R 1LtCC2+IT35w+LwtzSfaAFl0xON/uqvjwOuZWKijfLmZavQWm3iuB5o35nLXA8ks2zYwcqDD/UnkoFWXujxtL268ojf0+4q7KEozJG5ntLKJM9EjnaeX9b7iqjDUtHlHNYWkI1lHK+Ba6yRwVN0WfWtK2RWm3xfEQyJLvS6F2WxUEnbubN0SZFL5g2Bqn6+blZh6UrpsqYZOCdZD1fER55EvSOjPwecJHDVBUjnFsB99mtGyc/C8m6d8+NYQX1CPsLtnODfR+XR+7dUjUo2/aFrUFH3rwg7BX6nF+e2nFn/TfIDj414y/CQpwX4e63LU5B+o65E2AJaitq/7R0IgwLxdhDoRrDGwODT5sWxMgpNFG1KKDC6GyH8BKYOmpYQ2wUlh2s1vAlZ8Y6UClvaEyfyayz3PEdUOf+aOr0dqqR4dD/KQZ9A3ag+l/iPa4kvEDr6Z9k5Yr7dfwlrqhzf2sDbNRlpoHpLwX4QQUK7cPzoACodc0lA434FVW70EwhiRdsJcxgzmnyV6otoQI5wvDv1IAPQkswWLy3z1W1vFHVLrcV3At7MAhrY3i2V33Wc5YMshe2Od5VDDsI4HNCG7cU6XG96N3rfUifLFeN8UpKO7s89Tb64QfywIRSlf0wgoEF4Yi8pCRJNsbuNk= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: In preparation for checking whether the architecture has data cache aliasing within alloc_dax(), modify the error handling of nvdimm/pmem pmem_attach_disk() to treat alloc_dax() -EOPNOTSUPP failure as non-fatal. [ Based on commit "nvdimm/pmem: Fix leak on dax_add_host() failure". ] Fixes: d92576f1167c ("dax: does not work correctly with virtual aliasing caches") Signed-off-by: Mathieu Desnoyers Reviewed-by: Dan Williams Cc: Alasdair Kergon Cc: Mike Snitzer Cc: Mikulas Patocka Cc: Andrew Morton Cc: Linus Torvalds Cc: Dan Williams Cc: Vishal Verma Cc: Dave Jiang Cc: Matthew Wilcox Cc: Arnd Bergmann Cc: Russell King Cc: linux-arch@vger.kernel.org Cc: linux-cxl@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org Cc: linux-mm@kvack.org Cc: linux-xfs@vger.kernel.org Cc: dm-devel@lists.linux.dev Cc: nvdimm@lists.linux.dev --- drivers/nvdimm/pmem.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c index 9fe358090720..e9898457a7bd 100644 --- a/drivers/nvdimm/pmem.c +++ b/drivers/nvdimm/pmem.c @@ -560,17 +560,19 @@ static int pmem_attach_disk(struct device *dev, dax_dev = alloc_dax(pmem, &pmem_dax_ops); if (IS_ERR(dax_dev)) { rc = PTR_ERR(dax_dev); - goto out; + if (rc != -EOPNOTSUPP) + goto out; + } else { + set_dax_nocache(dax_dev); + set_dax_nomc(dax_dev); + if (is_nvdimm_sync(nd_region)) + set_dax_synchronous(dax_dev); + pmem->dax_dev = dax_dev; + rc = dax_add_host(dax_dev, disk); + if (rc) + goto out_cleanup_dax; + dax_write_cache(dax_dev, nvdimm_has_cache(nd_region)); } - set_dax_nocache(dax_dev); - set_dax_nomc(dax_dev); - if (is_nvdimm_sync(nd_region)) - set_dax_synchronous(dax_dev); - pmem->dax_dev = dax_dev; - rc = dax_add_host(dax_dev, disk); - if (rc) - goto out_cleanup_dax; - dax_write_cache(dax_dev, nvdimm_has_cache(nd_region)); rc = device_add_disk(dev, disk, pmem_attribute_groups); if (rc) goto out_remove_host;