From nobody Wed Nov 12 21:50:36 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1573851544; cv=none; d=zoho.com; s=zohoarc; b=Zrqxk5uVqoih+GHRKYJZI3OIJbwCUEUzcZoEmhO7DboiEq/IFD2xTDZ8lpEIKR8kru4nV2kBg3Co/a/1GKixVcHJ9jX0LpC65qzPUugFQ7TSdGu+t+/xU+XiHam5XU4sj6nj+R0E//vkhPJsZNI7ZuIj0W1Z9W5ilSMliR2PuRs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1573851544; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=FpCwPrwFNpEfj3R1MxNuQltxgfFE7nKTvRQ0qQrBjoE=; b=gBQnhTHQNsyKl8PUj3IPzvH5Z3eItVwEQijSfwvqe/NdB1GbOkTspRSjIsaPedOKSX4FGB8oXrIKJxSlKsIy3aqJ/cHlRIUeLHUWhuMG/BkEV02Z33QCeXMrt6kbc7KXxCoXhwd0Xy8C6h/JDyrp+MZEFHxfmlD1GDtXQGiJIrg= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 15738515449051019.5995655182136; Fri, 15 Nov 2019 12:59:04 -0800 (PST) Received: from localhost ([::1]:44982 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iVigI-00036S-PA for importer@patchew.org; Fri, 15 Nov 2019 15:59:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46588) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iVieU-0001L3-JD for qemu-devel@nongnu.org; Fri, 15 Nov 2019 15:57:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iVieR-00046H-Tz for qemu-devel@nongnu.org; Fri, 15 Nov 2019 15:57:09 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:55966 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iVieR-00044t-PY for qemu-devel@nongnu.org; Fri, 15 Nov 2019 15:57:07 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-355--619w4k7MBStYWIBTvG-BA-1; Fri, 15 Nov 2019 15:55:58 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6D48D1005511; Fri, 15 Nov 2019 20:55:57 +0000 (UTC) Received: from horse.redhat.com (unknown [10.18.25.35]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5F23310375C0; Fri, 15 Nov 2019 20:55:51 +0000 (UTC) Received: by horse.redhat.com (Postfix, from userid 10451) id DB2A7224778; Fri, 15 Nov 2019 15:55:50 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1573851427; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=FpCwPrwFNpEfj3R1MxNuQltxgfFE7nKTvRQ0qQrBjoE=; b=JscRJPUi1KrwoI2lawOEEfYnaYMd2QlECCQ/1/i8l9I97BCMHwjUJ4h51fCmHrMneuTMwg IuLxZxfMvRRNdBglIKVjOyKzHvDlj7ZKre860I2dclDyi45h9FXmtv62kpfKiJgmj2DCQo SOrYXLxdckSr7Z/HErPGVBjrHiwLWmk= From: Vivek Goyal To: virtio-fs@redhat.com, qemu-devel@nongnu.org Subject: [PATCH 4/4] virtiofsd: Implement blocking posix locks Date: Fri, 15 Nov 2019 15:55:43 -0500 Message-Id: <20191115205543.1816-5-vgoyal@redhat.com> In-Reply-To: <20191115205543.1816-1-vgoyal@redhat.com> References: <20191115205543.1816-1-vgoyal@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: -619w4k7MBStYWIBTvG-BA-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.61 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: miklos@szeredi.hu, stefanha@redhat.com, vgoyal@redhat.com, dgilbert@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" As of now we don't support fcntl(F_SETLKW) and if we see one, we return -EOPNOTSUPP. Change that by accepting these requests and returning a reply immediately asking caller to wait. Once lock is available, send a notification to the waiter indicating lock is available. Signed-off-by: Vivek Goyal --- contrib/virtiofsd/fuse_kernel.h | 7 +++ contrib/virtiofsd/fuse_lowlevel.c | 23 +++++++- contrib/virtiofsd/fuse_lowlevel.h | 25 ++++++++ contrib/virtiofsd/fuse_virtio.c | 94 ++++++++++++++++++++++++++++-- contrib/virtiofsd/passthrough_ll.c | 49 +++++++++++++--- 5 files changed, 182 insertions(+), 16 deletions(-) diff --git a/contrib/virtiofsd/fuse_kernel.h b/contrib/virtiofsd/fuse_kerne= l.h index 2bdc8b1c88..d4d65c5414 100644 --- a/contrib/virtiofsd/fuse_kernel.h +++ b/contrib/virtiofsd/fuse_kernel.h @@ -444,6 +444,7 @@ enum fuse_notify_code { FUSE_NOTIFY_STORE =3D 4, FUSE_NOTIFY_RETRIEVE =3D 5, FUSE_NOTIFY_DELETE =3D 6, + FUSE_NOTIFY_LOCK =3D 7, FUSE_NOTIFY_CODE_MAX, }; =20 @@ -836,6 +837,12 @@ struct fuse_notify_retrieve_in { uint64_t dummy4; }; =20 +struct fuse_notify_lock_out { + uint64_t id; + int32_t error; + int32_t padding; +}; + /* Device ioctls: */ #define FUSE_DEV_IOC_CLONE _IOR(229, 0, uint32_t) =20 diff --git a/contrib/virtiofsd/fuse_lowlevel.c b/contrib/virtiofsd/fuse_low= level.c index d4a42d9804..f706e440bf 100644 --- a/contrib/virtiofsd/fuse_lowlevel.c +++ b/contrib/virtiofsd/fuse_lowlevel.c @@ -183,7 +183,8 @@ int fuse_send_reply_iov_nofree(fuse_req_t req, int erro= r, struct iovec *iov, { struct fuse_out_header out; =20 - if (error <=3D -1000 || error > 0) { + /* error =3D 1 has been used to signal client to wait for notificaiton */ + if (error <=3D -1000 || error > 1) { fuse_log(FUSE_LOG_ERR, "fuse: bad error value: %i\n", error); error =3D -ERANGE; } @@ -291,6 +292,12 @@ int fuse_reply_err(fuse_req_t req, int err) return send_reply(req, -err, NULL, 0); } =20 +int fuse_reply_wait(fuse_req_t req) +{ + /* TODO: This is a hack. Fix it */ + return send_reply(req, 1, NULL, 0); +} + void fuse_reply_none(fuse_req_t req) { fuse_free_req(req); @@ -2207,6 +2214,20 @@ static int send_notify_iov(struct fuse_session *se, = int notify_code, return fuse_send_msg(se, NULL, iov, count); } =20 +int fuse_lowlevel_notify_lock(struct fuse_session *se, uint64_t req_id, + int32_t error) +{ + struct fuse_notify_lock_out outarg; + struct iovec iov[2]; + + outarg.id =3D req_id; + outarg.error =3D -error; + + iov[1].iov_base =3D &outarg; + iov[1].iov_len =3D sizeof(outarg); + return send_notify_iov(se, FUSE_NOTIFY_LOCK, iov, 2); +} + int fuse_lowlevel_notify_poll(struct fuse_pollhandle *ph) { if (ph !=3D NULL) { diff --git a/contrib/virtiofsd/fuse_lowlevel.h b/contrib/virtiofsd/fuse_low= level.h index e664d2d12d..f0a94683b5 100644 --- a/contrib/virtiofsd/fuse_lowlevel.h +++ b/contrib/virtiofsd/fuse_lowlevel.h @@ -1251,6 +1251,22 @@ struct fuse_lowlevel_ops { */ int fuse_reply_err(fuse_req_t req, int err); =20 +/** + * Ask caller to wait for lock. + * + * Possible requests: + * setlkw + * + * If caller sends a blocking lock request (setlkw), then reply to caller + * that wait for lock to be available. Once lock is available caller will + * receive a notification with request's unique id. Notification will + * carry info whether lock was successfully obtained or not. + * + * @param req request handle + * @return zero for success, -errno for failure to send reply + */ +int fuse_reply_wait(fuse_req_t req); + /** * Don't send reply * @@ -1704,6 +1720,15 @@ int fuse_lowlevel_notify_delete(struct fuse_session = *se, int fuse_lowlevel_notify_store(struct fuse_session *se, fuse_ino_t ino, off_t offset, struct fuse_bufvec *bufv, enum fuse_buf_copy_flags flags); +/** + * Notify event related to previous lock request + * + * @param se the session object + * @param req_id the id of the request which requested setlkw + * @param error zero for success, -errno for the failure + */ +int fuse_lowlevel_notify_lock(struct fuse_session *se, uint64_t req_id, + int32_t error); =20 /* ----------------------------------------------------------- * * Utility functions * diff --git a/contrib/virtiofsd/fuse_virtio.c b/contrib/virtiofsd/fuse_virti= o.c index 982b6ad0bd..98d27e7642 100644 --- a/contrib/virtiofsd/fuse_virtio.c +++ b/contrib/virtiofsd/fuse_virtio.c @@ -215,6 +215,81 @@ static void copy_iov(struct iovec *src_iov, int src_co= unt, } } =20 +static int virtio_send_notify_msg(struct fuse_session *se, struct iovec *i= ov, + int count) +{ + struct fv_QueueInfo *qi; + VuDev *dev =3D &se->virtio_dev->dev; + VuVirtq *q; + FVRequest *req; + VuVirtqElement *elem; + unsigned int in_num, bad_in_num =3D 0, bad_out_num =3D 0; + struct fuse_out_header *out =3D iov[0].iov_base; + size_t in_len, tosend_len =3D iov_size(iov, count); + struct iovec *in_sg; + int ret =3D 0; + + /* Notifications have unique =3D=3D 0 */ + assert (!out->unique); + + if (!se->notify_enabled) + return -EOPNOTSUPP; + + /* If notifications are enabled, queue index 1 is notification queue */ + qi =3D se->virtio_dev->qi[1]; + q =3D vu_get_queue(dev, qi->qidx); + + pthread_rwlock_rdlock(&qi->virtio_dev->vu_dispatch_rwlock); + pthread_mutex_lock(&qi->vq_lock); + /* Pop an element from queue */ + req =3D vu_queue_pop(dev, q, sizeof(FVRequest), &bad_in_num, &bad_out_= num); + if (!req) { + /* TODO: Implement some sort of ring buffer and queue notifications + * on that and send these later when notification queue has space + * available. + */ + return -ENOSPC; + } + pthread_mutex_unlock(&qi->vq_lock); + pthread_rwlock_unlock(&qi->virtio_dev->vu_dispatch_rwlock); + + out->len =3D tosend_len; + elem =3D &req->elem; + in_num =3D elem->in_num; + in_sg =3D elem->in_sg; + in_len =3D iov_size(in_sg, in_num); + fuse_log(FUSE_LOG_DEBUG, "%s: elem %d: with %d in desc of length %zd\n= ", + __func__, elem->index, in_num, in_len); + + if (in_len < sizeof(struct fuse_out_header)) { + fuse_log(FUSE_LOG_ERR, "%s: elem %d too short for out_header\n", + __func__, elem->index); + ret =3D -E2BIG; + goto out; + } + + if (in_len < tosend_len) { + fuse_log(FUSE_LOG_ERR, "%s: elem %d too small for data len" + " %zd\n", __func__, elem->index, tosend_len); + ret =3D -E2BIG; + goto out; + } + + /* First copy the header data from iov->in_sg */ + copy_iov(iov, count, in_sg, in_num, tosend_len); + + /* TODO: Add bad_innum handling */ + pthread_rwlock_rdlock(&qi->virtio_dev->vu_dispatch_rwlock); + pthread_mutex_lock(&qi->vq_lock); + vu_queue_push(dev, q, elem, tosend_len); + vu_queue_notify(dev, q); + pthread_mutex_unlock(&qi->vq_lock); + pthread_rwlock_unlock(&qi->virtio_dev->vu_dispatch_rwlock); +out: + free(req); + return ret; +} + /* * Called back by ll whenever it wants to send a reply/message back * The 1st element of the iov starts with the fuse_out_header @@ -223,11 +298,11 @@ static void copy_iov(struct iovec *src_iov, int src_c= ount, int virtio_send_msg(struct fuse_session *se, struct fuse_chan *ch, struct iovec *iov, int count) { - FVRequest *req =3D container_of(ch, FVRequest, ch); - struct fv_QueueInfo *qi =3D ch->qi; + FVRequest *req; + struct fv_QueueInfo *qi; VuDev *dev =3D &se->virtio_dev->dev; - VuVirtq *q =3D vu_get_queue(dev, qi->qidx); - VuVirtqElement *elem =3D &req->elem; + VuVirtq *q; + VuVirtqElement *elem; int ret =3D 0; =20 assert(count >=3D 1); @@ -238,8 +313,15 @@ int virtio_send_msg(struct fuse_session *se, struct fu= se_chan *ch, =20 size_t tosend_len =3D iov_size(iov, count); =20 - /* unique =3D=3D 0 is notification, which we don't support */ - assert(out->unique); + /* unique =3D=3D 0 is notification */ + if (!out->unique) + return virtio_send_notify_msg(se, iov, count); + + assert(ch); + req =3D container_of(ch, FVRequest, ch); + elem =3D &req->elem; + qi =3D ch->qi; + q =3D vu_get_queue(dev, qi->qidx); assert(!req->reply_sent); =20 /* The 'in' part of the elem is to qemu */ diff --git a/contrib/virtiofsd/passthrough_ll.c b/contrib/virtiofsd/passthr= ough_ll.c index 028e7da273..ed52953565 100644 --- a/contrib/virtiofsd/passthrough_ll.c +++ b/contrib/virtiofsd/passthrough_ll.c @@ -1925,7 +1925,10 @@ static void lo_setlk(fuse_req_t req, fuse_ino_t ino, struct lo_data *lo =3D lo_data(req); struct lo_inode *inode; struct lo_inode_plock *plock; - int ret, saverr =3D 0; + int ret, saverr =3D 0, ofd; + uint64_t unique; + struct fuse_session *se =3D req->se; + bool async_lock =3D false; =20 fuse_log(FUSE_LOG_DEBUG, "lo_setlk(ino=3D%" PRIu64 ", flags=3D%d)" " cmd=3D%d pid=3D%d owner=3D0x%lx sleep=3D%d l_whence=3D%d" @@ -1933,11 +1936,6 @@ static void lo_setlk(fuse_req_t req, fuse_ino_t ino, lock->l_type, lock->l_pid, fi->lock_owner, sleep, lock->l_whence, lock->l_start, lock->l_len); =20 - if (sleep) { - fuse_reply_err(req, EOPNOTSUPP); - return; - } - inode =3D lo_inode(req, ino); if (!inode) { fuse_reply_err(req, EBADF); @@ -1950,21 +1948,54 @@ static void lo_setlk(fuse_req_t req, fuse_ino_t ino, =20 if (!plock) { saverr =3D ret; + pthread_mutex_unlock(&inode->plock_mutex); goto out; } =20 + /* + * plock is now released when inode is going away. We already have + * a reference on inode, so it is guaranteed that plock->fd is + * still around even after dropping inode->plock_mutex lock + */ + ofd =3D plock->fd; + pthread_mutex_unlock(&inode->plock_mutex); + + /* + * If this lock request can block, request caller to wait for + * notification. Do not access req after this. Once lock is + * available, send a notification instead. + */ + if (sleep && lock->l_type !=3D F_UNLCK) { + /* + * If notification queue is not enabled, can't support async + * locks. + */ + if (!se->notify_enabled) { + saverr =3D EOPNOTSUPP; + goto out; + } + async_lock =3D true; + unique =3D req->unique; + fuse_reply_wait(req); + } /* TODO: Is it alright to modify flock? */ lock->l_pid =3D 0; - ret =3D fcntl(plock->fd, F_OFD_SETLK, lock); + if (async_lock) + ret =3D fcntl(ofd, F_OFD_SETLKW, lock); + else + ret =3D fcntl(ofd, F_OFD_SETLK, lock); if (ret =3D=3D -1) { saverr =3D errno; } =20 out: - pthread_mutex_unlock(&inode->plock_mutex); lo_inode_put(lo, &inode); =20 - fuse_reply_err(req, saverr); + if (!async_lock) + fuse_reply_err(req, saverr); + else { + fuse_lowlevel_notify_lock(se, unique, saverr); + } } =20 static void lo_fsyncdir(fuse_req_t req, fuse_ino_t ino, int datasync, --=20 2.20.1