[PATCH for-next 0/2] Misc RNBD update

[PATCH for-next 0/2] Misc RNBD update

[Jack Wang]

Hi Jens,

Please consider to include following change for next merge window.
- one fix for wrong api usage.
- one sysfs_emit conversion for sysfs access.

Regards!

Gioh Kim (1):
  block/rnbd-clt: Use put_cpu_ptr after get_cpu_ptr

Md Haris Iqbal (1):
  block/rnbd: Use sysfs_emit instead of s*printf function for sysfs show

 drivers/block/rnbd/rnbd-clt-sysfs.c | 33 +++++++++++++----------------
 drivers/block/rnbd/rnbd-clt.c       |  2 +-
 drivers/block/rnbd/rnbd-srv-sysfs.c | 14 ++++++------
 3 files changed, 23 insertions(+), 26 deletions(-)

-- 
2.25.1

[PATCH for-next 1/2] block/rnbd-clt: Use put_cpu_ptr after get_cpu_ptr

[Jack Wang]

From: Gioh Kim <gi-oh.kim@ionos.com>

This patch replaces put_cpu_var with put_cpu_ptr because
get_cpu_ptr should be paired with put_cpu_ptr.

Signed-off-by: Gioh Kim <gi-oh.kim@ionos.com>
Signed-off-by: Jack Wang <jinpu.wang@ionos.com>
---
 drivers/block/rnbd/rnbd-clt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/block/rnbd/rnbd-clt.c b/drivers/block/rnbd/rnbd-clt.c
index e9cc413495f0..bd4a41afbbfc 100644
--- a/drivers/block/rnbd/rnbd-clt.c
+++ b/drivers/block/rnbd/rnbd-clt.c
@@ -271,7 +271,7 @@ static bool rnbd_rerun_if_needed(struct rnbd_clt_session *sess)
 	 */
 	if (cpu_q)
 		*cpup = cpu_q->cpu;
-	put_cpu_var(sess->cpu_rr);
+	put_cpu_ptr(sess->cpu_rr);
 
 	if (q)
 		rnbd_clt_dev_requeue(q);
-- 
2.25.1

[PATCH for-next 2/2] block/rnbd: Use sysfs_emit instead of s*printf function for sysfs show

[Jack Wang]

From: Md Haris Iqbal <haris.iqbal@ionos.com>

sysfs_emit function was added to be aware of the PAGE_SIZE maximum of
the temporary buffer used for outputting sysfs content, so there is no
possible overruns. So replace the uses of any s*printf functions for
the sysfs show functions with sysfs_emit.

Signed-off-by: Md Haris Iqbal <haris.iqbal@ionos.com>
Signed-off-by: Jack Wang <jinpu.wang@ionos.com>
---
 drivers/block/rnbd/rnbd-clt-sysfs.c | 33 +++++++++++++----------------
 drivers/block/rnbd/rnbd-srv-sysfs.c | 14 ++++++------
 2 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/drivers/block/rnbd/rnbd-clt-sysfs.c b/drivers/block/rnbd/rnbd-clt-sysfs.c
index 324afdd63a96..4b93fd83bf79 100644
--- a/drivers/block/rnbd/rnbd-clt-sysfs.c
+++ b/drivers/block/rnbd/rnbd-clt-sysfs.c
@@ -227,17 +227,17 @@ static ssize_t state_show(struct kobject *kobj,
 
 	switch (dev->dev_state) {
 	case DEV_STATE_INIT:
-		return snprintf(page, PAGE_SIZE, "init\n");
+		return sysfs_emit(page, "init\n");
 	case DEV_STATE_MAPPED:
 		/* TODO fix cli tool before changing to proper state */
-		return snprintf(page, PAGE_SIZE, "open\n");
+		return sysfs_emit(page, "open\n");
 	case DEV_STATE_MAPPED_DISCONNECTED:
 		/* TODO fix cli tool before changing to proper state */
-		return snprintf(page, PAGE_SIZE, "closed\n");
+		return sysfs_emit(page, "closed\n");
 	case DEV_STATE_UNMAPPED:
-		return snprintf(page, PAGE_SIZE, "unmapped\n");
+		return sysfs_emit(page, "unmapped\n");
 	default:
-		return snprintf(page, PAGE_SIZE, "unknown\n");
+		return sysfs_emit(page, "unknown\n");
 	}
 }
 
@@ -263,7 +263,7 @@ static ssize_t mapping_path_show(struct kobject *kobj,
 
 	dev = container_of(kobj, struct rnbd_clt_dev, kobj);
 
-	return scnprintf(page, PAGE_SIZE, "%s\n", dev->pathname);
+	return sysfs_emit(page, "%s\n", dev->pathname);
 }
 
 static struct kobj_attribute rnbd_clt_mapping_path_attr =
@@ -276,8 +276,7 @@ static ssize_t access_mode_show(struct kobject *kobj,
 
 	dev = container_of(kobj, struct rnbd_clt_dev, kobj);
 
-	return snprintf(page, PAGE_SIZE, "%s\n",
-			rnbd_access_mode_str(dev->access_mode));
+	return sysfs_emit(page, "%s\n", rnbd_access_mode_str(dev->access_mode));
 }
 
 static struct kobj_attribute rnbd_clt_access_mode =
@@ -286,8 +285,8 @@ static struct kobj_attribute rnbd_clt_access_mode =
 static ssize_t rnbd_clt_unmap_dev_show(struct kobject *kobj,
 					struct kobj_attribute *attr, char *page)
 {
-	return scnprintf(page, PAGE_SIZE, "Usage: echo <normal|force> > %s\n",
-			 attr->attr.name);
+	return sysfs_emit(page, "Usage: echo <normal|force> > %s\n",
+			  attr->attr.name);
 }
 
 static ssize_t rnbd_clt_unmap_dev_store(struct kobject *kobj,
@@ -357,9 +356,8 @@ static ssize_t rnbd_clt_resize_dev_show(struct kobject *kobj,
 					 struct kobj_attribute *attr,
 					 char *page)
 {
-	return scnprintf(page, PAGE_SIZE,
-			 "Usage: echo <new size in sectors> > %s\n",
-			 attr->attr.name);
+	return sysfs_emit(page, "Usage: echo <new size in sectors> > %s\n",
+			  attr->attr.name);
 }
 
 static ssize_t rnbd_clt_resize_dev_store(struct kobject *kobj,
@@ -390,8 +388,7 @@ static struct kobj_attribute rnbd_clt_resize_dev_attr =
 static ssize_t rnbd_clt_remap_dev_show(struct kobject *kobj,
 					struct kobj_attribute *attr, char *page)
 {
-	return scnprintf(page, PAGE_SIZE, "Usage: echo <1> > %s\n",
-			 attr->attr.name);
+	return sysfs_emit(page, "Usage: echo <1> > %s\n", attr->attr.name);
 }
 
 static ssize_t rnbd_clt_remap_dev_store(struct kobject *kobj,
@@ -436,7 +433,7 @@ static ssize_t session_show(struct kobject *kobj, struct kobj_attribute *attr,
 
 	dev = container_of(kobj, struct rnbd_clt_dev, kobj);
 
-	return scnprintf(page, PAGE_SIZE, "%s\n", dev->sess->sessname);
+	return sysfs_emit(page, "%s\n", dev->sess->sessname);
 }
 
 static struct kobj_attribute rnbd_clt_session_attr =
@@ -499,8 +496,8 @@ static ssize_t rnbd_clt_map_device_show(struct kobject *kobj,
 					 struct kobj_attribute *attr,
 					 char *page)
 {
-	return scnprintf(page, PAGE_SIZE,
-			 "Usage: echo \"[dest_port=server port number] sessname=<name of the rtrs session> path=<[srcaddr@]dstaddr> [path=<[srcaddr@]dstaddr>] device_path=<full path on remote side> [access_mode=<ro|rw|migration>] [nr_poll_queues=<number of queues>]\" > %s\n\naddr ::= [ ip:<ipv4> | ip:<ipv6> | gid:<gid> ]\n",
+	return sysfs_emit(page,
+			  "Usage: echo \"[dest_port=server port number] sessname=<name of the rtrs session> path=<[srcaddr@]dstaddr> [path=<[srcaddr@]dstaddr>] device_path=<full path on remote side> [access_mode=<ro|rw|migration>] [nr_poll_queues=<number of queues>]\" > %s\n\naddr ::= [ ip:<ipv4> | ip:<ipv6> | gid:<gid> ]\n",
 			 attr->attr.name);
 }
 
diff --git a/drivers/block/rnbd/rnbd-srv-sysfs.c b/drivers/block/rnbd/rnbd-srv-sysfs.c
index acf5fced11ef..4db98e0e76f0 100644
--- a/drivers/block/rnbd/rnbd-srv-sysfs.c
+++ b/drivers/block/rnbd/rnbd-srv-sysfs.c
@@ -90,8 +90,8 @@ static ssize_t read_only_show(struct kobject *kobj, struct kobj_attribute *attr,
 
 	sess_dev = container_of(kobj, struct rnbd_srv_sess_dev, kobj);
 
-	return scnprintf(page, PAGE_SIZE, "%d\n",
-			 !(sess_dev->open_flags & FMODE_WRITE));
+	return sysfs_emit(page, "%d\n",
+			  !(sess_dev->open_flags & FMODE_WRITE));
 }
 
 static struct kobj_attribute rnbd_srv_dev_session_ro_attr =
@@ -105,8 +105,8 @@ static ssize_t access_mode_show(struct kobject *kobj,
 
 	sess_dev = container_of(kobj, struct rnbd_srv_sess_dev, kobj);
 
-	return scnprintf(page, PAGE_SIZE, "%s\n",
-			 rnbd_access_mode_str(sess_dev->access_mode));
+	return sysfs_emit(page, "%s\n",
+			  rnbd_access_mode_str(sess_dev->access_mode));
 }
 
 static struct kobj_attribute rnbd_srv_dev_session_access_mode_attr =
@@ -119,7 +119,7 @@ static ssize_t mapping_path_show(struct kobject *kobj,
 
 	sess_dev = container_of(kobj, struct rnbd_srv_sess_dev, kobj);
 
-	return scnprintf(page, PAGE_SIZE, "%s\n", sess_dev->pathname);
+	return sysfs_emit(page, "%s\n", sess_dev->pathname);
 }
 
 static struct kobj_attribute rnbd_srv_dev_session_mapping_path_attr =
@@ -128,8 +128,8 @@ static struct kobj_attribute rnbd_srv_dev_session_mapping_path_attr =
 static ssize_t rnbd_srv_dev_session_force_close_show(struct kobject *kobj,
 					struct kobj_attribute *attr, char *page)
 {
-	return scnprintf(page, PAGE_SIZE, "Usage: echo 1 > %s\n",
-			 attr->attr.name);
+	return sysfs_emit(page, "Usage: echo 1 > %s\n",
+			  attr->attr.name);
 }
 
 static ssize_t rnbd_srv_dev_session_force_close_store(struct kobject *kobj,
-- 
2.25.1

Re: [PATCH for-next 0/2] Misc RNBD update

[Jens Axboe]

On 7/26/21 5:59 AM, Jack Wang wrote:
> Hi Jens,
> 
> Please consider to include following change for next merge window.
> - one fix for wrong api usage.> - one sysfs_emit conversion for sysfs access.

Applied, thanks.

-- 
Jens Axboe

Re: [PATCH for-next 0/2] Misc RNBD update

[Jens Axboe]

On Thu, 7 Jul 2022 16:31:20 +0200, Md Haris Iqbal wrote:
> Please consider to include following change for next merge window.
>  - Fixes a minor bug
>  - Removes a list, and replaces its use with an existing xarray
> 
> Md Haris Iqbal (2):
>   block/rnbd-srv: Set keep_id to true after mutex_trylock
>   block/rnbd-srv: Replace sess_dev_list with index_idr
> 
> [...]

Applied, thanks!

[1/2] block/rnbd-srv: Set keep_id to true after mutex_trylock
      commit: 5ba7b490d9fce87b2aea9de27e13da6ef5300a17
[2/2] block/rnbd-srv: Replace sess_dev_list with index_idr
      commit: cf9db9e0f6fd15aa044d32e4018c3a572534a9a7

Best regards,
-- 
Jens Axboe

[PATCH for-next 0/2] Misc RNBD update

[Md Haris Iqbal]

Hi Jens,

Please consider to include following change for next merge window.
 - Fixes a minor bug
 - Removes a list, and replaces its use with an existing xarray

Md Haris Iqbal (2):
  block/rnbd-srv: Set keep_id to true after mutex_trylock
  block/rnbd-srv: Replace sess_dev_list with index_idr

 drivers/block/rnbd/rnbd-srv.c | 20 +++++++++-----------
 drivers/block/rnbd/rnbd-srv.h |  4 ----
 2 files changed, 9 insertions(+), 15 deletions(-)

-- 
2.25.1

Re: [PATCH for-next 0/2] Misc RNBD update

[Jens Axboe]

On Fri, 14 Jan 2022 16:58:53 +0100, Md Haris Iqbal wrote:
> Please consider to include following change for next merge window.
>  - fixes warning generated from checkpatch
>  - removes rotational param from RNBD device
> 
> Gioh Kim (2):
>   block/rnbd-clt: fix CHECK:BRACES warning
>   block/rnbd: client device does not care queue/rotational
> 
> [...]

Applied, thanks!

[1/2] block/rnbd-clt: fix CHECK:BRACES warning
      commit: 7cb0c32efbae2a7000f74243d8b4cab35d669cbd
[2/2] block/rnbd: client device does not care queue/rotational
      commit: de53a6a82aad3010d7e9c3151cba5e4e46b6ec32

Best regards,
-- 
Jens Axboe

Re: [PATCH for-next 0/2] Misc RNBD update

[Haris Iqbal]

On Fri, Jan 14, 2022 at 4:58 PM Md Haris Iqbal <haris.iqbal@ionos.com> wrote:
>
> Hi Jens,
>
> Please consider to include following change for next merge window.
>  - fixes warning generated from checkpatch
>  - removes rotational param from RNBD device

Ping.

>
> Gioh Kim (2):
>   block/rnbd-clt: fix CHECK:BRACES warning
>   block/rnbd: client device does not care queue/rotational
>
>  drivers/block/rnbd/rnbd-clt.c   | 15 ++++++++-------
>  drivers/block/rnbd/rnbd-clt.h   |  1 -
>  drivers/block/rnbd/rnbd-proto.h |  4 ++--
>  drivers/block/rnbd/rnbd-srv.c   |  1 -
>  4 files changed, 10 insertions(+), 11 deletions(-)
>
> --
> 2.25.1
>

[PATCH for-next 0/2] Misc RNBD update

[Md Haris Iqbal]

Hi Jens,

Please consider to include following change for next merge window.
 - fixes warning generated from checkpatch
 - removes rotational param from RNBD device

Gioh Kim (2):
  block/rnbd-clt: fix CHECK:BRACES warning
  block/rnbd: client device does not care queue/rotational

 drivers/block/rnbd/rnbd-clt.c   | 15 ++++++++-------
 drivers/block/rnbd/rnbd-clt.h   |  1 -
 drivers/block/rnbd/rnbd-proto.h |  4 ++--
 drivers/block/rnbd/rnbd-srv.c   |  1 -
 4 files changed, 10 insertions(+), 11 deletions(-)

-- 
2.25.1