rnbd cleanups
Subsystems (2)
Hi all,
this series has a few simple rnbd cleanups.
Slightly related question: why does rnbd send the max_hw_sectors value to the client given that it can't in any way be used by the client?
Diffstat:
drivers/block/rnbd/Makefile | 1 drivers/block/rnbd/rnbd-srv.c | 92 +++++++++++++++----------------------- drivers/block/rnbd/rnbd-srv.h | 2 drivers/block/rnbd/rnbd-srv-dev.c | 43 ----------------- drivers/block/rnbd/rnbd-srv-dev.h | 64 -------------------------- 5 files changed, 39 insertions(+), 163 deletions(-)
PATCH 1/4 rnbd-srv: simplify rnbd_srv_fill_msg_open_rsp
Remove all the wrappers and just get the information directly from the block device, or where no such helpers exist the request_queue.
--- drivers/block/rnbd/rnbd-srv-dev.h | 30 -------------------------- drivers/block/rnbd/rnbd-srv.c | 35 ++++++++++++------------------- 2 files changed, 13 insertions(+), 52 deletions(-)
drivers/block/rnbd/rnbd-srv-dev.h +0 -30
@@ -31,34 +31,4 @@ void rnbd_dev_close(struct rnbd_dev *dev);void rnbd_endio (void *priv,int error); -static inline int rnbd_dev_get_max_segs (const struct rnbd_dev *dev) -{ -return queue_max_segments (bdev_get_queue (dev->bdev)); -} - -static inline int rnbd_dev_get_max_hw_sects (const struct rnbd_dev *dev) -{ -return queue_max_hw_sectors (bdev_get_queue (dev->bdev)); -} - -static inline int rnbd_dev_get_secure_discard (const struct rnbd_dev *dev) -{ -return bdev_max_secure_erase_sectors (dev->bdev); -} - -static inline int rnbd_dev_get_max_discard_sects (const struct rnbd_dev *dev) -{ -return bdev_max_discard_sectors (dev->bdev); -} - -static inline int rnbd_dev_get_discard_granularity (const struct rnbd_dev *dev) -{ -return bdev_get_queue (dev->bdev)->limits.discard_granularity; -} - -static inline int rnbd_dev_get_discard_alignment (const struct rnbd_dev *dev) -{ -return bdev_discard_alignment (dev->bdev); -} -#endif /* RNBD_SRV_DEV_H */
drivers/block/rnbd/rnbd-srv.c +13 -22
@@ -540,34 +540,25 @@ rnbd_srv_get_or_create_srv_dev(struct rnbd_dev *rnbd_dev,static void rnbd_srv_fill_msg_open_rsp (struct rnbd_msg_open_rsp *rsp,struct rnbd_srv_sess_dev *sess_dev) { -struct rnbd_dev *rnbd_dev = sess_dev->rnbd_dev; +struct block_device *bdev = sess_dev->rnbd_dev->bdev; rsp->hdr.type =cpu_to_le16 (RNBD_MSG_OPEN_RSP ); - rsp->device_id = -cpu_to_le32 (sess_dev->device_id); - rsp->nsectors = -cpu_to_le64 (get_capacity (rnbd_dev->bdev->bd_disk)); - rsp->logical_block_size = -cpu_to_le16 (bdev_logical_block_size (rnbd_dev->bdev)); - rsp->physical_block_size = -cpu_to_le16 (bdev_physical_block_size (rnbd_dev->bdev)); - rsp->max_segments = -cpu_to_le16 (rnbd_dev_get_max_segs (rnbd_dev)); + rsp->device_id =cpu_to_le32 (sess_dev->device_id); + rsp->nsectors =cpu_to_le64 (bdev_nr_sectors (bdev)); + rsp->logical_block_size =cpu_to_le16 (bdev_logical_block_size (bdev)); + rsp->physical_block_size =cpu_to_le16 (bdev_physical_block_size (bdev)); + rsp->max_segments =cpu_to_le16 (bdev_max_segments (bdev)); rsp->max_hw_sectors = -cpu_to_le32 (rnbd_dev_get_max_hw_sects (rnbd_dev)); +cpu_to_le32 (queue_max_hw_sectors (bdev_get_queue (bdev))); rsp->max_write_same_sectors =0 ; - rsp->max_discard_sectors = -cpu_to_le32 (rnbd_dev_get_max_discard_sects (rnbd_dev)); - rsp->discard_granularity = -cpu_to_le32 (rnbd_dev_get_discard_granularity (rnbd_dev)); - rsp->discard_alignment = -cpu_to_le32 (rnbd_dev_get_discard_alignment (rnbd_dev)); - rsp->secure_discard = -cpu_to_le16 (rnbd_dev_get_secure_discard (rnbd_dev)); + rsp->max_discard_sectors =cpu_to_le32 (bdev_max_discard_sectors (bdev)); + rsp->discard_granularity =cpu_to_le32 (bdev_discard_granularity (bdev)); + rsp->discard_alignment =cpu_to_le32 (bdev_discard_alignment (bdev)); + rsp->secure_discard =cpu_to_le16 (bdev_max_secure_erase_sectors (bdev)); rsp->cache_policy =0 ; -if (bdev_write_cache (rnbd_dev->bdev)) +if (bdev_write_cache (bdev)) rsp->cache_policy |=RNBD_WRITEBACK ; -if (bdev_fua (rnbd_dev->bdev)) +if (bdev_fua (bdev)) rsp->cache_policy |=RNBD_FUA ; }
Signature · 1 line
2.30.2
Re: [PATCH 1/4] rnbd-srv: simplify rnbd_srv_fill_msg_open_rsp
Quoted 5 lines · Christoph Hellwig
Remove all the wrappers and just get the information directly from the block device, or where no such helpers exist the
request_queue.Signed-off-by Christoph Hellwig <[email protected]>---
Looks good.
-ck
PATCH 2/4 rnbd-srv: remove rnbd_endio
In reply to Christoph HellwigFold rnbd_endio into the only caller.
--- drivers/block/rnbd/rnbd-srv-dev.h | 2 -- drivers/block/rnbd/rnbd-srv.c | 20 +++++++------------- 2 files changed, 7 insertions(+), 15 deletions(-)
drivers/block/rnbd/rnbd-srv-dev.h +0 -2
@@ -29,6 +29,4 @@ struct rnbd_dev *rnbd_dev_open(const char *path, fmode_t flags);*/ void rnbd_dev_close (struct rnbd_dev *dev); -void rnbd_endio (void *priv,int error); -#endif /* RNBD_SRV_DEV_H */
drivers/block/rnbd/rnbd-srv.c +7 -13
@@ -85,18 +85,6 @@ static inline void rnbd_put_sess_dev(struct rnbd_srv_sess_dev *sess_dev)kref_put (&sess_dev->kref, rnbd_sess_dev_release); } -void rnbd_endio (void *priv,int error) -{ -struct rnbd_io_private *rnbd_priv = priv; -struct rnbd_srv_sess_dev *sess_dev = rnbd_priv->sess_dev; - -rnbd_put_sess_dev (sess_dev); - -rtrs_srv_resp_rdma (rnbd_priv->id, error); - -kfree (priv); -} -static struct rnbd_srv_sess_dev *rnbd_get_sess_dev (int dev_id,struct rnbd_srv_session *srv_sess) {
@@ -117,7 +105,13 @@ rnbd_get_sess_dev(int dev_id, struct rnbd_srv_session *srv_sess)static void rnbd_dev_bi_end_io (struct bio *bio) { -rnbd_endio (bio->bi_private,blk_status_to_errno (bio->bi_status)); +struct rnbd_io_private *rnbd_priv = bio->bi_private; +struct rnbd_srv_sess_dev *sess_dev = rnbd_priv->sess_dev; + +rnbd_put_sess_dev (sess_dev); +rtrs_srv_resp_rdma (rnbd_priv->id,blk_status_to_errno (bio->bi_status)); + +kfree (rnbd_priv);bio_put (bio); }
Signature · 1 line
2.30.2
Re: [PATCH 2/4] rnbd-srv: remove rnbd_endio
Quoted 4 lines · Christoph Hellwig
Fold
rnbd_endiointo the only caller.Signed-off-by Christoph Hellwig <[email protected]>---
Looks good.
-ck
PATCH 3/4 rnbd-srv: remove rnbd_dev_{open,close}
In reply to Christoph HellwigThese can be trivially open coded in the callers.
--- drivers/block/rnbd/Makefile | 1 - drivers/block/rnbd/rnbd-srv-dev.c | 43 ------------------------------- drivers/block/rnbd/rnbd-srv-dev.h | 12 --------- drivers/block/rnbd/rnbd-srv.c | 25 +++++++++++++----- 4 files changed, 18 insertions(+), 63 deletions(-) delete mode 100644 drivers/block/rnbd/rnbd-srv-dev.c
drivers/block/rnbd/Makefile +0 -1
@@ -10,7 +10,6 @@ CFLAGS_rnbd-srv-trace.o = -I$(src) rnbd-server-y := rnbd-common.o \ rnbd-srv.o \ - rnbd-srv-dev.o \ rnbd-srv-sysfs.o \ rnbd-srv-trace.o
drivers/block/rnbd/rnbd-srv-dev.c deleted +0 -43
43 lines not on this page · raw message
drivers/block/rnbd/rnbd-srv-dev.h +0 -12
@@ -17,16 +17,4 @@ struct rnbd_dev { fmode_t blk_open_flags; }; -/** -* rnbd_dev_open() - Open a device -* @path: path to open -* @flags: open flags -*/ -struct rnbd_dev *rnbd_dev_open (const char *path,fmode_t flags); - -/** -* rnbd_dev_close() - Close a device -*/ -void rnbd_dev_close (struct rnbd_dev *dev); -#endif /* RNBD_SRV_DEV_H */
drivers/block/rnbd/rnbd-srv.c +18 -7
@@ -220,7 +220,9 @@ void rnbd_destroy_sess_dev(struct rnbd_srv_sess_dev *sess_dev, bool keep_id)rnbd_put_sess_dev (sess_dev);wait_for_completion (&dc);/* wait for inflights to drop to zero */ -rnbd_dev_close (sess_dev->rnbd_dev); +blkdev_put (sess_dev->rnbd_dev->bdev, + sess_dev->rnbd_dev->blk_open_flags); +kfree (sess_dev->rnbd_dev);mutex_lock (&sess_dev->dev->lock);list_del (&sess_dev->dev_list);if (sess_dev->open_flags &FMODE_WRITE )
@@ -717,11 +719,19 @@ static int process_msg_open(struct rnbd_srv_session *srv_sess, goto reject; } - rnbd_dev =rnbd_dev_open (full_path, open_flags); -if (IS_ERR (rnbd_dev)) { -pr_err ("Opening device '%s' on session %s failed, failed to open the block device, err: %ld\n" , - full_path, srv_sess->sessname,PTR_ERR (rnbd_dev)); - ret =PTR_ERR (rnbd_dev); + rnbd_dev =kzalloc (sizeof (*rnbd_dev),GFP_KERNEL ); +if (!rnbd_dev) { + ret = -ENOMEM ; + goto free_path; + } + + rnbd_dev->blk_open_flags = open_flags; + rnbd_dev->bdev =blkdev_get_by_path (full_path, open_flags,THIS_MODULE ); +if (IS_ERR (rnbd_dev->bdev)) { + ret =PTR_ERR (rnbd_dev->bdev); +pr_err ("Opening device '%s' on session %s failed, failed to open the block device, err: %d\n" , + full_path, srv_sess->sessname, ret); +kfree (rnbd_dev); goto free_path; }
@@ -793,7 +803,8 @@ static int process_msg_open(struct rnbd_srv_session *srv_sess, }rnbd_put_srv_dev (srv_dev); rnbd_dev_close: -rnbd_dev_close (rnbd_dev); +blkdev_put (rnbd_dev->bdev, rnbd_dev->blk_open_flags); +kfree (rnbd_dev); free_path:kfree (full_path); reject:
Signature · 1 line
2.30.2
Re: [PATCH 3/4] rnbd-srv: remove rnbd_dev_{open,close}
Quoted 4 lines · Christoph Hellwig
These can be trivially open coded in the callers.
Signed-off-by Christoph Hellwig <[email protected]>---
Looks good.
-ck
PATCH 4/4 rnbd-srv: remove struct rnbd_dev
In reply to Christoph HellwigGiven that rnbd_srv_sess_dev already has an open_flags member, there is no need for the rnbd_dev indirection as a simple block_device pointer works just as well.
--- drivers/block/rnbd/rnbd-srv-dev.h | 20 -------------- drivers/block/rnbd/rnbd-srv.c | 46 ++++++++++++------------------- drivers/block/rnbd/rnbd-srv.h | 2 +- 3 files changed, 18 insertions(+), 50 deletions(-) delete mode 100644 drivers/block/rnbd/rnbd-srv-dev.h
drivers/block/rnbd/rnbd-srv-dev.h deleted +0 -20
@@ -1,20 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ -/* -* RDMA Network Block Driver -* -* Copyright (c) 2014 - 2018 ProfitBricks GmbH. All rights reserved. -* Copyright (c) 2018 - 2019 1&1 IONOS Cloud GmbH. All rights reserved. -* Copyright (c) 2019 - 2020 1&1 IONOS SE. All rights reserved. -*/ -#ifndef RNBD_SRV_DEV_H -#define RNBD_SRV_DEV_H - -#include <linux/fs.h> -#include "rnbd-proto.h" - -struct rnbd_dev { -struct block_device *bdev; -fmode_t blk_open_flags; -}; - -#endif /* RNBD_SRV_DEV_H */
drivers/block/rnbd/rnbd-srv.c +17 -29
133 lines not on this page · raw message
drivers/block/rnbd/rnbd-srv.h +1 -1
@@ -46,7 +46,7 @@ struct rnbd_srv_dev {struct rnbd_srv_sess_dev {/* Entry inside rnbd_srv_dev struct */ struct list_head dev_list; -struct rnbd_dev *rnbd_dev; +struct block_device *bdev;struct rnbd_srv_session *sess;struct rnbd_srv_dev *dev;struct kobject kobj;
Signature · 1 line
2.30.2
Re: [PATCH 4/4] rnbd-srv: remove struct rnbd_dev
Quoted 6 lines · Christoph Hellwig
Given that
rnbd_srv_sess_devalready has anopen_flagsmember, there is no need for thernbd_devindirection as a simpleblock_devicepointer works just as well.Signed-off-by Christoph Hellwig <[email protected]>---
Looks good.
-ck
Quoted 7 lines · Christoph Hellwig
Hi all,
this series has a few simple rnbd cleanups.
Slightly related question: why does rnbd send the
max_hw_sectorsvalue to the client given that it can't in any way be used by the client?
Hi Christoph,
Thanks for the cleanup, it all looks good.
Regarding the max_hw_sectors, you are right, client doesn't use it, we should clean it up.
Thanks!
Quoted 8 lines
Diffstat:
drivers/block/rnbd/Makefile | 1 drivers/block/rnbd/rnbd-srv.c | 92 +++++++++++++++----------------------- drivers/block/rnbd/rnbd-srv.h | 2 drivers/block/rnbd/rnbd-srv-dev.c | 43 ----------------- drivers/block/rnbd/rnbd-srv-dev.h | 64 -------------------------- 5 files changed, 39 insertions(+), 163 deletions(-)