From patchwork Tue Jun 13 01:00:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin KaFai Lau X-Patchwork-Id: 774906 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3wmrzq281Fz9s7F for ; Tue, 13 Jun 2017 11:00:55 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=fb.com header.i=@fb.com header.b="axrTz4Ae"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753227AbdFMBAa (ORCPT ); Mon, 12 Jun 2017 21:00:30 -0400 Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:33210 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752927AbdFMBA2 (ORCPT ); Mon, 12 Jun 2017 21:00:28 -0400 Received: from pps.filterd (m0109334.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.0.20/8.16.0.20) with SMTP id v5D0vNuZ024155 for ; Mon, 12 Jun 2017 18:00:28 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=facebook; bh=3nrAFQkqJgC78MlrTiohNX7JFBIe0KazhIejMn+Zx9U=; b=axrTz4Aevn6UJk9OILGmozKBflR3whCSSmWODYnSVqgfXlCgPnQjcoo9qKTkyhQKnAsh /js4d+YfXyxp3HGWdeVEBbf07qA9jhTz5L4kb7Opuq4a2xhNJ/cEi0aHE6ZggorPJqyO 7KWwQDHM5B8ByIuARe/H78/m4+t5jOIPE0w= Received: from mail.thefacebook.com ([199.201.64.23]) by mx0a-00082601.pphosted.com with ESMTP id 2b22448tgy-1 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT) for ; Mon, 12 Jun 2017 18:00:28 -0700 Received: from mx-out.facebook.com (192.168.52.123) by PRN-CHUB09.TheFacebook.com (192.168.16.19) with Microsoft SMTP Server (TLS) id 14.3.319.2; Mon, 12 Jun 2017 18:00:27 -0700 Received: from facebook.com (2401:db00:11:d09a:face:0:41:0) by mx-out.facebook.com (10.212.232.59) with ESMTP id aff7f3da4fd311e79aa20002c991e86a-89376b0 for ; Mon, 12 Jun 2017 18:00:26 -0700 Received: by devbig738.prn1.facebook.com (Postfix, from userid 6611) id ECE4C4A4356D; Mon, 12 Jun 2017 18:00:25 -0700 (PDT) Smtp-Origin-Hostprefix: devbig From: Martin KaFai Lau Smtp-Origin-Hostname: devbig738.prn1.facebook.com To: CC: Alexei Starovoitov , Daniel Borkmann , , Tariq Toukan , Saeed Mahameed Smtp-Origin-Cluster: prn1c29 Subject: [PATCH net-next 02/10] bpf: mlx4: Report bpf_prog ID during XDP_QUERY_PROG Date: Mon, 12 Jun 2017 18:00:17 -0700 Message-ID: <20170613010025.2983342-3-kafai@fb.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170613010025.2983342-1-kafai@fb.com> References: <20170613010025.2983342-1-kafai@fb.com> X-FB-Internal: Safe MIME-Version: 1.0 X-Proofpoint-Spam-Reason: safe X-FB-Internal: Safe X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-06-12_13:, , signatures=0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Add support to mlx4 to report bpf_prog ID during XDP_QUERY_PROG. Signed-off-by: Martin KaFai Lau Cc: Tariq Toukan Cc: Saeed Mahameed Acked-by: Alexei Starovoitov Acked-by: Daniel Borkmann --- drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c index c1de75fc399a..ba5233d6e19b 100644 --- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c @@ -2821,11 +2821,25 @@ static int mlx4_xdp_set(struct net_device *dev, struct bpf_prog *prog) return err; } -static bool mlx4_xdp_attached(struct net_device *dev) +static u32 mlx4_xdp_query(struct net_device *dev) { + const struct bpf_prog *xdp_prog; struct mlx4_en_priv *priv = netdev_priv(dev); + struct mlx4_en_dev *mdev = priv->mdev; + u32 prog_id = 0; + + if (!priv->tx_ring_num[TX_XDP]) + return prog_id; + + mutex_lock(&mdev->state_lock); + xdp_prog = rcu_dereference_protected( + priv->rx_ring[0]->xdp_prog, + lockdep_is_held(&mdev->state_lock)); + if (xdp_prog) + prog_id = xdp_prog->aux->id; + mutex_unlock(&mdev->state_lock); - return !!priv->tx_ring_num[TX_XDP]; + return prog_id; } static int mlx4_xdp(struct net_device *dev, struct netdev_xdp *xdp) @@ -2834,7 +2848,7 @@ static int mlx4_xdp(struct net_device *dev, struct netdev_xdp *xdp) case XDP_SETUP_PROG: return mlx4_xdp_set(dev, xdp->prog); case XDP_QUERY_PROG: - xdp->prog_attached = mlx4_xdp_attached(dev); + xdp->prog_id = mlx4_xdp_query(dev); return 0; default: return -EINVAL;