From nobody Tue Feb 15 17:51:33 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 F094419CDF89; Tue, 15 Feb 2022 17:51:34 +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 4JypYf2Hw4z4XKS; Tue, 15 Feb 2022 17:51:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644947494; 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=GL0JHWsSIp1Oz/LJddMi0hv7vzr4DGBIyMBhn/0nWGE=; b=cgYDUBuVmTI3ujj2f7V6pFxQxWgyBSoZyRqwWabSYk/cXj/JYLpd8j/w0Xu93dsEQ78ihF +4E/OG8hAL+vTS2dkNu8Pz3zCMSmStDljI7rY6XQ3kKxJu31AcxB6WXzreGas/Ao1367Nv dEZtPW4NBLb4Lpphv7h5+m8A/JT2EFDnBPtSU3sGL8N5pAFqG0Ug/Uk6LA3U9vEH+zT0+D 4Zcju9zMehRP0h4uKWsEov/VGWjatKx5zmI/iOI+D39ZG/aZ/VvSRY+rFNizU0UNe3OWvr VI2sroRB4bEufTuy2rOlnyK46p1y4956io35Vy3wkO0qrR2qYDpqJOafKV0G/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 D29742695A; Tue, 15 Feb 2022 17:51:33 +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 21FHpXiu016222; Tue, 15 Feb 2022 17:51:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21FHpXM2016221; Tue, 15 Feb 2022 17:51:33 GMT (envelope-from git) Date: Tue, 15 Feb 2022 17:51:33 GMT Message-Id: <202202151751.21FHpXM2016221@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: e68a5225e818 - main - fd: add fde_copy 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: e68a5225e818380a0038bc9ab346fdb7913c0af9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644947494; 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=GL0JHWsSIp1Oz/LJddMi0hv7vzr4DGBIyMBhn/0nWGE=; b=vWJj48hw+fi/8OYBmzWAS83rsWlCKyNrES4ika8DF+NPboUgnHtACKKIIaScrLpPLRYxf+ DIfrL+t/ET+74jXXxdQeMgiJg/waoxF+YFVb3CJZgX0SRRSa7OfBOke9lcdYBqhB25B9yT CjzzNhL6VRwS65lk6QCh9Hn017HF3D/N5i0QdqvujIBCUEaLdD2D/1qYbk2stuOi2jnV8l 2EWD8mMNj2KrKqziiq4KJ+oLEPr5YallAZdmIAvZUYMif+GnwmI8rn3ATmN4hIxKSEEh8H NKcGUHs2dCvdfwB7qRyleizaROr+JE0A3Cf1oG65x6rxAF94Hpg+rj/uLCrgZA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644947494; a=rsa-sha256; cv=none; b=Zxv3g/Jg1e/xOVJDFDka35LvZ3nXdUJuZQfY74KhPg2a9NRBbTv+W5sFOub9QvLJryJunD DM8G5oaiVe/TJ4mWoNeQrkGlju+ykKyKrw8aj6G4dv2ava5EaX3IGxFyxuqFsl7BmWakax amas1T2My5cJ3VJL/wJVwz9COXP1hOYa6Ul6yWMLjadZbnhhSOZN4t9FXG79VhCHdLC0BE gpAZqqOnfm/JKFNvact9eEuFSOhDs0tLBqmLY2U+ZPk6KXAv1UCQopemMsqkKGzgE+/MzJ /B86oKL3g1kSXlikKiZHCkWh+m1SIOgQgaZbK/qBbuyIxbVPC/lBGj8T1M131g== 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=e68a5225e818380a0038bc9ab346fdb7913c0af9 commit e68a5225e818380a0038bc9ab346fdb7913c0af9 Author: Mateusz Guzik AuthorDate: 2022-02-14 15:43:19 +0000 Commit: Mateusz Guzik CommitDate: 2022-02-15 17:51:08 +0000 fd: add fde_copy To dedup handrolled memcpy. This will be used later to make fd code atomic-clean. --- sys/kern/kern_descrip.c | 6 +++--- sys/sys/filedesc.h | 12 +++++++++++- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index 57e0d9dee671..259be785f88d 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -1022,7 +1022,7 @@ kern_dup(struct thread *td, u_int mode, int flags, int old, int new) seqc_write_begin(&newfde->fde_seqc); #endif oioctls = filecaps_free_prep(&newfde->fde_caps); - memcpy(newfde, oldfde, fde_change_size); + fde_copy(oldfde, newfde); filecaps_copy_finish(&oldfde->fde_caps, &newfde->fde_caps, nioctls); if ((flags & FDDUP_FLAG_CLOEXEC) != 0) @@ -3628,7 +3628,7 @@ dupfdopen(struct thread *td, struct filedesc *fdp, int dfd, int mode, #ifdef CAPABILITIES seqc_write_begin(&newfde->fde_seqc); #endif - memcpy(newfde, oldfde, fde_change_size); + fde_copy(oldfde, newfde); filecaps_copy_finish(&oldfde->fde_caps, &newfde->fde_caps, ioctls); #ifdef CAPABILITIES @@ -3645,7 +3645,7 @@ dupfdopen(struct thread *td, struct filedesc *fdp, int dfd, int mode, seqc_write_begin(&oldfde->fde_seqc); seqc_write_begin(&newfde->fde_seqc); #endif - memcpy(newfde, oldfde, fde_change_size); + fde_copy(oldfde, newfde); oldfde->fde_file = NULL; fdunused(fdp, dfd); #ifdef CAPABILITIES diff --git a/sys/sys/filedesc.h b/sys/sys/filedesc.h index ed1f8989358e..24eb6eb2c061 100644 --- a/sys/sys/filedesc.h +++ b/sys/sys/filedesc.h @@ -66,7 +66,17 @@ struct filedescent { #define fde_fcntls fde_caps.fc_fcntls #define fde_ioctls fde_caps.fc_ioctls #define fde_nioctls fde_caps.fc_nioctls -#define fde_change_size (offsetof(struct filedescent, fde_seqc)) + +#ifdef _KERNEL +static inline void +fde_copy(struct filedescent *from, struct filedescent *to) +{ + + to->fde_file = from->fde_file; + to->fde_caps = from->fde_caps; + to->fde_flags = from->fde_flags; +} +#endif struct fdescenttbl { int fdt_nfiles; /* number of open files allocated */