Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Jane Chu <jane.chu@oracle.com>
To:     david@fromorbit.com, djwong@kernel.org, dan.j.williams@intel.com,
        hch@infradead.org, vishal.l.verma@intel.com, dave.jiang@intel.com,
        agk@redhat.com, snitzer@redhat.com, dm-devel@redhat.com,
        ira.weiny@intel.com, willy@infradead.org, vgoyal@redhat.com,
        linux-fsdevel@vger.kernel.org, nvdimm@lists.linux.dev,
        linux-kernel@vger.kernel.org, linux-xfs@vger.kernel.org
Subject: [PATCH v5 6/7] dax: add recovery_write to dax_iomap_iter in failure path
Date:   Fri, 28 Jan 2022 14:31:49 -0700
Message-Id: <20220128213150.1333552-7-jane.chu@oracle.com>
In-Reply-To: <20220128213150.1333552-1-jane.chu@oracle.com>
References: <20220128213150.1333552-1-jane.chu@oracle.com>
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?34kDvhgJuealC8TDJchq52Qc62r2OYvSaEEZx78Vt3eeHZnIDdKuL8s/n8St?=
 =?us-ascii?Q?z244tECZeO5oHkB2cxXnSKNo2sbaEYg2XjbRc6XKQVFJ17kI25VZeaj/kyj4?=
 =?us-ascii?Q?3LDz7llU4ZA80BbLrd+8hH0lv1zukarsVZ4W1mRW0oXBVXXTWpK000v61Uc3?=
 =?us-ascii?Q?SMIPIJPg+v3a4BZOI/r3dcFwD4mMdxI13g49RR2HkhK8LE9YN2SlW9es3W2W?=
 =?us-ascii?Q?bxyaGN9bVtNPuZyfLPTNkaCn3WFLRBTmHd45X8Rf1MCn5wKNGHYD5qly3ZLt?=
 =?us-ascii?Q?lufmdh8mvs8SPxn3Ge4nlCB+pdl1olxECXBwMnt4csNTpWzxLiJoAKJIfLoU?=
 =?us-ascii?Q?Se/Xit0WYLarcoE7HzVLE3lcCuJ8XXSrnh26MrgEA+oFflkHwtoHCFCIXUrS?=
 =?us-ascii?Q?ihATeozJISa3jQpfXKx71pnOZ+O8fzgDDKwRT6cOqZW0hV5RqLFmI55oIzp7?=
 =?us-ascii?Q?CN8VAm9pMRB1NWyOudI5c6j8go/SPV7ke9wZuLZpmliMj8db+2P64O/eQuqN?=
 =?us-ascii?Q?1tRFvlmw1/k0oq24KSb429q9VgqlBiEvdYpOo4vdLfpJBHu1aP0TzmJoBHW2?=
 =?us-ascii?Q?BykfKTgNPMxX6lA2nQkUXb57RE00VL11o4AThYf7DQB2VClyCD0ZodXKxTd0?=
 =?us-ascii?Q?bICghxMOuyptt0/8r1oa0AXllhpt1GDUAhCQoPDDWGJvP1NDlqJoMU74toVs?=
 =?us-ascii?Q?MpN+AORCDQBNkMC9EEnQE07YtTmfY7F37OCTuTpN5lsOyh+yNxwP54tOfqck?=
 =?us-ascii?Q?GYYeLKoueg5a4ARxdS7WPHOHZBz4dKA1qhOIZBLJV8DDgycV5MTZLl7h/1gX?=
 =?us-ascii?Q?9ocB0cpPDYcBU6gSFT7YbaO3pao31pFkkZjd9D3FDVYoPVqonJ5IT2hx690A?=
 =?us-ascii?Q?1gu1/B4gujDpLjw5w81nIhmXzwHpQDDFYZyMw4g7x7WO5KJ7XQqoJsUxPlWC?=
 =?us-ascii?Q?Y/q/2fpWzCHMKqGu+pycMJSx853C0pPem/JhzwXo11+gQbxsAp5Tt0O7uVMF?=
 =?us-ascii?Q?q8mvOmuApvWEXqsmWfWHdPDpHOmxKhkjebrQHUEScLXzuWf1vE6OeWZubIF2?=
 =?us-ascii?Q?AdSA4TSqIedD1F/NnPcQtfMRniWW8fudulld5lJoL/rGHlIhngHY59CebrA4?=
 =?us-ascii?Q?9Z6Fhxl7CVn7bov8yCBEXdMSS1gt/u/yXkMcFiyjBKWKSunxmwITiJ1Xnq85?=
 =?us-ascii?Q?yDyD6syLujR6vy2FUBIvLeIBO6cRxcXNJRb7uBbXlJbvkmtejdBPg8k3tGTG?=
 =?us-ascii?Q?UDBzhPZ94tXAXITo+dl7/UJrttHXPEVcHFH9hb6q9L9Qy5sUgxwQm/Ub2lZI?=
 =?us-ascii?Q?7DY3nE2o12UKUP2yNVQxDw4cGTDEr6ArRS9tcqOiuRSNxUBTapWW5VBtdsov?=
 =?us-ascii?Q?7pbv1cN49bv8Ztv2G0RqIjViCAuqUkzumUzuYvdwrVgx/jvgkT3FFTpXjQ5t?=
 =?us-ascii?Q?qraFAtz98gQMBCNZs5qIOrwWV7NAmQcerIbHMuSpDVxDmrz4NZ1v0J/Q0jQy?=
 =?us-ascii?Q?24d2AxNVkeAU0vIwqUT4x48zovSEhoHLPVuQikqcpzPvn/iGJeUmtTlmOtQO?=
 =?us-ascii?Q?RWJ6V6g2AoR+w20DEElLiQn2AWc3w8twMtm7aDYmfZC5UHKt5JHwvP2cSsQn?=
 =?us-ascii?Q?RS+//AoxBoZUi1H0geZQ6z1h2QkckUUq/3L7yfSaO4eN?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 735031a9-4eef-4c8b-24bc-08d9e2a5b18a
X-MS-Exchange-CrossTenant-AuthSource: SJ0PR10MB4429.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jan 2022 21:32:32.6831
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: bL/L5hP8gAtm7qHotDUVO9CFj7Uoo0M/M+xsv7x6H6B8/Lhm9LBu/LeQXYCxHo0ojeO6Rpbs72c0iYOMf19KDQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR10MB5022
X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10241 signatures=673430
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 mlxlogscore=999
 adultscore=0 spamscore=0 bulkscore=0 mlxscore=0 phishscore=0
 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2201110000 definitions=main-2201280122
X-Proofpoint-GUID: UZwckryaTJEVRlm0H2FJP-UvsoJZYcC2
X-Proofpoint-ORIG-GUID: UZwckryaTJEVRlm0H2FJP-UvsoJZYcC2
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

dax_iomap_iter() fails if the destination range contains poison.
Add recovery_write to the failure code path.

Signed-off-by: Jane Chu <jane.chu@oracle.com>
---
 fs/dax.c | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/fs/dax.c b/fs/dax.c
index cd03485867a7..236675bd5946 100644
--- a/fs/dax.c
+++ b/fs/dax.c
@@ -1199,6 +1199,8 @@ int dax_truncate_page(struct inode *inode, loff_t pos, bool *did_zero,
 }
 EXPORT_SYMBOL_GPL(dax_truncate_page);
 
+typedef size_t (*iter_func_t)(struct dax_device *dax_dev, pgoff_t pgoff,
+		void *addr, size_t bytes, struct iov_iter *i);
 static loff_t dax_iomap_iter(const struct iomap_iter *iomi,
 		struct iov_iter *iter)
 {
@@ -1210,6 +1212,7 @@ static loff_t dax_iomap_iter(const struct iomap_iter *iomi,
 	ssize_t ret = 0;
 	size_t xfer;
 	int id;
+	iter_func_t write_func = dax_copy_from_iter;
 
 	if (iov_iter_rw(iter) == READ) {
 		end = min(end, i_size_read(iomi->inode));
@@ -1249,6 +1252,17 @@ static loff_t dax_iomap_iter(const struct iomap_iter *iomi,
 
 		map_len = dax_direct_access(dax_dev, pgoff, PHYS_PFN(size),
 				&kaddr, NULL);
+		if ((map_len == -EIO) && (iov_iter_rw(iter) == WRITE)) {
+			if (dax_prep_recovery(dax_dev, &kaddr) < 0) {
+				ret = map_len;
+				break;
+			}
+			map_len = dax_direct_access(dax_dev, pgoff,
+					PHYS_PFN(size), &kaddr, NULL);
+			if (map_len > 0)
+				write_func = dax_recovery_write;
+		}
+
 		if (map_len < 0) {
 			ret = map_len;
 			break;
@@ -1261,12 +1275,17 @@ static loff_t dax_iomap_iter(const struct iomap_iter *iomi,
 			map_len = end - pos;
 
 		if (iov_iter_rw(iter) == WRITE)
-			xfer = dax_copy_from_iter(dax_dev, pgoff, kaddr,
-					map_len, iter);
+			xfer = write_func(dax_dev, pgoff, kaddr, map_len, iter);
 		else
 			xfer = dax_copy_to_iter(dax_dev, pgoff, kaddr,
 					map_len, iter);
 
+		if (xfer == (ssize_t) -EIO) {
+			pr_warn("dax_ioma_iter: write_func returns -EIO\n");
+			ret = -EIO;
+			break;
+		}
+
 		pos += xfer;
 		length -= xfer;
 		done += xfer;
-- 
2.18.4