From: David Marchand <david.marchand@redhat.com> To: Duncan Bellamy <dunk@denkimushi.com> Cc: dev <dev@dpdk.org>, David Christensen <drc@linux.vnet.ibm.com> Subject: Re: [PATCH v6] lib/eal/ppc fix compilation for musl Date: Mon, 9 May 2022 14:06:01 +0200 Message-ID: <CAJFAV8wthKgtN2_O09pAu2Xmw3wAH2B4N9P2hsQJQ1TtovE9Wg@mail.gmail.com> (raw) In-Reply-To: <20220507211546.2363770-1-dunk@denkimushi.com> On Sat, May 7, 2022 at 11:16 PM Duncan Bellamy <dunk@denkimushi.com> wrote: > > musl lacks __ppc_get_timebase() but has __builtin_ppc_get_timebase() > > the __ppc_get_timebase_freq() is taken from: > https://git.alpinelinux.org/aports/commit/?id=06b03f70fb94972286c0c9f6278df89e53903833 > > Signed-off-by: Duncan Bellamy <dunk@denkimushi.com> - A patch title does not need lib/ prefix. Here, "eal/ppc: " is enough. - Code in lib/eal/linux won't be used for FreeBSD/Windows. On the other hand, arch-specific code (here, lib/eal/ppc/) can be used for the various OS. Besides, as far as I can see in the Linux kernel sources, powerpc is the only architecture that exports a "timebase" entry in /proc/cpuinfo. So, I see no reason to put any code out of lib/eal/ppc. - In the end, unless I missed some point, the patch could probably look like (untested): diff --git a/lib/eal/ppc/include/rte_cycles.h b/lib/eal/ppc/include/rte_cycles.h index 5585f9273c..666fc9b0bf 100644 --- a/lib/eal/ppc/include/rte_cycles.h +++ b/lib/eal/ppc/include/rte_cycles.h @@ -10,7 +10,10 @@ extern "C" { #endif +#include <features.h> +#ifdef __GLIBC__ #include <sys/platform/ppc.h> +#endif #include "generic/rte_cycles.h" @@ -26,7 +29,11 @@ extern "C" { static inline uint64_t rte_rdtsc(void) { +#ifdef __GLIBC__ return __ppc_get_timebase(); +#else + return __builtin_ppc_get_timebase(); +#endif } static inline uint64_t diff --git a/lib/eal/ppc/rte_cycles.c b/lib/eal/ppc/rte_cycles.c index 3180adb0ff..99d36b2f7e 100644 --- a/lib/eal/ppc/rte_cycles.c +++ b/lib/eal/ppc/rte_cycles.c @@ -2,12 +2,50 @@ * Copyright (C) IBM Corporation 2019. */ +#include <features.h> +#ifdef __GLIBC__ #include <sys/platform/ppc.h> +#elif RTE_EXEC_ENV_LINUX +#include <string.h> +#include <stdio.h> +#endif #include "eal_private.h" uint64_t get_tsc_freq_arch(void) { +#ifdef __GLIBC__ return __ppc_get_timebase_freq(); +#elif RTE_EXEC_ENV_LINUX + static unsigned long base; + char buf[512]; + ssize_t nr; + FILE *f; + + if (base != 0) + goto out; + + f = fopen("/proc/cpuinfo", "rb"); + if (f == NULL) + goto out; + + while (fgets(buf, sizeof(buf), f) != NULL) { + char *ret = strstr(buf, "timebase"); + + if (ret == NULL) + continue; + ret += sizeof("timebase") - 1; + ret = strchr(ret, ':'); + if (ret == NULL) + continue; + base = strtoul(ret + 1, NULL, 10); + break; + } + fclose(f); +out: + return (uint64_t) base; +#else + return 0; +#endif } -- David Marchand
next prev parent reply other threads:[~2022-05-09 12:06 UTC|newest] Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top [not found] <20220502115228.3AAAB1242D4@dpdk.org> 2022-05-02 14:26 ` [PATCH v2] " Duncan Bellamy 2022-05-02 17:41 ` David Marchand 2022-05-02 20:18 ` Dunk 2022-05-02 17:42 ` David Christensen 2022-05-02 20:20 ` Dunk 2022-05-07 9:47 ` [PATCH v3] " Duncan Bellamy 2022-05-07 19:43 ` [PATCH v4] " Duncan Bellamy 2022-05-07 21:03 ` [PATCH v5] " Duncan Bellamy 2022-05-07 21:15 ` [PATCH v6] " Duncan Bellamy 2022-05-09 12:06 ` David Marchand [this message] 2022-05-09 22:39 ` Dunk 2022-05-14 7:14 ` [PATCH v7] eal/ppc: " Duncan Bellamy 2022-05-19 16:18 ` David Marchand 2022-05-31 17:24 ` David Christensen 2022-06-01 15:06 ` David Marchand
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=CAJFAV8wthKgtN2_O09pAu2Xmw3wAH2B4N9P2hsQJQ1TtovE9Wg@mail.gmail.com \ --to=david.marchand@redhat.com \ --cc=dev@dpdk.org \ --cc=drc@linux.vnet.ibm.com \ --cc=dunk@denkimushi.com \ /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
DPDK patches and discussions This inbox may be cloned and mirrored by anyone: git clone --mirror http://inbox.dpdk.org/dev/0 dev/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 dev dev/ http://inbox.dpdk.org/dev \ dev@dpdk.org public-inbox-index dev Example config snippet for mirrors. Newsgroup available over NNTP: nntp://inbox.dpdk.org/inbox.dpdk.dev AGPL code for this site: git clone https://public-inbox.org/public-inbox.git