From nobody Wed Oct 11 15:44:26 2023 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 4S5HBf4jwxz4wJmP; Wed, 11 Oct 2023 15:44:26 +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 4S5HBf39Rwz3d3H; Wed, 11 Oct 2023 15:44:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697039066; 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=DLJaUgGWzPVyjWdAEgH0POk7CeyieSdAftji6lJx5tI=; b=a3bloLUvfb4d6PXQUQ5nhcOFJ1yxdxNWeZP5liTj6bQTy6qzOeSX2lMm/kTy6JEVyDZYAq eS1Qf0dTtCGbL9ziR8IinYmdIGukcUNsjBKKmV1b0HSNc4hLZLc6oYAIE8QSIasKrwaOoI QwCeXCoAEDyssgqs2aPYuZGxvjR5oFRtOb4PprZwp31assW6JS6eAQFvSftUV/TFdIhlrV ZRsP+YlMtsFw5lYHXTyUEGlKgTGc4xwN35QQfcdo9TPluyF4brazAOGJvFnBBnF3lVMeV1 O54bKF1Q1Z2l7ZzjHyPzbKFO6ocYRNm8sdviR6Euz2CkamrCaNEqRHEhphEzuA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697039066; a=rsa-sha256; cv=none; b=UDcy80GEXOJiH7lEQj6KfCPs9c+nZHJGazussOR3q6eq1AQKl4MUQwKvnanpuFEZsJueND KMCg1WAUaFIs29n+1Bx8x6xtN/60XJ49t2WjgiX9RkR2I9cgwLurC4VWmhKEdBC6Rp2/Hn qDIIKEhPLEwWON6O23vUSaDWrIhItAWRA1aNm8MiFTHRz61HB+Jzq4bqwS3SdPvusSq8Z8 TmRLH5kO+tj4oMLn/Q1aIkvGTcU+qyuhB1IXz4GJ5OJ9khV4KVXX4F1ws6DHBXz3CBVwo5 0V3mM48Np8pVMBSA8Fg+EGv1IsCuq6NgACMYOz99s3eaoBeNkOAKEgbPjPNPvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697039066; 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=DLJaUgGWzPVyjWdAEgH0POk7CeyieSdAftji6lJx5tI=; b=tAlROMVH+OxNcJGBv4jG4U7TexiNtIiHxi+l2f3ApF0ayDHxoprN5d8uKaW2nLlnHuVOJm 7mfnG0tpuz4wDkYGVziL40s6XygHI4/d4lF5OzXOTCwSaY1SfQqEh37UY0ZpiQ8f+lbvA0 ZZK5Q7tmlGCgJ1GaPax180POVl1r8h2uRuMCCzKes7k9A69NNb+vQAIb27+ZAnkeX8MdG1 9cOmvaoFfdsIDbwkKw2Rxhai4RlH5X+G4RPQISDByPezAak9VIUsi671JkoLpeqI7VeoGf zc5F4v316SDkKNQp7JWird++OrGATbkKcIRANx+2a/Eb3fZBbJAnaFefOm2+wQ== 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 4S5HBf2G3zzC58; Wed, 11 Oct 2023 15:44:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39BFiQHF023925; Wed, 11 Oct 2023 15:44:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39BFiQCd023922; Wed, 11 Oct 2023 15:44:26 GMT (envelope-from git) Date: Wed, 11 Oct 2023 15:44:26 GMT Message-Id: <202310111544.39BFiQCd023922@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: b7f5e993476f - stable/14 - virtio_random: Pipeline fetching the data 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b7f5e993476f6e445895383e73aed01741f8b9cf Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=b7f5e993476f6e445895383e73aed01741f8b9cf commit b7f5e993476f6e445895383e73aed01741f8b9cf Author: John-Mark Gurney AuthorDate: 2023-09-05 15:59:43 +0000 Commit: John Baldwin CommitDate: 2023-10-11 15:10:32 +0000 virtio_random: Pipeline fetching the data Queue an initial fetch of data during attach and after every read rather than synchronously fetching data and polling for completion. If data has not been returned from an previous fetch during read, just return EAGAIN rather than blocking. Co-authored-by: John Baldwin Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D41656 (cherry picked from commit f1c5a2e3a625053e2b70d5b1777d849a4d9328f2) --- sys/dev/virtio/random/virtio_random.c | 73 +++++++++++++++++++++-------------- 1 file changed, 43 insertions(+), 30 deletions(-) diff --git a/sys/dev/virtio/random/virtio_random.c b/sys/dev/virtio/random/virtio_random.c index c02b5c98cece..d54e2e6b70d4 100644 --- a/sys/dev/virtio/random/virtio_random.c +++ b/sys/dev/virtio/random/virtio_random.c @@ -54,6 +54,8 @@ struct vtrnd_softc { struct virtqueue *vtrnd_vq; eventhandler_tag eh; bool inactive; + struct sglist *vtrnd_sg; + uint32_t *vtrnd_value; }; static int vtrnd_modevent(module_t, int, void *); @@ -67,6 +69,7 @@ static int vtrnd_negotiate_features(struct vtrnd_softc *); static int vtrnd_setup_features(struct vtrnd_softc *); static int vtrnd_alloc_virtqueue(struct vtrnd_softc *); static int vtrnd_harvest(struct vtrnd_softc *, void *, size_t *); +static void vtrnd_enqueue(struct vtrnd_softc *sc); static unsigned vtrnd_read(void *, unsigned); #define VTRND_FEATURES 0 @@ -138,12 +141,17 @@ static int vtrnd_attach(device_t dev) { struct vtrnd_softc *sc, *exp; + size_t len; int error; sc = device_get_softc(dev); sc->vtrnd_dev = dev; virtio_set_feature_desc(dev, vtrnd_feature_desc); + len = sizeof(*sc->vtrnd_value) * HARVESTSIZE; + sc->vtrnd_value = malloc_aligned(len, len, M_DEVBUF, M_WAITOK); + sc->vtrnd_sg = sglist_build(sc->vtrnd_value, len, M_WAITOK); + error = vtrnd_setup_features(sc); if (error) { device_printf(dev, "cannot setup features\n"); @@ -174,6 +182,8 @@ vtrnd_attach(device_t dev) sc->inactive = false; random_source_register(&random_vtrnd); + vtrnd_enqueue(sc); + fail: if (error) vtrnd_detach(dev); @@ -185,6 +195,7 @@ static int vtrnd_detach(device_t dev) { struct vtrnd_softc *sc; + uint32_t rdlen; sc = device_get_softc(dev); KASSERT( @@ -197,7 +208,13 @@ vtrnd_detach(device_t dev) sc->eh = NULL; } random_source_deregister(&random_vtrnd); + + /* clear the queue */ + virtqueue_poll(sc->vtrnd_vq, &rdlen); + atomic_store_explicit(&g_vtrnd_softc, NULL, memory_order_release); + sglist_free(sc->vtrnd_sg); + zfree(sc->vtrnd_value, M_DEVBUF); return (0); } @@ -251,49 +268,45 @@ vtrnd_alloc_virtqueue(struct vtrnd_softc *sc) return (virtio_alloc_virtqueues(dev, 0, 1, &vq_info)); } +static void +vtrnd_enqueue(struct vtrnd_softc *sc) +{ + struct virtqueue *vq; + int error __diagused; + + vq = sc->vtrnd_vq; + + KASSERT(virtqueue_empty(vq), ("%s: non-empty queue", __func__)); + + error = virtqueue_enqueue(vq, sc, sc->vtrnd_sg, 0, 1); + KASSERT(error == 0, ("%s: virtqueue_enqueue returned error: %d", + __func__, error)); + + virtqueue_notify(vq); +} + static int vtrnd_harvest(struct vtrnd_softc *sc, void *buf, size_t *sz) { - struct sglist_seg segs[1]; - struct sglist sg; struct virtqueue *vq; - uint32_t value[HARVESTSIZE] __aligned(sizeof(uint32_t) * HARVESTSIZE); + void *cookie; uint32_t rdlen; - int error; - - _Static_assert(sizeof(value) < PAGE_SIZE, "sglist assumption"); if (sc->inactive) return (EDEADLK); - sglist_init(&sg, 1, segs); - error = sglist_append(&sg, value, *sz); - if (error != 0) - panic("%s: sglist_append error=%d", __func__, error); - vq = sc->vtrnd_vq; - KASSERT(virtqueue_empty(vq), ("%s: non-empty queue", __func__)); - - error = virtqueue_enqueue(vq, buf, &sg, 0, 1); - if (error != 0) - return (error); - - /* - * Poll for the response, but the command is likely already - * done when we return from the notify. - */ - virtqueue_notify(vq); - virtqueue_poll(vq, &rdlen); - if (rdlen > *sz) - panic("%s: random device wrote %zu bytes beyond end of provided" - " buffer %p:%zu", __func__, (size_t)rdlen - *sz, - (void *)value, *sz); - else if (rdlen == 0) + cookie = virtqueue_dequeue(vq, &rdlen); + if (cookie == NULL) return (EAGAIN); + KASSERT(cookie == sc, ("%s: cookie mismatch", __func__)); + *sz = MIN(rdlen, *sz); - memcpy(buf, value, *sz); - explicit_bzero(value, *sz); + memcpy(buf, sc->vtrnd_value, *sz); + + vtrnd_enqueue(sc); + return (0); }