From nobody Mon Feb 9 18:44:22 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1708002650; cv=none; d=zohomail.com; s=zohoarc; b=IsWK0i1bxRmeON5bswO9fm2sftEnWJw0x1hFTj1woorP7imWZ69KF3jMYmSG70hVTgFZy9LeULMgYRFPoQt8EixxYv9XMG5pUzGLri8EILihLNNOjOl0czbpq45z847AgbqoKWXrAkLlO9t/zPtRBSe+R3C2n0KaZU8UoiK55yU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1708002650; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=87vA+v/yqSIw13sXcaxXTXhvJpR4gCj67AXmDFAMYsw=; b=kOfI9bubYtMFgCM3F8LUzt1fZ8ylFPjUfCR2bhbzGNehzP1gfwtoqel0/3PPQXxG8TZ8TTg76OY7XmVeeH2QmgVbGnHkl8ied3GxLDmDLeeNnOwkwoJRIITfphcx1tTQc8HpVsTW47nKdCv06WbYsWlPbkr2zutKo3wjD6/JQNk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1708002650342960.353632365602; Thu, 15 Feb 2024 05:10:50 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.681765.1060756 (Exim 4.92) (envelope-from ) id 1rabVb-0007ae-1v; Thu, 15 Feb 2024 13:10:35 +0000 Received: by outflank-mailman (output) from mailman id 681765.1060756; Thu, 15 Feb 2024 13:10:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rabVa-0007aV-VH; Thu, 15 Feb 2024 13:10:34 +0000 Received: by outflank-mailman (input) for mailman id 681765; Thu, 15 Feb 2024 13:10:33 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rabRZ-0002yD-P0 for xen-devel@lists.xenproject.org; Thu, 15 Feb 2024 13:06:25 +0000 Received: from smtp-out1.suse.de (smtp-out1.suse.de [2a07:de40:b251:101:10:150:64:1]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 05b67721-cc03-11ee-8a4d-1f161083a0e0; Thu, 15 Feb 2024 14:06:25 +0100 (CET) Received: from imap2.dmz-prg2.suse.org (imap2.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:98]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 8E16D22031; Thu, 15 Feb 2024 13:06:24 +0000 (UTC) Received: from imap2.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap2.dmz-prg2.suse.org (Postfix) with ESMTPS id 5DF61139D0; Thu, 15 Feb 2024 13:06:24 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap2.dmz-prg2.suse.org with ESMTPSA id 4UaHFVAMzmW3FQAAn2gu4w (envelope-from ); Thu, 15 Feb 2024 13:06:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 05b67721-cc03-11ee-8a4d-1f161083a0e0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1708002384; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=87vA+v/yqSIw13sXcaxXTXhvJpR4gCj67AXmDFAMYsw=; b=HD/PUmo7iajzRJRmv5GvMx4aXD/9HOxHWCNarSFpPIqNhxjvPnMNSkn+h7FVMT+zzl4Kel BNSF9ruffO9492OvZlDnu9So4OiRXtHR1CgyRHs+ennHo7Ai+HHqDp7mfEgQo9YaUMHYOI YLrBAFdEQNvYkyTQTmq9K+BFK+8c7ms= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1708002384; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=87vA+v/yqSIw13sXcaxXTXhvJpR4gCj67AXmDFAMYsw=; b=HD/PUmo7iajzRJRmv5GvMx4aXD/9HOxHWCNarSFpPIqNhxjvPnMNSkn+h7FVMT+zzl4Kel BNSF9ruffO9492OvZlDnu9So4OiRXtHR1CgyRHs+ennHo7Ai+HHqDp7mfEgQo9YaUMHYOI YLrBAFdEQNvYkyTQTmq9K+BFK+8c7ms= From: Juergen Gross To: xen-devel@lists.xenproject.org Cc: Juergen Gross , Wei Liu , Anthony PERARD , Jason Andryuk Subject: [PATCH v7 13/21] tools/xen-9pfsd: add 9pfs read request support Date: Thu, 15 Feb 2024 14:05:01 +0100 Message-Id: <20240215130509.24008-14-jgross@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20240215130509.24008-1-jgross@suse.com> References: <20240215130509.24008-1-jgross@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.com header.s=susede1 header.b="HD/PUmo7" X-Spamd-Result: default: False [4.69 / 50.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_DKIM_ALLOW(-0.20)[suse.com:s=susede1]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:98:from]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; FREEMAIL_ENVRCPT(0.00)[gmail.com]; R_MISSING_CHARSET(2.50)[]; MIME_GOOD(-0.10)[text/plain]; TO_MATCH_ENVRCPT_ALL(0.00)[]; BROKEN_CONTENT_TYPE(1.50)[]; DWL_DNSWL_BLOCKED(0.00)[suse.com:dkim]; RCPT_COUNT_FIVE(0.00)[5]; RCVD_COUNT_THREE(0.00)[3]; DKIM_SIGNED(0.00)[suse.com:s=susede1]; DKIM_TRACE(0.00)[suse.com:+]; MX_GOOD(-0.01)[]; MID_CONTAINS_FROM(1.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.com:dkim,suse.com:email,citrix.com:email]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_CC(0.00)[suse.com,xen.org,citrix.com,gmail.com]; RCVD_TLS_ALL(0.00)[]; BAYES_HAM(-0.00)[20.42%] X-Rspamd-Server: rspamd1.dmz-prg2.suse.org X-Spam-Score: 4.69 X-Rspamd-Queue-Id: 8E16D22031 X-Spam-Level: **** X-Spam-Flag: NO X-Spamd-Bar: ++++ X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1708002652383100002 Content-Type: text/plain; charset="utf-8" Add the read request of the 9pfs protocol. Signed-off-by: Juergen Gross Reviewed-by: Jason Andryuk Acked-by: Anthony PERARD --- V2: - make error check more readable (Jason Andryuk) V4: - add directory read support V5: - rewinddir() if reading a directory and offset is 0 (Jason Andryuk) --- tools/9pfsd/io.c | 93 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) diff --git a/tools/9pfsd/io.c b/tools/9pfsd/io.c index 1832c6b06e..ba2d4a436e 100644 --- a/tools/9pfsd/io.c +++ b/tools/9pfsd/io.c @@ -33,6 +33,7 @@ #define P9_CMD_WALK 110 #define P9_CMD_OPEN 112 #define P9_CMD_CREATE 114 +#define P9_CMD_READ 116 #define P9_CMD_WRITE 118 #define P9_CMD_CLUNK 120 #define P9_CMD_STAT 124 @@ -1245,6 +1246,94 @@ static void p9_stat(struct ring *ring, struct p9_hea= der *hdr) free_fid(device, fidp); } =20 +static void p9_read(struct ring *ring, struct p9_header *hdr) +{ + device *device =3D ring->device; + uint32_t fid; + uint64_t off; + unsigned int len; + uint32_t count; + void *buf; + struct p9_fid *fidp; + int ret; + + ret =3D fill_data(ring, "ULU", &fid, &off, &count); + if ( ret !=3D 3 ) + { + p9_error(ring, hdr->tag, EINVAL); + return; + } + + fidp =3D get_fid_ref(device, fid); + if ( !fidp || !fidp->opened ) + { + errno =3D EBADF; + goto err; + } + + len =3D count; + buf =3D ring->buffer + sizeof(*hdr) + sizeof(uint32_t); + + if ( fidp->isdir ) + { + struct dirent *dirent; + struct stat st; + struct p9_stat p9s; + + if ( off =3D=3D 0 ) + rewinddir(fidp->data); + + while ( len !=3D 0 ) + { + errno =3D 0; + dirent =3D readdir(fidp->data); + if ( !dirent ) + { + if ( errno ) + goto err; + break; + } + if ( fstatat(fidp->fd, dirent->d_name, &st, 0) < 0 ) + goto err; + fill_p9_stat(device, &p9s, &st, dirent->d_name); + if ( p9s.size + sizeof(p9s.size) > len ) + { + seekdir(fidp->data, dirent->d_off); + break; + } + fill_buffer_at(&buf, "s", &p9s); + len -=3D p9s.size + sizeof(p9s.size); + } + } + else + { + while ( len !=3D 0 ) + { + ret =3D pread(fidp->fd, buf, len, off); + if ( ret <=3D 0 ) + break; + len -=3D ret; + buf +=3D ret; + off +=3D ret; + } + if ( ret < 0 && len =3D=3D count ) + goto err; + } + + buf =3D ring->buffer + sizeof(*hdr) + sizeof(uint32_t); + len =3D count - len; + fill_buffer(ring, hdr->cmd + 1, hdr->tag, "D", &len, buf); + + out: + free_fid(device, fidp); + + return; + + err: + p9_error(ring, hdr->tag, errno); + goto out; +} + static void p9_write(struct ring *ring, struct p9_header *hdr) { device *device =3D ring->device; @@ -1369,6 +1458,10 @@ void *io_thread(void *arg) p9_create(ring, &hdr); break; =20 + case P9_CMD_READ: + p9_read(ring, &hdr); + break; + case P9_CMD_WRITE: p9_write(ring, &hdr); break; --=20 2.35.3