* [PATCH] page_cgroup: add helper function to get swap_cgroup
@ 2011-12-02 9:42 Bob Liu
2011-12-02 9:56 ` Michal Hocko
0 siblings, 1 reply; 3+ messages in thread
From: Bob Liu @ 2011-12-02 9:42 UTC (permalink / raw)
To: linux-mm; +Cc: akpm, kamezawa.hiroyu, mhocko, jweiner, bsingharora, Bob Liu
There are multi places need to get swap_cgroup, so add a helper
function:
static struct swap_cgroup *swap_cgroup_getsc(swp_entry_t ent);
to simple the code.
Signed-off-by: Bob Liu <lliubbo@gmail.com>
---
mm/page_cgroup.c | 49 ++++++++++++++++++++++---------------------------
1 files changed, 22 insertions(+), 27 deletions(-)
diff --git a/mm/page_cgroup.c b/mm/page_cgroup.c
index f0559e0..ee1766a 100644
--- a/mm/page_cgroup.c
+++ b/mm/page_cgroup.c
@@ -362,6 +362,24 @@ not_enough_page:
return -ENOMEM;
}
+static struct swap_cgroup *swap_cgroup_getsc(swp_entry_t ent)
+{
+ int type = swp_type(ent);
+ unsigned long offset = swp_offset(ent);
+ unsigned long idx = offset / SC_PER_PAGE;
+ unsigned long pos = offset & SC_POS_MASK;
+ struct swap_cgroup_ctrl *ctrl;
+ struct page *mappage;
+ struct swap_cgroup *sc;
+
+ ctrl = &swap_cgroup_ctrl[type];
+
+ mappage = ctrl->map[idx];
+ sc = page_address(mappage);
+ sc += pos;
+ return sc;
+}
+
/**
* swap_cgroup_cmpxchg - cmpxchg mem_cgroup's id for this swp_entry.
* @end: swap entry to be cmpxchged
@@ -375,20 +393,14 @@ unsigned short swap_cgroup_cmpxchg(swp_entry_t ent,
unsigned short old, unsigned short new)
{
int type = swp_type(ent);
- unsigned long offset = swp_offset(ent);
- unsigned long idx = offset / SC_PER_PAGE;
- unsigned long pos = offset & SC_POS_MASK;
struct swap_cgroup_ctrl *ctrl;
- struct page *mappage;
struct swap_cgroup *sc;
unsigned long flags;
unsigned short retval;
ctrl = &swap_cgroup_ctrl[type];
+ sc = swap_cgroup_getsc(ent);
- mappage = ctrl->map[idx];
- sc = page_address(mappage);
- sc += pos;
spin_lock_irqsave(&ctrl->lock, flags);
retval = sc->id;
if (retval == old)
@@ -410,20 +422,14 @@ unsigned short swap_cgroup_cmpxchg(swp_entry_t ent,
unsigned short swap_cgroup_record(swp_entry_t ent, unsigned short id)
{
int type = swp_type(ent);
- unsigned long offset = swp_offset(ent);
- unsigned long idx = offset / SC_PER_PAGE;
- unsigned long pos = offset & SC_POS_MASK;
struct swap_cgroup_ctrl *ctrl;
- struct page *mappage;
struct swap_cgroup *sc;
unsigned short old;
unsigned long flags;
ctrl = &swap_cgroup_ctrl[type];
+ sc = swap_cgroup_getsc(ent);
- mappage = ctrl->map[idx];
- sc = page_address(mappage);
- sc += pos;
spin_lock_irqsave(&ctrl->lock, flags);
old = sc->id;
sc->id = id;
@@ -440,21 +446,10 @@ unsigned short swap_cgroup_record(swp_entry_t ent, unsigned short id)
*/
unsigned short lookup_swap_cgroup(swp_entry_t ent)
{
- int type = swp_type(ent);
- unsigned long offset = swp_offset(ent);
- unsigned long idx = offset / SC_PER_PAGE;
- unsigned long pos = offset & SC_POS_MASK;
- struct swap_cgroup_ctrl *ctrl;
- struct page *mappage;
struct swap_cgroup *sc;
- unsigned short ret;
- ctrl = &swap_cgroup_ctrl[type];
- mappage = ctrl->map[idx];
- sc = page_address(mappage);
- sc += pos;
- ret = sc->id;
- return ret;
+ sc = swap_cgroup_getsc(ent);
+ return sc->id;
}
int swap_cgroup_swapon(int type, unsigned long max_pages)
--
1.7.0.4
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] page_cgroup: add helper function to get swap_cgroup
2011-12-02 9:42 [PATCH] page_cgroup: add helper function to get swap_cgroup Bob Liu
@ 2011-12-02 9:56 ` Michal Hocko
2011-12-02 10:40 ` Bob Liu
0 siblings, 1 reply; 3+ messages in thread
From: Michal Hocko @ 2011-12-02 9:56 UTC (permalink / raw)
To: Bob Liu; +Cc: linux-mm, akpm, kamezawa.hiroyu, jweiner, bsingharora
On Fri 02-12-11 17:42:11, Bob Liu wrote:
> There are multi places need to get swap_cgroup, so add a helper
> function:
> static struct swap_cgroup *swap_cgroup_getsc(swp_entry_t ent);
> to simple the code.
I like the cleanup but I guess we can do a little bit better ;)
[...]
> +static struct swap_cgroup *swap_cgroup_getsc(swp_entry_t ent)
Add struct swap_cgroup_ctrl ** ctrl parameter
> +{
> + int type = swp_type(ent);
> + unsigned long offset = swp_offset(ent);
> + unsigned long idx = offset / SC_PER_PAGE;
> + unsigned long pos = offset & SC_POS_MASK;
> + struct swap_cgroup_ctrl *ctrl;
> + struct page *mappage;
> + struct swap_cgroup *sc;
> +
> + ctrl = &swap_cgroup_ctrl[type];
if (ctrl)
*ctrl = &swap_cgroup_ctrl[type]
[...]
> @@ -375,20 +393,14 @@ unsigned short swap_cgroup_cmpxchg(swp_entry_t ent,
> unsigned short old, unsigned short new)
> {
> int type = swp_type(ent);
> - unsigned long offset = swp_offset(ent);
> - unsigned long idx = offset / SC_PER_PAGE;
> - unsigned long pos = offset & SC_POS_MASK;
> struct swap_cgroup_ctrl *ctrl;
> - struct page *mappage;
> struct swap_cgroup *sc;
> unsigned long flags;
> unsigned short retval;
>
> ctrl = &swap_cgroup_ctrl[type];
> + sc = swap_cgroup_getsc(ent);
sc = swap_cgroup_getsc(ent, &ctrl);
[...]
> @@ -410,20 +422,14 @@ unsigned short swap_cgroup_cmpxchg(swp_entry_t ent,
> unsigned short swap_cgroup_record(swp_entry_t ent, unsigned short id)
> {
> int type = swp_type(ent);
> - unsigned long offset = swp_offset(ent);
> - unsigned long idx = offset / SC_PER_PAGE;
> - unsigned long pos = offset & SC_POS_MASK;
> struct swap_cgroup_ctrl *ctrl;
> - struct page *mappage;
> struct swap_cgroup *sc;
> unsigned short old;
> unsigned long flags;
>
> ctrl = &swap_cgroup_ctrl[type];
> + sc = swap_cgroup_getsc(ent);
Same here
[...]
> @@ -440,21 +446,10 @@ unsigned short swap_cgroup_record(swp_entry_t ent, unsigned short id)
> */
> unsigned short lookup_swap_cgroup(swp_entry_t ent)
> {
> - int type = swp_type(ent);
> - unsigned long offset = swp_offset(ent);
> - unsigned long idx = offset / SC_PER_PAGE;
> - unsigned long pos = offset & SC_POS_MASK;
> - struct swap_cgroup_ctrl *ctrl;
> - struct page *mappage;
> struct swap_cgroup *sc;
> - unsigned short ret;
>
> - ctrl = &swap_cgroup_ctrl[type];
> - mappage = ctrl->map[idx];
> - sc = page_address(mappage);
> - sc += pos;
> - ret = sc->id;
> - return ret;
> + sc = swap_cgroup_getsc(ent);
> + return sc->id;
return swap_cgroup_getsc(ent, NULL)->id;
What do you think?
--
Michal Hocko
SUSE Labs
SUSE LINUX s.r.o.
Lihovarska 1060/12
190 00 Praha 9
Czech Republic
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] page_cgroup: add helper function to get swap_cgroup
2011-12-02 9:56 ` Michal Hocko
@ 2011-12-02 10:40 ` Bob Liu
0 siblings, 0 replies; 3+ messages in thread
From: Bob Liu @ 2011-12-02 10:40 UTC (permalink / raw)
To: Michal Hocko; +Cc: linux-mm, akpm, kamezawa.hiroyu, jweiner, bsingharora
On Fri, Dec 2, 2011 at 5:56 PM, Michal Hocko <mhocko@suse.cz> wrote:
> On Fri 02-12-11 17:42:11, Bob Liu wrote:
>> There are multi places need to get swap_cgroup, so add a helper
>> function:
>> static struct swap_cgroup *swap_cgroup_getsc(swp_entry_t ent);
>> to simple the code.
>
> I like the cleanup but I guess we can do a little bit better ;)
>
> [...]
>> +static struct swap_cgroup *swap_cgroup_getsc(swp_entry_t ent)
>
> Add struct swap_cgroup_ctrl ** ctrl parameter
>
>> +{
>> + int type = swp_type(ent);
>> + unsigned long offset = swp_offset(ent);
>> + unsigned long idx = offset / SC_PER_PAGE;
>> + unsigned long pos = offset & SC_POS_MASK;
>> + struct swap_cgroup_ctrl *ctrl;
>> + struct page *mappage;
>> + struct swap_cgroup *sc;
>> +
>> + ctrl = &swap_cgroup_ctrl[type];
>
> if (ctrl)
> *ctrl = &swap_cgroup_ctrl[type]
>
> [...]
>> @@ -375,20 +393,14 @@ unsigned short swap_cgroup_cmpxchg(swp_entry_t ent,
>> unsigned short old, unsigned short new)
>> {
>> int type = swp_type(ent);
>> - unsigned long offset = swp_offset(ent);
>> - unsigned long idx = offset / SC_PER_PAGE;
>> - unsigned long pos = offset & SC_POS_MASK;
>> struct swap_cgroup_ctrl *ctrl;
>> - struct page *mappage;
>> struct swap_cgroup *sc;
>> unsigned long flags;
>> unsigned short retval;
>>
>> ctrl = &swap_cgroup_ctrl[type];
>> + sc = swap_cgroup_getsc(ent);
>
> sc = swap_cgroup_getsc(ent, &ctrl);
> [...]
>> @@ -410,20 +422,14 @@ unsigned short swap_cgroup_cmpxchg(swp_entry_t ent,
>> unsigned short swap_cgroup_record(swp_entry_t ent, unsigned short id)
>> {
>> int type = swp_type(ent);
>> - unsigned long offset = swp_offset(ent);
>> - unsigned long idx = offset / SC_PER_PAGE;
>> - unsigned long pos = offset & SC_POS_MASK;
>> struct swap_cgroup_ctrl *ctrl;
>> - struct page *mappage;
>> struct swap_cgroup *sc;
>> unsigned short old;
>> unsigned long flags;
>>
>> ctrl = &swap_cgroup_ctrl[type];
>> + sc = swap_cgroup_getsc(ent);
>
> Same here
>
> [...]
>> @@ -440,21 +446,10 @@ unsigned short swap_cgroup_record(swp_entry_t ent, unsigned short id)
>> */
>> unsigned short lookup_swap_cgroup(swp_entry_t ent)
>> {
>> - int type = swp_type(ent);
>> - unsigned long offset = swp_offset(ent);
>> - unsigned long idx = offset / SC_PER_PAGE;
>> - unsigned long pos = offset & SC_POS_MASK;
>> - struct swap_cgroup_ctrl *ctrl;
>> - struct page *mappage;
>> struct swap_cgroup *sc;
>> - unsigned short ret;
>>
>> - ctrl = &swap_cgroup_ctrl[type];
>> - mappage = ctrl->map[idx];
>> - sc = page_address(mappage);
>> - sc += pos;
>> - ret = sc->id;
>> - return ret;
>> + sc = swap_cgroup_getsc(ent);
>> + return sc->id;
>
> return swap_cgroup_getsc(ent, NULL)->id;
>
> What do you think?
Alright, i'll send out v2.
Thanks for your review.
--
Regards,
--Bob
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-12-02 10:40 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-12-02 9:42 [PATCH] page_cgroup: add helper function to get swap_cgroup Bob Liu
2011-12-02 9:56 ` Michal Hocko
2011-12-02 10:40 ` Bob Liu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox