From mboxrd@z Thu Jan 1 00:00:00 1970 From: Martin KaFai Lau Subject: [PATCH net-next 06/10] bpf: thunderx: Report bpf_prog ID during XDP_QUERY_PROG Date: Mon, 12 Jun 2017 18:00:21 -0700 Message-ID: <20170613010025.2983342-7-kafai@fb.com> References: <20170613010025.2983342-1-kafai@fb.com> Mime-Version: 1.0 Content-Type: text/plain Cc: Alexei Starovoitov , Daniel Borkmann , , Sunil Goutham To: Return-path: Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:52086 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753158AbdFMBA3 (ORCPT ); Mon, 12 Jun 2017 21:00:29 -0400 Received: from pps.filterd (m0109333.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.0.20/8.16.0.20) with SMTP id v5D0xmZY001880 for ; Mon, 12 Jun 2017 18:00:28 -0700 Received: from mail.thefacebook.com ([199.201.64.23]) by mx0a-00082601.pphosted.com with ESMTP id 2b1wwd1yqm-1 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT) for ; Mon, 12 Jun 2017 18:00:28 -0700 Received: from facebook.com (2401:db00:11:d09a:face:0:41:0) by mx-out.facebook.com (10.212.236.89) with ESMTP id b081e0224fd311e7bc860002c95209d8-773368f0 for ; Mon, 12 Jun 2017 18:00:27 -0700 In-Reply-To: <20170613010025.2983342-1-kafai@fb.com> Sender: netdev-owner@vger.kernel.org List-ID: Add support to thunderx to report bpf_prog ID during XDP_QUERY_PROG. Signed-off-by: Martin KaFai Lau Cc: Sunil Goutham Acked-by: Alexei Starovoitov Acked-by: Daniel Borkmann --- drivers/net/ethernet/cavium/thunder/nicvf_main.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/cavium/thunder/nicvf_main.c b/drivers/net/ethernet/cavium/thunder/nicvf_main.c index d6477af88085..00f8247f2a9a 100644 --- a/drivers/net/ethernet/cavium/thunder/nicvf_main.c +++ b/drivers/net/ethernet/cavium/thunder/nicvf_main.c @@ -1761,9 +1761,16 @@ static int nicvf_xdp(struct net_device *netdev, struct netdev_xdp *xdp) switch (xdp->command) { case XDP_SETUP_PROG: return nicvf_xdp_setup(nic, xdp->prog); - case XDP_QUERY_PROG: - xdp->prog_attached = !!nic->xdp_prog; + case XDP_QUERY_PROG: { + const struct bpf_prog *xdp_prog; + + xdp_prog = READ_ONCE(nic->xdp_prog); + if (xdp_prog) + xdp->prog_id = xdp_prog->aux->id; + else + xdp->prog_id = 0; return 0; + } default: return -EINVAL; } -- 2.9.3