From patchwork Tue Sep 15 15:11:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 77749 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 B9FBAA04C7; Tue, 15 Sep 2020 17:20:27 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 182601C137; Tue, 15 Sep 2020 17:19:35 +0200 (CEST) Received: from mail-pl1-f195.google.com (mail-pl1-f195.google.com [209.85.214.195]) by dpdk.org (Postfix) with ESMTP id BED821C10C for ; Tue, 15 Sep 2020 17:19:33 +0200 (CEST) Received: by mail-pl1-f195.google.com with SMTP id c3so1515124plz.5 for ; Tue, 15 Sep 2020 08:19:33 -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=1gz3kmI1EzHhv6feLfB9aVZr6+kuS/rBjRm2KdjL7qM=; b=mvBmLKCZEa0+haiXNqcuT4avxwovUx6IB318kLNT86Gsn5rd2UqSZd60ZFSEFpaM4U 22Ge16g0XmgJibolS3NrzgqQRt0j8QVKs1UHrA6M8ls6w9bl2TE0Ba7wCVFAGpOXbRd1 O02Eo5XQ3kOuIpEi5ej4oSTwYSgR63h1o82enU/hCV4eRRSgY5RXqKTRRbJUuect1HTK 7QeB63//FvnlRkpQFQr1LdtZhrocfBJ5AMVxz3QpzrIuDqXDzFjdvRg3uHBRahR/T4ev z0yNSSPeIDvnwKNOr2i+sJKiubK5+g/gP0TRq4XQm7ak+3JlO4d16kXoVnAfOuoVwKAS f7cw== 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=1gz3kmI1EzHhv6feLfB9aVZr6+kuS/rBjRm2KdjL7qM=; b=AerndwPPQmIU1aHlJjtEZ717RNg6tbBrVNzzQ2fQUOhkfnoWV4WkaJqTCgoMg62IT2 kBiNo/oyZKHvOup+cMVIhAtSO5EXPCHw+MBexobMtANMqa8IVn30A3JhfJdVCN1psQDA UH/XxubTR55hVYt8AeeD8GDeY6jhtXOJc+wb5EL63OUdZP3zEJfyonUGAS+sn0mGyoZZ ZlkDxt6wjy62GbRWBEMv8YItabkguPgjAz/Ei1CZqbrSjF4oxPOq3cnsn+fWSASlJWp9 b89j3rCgIcR2Sv649F5CqG1GaC0i+RMUg9U2kDvhwKCo/tbBuB4uRKjn177NQ3+o6qax 8Qtg== X-Gm-Message-State: AOAM531S1OS3MLx2Q6ox7h793UKOkSOym7NhgcvRjQvMoN+kEd2uw+SK gBZIzjHdCkYvWS3K9uOVMhQaOtBzlfZQ5Q== X-Google-Smtp-Source: ABdhPJzEJDhbpgTB+9pShjLmdUcQ5BKrsksLM8VSVdAuDRkhijosrB/Zfe0tvKaPVWsJsOGppRhRVw== X-Received: by 2002:a17:902:eb03:b029:d1:8c50:aafb with SMTP id l3-20020a170902eb03b02900d18c50aafbmr19987405plb.29.1600182709785; Tue, 15 Sep 2020 08:11:49 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id c127sm13742278pfa.165.2020.09.15.08.11.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Sep 2020 08:11:49 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Anatoly Burakov Date: Tue, 15 Sep 2020 08:11:13 -0700 Message-Id: <20200915151114.12024-17-stephen@networkplumber.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200915151114.12024-1-stephen@networkplumber.org> References: <20200911190701.29171-1-stephen@networkplumber.org> <20200915151114.12024-1-stephen@networkplumber.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v3 16/17] examples/ipsec-secgw: replace master lcore with main 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" Simple replacement. Acked-by: Anatoly Burakov Signed-off-by: Stephen Hemminger --- 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..bd60f0359b59 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 main core as Rx core */ eth_core_id = rte_get_next_lcore(0, /* curr core */ - 1, /* skip master core */ + 1, /* skip main 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 main 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 8ba15d23c7e8..339221eecf55 100644 --- a/examples/ipsec-secgw/ipsec-secgw.c +++ b/examples/ipsec-secgw/ipsec-secgw.c @@ -2992,8 +2992,8 @@ main(int32_t argc, char **argv) #endif /* STATS_INTERVAL */ /* 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_MAIN); + RTE_LCORE_FOREACH_WORKER(lcore_id) { if (rte_eal_wait_lcore(lcore_id) < 0) return -1; }