* [PATCH] mask ADT: replace cpumask_t implementation [3/22]
@ 2004-03-29 12:12 Paul Jackson
2004-03-30 1:49 ` Matthew Dobson
2004-04-01 1:05 ` Matthew Dobson
0 siblings, 2 replies; 7+ messages in thread
From: Paul Jackson @ 2004-03-29 12:12 UTC (permalink / raw)
To: linux-kernel; +Cc: mbligh, akpm, wli, haveblue, colpatch
Patch_3_of_22 - Rework cpumasks to use new mask ADT
Removes many old include/asm-<arch> and asm-generic cpumask files
Add intersects, subset, xor and andnot operators.
Provides temporary emulators for obsolete const, promote, coerce
Presents entire cpumask API clearly in single cpumask.h file
diffstat Patch_3_of_22:
b/include/linux/cpumask.h | 140 +++++++++++++++++++++++---
include/asm-alpha/cpumask.h | 6 -
include/asm-arm/cpumask.h | 6 -
include/asm-arm26/cpumask.h | 6 -
include/asm-cris/cpumask.h | 6 -
include/asm-generic/cpumask.h | 40 -------
include/asm-generic/cpumask_arith.h | 49 ---------
include/asm-generic/cpumask_array.h | 54 ----------
include/asm-generic/cpumask_const_reference.h | 29 -----
include/asm-generic/cpumask_const_value.h | 21 ---
include/asm-generic/cpumask_up.h | 59 ----------
include/asm-h8300/cpumask.h | 6 -
include/asm-i386/cpumask.h | 6 -
include/asm-ia64/cpumask.h | 6 -
include/asm-m68k/cpumask.h | 6 -
include/asm-m68knommu/cpumask.h | 6 -
include/asm-mips/cpumask.h | 6 -
include/asm-parisc/cpumask.h | 6 -
include/asm-ppc/cpumask.h | 6 -
include/asm-ppc64/cpumask.h | 6 -
include/asm-s390/cpumask.h | 6 -
include/asm-sh/cpumask.h | 6 -
include/asm-sparc/cpumask.h | 6 -
include/asm-sparc64/cpumask.h | 6 -
include/asm-um/cpumask.h | 6 -
include/asm-v850/cpumask.h | 6 -
include/asm-x86_64/cpumask.h | 6 -
27 files changed, 129 insertions(+), 383 deletions(-)
# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
# ChangeSet 1.1708 -> 1.1709
# include/asm-cris/cpumask.h 1.1 -> (deleted)
# include/asm-generic/cpumask_const_value.h 1.2 -> (deleted)
# include/asm-i386/cpumask.h 1.1 -> (deleted)
# include/asm-ppc/cpumask.h 1.1 -> (deleted)
# include/asm-generic/cpumask_const_reference.h 1.1 -> (deleted)
# include/asm-generic/cpumask_up.h 1.4 -> (deleted)
# include/asm-v850/cpumask.h 1.1 -> (deleted)
# include/asm-arm/cpumask.h 1.1 -> (deleted)
# include/linux/cpumask.h 1.8 -> 1.9
# include/asm-m68k/cpumask.h 1.1 -> (deleted)
# include/asm-sparc64/cpumask.h 1.1 -> (deleted)
# include/asm-sh/cpumask.h 1.1 -> (deleted)
# include/asm-generic/cpumask_array.h 1.4 -> (deleted)
# include/asm-ppc64/cpumask.h 1.1 -> (deleted)
# include/asm-parisc/cpumask.h 1.1 -> (deleted)
# include/asm-mips/cpumask.h 1.1 -> (deleted)
# include/asm-generic/cpumask_arith.h 1.3 -> (deleted)
# include/asm-x86_64/cpumask.h 1.1 -> (deleted)
# include/asm-ia64/cpumask.h 1.1 -> (deleted)
# include/asm-s390/cpumask.h 1.1 -> (deleted)
# include/asm-h8300/cpumask.h 1.1 -> (deleted)
# include/asm-alpha/cpumask.h 1.1 -> (deleted)
# include/asm-sparc/cpumask.h 1.1 -> (deleted)
# include/asm-um/cpumask.h 1.1 -> (deleted)
# include/asm-generic/cpumask.h 1.1 -> (deleted)
# include/asm-m68knommu/cpumask.h 1.1 -> (deleted)
# include/asm-arm26/cpumask.h 1.1 -> (deleted)
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 04/03/28 pj@sgi.com 1.1709
# Major new cpumask implementation, based on new mask ADT.
# New xor, subset, intersects and andnot operators provided.
# (Temporary emulations of soon to be obsolete coerce, promote
# and const routines provided, for working with unconverted code.)
# --------------------------------------------
#
diff -Nru a/include/asm-alpha/cpumask.h b/include/asm-alpha/cpumask.h
--- a/include/asm-alpha/cpumask.h Mon Mar 29 01:03:30 2004
+++ /dev/null Wed Dec 31 16:00:00 1969
@@ -1,6 +0,0 @@
-#ifndef _ASM_ALPHA_CPUMASK_H
-#define _ASM_ALPHA_CPUMASK_H
-
-#include <asm-generic/cpumask.h>
-
-#endif /* _ASM_ALPHA_CPUMASK_H */
diff -Nru a/include/asm-arm/cpumask.h b/include/asm-arm/cpumask.h
--- a/include/asm-arm/cpumask.h Mon Mar 29 01:03:30 2004
+++ /dev/null Wed Dec 31 16:00:00 1969
@@ -1,6 +0,0 @@
-#ifndef _ASM_ARM_CPUMASK_H
-#define _ASM_ARM_CPUMASK_H
-
-#include <asm-generic/cpumask.h>
-
-#endif /* _ASM_ARM_CPUMASK_H */
diff -Nru a/include/asm-arm26/cpumask.h b/include/asm-arm26/cpumask.h
--- a/include/asm-arm26/cpumask.h Mon Mar 29 01:03:30 2004
+++ /dev/null Wed Dec 31 16:00:00 1969
@@ -1,6 +0,0 @@
-#ifndef _ASM_ARM26_CPUMASK_H
-#define _ASM_ARM26_CPUMASK_H
-
-#include <asm-generic/cpumask.h>
-
-#endif /* _ASM_ARM26_CPUMASK_H */
diff -Nru a/include/asm-cris/cpumask.h b/include/asm-cris/cpumask.h
--- a/include/asm-cris/cpumask.h Mon Mar 29 01:03:30 2004
+++ /dev/null Wed Dec 31 16:00:00 1969
@@ -1,6 +0,0 @@
-#ifndef _ASM_CRIS_CPUMASK_H
-#define _ASM_CRIS_CPUMASK_H
-
-#include <asm-generic/cpumask.h>
-
-#endif /* _ASM_CRIS_CPUMASK_H */
diff -Nru a/include/asm-generic/cpumask.h b/include/asm-generic/cpumask.h
--- a/include/asm-generic/cpumask.h Mon Mar 29 01:03:30 2004
+++ /dev/null Wed Dec 31 16:00:00 1969
@@ -1,40 +0,0 @@
-#ifndef __ASM_GENERIC_CPUMASK_H
-#define __ASM_GENERIC_CPUMASK_H
-
-#include <linux/config.h>
-#include <linux/kernel.h>
-#include <linux/threads.h>
-#include <linux/types.h>
-#include <linux/bitmap.h>
-
-#if NR_CPUS > BITS_PER_LONG && NR_CPUS != 1
-#define CPU_ARRAY_SIZE BITS_TO_LONGS(NR_CPUS)
-
-struct cpumask
-{
- unsigned long mask[CPU_ARRAY_SIZE];
-};
-
-typedef struct cpumask cpumask_t;
-
-#else
-typedef unsigned long cpumask_t;
-#endif
-
-#ifdef CONFIG_SMP
-#if NR_CPUS > BITS_PER_LONG
-#include <asm-generic/cpumask_array.h>
-#else
-#include <asm-generic/cpumask_arith.h>
-#endif
-#else
-#include <asm-generic/cpumask_up.h>
-#endif
-
-#if NR_CPUS <= 4*BITS_PER_LONG
-#include <asm-generic/cpumask_const_value.h>
-#else
-#include <asm-generic/cpumask_const_reference.h>
-#endif
-
-#endif /* __ASM_GENERIC_CPUMASK_H */
diff -Nru a/include/asm-generic/cpumask_arith.h b/include/asm-generic/cpumask_arith.h
--- a/include/asm-generic/cpumask_arith.h Mon Mar 29 01:03:30 2004
+++ /dev/null Wed Dec 31 16:00:00 1969
@@ -1,49 +0,0 @@
-#ifndef __ASM_GENERIC_CPUMASK_ARITH_H
-#define __ASM_GENERIC_CPUMASK_ARITH_H
-
-/*
- * Arithmetic type -based cpu bitmaps. A single unsigned long is used
- * to contain the whole cpu bitmap.
- */
-
-#define cpu_set(cpu, map) set_bit(cpu, &(map))
-#define cpu_clear(cpu, map) clear_bit(cpu, &(map))
-#define cpu_isset(cpu, map) test_bit(cpu, &(map))
-#define cpu_test_and_set(cpu, map) test_and_set_bit(cpu, &(map))
-
-#define cpus_and(dst,src1,src2) do { dst = (src1) & (src2); } while (0)
-#define cpus_or(dst,src1,src2) do { dst = (src1) | (src2); } while (0)
-#define cpus_clear(map) do { map = 0; } while (0)
-#define cpus_complement(map) do { map = ~(map); } while (0)
-#define cpus_equal(map1, map2) ((map1) == (map2))
-#define cpus_empty(map) ((map) == 0)
-#define cpus_addr(map) (&(map))
-
-#if BITS_PER_LONG == 32
-#define cpus_weight(map) hweight32(map)
-#elif BITS_PER_LONG == 64
-#define cpus_weight(map) hweight64(map)
-#endif
-
-#define cpus_shift_right(dst, src, n) do { dst = (src) >> (n); } while (0)
-#define cpus_shift_left(dst, src, n) do { dst = (src) << (n); } while (0)
-
-#define any_online_cpu(map) \
-({ \
- cpumask_t __tmp__; \
- cpus_and(__tmp__, map, cpu_online_map); \
- __tmp__ ? first_cpu(__tmp__) : NR_CPUS; \
-})
-
-#define CPU_MASK_ALL (~((cpumask_t)0) >> (8*sizeof(cpumask_t) - NR_CPUS))
-#define CPU_MASK_NONE ((cpumask_t)0)
-
-/* only ever use this for things that are _never_ used on large boxen */
-#define cpus_coerce(map) ((unsigned long)(map))
-#define cpus_promote(map) ({ map; })
-#define cpumask_of_cpu(cpu) ({ ((cpumask_t)1) << (cpu); })
-
-#define first_cpu(map) __ffs(map)
-#define next_cpu(cpu, map) find_next_bit(&(map), NR_CPUS, cpu + 1)
-
-#endif /* __ASM_GENERIC_CPUMASK_ARITH_H */
diff -Nru a/include/asm-generic/cpumask_array.h b/include/asm-generic/cpumask_array.h
--- a/include/asm-generic/cpumask_array.h Mon Mar 29 01:03:30 2004
+++ /dev/null Wed Dec 31 16:00:00 1969
@@ -1,54 +0,0 @@
-#ifndef __ASM_GENERIC_CPUMASK_ARRAY_H
-#define __ASM_GENERIC_CPUMASK_ARRAY_H
-
-/*
- * Array-based cpu bitmaps. An array of unsigned longs is used to contain
- * the bitmap, and then contained in a structure so it may be passed by
- * value.
- */
-
-#define CPU_ARRAY_SIZE BITS_TO_LONGS(NR_CPUS)
-
-#define cpu_set(cpu, map) set_bit(cpu, (map).mask)
-#define cpu_clear(cpu, map) clear_bit(cpu, (map).mask)
-#define cpu_isset(cpu, map) test_bit(cpu, (map).mask)
-#define cpu_test_and_set(cpu, map) test_and_set_bit(cpu, (map).mask)
-
-#define cpus_and(dst,src1,src2) bitmap_and((dst).mask,(src1).mask, (src2).mask, NR_CPUS)
-#define cpus_or(dst,src1,src2) bitmap_or((dst).mask, (src1).mask, (src2).mask, NR_CPUS)
-#define cpus_clear(map) bitmap_clear((map).mask, NR_CPUS)
-#define cpus_complement(map) bitmap_complement((map).mask, (map).mask, NR_CPUS)
-#define cpus_equal(map1, map2) bitmap_equal((map1).mask, (map2).mask, NR_CPUS)
-#define cpus_empty(map) bitmap_empty(map.mask, NR_CPUS)
-#define cpus_addr(map) ((map).mask)
-#define cpus_weight(map) bitmap_weight((map).mask, NR_CPUS)
-#define cpus_shift_right(d, s, n) bitmap_shift_right((d).mask, (s).mask, n, NR_CPUS)
-#define cpus_shift_left(d, s, n) bitmap_shift_left((d).mask, (s).mask, n, NR_CPUS)
-#define first_cpu(map) find_first_bit((map).mask, NR_CPUS)
-#define next_cpu(cpu, map) find_next_bit((map).mask, NR_CPUS, cpu + 1)
-
-/* only ever use this for things that are _never_ used on large boxen */
-#define cpus_coerce(map) ((map).mask[0])
-#define cpus_promote(map) ({ cpumask_t __cpu_mask = CPU_MASK_NONE;\
- __cpu_mask.mask[0] = map; \
- __cpu_mask; \
- })
-#define cpumask_of_cpu(cpu) ({ cpumask_t __cpu_mask = CPU_MASK_NONE;\
- cpu_set(cpu, __cpu_mask); \
- __cpu_mask; \
- })
-#define any_online_cpu(map) \
-({ \
- cpumask_t __tmp__; \
- cpus_and(__tmp__, map, cpu_online_map); \
- find_first_bit(__tmp__.mask, NR_CPUS); \
-})
-
-
-/*
- * um, these need to be usable as static initializers
- */
-#define CPU_MASK_ALL { {[0 ... CPU_ARRAY_SIZE-1] = ~0UL} }
-#define CPU_MASK_NONE { {[0 ... CPU_ARRAY_SIZE-1] = 0UL} }
-
-#endif /* __ASM_GENERIC_CPUMASK_ARRAY_H */
diff -Nru a/include/asm-generic/cpumask_const_reference.h b/include/asm-generic/cpumask_const_reference.h
--- a/include/asm-generic/cpumask_const_reference.h Mon Mar 29 01:03:30 2004
+++ /dev/null Wed Dec 31 16:00:00 1969
@@ -1,29 +0,0 @@
-#ifndef __ASM_GENERIC_CPUMASK_CONST_REFERENCE_H
-#define __ASM_GENERIC_CPUMASK_CONST_REFERENCE_H
-
-struct cpumask_ref {
- const cpumask_t *val;
-};
-
-typedef const struct cpumask_ref cpumask_const_t;
-
-#define mk_cpumask_const(map) ((cpumask_const_t){ &(map) })
-#define cpu_isset_const(cpu, map) cpu_isset(cpu, *(map).val)
-
-#define cpus_and_const(dst,src1,src2) cpus_and(dst,*(src1).val,*(src2).val)
-#define cpus_or_const(dst,src1,src2) cpus_or(dst,*(src1).val,*(src2).val)
-
-#define cpus_equal_const(map1, map2) cpus_equal(*(map1).val, *(map2).val)
-
-#define cpus_copy_const(map1, map2) bitmap_copy((map1).mask, (map2).val->mask, NR_CPUS)
-
-#define cpus_empty_const(map) cpus_empty(*(map).val)
-#define cpus_weight_const(map) cpus_weight(*(map).val)
-#define first_cpu_const(map) first_cpu(*(map).val)
-#define next_cpu_const(cpu, map) next_cpu(cpu, *(map).val)
-
-/* only ever use this for things that are _never_ used on large boxen */
-#define cpus_coerce_const(map) cpus_coerce(*(map).val)
-#define any_online_cpu_const(map) any_online_cpu(*(map).val)
-
-#endif /* __ASM_GENERIC_CPUMASK_CONST_REFERENCE_H */
diff -Nru a/include/asm-generic/cpumask_const_value.h b/include/asm-generic/cpumask_const_value.h
--- a/include/asm-generic/cpumask_const_value.h Mon Mar 29 01:03:30 2004
+++ /dev/null Wed Dec 31 16:00:00 1969
@@ -1,21 +0,0 @@
-#ifndef __ASM_GENERIC_CPUMASK_CONST_VALUE_H
-#define __ASM_GENERIC_CPUMASK_CONST_VALUE_H
-
-typedef const cpumask_t cpumask_const_t;
-
-#define mk_cpumask_const(map) (map)
-#define cpu_isset_const(cpu, map) cpu_isset(cpu, map)
-#define cpus_and_const(dst,src1,src2) cpus_and(dst, src1, src2)
-#define cpus_or_const(dst,src1,src2) cpus_or(dst, src1, src2)
-#define cpus_equal_const(map1, map2) cpus_equal(map1, map2)
-#define cpus_empty_const(map) cpus_empty(map)
-#define cpus_copy_const(map1, map2) do { map1 = (cpumask_t)map2; } while (0)
-#define cpus_weight_const(map) cpus_weight(map)
-#define first_cpu_const(map) first_cpu(map)
-#define next_cpu_const(cpu, map) next_cpu(cpu, map)
-
-/* only ever use this for things that are _never_ used on large boxen */
-#define cpus_coerce_const(map) cpus_coerce(map)
-#define any_online_cpu_const(map) any_online_cpu(map)
-
-#endif /* __ASM_GENERIC_CPUMASK_CONST_VALUE_H */
diff -Nru a/include/asm-generic/cpumask_up.h b/include/asm-generic/cpumask_up.h
--- a/include/asm-generic/cpumask_up.h Mon Mar 29 01:03:30 2004
+++ /dev/null Wed Dec 31 16:00:00 1969
@@ -1,59 +0,0 @@
-#ifndef __ASM_GENERIC_CPUMASK_UP_H
-#define __ASM_GENERIC_CPUMASK_UP_H
-
-#define cpus_coerce(map) (map)
-
-#define cpu_set(cpu, map) do { (void)(cpu); cpus_coerce(map) = 1UL; } while (0)
-#define cpu_clear(cpu, map) do { (void)(cpu); cpus_coerce(map) = 0UL; } while (0)
-#define cpu_isset(cpu, map) ((void)(cpu), cpus_coerce(map) != 0UL)
-#define cpu_test_and_set(cpu, map) ((void)(cpu), test_and_set_bit(0, &(map)))
-
-#define cpus_and(dst, src1, src2) \
- do { \
- if (cpus_coerce(src1) && cpus_coerce(src2)) \
- cpus_coerce(dst) = 1UL; \
- else \
- cpus_coerce(dst) = 0UL; \
- } while (0)
-
-#define cpus_or(dst, src1, src2) \
- do { \
- if (cpus_coerce(src1) || cpus_coerce(src2)) \
- cpus_coerce(dst) = 1UL; \
- else \
- cpus_coerce(dst) = 0UL; \
- } while (0)
-
-#define cpus_clear(map) do { cpus_coerce(map) = 0UL; } while (0)
-
-#define cpus_complement(map) \
- do { \
- cpus_coerce(map) = !cpus_coerce(map); \
- } while (0)
-
-#define cpus_equal(map1, map2) (cpus_coerce(map1) == cpus_coerce(map2))
-#define cpus_empty(map) (cpus_coerce(map) == 0UL)
-#define cpus_addr(map) (&(map))
-#define cpus_weight(map) (cpus_coerce(map) ? 1UL : 0UL)
-#define cpus_shift_right(d, s, n) do { cpus_coerce(d) = 0UL; } while (0)
-#define cpus_shift_left(d, s, n) do { cpus_coerce(d) = 0UL; } while (0)
-#define first_cpu(map) (cpus_coerce(map) ? 0 : 1)
-#define next_cpu(cpu, map) 1
-
-/* only ever use this for things that are _never_ used on large boxen */
-#define cpus_promote(map) \
- ({ \
- cpumask_t __tmp__; \
- cpus_coerce(__tmp__) = map; \
- __tmp__; \
- })
-#define cpumask_of_cpu(cpu) ((void)(cpu), cpus_promote(1))
-#define any_online_cpu(map) (cpus_coerce(map) ? 0 : 1)
-
-/*
- * um, these need to be usable as static initializers
- */
-#define CPU_MASK_ALL 1UL
-#define CPU_MASK_NONE 0UL
-
-#endif /* __ASM_GENERIC_CPUMASK_UP_H */
diff -Nru a/include/asm-h8300/cpumask.h b/include/asm-h8300/cpumask.h
--- a/include/asm-h8300/cpumask.h Mon Mar 29 01:03:30 2004
+++ /dev/null Wed Dec 31 16:00:00 1969
@@ -1,6 +0,0 @@
-#ifndef _ASM_H8300_CPUMASK_H
-#define _ASM_H8300_CPUMASK_H
-
-#include <asm-generic/cpumask.h>
-
-#endif /* _ASM_H8300_CPUMASK_H */
diff -Nru a/include/asm-i386/cpumask.h b/include/asm-i386/cpumask.h
--- a/include/asm-i386/cpumask.h Mon Mar 29 01:03:30 2004
+++ /dev/null Wed Dec 31 16:00:00 1969
@@ -1,6 +0,0 @@
-#ifndef _ASM_I386_CPUMASK_H
-#define _ASM_I386_CPUMASK_H
-
-#include <asm-generic/cpumask.h>
-
-#endif /* _ASM_I386_CPUMASK_H */
diff -Nru a/include/asm-ia64/cpumask.h b/include/asm-ia64/cpumask.h
--- a/include/asm-ia64/cpumask.h Mon Mar 29 01:03:30 2004
+++ /dev/null Wed Dec 31 16:00:00 1969
@@ -1,6 +0,0 @@
-#ifndef _ASM_IA64_CPUMASK_H
-#define _ASM_IA64_CPUMASK_H
-
-#include <asm-generic/cpumask.h>
-
-#endif /* _ASM_IA64_CPUMASK_H */
diff -Nru a/include/asm-m68k/cpumask.h b/include/asm-m68k/cpumask.h
--- a/include/asm-m68k/cpumask.h Mon Mar 29 01:03:30 2004
+++ /dev/null Wed Dec 31 16:00:00 1969
@@ -1,6 +0,0 @@
-#ifndef _ASM_M68K_CPUMASK_H
-#define _ASM_M68K_CPUMASK_H
-
-#include <asm-generic/cpumask.h>
-
-#endif /* _ASM_M68K_CPUMASK_H */
diff -Nru a/include/asm-m68knommu/cpumask.h b/include/asm-m68knommu/cpumask.h
--- a/include/asm-m68knommu/cpumask.h Mon Mar 29 01:03:30 2004
+++ /dev/null Wed Dec 31 16:00:00 1969
@@ -1,6 +0,0 @@
-#ifndef _ASM_M68KNOMMU_CPUMASK_H
-#define _ASM_M68KNOMMU_CPUMASK_H
-
-#include <asm-generic/cpumask.h>
-
-#endif /* _ASM_M68KNOMMU_CPUMASK_H */
diff -Nru a/include/asm-mips/cpumask.h b/include/asm-mips/cpumask.h
--- a/include/asm-mips/cpumask.h Mon Mar 29 01:03:30 2004
+++ /dev/null Wed Dec 31 16:00:00 1969
@@ -1,6 +0,0 @@
-#ifndef _ASM_MIPS_CPUMASK_H
-#define _ASM_MIPS_CPUMASK_H
-
-#include <asm-generic/cpumask.h>
-
-#endif /* _ASM_MIPS_CPUMASK_H */
diff -Nru a/include/asm-parisc/cpumask.h b/include/asm-parisc/cpumask.h
--- a/include/asm-parisc/cpumask.h Mon Mar 29 01:03:30 2004
+++ /dev/null Wed Dec 31 16:00:00 1969
@@ -1,6 +0,0 @@
-#ifndef _ASM_PARISC_CPUMASK_H
-#define _ASM_PARISC_CPUMASK_H
-
-#include <asm-generic/cpumask.h>
-
-#endif /* _ASM_PARISC_CPUMASK_H */
diff -Nru a/include/asm-ppc/cpumask.h b/include/asm-ppc/cpumask.h
--- a/include/asm-ppc/cpumask.h Mon Mar 29 01:03:30 2004
+++ /dev/null Wed Dec 31 16:00:00 1969
@@ -1,6 +0,0 @@
-#ifndef _ASM_PPC_CPUMASK_H
-#define _ASM_PPC_CPUMASK_H
-
-#include <asm-generic/cpumask.h>
-
-#endif /* _ASM_PPC_CPUMASK_H */
diff -Nru a/include/asm-ppc64/cpumask.h b/include/asm-ppc64/cpumask.h
--- a/include/asm-ppc64/cpumask.h Mon Mar 29 01:03:30 2004
+++ /dev/null Wed Dec 31 16:00:00 1969
@@ -1,6 +0,0 @@
-#ifndef _ASM_PPC64_CPUMASK_H
-#define _ASM_PPC64_CPUMASK_H
-
-#include <asm-generic/cpumask.h>
-
-#endif /* _ASM_PPC64_CPUMASK_H */
diff -Nru a/include/asm-s390/cpumask.h b/include/asm-s390/cpumask.h
--- a/include/asm-s390/cpumask.h Mon Mar 29 01:03:30 2004
+++ /dev/null Wed Dec 31 16:00:00 1969
@@ -1,6 +0,0 @@
-#ifndef _ASM_S390_CPUMASK_H
-#define _ASM_S390_CPUMASK_H
-
-#include <asm-generic/cpumask.h>
-
-#endif /* _ASM_S390_CPUMASK_H */
diff -Nru a/include/asm-sh/cpumask.h b/include/asm-sh/cpumask.h
--- a/include/asm-sh/cpumask.h Mon Mar 29 01:03:30 2004
+++ /dev/null Wed Dec 31 16:00:00 1969
@@ -1,6 +0,0 @@
-#ifndef _ASM_SH_CPUMASK_H
-#define _ASM_SH_CPUMASK_H
-
-#include <asm-generic/cpumask.h>
-
-#endif /* _ASM_SH_CPUMASK_H */
diff -Nru a/include/asm-sparc/cpumask.h b/include/asm-sparc/cpumask.h
--- a/include/asm-sparc/cpumask.h Mon Mar 29 01:03:30 2004
+++ /dev/null Wed Dec 31 16:00:00 1969
@@ -1,6 +0,0 @@
-#ifndef _ASM_SPARC_CPUMASK_H
-#define _ASM_SPARC_CPUMASK_H
-
-#include <asm-generic/cpumask.h>
-
-#endif /* _ASM_SPARC_CPUMASK_H */
diff -Nru a/include/asm-sparc64/cpumask.h b/include/asm-sparc64/cpumask.h
--- a/include/asm-sparc64/cpumask.h Mon Mar 29 01:03:30 2004
+++ /dev/null Wed Dec 31 16:00:00 1969
@@ -1,6 +0,0 @@
-#ifndef _ASM_SPARC64_CPUMASK_H
-#define _ASM_SPARC64_CPUMASK_H
-
-#include <asm-generic/cpumask.h>
-
-#endif /* _ASM_SPARC64_CPUMASK_H */
diff -Nru a/include/asm-um/cpumask.h b/include/asm-um/cpumask.h
--- a/include/asm-um/cpumask.h Mon Mar 29 01:03:30 2004
+++ /dev/null Wed Dec 31 16:00:00 1969
@@ -1,6 +0,0 @@
-#ifndef _ASM_UM_CPUMASK_H
-#define _ASM_UM_CPUMASK_H
-
-#include <asm-generic/cpumask.h>
-
-#endif /* _ASM_UM_CPUMASK_H */
diff -Nru a/include/asm-v850/cpumask.h b/include/asm-v850/cpumask.h
--- a/include/asm-v850/cpumask.h Mon Mar 29 01:03:30 2004
+++ /dev/null Wed Dec 31 16:00:00 1969
@@ -1,6 +0,0 @@
-#ifndef _ASM_V850_CPUMASK_H
-#define _ASM_V850_CPUMASK_H
-
-#include <asm-generic/cpumask.h>
-
-#endif /* _ASM_V850_CPUMASK_H */
diff -Nru a/include/asm-x86_64/cpumask.h b/include/asm-x86_64/cpumask.h
--- a/include/asm-x86_64/cpumask.h Mon Mar 29 01:03:30 2004
+++ /dev/null Wed Dec 31 16:00:00 1969
@@ -1,6 +0,0 @@
-#ifndef _ASM_X86_64_CPUMASK_H
-#define _ASM_X86_64_CPUMASK_H
-
-#include <asm-generic/cpumask.h>
-
-#endif /* _ASM_X86_64_CPUMASK_H */
diff -Nru a/include/linux/cpumask.h b/include/linux/cpumask.h
--- a/include/linux/cpumask.h Mon Mar 29 01:03:30 2004
+++ b/include/linux/cpumask.h Mon Mar 29 01:03:30 2004
@@ -1,11 +1,108 @@
#ifndef __LINUX_CPUMASK_H
#define __LINUX_CPUMASK_H
+/*
+ * Cpumasks provide a bit mask suitable for representing the
+ * set of CPU's in a system, one bit position per CPU number.
+ *
+ * See detailed comments in the file linux/mask.h describing the
+ * data type on which these cpumasks are based.
+ *
+ * For details of cpumask_scnprintf() and cpumask_parse(),
+ * see bitmap_scnprintf() and bitmap_parse() in lib/bitmap.c.
+ *
+ * The available cpumask operations are:
+ *
+ * void cpu_set(cpu, mask) turn on bit 'cpu' in mask
+ * void cpu_clear(cpu, mask) turn off bit 'cpu' in mask
+ * void cpus_setall(mask) set all bits
+ * void cpus_clear(mask) clear all bits
+ * int cpu_isset(cpu, mask) true iff bit 'cpu' set in mask
+ * int cpu_test_and_set(cpu, mask) test and set bit 'cpu' in mask
+ *
+ * void cpus_and(dst, src1, src2) dst = src1 & src2 [intersection]
+ * void cpus_or(dst, src1, src2) dst = src1 | src2 [union]
+ * void cpus_xor(dst, src1, src2) dst = src1 ^ src2
+ * void cpus_andnot(dst, src1, src2) dst = src1 & ~src2
+ * void cpus_complement(dst, src) dst = ~src
+ *
+ * int cpus_equal(mask1, mask2) Does mask1 == mask2?
+ * int cpus_intersects(mask1, mask2) Do mask1 and mask2 intersect?
+ * int cpus_subset(mask1, mask2) Is mask1 a subset of mask2?
+ * int cpus_empty(mask) Is mask empty (no bits sets)?
+ * int cpus_full(mask) Is mask full (all bits sets)?
+ * int cpus_weight(mask) Hamming weigh - number of set bits
+ *
+ * void cpus_shift_right(dst, src, n) Shift right
+ * void cpus_shift_left(dst, src, n) Shift left
+ *
+ * int first_cpu(mask) Number lowest set bit, or NR_CPUS
+ * int next_cpu(cpu, mask) Next cpu past 'cpu', or NR_CPUS
+ *
+ * cpumask_t cpumask_of_cpu(cpu) Return cpumask with bit 'cpu' set
+ * CPU_MASK_ALL Initializer - all bits set
+ * CPU_MASK_NONE Initializer - no bits set
+ * unsigned long *cpus_raw(mask) Array of unsigned long's in mask
+ *
+ * int cpumask_scnprintf(buf, len, mask) Format cpumask for printing
+ * int cpumask_parse(ubuf, ulen, mask) Parse ascii string as cpumask
+ *
+ * int num_online_cpus() Number of online CPUs
+ * int num_possible_cpus() Number of all possible CPUs
+ * int cpu_online(cpu) Is some cpu < NR_CPUS online?
+ * int cpu_possible(cpu) Is some cpu < NR_CPUS possible?
+ * int any_online_cpu(mask) First online cpu in mask
+ *
+ * for_each_cpu_mask(cpu, mask) for-loop cpu over mask
+ * for_each_cpu(cpu) for-loop cpu over cpu_possible_map
+ * for_each_online_cpu(cpu) for-loop cpu over cpu_online_map
+ */
+
+#include <linux/config.h>
+#include <linux/mask.h>
#include <linux/threads.h>
-#include <linux/bitmap.h>
-#include <asm/cpumask.h>
#include <asm/bug.h>
+typedef __mask(NR_CPUS) cpumask_t;
+extern cpumask_t _unused_cpumask_arg_;
+
+#define cpu_set(cpu, mask) mask_setbit((cpu), (mask))
+#define cpu_clear(cpu, mask) mask_clearbit((cpu), (mask))
+#define cpus_setall(mask) mask_setall(mask, NR_CPUS)
+#define cpus_clear(mask) mask_clearall(mask)
+#define cpu_isset(cpu, mask) mask_isset((cpu), (mask))
+#define cpu_test_and_set(cpu, mask) mask_test_and_set((cpu), (mask))
+#define cpus_and(dst, src1, src2) mask_and((dst), (src1), (src2))
+#define cpus_or(dst, src1, src2) mask_or((dst), (src1), (src2))
+#define cpus_xor(dst, src1, src2) mask_xor((dst), (src1), (src2))
+#define cpus_andnot(dst, src1, src2) mask_andnot((dst), (src1), (src2))
+#define cpus_complement(dst, src) mask_complement((dst), (src), NR_CPUS)
+#define cpus_equal(mask1, mask2) mask_equal((mask1), (mask2))
+#define cpus_intersects(mask1, mask2) mask_intersects(mask1, mask2)
+#define cpus_subset(mask1, mask2) mask_subset(mask1, mask2)
+#define cpus_empty(mask) mask_empty(mask)
+#define cpus_full(mask) mask_full(mask, NR_CPUS)
+#define cpus_weight(mask) mask_weight(mask, NR_CPUS)
+#define cpus_shift_right(dst, src, n) \
+ mask_shift_right((dst), (src), (n), NR_CPUS)
+#define cpus_shift_left(dst, src, n) \
+ mask_shift_left((dst), (src), (n), NR_CPUS)
+#define first_cpu(mask) mask_first(mask, NR_CPUS)
+#define next_cpu(cpu, mask) mask_next(cpu, mask, NR_CPUS)
+#define cpumask_of_cpu(cpu) mask_of_bit((cpu), _unused_cpumask_arg_)
+#define CPU_MASK_ALL MASK_ALL(NR_CPUS)
+#define CPU_MASK_NONE MASK_NONE(NR_CPUS)
+#define cpus_raw(mask) mask_raw(mask)
+#define cpumask_scnprintf(buf, len, mask) \
+ mask_scnprintf(buf, len, mask, NR_CPUS)
+#define cpumask_parse(ubuf, ulen, mask) \
+ mask_parse(ubuf, ulen, mask, NR_CPUS)
+
+/*
+ * The following particular system cpumasks and operations
+ * on them manage all (possible) and online cpus.
+ */
+
#ifdef CONFIG_SMP
extern cpumask_t cpu_online_map;
@@ -16,29 +113,50 @@
#define cpu_online(cpu) cpu_isset(cpu, cpu_online_map)
#define cpu_possible(cpu) cpu_isset(cpu, cpu_possible_map)
-#define for_each_cpu_mask(cpu, mask) \
- for (cpu = first_cpu_const(mk_cpumask_const(mask)); \
- cpu < NR_CPUS; \
- cpu = next_cpu_const(cpu, mk_cpumask_const(mask)))
+#define any_online_cpu(mask) \
+({ \
+ cpumask_t m; \
+ cpus_and(m, mask, cpu_online_map); \
+ first_cpu(m); \
+})
+
+#define for_each_cpu_mask(cpu, mask) \
+ for (cpu = first_cpu(mask); \
+ cpu < NR_CPUS; \
+ cpu = next_cpu(cpu, mask))
#define for_each_cpu(cpu) for_each_cpu_mask(cpu, cpu_possible_map)
#define for_each_online_cpu(cpu) for_each_cpu_mask(cpu, cpu_online_map)
+
#else
+
#define cpu_online_map cpumask_of_cpu(0)
#define cpu_possible_map cpumask_of_cpu(0)
+
#define num_online_cpus() 1
#define num_possible_cpus() 1
#define cpu_online(cpu) ({ BUG_ON((cpu) != 0); 1; })
#define cpu_possible(cpu) ({ BUG_ON((cpu) != 0); 1; })
+#define any_online_cpu(mask) 0
+
+#define for_each_cpu_mask(cpu, mask) for (cpu = 0; cpu < 1; cpu++)
+
#define for_each_cpu(cpu) for (cpu = 0; cpu < 1; cpu++)
#define for_each_online_cpu(cpu) for (cpu = 0; cpu < 1; cpu++)
-#endif
-#define cpumask_scnprintf(buf, buflen, map) \
- bitmap_scnprintf(buf, buflen, cpus_addr(map), NR_CPUS)
+#endif
-#define cpumask_parse(buf, buflen, map) \
- bitmap_parse(buf, buflen, cpus_addr(map), NR_CPUS)
+/* Begin obsolete cpumask operator emulation */
+#define cpu_isset_const(a,b) cpu_isset(a,b)
+#define cpumask_const_t cpumask_t
+#define cpus_coerce(m) (cpus_raw(m)[0])
+#define cpus_coerce_const cpus_coerce
+#define cpus_promote(x) ({ cpumask_t m; m._m[0] = x; m; })
+#define cpus_weight_const cpus_weight
+#define first_cpu_const first_cpu
+#define mk_cpumask_const(x) x
+#define next_cpu_const next_cpu
+/* End of obsolete cpumask operator emulation */
#endif /* __LINUX_CPUMASK_H */
--
I won't rest till it's the best ...
Programmer, Linux Scalability
Paul Jackson <pj@sgi.com> 1.650.933.1373
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] mask ADT: replace cpumask_t implementation [3/22]
2004-03-29 12:12 [PATCH] mask ADT: replace cpumask_t implementation [3/22] Paul Jackson
@ 2004-03-30 1:49 ` Matthew Dobson
2004-04-01 15:22 ` Paul Jackson
2004-04-01 1:05 ` Matthew Dobson
1 sibling, 1 reply; 7+ messages in thread
From: Matthew Dobson @ 2004-03-30 1:49 UTC (permalink / raw)
To: Paul Jackson
Cc: LKML, Martin J. Bligh, Andrew Morton, William Lee Irwin III,
Dave Hansen
On Mon, 2004-03-29 at 04:12, Paul Jackson wrote:
> Patch_3_of_22 - Rework cpumasks to use new mask ADT
> Removes many old include/asm-<arch> and asm-generic cpumask files
> Add intersects, subset, xor and andnot operators.
> Provides temporary emulators for obsolete const, promote, coerce
> Presents entire cpumask API clearly in single cpumask.h file
<snip>
> + * int num_online_cpus() Number of online CPUs
> + * int num_possible_cpus() Number of all possible CPUs
> + * int cpu_online(cpu) Is some cpu < NR_CPUS online?
> + * int cpu_possible(cpu) Is some cpu < NR_CPUS possible?
> + * int any_online_cpu(mask) First online cpu in mask
This made me do a double-take. I don't think it's necessary to specify
the passed in cpu number is < NR_CPUS, because that is true for the
whole API. This comment seemed to imply at first reading that the call
would return true if any CPU with a number less than 'cpu' was
online/possible.
> +#define cpu_set(cpu, mask) mask_setbit((cpu), (mask))
> +#define cpu_clear(cpu, mask) mask_clearbit((cpu), (mask))
> +#define cpus_setall(mask) mask_setall(mask, NR_CPUS)
> +#define cpus_clear(mask) mask_clearall(mask)
> +#define cpu_isset(cpu, mask) mask_isset((cpu), (mask))
> +#define cpu_test_and_set(cpu, mask) mask_test_and_set((cpu), (mask))
> +#define cpus_and(dst, src1, src2) mask_and((dst), (src1), (src2))
> +#define cpus_or(dst, src1, src2) mask_or((dst), (src1), (src2))
> +#define cpus_xor(dst, src1, src2) mask_xor((dst), (src1), (src2))
> +#define cpus_andnot(dst, src1, src2) mask_andnot((dst), (src1), (src2))
> +#define cpus_complement(dst, src) mask_complement((dst), (src), NR_CPUS)
> +#define cpus_equal(mask1, mask2) mask_equal((mask1), (mask2))
> +#define cpus_intersects(mask1, mask2) mask_intersects(mask1, mask2)
> +#define cpus_subset(mask1, mask2) mask_subset(mask1, mask2)
> +#define cpus_empty(mask) mask_empty(mask)
> +#define cpus_full(mask) mask_full(mask, NR_CPUS)
> +#define cpus_weight(mask) mask_weight(mask, NR_CPUS)
> +#define cpus_shift_right(dst, src, n) \
> + mask_shift_right((dst), (src), (n), NR_CPUS)
> +#define cpus_shift_left(dst, src, n) \
> + mask_shift_left((dst), (src), (n), NR_CPUS)
> +#define first_cpu(mask) mask_first(mask, NR_CPUS)
> +#define next_cpu(cpu, mask) mask_next(cpu, mask, NR_CPUS)
> +#define cpumask_of_cpu(cpu) mask_of_bit((cpu), _unused_cpumask_arg_)
> +#define CPU_MASK_ALL MASK_ALL(NR_CPUS)
> +#define CPU_MASK_NONE MASK_NONE(NR_CPUS)
> +#define cpus_raw(mask) mask_raw(mask)
> +#define cpumask_scnprintf(buf, len, mask) \
> + mask_scnprintf(buf, len, mask, NR_CPUS)
> +#define cpumask_parse(ubuf, ulen, mask) \
> + mask_parse(ubuf, ulen, mask, NR_CPUS)
What would you think about creating two versions of some of the mask_*
functions, one that takes a nrbits argument and one that doesn't. Many
(all?) of the bitmap_* functions take a number of bits to operate on,
and for the mask_* functions we simply compute the size of the mask and
pass that along. We can be smarter in the cpumask/nodemask cases
because we *know* how many bits we're really using, and we can pass that
information along. Basically, what I'm suggesting is:
mask_empty(mask) -> bitmap_empty(mask, sizeof(mask))
mask_empty_bits(mask, nrbits) -> bitmap_empty(mask, nrbits)
cpus_empty(mask) -> mask_empty_bits(mask, NR_CPUS)
This allows anyone using the mask API to specify the exact number of
bits if they care to, and it buys us a little protection from non-word
sized cpumask/nodemask errors.
> #else
> +
> #define cpu_online_map cpumask_of_cpu(0)
> #define cpu_possible_map cpumask_of_cpu(0)
> +
> #define num_online_cpus() 1
> #define num_possible_cpus() 1
> #define cpu_online(cpu) ({ BUG_ON((cpu) != 0); 1; })
> #define cpu_possible(cpu) ({ BUG_ON((cpu) != 0); 1; })
Might it make more sense to actually define a cpu_online_map &
cpu_possible_map for UP, rather than generating this code:
#define mask_of_bit(bit, T) \
({ \
typeof(T) m; \
mask_clearall(m); \
mask_setbit((bit), m); \
m; \
})
every time some code references cpu_online_map? It'll only cost us 2
unsigned longs on 32-bit == 8 bytes...
-Matt
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] mask ADT: replace cpumask_t implementation [3/22]
2004-03-29 12:12 [PATCH] mask ADT: replace cpumask_t implementation [3/22] Paul Jackson
2004-03-30 1:49 ` Matthew Dobson
@ 2004-04-01 1:05 ` Matthew Dobson
1 sibling, 0 replies; 7+ messages in thread
From: Matthew Dobson @ 2004-04-01 1:05 UTC (permalink / raw)
To: Paul Jackson; +Cc: LKML, Andrew Morton, William Lee Irwin III
[-- Attachment #1: Type: text/plain, Size: 1207 bytes --]
On Mon, 2004-03-29 at 04:12, Paul Jackson wrote:
> Patch_3_of_22 - Rework cpumasks to use new mask ADT
> Removes many old include/asm-<arch> and asm-generic cpumask files
> Add intersects, subset, xor and andnot operators.
> Provides temporary emulators for obsolete const, promote, coerce
> Presents entire cpumask API clearly in single cpumask.h file
Paul,
Some changes to include/linux/cpumask.h:
1) You didn't provide a set of cpu_set_online/offline() macros. No one
is using these, but it may be a nice thing to have all the places that
are *writing* to cpu_online_map do it through a macro. If nothing else,
it makes cpu_online_map & node_online_map accessed similarly.
2) Dropped #include <linux/config.h>. The very next include
(linux/threads.h) includes this file.
3) Indented all the cpu_* and cpus_* macros. Massively more readable.
4) Made sure any macro call with more than 1 argument had its arguments
wrapped in parens. It seemed like you were a bit inconsistent as to
whether or not the arguments to macros got parens.
5) Moved for_each_cpu() & for_each_online_cpu() definitions outside the
#ifdef CONFIG_SMP, because they are identical for the SMP/UP cases.
Cheers!
-Matt
[-- Attachment #2: cpumask_h-mcd.patch --]
[-- Type: text/x-patch, Size: 6093 bytes --]
diff -Nurp --exclude-from=/home/mcd/.dontdiff linux-2.6.4-pj_nodemask/include/linux/cpumask.h linux-2.6.4-cpumask_h-mcd/include/linux/cpumask.h
--- linux-2.6.4-pj_nodemask/include/linux/cpumask.h Tue Mar 30 17:04:27 2004
+++ linux-2.6.4-cpumask_h-mcd/include/linux/cpumask.h Wed Mar 31 16:21:46 2004
@@ -51,6 +51,8 @@
* int num_possible_cpus() Number of all possible CPUs
* int cpu_online(cpu) Is some cpu < NR_CPUS online?
* int cpu_possible(cpu) Is some cpu < NR_CPUS possible?
+ * void cpu_set_online(cpu) set cpu in cpu_online_map
+ * void cpu_set_offline(cpu) clear cpu in cpu_online_map
* int any_online_cpu(mask) First online cpu in mask
*
* for_each_cpu_mask(cpu, mask) for-loop cpu over mask
@@ -58,45 +60,44 @@
* for_each_online_cpu(cpu) for-loop cpu over cpu_online_map
*/
-#include <linux/config.h>
-#include <linux/mask.h>
#include <linux/threads.h>
+#include <linux/mask.h>
#include <asm/bug.h>
typedef __mask(NR_CPUS) cpumask_t;
extern cpumask_t _unused_cpumask_arg_;
-#define cpu_set(cpu, mask) mask_setbit((cpu), (mask))
-#define cpu_clear(cpu, mask) mask_clearbit((cpu), (mask))
-#define cpus_setall(mask) mask_setall(mask, NR_CPUS)
-#define cpus_clear(mask) mask_clearall(mask)
-#define cpu_isset(cpu, mask) mask_isset((cpu), (mask))
-#define cpu_test_and_set(cpu, mask) mask_test_and_set((cpu), (mask))
-#define cpus_and(dst, src1, src2) mask_and((dst), (src1), (src2))
-#define cpus_or(dst, src1, src2) mask_or((dst), (src1), (src2))
-#define cpus_xor(dst, src1, src2) mask_xor((dst), (src1), (src2))
-#define cpus_andnot(dst, src1, src2) mask_andnot((dst), (src1), (src2))
-#define cpus_complement(dst, src) mask_complement((dst), (src), NR_CPUS)
-#define cpus_equal(mask1, mask2) mask_equal((mask1), (mask2))
-#define cpus_intersects(mask1, mask2) mask_intersects(mask1, mask2)
-#define cpus_subset(mask1, mask2) mask_subset(mask1, mask2)
-#define cpus_empty(mask) mask_empty(mask)
-#define cpus_full(mask) mask_full(mask, NR_CPUS)
-#define cpus_weight(mask) mask_weight(mask, NR_CPUS)
-#define cpus_shift_right(dst, src, n) \
+#define cpu_set(cpu, mask) mask_setbit((cpu), (mask))
+#define cpu_clear(cpu, mask) mask_clearbit((cpu), (mask))
+#define cpus_setall(mask) mask_setall((mask), NR_CPUS)
+#define cpus_clear(mask) mask_clearall(mask)
+#define cpu_isset(cpu, mask) mask_isset((cpu), (mask))
+#define cpu_test_and_set(cpu, mask) mask_test_and_set((cpu), (mask))
+#define cpus_and(dst, src1, src2) mask_and((dst), (src1), (src2))
+#define cpus_or(dst, src1, src2) mask_or((dst), (src1), (src2))
+#define cpus_xor(dst, src1, src2) mask_xor((dst), (src1), (src2))
+#define cpus_andnot(dst, src1, src2) mask_andnot((dst), (src1), (src2))
+#define cpus_complement(dst, src) mask_complement((dst), (src), NR_CPUS)
+#define cpus_equal(mask1, mask2) mask_equal((mask1), (mask2))
+#define cpus_intersects(mask1, mask2) mask_intersects((mask1), (mask2))
+#define cpus_subset(mask1, mask2) mask_subset((mask1), (mask2))
+#define cpus_empty(mask) mask_empty(mask)
+#define cpus_full(mask) mask_full((mask), NR_CPUS)
+#define cpus_weight(mask) mask_weight((mask), NR_CPUS)
+#define cpus_shift_right(dst, src, n) \
mask_shift_right((dst), (src), (n), NR_CPUS)
-#define cpus_shift_left(dst, src, n) \
+#define cpus_shift_left(dst, src, n) \
mask_shift_left((dst), (src), (n), NR_CPUS)
-#define first_cpu(mask) mask_first(mask, NR_CPUS)
-#define next_cpu(cpu, mask) mask_next(cpu, mask, NR_CPUS)
-#define cpumask_of_cpu(cpu) mask_of_bit((cpu), _unused_cpumask_arg_)
-#define CPU_MASK_ALL MASK_ALL(NR_CPUS)
-#define CPU_MASK_NONE MASK_NONE(NR_CPUS)
-#define cpus_raw(mask) mask_raw(mask)
+#define first_cpu(mask) mask_first((mask), NR_CPUS)
+#define next_cpu(cpu, mask) mask_next((cpu), (mask), NR_CPUS)
+#define cpumask_of_cpu(cpu) mask_of_bit((cpu), _unused_cpumask_arg_)
+#define CPU_MASK_ALL MASK_ALL(NR_CPUS)
+#define CPU_MASK_NONE MASK_NONE(NR_CPUS)
+#define cpus_raw(mask) mask_raw(mask)
#define cpumask_scnprintf(buf, len, mask) \
- mask_scnprintf(buf, len, mask, NR_CPUS)
+ mask_scnprintf((buf), (len), (mask), NR_CPUS)
#define cpumask_parse(ubuf, ulen, mask) \
- mask_parse(ubuf, ulen, mask, NR_CPUS)
+ mask_parse((ubuf), (ulen), (mask), NR_CPUS)
/*
* The following particular system cpumasks and operations
@@ -110,8 +111,10 @@ extern cpumask_t cpu_possible_map;
#define num_online_cpus() cpus_weight(cpu_online_map)
#define num_possible_cpus() cpus_weight(cpu_possible_map)
-#define cpu_online(cpu) cpu_isset(cpu, cpu_online_map)
-#define cpu_possible(cpu) cpu_isset(cpu, cpu_possible_map)
+#define cpu_online(cpu) cpu_isset((cpu), cpu_online_map)
+#define cpu_possible(cpu) cpu_isset((cpu), cpu_possible_map)
+#define cpu_set_online(cpu) cpu_set((cpu), cpu_online_map)
+#define cpu_set_offline(cpu) cpu_clear((cpu), cpu_online_map)
#define any_online_cpu(mask) \
({ \
@@ -125,10 +128,7 @@ extern cpumask_t cpu_possible_map;
cpu < NR_CPUS; \
cpu = next_cpu(cpu, mask))
-#define for_each_cpu(cpu) for_each_cpu_mask(cpu, cpu_possible_map)
-#define for_each_online_cpu(cpu) for_each_cpu_mask(cpu, cpu_online_map)
-
-#else
+#else /* !CONFIG_SMP */
#define cpu_online_map cpumask_of_cpu(0)
#define cpu_possible_map cpumask_of_cpu(0)
@@ -137,14 +137,18 @@ extern cpumask_t cpu_possible_map;
#define num_possible_cpus() 1
#define cpu_online(cpu) ({ BUG_ON((cpu) != 0); 1; })
#define cpu_possible(cpu) ({ BUG_ON((cpu) != 0); 1; })
+#define cpu_set_online(cpu) ({ BUG_ON((cpu) != 0); })
+#define cpu_set_offline(cpu) ({ BUG(); })
#define any_online_cpu(mask) 0
-#define for_each_cpu_mask(cpu, mask) for (cpu = 0; cpu < 1; cpu++)
+#define for_each_cpu_mask(cpu, mask) for (cpu = 0; cpu < 1; cpu++)
-#define for_each_cpu(cpu) for (cpu = 0; cpu < 1; cpu++)
-#define for_each_online_cpu(cpu) for (cpu = 0; cpu < 1; cpu++)
+#endif /* CONFIG_SMP */
-#endif
+#define for_each_cpu(cpu) \
+ for_each_cpu_mask(cpu, cpu_possible_map)
+#define for_each_online_cpu(cpu) \
+ for_each_cpu_mask(cpu, cpu_online_map)
#endif /* __LINUX_CPUMASK_H */
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] mask ADT: replace cpumask_t implementation [3/22]
2004-03-30 1:49 ` Matthew Dobson
@ 2004-04-01 15:22 ` Paul Jackson
2004-04-01 20:40 ` Matthew Dobson
0 siblings, 1 reply; 7+ messages in thread
From: Paul Jackson @ 2004-04-01 15:22 UTC (permalink / raw)
To: colpatch; +Cc: linux-kernel, mbligh, akpm, wli, haveblue
> > #define cpu_online_map cpumask_of_cpu(0)
> > #define cpu_possible_map cpumask_of_cpu(0)
> > ...
> Might it make more sense to actually define a cpu_online_map &
> cpu_possible_map for UP, rather than generating this code:
>
> #define mask_of_bit(bit, T) \
> ({ \
> typeof(T) m; \
> mask_clearall(m); \
> mask_setbit((bit), m); \
> m; \
> })
>
> every time some code references cpu_online_map? It'll only cost us 2
> unsigned longs on 32-bit == 8 bytes...
Perhaps.
When I looked at the code just now, this only seemed to take a
couple of instructions. Do you think that there is much to gain?
Better a couple of inline instructions than a possible uncached
memory reference, I suspect.
--
I won't rest till it's the best ...
Programmer, Linux Scalability
Paul Jackson <pj@sgi.com> 1.650.933.1373
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] mask ADT: replace cpumask_t implementation [3/22]
2004-04-01 15:22 ` Paul Jackson
@ 2004-04-01 20:40 ` Matthew Dobson
2004-04-01 20:46 ` Paul Jackson
0 siblings, 1 reply; 7+ messages in thread
From: Matthew Dobson @ 2004-04-01 20:40 UTC (permalink / raw)
To: Paul Jackson; +Cc: LKML, Andrew Morton, William Lee Irwin III
On Thu, 2004-04-01 at 07:22, Paul Jackson wrote:
> > > #define cpu_online_map cpumask_of_cpu(0)
> > > #define cpu_possible_map cpumask_of_cpu(0)
> > > ...
> > Might it make more sense to actually define a cpu_online_map &
> > cpu_possible_map for UP, rather than generating this code:
> >
> > #define mask_of_bit(bit, T) \
> > ({ \
> > typeof(T) m; \
> > mask_clearall(m); \
> > mask_setbit((bit), m); \
> > m; \
> > })
> >
> > every time some code references cpu_online_map? It'll only cost us 2
> > unsigned longs on 32-bit == 8 bytes...
>
> Perhaps.
>
> When I looked at the code just now, this only seemed to take a
> couple of instructions. Do you think that there is much to gain?
> Better a couple of inline instructions than a possible uncached
> memory reference, I suspect.
Yeah, you may be right about that.
On UP it should compile as such:
cpu_online_map => cpumask_of_cpu(0) =>
mask_of_bit(0, _unused_cpumask_arg_) =>
({ typeof(_unused_cpumask_arg_) m; mask_clearall(m); mask_setbit(0, m);
m; }) =>
({ cpumask_t m; m._m[0] = 0UL; set_bit(0, m._m); m; })
Maybe we could #define it better on UP. Something along the lines of:
#define cpu_online_map ({ cpumask_t up_cpu_map = { 1UL }; })
That way we'll get this inlined, plus very little code to execute?
Cheers!
-Matt
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] mask ADT: replace cpumask_t implementation [3/22]
2004-04-01 20:40 ` Matthew Dobson
@ 2004-04-01 20:46 ` Paul Jackson
2004-04-01 22:50 ` Matthew Dobson
0 siblings, 1 reply; 7+ messages in thread
From: Paul Jackson @ 2004-04-01 20:46 UTC (permalink / raw)
To: colpatch; +Cc: linux-kernel, akpm, wli
Matthew suggested:
> Maybe we could #define it better on UP. Something along the lines of:
> #define cpu_online_map ({ cpumask_t up_cpu_map = { 1UL }; })
Yeah - I started playing with something like that too ...
--
I won't rest till it's the best ...
Programmer, Linux Scalability
Paul Jackson <pj@sgi.com> 1.650.933.1373
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] mask ADT: replace cpumask_t implementation [3/22]
2004-04-01 20:46 ` Paul Jackson
@ 2004-04-01 22:50 ` Matthew Dobson
0 siblings, 0 replies; 7+ messages in thread
From: Matthew Dobson @ 2004-04-01 22:50 UTC (permalink / raw)
To: Paul Jackson; +Cc: LKML, Andrew Morton, William Lee Irwin III
On Thu, 2004-04-01 at 12:46, Paul Jackson wrote:
> Matthew suggested:
> > Maybe we could #define it better on UP. Something along the lines of:
> > #define cpu_online_map ({ cpumask_t up_cpu_map = { 1UL }; })
>
> Yeah - I started playing with something like that too ...
Cool. I think you're right about an actual cpumask_t for cpu_online_map
on UP not being a great idea, but I definitely think we can do better
than just #defining it to cpumask_of_cpu(0).
-Matt
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2004-04-01 22:51 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-03-29 12:12 [PATCH] mask ADT: replace cpumask_t implementation [3/22] Paul Jackson
2004-03-30 1:49 ` Matthew Dobson
2004-04-01 15:22 ` Paul Jackson
2004-04-01 20:40 ` Matthew Dobson
2004-04-01 20:46 ` Paul Jackson
2004-04-01 22:50 ` Matthew Dobson
2004-04-01 1:05 ` Matthew Dobson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox