From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9FAB8C61DA4 for ; Sat, 11 Mar 2023 05:01:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229541AbjCKFBm (ORCPT ); Sat, 11 Mar 2023 00:01:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50412 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229473AbjCKFBj (ORCPT ); Sat, 11 Mar 2023 00:01:39 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C7B2213C373 for ; Fri, 10 Mar 2023 21:01:38 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 50B1A604AD for ; Sat, 11 Mar 2023 05:01:38 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6060CC4339C; Sat, 11 Mar 2023 05:01:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1678510897; bh=bx1DcwLy+jH72h5Jdu0hna8kvAswFa7ABymFm20Fw1U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aerzAd//H6ZHNNItKg8ePKi3jvXwsie7fal0Nkmb54gKhynthWSXlAw4q4zGOvs06 YRE4DyEaegJRleKjXbbSeq+m9y76z545d7qFA0C6CMn3pcEZJSChP7AMN9S8xOuq0Z qMECLuhXsWRP1iAb3MlzbDCwkUSTbXsNsve6NZlXhNg/bBTnE6BqS973mbk0jabStB sHUjWSGceK6+udDsyacV6iHZzyE265/3lVnWHmIPbGeE4U+miSWLcOKBz3UEpO7sDm siW82kQO3aZRzPvvWVA2spF3Hawj4zo0/iUIsdfd1kAxYw55GP3GQh0MUp+kGKzGde sAwkP6BSAV0ZA== From: Jakub Kicinski To: netdev@vger.kernel.org, davem@davemloft.net, edumazet@google.com, pabeni@redhat.com Cc: alexanderduyck@fb.com, roman.gushchin@linux.dev, Jakub Kicinski Subject: [RFC net-next 2/3] ixgbe: use new queue try_stop/try_wake macros Date: Fri, 10 Mar 2023 21:01:29 -0800 Message-Id: <20230311050130.115138-2-kuba@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230311050130.115138-1-kuba@kernel.org> References: <20230311050130.115138-1-kuba@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Convert ixgbe to use the new macros, I think a lot of people copy the ixgbe code. Signed-off-by: Jakub Kicinski --- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 37 +++++-------------- 1 file changed, 9 insertions(+), 28 deletions(-) diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index 773c35fecace..db00e50a40ff 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c @@ -36,6 +36,7 @@ #include #include #include +#include #include #include @@ -1253,20 +1254,12 @@ static bool ixgbe_clean_tx_irq(struct ixgbe_q_vector *q_vector, total_packets, total_bytes); #define TX_WAKE_THRESHOLD (DESC_NEEDED * 2) - if (unlikely(total_packets && netif_carrier_ok(tx_ring->netdev) && - (ixgbe_desc_unused(tx_ring) >= TX_WAKE_THRESHOLD))) { - /* Make sure that anybody stopping the queue after this - * sees the new next_to_clean. - */ - smp_mb(); - if (__netif_subqueue_stopped(tx_ring->netdev, - tx_ring->queue_index) - && !test_bit(__IXGBE_DOWN, &adapter->state)) { - netif_wake_subqueue(tx_ring->netdev, - tx_ring->queue_index); - ++tx_ring->tx_stats.restart_queue; - } - } + if (total_packets && netif_carrier_ok(tx_ring->netdev) && + !__netif_subqueue_maybe_wake(tx_ring->netdev, tx_ring->queue_index, + ixgbe_desc_unused(tx_ring), + TX_WAKE_THRESHOLD, + test_bit(__IXGBE_DOWN, &adapter->state))) + ++tx_ring->tx_stats.restart_queue; return !!budget; } @@ -8270,22 +8263,10 @@ static void ixgbe_tx_olinfo_status(union ixgbe_adv_tx_desc *tx_desc, static int __ixgbe_maybe_stop_tx(struct ixgbe_ring *tx_ring, u16 size) { - netif_stop_subqueue(tx_ring->netdev, tx_ring->queue_index); - - /* Herbert's original patch had: - * smp_mb__after_netif_stop_queue(); - * but since that doesn't exist yet, just open code it. - */ - smp_mb(); - - /* We need to check again in a case another CPU has just - * made room available. - */ - if (likely(ixgbe_desc_unused(tx_ring) < size)) + if (!netif_subqueue_try_stop(tx_ring->netdev, tx_ring->queue_index, + ixgbe_desc_unused(tx_ring), size)) return -EBUSY; - /* A reprieve! - use start_queue because it doesn't call schedule */ - netif_start_subqueue(tx_ring->netdev, tx_ring->queue_index); ++tx_ring->tx_stats.restart_queue; return 0; } -- 2.39.2