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 X-Spam-Level: X-Spam-Status: No, score=-9.8 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 98862C2D0A3 for ; Mon, 9 Nov 2020 13:06:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 51DFB206C0 for ; Mon, 9 Nov 2020 13:06:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604927174; bh=3zmPrO5O5D6mLC0yk7Sa7K03eKQW/GI8p0sj0yyITFY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=UZgV90S8eNDaGKczSHwch1TMLQj5ks7fBq7r9Q9HLROksr1Y2l90BWhGUV45CVZK/ FKYOOa7fatp1r9EyhCi85kdW1KAapOs1ZjzDWerYOGy8poJ1vwEKIWT4uj8uMIOOtO pgvd9tL1EyBlMPmz0ECgY+IaDcjz/4HSKdR7BPYc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731042AbgKINGM (ORCPT ); Mon, 9 Nov 2020 08:06:12 -0500 Received: from mail.kernel.org ([198.145.29.99]:58726 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730964AbgKINFz (ORCPT ); Mon, 9 Nov 2020 08:05:55 -0500 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 14795206C0; Mon, 9 Nov 2020 13:05:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604927154; bh=3zmPrO5O5D6mLC0yk7Sa7K03eKQW/GI8p0sj0yyITFY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ns9XVnu88gZSaNo8uyWmV+F45H/YWcNBboglhvOjMC2RLynFvJt/jyoii0QNmp8PP ysC+O0OfPQqzWGs7K90I2COnkCv048iU1DESUm41IeXJd0XWDtOsc8WcCSFiwmsqSM kmyC6I+bAaJk9HJ9TqpO7sQ5yeuoBuO8VliEifDI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Sergey Nemov , Andrew Bowers , Jeff Kirsher , Ben Hutchings Subject: [PATCH 4.14 12/48] i40e: add num_vectors checker in iwarp handler Date: Mon, 9 Nov 2020 13:55:21 +0100 Message-Id: <20201109125017.344634174@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201109125016.734107741@linuxfoundation.org> References: <20201109125016.734107741@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Sergey Nemov commit 7015ca3df965378bcef072cca9cd63ed098665b5 upstream. Field num_vectors from struct virtchnl_iwarp_qvlist_info should not be larger than num_msix_vectors_vf in the hw struct. The iwarp uses the same set of vectors as the LAN VF driver. Signed-off-by: Sergey Nemov Tested-by: Andrew Bowers Signed-off-by: Jeff Kirsher Signed-off-by: Ben Hutchings Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 10 ++++++++++ 1 file changed, 10 insertions(+) --- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c @@ -419,6 +419,16 @@ static int i40e_config_iwarp_qvlist(stru u32 next_q_idx, next_q_type; u32 msix_vf, size; + msix_vf = pf->hw.func_caps.num_msix_vectors_vf; + + if (qvlist_info->num_vectors > msix_vf) { + dev_warn(&pf->pdev->dev, + "Incorrect number of iwarp vectors %u. Maximum %u allowed.\n", + qvlist_info->num_vectors, + msix_vf); + goto err; + } + size = sizeof(struct virtchnl_iwarp_qvlist_info) + (sizeof(struct virtchnl_iwarp_qv_info) * (qvlist_info->num_vectors - 1));