From patchwork Wed Jul 1 20:23:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 72681 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 22945A0350; Wed, 1 Jul 2020 22:26:42 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 76A711D605; Wed, 1 Jul 2020 22:24:32 +0200 (CEST) Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) by dpdk.org (Postfix) with ESMTP id 56A311D42B for ; Wed, 1 Jul 2020 22:24:30 +0200 (CEST) Received: by mail-pg1-f194.google.com with SMTP id d4so12265315pgk.4 for ; Wed, 01 Jul 2020 13:24:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=lRYtaF+oh3FJuppDjSohzXsbUQvY6C3QAo7e8q5ZLaw=; b=0yLUAfodTnj6NsAudWfQpwBA1c39qX5ZMy3e/6YUZYxdVO5HOR94rwY/W7/9lzONmL ABnBT0xSh9BjpUZgv+spQSbefcKFM6rnfm+9MVFGPeC39kglQojRU7zkEdMb/+lo6doQ b6w3qZZgFvmgbadq2kUyXgIervGfR2aMdHMrhKY+rpF0yGEN7pCmIwB9XF8T8xxQisJP 0PITAaP5jqQjE6ka59XasVy7rncGbe1kHadmC9SPtSXY8050FA3lR3Z6FoPYD+2hDg3n ZtX7DtnGjr/xdLF+cxX4eX4JjbGNhHeoOHH9xmdtxlmCRwTw+tlFI3sikAsf4xZ3w9L4 K0Gg== 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:mime-version:content-transfer-encoding; bh=lRYtaF+oh3FJuppDjSohzXsbUQvY6C3QAo7e8q5ZLaw=; b=bsxY/bPFZShsq3KOkPQjzkzl8BTaM66T3B7pm8dAKFMlsKz9HBaEdKf9kx0aiJIXAv znuBQg1TCo5jseR0juISvpo8S3w6y1LU+38CIbjrE2dbYDB9+EHLsrVLRGixy78qmRNX 1NtBg2ddSnfvEfkeudjOEP8AT47gEQrdaafRYImnq8v34QX6+N4SFt8jSeHglZAMUDmR uwbPjuj309PaJd1k+ll0L7NIOQcI1od5jiM1QwDIG3yk/6iQPUeMCC/TLFk9He7jgBku ieciBilYilpYelLSUAPTL1b+nJUTPA3eYAu3DIAZoMlYTw4O7xVFXujm9/U2fby2nhyQ /7KQ== X-Gm-Message-State: AOAM530bQQhRtQv9Crx53fWJQ+dfUe/OW+3AT4h7fpk0MX0mIm4EaqH5 WO3FugnvLuyTjzFn6VYucOGzxLausqg= X-Google-Smtp-Source: ABdhPJxkMP0yR1JaZ8WfyFq5uAkxqa1kJsd9NHFKsjjGiVQI9uA7u8ZJp5oHVndI8QRX+MmySKkWkA== X-Received: by 2002:a63:5509:: with SMTP id j9mr21147758pgb.195.1593635069113; Wed, 01 Jul 2020 13:24:29 -0700 (PDT) Received: from hermes.corp.microsoft.com (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id g8sm6584803pgr.70.2020.07.01.13.24.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2020 13:24:28 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Wed, 1 Jul 2020 13:23:48 -0700 Message-Id: <20200701202359.17006-17-stephen@networkplumber.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200701202359.17006-1-stephen@networkplumber.org> References: <20200604210200.25405-1-stephen@networkplumber.org> <20200701202359.17006-1-stephen@networkplumber.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v4 16/27] examples/ipcsec-secgw: replace references to master lcore 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" Use initial lcore instead. Signed-off-by: Stephen Hemminger Acked-by: Anatoly Burakov --- examples/ipsec-secgw/event_helper.c | 6 +++--- examples/ipsec-secgw/ipsec-secgw.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/ipsec-secgw/event_helper.c b/examples/ipsec-secgw/event_helper.c index 865dc911b864..239c35985bd6 100644 --- a/examples/ipsec-secgw/event_helper.c +++ b/examples/ipsec-secgw/event_helper.c @@ -1461,16 +1461,16 @@ eh_conf_init(void) /* Set two cores as eth cores for Rx & Tx */ - /* Use first core other than master core as Rx core */ + /* Use first core other than initial core as Rx core */ eth_core_id = rte_get_next_lcore(0, /* curr core */ - 1, /* skip master core */ + 1, /* skip initial core */ 0 /* wrap */); rte_bitmap_set(em_conf->eth_core_mask, eth_core_id); /* Use next core as Tx core */ eth_core_id = rte_get_next_lcore(eth_core_id, /* curr core */ - 1, /* skip master core */ + 1, /* skip initial core */ 0 /* wrap */); rte_bitmap_set(em_conf->eth_core_mask, eth_core_id); diff --git a/examples/ipsec-secgw/ipsec-secgw.c b/examples/ipsec-secgw/ipsec-secgw.c index f777ce2afe41..388f7f614ae0 100644 --- a/examples/ipsec-secgw/ipsec-secgw.c +++ b/examples/ipsec-secgw/ipsec-secgw.c @@ -2917,8 +2917,8 @@ main(int32_t argc, char **argv) check_all_ports_link_status(enabled_port_mask); /* launch per-lcore init on every lcore */ - rte_eal_mp_remote_launch(ipsec_launch_one_lcore, eh_conf, CALL_MASTER); - RTE_LCORE_FOREACH_SLAVE(lcore_id) { + rte_eal_mp_remote_launch(ipsec_launch_one_lcore, eh_conf, CALL_INITIAL); + RTE_LCORE_FOREACH_WORKER(lcore_id) { if (rte_eal_wait_lcore(lcore_id) < 0) return -1; }