From patchwork Mon Sep 21 16:27:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "gregkh@linuxfoundation.org" X-Patchwork-Id: 309325 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CF562C4346B for ; Mon, 21 Sep 2020 17:02:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8A3822073A for ; Mon, 21 Sep 2020 17:02:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600707730; bh=oF2oOhr7yLJCocgLQji2YvNsjF6h1GZ2XlmT8LdVhu4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=xsoUqozY0qpzR0JoVtmfkAuuk72YKkAV5busSwJMKfTsRxGgBOk9EP538Aiv/eMW/ fKg01HNlxl8fpvB/OX6LFZhaOtIpIepUKNsFUMwb2LiWhNPd5lQELeoGqMwfTuiH4F B2L27LGRzTweNo4KNl1q4hphJ5N5/UaD0TYPKGCE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730186AbgIURBl (ORCPT ); Mon, 21 Sep 2020 13:01:41 -0400 Received: from mail.kernel.org ([198.145.29.99]:40676 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728110AbgIUQjK (ORCPT ); Mon, 21 Sep 2020 12:39:10 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C68EA206DC; Mon, 21 Sep 2020 16:39:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600706344; bh=oF2oOhr7yLJCocgLQji2YvNsjF6h1GZ2XlmT8LdVhu4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yCH7IuBYRG08BdpGmNK2QkQ1lTenRCq5GPTetQRBeRtSq0mpMBHWoGatLOmkPdve+ BUsY1T/4DeWjYDuMnTp/CtbY5Oor6eG2MjE1ssFDJj7lSnWT/vXq1YP0pbE/QDMZ2F gBOB6NEw23qS6KzAJ969HI4XrPYm8bIM0luwgySc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Haiyang Zhang , "David S. Miller" Subject: [PATCH 4.14 63/94] hv_netvsc: Remove "unlikely" from netvsc_select_queue Date: Mon, 21 Sep 2020 18:27:50 +0200 Message-Id: <20200921162038.432030939@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200921162035.541285330@linuxfoundation.org> References: <20200921162035.541285330@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Haiyang Zhang commit 4d820543c54c47a2bd3c95ddbf52f83c89a219a0 upstream. When using vf_ops->ndo_select_queue, the number of queues of VF is usually bigger than the synthetic NIC. This condition may happen often. Remove "unlikely" from the comparison of ndev->real_num_tx_queues. Fixes: b3bf5666a510 ("hv_netvsc: defer queue selection to VF") Signed-off-by: Haiyang Zhang Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/hyperv/netvsc_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/net/hyperv/netvsc_drv.c +++ b/drivers/net/hyperv/netvsc_drv.c @@ -365,7 +365,7 @@ static u16 netvsc_select_queue(struct ne } rcu_read_unlock(); - while (unlikely(txq >= ndev->real_num_tx_queues)) + while (txq >= ndev->real_num_tx_queues) txq -= ndev->real_num_tx_queues; return txq;