From nobody Thu Nov 07 18:31:27 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XkrHz2s0Vz5cM6v; Thu, 07 Nov 2024 18:31:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XkrHz2Mbcz4Xs8; Thu, 7 Nov 2024 18:31:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731004287; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DSRBUDIDOG7TuRH6pN4ZEhX9gx0eziCzQqPeNoP5Ugo=; b=yik3bq1uOJz3MUlzCiiis8HKna/06LCrJvwNZPhJB5V4QzVCB0V0olRslJAgTotQUykp2c hUbY3vIfBj1WEBMbYUwJI2K0U2foI7cm0NgDbYUS6Pvim1LGmxC/CKIudChabcXBDe4zKU UxLviGAyDddgpzUYzmUcqWYlphqdp+ZZCB5DjvQRexYGmrxd44Ze+pagZ9w8GLdlIoFsRu 2o2IFdxV41pq6ciKPM6T3lfCxc9sblqkZ1V13UG1HgqLRD9Kesz9zqFOH8UvjWaQCmRkhD sGrvBy7Skg7vdY8FWaVK62UDkAGLHFV+3HsgfpQmhtJ2QzExwoMDqOtvfpq4Hg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731004287; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DSRBUDIDOG7TuRH6pN4ZEhX9gx0eziCzQqPeNoP5Ugo=; b=DAf7VDC+JQOu3uj4Jp0yM0+cEx3z4N2H8Z+GuxOZu2HDpsLlLuIW+ASH2WaZVkJQt8Z17O 7O52TyMgPN3MGgS3eA8VHisXehT0TpaXKWMp09ns8r9QdLeLSyBh7BaYwP+EftG2BERbsi bAI0MxajZ1PA+byPIV6N3cpPoVNgrpvGYSWyT+zWvd9apw7cCCgsD98tEVUuPgkjzAOPDk zYpxbLOvf7IPV+tg4C78RGEo7bTI7pdc0Kagl2jd3eskrA3GVloEWig4mfeVySdXK3O5XG Rv/DNZDqnvlr3uQB3FgafPxi/st2AV7dgC1HyE6qyPXHSGeHCl+4tv00+KxAuw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731004287; a=rsa-sha256; cv=none; b=e97HC+TzTgoDjJBE6wSgrbeGJWxv2669ozP4nazvI+QgbX1H391bXDafkSAvO2sW4MSgVN rtgopHr9KjjnJugnMNWPccNwJf0Q3sIFxikEwsA9zaqJ4L9E2BTm9DvoFL2D/zEylmwi5h nh0ElXZODaKg8Y1Ta3Tzxm3x39enCpd6hpBlmgEWM8zw+XRwM2iFtt+ic+whDWxj4frvX6 1BY1oftHZLeGP4dtBSSGE89MUfklE6ED46Azhyj5RUptGov9cuPqUspkuDTIZGmjRlrYk+ FqauIp2C6aPnP+Rnsn8QfEZwA9ZVFzdlJrz6sF09Qbh4yFySbKAPjtlk+GRVCw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XkrHz1yhVzx0s; Thu, 7 Nov 2024 18:31:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A7IVReU093626; Thu, 7 Nov 2024 18:31:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A7IVRPO093623; Thu, 7 Nov 2024 18:31:27 GMT (envelope-from git) Date: Thu, 7 Nov 2024 18:31:27 GMT Message-Id: <202411071831.4A7IVRPO093623@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 1d99e8d9a37e - main - p9fs: Use UNLINKAT instead of REMOVE to implement removals List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1d99e8d9a37e1ba528628186df57b79fe74e196c Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=1d99e8d9a37e1ba528628186df57b79fe74e196c commit 1d99e8d9a37e1ba528628186df57b79fe74e196c Author: Mark Johnston AuthorDate: 2024-11-07 18:23:32 +0000 Commit: Mark Johnston CommitDate: 2024-11-07 18:23:32 +0000 p9fs: Use UNLINKAT instead of REMOVE to implement removals REMOVE doesn't work properly in the face of hard links. Use UNLINKAT instead, which is implemented by qemu and bhyve and lets the client specify the name being removed. PR: 282432 Reviewed by: dfr Differential Revision: https://reviews.freebsd.org/D47438 --- sys/fs/p9fs/p9_client.c | 21 +++++++++++++++++++++ sys/fs/p9fs/p9_client.h | 1 + sys/fs/p9fs/p9_protocol.h | 2 ++ sys/fs/p9fs/p9fs_vnops.c | 21 ++++++++++++++------- 4 files changed, 38 insertions(+), 7 deletions(-) diff --git a/sys/fs/p9fs/p9_client.c b/sys/fs/p9fs/p9_client.c index 45d24870306c..547de98c4c03 100644 --- a/sys/fs/p9fs/p9_client.c +++ b/sys/fs/p9fs/p9_client.c @@ -669,6 +669,27 @@ p9_client_remove(struct p9_fid *fid) return (error); } +int +p9_client_unlink(struct p9_fid *dfid, const char *name, int32_t flags) +{ + int error; + struct p9_client *clnt; + struct p9_req_t *req; + + error = 0; + clnt = dfid->clnt; + + req = p9_client_request(clnt, P9PROTO_TUNLINKAT, &error, "dsd", + dfid->fid, name, flags); + if (error != 0) { + P9_DEBUG(PROTO, "RUNLINKAT fid %d\n", dfid->fid); + return (error); + } + + p9_free_req(clnt, req); + return (error); +} + /* Inform the file server that the current file represented by fid is no longer * needed by the client. Any allocated fid on the server needs a clunk to be * destroyed. diff --git a/sys/fs/p9fs/p9_client.h b/sys/fs/p9fs/p9_client.h index 8597c0732ba3..79d402c174e8 100644 --- a/sys/fs/p9fs/p9_client.h +++ b/sys/fs/p9fs/p9_client.h @@ -140,6 +140,7 @@ int p9_client_write(struct p9_fid *fid, uint64_t offset, uint32_t count, char *d int p9_client_file_create(struct p9_fid *fid, char *name, uint32_t perm, int mode, char *extension); int p9_client_remove(struct p9_fid *fid); +int p9_client_unlink(struct p9_fid *dfid, const char *name, int32_t flags); int p9_dirent_read(struct p9_client *clnt, char *buf, int start, int len, struct p9_dirent *dirent); int p9_client_statfs(struct p9_fid *fid, struct p9_statfs *stat); diff --git a/sys/fs/p9fs/p9_protocol.h b/sys/fs/p9fs/p9_protocol.h index ddd8571adc8d..7ffd7dd67bcf 100644 --- a/sys/fs/p9fs/p9_protocol.h +++ b/sys/fs/p9fs/p9_protocol.h @@ -267,6 +267,8 @@ struct p9_iattr_dotl { #define P9PROTO_TGETATTR_BLK 512 +#define P9PROTO_UNLINKAT_REMOVEDIR 0x200 + /* PDU buffer used for SG lists. */ struct p9_buffer { uint32_t size; diff --git a/sys/fs/p9fs/p9fs_vnops.c b/sys/fs/p9fs/p9fs_vnops.c index 14951e96b59d..cfb50c704019 100644 --- a/sys/fs/p9fs/p9fs_vnops.c +++ b/sys/fs/p9fs/p9fs_vnops.c @@ -1497,7 +1497,8 @@ out: * After that, does a node metadata cleanup on client side. */ static int -remove_common(struct p9fs_node *np, struct ucred *cred) +remove_common(struct p9fs_node *dnp, struct p9fs_node *np, const char *name, + struct ucred *cred) { int error; struct p9fs_session *vses; @@ -1508,21 +1509,23 @@ remove_common(struct p9fs_node *np, struct ucred *cred) vses = np->p9fs_ses; vp = P9FS_NTOV(np); - vfid = p9fs_get_fid(vses->clnt, np, cred, VFID, -1, &error); + vfid = p9fs_get_fid(vses->clnt, dnp, cred, VFID, -1, &error); if (error != 0) return (error); - error = p9_client_remove(vfid); + error = p9_client_unlink(vfid, name, + np->v_node->v_type == VDIR ? P9PROTO_UNLINKAT_REMOVEDIR : 0); if (error != 0) return (error); /* Remove all non-open fids associated with the vp */ - p9fs_fid_remove_all(np, TRUE); + if (np->inode.i_links_count == 1) + p9fs_fid_remove_all(np, TRUE); /* Invalidate all entries of vnode from name cache and hash list. */ cache_purge(vp); - vfs_hash_remove(vp); + np->flags |= P9FS_NODE_DELETED; return (error); @@ -1537,8 +1540,10 @@ p9fs_remove(struct vop_remove_args *ap) struct vnode *dvp; struct p9fs_node *dnp; struct p9fs_inode *dinode; + struct componentname *cnp; int error; + cnp = ap->a_cnp; vp = ap->a_vp; np = P9FS_VTON(vp); dvp = ap->a_dvp; @@ -1550,7 +1555,7 @@ p9fs_remove(struct vop_remove_args *ap) if (vp->v_type == VDIR) return (EISDIR); - error = remove_common(np, ap->a_cnp->cn_cred); + error = remove_common(dnp, np, cnp->cn_nameptr, cnp->cn_cred); if (error == 0) P9FS_DECR_LINKS(dinode); @@ -1566,8 +1571,10 @@ p9fs_rmdir(struct vop_rmdir_args *ap) struct vnode *dvp; struct p9fs_node *dnp; struct p9fs_inode *dinode; + struct componentname *cnp; int error; + cnp = ap->a_cnp; vp = ap->a_vp; np = P9FS_VTON(vp); dvp = ap->a_dvp; @@ -1576,7 +1583,7 @@ p9fs_rmdir(struct vop_rmdir_args *ap) P9_DEBUG(VOPS, "%s: vp %p node %p \n", __func__, vp, np); - error = remove_common(np, ap->a_cnp->cn_cred); + error = remove_common(dnp, np, cnp->cn_nameptr, cnp->cn_cred); if (error == 0) P9FS_DECR_LINKS(dinode);