From patchwork Tue Sep 19 21:45:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chas Williams <3chas3@gmail.com> X-Patchwork-Id: 28970 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D3552F94; Tue, 19 Sep 2017 23:45:52 +0200 (CEST) Received: from mail-qk0-f194.google.com (mail-qk0-f194.google.com [209.85.220.194]) by dpdk.org (Postfix) with ESMTP id D69CDF04 for ; Tue, 19 Sep 2017 23:45:51 +0200 (CEST) Received: by mail-qk0-f194.google.com with SMTP id i14so590181qke.3 for ; Tue, 19 Sep 2017 14:45:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=UURfbhEmvbMxSwKKnDJOsuyCcUUDMoxgEg9AyQyvPsY=; b=CSMaHYVuM1X6TDL8Xc3oz0g7/Nca7sFPouvIAF6gypbD7pv6oLmf1Rk235YSi01hlk fkEHvWv4FuGys2WzPLoXrxOBxkiXNmQ9vdrKy/Z3M3YUnbBNbogqIBct6KGRrpEWy/lA SqFfiDNNRr28jnJ8MTMEEcBFrfS5c66UnUJsOhkGtO73Ak8XwMZokqwJj7jfEV8FvF2R muMCn7l4g9uoM5FqKlhHa6NQYsowAZn638fIMMiYMwj7Z1qsMEvbswOvv9xBhwDg3eIn BJcvCkpM3QzRax4wzKlvk2vggFmswP3x50pJs6aoNemyEGpceZofH/pjK2tIGGARWnyJ lazw== 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:in-reply-to :references; bh=UURfbhEmvbMxSwKKnDJOsuyCcUUDMoxgEg9AyQyvPsY=; b=NkDFgNPH7gBUy+JVGGV3NrMoOmXzUPqPghV2DbomWJ+X2ZR0SkANjiBdByANXRDfri F5rXVfkh4TnLGJGL4OvIXzs5uf0z5qw3i4E4/C+C6yev5P63M70Q34TQiVigP2kO5RFV JmzKtUXdW3qbuCjLPZ0jGGzh2eqTgkUJl0NzBxul4Yg8N/uWQgTl8tkd6f1BXWEykkHS uJEU88CQTQkaNzSjBVjqfY6eNUIqviDwTPnxhd50yu2gR9PnDmH9Yswe4MI8jwLFRfLk oZz7viw1GSw9IyG4coN4bVZ7dpaai//YXJNadyZ0sv0OAwFoXrxZ8A+jkXaTjqsdlAUW HLJw== X-Gm-Message-State: AHPjjUiHE3HwwBJ2hcNyw8q+6nmh3gSEPjtdD6oKmmvse1LJLYNbvqMp NyknSICrFSoCwkw/bmv7ka0pzA== X-Google-Smtp-Source: AOwi7QAriD4zRrglWb6jvTdeU6CVGlbu8waFzWync7DRgi6tY/pfjuR9glSrF7kMUZNNL5TnbZzuzQ== X-Received: by 10.233.239.69 with SMTP id d66mr4082958qkg.296.1505857551113; Tue, 19 Sep 2017 14:45:51 -0700 (PDT) Received: from monolith.home (pool-96-255-82-208.washdc.fios.verizon.net. [96.255.82.208]) by smtp.gmail.com with ESMTPSA id v32sm237396qtc.66.2017.09.19.14.45.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 Sep 2017 14:45:50 -0700 (PDT) From: Chas Williams <3chas3@gmail.com> To: dev@dpdk.org Cc: linville@tuxdriver.com, "Charles (Chas) Williams" , Chas Williams Date: Tue, 19 Sep 2017 17:45:45 -0400 Message-Id: <20170919214545.7549-1-3chas3@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20170919212131.7006-1-3chas3@gmail.com> References: <20170919212131.7006-1-3chas3@gmail.com> Subject: [dpdk-dev] [PATCH v2] net/af_packet: make bypass configurable X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: "Charles (Chas) Williams" In certain situations, low speed interfaces, it may be desirable to have the flow control provided by the kernel queueing disciplines. Signed-off-by: Chas Williams Acked-by: Luca Boccassi --- drivers/net/af_packet/rte_eth_af_packet.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/drivers/net/af_packet/rte_eth_af_packet.c b/drivers/net/af_packet/rte_eth_af_packet.c index 7aa26e5..e3858fa 100644 --- a/drivers/net/af_packet/rte_eth_af_packet.c +++ b/drivers/net/af_packet/rte_eth_af_packet.c @@ -59,6 +59,7 @@ #define ETH_AF_PACKET_BLOCKSIZE_ARG "blocksz" #define ETH_AF_PACKET_FRAMESIZE_ARG "framesz" #define ETH_AF_PACKET_FRAMECOUNT_ARG "framecnt" +#define ETH_AF_PACKET_BYPASS_ARG "bypass" #define DFLT_BLOCK_SIZE (1 << 12) #define DFLT_FRAME_SIZE (1 << 11) @@ -115,6 +116,7 @@ static const char *valid_arguments[] = { ETH_AF_PACKET_BLOCKSIZE_ARG, ETH_AF_PACKET_FRAMESIZE_ARG, ETH_AF_PACKET_FRAMECOUNT_ARG, + ETH_AF_PACKET_BYPASS_ARG, NULL }; @@ -559,6 +561,7 @@ rte_pmd_init_internals(struct rte_vdev_device *dev, unsigned int blockcnt, unsigned int framesize, unsigned int framecnt, + unsigned int bypass, struct pmd_internals **internals, struct rte_eth_dev **eth_dev, struct rte_kvargs *kvlist) @@ -580,9 +583,6 @@ rte_pmd_init_internals(struct rte_vdev_device *dev, #if defined(PACKET_FANOUT) int fanout_arg; #endif -#if defined(PACKET_QDISC_BYPASS) - int bypass; -#endif for (k_idx = 0; k_idx < kvlist->count; k_idx++) { pair = &kvlist->pairs[k_idx]; @@ -698,7 +698,6 @@ rte_pmd_init_internals(struct rte_vdev_device *dev, } #if defined(PACKET_QDISC_BYPASS) - bypass = 1; rc = setsockopt(qsockfd, SOL_PACKET, PACKET_QDISC_BYPASS, &bypass, sizeof(bypass)); if (rc == -1) { @@ -851,6 +850,7 @@ rte_eth_from_packet(struct rte_vdev_device *dev, unsigned int framesize = DFLT_FRAME_SIZE; unsigned int framecount = DFLT_FRAME_COUNT; unsigned int qpairs = 1; + unsigned int bypass = 1; /* do some parameter checking */ if (*sockfd < 0) @@ -902,6 +902,16 @@ rte_eth_from_packet(struct rte_vdev_device *dev, } continue; } + if (strstr(pair->key, ETH_AF_PACKET_BYPASS_ARG) != NULL) { + bypass = atoi(pair->value); + if (bypass > 2) { + RTE_LOG(ERR, PMD, + "%s: invalid bypass value\n", + name); + return -1; + } + continue; + } } if (framesize > blocksize) { @@ -927,6 +937,7 @@ rte_eth_from_packet(struct rte_vdev_device *dev, if (rte_pmd_init_internals(dev, *sockfd, qpairs, blocksize, blockcount, framesize, framecount, + bypass, &internals, ð_dev, kvlist) < 0) return -1; @@ -1021,4 +1032,5 @@ RTE_PMD_REGISTER_PARAM_STRING(net_af_packet, "qpairs= " "blocksz= " "framesz= " - "framecnt="); + "framecnt= " + "bypass=");