From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jakub Kicinski Subject: [PATCH bpf-next 05/14] nfp: bpf: allow disabling TC offloads when XDP active Date: Tue, 9 Jan 2018 21:07:33 -0800 Message-ID: <20180110050742.26226-6-jakub.kicinski@netronome.com> References: <20180110050742.26226-1-jakub.kicinski@netronome.com> Cc: netdev@vger.kernel.org, oss-drivers@netronome.com, Jakub Kicinski To: daniel@iogearbox.net, alexei.starovoitov@gmail.com Return-path: Received: from mail-pl0-f67.google.com ([209.85.160.67]:36449 "EHLO mail-pl0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751165AbeAJFIC (ORCPT ); Wed, 10 Jan 2018 00:08:02 -0500 Received: by mail-pl0-f67.google.com with SMTP id b12so6641282plm.3 for ; Tue, 09 Jan 2018 21:08:02 -0800 (PST) In-Reply-To: <20180110050742.26226-1-jakub.kicinski@netronome.com> Sender: netdev-owner@vger.kernel.org List-ID: TC BPF offload was added first, so we used to assume that the ethtool TC HW offload flag cannot be touched whenever any BPF program is loaded on the NIC. This unncessarily limits changes to the TC flag when offloaded program is XDP. Signed-off-by: Jakub Kicinski --- drivers/net/ethernet/netronome/nfp/bpf/main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/netronome/nfp/bpf/main.c b/drivers/net/ethernet/netronome/nfp/bpf/main.c index 978086580ca0..50b16b6cad0b 100644 --- a/drivers/net/ethernet/netronome/nfp/bpf/main.c +++ b/drivers/net/ethernet/netronome/nfp/bpf/main.c @@ -191,7 +191,9 @@ static int nfp_bpf_setup_tc(struct nfp_app *app, struct net_device *netdev, static bool nfp_bpf_tc_busy(struct nfp_app *app, struct nfp_net *nn) { - return nn->dp.ctrl & NFP_NET_CFG_CTRL_BPF; + struct nfp_bpf_vnic *bv = nn->app_priv; + + return !!bv->tc_prog; } static int -- 2.15.1