From patchwork Wed Sep 27 13:52:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tushar Vyavahare X-Patchwork-Id: 13400797 Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D38537498; Wed, 27 Sep 2023 13:31:32 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 34245FC; Wed, 27 Sep 2023 06:31:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1695821491; x=1727357491; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=fBJZ3rbyTWZWeVhQsWPtDf4vOzMaUCQneqrbU4n2/t0=; b=Ot7YyJ6lWHxAIMXaXmEd/9uBUafV3g2lDGLHmImneYocReVn8mbXisqP 3ojjsMomSd6FAj/3hKbTouOGyce7CHmUfceU/X6XQLC/WDDQ+VMJ5n/I/ K5beMXp9NAq/eXlHddn/lxwV5rvVHNZQrdinCfzcxZygZeMQmMso0OgWW CuHqcA3xhdSM2/d+KS9LUCpCNbuIT8bD04eHGBN7SpYwD5LlBq+LaGpvj zY10WxMB7XS6qgDiYEBplAA5pzqh5R325OwVp3cwR+uFIf6xzT6L/4qGH cv17Nu/8KKrpk9ATx/tbLbDWvx65iYimamTB7klELRvU1Fcb2IZsUJvMS g==; X-IronPort-AV: E=McAfee;i="6600,9927,10846"; a="448316237" X-IronPort-AV: E=Sophos;i="6.03,181,1694761200"; d="scan'208";a="448316237" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Sep 2023 06:31:24 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10846"; a="698878513" X-IronPort-AV: E=Sophos;i="6.03,181,1694761200"; d="scan'208";a="698878513" Received: from unknown (HELO axxiablr2..) ([10.190.162.200]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Sep 2023 06:31:18 -0700 From: Tushar Vyavahare To: bpf@vger.kernel.org Cc: netdev@vger.kernel.org, bjorn@kernel.org, magnus.karlsson@intel.com, maciej.fijalkowski@intel.com, jonathan.lemon@gmail.com, davem@davemloft.net, kuba@kernel.org, pabeni@redhat.com, ast@kernel.org, daniel@iogearbox.net, tirthendu.sarkar@intel.com, tushar.vyavahare@intel.com Subject: [PATCH bpf-next v3 0/8] Add a test for SHARED_UMEM feature Date: Wed, 27 Sep 2023 19:22:33 +0530 Message-Id: <20230927135241.2287547-1-tushar.vyavahare@intel.com> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net X-Patchwork-Delegate: bpf@iogearbox.net Implement a test for the SHARED_UMEM feature in this patch set and make necessary changes/improvements. Ensure that the framework now supports different streams for different sockets. v2->v3 - Set the sock_num at the end of the while loop. - Declare xsk at the top of the while loop. v1->v2 - Remove generate_mac_addresses() and generate mac addresses based on the number of sockets in __test_spec_init() function. [Magnus] - Update Makefile to include find_bit.c for compiling xskxceiver. - Add bitmap_full() function to verify all bits are set to break the while loop in the receive_pkts() and send_pkts() functions. - Replace __test_and_set_bit() function with __set_bit() function. - Add single return check for wait_for_tx_completion() function call. Patch series summary: 1: Move the packet stream from the ifobject struct to the xsk_socket_info struct to enable the use of different streams for different sockets This will facilitate the sending and receiving of data from multiple sockets simultaneously using the SHARED_XDP_UMEM feature. It gives flexibility of send/recive individual traffic on particular socket. 2: Rename the header file to a generic name so that it can be used by all future XDP programs. 3: Move the src_mac and dst_mac fields from the ifobject structure to the xsk_socket_info structure to achieve per-socket MAC address assignment. Require this in order to steer traffic to various sockets in subsequent patches. 4: Improve the receive_pkt() function to enable it to receive packets from multiple sockets. Define a sock_num variable to iterate through all the sockets in the Rx path. Add nb_valid_entries to check that all the expected number of packets are received. 5: The pkt_set() function no longer needs the umem parameter. This commit removes the umem parameter from the pkt_set() function. 6: Iterate over all the sockets in the send pkts function. Update send_pkts() to handle multiple sockets for sending packets. Multiple TX sockets are utilized alternately based on the batch size for improve packet transmission. 7: Modify xsk_update_xskmap() to accept the index as an argument, enabling the addition of multiple sockets to xskmap. 8: Add a new test for testing shared umem feature. This is accomplished by adding a new XDP program and using the multiple sockets. The new XDP program redirects the packets based on the destination MAC address. Tushar Vyavahare (8): selftests/xsk: move pkt_stream to the xsk_socket_info selftests/xsk: rename xsk_xdp_metadata.h to xsk_xdp_common.h selftests/xsk: move src_mac and dst_mac to the xsk_socket_info selftests/xsk: iterate over all the sockets in the receive pkts function selftests/xsk: remove unnecessary parameter from pkt_set() function call selftests/xsk: iterate over all the sockets in the send pkts function selftests/xsk: modify xsk_update_xskmap() to accept the index as an argument selftests/xsk: add a test for shared umem feature tools/testing/selftests/bpf/Makefile | 4 +- .../selftests/bpf/progs/xsk_xdp_progs.c | 22 +- tools/testing/selftests/bpf/xsk.c | 3 +- tools/testing/selftests/bpf/xsk.h | 2 +- tools/testing/selftests/bpf/xsk_xdp_common.h | 12 + .../testing/selftests/bpf/xsk_xdp_metadata.h | 5 - tools/testing/selftests/bpf/xskxceiver.c | 513 +++++++++++------- tools/testing/selftests/bpf/xskxceiver.h | 13 +- 8 files changed, 363 insertions(+), 211 deletions(-) create mode 100644 tools/testing/selftests/bpf/xsk_xdp_common.h delete mode 100644 tools/testing/selftests/bpf/xsk_xdp_metadata.h Acked-by: Magnus Karlsson