From nobody Sun Feb 19 05:47:14 2023 X-Original-To: dev-commits-src-branches@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 4PKF1b2bQtz3smRF; Sun, 19 Feb 2023 05:47:15 +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 4PKF1b1mH5z3LCR; Sun, 19 Feb 2023 05:47:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676785635; 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=0Z1/E3XgaRH4GwIiQCssR4e0/IHr5DZoFH1glf8eFqo=; b=B6EZoPBpt1vskWbG3jtRbqmZ/qITF7maGCRgDfmt21ceDcOhnjZSY2ZwkLebJfrq+UXEQJ YBWVdMnoKFa+mjrz05vTjK/QO+B8SQbXbNgyLTQf7KVp82HhW7htaERQu0Yt6beszsGHC+ 7v1itouSLSwTaxAHDTCOA0kEDE+Dk8x96PoIumlWA9Wj6OnGeq6k5HM2drfAcBh/E4WQ1M rCnwVuPgQBuzR0i/xx0TGf5L3rIW28TIZiJF7KXbIrwq2Hs1VTuvcLZ+5oDSip9VwGTMlq yfMVgWxBDgHXPFx65j73jvnbZMRgGB9vjQZcy018nK7iHaAGMjGkSHzpq/CiZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676785635; 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=0Z1/E3XgaRH4GwIiQCssR4e0/IHr5DZoFH1glf8eFqo=; b=cp1SmBWrcp+jr7HUSWCENEUCF/m5wogbHu/BWHFa7yY7Amqri6jgGSgMOcvEI5fMhCuKLo HHKNkS3Ifg7OjQZojbDlI5Dee3ZbpThGUg6auTfZv6MFbTLMitBjFpkVPo3SJ83OABnlVv kVO4oCS4sgCFGCR9puoyVCgZa3mEf6Ym70t0oFhZE3nEVTP+PMbiZuYzANEUoShG/dx9Bc oszvIgGb0ihu3fU9Ua3fbekIXJVh8utb/Rza+trkePaAi/Vev0avplL24JP85Chstqq4Po BmAXrYkQNBOixzKcegksrTYx43+RI1SkNiCnY85DLdSVVMzIsXmQCM0Y64TKIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676785635; a=rsa-sha256; cv=none; b=Rlj8zH0cfDHed0gy5x0jTyVOjknygaZh7huvDCLhjZ/5iV9cmffNc2xAjrlN2eAFEM7+Nm mKAqIPoZXsVQ7xrIWXsE2gdw+7t8zz0G+ED1j7qoVs/Fym2YboOVwm4jUpD1JkBUbmgnxL OhiYLIvi0xJajv12gUTD7aKMx4bAcZMBYZp07s1SXbpDdlo1LVwRRM7qYEtrPoCqNu6nO/ 2/QzHTJccQypjD6NTSL3iq/WwerWduLgRmCQ06sLIsi75cNG3kzMpPJTBOtmKjPoNbe+Zg /ncg/HWSvm4j5YQhHEctGIOvo4N1ctmwrqX3sLm0hggZuocsJ4dp2W1cWBGIXQ== 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 4PKF1b0kw9zrWM; Sun, 19 Feb 2023 05:47:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31J5lENF097125; Sun, 19 Feb 2023 05:47:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31J5lEXj097124; Sun, 19 Feb 2023 05:47:14 GMT (envelope-from git) Date: Sun, 19 Feb 2023 05:47:14 GMT Message-Id: <202302190547.31J5lEXj097124@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: 071a0b5b7058 - stable/13 - allocbuf(): convert direct panic() calls to KASSERT()s List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: 071a0b5b7058b97b629e6aa49e7d03bb87615f5f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=071a0b5b7058b97b629e6aa49e7d03bb87615f5f commit 071a0b5b7058b97b629e6aa49e7d03bb87615f5f Author: Konstantin Belousov AuthorDate: 2023-02-11 18:03:22 +0000 Commit: Konstantin Belousov CommitDate: 2023-02-19 05:16:25 +0000 allocbuf(): convert direct panic() calls to KASSERT()s (cherry picked from commit 020e8a4d0609d56cb49a9f35258ff07815d5e478) --- sys/kern/vfs_bio.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index abb9ebc7281b..6a479ed335ef 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -4343,8 +4343,9 @@ allocbuf(struct buf *bp, int size) if (bp->b_bcount == size) return (1); - if (bp->b_kvasize != 0 && bp->b_kvasize < size) - panic("allocbuf: buffer too small"); + KASSERT(bp->b_kvasize == 0 || bp->b_kvasize >= size, + ("allocbuf: buffer too small %p %#x %#x", + bp, bp->b_kvasize, size)); newbsize = roundup2(size, DEV_BSIZE); if ((bp->b_flags & B_VMIO) == 0) { @@ -4361,11 +4362,12 @@ allocbuf(struct buf *bp, int size) } else { int desiredpages; - desiredpages = (size == 0) ? 0 : + desiredpages = size == 0 ? 0 : num_pages((bp->b_offset & PAGE_MASK) + newbsize); - if (bp->b_flags & B_MALLOC) - panic("allocbuf: VMIO buffer can't be malloced"); + KASSERT((bp->b_flags & B_MALLOC) == 0, + ("allocbuf: VMIO buffer can't be malloced %p", bp)); + /* * Set B_CACHE initially if buffer is 0 length or will become * 0-length.