* [PATCH] Staging: lustre: linux-cpu: Remove unnecessary wrapper functions
@ 2015-11-02 16:41 Shivani Bhardwaj
2015-11-02 16:52 ` [Outreachy kernel] " Greg KH
0 siblings, 1 reply; 4+ messages in thread
From: Shivani Bhardwaj @ 2015-11-02 16:41 UTC (permalink / raw)
To: outreachy-kernel
Remove the functions cfs_cpu_core_siblings(), cfs_cpu_ht_siblings(),
cfs_node_to_cpumask() and replace their calls with the functions they
wrapped.
Signed-off-by: Shivani Bhardwaj <shivanib134@gmail.com>
---
.../staging/lustre/lustre/libcfs/linux/linux-cpu.c | 30 +++++-----------------
1 file changed, 7 insertions(+), 23 deletions(-)
diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-cpu.c b/drivers/staging/lustre/lustre/libcfs/linux/linux-cpu.c
index 2097364..31719af 100644
--- a/drivers/staging/lustre/lustre/libcfs/linux/linux-cpu.c
+++ b/drivers/staging/lustre/lustre/libcfs/linux/linux-cpu.c
@@ -78,23 +78,6 @@ struct cfs_cpt_data {
static struct cfs_cpt_data cpt_data;
-static void cfs_cpu_core_siblings(int cpu, cpumask_t *mask)
-{
- /* return cpumask of cores in the same socket */
- cpumask_copy(mask, topology_core_cpumask(cpu));
-}
-
-/* return cpumask of HTs in the same core */
-static void cfs_cpu_ht_siblings(int cpu, cpumask_t *mask)
-{
- cpumask_copy(mask, topology_sibling_cpumask(cpu));
-}
-
-static void cfs_node_to_cpumask(int node, cpumask_t *mask)
-{
- cpumask_copy(mask, cpumask_of_node(node));
-}
-
void
cfs_cpt_table_free(struct cfs_cpt_table *cptab)
{
@@ -426,7 +409,7 @@ cfs_cpt_set_node(struct cfs_cpt_table *cptab, int cpt, int node)
mutex_lock(&cpt_data.cpt_mutex);
mask = cpt_data.cpt_cpumask;
- cfs_node_to_cpumask(node, mask);
+ cpumask_copy(mask, cpumask_of_node(node));
rc = cfs_cpt_set_cpumask(cptab, cpt, mask);
@@ -450,7 +433,7 @@ cfs_cpt_unset_node(struct cfs_cpt_table *cptab, int cpt, int node)
mutex_lock(&cpt_data.cpt_mutex);
mask = cpt_data.cpt_cpumask;
- cfs_node_to_cpumask(node, mask);
+ cpumask_copy(mask, cpumask_of_node(node));
cfs_cpt_unset_cpumask(cptab, cpt, mask);
@@ -643,7 +626,7 @@ cfs_cpt_choose_ncpus(struct cfs_cpt_table *cptab, int cpt,
cpu = cpumask_first(node);
/* get cpumask for cores in the same socket */
- cfs_cpu_core_siblings(cpu, socket);
+ cpumask_copy(socket, topology_core_cpumask(cpu));
cpumask_and(socket, socket, node);
LASSERT(!cpumask_empty(socket));
@@ -652,7 +635,7 @@ cfs_cpt_choose_ncpus(struct cfs_cpt_table *cptab, int cpt,
int i;
/* get cpumask for hts in the same core */
- cfs_cpu_ht_siblings(cpu, core);
+ cpumask_copy(socket, topology_sibling_cpumask(cpu));
cpumask_and(core, core, node);
LASSERT(!cpumask_empty(core));
@@ -769,7 +752,7 @@ cfs_cpt_table_create(int ncpt)
}
for_each_online_node(i) {
- cfs_node_to_cpumask(i, mask);
+ cpumask_copy(mask, cpumask_of_node(i));
while (!cpumask_empty(mask)) {
struct cfs_cpu_partition *part;
@@ -968,7 +951,8 @@ cfs_cpu_notify(struct notifier_block *self, unsigned long action, void *hcpu)
mutex_lock(&cpt_data.cpt_mutex);
/* if all HTs in a core are offline, it may break affinity */
- cfs_cpu_ht_siblings(cpu, cpt_data.cpt_cpumask);
+ cpumask_copy(cpt_data.cpt_cpumask,
+ topology_sibling_cpumask(cpu));
warn = cpumask_any_and(cpt_data.cpt_cpumask,
cpu_online_mask) >= nr_cpu_ids;
mutex_unlock(&cpt_data.cpt_mutex);
--
2.1.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [Outreachy kernel] [PATCH] Staging: lustre: linux-cpu: Remove unnecessary wrapper functions
2015-11-02 16:41 [PATCH] Staging: lustre: linux-cpu: Remove unnecessary wrapper functions Shivani Bhardwaj
@ 2015-11-02 16:52 ` Greg KH
2015-11-02 16:56 ` Shivani Bhardwaj
0 siblings, 1 reply; 4+ messages in thread
From: Greg KH @ 2015-11-02 16:52 UTC (permalink / raw)
To: Shivani Bhardwaj; +Cc: outreachy-kernel
On Mon, Nov 02, 2015 at 10:11:19PM +0530, Shivani Bhardwaj wrote:
> Remove the functions cfs_cpu_core_siblings(), cfs_cpu_ht_siblings(),
> cfs_node_to_cpumask() and replace their calls with the functions they
> wrapped.
>
> Signed-off-by: Shivani Bhardwaj <shivanib134@gmail.com>
> ---
> .../staging/lustre/lustre/libcfs/linux/linux-cpu.c | 30 +++++-----------------
> 1 file changed, 7 insertions(+), 23 deletions(-)
>
> diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-cpu.c b/drivers/staging/lustre/lustre/libcfs/linux/linux-cpu.c
> index 2097364..31719af 100644
> --- a/drivers/staging/lustre/lustre/libcfs/linux/linux-cpu.c
> +++ b/drivers/staging/lustre/lustre/libcfs/linux/linux-cpu.c
> @@ -78,23 +78,6 @@ struct cfs_cpt_data {
>
> static struct cfs_cpt_data cpt_data;
>
> -static void cfs_cpu_core_siblings(int cpu, cpumask_t *mask)
> -{
> - /* return cpumask of cores in the same socket */
> - cpumask_copy(mask, topology_core_cpumask(cpu));
> -}
> -
> -/* return cpumask of HTs in the same core */
> -static void cfs_cpu_ht_siblings(int cpu, cpumask_t *mask)
> -{
> - cpumask_copy(mask, topology_sibling_cpumask(cpu));
> -}
> -
> -static void cfs_node_to_cpumask(int node, cpumask_t *mask)
> -{
> - cpumask_copy(mask, cpumask_of_node(node));
> -}
>
Please remove one of these at a time, it makes it much easier to review
the patch.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [Outreachy kernel] [PATCH] Staging: lustre: linux-cpu: Remove unnecessary wrapper functions
2015-11-02 16:52 ` [Outreachy kernel] " Greg KH
@ 2015-11-02 16:56 ` Shivani Bhardwaj
2015-11-02 16:59 ` Greg KH
0 siblings, 1 reply; 4+ messages in thread
From: Shivani Bhardwaj @ 2015-11-02 16:56 UTC (permalink / raw)
To: Greg KH; +Cc: outreachy-kernel
On Mon, Nov 2, 2015 at 10:22 PM, Greg KH <gregkh@linuxfoundation.org> wrote:
> On Mon, Nov 02, 2015 at 10:11:19PM +0530, Shivani Bhardwaj wrote:
>> Remove the functions cfs_cpu_core_siblings(), cfs_cpu_ht_siblings(),
>> cfs_node_to_cpumask() and replace their calls with the functions they
>> wrapped.
>>
>> Signed-off-by: Shivani Bhardwaj <shivanib134@gmail.com>
>> ---
>> .../staging/lustre/lustre/libcfs/linux/linux-cpu.c | 30 +++++-----------------
>> 1 file changed, 7 insertions(+), 23 deletions(-)
>>
>> diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-cpu.c b/drivers/staging/lustre/lustre/libcfs/linux/linux-cpu.c
>> index 2097364..31719af 100644
>> --- a/drivers/staging/lustre/lustre/libcfs/linux/linux-cpu.c
>> +++ b/drivers/staging/lustre/lustre/libcfs/linux/linux-cpu.c
>> @@ -78,23 +78,6 @@ struct cfs_cpt_data {
>>
>> static struct cfs_cpt_data cpt_data;
>>
>> -static void cfs_cpu_core_siblings(int cpu, cpumask_t *mask)
>> -{
>> - /* return cpumask of cores in the same socket */
>> - cpumask_copy(mask, topology_core_cpumask(cpu));
>> -}
>> -
>> -/* return cpumask of HTs in the same core */
>> -static void cfs_cpu_ht_siblings(int cpu, cpumask_t *mask)
>> -{
>> - cpumask_copy(mask, topology_sibling_cpumask(cpu));
>> -}
>> -
>> -static void cfs_node_to_cpumask(int node, cpumask_t *mask)
>> -{
>> - cpumask_copy(mask, cpumask_of_node(node));
>> -}
>>
>
> Please remove one of these at a time, it makes it much easier to review
> the patch.
>
Should I resend this one as well? I'll take care next time.
Thank you
> thanks,
>
> greg k-h
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [Outreachy kernel] [PATCH] Staging: lustre: linux-cpu: Remove unnecessary wrapper functions
2015-11-02 16:56 ` Shivani Bhardwaj
@ 2015-11-02 16:59 ` Greg KH
0 siblings, 0 replies; 4+ messages in thread
From: Greg KH @ 2015-11-02 16:59 UTC (permalink / raw)
To: Shivani Bhardwaj; +Cc: outreachy-kernel
On Mon, Nov 02, 2015 at 10:26:18PM +0530, Shivani Bhardwaj wrote:
> On Mon, Nov 2, 2015 at 10:22 PM, Greg KH <gregkh@linuxfoundation.org> wrote:
> > On Mon, Nov 02, 2015 at 10:11:19PM +0530, Shivani Bhardwaj wrote:
> >> Remove the functions cfs_cpu_core_siblings(), cfs_cpu_ht_siblings(),
> >> cfs_node_to_cpumask() and replace their calls with the functions they
> >> wrapped.
> >>
> >> Signed-off-by: Shivani Bhardwaj <shivanib134@gmail.com>
> >> ---
> >> .../staging/lustre/lustre/libcfs/linux/linux-cpu.c | 30 +++++-----------------
> >> 1 file changed, 7 insertions(+), 23 deletions(-)
> >>
> >> diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-cpu.c b/drivers/staging/lustre/lustre/libcfs/linux/linux-cpu.c
> >> index 2097364..31719af 100644
> >> --- a/drivers/staging/lustre/lustre/libcfs/linux/linux-cpu.c
> >> +++ b/drivers/staging/lustre/lustre/libcfs/linux/linux-cpu.c
> >> @@ -78,23 +78,6 @@ struct cfs_cpt_data {
> >>
> >> static struct cfs_cpt_data cpt_data;
> >>
> >> -static void cfs_cpu_core_siblings(int cpu, cpumask_t *mask)
> >> -{
> >> - /* return cpumask of cores in the same socket */
> >> - cpumask_copy(mask, topology_core_cpumask(cpu));
> >> -}
> >> -
> >> -/* return cpumask of HTs in the same core */
> >> -static void cfs_cpu_ht_siblings(int cpu, cpumask_t *mask)
> >> -{
> >> - cpumask_copy(mask, topology_sibling_cpumask(cpu));
> >> -}
> >> -
> >> -static void cfs_node_to_cpumask(int node, cpumask_t *mask)
> >> -{
> >> - cpumask_copy(mask, cpumask_of_node(node));
> >> -}
> >>
> >
> > Please remove one of these at a time, it makes it much easier to review
> > the patch.
> >
>
> Should I resend this one as well?
Yes.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-11-02 16:59 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-11-02 16:41 [PATCH] Staging: lustre: linux-cpu: Remove unnecessary wrapper functions Shivani Bhardwaj
2015-11-02 16:52 ` [Outreachy kernel] " Greg KH
2015-11-02 16:56 ` Shivani Bhardwaj
2015-11-02 16:59 ` Greg KH
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.