patches for DPDK stable branches
 help / color / mirror / Atom feed
From: David Marchand <david.marchand@redhat.com>
To: Luca Boccassi <bluca@debian.org>
Cc: Bruce Richardson <bruce.richardson@intel.com>, dev <dev@dpdk.org>,
	 dpdk stable <stable@dpdk.org>
Subject: Re: [dpdk-stable] [dpdk-dev] [PATCH 4/5] examples/l2fwd-cat: fix build on FreeBSD
Date: Tue, 9 Apr 2019 13:09:44 +0200	[thread overview]
Message-ID: <CAJFAV8wM6jj=wvQ0xAGMDLL1NSzHv+nRijjqP-rmTXoHeTHagw@mail.gmail.com> (raw)
In-Reply-To: <5bea441407568aceecee73c413378470e30c3305.camel@debian.org>

On Tue, Apr 9, 2019 at 12:40 PM Luca Boccassi <bluca@debian.org> 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 <pthread_np.h>
-       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

  reply	other threads:[~2019-04-09 11:09 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20190409092933.55356-1-bruce.richardson@intel.com>
2019-04-09  9:29 ` [dpdk-stable] " Bruce Richardson
2019-04-09  9:56   ` [dpdk-stable] [dpdk-dev] " David Marchand
2019-04-09 10:03     ` Bruce Richardson
2019-04-09 10:34       ` David Marchand
2019-04-09 10:40         ` Bruce Richardson
2019-04-09 10:40         ` Luca Boccassi
2019-04-09 11:09           ` David Marchand [this message]
2019-04-09 10:40   ` Luca Boccassi

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CAJFAV8wM6jj=wvQ0xAGMDLL1NSzHv+nRijjqP-rmTXoHeTHagw@mail.gmail.com' \
    --to=david.marchand@redhat.com \
    --cc=bluca@debian.org \
    --cc=bruce.richardson@intel.com \
    --cc=dev@dpdk.org \
    --cc=stable@dpdk.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).