From nobody Sun Feb 11 01:52:49 2024 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 4TXVwL086wz596dh; Sun, 11 Feb 2024 01:52:50 +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 4TXVwK67D4z45lD; Sun, 11 Feb 2024 01:52:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707616369; 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=wdEy2byabuWr4/mrCrGvo5IPjX2uXTyMk2HsxgyMLaU=; b=noAdT4cSrRsl/Gja+GN9pJFVbGrN3c+QuVnKli2w6daV0rI8BEwv7dKnHoe8+i8uvJbud+ FjdygpQ56sNwOzFYsa+80DgxH15+cqCCPA33WNMcd0ZAfTj4Gigt/OOzjlAOHZHTfG9FBU AQfHysvN7NxoYUXIliqMeOmVcayyXsxKVEJuBNA7fxpBXylXVUE3k2M0S5CFdT9uHLGYo8 sY8pI7r4eZrLxwPg82/ms5MefypLU9cfQQELCLkn9dUvPrx87dgSNvE+AJEHUVZFphWpMi tpsN4bTStHkHd06Y1T7+NrzWIkgzUoyHarnnnZ5LaAYuI2jz5oYfFwDEaiYsqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707616369; a=rsa-sha256; cv=none; b=rCtbC+EFoww4fIX8NnufH0sug4AhPZiXQ7zjFJaPc/jEnKBSZez2eKyCkbdWnrJNqDH4Du fBlFELexBJIYl5O/EuQJDZOW5277ra5UiuPDVADWEsXgwJd9Odk8IFxIWzfEWv5r6spWDt PdsPzpgtrvN9O6tXooG6yXM9/xGjknEtAhPfnOyGbFUElNwr3HbgTl4ieu1uBoTHGqB9pp WTahLZMwTht2sa1J3WxNP4447Y5Y6D/RAmonLpg/F8+EraW04yuj+Sy1lGpxQ5g+zkLXj+ EUnCzZ3vniLrLAHr7LI5ucmwt47liAbTclxw7MyNrMVQFEQt4GPkh84oGuw/GQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707616369; 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=wdEy2byabuWr4/mrCrGvo5IPjX2uXTyMk2HsxgyMLaU=; b=vM6G2wBAfnLavCJwAKWNe5d8SHFn1lvDrQyX2DRnkKQgYpf+HzWA8QpF8Pey1DPyxGkH8S iC//sSPHdVUf8SvvtnF4oqylMTylE8og8GGY37DXDQ8uEPYnPlxX1K5iku4GEt8K8D2Zgv FLTCUPfJsmMOas4aFsJCbGPCMRlleFogGOD1kkb3g35DgJ9uS5YrG9fWMXqu7QNQ5UISZv 7HB674gBGAX06vs5DpmSNnL63kOnjvdvkwttW+boPuDajPkeO20dlRoFyxZT9NsmtRx5JP A8OepFSxWs1kPAr2hEA8x/nq7EYY8hmPRHXHu0bpWgM2G4qmAEkDz5fkN51eaA== 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 4TXVwK5Dcbzgxv; Sun, 11 Feb 2024 01:52:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41B1qn4A089519; Sun, 11 Feb 2024 01:52:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41B1qnLF089516; Sun, 11 Feb 2024 01:52:49 GMT (envelope-from git) Date: Sun, 11 Feb 2024 01:52:49 GMT Message-Id: <202402110152.41B1qnLF089516@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 7d2b98e645ce - stable/13 - kcmp(2): implement for generic file types 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 7d2b98e645ce9454b84f7d1d193d98d0880c4627 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=7d2b98e645ce9454b84f7d1d193d98d0880c4627 commit 7d2b98e645ce9454b84f7d1d193d98d0880c4627 Author: Konstantin Belousov AuthorDate: 2024-01-19 21:44:37 +0000 Commit: Konstantin Belousov CommitDate: 2024-02-11 01:40:29 +0000 kcmp(2): implement for generic file types (cherry picked from commit f28526e9466cd60ed33053e922238ba1c9040341) --- sys/kern/kern_event.c | 1 + sys/kern/sys_eventfd.c | 1 + sys/kern/sys_generic.c | 8 ++++++++ sys/kern/sys_pipe.c | 1 + sys/kern/sys_socket.c | 1 + sys/kern/tty_pts.c | 1 + sys/kern/uipc_mqueue.c | 1 + sys/kern/uipc_sem.c | 1 + sys/kern/uipc_shm.c | 1 + sys/sys/file.h | 1 + 10 files changed, 17 insertions(+) diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index 0bf84389a6ee..3fb576648fee 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -140,6 +140,7 @@ static struct fileops kqueueops = { .fo_chmod = invfo_chmod, .fo_chown = invfo_chown, .fo_sendfile = invfo_sendfile, + .fo_cmp = file_kcmp_generic, .fo_fill_kinfo = kqueue_fill_kinfo, }; diff --git a/sys/kern/sys_eventfd.c b/sys/kern/sys_eventfd.c index 3a5f1dca6df9..47d422f1fc90 100644 --- a/sys/kern/sys_eventfd.c +++ b/sys/kern/sys_eventfd.c @@ -77,6 +77,7 @@ static struct fileops eventfdops = { .fo_chown = invfo_chown, .fo_sendfile = invfo_sendfile, .fo_fill_kinfo = eventfd_fill_kinfo, + .fo_cmp = file_kcmp_generic, .fo_flags = DFLAG_PASSABLE }; diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c index cbb17026894b..32f137f0cb4c 100644 --- a/sys/kern/sys_generic.c +++ b/sys/kern/sys_generic.c @@ -2090,3 +2090,11 @@ sys_kcmp(struct thread *td, struct kcmp_args *uap) return (kern_kcmp(td, uap->pid1, uap->pid2, uap->type, uap->idx1, uap->idx2)); } + +int +file_kcmp_generic(struct file *fp1, struct file *fp2, struct thread *td) +{ + if (fp1->f_type != fp2->f_type) + return (3); + return (kcmp_cmp((uintptr_t)fp1->f_data, (uintptr_t)fp2->f_data)); +} diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c index edd9ce9534d3..19f5f07d7523 100644 --- a/sys/kern/sys_pipe.c +++ b/sys/kern/sys_pipe.c @@ -168,6 +168,7 @@ struct fileops pipeops = { .fo_chown = pipe_chown, .fo_sendfile = invfo_sendfile, .fo_fill_kinfo = pipe_fill_kinfo, + .fo_cmp = file_kcmp_generic, .fo_flags = DFLAG_PASSABLE }; diff --git a/sys/kern/sys_socket.c b/sys/kern/sys_socket.c index c54a729fa12c..cf65edb9ef0a 100644 --- a/sys/kern/sys_socket.c +++ b/sys/kern/sys_socket.c @@ -112,6 +112,7 @@ struct fileops socketops = { .fo_sendfile = invfo_sendfile, .fo_fill_kinfo = soo_fill_kinfo, .fo_aio_queue = soo_aio_queue, + .fo_cmp = file_kcmp_generic, .fo_flags = DFLAG_PASSABLE }; diff --git a/sys/kern/tty_pts.c b/sys/kern/tty_pts.c index 1351560ba05a..3a6a71dfd7e8 100644 --- a/sys/kern/tty_pts.c +++ b/sys/kern/tty_pts.c @@ -611,6 +611,7 @@ static struct fileops ptsdev_ops = { .fo_chown = invfo_chown, .fo_sendfile = invfo_sendfile, .fo_fill_kinfo = ptsdev_fill_kinfo, + .fo_cmp = file_kcmp_generic, .fo_flags = DFLAG_PASSABLE, }; diff --git a/sys/kern/uipc_mqueue.c b/sys/kern/uipc_mqueue.c index 0d0758011731..2038de9324fc 100644 --- a/sys/kern/uipc_mqueue.c +++ b/sys/kern/uipc_mqueue.c @@ -2667,6 +2667,7 @@ static struct fileops mqueueops = { .fo_chown = mqf_chown, .fo_sendfile = invfo_sendfile, .fo_fill_kinfo = mqf_fill_kinfo, + .fo_cmp = file_kcmp_generic, .fo_flags = DFLAG_PASSABLE, }; diff --git a/sys/kern/uipc_sem.c b/sys/kern/uipc_sem.c index ad0f3e1f1d00..7cb25749ad9c 100644 --- a/sys/kern/uipc_sem.c +++ b/sys/kern/uipc_sem.c @@ -153,6 +153,7 @@ static struct fileops ksem_ops = { .fo_chown = ksem_chown, .fo_sendfile = invfo_sendfile, .fo_fill_kinfo = ksem_fill_kinfo, + .fo_cmp = file_kcmp_generic, .fo_flags = DFLAG_PASSABLE }; diff --git a/sys/kern/uipc_shm.c b/sys/kern/uipc_shm.c index def8c35025c1..1df3a0967b09 100644 --- a/sys/kern/uipc_shm.c +++ b/sys/kern/uipc_shm.c @@ -165,6 +165,7 @@ struct fileops shm_ops = { .fo_get_seals = shm_get_seals, .fo_add_seals = shm_add_seals, .fo_fallocate = shm_fallocate, + .fo_cmp = file_kcmp_generic, .fo_flags = DFLAG_PASSABLE | DFLAG_SEEKABLE, }; diff --git a/sys/sys/file.h b/sys/sys/file.h index 4b291459395f..9ae31974745a 100644 --- a/sys/sys/file.h +++ b/sys/sys/file.h @@ -277,6 +277,7 @@ fo_seek_t vn_seek; fo_fill_kinfo_t vn_fill_kinfo; fo_kqfilter_t vn_kqfilter_opath; int vn_fill_kinfo_vnode(struct vnode *vp, struct kinfo_file *kif); +int file_kcmp_generic(struct file *fp1, struct file *fp2, struct thread *td); void finit(struct file *, u_int, short, void *, struct fileops *); void finit_vnode(struct file *, u_int, void *, struct fileops *);