From nobody Tue Feb 15 17:51:31 2022 X-Original-To: dev-commits-src-all@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 BB2EB19CDF00; Tue, 15 Feb 2022 17:51:31 +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 4JypYb4x3Wz4XC4; Tue, 15 Feb 2022 17:51:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644947491; 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=lIhqGOK+Wdfegw7/5C5FFvkzY1mAsiQBovl/kh252MM=; b=hkjlA/svgFq5+gUgokI5KmVkaKnnzXNTT/BjRnBo/L2lWCFm4al57CY0bTRf3JWoq+5dtd GzKOv93rl3IjrZWO6RmALCYHKEXImNSc4PMSS0FS9km6AMctzJT5WWRqHYVNgv1Uh+PQGj L0OIpi6aHQozgkFDaSaxHgYG03Ngi+fGNdjPcvoPIFU296ICdDAj+/KVseXq9GLd2PcTiF ALtOSygVTTQvO4fiVvqN59qFpT3WzykltVdrkK1SeSb6gXRlrt6qk8CbAx9PPQrVOFDJ2O yN1ggm3ymIC5fzP4llb6Lo8dpX2/gUe5EnBumZl9VayiGjMPCjUjpnOGe9Yn+Q== 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 80EE826BB0; Tue, 15 Feb 2022 17:51:31 +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 21FHpVYb016174; Tue, 15 Feb 2022 17:51:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21FHpVCm016173; Tue, 15 Feb 2022 17:51:31 GMT (envelope-from git) Date: Tue, 15 Feb 2022 17:51:31 GMT Message-Id: <202202151751.21FHpVCm016173@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: c9a995994b40 - main - seqc: rename seqc_consistent_nomb to seqc_consistent_no_fence List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: c9a995994b40966c44e4c7eeb5b3024c326e6b25 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644947491; 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=lIhqGOK+Wdfegw7/5C5FFvkzY1mAsiQBovl/kh252MM=; b=IuQtRoRGZ28nrBmr0W+oO/fxKsSo38ktot2JLU9REUyJvSZGw2XGP25MOCOkMI2als5qdM Aex2nhiR7RxnhB3MQaKz4SqltGTxx6zA97WowpX72Ul3OdmtH4QEI3vWDnEH7XZEYLm70T SJkJc7/DmEddqA1ADqT7aQdenNz5CulVBMUjYzy1lU12NWjPVonOH2PhvFK5gNP5sqoyiX ZC/TIB1CbPDEgt1q4a4UsJO1Up69P6CzW9owaYkTigNMJTP3wtvNs7xhVFRzc9AvX07PNG EttoWd980wOja+HUMT5R0Io8TzzYKlD1Fg+hk3lEy9XercSTkKq+iHsk5zjm1A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644947491; a=rsa-sha256; cv=none; b=HHc5hgyCuIUq/GJQQJYcz8thVaHeklXJGLUvzSHKjTQD/WbCgArV3g2kWphNhMx1dRvYTV Fs3H63O7ZeAHSqjoUis/9qSYILVm3CD9BrRSo6ZjU1kQz1Z8EWHqAzpDCKs8Z0hju8oRuW E+4lj9oGsa5TzGUkP7dvtTiTG6IxRJalLEB0wLwKPbdh+J+YSfEHF9q9tXygWdQ8z7voNg CsPOZaWxattQ8W9RxAdDGmrvx8FeOgk3Pf9zocpEQ4okKLgHSBTNUmOgUOfXRTdiYqsOAm 84XMkEMEQEudr1RWYJ/MrnX6wWSygvhDQXO5rbfCN7Zw+w+7a4/xutzWzpVbgA== 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=c9a995994b40966c44e4c7eeb5b3024c326e6b25 commit c9a995994b40966c44e4c7eeb5b3024c326e6b25 Author: Mateusz Guzik AuthorDate: 2022-02-14 18:50:37 +0000 Commit: Mateusz Guzik CommitDate: 2022-02-15 17:51:07 +0000 seqc: rename seqc_consistent_nomb to seqc_consistent_no_fence For more consistency with other primitives. --- sys/compat/linuxkpi/common/include/linux/seqlock.h | 2 +- sys/kern/kern_descrip.c | 6 +++--- sys/sys/seqc.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/seqlock.h b/sys/compat/linuxkpi/common/include/linux/seqlock.h index 03d36d89de89..6f0618d7ac9d 100644 --- a/sys/compat/linuxkpi/common/include/linux/seqlock.h +++ b/sys/compat/linuxkpi/common/include/linux/seqlock.h @@ -71,7 +71,7 @@ write_seqcount_end(struct seqcount *seqcount) * XXX: Are predicts from inline functions still not honored by clang? */ #define __read_seqcount_retry(seqcount, gen) \ - (!seqc_consistent_nomb(&(seqcount)->seqc, gen)) + (!seqc_consistent_no_fence(&(seqcount)->seqc, gen)) #define read_seqcount_retry(seqcount, gen) \ (!seqc_consistent(&(seqcount)->seqc, gen)) diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index fe67395a32fc..e7b3191bae30 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -2941,7 +2941,7 @@ fgetvp_lookup_smr(int fd, struct nameidata *ndp, struct vnode **vpp, bool *fsear */ atomic_thread_fence_acq(); fdt = fdp->fd_files; - if (__predict_false(!seqc_consistent_nomb(fd_seqc(fdt, fd), seq))) + if (__predict_false(!seqc_consistent_no_fence(fd_seqc(fdt, fd), seq))) return (EAGAIN); /* * If file descriptor doesn't have all rights, @@ -3058,7 +3058,7 @@ fget_unlocked_seq(struct thread *td, int fd, cap_rights_t *needrightsp, */ atomic_thread_fence_acq(); fdt = fdp->fd_files; - if (seqc_consistent_nomb(fd_seqc(fdt, fd), seq)) + if (seqc_consistent_no_fence(fd_seqc(fdt, fd), seq)) break; fdrop(fp, td); } @@ -3157,7 +3157,7 @@ fget_unlocked(struct thread *td, int fd, cap_rights_t *needrightsp, atomic_thread_fence_acq(); fdt = fdp->fd_files; #ifdef CAPABILITIES - if (__predict_false(!seqc_consistent_nomb(fd_seqc(fdt, fd), seq))) + if (__predict_false(!seqc_consistent_no_fence(fd_seqc(fdt, fd), seq))) #else if (__predict_false(fp != fdt->fdt_ofiles[fd].fde_file)) #endif diff --git a/sys/sys/seqc.h b/sys/sys/seqc.h index fd9f196aceca..c401ad28b47e 100644 --- a/sys/sys/seqc.h +++ b/sys/sys/seqc.h @@ -107,7 +107,7 @@ seqc_read(const seqc_t *seqcp) return (ret); } -#define seqc_consistent_nomb(seqcp, oldseqc) ({ \ +#define seqc_consistent_no_fence(seqcp, oldseqc)({ \ const seqc_t *__seqcp = (seqcp); \ seqc_t __oldseqc = (oldseqc); \ \ @@ -117,7 +117,7 @@ seqc_read(const seqc_t *seqcp) #define seqc_consistent(seqcp, oldseqc) ({ \ atomic_thread_fence_acq(); \ - seqc_consistent_nomb(seqcp, oldseqc); \ + seqc_consistent_no_fence(seqcp, oldseqc); \ }) /*