From nobody Tue May 02 21:08:23 2023 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 4Q9t3F5jxXz48B03; Tue, 2 May 2023 21:08:25 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: from mail-oo1-xc2f.google.com (mail-oo1-xc2f.google.com [IPv6:2607:f8b0:4864:20::c2f]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q9t3F1rpbz4MJy; Tue, 2 May 2023 21:08:25 +0000 (UTC) (envelope-from mjguzik@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20221208 header.b=rYEKU4Sc; spf=pass (mx1.freebsd.org: domain of mjguzik@gmail.com designates 2607:f8b0:4864:20::c2f as permitted sender) smtp.mailfrom=mjguzik@gmail.com; dmarc=pass (policy=none) header.from=gmail.com Received: by mail-oo1-xc2f.google.com with SMTP id 006d021491bc7-54c96cef24aso1276031eaf.1; Tue, 02 May 2023 14:08:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683061704; x=1685653704; h=cc:to:subject:message-id:date:from:references:in-reply-to :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=trTjSvSeLSB76/ik+DWUYGo7z6kAG/sOCNlB8rBHz+w=; b=rYEKU4Sc0jZjPr+FO1f7cKrgaZCrLDhoh7B13JBnKd6UpgUg9KA8xnopOrDd3z+6Am 19Pq4V7ZYPyXotJJLLgMqDlfC6LfwSu6LfNq7ztgoB/VzSZIR20t3+AL0Fiz3EJ5xyZW mSH7cKkTFKWiG3b2wavJkckTydUaXHbKTRi8y0aveNAO53HVjRrgr4+vdJEIhcBxeowz 11ZS0YAAS3i15OTTYKJ0Emp37jAKSYc1dd1mGpLc2JkX3mOGutgUhO6y2JbLNjHAfdNf zXfBdxe6lEC7N/pLj2Vc1HuHByxrxtdRyTcWpHfdJxAee4GkhMYV7hNNxNvQmB3E7MOE KfaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683061704; x=1685653704; h=cc:to:subject:message-id:date:from:references:in-reply-to :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=trTjSvSeLSB76/ik+DWUYGo7z6kAG/sOCNlB8rBHz+w=; b=G3/jlahACO/jgT20Vm//r3WqoD40GeWQweLDGW8oh10Lxb1T0xd7+Hwhd2CwJ2vVaX xRnmO3dvrz52bC7Q2jzugMxmh4qlM36aE4ges8tpBHFViGTnOzAeIfoQJfML/FYtSa5j OVUAiCJd9UOOM3ntyyyQmpW+PXqmEYGbANygh0+mWKltRDjCEAos+O584Mg73TkjGAJl XhHyFgdyLI1qSI7b+VupKlmW8pctuK8KNOGXAxutM5jzLg4oIH9kmUSgbaS0MDoavn0E skWxixTHCtP1a7b9YZMeye5xiEbwftcD94rJvgZmoqFxunVnJOyUg7Ky1NI6aoLU1w+B fOYg== X-Gm-Message-State: AC+VfDzAJSDq5a40dN8cl4E4qPOPFIkw5sOY10+dejfe3p/c5dKz6ghA uyd9IiI5UE+mgqKdk9PV8jNDD3RilXgqwPzQxjFU/M+U X-Google-Smtp-Source: ACHHUZ6/PoomMzr5WBRS+3U+Y2f+p0QCq7Dol9axmESQUY9Sy7yOxM3/Hn9i5yFwvn3gk0eK9UcLcNtRdU4t5xj2XC4= X-Received: by 2002:a05:6820:1995:b0:547:7c75:4b23 with SMTP id bp21-20020a056820199500b005477c754b23mr8429902oob.4.1683061704220; Tue, 02 May 2023 14:08:24 -0700 (PDT) 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Received: by 2002:ac9:799a:0:b0:4d4:94b:7266 with HTTP; Tue, 2 May 2023 14:08:23 -0700 (PDT) In-Reply-To: References: <202305021512.342FCpbN056202@gitrepo.freebsd.org> From: Mateusz Guzik Date: Tue, 2 May 2023 23:08:23 +0200 Message-ID: Subject: Re: git: a1d71cebc05c - main - fstatat(2): restore AT_EMPTY_PATH handling To: Dmitry Chagin Cc: Mark Johnston , Konstantin Belousov , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Spamd-Result: default: False [-3.91 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.91)[-0.908]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20221208]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36]; MIME_GOOD(-0.10)[text/plain]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::c2f:from]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ARC_NA(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; MID_RHS_MATCH_FROMTLD(0.00)[]; TO_DN_SOME(0.00)[]; FROM_HAS_DN(0.00)[]; DKIM_TRACE(0.00)[gmail.com:+]; FREEMAIL_FROM(0.00)[gmail.com]; RCPT_COUNT_FIVE(0.00)[6]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_TLS_LAST(0.00)[]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim] X-Rspamd-Queue-Id: 4Q9t3F1rpbz4MJy X-Spamd-Bar: --- X-ThisMailContainsUnwantedMimeParts: N On 5/2/23, Mateusz Guzik wrote: > right, this should do it > > diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c > index e4977392349f..b583eed5e249 100644 > --- a/sys/kern/vfs_cache.c > +++ b/sys/kern/vfs_cache.c > @@ -4435,6 +4435,7 @@ cache_fplookup_dirfd(struct cache_fpl *fpl, > struct vnode **vpp) > if ((*vpp)->v_type != VDIR) { > if (!((cnp->cn_flags & EMPTYPATH) != 0 && > cnp->cn_pnbuf[0] == '\0')) { > cache_fpl_smr_exit(fpl); > + ndp->ni_resflags |= NIRES_EMPTYPATH; > return (cache_fpl_handled_error(fpl, ENOTDIR)); > } > } > on another look it already works fine as is, I miseed the ! in the condition ;) #include #include int main(void) { struct stat sb; int fd; fd = open("/etc/fstab", O_RDONLY); fstatat(fd, "", &sb, AT_EMPTY_PATH); } openat(AT_FDCWD,"/etc/fstab",O_RDONLY,00) = 3 (0x3) fstatat(3,"",{ mode=-rw-r--r-- ,inode=370100,size=145,blksize=4096 },AT_EMPTY_PATH) = 0 (0x0) dtrace -n 'vfs:fplookup:: /execname == "a.out"/ { @[stack(), arg1, arg2] = count(); }' [snip] kernel`kern_statat+0xec kernel`sys_fstatat+0x27 kernel`amd64_syscall+0x109 kernel`0xffffffff809726bb 4980 3 1 as in handled in cache_fplookup_emptypath > > On 5/2/23, Dmitry Chagin wrote: >> On Tue, May 02, 2023 at 03:04:37PM -0400, Mark Johnston wrote: >>> On Tue, May 02, 2023 at 08:00:01PM +0300, Dmitry Chagin wrote: >>> > On Tue, May 02, 2023 at 03:12:51PM +0000, Konstantin Belousov wrote: >>> > > The branch main has been updated by kib: >>> > > >>> > > URL: >>> > > https://cgit.FreeBSD.org/src/commit/?id=a1d71cebc05ccfeedf95f2db3e94b17270167888 >>> > > >>> > > commit a1d71cebc05ccfeedf95f2db3e94b17270167888 >>> > > Author: Konstantin Belousov >>> > > AuthorDate: 2023-05-02 15:11:39 +0000 >>> > > Commit: Konstantin Belousov >>> > > CommitDate: 2023-05-02 15:11:39 +0000 >>> > > >>> > > fstatat(2): restore AT_EMPTY_PATH handling >>> > > >>> > > Fixes: cb858340dcbf214cc4c4d78dbb741620d7b3a252 >>> > > Reported by: markj >>> > > Sponsored by: The FreeBSD Foundation >>> > > --- >>> > > sys/kern/vfs_syscalls.c | 6 +++++- >>> > > 1 file changed, 5 insertions(+), 1 deletion(-) >>> > > >>> > > diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c >>> > > index 5c0a291e3b0b..d68af4ea4d51 100644 >>> > > --- a/sys/kern/vfs_syscalls.c >>> > > +++ b/sys/kern/vfs_syscalls.c >>> > > @@ -2438,8 +2438,12 @@ kern_statat(struct thread *td, int flag, int >>> > > fd, const char *path, >>> > > AT_SYMLINK_NOFOLLOW | AT_EMPTY_PATH) | LOCKSHARED | LOCKLEAF | >>> > > AUDITVNODE1, pathseg, path, fd, &cap_fstat_rights); >>> > > >>> > > - if ((error = namei(&nd)) != 0) >>> > > + if ((error = namei(&nd)) != 0) { >>> > > + if (error == ENOTDIR && >>> > > + (nd.ni_resflags & NIRES_EMPTYPATH) != 0) >>> > > + error = kern_fstat(td, fd, sbp); >>> > > return (error); >>> > > + } >>> > >>> > cache_fplookup_dirfd() doesnt set the NIRES_EMPTYPATH flag >>> >>> It doesn't, but for an AT_EMPTY_PATH lookup it aborts the lookup and >>> returns ENOTDIR to namei(), which sets NIRES_EMPTYPATH before passing >>> the error up. >>> >> >> it call cache_fpl_handled_error() which is set status to >> CACHE_FPL_STATUS_HADLED, namei() simply return error in that path >> >> >>> > > error = VOP_STAT(nd.ni_vp, sbp, td->td_ucred, NOCRED); >>> > > NDFREE_PNBUF(&nd); >>> > > vput(nd.ni_vp); >>> > >> > > > -- > Mateusz Guzik > -- Mateusz Guzik