From nobody Tue Feb 01 14:46:23 2022 X-Original-To: dev-commits-src-main@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 5F02B19A5CF3; Tue, 1 Feb 2022 14:46: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 4Jp76T3Xvsz4j1q; Tue, 1 Feb 2022 14:46:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643726785; 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=YALIxyJxEgaORkrfsvPRyHoe9vSLTSQ7++XwcQ3W3bg=; b=WVRHf0dqAJ68j5SY5mABi0QIGU3hyjFNVEb5tmYcAoFUGDeIm7NPzSevqkpNM30zxAAZCD zj9wsdAB7/pf+At6iRKl7ROcP+TYJ4ZMndOFMXim8rbZKNo1mFJJefJFei7I1vBkQ9CJaz 6C9+THChNeplxByavhG6HFcJ1iPl0C9BwxmpRbPT+hH5hUxxKOOWnCYRUOMq0ujcl9pdWT erHvufCal4/oNaHKOTgb6pC+4uQ7U6HWWCG16iRxXY4nyI4dqQnbky9O6tRraZYZypLy4T MKx66JHi75QyM4auADZIYAdiZTtOfPat+dOco19mpzQEHQ59QoEaO5SbGeq8QA== 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 8608912AB5; Tue, 1 Feb 2022 14:46:23 +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 211EkNFC096812; Tue, 1 Feb 2022 14:46:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 211EkNIE096811; Tue, 1 Feb 2022 14:46:23 GMT (envelope-from git) Date: Tue, 1 Feb 2022 14:46:23 GMT Message-Id: <202202011446.211EkNIE096811@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 0f7b6e11c01d - main - mlx5en: Use a UMA cache zone for managing TLS send tags List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 0f7b6e11c01d5360c9423d6938b160fe2d030ab0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643726785; 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=YALIxyJxEgaORkrfsvPRyHoe9vSLTSQ7++XwcQ3W3bg=; b=ym9u57gTSKn/WgMMTvHwTZz3IM0wtESn2dC6EqOs3tfOZqNEJ9H8K2w2mBVFOXCQkSjbRO 9N4j0wK2Jt23AtpchfSEYo0KL7zWfrx40Dn1cmjBhvXfCEBdG0a2Fa/sWYcLce2TfM8TGT bZopzXZKij5Zt0CkHfBtesKECVg5HNd2W4/iMcCDePAl0rnc4Gpa72dwPHCIJR6VAA6b9d 4TlkK+rAra285+C2F3jjxqL+py/CDqGQKlRy/HEKa+PtbwRUUc0DVS4RbAUmpXh1nHO3gv OUuiJ9EpLz8XotQPvGrInd7wunnp+h1dJwNZsuYAei5N3hnvf1AI+vpFj6J7pg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643726785; a=rsa-sha256; cv=none; b=smtpu3XUuYx80dc12FJ414EYMoKmIYMejfixSL8wwOZWhX6NO8K1K+TznjEFqKJK6Hu463 qX48PRjNHC+rJJuZMqc798ON4Yp8tj1/Ztx3smNoTWsKfM2LfdUnpCPROJYjWZeNK4UNSa BCDNSdeKy7TI8ra4wEgcIdWosSSkvoxtwagzMkxiyqaEbR1KAqqehNhgXx1iq6nDIRcyx+ yi/J6qbkOumNI4UdHw03o7DAlWg1iAnXpYALUTiye83cb+Jkym9cxqlPi0257VgrXYVCJn M8QcqjuyJYSJgn1zZ1AmitIJsPwcsxJVOjzsHcPb0DZkre7eYcXol+4ENc6FfA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=0f7b6e11c01d5360c9423d6938b160fe2d030ab0 commit 0f7b6e11c01d5360c9423d6938b160fe2d030ab0 Author: Konstantin Belousov AuthorDate: 2021-11-15 17:37:08 +0000 Commit: Konstantin Belousov CommitDate: 2022-02-01 12:45:58 +0000 mlx5en: Use a UMA cache zone for managing TLS send tags Instead of allocating directly from a normal zone. This way import and release are guaranteed to process all allocated and then deallocated items. Also, the release occurs in a sleepable context when caller of uma_zfree() or uma_zdestroy() can sleep itself. MFC after: 1 week Sponsored by: NVIDIA Networking --- sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c | 55 ++++++++++++++++++++--------------- 1 file changed, 32 insertions(+), 23 deletions(-) diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c b/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c index 059703b28ce4..01581693f744 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2019 Mellanox Technologies. All rights reserved. + * Copyright (c) 2019-2021 Mellanox Technologies. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -82,37 +82,45 @@ static const char *mlx5e_tls_stats_desc[] = { static void mlx5e_tls_work(struct work_struct *); static int -mlx5e_tls_tag_zinit(void *mem, int size, int flags) +mlx5e_tls_tag_import(void *arg, void **store, int cnt, int domain, int flags) { - struct mlx5e_tls_tag *ptag = mem; - - MPASS(size == sizeof(*ptag)); - - memset(ptag, 0, sizeof(*ptag)); - mtx_init(&ptag->mtx, "mlx5-tls-tag-mtx", NULL, MTX_DEF); - INIT_WORK(&ptag->work, mlx5e_tls_work); - - return (0); + struct mlx5e_tls_tag *ptag; + int i; + + for (i = 0; i != cnt; i++) { + ptag = malloc_domainset(sizeof(*ptag), M_MLX5E_TLS, + mlx5_dev_domainset(arg), flags | M_ZERO); + mtx_init(&ptag->mtx, "mlx5-tls-tag-mtx", NULL, MTX_DEF); + INIT_WORK(&ptag->work, mlx5e_tls_work); + store[i] = ptag; + } + return (i); } static void -mlx5e_tls_tag_zfini(void *mem, int size) +mlx5e_tls_tag_release(void *arg, void **store, int cnt) { - struct mlx5e_tls_tag *ptag = mem; + struct mlx5e_tls_tag *ptag; struct mlx5e_priv *priv; struct mlx5e_tls *ptls; + int i; - ptls = ptag->tls; - priv = container_of(ptls, struct mlx5e_priv, tls); + for (i = 0; i != cnt; i++) { + ptag = store[i]; + ptls = ptag->tls; + priv = container_of(ptls, struct mlx5e_priv, tls); - flush_work(&ptag->work); + flush_work(&ptag->work); - if (ptag->tisn != 0) { - mlx5_tls_close_tis(priv->mdev, ptag->tisn); - atomic_add_32(&ptls->num_resources, -1U); - } + if (ptag->tisn != 0) { + mlx5_tls_close_tis(priv->mdev, ptag->tisn); + atomic_add_32(&ptls->num_resources, -1U); + } + + mtx_destroy(&ptag->mtx); - mtx_destroy(&ptag->mtx); + free(ptag, M_MLX5E_TLS); + } } static void @@ -154,8 +162,9 @@ mlx5e_tls_init(struct mlx5e_priv *priv) snprintf(ptls->zname, sizeof(ptls->zname), "mlx5_%u_tls", device_get_unit(priv->mdev->pdev->dev.bsddev)); - ptls->zone = uma_zcreate(ptls->zname, sizeof(struct mlx5e_tls_tag), - NULL, NULL, mlx5e_tls_tag_zinit, mlx5e_tls_tag_zfini, UMA_ALIGN_CACHE, 0); + ptls->zone = uma_zcache_create(ptls->zname, + sizeof(struct mlx5e_tls_tag), NULL, NULL, NULL, NULL, + mlx5e_tls_tag_import, mlx5e_tls_tag_release, priv->mdev, 0); ptls->max_resources = 1U << MLX5_CAP_GEN(priv->mdev, log_max_dek);