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.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,T_DKIMWL_WL_HIGH,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 759E8C28CC2 for ; Thu, 30 May 2019 04:27:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4323A25495 for ; Thu, 30 May 2019 04:27:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559190422; bh=ezxrnQ1NzkHpQFx72zDTFDyGqdmHZoV15V176/RZO2E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=vTgfpNyYr8hPaMmhO/mfx4+F5CrVKZxyPn57XO9AXi8jbWkQ5twqDk3kN32Wd/JPo ojq00dRjH2QrsOYEP+lL/kULtSNMDDrqpjY6tI1FDV84f5MP8gGi0PPxprzMJNp3Q7 5itm30KPaGCE5EMNHId18rUSU66t5FlpMp0bvKaw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729855AbfE3DOZ (ORCPT ); Wed, 29 May 2019 23:14:25 -0400 Received: from mail.kernel.org ([198.145.29.99]:34174 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729847AbfE3DOX (ORCPT ); Wed, 29 May 2019 23:14:23 -0400 Received: from localhost (ip67-88-213-2.z213-88-67.customer.algx.net [67.88.213.2]) (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 C254924547; Thu, 30 May 2019 03:14:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559186062; bh=ezxrnQ1NzkHpQFx72zDTFDyGqdmHZoV15V176/RZO2E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=utVwj4zpLuHMVM7owQxiXVysSpe6yOQyL6dP7JrMdunvzUJY3AoP//gmclaTxbwYO Pg75Kk4pRuG1E2fGhfgRczUzjc/30HCF+GHp07SyOUuPPLKqPBaGtT/9wgR6e9o2P+ r6bxvNfmsxOP6SgeXEQQ3mwKawADNYe1OOlJFMaY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Adam Ludkiewicz , Andrew Bowers , Jeff Kirsher , Sasha Levin Subject: [PATCH 5.0 171/346] i40e: Able to add up to 16 MAC filters on an untrusted VF Date: Wed, 29 May 2019 20:04:04 -0700 Message-Id: <20190530030549.819725947@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190530030540.363386121@linuxfoundation.org> References: <20190530030540.363386121@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ Upstream commit 06b6e2a2333eb3581567a7ac43ca465ef45f4daa ] This patch fixes the problem with the driver being able to add only 7 multicast MAC address filters instead of 16. The problem is fixed by changing the maximum number of MAC address filters to 16+1+1 (two extra are needed because the driver uses 1 for unicast MAC address and 1 for broadcast). Signed-off-by: Adam Ludkiewicz Tested-by: Andrew Bowers Signed-off-by: Jeff Kirsher Signed-off-by: Sasha Levin --- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c index 2ac23ebfbf31b..715c6a9f30f9f 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c @@ -2449,8 +2449,10 @@ static int i40e_vc_get_stats_msg(struct i40e_vf *vf, u8 *msg) (u8 *)&stats, sizeof(stats)); } -/* If the VF is not trusted restrict the number of MAC/VLAN it can program */ -#define I40E_VC_MAX_MAC_ADDR_PER_VF 12 +/* If the VF is not trusted restrict the number of MAC/VLAN it can program + * MAC filters: 16 for multicast, 1 for MAC, 1 for broadcast + */ +#define I40E_VC_MAX_MAC_ADDR_PER_VF (16 + 1 + 1) #define I40E_VC_MAX_VLAN_PER_VF 8 /** -- 2.20.1