From patchwork Sat Dec 16 00:29:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 849430 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=netronome-com.20150623.gappssmtp.com header.i=@netronome-com.20150623.gappssmtp.com header.b="avTBJeP6"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yz7VX6tN7z9s7B for ; Sat, 16 Dec 2017 11:30:12 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755972AbdLPA3c (ORCPT ); Fri, 15 Dec 2017 19:29:32 -0500 Received: from mail-pf0-f194.google.com ([209.85.192.194]:41102 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755834AbdLPA3b (ORCPT ); Fri, 15 Dec 2017 19:29:31 -0500 Received: by mail-pf0-f194.google.com with SMTP id j28so7268829pfk.8 for ; Fri, 15 Dec 2017 16:29:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netronome-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=JCdnWwW7Bn4813JXgkbFAd0Dwi7YFxPw7MXHHV6ypzU=; b=avTBJeP6vu3HktYzU/Flzlp2Nt68Dt5kGf+NqPxLnP5R0WHM9/DIipUOTYCZRRxEKa cfnU0wdZ0rdiiccxsnUSDVxywlxP2W2UK8oIbGyNMibTcE4V2DlyMLnsGgHJmY1qScR7 dYv3m6gWGgkhdoHfeoOnb5xij5lMPlP8j0pT1b4ltPTln4+oIIQBBIErIFjpU4mbCBXl oNklHz3yBnY57rIuMSsFOoyTJMrPDRpXp1ygYkaSp7ZdMJg0QL7OVcDxeY4u5OfuThwW jUhGbQpQ6eyw/w1GcszltAcuYe1tCM8Lg9gTb9Rlq1Ho/j6ZSVeYSUrkum7W2k1fmXse 6BpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=JCdnWwW7Bn4813JXgkbFAd0Dwi7YFxPw7MXHHV6ypzU=; b=K/WTMKIWs7NQiSbpZeseV5OGnnqIeTYQWKNfUUlwwWkf6cB+ZAyaW92zeJO515bNWb lCJ+J3qt4m7oC2C/tnw1ekqri3USuRoZhg6uH22zE4h9KjzTKQP1bsvi0cR5qXdvjaef M9QYERdri2tCujSbbj2pa17PP/8mztYCzpfZ1/mndomnMS2tihIGEPWnCGQdIIz7/W0/ BFXTSWKHoRqn+ulpQVoettpOwIRyi+HrCTSOF+/eE+LMVt8dwUlKCJOnj1pwaNmg0O2W 2rzcV7PkOywWNCiT4X7dIm5XR/FxDYwBcIg3+GmP1NKAqJ153Ho4sPnxa7RltOMC/wOo qAhg== X-Gm-Message-State: AKGB3mIpPTIOPm9f2OH+S5nOTepgKZJd/UTLf9CA4uARjLiUFFPg/Fk8 NTvrAHA2n4Ohklq9U8sYoUf4FZzP X-Google-Smtp-Source: ACJfBovZ6lBqLBTU1BG4uD9fi8AgLOMZp4jIrG1aArL0b9+iHM5KGcputEFUQIrUaca+7pq1CmAPSA== X-Received: by 10.84.234.198 with SMTP id i6mr2601568plt.384.1513384170317; Fri, 15 Dec 2017 16:29:30 -0800 (PST) Received: from jkicinski-Precision-T1700.netronome.com ([75.53.12.129]) by smtp.gmail.com with ESMTPSA id j5sm12814914pgn.82.2017.12.15.16.29.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 15 Dec 2017 16:29:29 -0800 (PST) From: Jakub Kicinski To: netdev@vger.kernel.org Cc: oss-drivers@netronome.com, daniel@iogearbox.net, alexei.starovoitov@gmail.com, Jakub Kicinski Subject: [PATCH bpf-next] nfp: set flags in the correct member of netdev_bpf Date: Fri, 15 Dec 2017 16:29:13 -0800 Message-Id: <20171216002913.22278-1-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.15.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org netdev_bpf.flags is the input member for installing the program. netdev_bpf.prog_flags is the output member for querying. Set the correct one on query. Fixes: 92f0292b35a0 ("net: xdp: report flags program was installed with on query") Signed-off-by: Jakub Kicinski Reviewed-by: Quentin Monnet --- drivers/net/ethernet/netronome/nfp/nfp_net_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c index ad3e9f6a61e5..0add4870ce2e 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c @@ -3392,7 +3392,7 @@ static int nfp_net_xdp(struct net_device *netdev, struct netdev_bpf *xdp) if (nn->dp.bpf_offload_xdp) xdp->prog_attached = XDP_ATTACHED_HW; xdp->prog_id = nn->xdp_prog ? nn->xdp_prog->aux->id : 0; - xdp->flags = nn->xdp_prog ? nn->xdp_flags : 0; + xdp->prog_flags = nn->xdp_prog ? nn->xdp_flags : 0; return 0; case BPF_OFFLOAD_VERIFIER_PREP: return nfp_app_bpf_verifier_prep(nn->app, nn, xdp);