From nobody Mon Jan 24 23:29:09 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 7307C1986375; Mon, 24 Jan 2022 23:29:11 +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 4JjR5L1gZCz4gn5; Mon, 24 Jan 2022 23:29:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643066950; 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=pCf99qW9PI/5a/tR1ebaknSmzn3JGxyvvNa8wTUDQpg=; b=rSs8jf2WV3VsW9zl2IQiCJRkYJ1MsWpOn4iVmmi0tq0kQnNLSLHJiC6KnXtqk1VO5qecyo VPG3vH27aE87ArupP0hm09Ipp5CobCj2GD9SsiVzuf9gIJ6paDHQsiSoP6kZNkwK3Gq6LY NZAsBEbiaiew5pRXUicnTBERFtF7ig8kdF7Jxk0WD0ak74RLPrmHUdbTipqiDbNMAneuAI 51apxKQdWTJRtEhShoxZ7ehGmgUMb5/fgsMpe/oDbuYOm02HBmt77ruZwghycO6fMtjlCK j1l8IcCRgoDsOJx8M21OA/Pe+GbASIuU4yNAwjC/8f4Y0t2WLNFBR/m2BCwM+g== 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 020A71ECBE; Mon, 24 Jan 2022 23:29:09 +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 20ONT9db069383; Mon, 24 Jan 2022 23:29:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20ONT9WY069382; Mon, 24 Jan 2022 23:29:09 GMT (envelope-from git) Date: Mon, 24 Jan 2022 23:29:09 GMT Message-Id: <202201242329.20ONT9WY069382@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 8f3f3fdf73a9 - main - cryptodev: Use a private malloc type (M_CRYPTODEV) instead of M_XDATA. 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/main X-Git-Reftype: branch X-Git-Commit: 8f3f3fdf73a98e819d5f73c1da3286bd608e8208 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643066950; 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=pCf99qW9PI/5a/tR1ebaknSmzn3JGxyvvNa8wTUDQpg=; b=Z8zTfPilFmqdkl7RhLOVKh/gpaLT8wLm0uA7TwVf2gWG99mpwf4b48K3RH9uZV4Tse7O4d XyoT0RhlBnIn+buOudKiy3dCQjb5bFWqd4IGfzxvF7UOc0a3OTXrzySp82+ObuM16y1dfj BIlWuwjulEek36seTTvVkpWkAjFPSLkgeBOYyo2mnw5O9PieGL8sKJ3GO2q5T6YRMjPPwj CQ8J3vLgxZ57GtU9dZlr8PAJXVVKoRmxFSdOBNIcBwXabr2esMPA4TRvY1VkrtNrh5vMbG DcZELe/J4PPfoZ26vyhLHgehoDaT0OJIGq7+igRxrAq7Gs0CwVs4GQHBjBfr2Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643066950; a=rsa-sha256; cv=none; b=MVA+HVeE/rxBKczB0enBfy8DvIBbGmbdaj4RcpE9EA2D+/JGDnGYzpWfKDZcJoKP0vmtKb YEscOW/ddpXuv7hAjo7GRBWKmdwHbfmnc8eesXs5Z6KuvWn1CDQb0omT5b3+ibzleNJHfw QQ46XdDGEVDxhx6Xrh/FathiCX8Ivyb0v/9vsf5BhSlw2KL5zGeJCQaQpqZhXrAJFUp7Tk Sllw7bCKem1eATeQWgbBcxtk8cedpNXi4ganG2weSeIJFb4KZl61rSL9UzRF/E9Myazan/ i9XI/RwQSZy/mJgPAre5LOjQQC65Wj9EM06EcEYuQt6So9fYpLf0yO3T8YFZfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=8f3f3fdf73a98e819d5f73c1da3286bd608e8208 commit 8f3f3fdf73a98e819d5f73c1da3286bd608e8208 Author: John Baldwin AuthorDate: 2022-01-24 23:27:39 +0000 Commit: John Baldwin CommitDate: 2022-01-24 23:27:39 +0000 cryptodev: Use a private malloc type (M_CRYPTODEV) instead of M_XDATA. Reviewed by: markj Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D33991 --- sys/opencrypto/cryptodev.c | 42 +++++++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/sys/opencrypto/cryptodev.c b/sys/opencrypto/cryptodev.c index a8c9f04e1fb7..45003691f2e6 100644 --- a/sys/opencrypto/cryptodev.c +++ b/sys/opencrypto/cryptodev.c @@ -302,6 +302,8 @@ SYSCTL_BOOL(_kern_crypto, OID_AUTO, cryptodev_separate_aad, CTLFLAG_RW, &use_separate_aad, 0, "Use separate AAD buffer for /dev/crypto requests."); +static MALLOC_DEFINE(M_CRYPTODEV, "cryptodev", "/dev/crypto data buffers"); + /* * Check a crypto identifier to see if it requested * a software device/driver. This can be done either @@ -423,7 +425,7 @@ cse_create(struct fcrypt *fcr, struct session2_op *sop) goto bail; } - key = malloc(csp.csp_cipher_klen, M_XDATA, M_WAITOK); + key = malloc(csp.csp_cipher_klen, M_CRYPTODEV, M_WAITOK); error = copyin(sop->key, key, csp.csp_cipher_klen); if (error) { CRYPTDEB("invalid key"); @@ -443,7 +445,8 @@ cse_create(struct fcrypt *fcr, struct session2_op *sop) } if (csp.csp_auth_klen != 0) { - mackey = malloc(csp.csp_auth_klen, M_XDATA, M_WAITOK); + mackey = malloc(csp.csp_auth_klen, M_CRYPTODEV, + M_WAITOK); error = copyin(sop->mackey, mackey, csp.csp_auth_klen); if (error) { CRYPTDEB("invalid mac key"); @@ -493,7 +496,7 @@ cse_create(struct fcrypt *fcr, struct session2_op *sop) goto bail; } - cse = malloc(sizeof(struct csession), M_XDATA, M_WAITOK | M_ZERO); + cse = malloc(sizeof(struct csession), M_CRYPTODEV, M_WAITOK | M_ZERO); mtx_init(&cse->lock, "cryptodev", "crypto session lock", MTX_DEF); refcount_init(&cse->refs, 1); cse->key = key; @@ -528,8 +531,8 @@ cse_create(struct fcrypt *fcr, struct session2_op *sop) sop->crid = crypto_ses2hid(cse->cses); bail: if (error) { - free(key, M_XDATA); - free(mackey, M_XDATA); + free(key, M_CRYPTODEV); + free(mackey, M_CRYPTODEV); } return (error); } @@ -560,10 +563,10 @@ cse_free(struct csession *cse) crypto_freesession(cse->cses); mtx_destroy(&cse->lock); if (cse->key) - free(cse->key, M_XDATA); + free(cse->key, M_CRYPTODEV); if (cse->mackey) - free(cse->mackey, M_XDATA); - free(cse, M_XDATA); + free(cse->mackey, M_CRYPTODEV); + free(cse, M_CRYPTODEV); } static bool @@ -589,17 +592,18 @@ cod_alloc(struct csession *cse, size_t aad_len, size_t len) { struct cryptop_data *cod; - cod = malloc(sizeof(struct cryptop_data), M_XDATA, M_WAITOK | M_ZERO); + cod = malloc(sizeof(struct cryptop_data), M_CRYPTODEV, M_WAITOK | + M_ZERO); cod->cse = cse; if (crypto_get_params(cse->cses)->csp_flags & CSP_F_SEPARATE_AAD) { if (aad_len != 0) - cod->aad = malloc(aad_len, M_XDATA, M_WAITOK); - cod->buf = malloc(len, M_XDATA, M_WAITOK); + cod->aad = malloc(aad_len, M_CRYPTODEV, M_WAITOK); + cod->buf = malloc(len, M_CRYPTODEV, M_WAITOK); } else - cod->buf = malloc(aad_len + len, M_XDATA, M_WAITOK); + cod->buf = malloc(aad_len + len, M_CRYPTODEV, M_WAITOK); if (crypto_get_params(cse->cses)->csp_flags & CSP_F_SEPARATE_OUTPUT) - cod->obuf = malloc(len, M_XDATA, M_WAITOK); + cod->obuf = malloc(len, M_CRYPTODEV, M_WAITOK); return (cod); } @@ -607,10 +611,10 @@ static void cod_free(struct cryptop_data *cod) { - free(cod->aad, M_XDATA); - free(cod->obuf, M_XDATA); - free(cod->buf, M_XDATA); - free(cod, M_XDATA); + free(cod->aad, M_CRYPTODEV); + free(cod->obuf, M_CRYPTODEV); + free(cod->buf, M_CRYPTODEV); + free(cod, M_CRYPTODEV); } static int @@ -1097,7 +1101,7 @@ fcrypt_dtor(void *data) cse_free(cse); } mtx_destroy(&fcr->lock); - free(fcr, M_XDATA); + free(fcr, M_CRYPTODEV); } static int @@ -1106,7 +1110,7 @@ crypto_open(struct cdev *dev, int oflags, int devtype, struct thread *td) struct fcrypt *fcr; int error; - fcr = malloc(sizeof(struct fcrypt), M_XDATA, M_WAITOK | M_ZERO); + fcr = malloc(sizeof(struct fcrypt), M_CRYPTODEV, M_WAITOK | M_ZERO); TAILQ_INIT(&fcr->csessions); mtx_init(&fcr->lock, "fcrypt", NULL, MTX_DEF); error = devfs_set_cdevpriv(fcr, fcrypt_dtor);