From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 575D5A0096 for ; Tue, 9 Apr 2019 13:09:58 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 10EDB4D27; Tue, 9 Apr 2019 13:09:58 +0200 (CEST) Received: from mail-ua1-f50.google.com (mail-ua1-f50.google.com [209.85.222.50]) by dpdk.org (Postfix) with ESMTP id AB32E4F91 for ; Tue, 9 Apr 2019 13:09:56 +0200 (CEST) Received: by mail-ua1-f50.google.com with SMTP id h4so5339800uaj.9 for ; Tue, 09 Apr 2019 04:09:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=hdxFxYvLheU5sPh/CP4m0oPQgRKxEkZY1Ila+Ysx7iM=; b=ZvX/Q4zV70EkGkfp0W4kHjkoBzNJfcc2wqBWwhe3fDeguKzTVF+3nKicVVieRW/iGi +HJ4da0f5BUk94FwZP2IB/kSvm54qGnsqSWguuSxN9KmloSi5mdSCynjs6TgiDF25SeL X1vgTp4Sd4437L3JmBsaSrEhRfR3XxnnWylqhgFWV3RCdKAg/qBwItHMZ4TKahHYyG+z qC8N5uKNoxNQOmeKA/vUZkkgnKIw97KX055salKqvrz2A9EGhJrWI9ByfS5zmTjNuZ3C O4Zcw65FItnGoClwOYf91qkhpJ4WVHYk2FcHFQl8C5JZaq8cOAsXLDf2DDnPHBHiK55z Z3wQ== X-Gm-Message-State: APjAAAUZJAOaJT6TMiMHqPubAhJZGzKtL4MwxpHlOwBG9VlkvLd980N4 N5V/Yjw+1tbYBlzUEANg5E8xwDVl8FDFMX5ZO4j8gg== X-Google-Smtp-Source: APXvYqzh4UttFt42NzrsYopwccfZsFGLf/opC/TH0rZUv570ULyjSs2hV442L06HnibydjRd9TQ/KrjO3c16/DY1TNA= X-Received: by 2002:ab0:2858:: with SMTP id c24mr12661625uaq.4.1554808196021; Tue, 09 Apr 2019 04:09:56 -0700 (PDT) MIME-Version: 1.0 References: <20190409092933.55356-1-bruce.richardson@intel.com> <20190409092933.55356-5-bruce.richardson@intel.com> <20190409100341.GB655@bricha3-MOBL.ger.corp.intel.com> <5bea441407568aceecee73c413378470e30c3305.camel@debian.org> In-Reply-To: <5bea441407568aceecee73c413378470e30c3305.camel@debian.org> From: David Marchand Date: Tue, 9 Apr 2019 13:09:44 +0200 Message-ID: To: Luca Boccassi Cc: Bruce Richardson , dev , dpdk stable Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.15 Subject: Re: [dpdk-stable] [dpdk-dev] [PATCH 4/5] examples/l2fwd-cat: fix build on FreeBSD 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" On Tue, Apr 9, 2019 at 12:40 PM Luca Boccassi wrote: > On Tue, 2019-04-09 at 12:34 +0200, David Marchand wrote: > > On Tue, Apr 9, 2019 at 12:03 PM Bruce Richardson < > > bruce.richardson@intel.com > > > > > wrote: > > > > > On Tue, Apr 09, 2019 at 11:56:04AM +0200, David Marchand wrote: > > > > On Tue, Apr 9, 2019 at 11:30 AM Bruce Richardson > > > > <[1] > > > > bruce.richardson@intel.com > > > > > wrote: > > > > > > > > The definition of CPU_AND differs from Linux to BSD, so we > > > > need to > > > > use > > > > RTE_CPU_AND instead. > > > > Fixes: f6baccbc2b3b ("examples/l2fwd-cat: add sample > > > > application for > > > > PQoS CAT and CDP") > > > > Cc: [2] > > > > stable@dpdk.org > > > > > > > > > > > > This creates a dependency on backporting c3568ea37670 ("eal: > > > > restrict > > > > control threads to startup CPU affinity") which introduced the > > > > RTE_CPU_AND macro. > > > > -- > > > > David Marchand > > > > > > > > > > Shall I drop the stable reference from the v2, then? > > > > > > > We can backport in 18.11, as I would expect c3568ea37670 to be > > backported. > > > > The question is more what we want to do with 17.11. > > We could backport only the macro bits from this patch if needed. > > If c3568 is not destined for 17.11.x, if you are up for doing the extra > work you can send the macro-only change as an individual patch to > stable@dpdk.org (do not cc dev) and use --subject-prefix='PATCH 17.11' > - alternatively, the 17.11 maintainer can simply opt to not pick up > this patch. > Not hard to achieve from my pov, the relevant bits are just this, I can send it if the patch is selected. @@ -23,10 +23,18 @@ #define LCORE_ID_ANY UINT32_MAX /**< Any lcore. */ #if defined(__linux__) - typedef cpu_set_t rte_cpuset_t; +typedef cpu_set_t rte_cpuset_t; +#define RTE_CPU_AND(dst, src1, src2) CPU_AND(dst, src1, src2) #elif defined(__FreeBSD__) #include - typedef cpuset_t rte_cpuset_t; +typedef cpuset_t rte_cpuset_t; +#define RTE_CPU_AND(dst, src1, src2) do \ +{ \ + cpuset_t tmp; \ + CPU_COPY(src1, &tmp); \ + CPU_AND(&tmp, src2); \ + CPU_COPY(&tmp, dst); \ +} while (0) #endif /** -- David Marchand