From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 39EFC376E6; Tue, 23 Jan 2024 00:35:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705970155; cv=none; b=gpcP5LeC/xrRb/0xKNIFEViDd+pWT4o5MwVs1LufMHeHxbTrMuG22lZNs0txMTQat3r4fuKGwIZCNybWfVABMmNXR/FuPDsd/qqUs3ZEBCZIM1zF4qGG7Uq9dumoUVPegHZPOmXrCgEfO5Z8z2MqFTiWsBftONjQVOI0HopaINU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705970155; c=relaxed/simple; bh=WyilkSIOkKCiWJg3+ZN558xKboj2CTZ+BDTju1h2dgc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Gl4OtGjTii+ZtjNJtfdrAV9spTw2JffyF3Nf/zMA698HpRSnZfDERAufK2n6diNPFeGvprJqU2MQZwEKiHmuQEdRgG3+e00RMgOu1FE5MmPXu2dFoqhn+fLwILuyYHHZ2jmanEfNm5YFSMJaMfHfulBoh/sTP7SZE94/hQ9q4Js= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=ZnmKJDZT; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="ZnmKJDZT" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0091DC433F1; Tue, 23 Jan 2024 00:35:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1705970154; bh=WyilkSIOkKCiWJg3+ZN558xKboj2CTZ+BDTju1h2dgc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZnmKJDZTx11i73wLq2YrtEBcckMMzndattI1KxiI/hNbSK341UwsfXoARIIZ3roib +kqpmHwbbW91NP0N+UNlsb7n/LlbwZku38tCdIkAKfBDXJiZ7tuPftiVnBgeIcTA/x NJZhihllhQQ/BlglNNfZclbSqRj8kI/DSMerCjgg= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Marc Kleine-Budde , Jakub Kicinski , "David S. Miller" , Sasha Levin Subject: [PATCH 6.7 601/641] net: netdev_queue: netdev_txq_completed_mb(): fix wake condition Date: Mon, 22 Jan 2024 15:58:25 -0800 Message-ID: <20240122235837.030045635@linuxfoundation.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240122235818.091081209@linuxfoundation.org> References: <20240122235818.091081209@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.7-stable review patch. If anyone has any objections, please let me know. ------------------ From: Marc Kleine-Budde [ Upstream commit 894d7508316e7ad722df597d68b4b1797a9eee11 ] netif_txq_try_stop() uses "get_desc >= start_thrs" as the check for the call to netif_tx_start_queue(). Use ">=" i netdev_txq_completed_mb(), too. Fixes: c91c46de6bbc ("net: provide macros for commonly copied lockless queue stop/wake code") Signed-off-by: Marc Kleine-Budde Acked-by: Jakub Kicinski Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- include/net/netdev_queues.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/net/netdev_queues.h b/include/net/netdev_queues.h index d68b0a483431..8b8ed4e13d74 100644 --- a/include/net/netdev_queues.h +++ b/include/net/netdev_queues.h @@ -128,7 +128,7 @@ netdev_txq_completed_mb(struct netdev_queue *dev_queue, netdev_txq_completed_mb(txq, pkts, bytes); \ \ _res = -1; \ - if (pkts && likely(get_desc > start_thrs)) { \ + if (pkts && likely(get_desc >= start_thrs)) { \ _res = 1; \ if (unlikely(netif_tx_queue_stopped(txq)) && \ !(down_cond)) { \ -- 2.43.0