All of lore.kernel.org
 help / color / mirror / Atom feed
From: Vivek Goyal <vgoyal@redhat.com>
To: qemu-devel@nongnu.org, virtio-fs@redhat.com
Cc: mszeredi@redhat.com, stefanha@redhat.com, dgilbert@redhat.com,
	vgoyal@redhat.com
Subject: [PATCH v4 4/9] virtiofsd: Extend size of fuse_conn_info->capable and ->want fields
Date: Mon, 24 Jan 2022 16:24:50 -0500	[thread overview]
Message-ID: <20220124212455.83968-5-vgoyal@redhat.com> (raw)
In-Reply-To: <20220124212455.83968-1-vgoyal@redhat.com>

->capable keeps track of what capabilities kernel supports and ->wants keep
track of what capabilities filesytem wants.

Right now these fields are 32bit in size. But now fuse has run out of
bits and capabilities can now have bit number which are higher than 31.

That means 32 bit fields are not suffcient anymore. Increase size to 64
bit so that we can add newer capabilities and still be able to use existing
code to check and set the capabilities.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
---
 tools/virtiofsd/fuse_common.h   | 4 ++--
 tools/virtiofsd/fuse_lowlevel.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/virtiofsd/fuse_common.h b/tools/virtiofsd/fuse_common.h
index 0c2665b977..6f8a988202 100644
--- a/tools/virtiofsd/fuse_common.h
+++ b/tools/virtiofsd/fuse_common.h
@@ -439,7 +439,7 @@ struct fuse_conn_info {
     /**
      * Capability flags that the kernel supports (read-only)
      */
-    unsigned capable;
+    uint64_t capable;
 
     /**
      * Capability flags that the filesystem wants to enable.
@@ -447,7 +447,7 @@ struct fuse_conn_info {
      * libfuse attempts to initialize this field with
      * reasonable default values before calling the init() handler.
      */
-    unsigned want;
+    uint64_t want;
 
     /**
      * Maximum number of pending "background" requests. A
diff --git a/tools/virtiofsd/fuse_lowlevel.c b/tools/virtiofsd/fuse_lowlevel.c
index c3af5ede08..f3f5e70be6 100644
--- a/tools/virtiofsd/fuse_lowlevel.c
+++ b/tools/virtiofsd/fuse_lowlevel.c
@@ -2063,7 +2063,7 @@ static void do_init(fuse_req_t req, fuse_ino_t nodeid,
     if (se->conn.want & (~se->conn.capable)) {
         fuse_log(FUSE_LOG_ERR,
                  "fuse: error: filesystem requested capabilities "
-                 "0x%x that are not supported by kernel, aborting.\n",
+                 "0x%lx that are not supported by kernel, aborting.\n",
                  se->conn.want & (~se->conn.capable));
         fuse_reply_err(req, EPROTO);
         se->error = -EPROTO;
-- 
2.31.1



WARNING: multiple messages have this Message-ID (diff)
From: Vivek Goyal <vgoyal@redhat.com>
To: qemu-devel@nongnu.org, virtio-fs@redhat.com
Cc: vgoyal@redhat.com
Subject: [Virtio-fs] [PATCH v4 4/9] virtiofsd: Extend size of fuse_conn_info->capable and ->want fields
Date: Mon, 24 Jan 2022 16:24:50 -0500	[thread overview]
Message-ID: <20220124212455.83968-5-vgoyal@redhat.com> (raw)
In-Reply-To: <20220124212455.83968-1-vgoyal@redhat.com>

->capable keeps track of what capabilities kernel supports and ->wants keep
track of what capabilities filesytem wants.

Right now these fields are 32bit in size. But now fuse has run out of
bits and capabilities can now have bit number which are higher than 31.

That means 32 bit fields are not suffcient anymore. Increase size to 64
bit so that we can add newer capabilities and still be able to use existing
code to check and set the capabilities.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
---
 tools/virtiofsd/fuse_common.h   | 4 ++--
 tools/virtiofsd/fuse_lowlevel.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/virtiofsd/fuse_common.h b/tools/virtiofsd/fuse_common.h
index 0c2665b977..6f8a988202 100644
--- a/tools/virtiofsd/fuse_common.h
+++ b/tools/virtiofsd/fuse_common.h
@@ -439,7 +439,7 @@ struct fuse_conn_info {
     /**
      * Capability flags that the kernel supports (read-only)
      */
-    unsigned capable;
+    uint64_t capable;
 
     /**
      * Capability flags that the filesystem wants to enable.
@@ -447,7 +447,7 @@ struct fuse_conn_info {
      * libfuse attempts to initialize this field with
      * reasonable default values before calling the init() handler.
      */
-    unsigned want;
+    uint64_t want;
 
     /**
      * Maximum number of pending "background" requests. A
diff --git a/tools/virtiofsd/fuse_lowlevel.c b/tools/virtiofsd/fuse_lowlevel.c
index c3af5ede08..f3f5e70be6 100644
--- a/tools/virtiofsd/fuse_lowlevel.c
+++ b/tools/virtiofsd/fuse_lowlevel.c
@@ -2063,7 +2063,7 @@ static void do_init(fuse_req_t req, fuse_ino_t nodeid,
     if (se->conn.want & (~se->conn.capable)) {
         fuse_log(FUSE_LOG_ERR,
                  "fuse: error: filesystem requested capabilities "
-                 "0x%x that are not supported by kernel, aborting.\n",
+                 "0x%lx that are not supported by kernel, aborting.\n",
                  se->conn.want & (~se->conn.capable));
         fuse_reply_err(req, EPROTO);
         se->error = -EPROTO;
-- 
2.31.1


  parent reply	other threads:[~2022-01-24 21:28 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-01-24 21:24 [PATCH v4 0/9] virtiofsd: Add support for file security context at creation Vivek Goyal
2022-01-24 21:24 ` [Virtio-fs] " Vivek Goyal
2022-01-24 21:24 ` [PATCH v4 1/9] linux-headers: Update headers to v5.17-rc1 Vivek Goyal
2022-01-24 21:24   ` [Virtio-fs] " Vivek Goyal
2022-01-27 17:21   ` Dr. David Alan Gilbert
2022-01-27 17:21     ` [Virtio-fs] " Dr. David Alan Gilbert
2022-01-27 18:06     ` Vivek Goyal
2022-01-27 18:06       ` [Virtio-fs] " Vivek Goyal
2022-01-27 19:42       ` Dr. David Alan Gilbert
2022-01-27 19:42         ` [Virtio-fs] " Dr. David Alan Gilbert
2022-01-24 21:24 ` [PATCH v4 2/9] virtiofsd: Fix breakage due to fuse_init_in size change Vivek Goyal
2022-01-24 21:24   ` [Virtio-fs] " Vivek Goyal
2022-01-27 17:17   ` Dr. David Alan Gilbert
2022-01-27 17:17     ` [Virtio-fs] " Dr. David Alan Gilbert
2022-01-24 21:24 ` [PATCH v4 3/9] virtiofsd: Parse extended "struct fuse_init_in" Vivek Goyal
2022-01-24 21:24   ` [Virtio-fs] " Vivek Goyal
2022-01-27 17:50   ` Dr. David Alan Gilbert
2022-01-27 17:50     ` [Virtio-fs] " Dr. David Alan Gilbert
2022-01-27 18:21     ` Vivek Goyal
2022-01-27 18:21       ` [Virtio-fs] " Vivek Goyal
2022-01-24 21:24 ` Vivek Goyal [this message]
2022-01-24 21:24   ` [Virtio-fs] [PATCH v4 4/9] virtiofsd: Extend size of fuse_conn_info->capable and ->want fields Vivek Goyal
2022-01-27 17:53   ` Dr. David Alan Gilbert
2022-01-27 17:53     ` [Virtio-fs] " Dr. David Alan Gilbert
2022-01-27 18:31     ` Vivek Goyal
2022-01-27 18:31       ` [Virtio-fs] " Vivek Goyal
2022-01-24 21:24 ` [PATCH v4 5/9] virtiofsd, fuse_lowlevel.c: Add capability to parse security context Vivek Goyal
2022-01-24 21:24   ` [Virtio-fs] " Vivek Goyal
2022-01-24 21:24 ` [PATCH v4 6/9] virtiofsd: Move core file creation code in separate function Vivek Goyal
2022-01-24 21:24   ` [Virtio-fs] " Vivek Goyal
2022-01-27 19:50   ` Dr. David Alan Gilbert
2022-01-27 19:50     ` [Virtio-fs] " Dr. David Alan Gilbert
2022-01-24 21:24 ` [PATCH v4 7/9] virtiofsd: Create new file with fscreate set Vivek Goyal
2022-01-24 21:24   ` [Virtio-fs] " Vivek Goyal
2022-01-24 21:24 ` [PATCH v4 8/9] virtiofsd: Create new file using O_TMPFILE and set security context Vivek Goyal
2022-01-24 21:24   ` [Virtio-fs] " Vivek Goyal
2022-01-24 21:24 ` [PATCH v4 9/9] virtiofsd: Add an option to enable/disable security label Vivek Goyal
2022-01-24 21:24   ` [Virtio-fs] " Vivek Goyal

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220124212455.83968-5-vgoyal@redhat.com \
    --to=vgoyal@redhat.com \
    --cc=dgilbert@redhat.com \
    --cc=mszeredi@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@redhat.com \
    --cc=virtio-fs@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.