From nobody Sun Feb 8 12:37:53 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1619608768; cv=none; d=zohomail.com; s=zohoarc; b=JuJvPxs90fwRaPWVVGHw7XIM8KbJZqp3jTTXx3CHU4WdcvfTOOEcBVStuVv4tjwGf5B4uQGaaqTPOeZqW7KsKUaqLmMe3Da48rb8/00lULMpqCYUAmdWelF32bmBzM3ck1CcV3t3+vxfG7p3L1x5ek3Q0NvBUob152XJVuo33yA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619608768; 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=CAdKIrmg1LqAyH8qlyawMEzrE9lHYZ6RdbbBMWT7eJs=; b=SmOdqxP5YNfnaHzXAZ9TgYPZBdkC8NReCHz4OZyMj+wiEhKoX/X2XWZFVfqNFDD861pczXND92Pv2S6GYgknMD60LPqUhD1AlrT8jHIyYm7TylzkQqzw8+RrMwlW2wyklgh6D54NJ+Ud6yt0kH+nwFkxoyisP0QSyVGci24W9kM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass 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 1619608768486379.4905562561976; Wed, 28 Apr 2021 04:19:28 -0700 (PDT) Received: from localhost ([::1]:50174 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lbiE3-00013S-Er for importer@patchew.org; Wed, 28 Apr 2021 07:19:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36424) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lbhxY-0006mf-BT for qemu-devel@nongnu.org; Wed, 28 Apr 2021 07:02:24 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:36941) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lbhxW-0005Hq-Ej for qemu-devel@nongnu.org; Wed, 28 Apr 2021 07:02:24 -0400 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-394-P28bVyR3OMOhwIqRjd7KFA-1; Wed, 28 Apr 2021 07:02:17 -0400 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 53B6418957F3; Wed, 28 Apr 2021 11:02:16 +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 E00031002D71; Wed, 28 Apr 2021 11:02:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619607740; 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=CAdKIrmg1LqAyH8qlyawMEzrE9lHYZ6RdbbBMWT7eJs=; b=INi0pH/LLwWISqGKZGu2NExoykAuzS9YbMx8wqqWQkSFnaDcGPnRtRLZGG3vuZwUPSvVty DX9gHOwe38G6Wdmaf0LYLK89aAwZhNc5vdMJaIe5j3cCfPLPUsyistFubDruI85WCq19vK 6ycmColRipreNvrapl4YG/F4Em6NSR4= X-MC-Unique: P28bVyR3OMOhwIqRjd7KFA-1 From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, vgoyal@redhat.com, stefanha@redhat.com, groug@kaod.org Subject: [PATCH v3 22/26] DAX/unmap virtiofsd: route unmappable write to slave command Date: Wed, 28 Apr 2021 12:00:56 +0100 Message-Id: <20210428110100.27757-23-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: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=170.10.133.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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: "Dr. David Alan Gilbert" When a fuse_buf_copy is performed on an element with FUSE_BUF_PHYS_ADDR route it to a fuse_virtio_write request that does a slave command to perform the write. Signed-off-by: Dr. David Alan Gilbert Reviewed-by: Stefan Hajnoczi --- tools/virtiofsd/buffer.c | 14 +++++++++++--- tools/virtiofsd/fuse_common.h | 6 +++++- tools/virtiofsd/fuse_lowlevel.h | 3 --- tools/virtiofsd/passthrough_ll.c | 2 +- 4 files changed, 17 insertions(+), 8 deletions(-) diff --git a/tools/virtiofsd/buffer.c b/tools/virtiofsd/buffer.c index 1a050aa441..8135d52d2a 100644 --- a/tools/virtiofsd/buffer.c +++ b/tools/virtiofsd/buffer.c @@ -200,13 +200,20 @@ static ssize_t fuse_buf_fd_to_fd(const struct fuse_bu= f *dst, size_t dst_off, return copied; } =20 -static ssize_t fuse_buf_copy_one(const struct fuse_buf *dst, size_t dst_of= f, +static ssize_t fuse_buf_copy_one(fuse_req_t req, + const struct fuse_buf *dst, size_t dst_of= f, const struct fuse_buf *src, size_t src_of= f, size_t len) { int src_is_fd =3D src->flags & FUSE_BUF_IS_FD; int dst_is_fd =3D dst->flags & FUSE_BUF_IS_FD; + int src_is_phys =3D src->flags & FUSE_BUF_PHYS_ADDR; + int dst_is_phys =3D src->flags & FUSE_BUF_PHYS_ADDR; =20 + if (src_is_phys && !src_is_fd && dst_is_fd) { + return fuse_virtio_write(req, dst, dst_off, src, src_off, len); + } + assert(!src_is_phys && !dst_is_phys); if (!src_is_fd && !dst_is_fd) { char *dstmem =3D (char *)dst->mem + dst_off; char *srcmem =3D (char *)src->mem + src_off; @@ -259,7 +266,8 @@ static int fuse_bufvec_advance(struct fuse_bufvec *bufv= , size_t len) return 1; } =20 -ssize_t fuse_buf_copy(struct fuse_bufvec *dstv, struct fuse_bufvec *srcv) +ssize_t fuse_buf_copy(fuse_req_t req, struct fuse_bufvec *dstv, + struct fuse_bufvec *srcv) { size_t copied =3D 0, i; =20 @@ -301,7 +309,7 @@ ssize_t fuse_buf_copy(struct fuse_bufvec *dstv, struct = fuse_bufvec *srcv) dst_len =3D dst->size - dstv->off; len =3D min_size(src_len, dst_len); =20 - res =3D fuse_buf_copy_one(dst, dstv->off, src, srcv->off, len); + res =3D fuse_buf_copy_one(req, dst, dstv->off, src, srcv->off, len= ); if (res < 0) { if (!copied) { return res; diff --git a/tools/virtiofsd/fuse_common.h b/tools/virtiofsd/fuse_common.h index af43cf19f9..beed03aa93 100644 --- a/tools/virtiofsd/fuse_common.h +++ b/tools/virtiofsd/fuse_common.h @@ -510,6 +510,8 @@ struct fuse_conn_info { struct fuse_session; struct fuse_pollhandle; struct fuse_conn_info_opts; +struct fuse_req; +typedef struct fuse_req *fuse_req_t; =20 /** * This function parses several command-line options that can be used @@ -728,11 +730,13 @@ size_t fuse_buf_size(const struct fuse_bufvec *bufv); /** * Copy data from one buffer vector to another * + * @param req The request this copy is part of * @param dst destination buffer vector * @param src source buffer vector * @return actual number of bytes copied or -errno on error */ -ssize_t fuse_buf_copy(struct fuse_bufvec *dst, struct fuse_bufvec *src); +ssize_t fuse_buf_copy(fuse_req_t req, + struct fuse_bufvec *dst, struct fuse_bufvec *src); =20 /** * Memory buffer iterator diff --git a/tools/virtiofsd/fuse_lowlevel.h b/tools/virtiofsd/fuse_lowleve= l.h index 757cdae49b..24e580aafe 100644 --- a/tools/virtiofsd/fuse_lowlevel.h +++ b/tools/virtiofsd/fuse_lowlevel.h @@ -42,9 +42,6 @@ /** Inode number type */ typedef uint64_t fuse_ino_t; =20 -/** Request pointer type */ -typedef struct fuse_req *fuse_req_t; - /** * Session * diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough= _ll.c index 600e102839..c5b8a1f5b1 100644 --- a/tools/virtiofsd/passthrough_ll.c +++ b/tools/virtiofsd/passthrough_ll.c @@ -2301,7 +2301,7 @@ static void lo_write_buf(fuse_req_t req, fuse_ino_t i= no, } } =20 - res =3D fuse_buf_copy(&out_buf, in_buf); + res =3D fuse_buf_copy(req, &out_buf, in_buf); if (res < 0) { fuse_reply_err(req, -res); } else { --=20 2.31.1