From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6D81CA051C for ; Tue, 11 Feb 2020 12:30:32 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 63CD52BE9; Tue, 11 Feb 2020 12:30:32 +0100 (CET) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by dpdk.org (Postfix) with ESMTP id 4DA132BE9 for ; Tue, 11 Feb 2020 12:30:31 +0100 (CET) Received: by mail-wr1-f66.google.com with SMTP id w12so11921602wrt.2 for ; Tue, 11 Feb 2020 03:30:31 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=bkHi6Fx7a1ndClx/Td4H/ErOyCb13j/EJ0maunL4WzU=; b=FGj77s94GQvUmizGYWqHod0Bcak0fg86Q5jH9fwkYsfqnWzvHXzmxDNy3LZ4d+NcRI 9h1EqRiy993XyJZOcKPlkfQ/IRGY4/WgXVqivZcBe5GVIorNW0ofzpj5wgL1HhKWqVVk MBq4X4EDcDI8gTHNxpqZ9FZuQ9MH+lV75B7jXkguM5i93NM68DH3KdbsNZZZEA8uBSIT g/Ctf1ZDvu4lNKldVYf68dXgydOJK5D2qRnUiUeGfbijjHurGhafSVigQeeZmX0LeP8K Por7BP9wHz4bFQS+HWPll1HGicpE14EgX7zMG1zlhG4q/TTqiGTefhoumFT7Oeu/8YTJ EcqA== 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=bkHi6Fx7a1ndClx/Td4H/ErOyCb13j/EJ0maunL4WzU=; b=j76WdOsoAunkJ8pZt0QiHDrwX+gnOZ2tVMcwkE3Ig2KmglEFZK2rbkt2Tt6hotwhfq awEdgnJNAT8JWkFRy6u5Mzjlc99OXtoRjzW1sGg71AdpOsuhkPtox7uliw5nRoYLWoYw /6L/TqSXckMbWLX3cWCufejh4KSMZhuznQHues0agCbSWK+BGWdynuR9/IdqnuU9A+vc 4byPckhn/kIUNdmvHSJF/I2Ku2v9JCgzsJolHOfnEUZzJempt5i08VIgEG6yrx4wPXv5 buG5QcF3uXrry/z8KhgPJmuoQPaootB/taAF/2nYZZ6BGnR943BMV0D3FvFpbJwfd91s 2rPg== X-Gm-Message-State: APjAAAUCodCfEf01KYX5Iqip7crHGSzj1IKOBW6X6g45ZPCbYHWo3UzB Jyy78ara5GnH7VFkK0yzanY= X-Google-Smtp-Source: APXvYqx+rstEgZNSsRabbD66siIyaA+sCho9nluIFtuNpLsYWBaXL7g83wZYleQEOb6zEg21MMuGQg== X-Received: by 2002:adf:82ee:: with SMTP id 101mr7991195wrc.130.1581420630996; Tue, 11 Feb 2020 03:30:30 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id g2sm4785170wrw.76.2020.02.11.03.30.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2020 03:30:30 -0800 (PST) From: luca.boccassi@gmail.com To: Xiaoyun Li Cc: dpdk stable Date: Tue, 11 Feb 2020 11:20:57 +0000 Message-Id: <20200211112216.3929-111-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200211112216.3929-1-luca.boccassi@gmail.com> References: <20200211112216.3929-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'examples/ntb: fix mempool ops setting' has been queued to stable release 19.11.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/13/20. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Thanks. Luca Boccassi --- >From 38498a1a3056c2f5cd2d266c3697a895375c8377 Mon Sep 17 00:00:00 2001 From: Xiaoyun Li Date: Wed, 25 Dec 2019 17:09:42 +0800 Subject: [PATCH] examples/ntb: fix mempool ops setting [ upstream commit 28a2568f469d9d715b9dfbafdce14537e35b7d4e ] Mempool ops may register in different order when compiling. The default ops index is always zero but the wanted ops is ring_mp_mc. This patch sets best mempool ops before generating mbuf pool to fix this issue. Fixes: 5194299d6ef5 ("examples/ntb: support more functions") Signed-off-by: Xiaoyun Li --- examples/ntb/ntb_fwd.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/examples/ntb/ntb_fwd.c b/examples/ntb/ntb_fwd.c index c914256dd4..17eedcf0b8 100644 --- a/examples/ntb/ntb_fwd.c +++ b/examples/ntb/ntb_fwd.c @@ -19,6 +19,7 @@ #include #include #include +#include /* Per-port statistics struct */ struct ntb_port_statistics { @@ -1256,6 +1257,11 @@ ntb_mbuf_pool_create(uint16_t mbuf_seg_size, uint32_t nb_mbuf, if (mp == NULL) return NULL; + if (rte_mempool_set_ops_byname(mp, rte_mbuf_best_mempool_ops(), NULL)) { + printf("error setting mempool handler\n"); + goto fail; + } + memset(&mbp_priv, 0, sizeof(mbp_priv)); mbp_priv.mbuf_data_room_size = mbuf_seg_size; mbp_priv.mbuf_priv_size = 0; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-02-11 11:17:42.660872413 +0000 +++ 0111-examples-ntb-fix-mempool-ops-setting.patch 2020-02-11 11:17:38.576004638 +0000 @@ -1,14 +1,15 @@ -From 28a2568f469d9d715b9dfbafdce14537e35b7d4e Mon Sep 17 00:00:00 2001 +From 38498a1a3056c2f5cd2d266c3697a895375c8377 Mon Sep 17 00:00:00 2001 From: Xiaoyun Li Date: Wed, 25 Dec 2019 17:09:42 +0800 Subject: [PATCH] examples/ntb: fix mempool ops setting +[ upstream commit 28a2568f469d9d715b9dfbafdce14537e35b7d4e ] + Mempool ops may register in different order when compiling. The default ops index is always zero but the wanted ops is ring_mp_mc. This patch sets best mempool ops before generating mbuf pool to fix this issue. Fixes: 5194299d6ef5 ("examples/ntb: support more functions") -Cc: stable@dpdk.org Signed-off-by: Xiaoyun Li ---