Luis Chamberlain (1): nvdimm/pmem: use add_disk() error handling
Mathieu Desnoyers (1): dax: alloc_dax() return ERR_PTR(-EOPNOTSUPP) for CONFIG_DAX=n
drivers/dax/super.c | 5 +++++ drivers/nvdimm/pmem.c | 8 +++++++- include/linux/dax.h | 6 +----- 3 files changed, 13 insertions(+), 6 deletions(-)
反馈： 您发送到kernel@openeuler.org的补丁/补丁集，已成功转换为PR！ PR链接地址： https://gitee.com/openeuler/kernel/pulls/9932 邮件列表地址：https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/Q...
FeedBack: The patch(es) which you have sent to kernel@openeuler.org mailing list has been converted to a pull request successfully! Pull request link: https://gitee.com/openeuler/kernel/pulls/9932 Mailing list address: https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/Q...
From: Luis Chamberlain mcgrof@kernel.org
mainline inclusion from mainline-v5.16-rc1 commit 5a192ccc32e2981f721343c750b8cfb4c3f41007 category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/IAD301 CVE: NA
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?i...
--------------------------------
Now that device_add_disk() supports returning an error, use that. We must unwind alloc_dax() on error.
Reviewed-by: Christoph Hellwig hch@lst.de Signed-off-by: Luis Chamberlain mcgrof@kernel.org Link: https://lore.kernel.org/r/20211103230437.1639990-7-mcgrof@kernel.org Signed-off-by: Jens Axboe axboe@kernel.dk Conflicts: drivers/nvdimm/pmem.c [ Commit accf58afb689f81daadde("nvdimm/pmem: cleanup the disk if pmem_release_disk() is yet assigned") is not applied. ] Signed-off-by: Zhihao Cheng chengzhihao1@huawei.com Signed-off-by: Zhihao Cheng chengzhihao@huaweicloud.com --- drivers/nvdimm/pmem.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c index d5dd79b59b16..9947cc2bd2fc 100644 --- a/drivers/nvdimm/pmem.c +++ b/drivers/nvdimm/pmem.c @@ -498,7 +498,13 @@ static int pmem_attach_disk(struct device *dev, gendev = disk_to_dev(disk); gendev->groups = pmem_attribute_groups;
- device_add_disk(dev, disk, NULL); + rc = device_add_disk_safe(dev, disk, NULL); + if (rc) { + kill_dax(dax_dev); + put_dax(dax_dev); + put_disk(disk); + return rc; + } if (devm_add_action_or_reset(dev, pmem_release_disk, pmem)) return -ENOMEM;
From: Mathieu Desnoyers mathieu.desnoyers@efficios.com
mainline inclusion from mainline-v6.9-rc1 commit 6d439c18d9b190ab1e0f1196bc45590f95752bf1 category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/IAD301 CVE: NA
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?i...
--------------------------------
Change the return value from NULL to PTR_ERR(-EOPNOTSUPP) for CONFIG_DAX=n to be consistent with the fact that CONFIG_DAX=y never returns NULL.
This is done in preparation for using cpu_dcache_is_aliasing() in a following change which will properly support architectures which detect data cache aliasing at runtime.
Link: https://lkml.kernel.org/r/20240215144633.96437-3-mathieu.desnoyers@efficios.... Fixes: 4e4ced93794a ("dax: Move mandatory ->zero_page_range() check in alloc_dax()") Signed-off-by: Mathieu Desnoyers mathieu.desnoyers@efficios.com Reviewed-by: Dan Williams dan.j.williams@intel.com Cc: Dan Williams dan.j.williams@intel.com Cc: Vishal Verma vishal.l.verma@intel.com Cc: Dave Jiang dave.jiang@intel.com Cc: Matthew Wilcox willy@infradead.org Cc: Arnd Bergmann arnd@arndb.de Cc: Russell King linux@armlinux.org.uk Cc: Alasdair Kergon agk@redhat.com Cc: Christoph Hellwig hch@lst.de Cc: Dave Chinner david@fromorbit.com Cc: Heiko Carstens hca@linux.ibm.com Cc: kernel test robot lkp@intel.com Cc: Michael Sclafani dm-devel@lists.linux.dev Cc: Mike Snitzer snitzer@kernel.org Cc: Mikulas Patocka mpatocka@redhat.com Signed-off-by: Andrew Morton akpm@linux-foundation.org Signed-off-by: Zhihao Cheng chengzhihao1@huawei.com Signed-off-by: Zhihao Cheng chengzhihao@huaweicloud.com --- drivers/dax/super.c | 5 +++++ include/linux/dax.h | 6 +----- 2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/drivers/dax/super.c b/drivers/dax/super.c index 260a247c60d2..a2463320b86b 100644 --- a/drivers/dax/super.c +++ b/drivers/dax/super.c @@ -433,6 +433,11 @@ static int dax_host_hash(const char *host) * that any fault handlers or operations that might have seen * dax_alive(), have completed. Any operations that start after * synchronize_srcu() has run will abort upon seeing !dax_alive(). + * + * Note, because alloc_dax() returns an ERR_PTR() on error, callers + * typically store its result into a local variable in order to check + * the result. Therefore, care must be taken to populate the struct + * device dax_dev field make sure the dax_dev is not leaked. */ void kill_dax(struct dax_device *dax_dev) { diff --git a/include/linux/dax.h b/include/linux/dax.h index b52f084aa643..f6f26a66ead0 100644 --- a/include/linux/dax.h +++ b/include/linux/dax.h @@ -80,11 +80,7 @@ static inline struct dax_device *dax_get_by_host(const char *host) static inline struct dax_device *alloc_dax(void *private, const char *host, const struct dax_operations *ops, unsigned long flags) { - /* - * Callers should check IS_ENABLED(CONFIG_DAX) to know if this - * NULL is an error or expected. - */ - return NULL; + return ERR_PTR(-EOPNOTSUPP); } static inline void put_dax(struct dax_device *dax_dev) {
-
patchwork bot -
Zhihao Cheng