Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp850176yba; Wed, 24 Apr 2019 10:35:53 -0700 (PDT) X-Google-Smtp-Source: APXvYqzkdgqjx6QAGmfkurodHmnNSLffWTF9SljcJVq1lmVtvyONBtRY5Sq11W+aoVaA6qL1b8O6 X-Received: by 2002:a17:902:e08a:: with SMTP id cb10mr4317610plb.160.1556127353382; Wed, 24 Apr 2019 10:35:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556127353; cv=none; d=google.com; s=arc-20160816; b=fbUCVfWiq2KBg31AtRjDt8ofJTvBvCKIaCqh3SMQl2LaDwVT9/noqgMy4hJiUhs0Jb 2pSps3eJD30CW1R7P9RbnAvw/rKhXKHrQD8qwB3rrLRvkkIGqhfe8mJD11KeKpSFuOLj BPu8QQYQUHPsaaEicHG9YllDgSAYFgl7gIW96xPPR++n7/Cr999JXV/casXCQn/1x5U2 dbNqAiEaUptPuEB53jFmTa5NrK9Zjmiw2+tiaGLNCFD6fvFn6GuKqoaZKoUxe0ElmB4x bJPCJN3Cwy6B6BMsZWChwOIaJ19ulgW/4U27dXJi17Hxlr6uya1kdkOCxIGFPkK6kj1J ZbgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=AuhN1zswpiRpBpLNX/csCf0/GqdQ4asMyB8C7t5rSuA=; b=wTERGFkC/B6tjrncRIwICqTcDNasbzI7+YtZISqYg+NxK1rHZMOineNaAyWihwn9/R nEJV+fBNTlS1VBSjaBVXRmgDysyp0QFchsMuwGNikuviesf6uxICOoc4AZHjvh0UVAM9 QYFFJl/UvjbyYernEZ26fPYkpt9yyp1jG/TRRPFwG/z4ehrFjl7dV25rm4cNeIRZzYXE 1rsT7s/ORGzHeD0sRLcBIoWL72gvahrhEjCoBRKz6YXTQJ1/+93Db+Lu20Jr4X3iKfIE Jcwx/crL4S9u7Vru2+iVKP2n0+qNPamlXNt2qVo12NtuaESXbwTRDyxvPPM/HQI90+qL oC4w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=i8Vq+wnP; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e96si16652951plb.0.2019.04.24.10.35.37; Wed, 24 Apr 2019 10:35:53 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=i8Vq+wnP; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391660AbfDXReL (ORCPT + 99 others); Wed, 24 Apr 2019 13:34:11 -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: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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))