From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0ADF9C433ED for ; Wed, 28 Apr 2021 11:19:31 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8A25961422 for ; Wed, 28 Apr 2021 11:19:30 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8A25961422 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:50764 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lbiE5-0001Hw-GZ for qemu-devel@archiver.kernel.org; Wed, 28 Apr 2021 07:19:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36350) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lbhxS-0006hl-RI for qemu-devel@nongnu.org; Wed, 28 Apr 2021 07:02:20 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:56954) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lbhxP-0005FV-E1 for qemu-devel@nongnu.org; Wed, 28 Apr 2021 07:02:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619607734; 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=lJFtzScEIL+LgQ8eF2qNDMr1tK8EKOlYtE4oVOkxW6o=; b=Mb2zP/A+VBgfvZrauVD1uOQlppgftZ/yUmacOIFBFsDjwOEi2CHI44WukeTyXYT3kkpd7I JfDgmwBd5flj0s8rAf/nKhUp90mcTBKwWhKUxtAawuxT95M5c87rbiSFscw1gtWxqPYybY SgK5VecH+MU/9ZCv+PRSFkRe0vsOr2o= 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-43-R8VFWnAaOCaVQvHPvsmdQg-1; Wed, 28 Apr 2021 07:02:11 -0400 X-MC-Unique: R8VFWnAaOCaVQvHPvsmdQg-1 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 DC58D180486D; Wed, 28 Apr 2021 11:02:10 +0000 (UTC) Received: from dgilbert-t580.localhost (ovpn-115-35.ams2.redhat.com [10.36.115.35]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9A27910016FC; Wed, 28 Apr 2021 11:02:09 +0000 (UTC) From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, vgoyal@redhat.com, stefanha@redhat.com, groug@kaod.org Subject: [PATCH v3 19/26] DAX/unmap virtiofsd: Add wrappers for VHOST_USER_SLAVE_FS_IO Date: Wed, 28 Apr 2021 12:00:53 +0100 Message-Id: <20210428110100.27757-20-dgilbert@redhat.com> In-Reply-To: <20210428110100.27757-1-dgilbert@redhat.com> References: <20210428110100.27757-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=dgilbert@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Received-SPF: pass client-ip=216.205.24.124; envelope-from=dgilbert@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.22, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: virtio-fs@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: "Dr. David Alan Gilbert" Add a wrapper to send VHOST_USER_SLAVE_FS_IO commands and a further wrapper for sending a fuse_buf write using the FS_IO slave command. Signed-off-by: Dr. David Alan Gilbert Reviewed-by: Stefan Hajnoczi --- tools/virtiofsd/fuse_lowlevel.h | 25 +++++++++++++++++++ tools/virtiofsd/fuse_virtio.c | 43 +++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+) diff --git a/tools/virtiofsd/fuse_lowlevel.h b/tools/virtiofsd/fuse_lowlevel.h index 27b07bfc22..757cdae49b 100644 --- a/tools/virtiofsd/fuse_lowlevel.h +++ b/tools/virtiofsd/fuse_lowlevel.h @@ -2013,4 +2013,29 @@ int64_t fuse_virtio_map(fuse_req_t req, VhostUserFSSlaveMsg *msg, int fd); */ int64_t fuse_virtio_unmap(struct fuse_session *se, VhostUserFSSlaveMsg *msg); +/** + * For use with virtio-fs; request IO directly to memory + * + * @param se The current session + * @param msg A set of IO requests + * @param fd The fd to map + * @return Length on success, negative errno on error + */ +int64_t fuse_virtio_io(struct fuse_session *se, VhostUserFSSlaveMsg *msg, + int fd); + +/** + * For use with virtio-fs; wrapper for fuse_virtio_io for writes + * from memory to an fd + * @param req The request that triggered this action + * @param dst The destination (file) memory buffer + * @param dst_off Byte offset in the file + * @param src The source (memory) buffer + * @param src_off The GPA + * @param len Length in bytes + */ +ssize_t fuse_virtio_write(fuse_req_t req, const struct fuse_buf *dst, + size_t dst_off, const struct fuse_buf *src, + size_t src_off, size_t len); + #endif /* FUSE_LOWLEVEL_H_ */ diff --git a/tools/virtiofsd/fuse_virtio.c b/tools/virtiofsd/fuse_virtio.c index 85d90ca595..91317bade8 100644 --- a/tools/virtiofsd/fuse_virtio.c +++ b/tools/virtiofsd/fuse_virtio.c @@ -1141,3 +1141,46 @@ int64_t fuse_virtio_unmap(struct fuse_session *se, VhostUserFSSlaveMsg *msg) return vu_fs_cache_request(&se->virtio_dev->dev, VHOST_USER_SLAVE_FS_UNMAP, -1, msg); } + +int64_t fuse_virtio_io(struct fuse_session *se, VhostUserFSSlaveMsg *msg, + int fd) +{ + if (!se->virtio_dev) { + return -ENODEV; + } + return vu_fs_cache_request(&se->virtio_dev->dev, VHOST_USER_SLAVE_FS_IO, + fd, msg); +} + +/* + * Write to a file (dst) from an area of guest GPA (src) that probably + * isn't visible to the daemon. + */ +ssize_t fuse_virtio_write(fuse_req_t req, const struct fuse_buf *dst, + size_t dst_off, const struct fuse_buf *src, + size_t src_off, size_t len) +{ + VhostUserFSSlaveMsg *msg = g_malloc0(sizeof(VhostUserFSSlaveMsg) + + sizeof(VhostUserFSSlaveMsgEntry)); + + msg->count = 1; + + if (dst->flags & FUSE_BUF_FD_SEEK) { + msg->entries[0].fd_offset = dst->pos + dst_off; + } else { + off_t cur = lseek(dst->fd, 0, SEEK_CUR); + if (cur == (off_t)-1) { + g_free(msg); + return -errno; + } + msg->entries[0].fd_offset = cur; + } + msg->entries[0].c_offset = (uintptr_t)src->mem + src_off; + msg->entries[0].len = len; + msg->entries[0].flags = VHOST_USER_FS_FLAG_MAP_W; + + int64_t result = fuse_virtio_io(req->se, msg, dst->fd); + fuse_log(FUSE_LOG_DEBUG, "%s: result=%" PRId64 " \n", __func__, result); + g_free(msg); + return result; +} -- 2.31.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Dr. David Alan Gilbert (git)" Date: Wed, 28 Apr 2021 12:00:53 +0100 Message-Id: <20210428110100.27757-20-dgilbert@redhat.com> In-Reply-To: <20210428110100.27757-1-dgilbert@redhat.com> References: <20210428110100.27757-1-dgilbert@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Virtio-fs] [PATCH v3 19/26] DAX/unmap virtiofsd: Add wrappers for VHOST_USER_SLAVE_FS_IO List-Id: Development discussions about virtio-fs List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, vgoyal@redhat.com, stefanha@redhat.com, groug@kaod.org Cc: virtio-fs@redhat.com From: "Dr. David Alan Gilbert" Add a wrapper to send VHOST_USER_SLAVE_FS_IO commands and a further wrapper for sending a fuse_buf write using the FS_IO slave command. Signed-off-by: Dr. David Alan Gilbert Reviewed-by: Stefan Hajnoczi --- tools/virtiofsd/fuse_lowlevel.h | 25 +++++++++++++++++++ tools/virtiofsd/fuse_virtio.c | 43 +++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+) diff --git a/tools/virtiofsd/fuse_lowlevel.h b/tools/virtiofsd/fuse_lowlevel.h index 27b07bfc22..757cdae49b 100644 --- a/tools/virtiofsd/fuse_lowlevel.h +++ b/tools/virtiofsd/fuse_lowlevel.h @@ -2013,4 +2013,29 @@ int64_t fuse_virtio_map(fuse_req_t req, VhostUserFSSlaveMsg *msg, int fd); */ int64_t fuse_virtio_unmap(struct fuse_session *se, VhostUserFSSlaveMsg *msg); +/** + * For use with virtio-fs; request IO directly to memory + * + * @param se The current session + * @param msg A set of IO requests + * @param fd The fd to map + * @return Length on success, negative errno on error + */ +int64_t fuse_virtio_io(struct fuse_session *se, VhostUserFSSlaveMsg *msg, + int fd); + +/** + * For use with virtio-fs; wrapper for fuse_virtio_io for writes + * from memory to an fd + * @param req The request that triggered this action + * @param dst The destination (file) memory buffer + * @param dst_off Byte offset in the file + * @param src The source (memory) buffer + * @param src_off The GPA + * @param len Length in bytes + */ +ssize_t fuse_virtio_write(fuse_req_t req, const struct fuse_buf *dst, + size_t dst_off, const struct fuse_buf *src, + size_t src_off, size_t len); + #endif /* FUSE_LOWLEVEL_H_ */ diff --git a/tools/virtiofsd/fuse_virtio.c b/tools/virtiofsd/fuse_virtio.c index 85d90ca595..91317bade8 100644 --- a/tools/virtiofsd/fuse_virtio.c +++ b/tools/virtiofsd/fuse_virtio.c @@ -1141,3 +1141,46 @@ int64_t fuse_virtio_unmap(struct fuse_session *se, VhostUserFSSlaveMsg *msg) return vu_fs_cache_request(&se->virtio_dev->dev, VHOST_USER_SLAVE_FS_UNMAP, -1, msg); } + +int64_t fuse_virtio_io(struct fuse_session *se, VhostUserFSSlaveMsg *msg, + int fd) +{ + if (!se->virtio_dev) { + return -ENODEV; + } + return vu_fs_cache_request(&se->virtio_dev->dev, VHOST_USER_SLAVE_FS_IO, + fd, msg); +} + +/* + * Write to a file (dst) from an area of guest GPA (src) that probably + * isn't visible to the daemon. + */ +ssize_t fuse_virtio_write(fuse_req_t req, const struct fuse_buf *dst, + size_t dst_off, const struct fuse_buf *src, + size_t src_off, size_t len) +{ + VhostUserFSSlaveMsg *msg = g_malloc0(sizeof(VhostUserFSSlaveMsg) + + sizeof(VhostUserFSSlaveMsgEntry)); + + msg->count = 1; + + if (dst->flags & FUSE_BUF_FD_SEEK) { + msg->entries[0].fd_offset = dst->pos + dst_off; + } else { + off_t cur = lseek(dst->fd, 0, SEEK_CUR); + if (cur == (off_t)-1) { + g_free(msg); + return -errno; + } + msg->entries[0].fd_offset = cur; + } + msg->entries[0].c_offset = (uintptr_t)src->mem + src_off; + msg->entries[0].len = len; + msg->entries[0].flags = VHOST_USER_FS_FLAG_MAP_W; + + int64_t result = fuse_virtio_io(req->se, msg, dst->fd); + fuse_log(FUSE_LOG_DEBUG, "%s: result=%" PRId64 " \n", __func__, result); + g_free(msg); + return result; +} -- 2.31.1