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=-6.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, 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 200E6C282CE for ; Wed, 24 Apr 2019 17:44:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E5B00218B0 for ; Wed, 24 Apr 2019 17:44:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556127884; bh=FrFiQN2p3zgCfAT3mG0OqJs08s3I4gHd1K4DRXGWIn4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=JhaJ41fK3Fs/2CXz/kps9vzKGGzJIL0NjqiNV2p/i9YdXQH5+cvlNO8NCc8Z7HaQh QqIUFsB2MdrpLtEi5jg8suEmBy19eWpHnhAJoxjjnzofDbXxyei1l/L+2EgZCM7OAx qA3aKHiHPbnivgMvr3WYV2Jt+aaAPwAquJnLFfGw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391652AbfDXReJ (ORCPT ); Wed, 24 Apr 2019 13:34:09 -0400 Received: from mail.kernel.org ([198.145.29.99]:33012 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391647AbfDXReI (ORCPT ); Wed, 24 Apr 2019 13:34:08 -0400 Received: from localhost (62-193-50-229.as16211.net [62.193.50.229]) (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 60A4E2054F; Wed, 24 Apr 2019 17:34:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556127247; bh=FrFiQN2p3zgCfAT3mG0OqJs08s3I4gHd1K4DRXGWIn4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=i8Vq+wnPtotKdP1JldTbrZcFnyVKvlqn4knimOS8p5DVHB5EjhO52Ls0ef6LaUasA e0hQWZXOgW0GeIczHeG494JPl3BE+3ba13mIEvMoPblAYSgpduK2QHoi73jp+loSi2 jXCLGxu7kBaA2sycoGKIdlYbzupnoAIyXYUS6t1Y= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Matteo Croce , Jesper Dangaard Brouer , "David S. Miller" Subject: [PATCH 5.0 021/115] net: thunderx: dont allow jumbo frames with XDP Date: Wed, 24 Apr 2019 19:09:17 +0200 Message-Id: <20190424170926.302302414@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190424170924.797924502@linuxfoundation.org> References: <20190424170924.797924502@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 From: Matteo Croce [ Upstream commit 1f227d16083b2e280b7dde4ca78883d75593f2fd ] The thunderx driver forbids to load an eBPF program if the MTU is too high, but this can be circumvented by loading the eBPF, then raising the MTU. Fix this by limiting the MTU if an eBPF program is already loaded. Fixes: 05c773f52b96e ("net: thunderx: Add basic XDP support") Signed-off-by: Matteo Croce Acked-by: Jesper Dangaard Brouer Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/cavium/thunder/nicvf_main.c | 9 +++++++++ 1 file changed, 9 insertions(+) --- a/drivers/net/ethernet/cavium/thunder/nicvf_main.c +++ b/drivers/net/ethernet/cavium/thunder/nicvf_main.c @@ -1589,6 +1589,15 @@ static int nicvf_change_mtu(struct net_d struct nicvf *nic = netdev_priv(netdev); int orig_mtu = netdev->mtu; + /* For now just support only the usual MTU sized frames, + * plus some headroom for VLAN, QinQ. + */ + if (nic->xdp_prog && new_mtu > MAX_XDP_MTU) { + netdev_warn(netdev, "Jumbo frames not yet supported with XDP, current MTU %d.\n", + netdev->mtu); + return -EINVAL; + } + netdev->mtu = new_mtu; if (!netif_running(netdev))