Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Vivek Goyal <vgoyal@redhat.com>
To:     linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org,
        virtio-fs@redhat.com
Cc:     virtualization@lists.linux-foundation.org, vgoyal@redhat.com,
        miklos@szeredi.hu, stefanha@redhat.com, dgilbert@redhat.com
Subject: [PATCH 2/3] virtiofs: Do not send forget request "struct list_head" element
Date:   Wed, 30 Oct 2019 11:07:18 -0400
Message-Id: <20191030150719.29048-3-vgoyal@redhat.com>
In-Reply-To: <20191030150719.29048-1-vgoyal@redhat.com>
References: <20191030150719.29048-1-vgoyal@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=WINDOWS-1252
Content-Transfer-Encoding: quoted-printable
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

We are sending whole of virtio_fs_foreget struct to the other end over
virtqueue. Other end does not need to see elements like "struct list".
That's internal detail of guest kernel. Fix it.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
---
 fs/fuse/virtio_fs.c | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/fs/fuse/virtio_fs.c b/fs/fuse/virtio_fs.c
index 6cc7be170cb8..43224db8d9ed 100644
--- a/fs/fuse/virtio_fs.c
+++ b/fs/fuse/virtio_fs.c
@@ -48,11 +48,15 @@ struct virtio_fs {
 =09unsigned int num_request_queues; /* number of request queues */
 };
=20
-struct virtio_fs_forget {
+struct virtio_fs_forget_req {
 =09struct fuse_in_header ih;
 =09struct fuse_forget_in arg;
+};
+
+struct virtio_fs_forget {
 =09/* This request can be temporarily queued on virt queue */
 =09struct list_head list;
+=09struct virtio_fs_forget_req req;
 };
=20
 static int virtio_fs_enqueue_req(struct virtio_fs_vq *fsvq,
@@ -325,6 +329,7 @@ static int send_forget_request(struct virtio_fs_vq *fsv=
q,
 =09struct virtqueue *vq;
 =09int ret =3D 0;
 =09bool notify;
+=09struct virtio_fs_forget_req *req =3D &forget->req;
=20
 =09spin_lock(&fsvq->lock);
 =09if (!fsvq->connected) {
@@ -334,7 +339,7 @@ static int send_forget_request(struct virtio_fs_vq *fsv=
q,
 =09=09goto out;
 =09}
=20
-=09sg_init_one(&sg, forget, sizeof(*forget));
+=09sg_init_one(&sg, req, sizeof(*req));
 =09vq =3D fsvq->vq;
 =09dev_dbg(&vq->vdev->dev, "%s\n", __func__);
=20
@@ -730,6 +735,7 @@ __releases(fiq->lock)
 {
 =09struct fuse_forget_link *link;
 =09struct virtio_fs_forget *forget;
+=09struct virtio_fs_forget_req *req;
 =09struct virtio_fs *fs;
 =09struct virtio_fs_vq *fsvq;
 =09u64 unique;
@@ -743,14 +749,15 @@ __releases(fiq->lock)
=20
 =09/* Allocate a buffer for the request */
 =09forget =3D kmalloc(sizeof(*forget), GFP_NOFS | __GFP_NOFAIL);
+=09req =3D &forget->req;
=20
-=09forget->ih =3D (struct fuse_in_header){
+=09req->ih =3D (struct fuse_in_header){
 =09=09.opcode =3D FUSE_FORGET,
 =09=09.nodeid =3D link->forget_one.nodeid,
 =09=09.unique =3D unique,
-=09=09.len =3D sizeof(*forget),
+=09=09.len =3D sizeof(*req),
 =09};
-=09forget->arg =3D (struct fuse_forget_in){
+=09req->arg =3D (struct fuse_forget_in){
 =09=09.nlookup =3D link->forget_one.nlookup,
 =09};
=20
--=20
2.20.1