From patchwork Wed Mar 3 15:51:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maciej Fijalkowski X-Patchwork-Id: 12114497 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B4BD5C433E0 for ; Wed, 3 Mar 2021 22:57:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7C00C64EFE for ; Wed, 3 Mar 2021 22:57:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1391873AbhCCWvQ (ORCPT ); Wed, 3 Mar 2021 17:51:16 -0500 Received: from mga14.intel.com ([192.55.52.115]:41913 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235533AbhCCQFh (ORCPT ); Wed, 3 Mar 2021 11:05:37 -0500 IronPort-SDR: CI+b+4koub3UurnUUIycbVFsFEt56aUMfDXmbeQlHn6I0e3r0IMjY9qrDqZ4SGk52UN6Deu6HW IVFEcXgyKLKA== X-IronPort-AV: E=McAfee;i="6000,8403,9912"; a="186571032" X-IronPort-AV: E=Sophos;i="5.81,220,1610438400"; d="scan'208";a="186571032" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Mar 2021 08:01:53 -0800 IronPort-SDR: iedCUswGS6augWsSStBe8ZUY+YKLc8Sa+wgoN5VT7SWepg12E6ReoWFy1gtmf0y1lPcpru2Kib KYYjQ1EZM7jA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,220,1610438400"; d="scan'208";a="445323940" Received: from ranger.igk.intel.com ([10.102.21.164]) by orsmga001.jf.intel.com with ESMTP; 03 Mar 2021 08:01:51 -0800 From: Maciej Fijalkowski To: daniel@iogearbox.net, ast@kernel.org, bpf@vger.kernel.org Cc: bjorn.topel@intel.com, magnus.karlsson@intel.com, john.fastabend@gmail.com, Maciej Fijalkowski Subject: [PATCH bpf 1/3] xsk: remove dangling function declaration from header file Date: Wed, 3 Mar 2021 16:51:55 +0100 Message-Id: <20210303155158.15953-2-maciej.fijalkowski@intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210303155158.15953-1-maciej.fijalkowski@intel.com> References: <20210303155158.15953-1-maciej.fijalkowski@intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org X-Patchwork-Delegate: bpf@iogearbox.net xdp_umem_query() is dead for a long time, drop the declaration from include/linux/netdevice.h Fixes: c9b47cc1fabc ("xsk: fix bug when trying to use both copy and zero-copy on one queue id") Signed-off-by: Maciej Fijalkowski Acked-by: Björn Töpel --- include/linux/netdevice.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 6cef47b76cc6..226303976310 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -3932,8 +3932,6 @@ int dev_change_xdp_fd(struct net_device *dev, struct netlink_ext_ack *extack, int bpf_xdp_link_attach(const union bpf_attr *attr, struct bpf_prog *prog); u32 dev_xdp_prog_id(struct net_device *dev, enum bpf_xdp_mode mode); -int xdp_umem_query(struct net_device *dev, u16 queue_id); - int __dev_forward_skb(struct net_device *dev, struct sk_buff *skb); int dev_forward_skb(struct net_device *dev, struct sk_buff *skb); int dev_forward_skb_nomtu(struct net_device *dev, struct sk_buff *skb); From patchwork Wed Mar 3 15:51:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maciej Fijalkowski X-Patchwork-Id: 12114501 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3A36BC433DB for ; Wed, 3 Mar 2021 22:57:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0CAF864EF9 for ; Wed, 3 Mar 2021 22:57:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1445485AbhCCWvg (ORCPT ); Wed, 3 Mar 2021 17:51:36 -0500 Received: from mga14.intel.com ([192.55.52.115]:42559 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235237AbhCCQF5 (ORCPT ); Wed, 3 Mar 2021 11:05:57 -0500 IronPort-SDR: P681GkAizM32eNqjEqUMR+5Z7a3Q9J28KxukXzQCX3mkzeHNhFjW5aAmQF3lPE6dU9VkYSEcxH Kca0pczKrIcw== X-IronPort-AV: E=McAfee;i="6000,8403,9912"; a="186571043" X-IronPort-AV: E=Sophos;i="5.81,220,1610438400"; d="scan'208";a="186571043" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Mar 2021 08:01:55 -0800 IronPort-SDR: YA81s8hQgCDP8PgteyGBgaAF/2iLH8hitk1E9+xokrTtPUsZeKzm1py0Iq6cTpxwLdqJvk1SOu UgcCUW/WIc+w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,220,1610438400"; d="scan'208";a="445323963" Received: from ranger.igk.intel.com ([10.102.21.164]) by orsmga001.jf.intel.com with ESMTP; 03 Mar 2021 08:01:53 -0800 From: Maciej Fijalkowski To: daniel@iogearbox.net, ast@kernel.org, bpf@vger.kernel.org Cc: bjorn.topel@intel.com, magnus.karlsson@intel.com, john.fastabend@gmail.com, Maciej Fijalkowski Subject: [PATCH bpf 2/3] samples: bpf: add missing munmap in xdpsock Date: Wed, 3 Mar 2021 16:51:56 +0100 Message-Id: <20210303155158.15953-3-maciej.fijalkowski@intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210303155158.15953-1-maciej.fijalkowski@intel.com> References: <20210303155158.15953-1-maciej.fijalkowski@intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org X-Patchwork-Delegate: bpf@iogearbox.net We mmap the umem region, but we never munmap it. Add the missing call at the end of the cleanup. Fixes: 3945b37a975d ("samples/bpf: use hugepages in xdpsock app") Signed-off-by: Maciej Fijalkowski Acked-by: Björn Töpel --- samples/bpf/xdpsock_user.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/samples/bpf/xdpsock_user.c b/samples/bpf/xdpsock_user.c index db0cb73513a5..1e2a1105d0e6 100644 --- a/samples/bpf/xdpsock_user.c +++ b/samples/bpf/xdpsock_user.c @@ -1699,5 +1699,7 @@ int main(int argc, char **argv) xdpsock_cleanup(); + munmap(bufs, NUM_FRAMES * opt_xsk_frame_size); + return 0; } From patchwork Wed Mar 3 15:51:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maciej Fijalkowski X-Patchwork-Id: 12114503 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7D97AC433E9 for ; Wed, 3 Mar 2021 22:57:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4F93464F0B for ; Wed, 3 Mar 2021 22:57:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1449535AbhCCWwB (ORCPT ); Wed, 3 Mar 2021 17:52:01 -0500 Received: from mga14.intel.com ([192.55.52.115]:41913 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1384426AbhCCQIB (ORCPT ); Wed, 3 Mar 2021 11:08:01 -0500 IronPort-SDR: dmCBhNOpLnYFj4huJwDYDBXOzXxm5k79lvLLV2WR2vIyqjaIepJDHxx3JidxOAYIjVBXxVR138 nCIcINm0iHiQ== X-IronPort-AV: E=McAfee;i="6000,8403,9912"; a="186571055" X-IronPort-AV: E=Sophos;i="5.81,220,1610438400"; d="scan'208";a="186571055" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Mar 2021 08:01:57 -0800 IronPort-SDR: QJ+2Vak3ixVm919wKu4HuWEhsXh7ahLoEGrVV/1Yf75Dk9UA4Su0Ci7ZQvdi3/tonEjY295JoT dHny2koXIzVA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,220,1610438400"; d="scan'208";a="445323977" Received: from ranger.igk.intel.com ([10.102.21.164]) by orsmga001.jf.intel.com with ESMTP; 03 Mar 2021 08:01:55 -0800 From: Maciej Fijalkowski To: daniel@iogearbox.net, ast@kernel.org, bpf@vger.kernel.org Cc: bjorn.topel@intel.com, magnus.karlsson@intel.com, john.fastabend@gmail.com, Maciej Fijalkowski Subject: [PATCH bpf 3/3] libbpf: clear map_info before each bpf_obj_get_info_by_fd Date: Wed, 3 Mar 2021 16:51:57 +0100 Message-Id: <20210303155158.15953-4-maciej.fijalkowski@intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210303155158.15953-1-maciej.fijalkowski@intel.com> References: <20210303155158.15953-1-maciej.fijalkowski@intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org X-Patchwork-Delegate: bpf@iogearbox.net xsk_lookup_bpf_maps, based on prog_fd, looks whether current prog has a reference to XSKMAP. BPF prog can include insns that work on various BPF maps and this is covered by iterating through map_ids. The bpf_map_info that is passed to bpf_obj_get_info_by_fd for filling needs to be cleared at each iteration, so that it doesn't contain any outdated fields and that is currently missing in the function of interest. To fix that, zero-init map_info via memset before each bpf_obj_get_info_by_fd call. Also, since the area of this code is touched, in general strcmp is considered harmful, so let's convert it to strncmp and provide the length of the array name from current map_info. Last but not least, do s/continue/break/ once we have found the xsks_map to terminate the search. Fixes: 5750902a6e9b ("libbpf: proper XSKMAP cleanup") Signed-off-by: Maciej Fijalkowski --- tools/lib/bpf/xsk.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/lib/bpf/xsk.c b/tools/lib/bpf/xsk.c index ffbb588724d8..e56b2d76efc2 100644 --- a/tools/lib/bpf/xsk.c +++ b/tools/lib/bpf/xsk.c @@ -610,15 +610,16 @@ static int xsk_lookup_bpf_maps(struct xsk_socket *xsk) if (fd < 0) continue; + memset(&map_info, 0, map_len); err = bpf_obj_get_info_by_fd(fd, &map_info, &map_len); if (err) { close(fd); continue; } - if (!strcmp(map_info.name, "xsks_map")) { + if (!strncmp(map_info.name, "xsks_map", strlen(map_info.name))) { ctx->xsks_map_fd = fd; - continue; + break; } close(fd);