From nobody Thu Feb 10 13:46:51 2022 X-Original-To: dev-commits-src-all@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 99B9219AD2C4; Thu, 10 Feb 2022 13:46:51 +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 4JvdMb3kcdz4d0H; Thu, 10 Feb 2022 13:46:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644500811; 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=Vz82hBXFNUgXNhsThqyefllS/6s0a4vYNpkMlK0w+w4=; b=hIaPH83+BvLUlBoVDARMdOwEUdO6YPmN8udUmkGPKf6djx4KuQGvhUCrl9kN0fbLyorO+h 7IvbetOp2DKCojCvKhtjSosTiro4FfVoRTzMgbxzNgOQ+0PdzJo8hlKY2inGVza1emXRil J31XWup41RQJ/LIIJurnl1B86Hf82D4TCWzU6bekQ6tZuMkZRnEtouNnNDARUGkjweW2R1 1g7ZJZbY88CKKuYitynCMURk0npT+AWkWk5AlMRXjgWZ8oDPSG4md98bXBqHBKPnqH9HbL QN+Ema/7kCQDZQUDQRKnTDphbWbNEOy5R/EjDbHi+3ocfir0ZRPZwu64axGAOQ== 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 5A26C216CF; Thu, 10 Feb 2022 13:46:51 +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 21ADkpBs049583; Thu, 10 Feb 2022 13:46:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21ADkpns049582; Thu, 10 Feb 2022 13:46:51 GMT (envelope-from git) Date: Thu, 10 Feb 2022 13:46:51 GMT Message-Id: <202202101346.21ADkpns049582@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 14c0cde468e1 - stable/13 - shsec: Allocate data blocks only for BIO_READ/WRITE requests List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 14c0cde468e136a007a5a7e1bcb7b3a50a2a8b57 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644500811; 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=Vz82hBXFNUgXNhsThqyefllS/6s0a4vYNpkMlK0w+w4=; b=osrl5lq9XmpwXptu49GDrvnJkrHbayim8BqOeMi7tP2NrVIaFieX9S3KvOK+XeW1CrybOs tASfsm1BymwN9kSsCQU5ELB4NmRKcN/2VoFSeGGbjetbW/UtYciuiGqnfMcdwe/k2oAhLj mu6Ru7UZEHgqFggPeLf6hzk7SmCCeADTyC5oMomfPNqBXN7z5XjX1/7G+5oluwSO7kyl2v wUpUB4cGZijk5T1bLwSqwcxXN0LrMgM3ZoL3+TLHDf9nEQx4Q3JFpKEI1LPw81oVgscb5Z dtZLzuzURwFdtMtgnoygwSHj936J5/9r3p8qLpgITMuCxpcE4khlxOHUVhibqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644500811; a=rsa-sha256; cv=none; b=BPLE+Z4BcFtfAvwUROPKp8dLoYr/iEEQ98Ky15eqaFhHAFnQm4tbFC2JeIMY2D9UTY9Xtg HiLUWupO9Tm59pow92PevPN2rIVmsfdJ1MxSlfSIQwb9e45mrQEr9VW/wl0Iq+79BrFIvF jOR7Ia4g0zbvR2/o+fal26B28OXivDCUq/9nXd2NEIWC2Hsv7ee+qYouTdWkbQEap5vFou WBxv74+hZLZD6pu19n92Y6BcWrZCeU6+AezK/o+N6cy7ooZKD0RSNjP8DNc1t+zfweeWRj L+79wox1CcSJZ75kWuUXje413e8FT16BEg3eZlW5SF8DVqKlwMudqidFxCh9Pg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=14c0cde468e136a007a5a7e1bcb7b3a50a2a8b57 commit 14c0cde468e136a007a5a7e1bcb7b3a50a2a8b57 Author: Mark Johnston AuthorDate: 2022-01-27 14:53:02 +0000 Commit: Mark Johnston CommitDate: 2022-02-10 13:46:12 +0000 shsec: Allocate data blocks only for BIO_READ/WRITE requests In particular, there is no need to allocate a data block when passing BIO_FLUSH requests to child providers, and g_io_request() asserts that bp->bio_data == NULL for such requests. PR: 255131 Reported and tested by: nvass@gmx.com Sponsored by: The FreeBSD Foundation (cherry picked from commit a2dfffb98917a57bfacb155b9d7d423c3e8ff792) --- sys/geom/shsec/g_shsec.c | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/sys/geom/shsec/g_shsec.c b/sys/geom/shsec/g_shsec.c index a3b2f59d0555..2b9e127ce350 100644 --- a/sys/geom/shsec/g_shsec.c +++ b/sys/geom/shsec/g_shsec.c @@ -272,8 +272,10 @@ g_shsec_done(struct bio *bp) (ssize_t)pbp->bio_length); } } - explicit_bzero(bp->bio_data, bp->bio_length); - uma_zfree(g_shsec_zone, bp->bio_data); + if (bp->bio_data != NULL) { + explicit_bzero(bp->bio_data, bp->bio_length); + uma_zfree(g_shsec_zone, bp->bio_data); + } g_destroy_bio(bp); pbp->bio_inbed++; if (pbp->bio_children == pbp->bio_inbed) { @@ -351,20 +353,22 @@ g_shsec_start(struct bio *bp) * Fill in the component buf structure. */ cbp->bio_done = g_shsec_done; - cbp->bio_data = uma_zalloc(g_shsec_zone, M_NOWAIT); - if (cbp->bio_data == NULL) { - g_shsec_alloc_failed++; - error = ENOMEM; - goto failure; - } cbp->bio_caller2 = sc->sc_disks[no]; - if (bp->bio_cmd == BIO_WRITE) { - if (no == 0) { - dst = (uint32_t *)cbp->bio_data; - bcopy(bp->bio_data, dst, len); - } else { - g_shsec_xor2((uint32_t *)cbp->bio_data, dst, - len); + if (bp->bio_cmd == BIO_READ || bp->bio_cmd == BIO_WRITE) { + cbp->bio_data = uma_zalloc(g_shsec_zone, M_NOWAIT); + if (cbp->bio_data == NULL) { + g_shsec_alloc_failed++; + error = ENOMEM; + goto failure; + } + if (bp->bio_cmd == BIO_WRITE) { + if (no == 0) { + dst = (uint32_t *)cbp->bio_data; + bcopy(bp->bio_data, dst, len); + } else { + g_shsec_xor2((uint32_t *)cbp->bio_data, + dst, len); + } } } }