From patchwork Thu Jul 28 15:11:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cristian Dumitrescu X-Patchwork-Id: 114369 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id C217FA00C5; Thu, 28 Jul 2022 17:13:45 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5E5D242C22; Thu, 28 Jul 2022 17:12:15 +0200 (CEST) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mails.dpdk.org (Postfix) with ESMTP id AF85C42BE1 for ; Thu, 28 Jul 2022 17:12:09 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1659021129; x=1690557129; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=uZX8+4QfKLcqTrRryvdWz4IJDULmCR6po14r0NtwhbI=; b=WdkD4XKi8uGf+Hu2vkw+Al+TVo2+xAJ2vzmcY8jKb3EiaLd1aoQ7HzVB hEM0bIdqhY9zbJb3qnh8QGLMa+DO0CjvLTscPI4Ploa9YO1YN1iwb++4y ClM15M4KZVXvpjJw8Ttm+1EpR2soSDfdQsa0pNiVFYjSN4tc02B9ovWw1 Okfae6CaARQyFmzfsnsqVx0VC+rbMAJhlPPeftxR1tBd+QthzN3ZjrT4y mM+vt0fJeSU5u65ml4bheReGw1FIDu2iVVnFEOqaiDE4bBfRe1OFKhZZz sjW/CpbaQ3q4r5ZBnaVJ+eiLgeEGiL3guGK2NDAfzi4WUF0NnLGvdiOUo Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10422"; a="288547435" X-IronPort-AV: E=Sophos;i="5.93,198,1654585200"; d="scan'208";a="288547435" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Jul 2022 08:12:08 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,198,1654585200"; d="scan'208";a="633727395" Received: from silpixa00400573.ir.intel.com (HELO silpixa00400573.ger.corp.intel.com.) ([10.237.223.157]) by orsmga001.jf.intel.com with ESMTP; 28 Jul 2022 08:12:07 -0700 From: Cristian Dumitrescu To: dev@dpdk.org Cc: "Kamalakannan R ." Subject: [PATCH V6 16/17] examples/pipelines: remove obsolete tap CLI command Date: Thu, 28 Jul 2022 15:11:46 +0000 Message-Id: <20220728151147.603265-17-cristian.dumitrescu@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220728151147.603265-1-cristian.dumitrescu@intel.com> References: <20220718130713.339003-1-cristian.dumitrescu@intel.com> <20220728151147.603265-1-cristian.dumitrescu@intel.com> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Remove the tap CLI command, as the file descriptor I/O ports of the pipeline are now configured trough the I/O specification file. Signed-off-by: Cristian Dumitrescu Signed-off-by: Kamalakannan R. --- examples/pipeline/cli.c | 37 ----------------- examples/pipeline/obj.c | 89 ----------------------------------------- examples/pipeline/obj.h | 18 --------- 3 files changed, 144 deletions(-) diff --git a/examples/pipeline/cli.c b/examples/pipeline/cli.c index d56a830fb7..75c32b9089 100644 --- a/examples/pipeline/cli.c +++ b/examples/pipeline/cli.c @@ -466,32 +466,6 @@ cmd_ring(char **tokens, } } -static const char cmd_tap_help[] = -"tap \n"; - -static void -cmd_tap(char **tokens, - uint32_t n_tokens, - char *out, - size_t out_size, - void *obj) -{ - struct tap *tap; - char *name; - - if (n_tokens < 2) { - snprintf(out, out_size, MSG_ARG_MISMATCH, tokens[0]); - return; - } - name = tokens[1]; - - tap = tap_create(obj, name); - if (tap == NULL) { - snprintf(out, out_size, MSG_CMD_FAIL, tokens[0]); - return; - } -} - static const char cmd_pipeline_codegen_help[] = "pipeline codegen \n"; @@ -2645,7 +2619,6 @@ cmd_help(char **tokens, "List of commands:\n" "\tmempool\n" "\tethdev\n" - "\ttap\n" "\tpipeline codegen\n" "\tpipeline libbuild\n" "\tpipeline build\n" @@ -2690,11 +2663,6 @@ cmd_help(char **tokens, return; } - if (strcmp(tokens[0], "tap") == 0) { - snprintf(out, out_size, "\n%s\n", cmd_tap_help); - return; - } - if ((strcmp(tokens[0], "pipeline") == 0) && (n_tokens == 2) && (strcmp(tokens[1], "codegen") == 0)) { snprintf(out, out_size, "\n%s\n", cmd_pipeline_codegen_help); @@ -2950,11 +2918,6 @@ cli_process(char *in, char *out, size_t out_size, void *obj) return; } - if (strcmp(tokens[0], "tap") == 0) { - cmd_tap(tokens, n_tokens, out, out_size, obj); - return; - } - if (strcmp(tokens[0], "pipeline") == 0) { if ((n_tokens >= 3) && (strcmp(tokens[1], "codegen") == 0)) { diff --git a/examples/pipeline/obj.c b/examples/pipeline/obj.c index 950ab831fb..b7e2316eec 100644 --- a/examples/pipeline/obj.c +++ b/examples/pipeline/obj.c @@ -35,11 +35,6 @@ TAILQ_HEAD(link_list, link); */ TAILQ_HEAD(ring_list, ring); -/* - * tap - */ -TAILQ_HEAD(tap_list, tap); - /* * obj */ @@ -47,7 +42,6 @@ struct obj { struct mempool_list mempool_list; struct link_list link_list; struct ring_list ring_list; - struct tap_list tap_list; }; /* @@ -416,88 +410,6 @@ ring_find(struct obj *obj, const char *name) return NULL; } -/* - * tap - */ -#define TAP_DEV "/dev/net/tun" - -struct tap * -tap_find(struct obj *obj, const char *name) -{ - struct tap *tap; - - if (!obj || !name) - return NULL; - - TAILQ_FOREACH(tap, &obj->tap_list, node) - if (strcmp(tap->name, name) == 0) - return tap; - - return NULL; -} - -struct tap * -tap_next(struct obj *obj, struct tap *tap) -{ - return (tap == NULL) ? - TAILQ_FIRST(&obj->tap_list) : TAILQ_NEXT(tap, node); -} - -#ifndef RTE_EXEC_ENV_LINUX - -struct tap * -tap_create(struct obj *obj __rte_unused, const char *name __rte_unused) -{ - return NULL; -} - -#else - -struct tap * -tap_create(struct obj *obj, const char *name) -{ - struct tap *tap; - struct ifreq ifr; - int fd, status; - - /* Check input params */ - if ((name == NULL) || - tap_find(obj, name)) - return NULL; - - /* Resource create */ - fd = open(TAP_DEV, O_RDWR | O_NONBLOCK); - if (fd < 0) - return NULL; - - memset(&ifr, 0, sizeof(ifr)); - ifr.ifr_flags = IFF_TAP | IFF_NO_PI; /* No packet information */ - strlcpy(ifr.ifr_name, name, IFNAMSIZ); - - status = ioctl(fd, TUNSETIFF, (void *) &ifr); - if (status < 0) { - close(fd); - return NULL; - } - - /* Node allocation */ - tap = calloc(1, sizeof(struct tap)); - if (tap == NULL) { - close(fd); - return NULL; - } - /* Node fill in */ - strlcpy(tap->name, name, sizeof(tap->name)); - tap->fd = fd; - - /* Node add to list */ - TAILQ_INSERT_TAIL(&obj->tap_list, tap, node); - - return tap; -} - -#endif - /* * obj */ @@ -513,7 +425,6 @@ obj_init(void) TAILQ_INIT(&obj->mempool_list); TAILQ_INIT(&obj->link_list); TAILQ_INIT(&obj->ring_list); - TAILQ_INIT(&obj->tap_list); return obj; } diff --git a/examples/pipeline/obj.h b/examples/pipeline/obj.h index af270a8e57..8ea1c414c2 100644 --- a/examples/pipeline/obj.h +++ b/examples/pipeline/obj.h @@ -121,22 +121,4 @@ ring_create(struct obj *obj, struct ring * ring_find(struct obj *obj, const char *name); -/* - * tap - */ -struct tap { - TAILQ_ENTRY(tap) node; - char name[NAME_SIZE]; - int fd; -}; - -struct tap * -tap_find(struct obj *obj, const char *name); - -struct tap * -tap_next(struct obj *obj, struct tap *tap); - -struct tap * -tap_create(struct obj *obj, const char *name); - #endif /* _INCLUDE_OBJ_H_ */