From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 06F8EA0A03; Mon, 18 Jan 2021 06:58:10 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 875BA140DDF; Mon, 18 Jan 2021 06:58:10 +0100 (CET) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by mails.dpdk.org (Postfix) with ESMTP id 45D12140DD3; Mon, 18 Jan 2021 06:58:09 +0100 (CET) IronPort-SDR: bd8qc4eUaO3C7sK2qiL1iHroICrHARUfEQj23FTF+MoQXCzyJols4XKQXBvalIf1DX5d6o132K cNpU8YoRS/8g== X-IronPort-AV: E=McAfee;i="6000,8403,9867"; a="166429417" X-IronPort-AV: E=Sophos;i="5.79,355,1602572400"; d="scan'208";a="166429417" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Jan 2021 21:58:07 -0800 IronPort-SDR: 6LYNhvCOTjDi/tBLSqmVxNEEDfp+7QtDfnHe718koH4BXh16G7C92oytIiK1Qbrk2bYtLSh7mT POZhTHF5krOQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.79,355,1602572400"; d="scan'208";a="500545634" Received: from fmsmsx605.amr.corp.intel.com ([10.18.126.85]) by orsmga004.jf.intel.com with ESMTP; 17 Jan 2021 21:58:07 -0800 Received: from shsmsx603.ccr.corp.intel.com (10.109.6.143) by fmsmsx605.amr.corp.intel.com (10.18.126.85) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Sun, 17 Jan 2021 21:58:06 -0800 Received: from shsmsx606.ccr.corp.intel.com (10.109.6.216) by SHSMSX603.ccr.corp.intel.com (10.109.6.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Mon, 18 Jan 2021 13:58:04 +0800 Received: from shsmsx606.ccr.corp.intel.com ([10.109.6.216]) by SHSMSX606.ccr.corp.intel.com ([10.109.6.216]) with mapi id 15.01.1713.004; Mon, 18 Jan 2021 13:58:04 +0800 From: "Xie, WeiX" To: "Zhang, AlvinX" , "Guo, Jia" , "Wang, Haiyue" CC: "dev@dpdk.org" , "Zhang, AlvinX" , "stable@dpdk.org" Thread-Topic: [PATCH v5] net/ixgbe: fix configuration of max frame size Thread-Index: AQHW7VdPFYgwKEN2+E6y3EqVUDuTfqos4vrA Date: Mon, 18 Jan 2021 05:58:04 +0000 Message-ID: <8f0788a0133742479f8bb0021d6df9c3@intel.com> References: <20210115100829.31980-1-alvinx.zhang@intel.com> <20210118050341.1460-1-alvinx.zhang@intel.com> In-Reply-To: <20210118050341.1460-1-alvinx.zhang@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.36] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [dpdk-dev] [PATCH v5] net/ixgbe: fix configuration of max frame size X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Tested-by: Xie,WeiX < weix.xie@intel.com> Regards, Xie Wei > -----Original Message----- > From: Zhang,Alvin [mailto:alvinx.zhang@intel.com] > Sent: Monday, January 18, 2021 1:04 PM > To: Guo, Jia ; Xie, WeiX ; Wang, > Haiyue > Cc: dev@dpdk.org; Zhang, AlvinX ; > stable@dpdk.org > Subject: [PATCH v5] net/ixgbe: fix configuration of max frame size >=20 > From: Alvin Zhang >=20 > For some types of NIC, jumbo frame is not supported in IOV mode, so if a = VF > requests to configure the frame size to not bigger than > RTE_ETHER_MAX_LEN, the kernel driver returns 0, but the DPDK ixgbe PMD > returens -1, this will cause the VF to fail to start when the PF driven b= y DPDK > ixgbe PMD. >=20 > This patch keeps ixgbe PMD's handling mode consistent with kernel driver = in > above situation. >=20 > In addition, the value set by the command IXGBE_VF_SET_LPE represents > the max frame size, not the mtu. >=20 > Fixes: 1b9ea09c067b ("ixgbe: support X550") > Fixes: 95a27b3ba5f5 ("net/ixgbe: enable jumbo frame for VF") > Cc: stable@dpdk.org >=20 > Signed-off-by: Alvin Zhang > --- >=20 > V3: Restore variable name from cur_frame_size to max_frs. > V4: Update git log and add notes. > V5: Add check for VF api version. > --- > drivers/net/ixgbe/ixgbe_pf.c | 43 > +++++++++++++++++++++++++++++++++++-------- > 1 file changed, 35 insertions(+), 8 deletions(-) >=20 > diff --git a/drivers/net/ixgbe/ixgbe_pf.c b/drivers/net/ixgbe/ixgbe_pf.c > index 833863a..793f970 100644 > --- a/drivers/net/ixgbe/ixgbe_pf.c > +++ b/drivers/net/ixgbe/ixgbe_pf.c > @@ -552,20 +552,47 @@ int ixgbe_pf_host_configure(struct rte_eth_dev > *eth_dev) } >=20 > static int > -ixgbe_set_vf_lpe(struct rte_eth_dev *dev, __rte_unused uint32_t vf, > uint32_t *msgbuf) > +ixgbe_set_vf_lpe(struct rte_eth_dev *dev, uint32_t vf, uint32_t > +*msgbuf) > { > struct ixgbe_hw *hw =3D IXGBE_DEV_PRIVATE_TO_HW(dev->data- > >dev_private); > - uint32_t new_mtu =3D msgbuf[1]; > + uint32_t max_frame =3D msgbuf[1]; > uint32_t max_frs; > uint32_t hlreg0; > - int max_frame =3D new_mtu + RTE_ETHER_HDR_LEN + > RTE_ETHER_CRC_LEN; >=20 > /* X540 and X550 support jumbo frames in IOV mode */ > if (hw->mac.type !=3D ixgbe_mac_X540 && > hw->mac.type !=3D ixgbe_mac_X550 && > hw->mac.type !=3D ixgbe_mac_X550EM_x && > - hw->mac.type !=3D ixgbe_mac_X550EM_a) > - return -1; > + hw->mac.type !=3D ixgbe_mac_X550EM_a) { > + struct ixgbe_vf_info *vfinfo =3D > + *IXGBE_DEV_PRIVATE_TO_P_VFDATA(dev->data- > >dev_private); > + > + switch (vfinfo[vf].api_version) { > + case ixgbe_mbox_api_11: > + case ixgbe_mbox_api_12: > + case ixgbe_mbox_api_13: > + /** > + * Version 1.1 supports jumbo frames on VFs if PF > has > + * jumbo frames enabled which means legacy VFs > are > + * disabled > + */ > + if (dev->data->dev_conf.rxmode.max_rx_pkt_len > > + RTE_ETHER_MAX_LEN) > + break; > + /* fall through */ > + default: > + /** > + * If the PF or VF are running jumbo frames enabled, > + * return -1 since cannot support jumbo frames on > + * legacy VFs. > + */ > + if (max_frame > RTE_ETHER_MAX_LEN || > + dev->data->dev_conf.rxmode.max_rx_pkt_len > > + RTE_ETHER_MAX_LEN) > + return -1; > + break; > + } > + } >=20 > if (max_frame < RTE_ETHER_MIN_LEN || > max_frame > > RTE_ETHER_MAX_JUMBO_FRAME_LEN) @@ -573,9 +600,9 @@ int > ixgbe_pf_host_configure(struct rte_eth_dev *eth_dev) >=20 > max_frs =3D (IXGBE_READ_REG(hw, IXGBE_MAXFRS) & > IXGBE_MHADD_MFS_MASK) >> > IXGBE_MHADD_MFS_SHIFT; > - if (max_frs < new_mtu) { > + if (max_frs < max_frame) { > hlreg0 =3D IXGBE_READ_REG(hw, IXGBE_HLREG0); > - if (new_mtu > RTE_ETHER_MAX_LEN) { > + if (max_frame > RTE_ETHER_MAX_LEN) { > dev->data->dev_conf.rxmode.offloads |=3D > DEV_RX_OFFLOAD_JUMBO_FRAME; > hlreg0 |=3D IXGBE_HLREG0_JUMBOEN; > @@ -586,7 +613,7 @@ int ixgbe_pf_host_configure(struct rte_eth_dev > *eth_dev) > } > IXGBE_WRITE_REG(hw, IXGBE_HLREG0, hlreg0); >=20 > - max_frs =3D new_mtu << IXGBE_MHADD_MFS_SHIFT; > + max_frs =3D max_frame << IXGBE_MHADD_MFS_SHIFT; > IXGBE_WRITE_REG(hw, IXGBE_MAXFRS, max_frs); > } >=20 > -- > 1.8.3.1