From nobody Fri Feb 11 13:58:04 2022 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 E6D8619B0703; Fri, 11 Feb 2022 13:58:05 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JwFZ54qLqz3sm9; Fri, 11 Feb 2022 13:58:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644587885; 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=kLGHCxI++bMKMmmxMfYKxqqHGTgDiSWdm0xGgXc7bzI=; b=LUMVC+PxIdiOI7dU7OR+PexZzbicLoZ6KTGFbt6YpBDucg3cHbqJrVAu8tOnWCjy6Vk8x0 nZimY2xDDoZgtWeGV6zjOOldi9JSvtJBDGAku3h9ESFFAN3bWTnwuUTs5/dkvPTMUqrMVJ v8DJahfgBLVFOnG6QoK56TPD6LXneJQTcKmo+SsYv8bfgquZjDSAScxfOGtf75wIb3kOv6 4crGZIihX1A+UUyH7tkirn087ZJp0iYw3kN2kCfSqaUF0mSVo/o5SCaun+sVc4fex5SsRy CS/Hi7w4zhQ9nPq/Dagquoo8yRf/hW6FMdgUXXu5uENpNZ8WRsWXp+anCmFpBg== 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 0607215430; Fri, 11 Feb 2022 13:58:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21BDw441093159; Fri, 11 Feb 2022 13:58:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21BDw4Yf093158; Fri, 11 Feb 2022 13:58:04 GMT (envelope-from git) Date: Fri, 11 Feb 2022 13:58:04 GMT Message-Id: <202202111358.21BDw4Yf093158@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: 45bb8beacc2f - main - fd: elide one acquire fence in fget_unlocked_seq 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 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 45bb8beacc2fadbbc32428df0f2f5683863df289 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644587885; 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=kLGHCxI++bMKMmmxMfYKxqqHGTgDiSWdm0xGgXc7bzI=; b=q6aIPoQCJdqsIXKcBek9Gs+/1w3DY9E5n26mO+9xP4dEFBFgaUCwSJkvafU2wU3vABwvrL OKWXbXsHTgdJBecxJKGCpSSyXZifZc/19K/xtqV4hyZNDbOMIhUgUItiJHN+kJbjs2SQHq BImt3ZXv2UgiL5W5/tPzahYPm4zp/JUYTWvH1+nNvshsz06ebFcB2nQiDlSzad7EtADL0X NZbqSWEL/p+LD6i3D7/6Ob3TGNRtbXukrR6xCAASW724qV0VWoMCo1TOYsZxjaF+5dgNHF va63PSTY1CFPM/wlgP1YYtA/kPBdsyF1tbD5i3SvBfIdTBa7HC1fQY2gx8nSOQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644587885; a=rsa-sha256; cv=none; b=QB0QPZpzFMDNhKwNG9L3CcTJxgvdxj90G34INVjQaCUSJrcS1EFArMSwL5mgjMgugecJ17 XfyT9F794+nXFFKpdX8xfgZDhBc5D79Do6J++WWj0pCAmM+ywZvczt5IRGI5U8ZqVBSCad yfUiCh+sfSbWo2aLRfCqqDyTPnl5b5KwNpGjU8qfCsrw3AGivaVZVbjHOJf0SuH2h5nK69 ZdT9xUHf08QWtxThYuAfmvQ/PVvTJZuLN/lDNeDRUtB2DLksf002SxTj34ka3j4nmHtoTM rzDeZ/Xf78O82j2+k9aKRKRzxzmuQ6aEXE+qPAxk7pXxr+U1jKC4l0OVaNYQjw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=45bb8beacc2fadbbc32428df0f2f5683863df289 commit 45bb8beacc2fadbbc32428df0f2f5683863df289 Author: Mateusz Guzik AuthorDate: 2022-02-01 16:58:12 +0000 Commit: Mateusz Guzik CommitDate: 2022-02-11 12:29:26 +0000 fd: elide one acquire fence in fget_unlocked_seq Still validate we got the stable state before returning an error though. --- sys/kern/kern_descrip.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index c4f435002907..e5ffdb01255f 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -3060,13 +3060,19 @@ fget_unlocked_seq(struct filedesc *fdp, int fd, cap_rights_t *needrightsp, fde = &fdt->fdt_ofiles[fd]; haverights = *cap_rights_fde_inline(fde); fp = fde->fde_file; - if (!seqc_consistent(fd_seqc(fdt, fd), seq)) + if (__predict_false(fp == NULL)) { + if (seqc_consistent(fd_seqc(fdt, fd), seq)) + return (EBADF); + fdt = atomic_load_ptr(&fdp->fd_files); continue; - if (__predict_false(fp == NULL)) - return (EBADF); + } error = cap_check_inline(&haverights, needrightsp); - if (__predict_false(error != 0)) - return (error); + if (__predict_false(error != 0)) { + if (seqc_consistent(fd_seqc(fdt, fd), seq)) + return (error); + fdt = atomic_load_ptr(&fdp->fd_files); + continue; + } if (__predict_false(!refcount_acquire_if_not_zero(&fp->f_count))) { fdt = atomic_load_ptr(&fdp->fd_files); continue;