DPDK patches and discussions
 help / color / mirror / Atom feed
From: Thomas Monjalon <thomas@monjalon.net>
To: jerin.jacob@caviumnetworks.com
Cc: dev@dpdk.org
Subject: [dpdk-dev] [PATCH] eal/arm64: fix memory barrier macros
Date: Tue, 16 Jan 2018 00:59:34 +0100	[thread overview]
Message-ID: <20180115235934.16054-1-thomas@monjalon.net> (raw)

The macros dsb and dmb are defined as an instruction block with braces.
As a consequence, when it is used in if/else without brace:
	if (cond)
		rte_mb();
	else
		statement;
the added semicolon is parsed outside of if/else,
so the "else" cannot match the "if":
	if (cond) {
		asm volatile("dsb sy" : : : "memory");
	}
	;
	else
		statement

The solution is either to use the "do { } while (0)" construct,
or simply remove the braces because there is only one statement.

Fixes: 84733fd0d75e ("eal/arm64: fix memory barrier definition")

Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
---
 lib/librte_eal/common/include/arch/arm/rte_atomic_64.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/librte_eal/common/include/arch/arm/rte_atomic_64.h b/lib/librte_eal/common/include/arch/arm/rte_atomic_64.h
index b6bbd0b32..b012dfa74 100644
--- a/lib/librte_eal/common/include/arch/arm/rte_atomic_64.h
+++ b/lib/librte_eal/common/include/arch/arm/rte_atomic_64.h
@@ -15,8 +15,8 @@ extern "C" {
 
 #include "generic/rte_atomic.h"
 
-#define dsb(opt)  { asm volatile("dsb " #opt : : : "memory"); }
-#define dmb(opt)  { asm volatile("dmb " #opt : : : "memory"); }
+#define dsb(opt)  asm volatile("dsb " #opt : : : "memory")
+#define dmb(opt)  asm volatile("dmb " #opt : : : "memory")
 
 #define rte_mb() dsb(sy)
 
-- 
2.15.1

             reply	other threads:[~2018-01-16  0:00 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-01-15 23:59 Thomas Monjalon [this message]
2018-01-16  0:21 ` Thomas Monjalon

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=20180115235934.16054-1-thomas@monjalon.net \
    --to=thomas@monjalon.net \
    --cc=dev@dpdk.org \
    --cc=jerin.jacob@caviumnetworks.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
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).