From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ferruh Yigit Subject: Re: [PATCH v3] kni: dynamically allocate memory for each KNI Date: Tue, 2 Oct 2018 14:27:07 +0100 Message-ID: <554bb0ff-2aa6-6777-74d6-d6499657c54a@intel.com> References: <20180923191202.64896-1-iryzhov@nfware.com> <20180926162106.1129-1-iryzhov@nfware.com> <4313273.d4aErm0F2p@xps> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Cc: dev@dpdk.org To: Thomas Monjalon , Igor Ryzhov Return-path: Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by dpdk.org (Postfix) with ESMTP id 407C04C93 for ; Tue, 2 Oct 2018 15:27:10 +0200 (CEST) In-Reply-To: <4313273.d4aErm0F2p@xps> Content-Language: en-US List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" On 10/2/2018 2:06 PM, Thomas Monjalon wrote: > Hi, > > 26/09/2018 18:21, Igor Ryzhov: >> Long time ago preallocation of memory for KNI was introduced in commit >> 0c6bc8e. It was done because of lack of ability to free previously >> allocated memzones, which led to memzone exhaustion. Currently memzones >> can be freed and this patch uses this ability for dynamic KNI memory >> allocation. >> >> Signed-off-by: Igor Ryzhov > > The patch does not apply on master. > Is there a dependency? There should not be a conflict, following commit already in tree is causing the conflict, I was resolving it myself when testing: Commit e716b639856c ("kni: fix crash with null name") Basically both do same thing: <<<<<<< IN REPO if (name == NULL || name[0] == '\0') return NULL; ======= if (!name || !name[0]) return NULL; >>>>>>> PATCH It seems Igor has a older version of the tree. It is OK to keep the check existing in the repo.