From patchwork Thu Oct 15 22:57:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 81003 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 6BD33A04DB; Fri, 16 Oct 2020 01:03:41 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 5801B1E886; Fri, 16 Oct 2020 00:58:24 +0200 (CEST) Received: from mail-pl1-f194.google.com (mail-pl1-f194.google.com [209.85.214.194]) by dpdk.org (Postfix) with ESMTP id 01BF01E553 for ; Fri, 16 Oct 2020 00:58:10 +0200 (CEST) Received: by mail-pl1-f194.google.com with SMTP id b19so207339pld.0 for ; Thu, 15 Oct 2020 15:58:10 -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=p7tqLTLHY/bSkFa/kfcqZutFbu9VWjsg0fUS0dfsVKo=; b=BR714eFPOF8LQlqNloTBUqJNNWR+0k9317jFRviF7YCPLsmz3YcvZt8OLf8Bw5G3JN GJpEX64hF2mhtMFJ3BDPyHjRcbtrVtli/YNEswD6H6B0Isnqi5fub4TxQlN+u1x4tsh/ jn1sgCJPN+hE4byw5apwX31VFyoiDsNSU0KMjdkYyQ9ot8nlpOYbQBlBGCrCCpAfuWBb RfD2oyWdX3VAJEPjbkpZbk89bW3veJNMXVjHQ3HohMdVN0Mf2QWi8Qleu7j+/FM3hUte 1o4tQfbjmSw3Jkd0hDiXTiGv03F4GV4Q0HKXfeLt5OvfAoLkJmQ4sStYGFXh/VuLGmTK nD6Q== 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=p7tqLTLHY/bSkFa/kfcqZutFbu9VWjsg0fUS0dfsVKo=; b=mKHuGwr64QdMInc2pbj+qiuEYjQAjvI8yomD2B7N/DcogY+TdzfGEoVdC4c20/OwhF 6U0/evi3EFdI/36D25oBRhCxJJbSkT117Oko2Ud+E/z5YXpYB1tZv6QQ3d4CNt0GjtWs aoWeKqdRYW4zPX22uOqYFo0lRxWHDa6MLQFT3nBg9Jn8bHRNs4R2MiwyRDy6L9YgRshk nenXM/gAePbWsQTtdGFuI4EkDSRrqakBSXXREyCX5dLFpkG8F2tg32KpjWxkbOBzX1tj eK40JP154BQeJoTDDPXs+ZK0UqU6/0zM3uw2nUVQOEj6nY5TdMyMgZ8I3sWlhPEkT9N9 DPEg== X-Gm-Message-State: AOAM533lmKJtb5X9yCiylLfgbWFtrKMYLstP5tFOwtGx5hNygqkdwGEj TSRlUuYBM6RnGKxFMoszldZ8zPGc53FgTA== X-Google-Smtp-Source: ABdhPJwcUCKOq32Owb4StPz64eyHj1rWizKQfbaYBrnjTpo0euHH6Lj7gbLyKH5AAGWxSvcze/vdDg== X-Received: by 2002:a17:90a:f3d3:: with SMTP id ha19mr975635pjb.58.1602802688726; Thu, 15 Oct 2020 15:58:08 -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 x4sm324055pfm.86.2020.10.15.15.58.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Oct 2020 15:58:07 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Anatoly Burakov Date: Thu, 15 Oct 2020 15:57:32 -0700 Message-Id: <20201015225736.12167-17-stephen@networkplumber.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201015225736.12167-1-stephen@networkplumber.org> References: <20200911190701.29171-1-stephen@networkplumber.org> <20201015225736.12167-1-stephen@networkplumber.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v7 16/20] 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 60132c4bd7e4..b2ef24df3a6c 100644 --- a/examples/ipsec-secgw/ipsec-secgw.c +++ b/examples/ipsec-secgw/ipsec-secgw.c @@ -2989,8 +2989,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; }