From: Matthew Wilcox <willy@infradead.org>
To: linux-kernel@vger.kernel.org,
Ross Zwisler <ross.zwisler@linux.intel.com>,
Dave Hansen <dave.hansen@intel.com>,
linux-mm@kvack.org, Josh Triplett <josh@joshtriplett.org>
Cc: Matthew Wilcox <mawilcox@microsoft.com>
Subject: [PATCH 2/2] Introduce __cond_lock_err
Date: Tue, 19 Dec 2017 08:58:23 -0800 [thread overview]
Message-ID: <20171219165823.24243-2-willy@infradead.org> (raw)
In-Reply-To: <20171219165823.24243-1-willy@infradead.org>
From: Matthew Wilcox <mawilcox@microsoft.com>
The __cond_lock macro expects the function to return 'true' if the lock
was acquired and 'false' if it wasn't. We have another common calling
convention in the kernel, which is returning 0 on success and an errno
on failure. It's hard to use the existing __cond_lock macro for those
kinds of functions, so introduce __cond_lock_err() and convert the
two existing users.
Signed-off-by: Matthew Wilcox <mawilcox@microsoft.com>
---
include/linux/compiler_types.h | 2 ++
include/linux/mm.h | 9 ++-------
mm/memory.c | 9 ++-------
3 files changed, 6 insertions(+), 14 deletions(-)
diff --git a/include/linux/compiler_types.h b/include/linux/compiler_types.h
index 6b79a9bba9a7..ff3c41c78efa 100644
--- a/include/linux/compiler_types.h
+++ b/include/linux/compiler_types.h
@@ -16,6 +16,7 @@
# define __acquire(x) __context__(x,1)
# define __release(x) __context__(x,-1)
# define __cond_lock(x,c) ((c) ? ({ __acquire(x); 1; }) : 0)
+# define __cond_lock_err(x,c) ((c) ? 1 : ({ __acquire(x); 0; }))
# define __percpu __attribute__((noderef, address_space(3)))
# define __rcu __attribute__((noderef, address_space(4)))
# define __private __attribute__((noderef))
@@ -42,6 +43,7 @@ extern void __chk_io_ptr(const volatile void __iomem *);
# define __acquire(x) (void)0
# define __release(x) (void)0
# define __cond_lock(x,c) (c)
+# define __cond_lock_err(x,c) (c)
# define __percpu
# define __rcu
# define __private
diff --git a/include/linux/mm.h b/include/linux/mm.h
index 94a9d2149bd6..2ccdc980296b 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -1328,13 +1328,8 @@ static inline int follow_pte_pmd(struct mm_struct *mm, unsigned long address,
unsigned long *start, unsigned long *end,
pte_t **ptepp, pmd_t **pmdpp, spinlock_t **ptlp)
{
- int res;
-
- /* (void) is needed to make gcc happy */
- (void) __cond_lock(*ptlp,
- !(res = __follow_pte_pmd(mm, address, start, end,
- ptepp, pmdpp, ptlp)));
- return res;
+ return __cond_lock_err(*ptlp, __follow_pte_pmd(mm, address, start, end,
+ ptepp, pmdpp, ptlp));
}
static inline void unmap_shared_mapping_range(struct address_space *mapping,
diff --git a/mm/memory.c b/mm/memory.c
index cb433662af21..92d58309cf45 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -4269,13 +4269,8 @@ int __follow_pte_pmd(struct mm_struct *mm, unsigned long address,
static inline int follow_pte(struct mm_struct *mm, unsigned long address,
pte_t **ptepp, spinlock_t **ptlp)
{
- int res;
-
- /* (void) is needed to make gcc happy */
- (void) __cond_lock(*ptlp,
- !(res = __follow_pte_pmd(mm, address, NULL, NULL,
- ptepp, NULL, ptlp)));
- return res;
+ return __cond_lock_err(*ptlp, __follow_pte_pmd(mm, address, NULL, NULL,
+ ptepp, NULL, ptlp));
}
/**
--
2.15.1
next prev parent reply other threads:[~2017-12-19 16:58 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-19 16:58 [PATCH 1/2] mm: Make follow_pte_pmd an inline Matthew Wilcox
2017-12-19 16:58 ` Matthew Wilcox [this message]
2017-12-21 21:48 ` [PATCH 2/2] Introduce __cond_lock_err Ross Zwisler
2017-12-21 22:00 ` Josh Triplett
2017-12-21 22:10 ` Ross Zwisler
2017-12-22 1:10 ` Matthew Wilcox
2017-12-22 4:21 ` Josh Triplett
2017-12-22 12:31 ` Matthew Wilcox
2017-12-22 13:36 ` Matthew Wilcox
2017-12-23 9:39 ` Josh Triplett
2017-12-23 13:06 ` Matthew Wilcox
2017-12-27 14:38 ` Luc Van Oostenryck
2017-12-27 14:28 ` Luc Van Oostenryck
2017-12-30 7:17 ` Matthew Wilcox
2017-12-19 17:05 ` [PATCH 1/2] mm: Make follow_pte_pmd an inline Joe Perches
2017-12-19 17:12 ` Matthew Wilcox
2017-12-21 21:29 ` Ross Zwisler
2017-12-22 1:07 ` Matthew Wilcox
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=20171219165823.24243-2-willy@infradead.org \
--to=willy@infradead.org \
--cc=dave.hansen@intel.com \
--cc=josh@joshtriplett.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mawilcox@microsoft.com \
--cc=ross.zwisler@linux.intel.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).