From patchwork Fri Feb 2 21:00:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Desnoyers X-Patchwork-Id: 13543404 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 0A797C4828E for ; Fri, 2 Feb 2024 21:00:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 857F26B008C; Fri, 2 Feb 2024 16:00:32 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 723666B0095; Fri, 2 Feb 2024 16:00:32 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 521396B0092; Fri, 2 Feb 2024 16:00:32 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 42D926B0089 for ; Fri, 2 Feb 2024 16:00:32 -0500 (EST) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 0641D1C0E1B for ; Fri, 2 Feb 2024 21:00:32 +0000 (UTC) X-FDA: 81748082304.22.B54DA99 Received: from smtpout.efficios.com (smtpout.efficios.com [167.114.26.122]) by imf01.hostedemail.com (Postfix) with ESMTP id 6393E40014 for ; Fri, 2 Feb 2024 21:00:30 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=efficios.com header.s=smtpout1 header.b=fQOdZGB8; spf=pass (imf01.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=1706907630; 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=p09K36qcF8CV8GY17NNSA6slg2+YUMG1wkffTYeeubM=; b=k31p5HstnMvFsrm+WlRdRd/CqCUaynTcqf8OiOB+8hgDL043Q0HCB1vtmy9nJ+hOP7xX8t 10NJhQVX40nVe0qdsD1IYe9IKVFJCo+iXAwawksILRwMET1Ufb3z46PjKX4e2N0HBw63jL EUXCqOLp0FoD0Ujcb1BQThe803jJxJA= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1706907630; a=rsa-sha256; cv=none; b=oX2ii3VmItik5QtJILxvalB4pKHfBcT9GA0Z5di76ww4ygw3hvj+G1xNwHAE1bsWLN88ZD jN41CTSjaPm5U82L3NSd7SgZDY5GUSMeZT5/1Ebyl9mhrDPLJtf7kSI63JLdwjsBUvlt8G ObWtTC2Et/D912NNl7XL+t1D00WDTVk= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=efficios.com header.s=smtpout1 header.b=fQOdZGB8; spf=pass (imf01.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=1706907629; bh=6kaHeiBxh7tXa+wyC1kCcD7MhkDErN5w3UH4NjBdGts=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fQOdZGB8ZoM+ot4BpfHpDhS3UZ/Xl9kL6L2cCK/HSOO89KLHleVlUen3Hvy7uouoA jkSg4Ou1+kepWAwhWgSZKXNNm6LCEyBCdPkykABCJgThUTXtmOtFcZ6bxqN2ifCI+o 96d3GrsSllptt4Mc0jotzKMhB/znC1tQydRK48oH5ngXTQVmKOtZrOhOG0WfGwKx6w kfMewMuk+6MGuzHxK4hWcgzNa+KJTaQFp4kakLGUOhyCRsSciU6S8CX33ScaDEGVFa qlecryD5H6JRb2MG0sirVt1fMHpExeBDP5sB+exAwyLtxDtvgAdLPLFw2aSkquU6rq T/tHs8uC3lE8Q== 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 4TRSph5pS4zX4T; Fri, 2 Feb 2024 16:00:28 -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: [RFC PATCH v4 05/12] virtio: Treat alloc_dax() -EOPNOTSUPP failure as non-fatal Date: Fri, 2 Feb 2024 16:00:12 -0500 Message-Id: <20240202210019.88022-6-mathieu.desnoyers@efficios.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240202210019.88022-1-mathieu.desnoyers@efficios.com> References: <20240202210019.88022-1-mathieu.desnoyers@efficios.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 6393E40014 X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: ht1a7xpj9wu9rhgxeohu6e4d163iisea X-HE-Tag: 1706907630-515689 X-HE-Meta: U2FsdGVkX19B/3xAeIHoMw0XO1/STqTNgpzYe/eVDpZlcN8qnyHKNcQty0tNoIohSBWOH1O/ClmF9MCx65BWg9sgBEsAL+AhBwVZbcq8p1JRFHLk/VzjkNZRo0wP7k4aqySIiuNTrCNakdxIMNmyk9qP7+FW9bCl1bx5B5dLgL/5cXqg9lmMc25ACR1x2qNib/EpLV5pCIb/+/5jYYpJfT6coLEOM24J8TOMAHrjyl2o6ophfxlvI64mFAWZOpJS69XqkOX0Sf5KtKuRIXk5YL+6WOJBcl8yjLq1Z1E/gH0s1U5P1d9YTHnlw/FLV/0kvmNW/eeCM19JmfWyvIAaQtULX75KyhPYowd66OAr59GzIeSThualQ258jHkm1znCUiG1tJiajHuwH6KxTm3S6ubQ/ua4bdvw4+rMlcCGBw/0HFsnW9edabMLODDr1LHsS9311nfELSI6a0Y9gbuJrW5+BR0hg+5xYgCAEEWWETY4NZVWtm3bmKu6eq3MHYukDbc6rMBSTj7VTrT32WVchWTyE7lVO9O9o+TCrDLw/eT3drN7zgEvnB3dXx489HRUoyX0nwML3F/yl1q2NrdUSAd9teRa3f6JQp+nzZFF3bVttsN0suW2Gc74W1KaazM0eamFg0pe0BbWrBFI9tFB9+8Fxu0U5uomaWmJ8U/lSEkX8H6hrkW9g+Ph0G6gOlsg+Zh2kwpcFMsQfTYH/WwbEIkieHSWZIY/XIAeDxhx2yS8q0hJmtCUy9FmppG36s0iFi5SnpYusT4ee7DbkyRjFsAINAIGIK8/VeCGpuQUGZjFDNxtK8se/KH42lX55Av3DPlQWmJLvoORnsraJyGzdk6y/Iv0idIPAgKx7R4QZnF45hgYGiODSKEQFDsbkdvcFLBxSHVn+Q0/ZdO0lc7PRnic8hkSLmYe2LyxCGR7JPubBiElarVaxbSmtqcB2yI3PfPk8DpGK2sh3KvEvN6 2Rrtr/rh WGU8I6p0aCC/ZgvC+RJ8r0hmYis2ZBo5uwYvI8IedPYKxkXlKhFDm6fARRj3eqi3TiP3XOhT9K9qN5+D5eAHIb+1V9ThWmhVyHUXjUIlaE1Eh4HKP3o7vkBw9hV4VlLcc8aYiLTHH9lQu+zgxzISa8pj4OWjK+SyrWC4ej4KHy2LnF4nKndIkhzIgqOo7QC+A0x6D/cYyjvurmWj+X6I3NNPPMeW+30t4bHIxKJXQnOKFyLrVgoGwSMXFtI3otXuvR1Dyl9MMyAN1BojaEQUFH/ZS3bZY0lBXRA95LDMThpoZfUqRwLVKwh2ITluMA9bsQ2J/F1h0WBgu1NqUsIvOjdSQXsJx8ZbOP/uCq/BuP7kEXztNaeakzVZDAwgnO1gAn9gczF37wFqvC3Oic5/nnPD7Mgzgdaxn9UyYaVCppYOpxtngm39yckhf5VP2mHUcXshHeSahl59DPtququ9rJhFA4S2q2pouh0X2TZK84iDYCuF2g4G3A7u6ctHu56rApKQ07qzMf4iNnLjIqDsv6RlUo6AjaxmlzHJUgflk05S6pX0JQ0QOyVtE770K4HaNKyBcu81eI327LdJ89BooQSWg//DTgfqsfapX9JzsujxsCWD0rRpFbGikFODu0RMrESDJqI0FSPxH5uk= 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 virtio virtio_fs_setup_dax() to treat alloc_dax() -EOPNOTSUPP failure as non-fatal. For the transition, consider that alloc_dax() returning NULL is the same as returning -EOPNOTSUPP. Co-developed-by: Dan Williams Signed-off-by: Dan Williams Fixes: d92576f1167c ("dax: does not work correctly with virtual aliasing caches") Signed-off-by: Mathieu Desnoyers 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 --- fs/fuse/virtio_fs.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/fs/fuse/virtio_fs.c b/fs/fuse/virtio_fs.c index 5f1be1da92ce..621b1bca2d55 100644 --- a/fs/fuse/virtio_fs.c +++ b/fs/fuse/virtio_fs.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include "fuse_i.h" @@ -795,8 +796,11 @@ static void virtio_fs_cleanup_dax(void *data) put_dax(dax_dev); } +DEFINE_FREE(cleanup_dax, struct dax_dev *, if (!IS_ERR_OR_NULL(_T)) virtio_fs_cleanup_dax(_T)) + static int virtio_fs_setup_dax(struct virtio_device *vdev, struct virtio_fs *fs) { + struct dax_device *dax_dev __free(cleanup_dax) = NULL; struct virtio_shm_region cache_reg; struct dev_pagemap *pgmap; bool have_cache; @@ -804,6 +808,12 @@ static int virtio_fs_setup_dax(struct virtio_device *vdev, struct virtio_fs *fs) if (!IS_ENABLED(CONFIG_FUSE_DAX)) return 0; + dax_dev = alloc_dax(fs, &virtio_fs_dax_ops); + if (IS_ERR_OR_NULL(dax_dev)) { + int rc = IS_ERR(dax_dev) ? PTR_ERR(dax_dev) : -EOPNOTSUPP; + return rc == -EOPNOTSUPP ? 0 : rc; + } + /* Get cache region */ have_cache = virtio_get_shm_region(vdev, &cache_reg, (u8)VIRTIO_FS_SHMCAP_ID_CACHE); @@ -849,10 +859,7 @@ static int virtio_fs_setup_dax(struct virtio_device *vdev, struct virtio_fs *fs) dev_dbg(&vdev->dev, "%s: window kaddr 0x%px phys_addr 0x%llx len 0x%llx\n", __func__, fs->window_kaddr, cache_reg.addr, cache_reg.len); - fs->dax_dev = alloc_dax(fs, &virtio_fs_dax_ops); - if (IS_ERR(fs->dax_dev)) - return PTR_ERR(fs->dax_dev); - + fs->dax_dev = no_free_ptr(dax_dev); return devm_add_action_or_reset(&vdev->dev, virtio_fs_cleanup_dax, fs->dax_dev); }