From owner-svn-src-stable-12@freebsd.org Fri Apr 3 16:29:00 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id BF2B32602D1; Fri, 3 Apr 2020 16:29:00 +0000 (UTC) (envelope-from markj@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48v53b1tSwz4CG1; Fri, 3 Apr 2020 16:28:58 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 428287A5F; Fri, 3 Apr 2020 16:28:41 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 033GSext090883; Fri, 3 Apr 2020 16:28:40 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 033GSdsY090878; Fri, 3 Apr 2020 16:28:39 GMT (envelope-from markj@FreeBSD.org) Message-Id: <202004031628.033GSdsY090878@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Fri, 3 Apr 2020 16:28:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r359604 - in stable/12/sys: amd64/linux amd64/linux32 arm64/linux compat/linux i386/linux X-SVN-Group: stable-12 X-SVN-Commit-Author: markj X-SVN-Commit-Paths: in stable/12/sys: amd64/linux amd64/linux32 arm64/linux compat/linux i386/linux X-SVN-Commit-Revision: 359604 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Apr 2020 16:29:00 -0000 Author: markj Date: Fri Apr 3 16:28:39 2020 New Revision: 359604 URL: https://svnweb.freebsd.org/changeset/base/359604 Log: MFC r355754, r355807 (trasz): Add sync_file_range(2) implementation to linux(4). Modified: stable/12/sys/amd64/linux/linux_dummy.c stable/12/sys/amd64/linux32/linux32_dummy.c stable/12/sys/arm64/linux/linux_dummy.c stable/12/sys/compat/linux/linux_file.c stable/12/sys/compat/linux/linux_file.h stable/12/sys/i386/linux/linux_dummy.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/amd64/linux/linux_dummy.c ============================================================================== --- stable/12/sys/amd64/linux/linux_dummy.c Fri Apr 3 16:19:07 2020 (r359603) +++ stable/12/sys/amd64/linux/linux_dummy.c Fri Apr 3 16:28:39 2020 (r359604) @@ -100,7 +100,6 @@ DUMMY(unshare); /* Linux 2.6.17: */ DUMMY(splice); DUMMY(tee); -DUMMY(sync_file_range); DUMMY(vmsplice); /* Linux 2.6.18: */ DUMMY(move_pages); Modified: stable/12/sys/amd64/linux32/linux32_dummy.c ============================================================================== --- stable/12/sys/amd64/linux32/linux32_dummy.c Fri Apr 3 16:19:07 2020 (r359603) +++ stable/12/sys/amd64/linux32/linux32_dummy.c Fri Apr 3 16:28:39 2020 (r359604) @@ -105,7 +105,6 @@ DUMMY(migrate_pages); DUMMY(unshare); /* Linux 2.6.17: */ DUMMY(splice); -DUMMY(sync_file_range); DUMMY(tee); DUMMY(vmsplice); /* Linux 2.6.18: */ Modified: stable/12/sys/arm64/linux/linux_dummy.c ============================================================================== --- stable/12/sys/arm64/linux/linux_dummy.c Fri Apr 3 16:19:07 2020 (r359603) +++ stable/12/sys/arm64/linux/linux_dummy.c Fri Apr 3 16:28:39 2020 (r359604) @@ -102,7 +102,6 @@ DUMMY(unshare); /* Linux 2.6.17: */ DUMMY(splice); DUMMY(tee); -DUMMY(sync_file_range); DUMMY(vmsplice); /* Linux 2.6.18: */ DUMMY(move_pages); Modified: stable/12/sys/compat/linux/linux_file.c ============================================================================== --- stable/12/sys/compat/linux/linux_file.c Fri Apr 3 16:19:07 2020 (r359603) +++ stable/12/sys/compat/linux/linux_file.c Fri Apr 3 16:28:39 2020 (r359604) @@ -997,10 +997,22 @@ linux_linkat(struct thread *td, struct linux_linkat_ar } int -linux_fdatasync(td, uap) - struct thread *td; - struct linux_fdatasync_args *uap; +linux_fdatasync(struct thread *td, struct linux_fdatasync_args *uap) { + + return (kern_fsync(td, uap->fd, false)); +} + +int +linux_sync_file_range(struct thread *td, struct linux_sync_file_range_args *uap) +{ + + if (uap->offset < 0 || uap->nbytes < 0 || + (uap->flags & ~(LINUX_SYNC_FILE_RANGE_WAIT_BEFORE | + LINUX_SYNC_FILE_RANGE_WRITE | + LINUX_SYNC_FILE_RANGE_WAIT_AFTER)) != 0) { + return (EINVAL); + } return (kern_fsync(td, uap->fd, false)); } Modified: stable/12/sys/compat/linux/linux_file.h ============================================================================== --- stable/12/sys/compat/linux/linux_file.h Fri Apr 3 16:19:07 2020 (r359603) +++ stable/12/sys/compat/linux/linux_file.h Fri Apr 3 16:28:39 2020 (r359604) @@ -127,4 +127,11 @@ #define LINUX_F_UNLCK 2 #endif +/* + * sync_file_range flags + */ +#define LINUX_SYNC_FILE_RANGE_WAIT_BEFORE 1 +#define LINUX_SYNC_FILE_RANGE_WRITE 2 +#define LINUX_SYNC_FILE_RANGE_WAIT_AFTER 4 + #endif /* !_LINUX_FILE_H_ */ Modified: stable/12/sys/i386/linux/linux_dummy.c ============================================================================== --- stable/12/sys/i386/linux/linux_dummy.c Fri Apr 3 16:19:07 2020 (r359603) +++ stable/12/sys/i386/linux/linux_dummy.c Fri Apr 3 16:28:39 2020 (r359604) @@ -101,7 +101,6 @@ DUMMY(migrate_pages); DUMMY(unshare); /* Linux 2.6.17: */ DUMMY(splice); -DUMMY(sync_file_range); DUMMY(tee); DUMMY(vmsplice); /* Linux 2.6.18: */