From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id BEEDFA034F for ; Tue, 1 Mar 2022 11:45:53 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B53F7407FF; Tue, 1 Mar 2022 11:45:53 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 6AA7C407FF for ; Tue, 1 Mar 2022 11:45:52 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646131552; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=l7sKTyduEMsqxt4Askdf6L/9YDRhfqH7F0rRzq8maB0=; b=PGTO7fMwUHA3666B0wN7tFZSyaAJbwXEvEjSZKGIZCbsWsELEy49LrJuC/xpNqwWrVeacp ZQ7zxvjNerPZdF6ejnfT1OB0SzbIGgAg2IRHtvrK2Pq4CKo7pg0E9dap+O015an6N1Hbmh +4l+r088FX1fLN/TbbCKWpboKjwZoIs= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-617-QPf71RMrMryh6yxcGLSJBA-1; Tue, 01 Mar 2022 05:45:48 -0500 X-MC-Unique: QPf71RMrMryh6yxcGLSJBA-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id AC2E5814600; Tue, 1 Mar 2022 10:45:47 +0000 (UTC) Received: from rh.Home (unknown [10.39.194.142]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6E12F6FB02; Tue, 1 Mar 2022 10:45:46 +0000 (UTC) From: Kevin Traynor To: Suanming Mou Cc: Viacheslav Ovsiienko , dpdk stable Subject: patch 'net/mlx5: remove unused function' has been queued to stable release 21.11.1 Date: Tue, 1 Mar 2022 10:42:37 +0000 Message-Id: <20220301104300.334382-81-ktraynor@redhat.com> In-Reply-To: <20220301104300.334382-1-ktraynor@redhat.com> References: <20220301104300.334382-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 21.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/06/22. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/b362035a7e69c1e6cd65b4d94043a70cb2e2561e Thanks. Kevin --- >From b362035a7e69c1e6cd65b4d94043a70cb2e2561e Mon Sep 17 00:00:00 2001 From: Suanming Mou Date: Tue, 15 Feb 2022 11:46:23 +0200 Subject: [PATCH] net/mlx5: remove unused function [ upstream commit ad98ff6c500ad99a68b3e3f0a2cdabad5ee7d769 ] The mlx5_l3t_prepare_entry() function is not used anymore. This commit removes the unused mlx5_l3t_prepare_entry() function. Fixes: 92ef4b8f1688 ("ethdev: remove deprecated shared counter attribute") Signed-off-by: Suanming Mou Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_utils.c | 41 ----------------------------------- drivers/net/mlx5/mlx5_utils.h | 28 ------------------------ 2 files changed, 69 deletions(-) diff --git a/drivers/net/mlx5/mlx5_utils.c b/drivers/net/mlx5/mlx5_utils.c index e4e66ae4c5..be33af96fe 100644 --- a/drivers/net/mlx5/mlx5_utils.c +++ b/drivers/net/mlx5/mlx5_utils.c @@ -1185,43 +1185,2 @@ mlx5_l3t_set_entry(struct mlx5_l3t_tbl *tbl, uint32_t idx, return ret; } - -int32_t -mlx5_l3t_prepare_entry(struct mlx5_l3t_tbl *tbl, uint32_t idx, - union mlx5_l3t_data *data, - mlx5_l3t_alloc_callback_fn cb, void *ctx) -{ - int32_t ret; - - rte_spinlock_lock(&tbl->sl); - /* Check if entry data is ready. */ - ret = __l3t_get_entry(tbl, idx, data); - if (!ret) { - switch (tbl->type) { - case MLX5_L3T_TYPE_WORD: - if (data->word) - goto out; - break; - case MLX5_L3T_TYPE_DWORD: - if (data->dword) - goto out; - break; - case MLX5_L3T_TYPE_QWORD: - if (data->qword) - goto out; - break; - default: - if (data->ptr) - goto out; - break; - } - } - /* Entry data is not ready, use user callback to create it. */ - ret = cb(ctx, data); - if (ret) - goto out; - /* Save the new allocated data to entry. */ - ret = __l3t_set_entry(tbl, idx, data); -out: - rte_spinlock_unlock(&tbl->sl); - return ret; -} diff --git a/drivers/net/mlx5/mlx5_utils.h b/drivers/net/mlx5/mlx5_utils.h index e2dcbafc0a..254c879d1a 100644 --- a/drivers/net/mlx5/mlx5_utils.h +++ b/drivers/net/mlx5/mlx5_utils.h @@ -460,32 +460,4 @@ int32_t mlx5_l3t_get_entry(struct mlx5_l3t_tbl *tbl, uint32_t idx, union mlx5_l3t_data *data); -/** - * This function gets the index entry from Three-level table. - * - * If the index entry is not available, allocate new one by callback - * function and fill in the entry. - * - * @param tbl - * Pointer to the l3t. - * @param idx - * Index to the entry. - * @param data - * Pointer to the memory which saves the entry data. - * When function call returns 0, data contains the entry data get from - * l3t. - * When function call returns -1, data is not modified. - * @param cb - * Callback function to allocate new data. - * @param ctx - * Context for callback function. - * - * @return - * 0 if success, -1 on error. - */ - -int32_t mlx5_l3t_prepare_entry(struct mlx5_l3t_tbl *tbl, uint32_t idx, - union mlx5_l3t_data *data, - mlx5_l3t_alloc_callback_fn cb, void *ctx); - /** * This function decreases and clear index entry if reference -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-01 10:41:03.656724182 +0000 +++ 0081-net-mlx5-remove-unused-function.patch 2022-03-01 10:41:01.416244121 +0000 @@ -1 +1 @@ -From ad98ff6c500ad99a68b3e3f0a2cdabad5ee7d769 Mon Sep 17 00:00:00 2001 +From b362035a7e69c1e6cd65b4d94043a70cb2e2561e Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit ad98ff6c500ad99a68b3e3f0a2cdabad5ee7d769 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org