From owner-svn-src-head@freebsd.org Tue Sep 22 21:48:24 2020 Return-Path: Delivered-To: svn-src-head@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 9C88B3E0B28; Tue, 22 Sep 2020 21:48:24 +0000 (UTC) (envelope-from asomers@gmail.com) Received: from mail-oi1-f175.google.com (mail-oi1-f175.google.com [209.85.167.175]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 4Bww0l3nfSz3TPj; Tue, 22 Sep 2020 21:48:23 +0000 (UTC) (envelope-from asomers@gmail.com) Received: by mail-oi1-f175.google.com with SMTP id n2so22716054oij.1; Tue, 22 Sep 2020 14:48:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=KZpAvbPycvgZE1cd/dTQnaBbN6I4Wf1Nd1IvLnRgK3g=; b=BRZFXBv1vys3CbuHwHYbPxs4ATsQwjR3MYcOagsY6vi6onkVUZA3v7Rqmv7GE4JbsZ 8BJmG5to0p5sQNda+Zfq8f/aUv96pFiI5grY5SVDBIYCrUf6kXM95typ6ifE4jDOgVGU VEgNp+ryn2FsLulJZO/HcKF9Yd+d8zEPrTfAVCXF4kMIj5sz0GQazCA99YxI7rggN7kp Xw1bGxeliSyV7YSEPRrvubVGimLDuCA98Cctux6IDvx0KWkyR96TL4Aw46/rYHfCjvTa 33IVNhoh8bCxr/HG22q/Wz/XpkaTj2JbABpOMzKSdEjxmcTySajNIrv76zia30E3t46i wSdQ== X-Gm-Message-State: AOAM531gv0PFNt+UpkIACNtfOL/TJwf7ut8ATZN6WSY5Y5fW3K4IpA7o YKVue/50opdw/fx3HU+jj450Sa9vxsLpa/IHlZ4UkkjG X-Google-Smtp-Source: ABdhPJx8ULzUjuwwDj/rlGqR5q4z8+JKkn7+EO6zggOIPEL3FUFraxnY8iga5FV2/PaNNi81Uybg0/cm2tvlDieB+9U= X-Received: by 2002:a05:6808:555:: with SMTP id i21mr3726777oig.55.1600811302414; Tue, 22 Sep 2020 14:48:22 -0700 (PDT) MIME-Version: 1.0 References: <202009112049.08BKnavL032212@repo.freebsd.org> In-Reply-To: From: Alan Somers Date: Tue, 22 Sep 2020 15:48:11 -0600 Message-ID: Subject: Re: svn commit: r365643 - head/bin/cp To: Warner Losh Cc: Kyle Evans , Mateusz Guzik , src-committers , svn-src-all , svn-src-head X-Rspamd-Queue-Id: 4Bww0l3nfSz3TPj X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of asomers@gmail.com designates 209.85.167.175 as permitted sender) smtp.mailfrom=asomers@gmail.com X-Spamd-Result: default: False [-1.33 / 15.00]; MIME_TRACE(0.00)[0:+,1:+,2:~]; ARC_NA(0.00)[]; FREEMAIL_CC(0.00)[freebsd.org,gmail.com]; FREEFALL_USER(0.00)[asomers]; FROM_HAS_DN(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; RCVD_TLS_ALL(0.00)[]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; DMARC_NA(0.00)[freebsd.org]; NEURAL_HAM_LONG(-0.98)[-0.983]; RCPT_COUNT_FIVE(0.00)[6]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[209.85.167.175:from]; NEURAL_SPAM_SHORT(0.59)[0.589]; NEURAL_HAM_MEDIUM(-0.93)[-0.934]; FORGED_SENDER(0.30)[asomers@freebsd.org,asomers@gmail.com]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.167.175:from]; R_DKIM_NA(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; RCVD_COUNT_TWO(0.00)[2]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; FROM_NEQ_ENVFROM(0.00)[asomers@freebsd.org,asomers@gmail.com]; MAILMAN_DEST(0.00)[svn-src-all,svn-src-head] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.33 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Sep 2020 21:48:24 -0000 It doesn't feel like a workaround to me. I think Kyle's version is clearer than the original. On Tue, Sep 22, 2020 at 3:45 PM Warner Losh wrote: > > > On Tue, Sep 22, 2020 at 3:42 PM Kyle Evans wrote: > >> cp is already fixed, people are still feeling the fallout of being >> within those revisions and needing to bootstrap their own cp. We can >> reduce the number of components these invocations rely on trivially to >> shell built-in mechanics, why not do so? >> > > Fair point. I just bristle at putting workarounds in for valid /bin/sh > syntax because we opposed for a few days. so long as it's an unconditional > clearing of the file to be zero length, I'm OK with that. > > Warner > > >> On Tue, Sep 22, 2020 at 4:40 PM Warner Losh wrote: >> > >> > So why do we need a workaround at all? cp /dev/null has been fixed, and >> that's way more important to get right. >> > >> > I don't want to paper-over issues with this at all, though if we use >> the host's (now broken) cp, I suppose that might be OK in the short term. >> If that's the case, then maybe this is OK. >> > >> > Otherwise, I'd strongly prefer we fix cp. >> > >> > Warner >> > >> > On Tue, Sep 22, 2020 at 3:31 PM Alan Somers >> wrote: >> >> >> >> +1. >> >> >> >> On Tue, Sep 22, 2020 at 3:27 PM Kyle Evans wrote: >> >>> >> >>> I'm running a build at the suggestion of mjg to confirm there aren't >> >>> any others hiding that can be converted, and I will commit after I've >> >>> verified that this is it. >> >>> >> >>> On Tue, Sep 22, 2020 at 4:02 PM Alan Somers >> wrote: >> >>> > >> >>> > LGTM. >> >>> > >> >>> > On Tue, Sep 22, 2020 at 2:59 PM Kyle Evans >> wrote: >> >>> >> >> >>> >> Perhaps: >> >>> >> >> >>> >> diff --git a/stand/i386/zfsboot/Makefile >> b/stand/i386/zfsboot/Makefile >> >>> >> index ff315abc0ef..7e362b43a39 100644 >> >>> >> --- a/stand/i386/zfsboot/Makefile >> >>> >> +++ b/stand/i386/zfsboot/Makefile >> >>> >> @@ -81,7 +81,7 @@ zfsboot.ld: zfsboot.ldr zfsboot.bin ${BTXKERN} >> >>> >> -o ${.TARGET} -P 1 zfsboot.bin >> >>> >> >> >>> >> zfsboot.ldr: >> >>> >> - cp /dev/null ${.TARGET} >> >>> >> + :> ${.TARGET} >> >>> >> >> >>> >> zfsboot.bin: zfsboot.out >> >>> >> ${OBJCOPY} -S -O binary zfsboot.out ${.TARGET} >> >>> >> diff --git a/stand/libsa/Makefile b/stand/libsa/Makefile >> >>> >> index effece9e01b..63cd46a9c54 100644 >> >>> >> --- a/stand/libsa/Makefile >> >>> >> +++ b/stand/libsa/Makefile >> >>> >> @@ -122,7 +122,7 @@ beforedepend: >> >>> >> ln -sf ${SRCTOP}/include/arpa/inet.h arpa/inet.h; \ >> >>> >> ln -sf ${SRCTOP}/include/arpa/tftp.h arpa/tftp.h; \ >> >>> >> for i in _time.h _strings.h _string.h; do \ >> >>> >> - [ -f xlocale/$$i ] || cp /dev/null xlocale/$$i; \ >> >>> >> + [ -f xlocale/$$i ] || :> xlocale/$$i; \ >> >>> >> done; \ >> >>> >> for i in ${STAND_H_INC}; do \ >> >>> >> ln -sf ${SASRC}/stand.h $$i; \ >> >>> >> >> >>> >> >> >>> >> On Tue, Sep 22, 2020 at 3:58 PM Alan Somers >> wrote: >> >>> >> > >> >>> >> > Looks like two places in stand. Is there any reason why >> Mateusz's suggestion wouldn't work? >> >>> >> > >> >>> >> > > rg -g Makefile 'cp.*/dev/null' >> >>> >> > stand/libsa/Makefile >> >>> >> > 125: [ -f xlocale/$$i ] || cp /dev/null xlocale/$$i; \ >> >>> >> > >> >>> >> > stand/i386/zfsboot/Makefile >> >>> >> > 82: cp /dev/null ${.TARGET} >> >>> >> > >> >>> >> > On Tue, Sep 22, 2020 at 2:54 PM Mateusz Guzik >> wrote: >> >>> >> >> >> >>> >> >> Can we instead add a workaround to the build tree? >> >>> >> >> >> >>> >> >> Where is cp /dev/null coming from anyway? Perhaps this can be >> patched >> >>> >> >> to touch the target file. >> >>> >> >> >> >>> >> >> On 9/22/20, Alan Somers wrote: >> >>> >> >> > On Tue, Sep 22, 2020 at 2:48 PM Kyle Evans < >> kevans@freebsd.org> wrote: >> >>> >> >> > >> >>> >> >> >> On Fri, Sep 11, 2020 at 3:49 PM Alan Somers < >> asomers@freebsd.org> wrote: >> >>> >> >> >> > >> >>> >> >> >> > Author: asomers >> >>> >> >> >> > Date: Fri Sep 11 20:49:36 2020 >> >>> >> >> >> > New Revision: 365643 >> >>> >> >> >> > URL: https://svnweb.freebsd.org/changeset/base/365643 >> >>> >> >> >> > >> >>> >> >> >> > Log: >> >>> >> >> >> > cp: fall back to read/write if copy_file_range fails >> >>> >> >> >> > >> >>> >> >> >> > Even though copy_file_range has a file-system agnostic >> version, it >> >>> >> >> >> still >> >>> >> >> >> > fails on devfs (perhaps because the file descriptor is >> non-seekable?) >> >>> >> >> >> In >> >>> >> >> >> > that case, fallback to old-fashioned read/write. Fixes >> >>> >> >> >> > "cp /dev/null /tmp/null" >> >>> >> >> >> > >> >>> >> >> >> >> >>> >> >> >> Hi, >> >>> >> >> >> >> >>> >> >> >> Any objection to adding a quick UPDATING entry for this? I'm >> seeing >> >>> >> >> >> occasional reports of this breakage as recent as today on >> IRC from >> >>> >> >> >> folks that were a little bit thrown off by this because it >> throws up >> >>> >> >> >> fairly far into the build and looks like a stand build >> regression >> >>> >> >> >> instead of a cp regression. >> >>> >> >> >> >> >>> >> >> >> Thanks, >> >>> >> >> >> >> >>> >> >> >> Kyle Evans >> >>> >> >> >> >> >>> >> >> > >> >>> >> >> > No objection. Can you suggest the proper wording? >> >>> >> >> > _______________________________________________ >> >>> >> >> > svn-src-all@freebsd.org mailing list >> >>> >> >> > https://lists.freebsd.org/mailman/listinfo/svn-src-all >> >>> >> >> > To unsubscribe, send any mail to " >> svn-src-all-unsubscribe@freebsd.org" >> >>> >> >> > >> >>> >> >> >> >>> >> >> >> >>> >> >> -- >> >>> >> >> Mateusz Guzik >> >