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 88322A0524 for ; Fri, 5 Feb 2021 12:38:45 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8290F188A59; Fri, 5 Feb 2021 12:38:45 +0100 (CET) Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by mails.dpdk.org (Postfix) with ESMTP id 1A4714067B for ; Fri, 5 Feb 2021 12:38:44 +0100 (CET) Received: by mail-wr1-f50.google.com with SMTP id b3so7325282wrj.5 for ; Fri, 05 Feb 2021 03:38:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=pT5glriwFXRtS8PWl8t/HBHtcOY5Tmvd7uL8zGejoyM=; b=Xd3ZFp+tLbJWAeCnWlHXEpfHtMUCPXZSiPG+Z9caoTRZ+msf1e1evK3Gl2nTqjcfz6 xzWE99qeNg6rcgx1bqrVIQ+YZ2IMrwzerpwVAgUR3ixmz9ZsTPBwkWrEPOC45lsaCX1S LhJjIIkjDn4999M55SlViS1fjcYV0RWjBEZVLLqQu9LY4jEV5jQw9K6wJODaeQAHqktO PE/ySgRgnlpQT8WDgSC7gQV17bhUDyRsPnOTXcwKZqKEwkOhHKZxbj9rH7HNFzkhhP4E +GTFSJYNm7lHaBzNlhBSTNiTZmRzbRmS0UXRu/SgdgYsoflM7HWUUOXVJ4uYWsetthRM PaFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=pT5glriwFXRtS8PWl8t/HBHtcOY5Tmvd7uL8zGejoyM=; b=JppT5K/PmXQdPGJTmgIZtJO6adJbO7wHNfcDfgKE7TLsTP01L51tAyz2wzcwfKGt4Y AbvZh+u+aPDAT/nbKvzlmCq6NW6aYhGCWNQRKuFSSYdGK/GZQHBKiURy/8NHAu/FJvmK NlgvVzL77lCGS1NyHq4ZNuQv9Bbe9tFRbUo4zAGgR0efcVbygCHcmu8OX8PgW0Vb03A7 VMBB5rENTXvJAhnoCHna6sdcnqe4kFnXNE1IvEPqo5ZJGD3+rGkUCZ+eN11fRwlvmQy8 fgO7PoDIsnJulG7qmnRaidChDO4ry9IxdHd0aUkTmzCg5jgh3xyNGNsI/rU866hknIBP No4Q== X-Gm-Message-State: AOAM532696224Q0RWjPKOIWV7r2eCx9/hzRxboMKagLsEelljCTAqFy7 33xTx6807mUB+2LPyvG08HS2Ih01K3f7Omab X-Google-Smtp-Source: ABdhPJyWLORX4xk1Z6FqZfkiYJwCWJjKdt6D4WN7cImy1/muXW2w0mo4fUwdb7Zv4qvxJpVaG5v1pg== X-Received: by 2002:a5d:560c:: with SMTP id l12mr4404939wrv.417.1612525123905; Fri, 05 Feb 2021 03:38:43 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id m22sm13160191wrh.66.2021.02.05.03.38.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:38:43 -0800 (PST) From: luca.boccassi@gmail.com To: Andrew Boyer Cc: dpdk stable Date: Fri, 5 Feb 2021 11:18:58 +0000 Message-Id: <20210205111920.1272063-252-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210205111920.1272063-1-luca.boccassi@gmail.com> References: <20210205111920.1272063-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/ionic: fix up function attribute tags' has been queued to stable release 20.11.1 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.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 02/07/21. 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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/f6b2e530dda185946d2df37972e5a22228b6650c Thanks. Luca Boccassi --- >From f6b2e530dda185946d2df37972e5a22228b6650c Mon Sep 17 00:00:00 2001 From: Andrew Boyer Date: Mon, 18 Jan 2021 12:35:07 -0800 Subject: [PATCH] net/ionic: fix up function attribute tags [ upstream commit 0de3e209af12b2f3c5f656203c58703b8ebc14e3 ] One function marked cold is in the hot path. Make sure to always inline hot path functions. Fixes: a27d901331da ("net/ionic: add Rx and Tx handling") Signed-off-by: Andrew Boyer --- drivers/net/ionic/ionic_rxtx.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/net/ionic/ionic_rxtx.c b/drivers/net/ionic/ionic_rxtx.c index 0b7c273939..7804b30ff9 100644 --- a/drivers/net/ionic/ionic_rxtx.c +++ b/drivers/net/ionic/ionic_rxtx.c @@ -67,7 +67,7 @@ ionic_txq_info_get(struct rte_eth_dev *dev, uint16_t queue_id, qinfo->conf.tx_deferred_start = txq->deferred_start; } -static inline void __rte_cold +static __rte_always_inline void ionic_tx_flush(struct ionic_cq *cq) { struct ionic_queue *q = cq->bound_q; @@ -429,7 +429,7 @@ ionic_tx_tso(struct ionic_queue *q, struct rte_mbuf *txm, return 0; } -static int +static __rte_always_inline int ionic_tx(struct ionic_queue *q, struct rte_mbuf *txm, uint64_t offloads, bool not_xmit_more) { @@ -713,7 +713,7 @@ ionic_dev_rx_queue_setup(struct rte_eth_dev *eth_dev, return 0; } -static void +static __rte_always_inline void ionic_rx_clean(struct ionic_queue *q, uint32_t q_desc_index, uint32_t cq_desc_index, void *cb_arg, void *service_cb_arg) @@ -874,7 +874,7 @@ ionic_rx_recycle(struct ionic_queue *q, uint32_t q_desc_index, ionic_q_post(q, true, ionic_rx_clean, mbuf); } -static int __rte_cold +static __rte_always_inline int ionic_rx_fill(struct ionic_qcq *rxq, uint32_t len) { struct ionic_queue *q = &rxq->q; @@ -982,7 +982,7 @@ ionic_dev_rx_queue_start(struct rte_eth_dev *eth_dev, uint16_t rx_queue_id) return 0; } -static inline void __rte_cold +static __rte_always_inline void ionic_rxq_service(struct ionic_cq *cq, uint32_t work_to_do, void *service_cb_arg) { -- 2.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:40.274747957 +0000 +++ 0252-net-ionic-fix-up-function-attribute-tags.patch 2021-02-05 11:18:29.266699870 +0000 @@ -1 +1 @@ -From 0de3e209af12b2f3c5f656203c58703b8ebc14e3 Mon Sep 17 00:00:00 2001 +From f6b2e530dda185946d2df37972e5a22228b6650c Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 0de3e209af12b2f3c5f656203c58703b8ebc14e3 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index 2a47a282ad..23e7d8aef7 100644 +index 0b7c273939..7804b30ff9 100644 @@ -22 +23 @@ - qinfo->conf.tx_deferred_start = txq->flags & IONIC_QCQ_F_DEFERRED; + qinfo->conf.tx_deferred_start = txq->deferred_start; @@ -30 +31 @@ -@@ -448,7 +448,7 @@ ionic_tx_tso(struct ionic_qcq *txq, struct rte_mbuf *txm, +@@ -429,7 +429,7 @@ ionic_tx_tso(struct ionic_queue *q, struct rte_mbuf *txm, @@ -36,2 +37,2 @@ - ionic_tx(struct ionic_qcq *txq, struct rte_mbuf *txm, - bool not_xmit_more) + ionic_tx(struct ionic_queue *q, struct rte_mbuf *txm, + uint64_t offloads, bool not_xmit_more) @@ -39 +40 @@ -@@ -736,7 +736,7 @@ ionic_dev_rx_queue_setup(struct rte_eth_dev *eth_dev, +@@ -713,7 +713,7 @@ ionic_dev_rx_queue_setup(struct rte_eth_dev *eth_dev, @@ -48 +49 @@ -@@ -897,7 +897,7 @@ ionic_rx_recycle(struct ionic_queue *q, uint32_t q_desc_index, +@@ -874,7 +874,7 @@ ionic_rx_recycle(struct ionic_queue *q, uint32_t q_desc_index, @@ -57 +58 @@ -@@ -1013,7 +1013,7 @@ ionic_dev_rx_queue_start(struct rte_eth_dev *eth_dev, uint16_t rx_queue_id) +@@ -982,7 +982,7 @@ ionic_dev_rx_queue_start(struct rte_eth_dev *eth_dev, uint16_t rx_queue_id)