From owner-svn-src-all@freebsd.org Thu Jul 25 16:46:11 2019 Return-Path: Delivered-To: svn-src-all@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 5F2D1A8C88 for ; Thu, 25 Jul 2019 16:46:11 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: from mail-qk1-x743.google.com (mail-qk1-x743.google.com [IPv6:2607:f8b0:4864:20::743]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C20C98A790 for ; Thu, 25 Jul 2019 16:46:09 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: by mail-qk1-x743.google.com with SMTP id d79so36890446qke.11 for ; Thu, 25 Jul 2019 09:46:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hardenedbsd.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=ajC4ZEUau6mzxRhmOThp55SkQuBmuQLo7sBOHljipXU=; b=Xhw4eRV8C9P6pPN1zJ86xXOcYgJiOKOJYuZ+UNWvHGq+b2S2segbWxB6o90lRKNRqu M19V/COehbKPnwdYqemEXcQ7RQdji3bLlx7U5dF0Op3XwNtas3+Jt2nMorCzOCr1yYPf 8SGaIZk3dc4VO9v1AdPZHg8D8vX8j3DSuQ/6tHwV3C+yVEYTxxL0bzM7RIBtgVAfcBA+ Ab5WBLGJjiSdKbaa87+KKKJXg4BlTAU6qcJGgPXjgPrmvuD5mTW89SPqpWrzye7D27be dUuJaWBigoUDYRD+0nHaHl6Zk1gqV5OSkMM/vYDAtvcCIM0JJY7kylZ+n30WhNkx9kcH FSdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=ajC4ZEUau6mzxRhmOThp55SkQuBmuQLo7sBOHljipXU=; b=nxZQAeaIFZFRmAFUXMAZQkulm6fvCbUTp6R+8BxnnYF7W66jmcDFQ2iWYRefe0AQ5y eVtZ8tSIEDUpYw29PdJE7leBA01pTuF08HMGFgpXsvIPdfphsG+WRCeoKZef7T+4O2i3 JRtpd8WFOrOVG2W/KQqtPZPxTJyGMIYSn5eeQsmMwilFa2LY/+Aw0ZtoUtvJ9qhGmJZC vmpHOyRihP85v4p6ulrT+XKf/9WVrPQ2g1YoYzCopDA7cbc5zgX9a0u3BEkXXHsntWRp tIxoUMBuhzfiluiDNYf8Ab54nwU8qqv3gcCf5Wrbicdy7T+Plnu2eYLYikgYbecV8Hck LZ8A== X-Gm-Message-State: APjAAAVy+onqkectKU8FBwvwZUHVlywja3y7FedPhUisNz3inMUP7dnU XByGKq0waNLZtqGI4KT+vkOggyWgOSbEmQ== X-Google-Smtp-Source: APXvYqxqkS18jS4Y2TYZX01ensDVWydseZ1qs7ffRUFuj4jXYJYPMcMjerttQ1WXaigk4VzNPQudfQ== X-Received: by 2002:a37:6085:: with SMTP id u127mr60446865qkb.25.1564073168818; Thu, 25 Jul 2019 09:46:08 -0700 (PDT) Received: from mutt-hbsd ([63.88.83.108]) by smtp.gmail.com with ESMTPSA id h19sm19121535qto.3.2019.07.25.09.46.07 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 25 Jul 2019 09:46:08 -0700 (PDT) Date: Thu, 25 Jul 2019 12:46:07 -0400 From: Shawn Webb To: Rick Macklem Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r350315 - in head/sys: kern sys Message-ID: <20190725164607.zpa7w2pgrnahaxz4@mutt-hbsd> References: <201907250546.x6P5kHWq076756@repo.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="veokz6vwuek33re7" Content-Disposition: inline In-Reply-To: <201907250546.x6P5kHWq076756@repo.freebsd.org> X-Operating-System: FreeBSD mutt-hbsd 13.0-CURRENT-HBSD FreeBSD 13.0-CURRENT-HBSD X-PGP-Key: http://pgp.mit.edu/pks/lookup?op=vindex&search=0xFF2E67A277F8E1FA User-Agent: NeoMutt/20180716 X-Rspamd-Queue-Id: C20C98A790 X-Spamd-Bar: ----- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=hardenedbsd.org header.s=google header.b=Xhw4eRV8; spf=pass (mx1.freebsd.org: domain of shawn.webb@hardenedbsd.org designates 2607:f8b0:4864:20::743 as permitted sender) smtp.mailfrom=shawn.webb@hardenedbsd.org X-Spamd-Result: default: False [-5.58 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[hardenedbsd.org:+]; MX_GOOD(-0.01)[alt1.aspmx.l.google.com,aspmx.l.google.com,aspmx2.googlemail.com,alt2.aspmx.l.google.com,aspmx3.googlemail.com]; NEURAL_HAM_SHORT(-0.88)[-0.881,0]; SIGNED_PGP(-2.00)[]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+,1:+]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; IP_SCORE(-0.59)[ip: (2.64), ipnet: 2607:f8b0::/32(-3.08), asn: 15169(-2.43), country: US(-0.05)]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; R_DKIM_ALLOW(-0.20)[hardenedbsd.org:s=google]; URIBL_BLOCKED(0.00)[hardenedbsd.org.multi.uribl.com]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.20)[multipart/signed,text/plain]; PREVIOUSLY_DELIVERED(0.00)[svn-src-all@freebsd.org]; DMARC_NA(0.00)[hardenedbsd.org]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[3.4.7.0.0.0.0.0.0.0.0.0.0.0.0.0.0.2.0.0.4.6.8.4.0.b.8.f.7.0.6.2.list.dnswl.org : 127.0.5.0]; MID_RHS_NOT_FQDN(0.50)[] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jul 2019 16:46:11 -0000 --veokz6vwuek33re7 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hey Rick, On Thu, Jul 25, 2019 at 05:46:17AM +0000, Rick Macklem wrote: > Author: rmacklem > Date: Thu Jul 25 05:46:16 2019 > New Revision: 350315 > URL: https://svnweb.freebsd.org/changeset/base/350315 >=20 > Log: > Add kernel support for a Linux compatible copy_file_range(2) syscall. > =20 > This patch adds support to the kernel for a Linux compatible > copy_file_range(2) syscall and the related VOP_COPY_FILE_RANGE(9). > This syscall/VOP can be used by the NFSv4.2 client to implement the > Copy operation against an NFSv4.2 server to do file copies locally on > the server. > The vn_generic_copy_file_range() function in this patch can be used > by the NFSv4.2 server to implement the Copy operation. > Fuse may also me able to use the VOP_COPY_FILE_RANGE() method. > =20 > vn_generic_copy_file_range() attempts to maintain holes in the output > file in the range to be copied, but may fail to do so if the input and > output files are on different file systems with different _PC_MIN_HOLE_= SIZE > values. > =20 > Separate commits will be done for the generated syscall files and userl= and > changes. A commit for a compat32 syscall will be done later. > =20 > Reviewed by: kib, asomers (plus comments by brooks, jilles) > Relnotes: yes > Differential Revision: https://reviews.freebsd.org/D20584 >=20 > Modified: > head/sys/kern/syscalls.master > head/sys/kern/vfs_default.c > head/sys/kern/vfs_syscalls.c > head/sys/kern/vfs_vnops.c > head/sys/kern/vnode_if.src > head/sys/sys/syscallsubr.h > head/sys/sys/vnode.h >=20 > Modified: head/sys/kern/syscalls.master > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/kern/syscalls.master Thu Jul 25 03:55:05 2019 (r350314) > +++ head/sys/kern/syscalls.master Thu Jul 25 05:46:16 2019 (r350315) > @@ -3175,6 +3175,16 @@ > int flag > ); > } > +569 AUE_NULL STD { > + ssize_t copy_file_range( > + int infd, > + _Inout_opt_ off_t *inoffp, > + int outfd, > + _Inout_opt_ off_t *outoffp, > + size_t len, > + unsigned int flags > + ); > + } > =20 > ; Please copy any additions and changes to the following compatability t= ables: > ; sys/compat/freebsd32/syscalls.master >=20 > Modified: head/sys/kern/vfs_default.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/kern/vfs_default.c Thu Jul 25 03:55:05 2019 (r350314) > +++ head/sys/kern/vfs_default.c Thu Jul 25 05:46:16 2019 (r350315) > @@ -83,6 +83,7 @@ static int dirent_exists(struct vnode *vp, const char= =20 > static int vop_stdis_text(struct vop_is_text_args *ap); > static int vop_stdunset_text(struct vop_unset_text_args *ap); > static int vop_stdadd_writecount(struct vop_add_writecount_args *ap); > +static int vop_stdcopy_file_range(struct vop_copy_file_range_args *ap); > static int vop_stdfdatasync(struct vop_fdatasync_args *ap); > static int vop_stdgetpages_async(struct vop_getpages_async_args *ap); > =20 > @@ -140,6 +141,7 @@ struct vop_vector default_vnodeops =3D { > .vop_set_text =3D vop_stdset_text, > .vop_unset_text =3D vop_stdunset_text, > .vop_add_writecount =3D vop_stdadd_writecount, > + .vop_copy_file_range =3D vop_stdcopy_file_range, > }; > =20 > /* > @@ -1210,6 +1212,17 @@ vfs_stdnosync (mp, waitfor) > { > =20 > return (0); > +} > + > +static int > +vop_stdcopy_file_range(struct vop_copy_file_range_args *ap) > +{ > + int error; > + > + error =3D vn_generic_copy_file_range(ap->a_invp, ap->a_inoffp, > + ap->a_outvp, ap->a_outoffp, ap->a_lenp, ap->a_flags, ap->a_incred, > + ap->a_outcred, ap->a_fsizetd); > + return (error); > } > =20 > int >=20 > Modified: head/sys/kern/vfs_syscalls.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/kern/vfs_syscalls.c Thu Jul 25 03:55:05 2019 (r350314) > +++ head/sys/kern/vfs_syscalls.c Thu Jul 25 05:46:16 2019 (r350315) > @@ -4814,3 +4814,122 @@ sys_posix_fadvise(struct thread *td, struct posix= _fadv > uap->advice); > return (kern_posix_error(td, error)); > } > + > +int > +kern_copy_file_range(struct thread *td, int infd, off_t *inoffp, int out= fd, > + off_t *outoffp, size_t len, unsigned int flags) > +{ > + struct file *infp, *outfp; > + struct vnode *invp, *outvp; > + int error; > + size_t retlen; > + void *rl_rcookie, *rl_wcookie; > + off_t savinoff, savoutoff; > + > + infp =3D outfp =3D NULL; > + rl_rcookie =3D rl_wcookie =3D NULL; > + savinoff =3D -1; > + error =3D 0; > + retlen =3D 0; > + > + if (flags !=3D 0) { > + error =3D EINVAL; > + goto out; > + } > + if (len > SSIZE_MAX) > + /* > + * Although the len argument is size_t, the return argument > + * is ssize_t (which is signed). Therefore a size that won't > + * fit in ssize_t can't be returned. > + */ > + len =3D SSIZE_MAX; > + > + /* Get the file structures for the file descriptors. */ > + error =3D fget_read(td, infd, &cap_read_rights, &infp); > + if (error !=3D 0) > + goto out; > + error =3D fget_write(td, outfd, &cap_write_rights, &outfp); > + if (error !=3D 0) > + goto out; > + > + /* Set the offset pointers to the correct place. */ > + if (inoffp =3D=3D NULL) > + inoffp =3D &infp->f_offset; > + if (outoffp =3D=3D NULL) > + outoffp =3D &outfp->f_offset; > + savinoff =3D *inoffp; > + savoutoff =3D *outoffp; Should these two lines, saving the old inoffp and outoffp, be moved before the two conditionals above? Thanks, --=20 Shawn Webb Cofounder / Security Engineer HardenedBSD Tor-ified Signal: +1 443-546-8752 Tor+XMPP+OTR: lattera@is.a.hacker.sx GPG Key ID: 0xFF2E67A277F8E1FA GPG Key Fingerprint: D206 BB45 15E0 9C49 0CF9 3633 C85B 0AF8 AB23 0FB2 --veokz6vwuek33re7 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEA6TL67gupaZ9nzhT/y5nonf44foFAl053MkACgkQ/y5nonf4 4fr54Q/+PfcJIexfFFDXCQy43PkVrYpTXmNy6vHHf/c8wjgKespkEc9chaQlTWdi HifnyWrxlH+zwSH2+1vLlmhh9GVywUGOoXCUQK5NY+EkQ0QrSBOubA/htGDWuBun GF2GI8o2Fu+cXuy9CkbfwPbSqgv0Bb4VjKkB7v/99A1OcVnbBeZ0grir/xQznazJ GevbVV6SamdDirCECnlbFleapMCwxVJbO+3WpVrygf5JNvAaP0/mCOYgrJIi2wdz HZm+McS/9+k5rk+3lNilYQTIRS9/3zH+3epYOk3r3+9naV3IuuvNHGFvcFTxFlJ4 oOxp1mpu06qu2tsGxihfv26givlFAzxkUjboWUdNQ20MAIRs/qMpxpnr+RpQgV/o UAWtWtct+QhKtK5nY1GwQcYMboseeI+US8l+Qg9/vAuLi+EBCwmBM73Jh0nCBAc+ Ug8RJDb2rUUV2d9kE7updEJkYfWambX7RUXWRKKAtivsFxFzFW5s8izWDrwE6I0l 6OIn9DLtVwZwmlkSlKv71uipuvxcvLpzPoEaWENKhSJF4e4gBRyNF98b10Ea4zx3 X13NE2Y7VNI20+IYuayJ7GpOH4OqnfzaphEtJShvQhFNDK8QbjZSADkMLucRaSOI xCGgyg08PBAvl+XTNa25P1KsXlFoRDTUFi2Nu54TJKPtsN+aoyU= =KYRD -----END PGP SIGNATURE----- --veokz6vwuek33re7--