From owner-svn-src-all@freebsd.org Sun Jul 14 19:35: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 E76DDA452F; Sun, 14 Jul 2019 19:35:11 +0000 (UTC) (envelope-from cse.cem@gmail.com) Received: from mail-io1-f53.google.com (mail-io1-f53.google.com [209.85.166.53]) (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 CB5D08928B; Sun, 14 Jul 2019 19:35:10 +0000 (UTC) (envelope-from cse.cem@gmail.com) Received: by mail-io1-f53.google.com with SMTP id f4so30836517ioh.6; Sun, 14 Jul 2019 12:35:10 -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:reply-to :from:date:message-id:subject:to:cc; bh=EjFy9Gek3zORXJzn5EEBIzdXhQgKks5qhpsFBJcGIRw=; b=QyHjvokgMN11NziVAB/EJSKWsROk0rhrwZqvwbkgcVC89nUob8CjmJtISnTY9RgJNP diIOizHSORwuOnpeB90Ct6LtOVqAUQcIu1bbk9yAfrRO/dwdCfF64JCJ92OwYywv35oT kFFXXo58NCNoF3B6gF+aZedySkyv8xGUm+XJf3CPXqPQTrn9P7cj7dYrgAXGAnMqBcKt 7E8/MExLzOFhxezavED2qVoxgTxRDqJEbLSGDW/eBqzbF5dGIDyOGCd3+w5fLub79DFC i0UzrqV4rsBr6n4IK1uhaUqgpF2KvNUe18YGmcIyTO5aPZ4japNwkwzAekxHjATC5/WO oz4g== X-Gm-Message-State: APjAAAXvH0Q0OUb5GxPXcHLfu/kE6jpFsONvWG7LqmevQM53dhi66XjS UENo6m2nEsQ2uLnSnf2KhTHqBmNA X-Google-Smtp-Source: APXvYqxPgq9ZdNbFO3JUvDQ6H/E0DgU0SfWI6aFyVBBxeMUTsQrjOJl3qMsrKKPUw0OeR07vAVMGZw== X-Received: by 2002:a6b:b497:: with SMTP id d145mr21649301iof.17.1563131330372; Sun, 14 Jul 2019 12:08:50 -0700 (PDT) Received: from mail-io1-f42.google.com (mail-io1-f42.google.com. [209.85.166.42]) by smtp.gmail.com with ESMTPSA id w23sm14094242ioa.51.2019.07.14.12.08.49 (version=TLS1_3 cipher=AEAD-AES128-GCM-SHA256 bits=128/128); Sun, 14 Jul 2019 12:08:49 -0700 (PDT) Received: by mail-io1-f42.google.com with SMTP id z3so30834568iog.0; Sun, 14 Jul 2019 12:08:49 -0700 (PDT) X-Received: by 2002:a5d:88c6:: with SMTP id i6mr22005932iol.107.1563131329372; Sun, 14 Jul 2019 12:08:49 -0700 (PDT) MIME-Version: 1.0 References: <201906251944.x5PJiNaA093352@repo.freebsd.org> In-Reply-To: <201906251944.x5PJiNaA093352@repo.freebsd.org> Reply-To: cem@freebsd.org From: Conrad Meyer Date: Sun, 14 Jul 2019 12:08:38 -0700 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r349391 - head/sys/kern To: Alan Somers Cc: src-committers , svn-src-all , svn-src-head Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: CB5D08928B X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; spf=pass (mx1.freebsd.org: domain of csecem@gmail.com designates 209.85.166.53 as permitted sender) smtp.mailfrom=csecem@gmail.com X-Spamd-Result: default: False [-4.73 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; HAS_REPLYTO(0.00)[cem@freebsd.org]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; REPLYTO_ADDR_EQ_FROM(0.00)[]; RCVD_COUNT_THREE(0.00)[4]; TO_DN_ALL(0.00)[]; MX_GOOD(-0.01)[cached: alt3.gmail-smtp-in.l.google.com]; NEURAL_HAM_SHORT(-0.84)[-0.839,0]; FORGED_SENDER(0.30)[cem@freebsd.org,csecem@gmail.com]; R_DKIM_NA(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; FROM_NEQ_ENVFROM(0.00)[cem@freebsd.org,csecem@gmail.com]; TAGGED_FROM(0.00)[]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; MIME_TRACE(0.00)[0:+]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; MIME_GOOD(-0.10)[text/plain]; RCVD_TLS_LAST(0.00)[]; DMARC_NA(0.00)[freebsd.org]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; IP_SCORE(-1.89)[ip: (-3.47), ipnet: 209.85.128.0/17(-3.46), asn: 15169(-2.44), country: US(-0.06)]; RCVD_IN_DNSWL_NONE(0.00)[53.166.85.209.list.dnswl.org : 127.0.5.0]; RWL_MAILSPIKE_POSSIBLE(0.00)[53.166.85.209.rep.mailspike.net : 127.0.0.17] 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: Sun, 14 Jul 2019 19:35:12 -0000 Hi Alan, This change restores the possible overflow beyond IO_SEQMAX that the removed conditional prevented. On Tue, Jun 25, 2019 at 12:44 PM Alan Somers wrote: > > Author: asomers > Date: Tue Jun 25 19:44:22 2019 > New Revision: 349391 > URL: https://svnweb.freebsd.org/changeset/base/349391 > > --- head/sys/kern/vfs_vnops.c Tue Jun 25 19:36:01 2019 (r349390) > +++ head/sys/kern/vfs_vnops.c Tue Jun 25 19:44:22 2019 (r349391) > @@ -499,10 +499,8 @@ sequential_heuristic(struct uio *uio, struct file *fp) > * closely related to the best I/O size for real disks than > * to any block size used by software. > */ > - fp->f_seqcount += MIN(IO_SEQMAX, > + fp->f_seqcount += lmin(IO_SEQMAX, > howmany(uio->uio_resid, 16384)); > - if (fp->f_seqcount > IO_SEQMAX) > - fp->f_seqcount = IO_SEQMAX; > return (fp->f_seqcount << IO_SEQSHIFT); > } Perhaps instead this should be: fp->f_seqcount = lmin(IO_SEQMAX, fp->f_seqcount + howmany(...)); Best, Conrad