Force always inline for gcc 4.5 when optimizing for size
Subsystems (6)
PATCH 1/12 Force always inline for gcc 4.5 when optimizing for size
From: Andi Kleen <[email protected]>
I found that gcc 4.5 didn't inline a lot of inlines with CONFIG_OPTIMIZE_INLINING and CONFIG_CC_OPTIMIZE_FOR_SIZE. It was quite common to have very small inlines to be out of line, or worse inline statics in include files to be out of line with a copy for every file using it too.
This is handily visible in a function graph trace for might_fault:
10) | might_fault() {
10) | _cond_resched() {
10) | should_resched() {
10) | need_resched() {
10) 0.063 us | test_ti_thread_flag();
10) 0.643 us | }
10) 1.238 us | }
10) 1.845 us | }
10) 2.438 us | }Note all of these functions are very small and should be definitely inlined in each other. In many cases even copy_from_user ends up out of line now which is really bad!
If I switch to -O2 it is also not quite as bad, but since a lot of people use -Os I was trying to fix it up.
So this patch forces inlining with gcc 4.4 with -Os.
Unfortunately it costs some code size with just this patch.
text data bss dec hex filename
11507035 1940276 1191936 14639247 df608f vmlinux-O2
10189858 1908124 1187840 13285822 cab9be vmlinux-Os-force
9808525 1940204 1187840 12936569 c56579 vmlinux-Os-orig
But after some starring on bloat-o-meter it turned out only some subsystems (in my kernel) had a real problem. The biggest offender was DRM. I fixed those up manually by removing inlines. With these changes (and disabling DRM debugging, which is on by default) I get a kernel with force inline that is a few KB smaller. With DRM debugging enabled it's about 50k larger (nearly all of it in DRM, mostly radeon). I hope the default for this can be changed.
I haven't tested earlier gcc 4.x versions, but they may need the same treatment.
Signed-off-by Andi Kleen <[email protected]>
--- include/linux/compiler-gcc.h | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-)
include/linux/compiler-gcc.h +4 -1
@@ -40,9 +40,12 @@/* * Force always-inline if the user requests it so via the .config, * or if gcc is too old: +* When optimizing for size on gcc 4.5 always force inlining too. */ #if !defined(CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING ) || \ - !defined(CONFIG_OPTIMIZE_INLINING ) || (__GNUC__ <4 ) + !defined(CONFIG_OPTIMIZE_INLINING ) || (__GNUC__ <4 ) || \ + (defined(CONFIG_CC_OPTIMIZE_FOR_SIZE ) && \ + (__GNUC__ ==4 && __GNUC_MINOR__ ==5 ))# define inline inline __attribute__((always_inline))# define __inline__ __inline__ __attribute__((always_inline))# define __inline __inline __attribute__((always_inline))
Signature · 1 line
1.7.4.4
PATCH 2/12 RADEON: Drop inlines from evergreen_cs.c / r600_cs.c
From: Andi Kleen <[email protected]>
Fixes
evergreen_cs_parse 4080 23124 +19044
and others compared to a non force inline kernel.
Signed-off-by Andi Kleen <[email protected]>
--- drivers/gpu/drm/radeon/evergreen_cs.c | 8 ++++---- drivers/gpu/drm/radeon/r600_cs.c | 24 ++++++++++++------------ 2 files changed, 16 insertions(+), 16 deletions(-)
drivers/gpu/drm/radeon/evergreen_cs.c +4 -4
@@ -122,7 +122,7 @@ static void evergreen_cs_track_init(struct evergreen_cs_track *track) track->db_s_write_bo =NULL ; } -static inline int evergreen_cs_track_validate_cb (struct radeon_cs_parser *p,int i) +static int evergreen_cs_track_validate_cb (struct radeon_cs_parser *p,int i) {/* XXX fill in */ return 0 ;
@@ -242,7 +242,7 @@ static int evergreen_cs_packet_next_reloc(struct radeon_cs_parser *p,* Check next packet is relocation packet3, do bo validation and compute * GPU offset using the provided start. **/ -static inline int evergreen_cs_packet_next_is_pkt3_nop (struct radeon_cs_parser *p) +static int evergreen_cs_packet_next_is_pkt3_nop (struct radeon_cs_parser *p) {struct radeon_cs_packet p3reloc;int r;
@@ -414,7 +414,7 @@ static int evergreen_cs_parse_packet0(struct radeon_cs_parser *p,* if register is safe. If register is not flag as safe this function * will test it against a list of register needind special handling. */ -static inline int evergreen_cs_check_reg (struct radeon_cs_parser *p,u32 reg,u32 idx) +static int evergreen_cs_check_reg (struct radeon_cs_parser *p,u32 reg,u32 idx) {struct evergreen_cs_track *track = (struct evergreen_cs_track *)p->track;struct radeon_cs_reloc *reloc;
@@ -963,7 +963,7 @@ static inline int evergreen_cs_check_reg(struct radeon_cs_parser *p, u32 reg, u3* This function will check that the resource has valid field and that * the texture and mipmap bo object are big enough to cover this resource. */ -static inline int evergreen_check_texture_resource (struct radeon_cs_parser *p,u32 idx, +static int evergreen_check_texture_resource (struct radeon_cs_parser *p,u32 idx,struct radeon_bo *texture,struct radeon_bo *mipmap) {
drivers/gpu/drm/radeon/r600_cs.c +12 -12
@@ -157,7 +157,7 @@ static const struct gpu_formats color_formats_table[] = { }; -static inline bool fmt_is_valid_color (u32 format) +static bool fmt_is_valid_color (u32 format) {if (format >=ARRAY_SIZE (color_formats_table))return false;
@@ -168,7 +168,7 @@ static inline bool fmt_is_valid_color(u32 format)return false; } -static inline bool fmt_is_valid_texture (u32 format) +static bool fmt_is_valid_texture (u32 format) {if (format >=ARRAY_SIZE (color_formats_table))return false;
@@ -179,7 +179,7 @@ static inline bool fmt_is_valid_texture(u32 format)return false; } -static inline int fmt_get_blocksize (u32 format) +static int fmt_get_blocksize (u32 format) {if (format >=ARRAY_SIZE (color_formats_table))return 0 ;
@@ -187,7 +187,7 @@ static inline int fmt_get_blocksize(u32 format)return color_formats_table[format].blocksize; } -static inline int fmt_get_nblocksx (u32 format,u32 w) +static int fmt_get_nblocksx (u32 format,u32 w) {unsigned bw;
@@ -201,7 +201,7 @@ static inline int fmt_get_nblocksx(u32 format, u32 w)return (w + bw -1 ) / bw; } -static inline int fmt_get_nblocksy (u32 format,u32 h) +static int fmt_get_nblocksy (u32 format,u32 h) {unsigned bh;
@@ -215,7 +215,7 @@ static inline int fmt_get_nblocksy(u32 format, u32 h)return (h + bh -1 ) / bh; } -static inline int r600_bpe_from_format (u32 *bpe,u32 format) +static int r600_bpe_from_format (u32 *bpe,u32 format) {unsigned res;
@@ -244,7 +244,7 @@ struct array_mode_checker { };/* returns alignment in pixels for pitch/height/depth and bytes for base */ -static inline int r600_get_array_mode_alignment(struct array_mode_checker *values, +static int r600_get_array_mode_alignment(struct array_mode_checker *values, u32 *pitch_align, u32 *height_align, u32 *depth_align,
@@ -323,7 +323,7 @@ static void r600_cs_track_init(struct r600_cs_track *track) track->db_depth_control =0xFFFFFFFF ; } -static inline int r600_cs_track_validate_cb (struct radeon_cs_parser *p,int i) +static int r600_cs_track_validate_cb (struct radeon_cs_parser *p,int i) {struct r600_cs_track *track = p->track;u32 slice_tile_max, size, tmp;
@@ -729,7 +729,7 @@ static int r600_cs_packet_next_reloc_nomm(struct radeon_cs_parser *p,* Check next packet is relocation packet3, do bo validation and compute * GPU offset using the provided start. **/ -static inline int r600_cs_packet_next_is_pkt3_nop (struct radeon_cs_parser *p) +static int r600_cs_packet_next_is_pkt3_nop (struct radeon_cs_parser *p) {struct radeon_cs_packet p3reloc;int r;
@@ -903,7 +903,7 @@ static int r600_cs_parse_packet0(struct radeon_cs_parser *p,* if register is safe. If register is not flag as safe this function * will test it against a list of register needind special handling. */ -static inline int r600_cs_check_reg (struct radeon_cs_parser *p,u32 reg,u32 idx) +static int r600_cs_check_reg (struct radeon_cs_parser *p,u32 reg,u32 idx) {struct r600_cs_track *track = (struct r600_cs_track *)p->track;struct radeon_cs_reloc *reloc;
@@ -1199,7 +1199,7 @@ static inline int r600_cs_check_reg(struct radeon_cs_parser *p, u32 reg, u32 idxreturn 0 ; } -static inline unsigned mip_minify (unsigned size,unsigned level) +static unsigned mip_minify (unsigned size,unsigned level) {unsigned val;
@@ -1269,7 +1269,7 @@ static void r600_texture_size(unsigned nfaces, unsigned blevel, unsigned llevel,* This function will check that the resource has valid field and that * the texture and mipmap bo object are big enough to cover this resource. */ -static inline int r600_check_texture_resource(struct radeon_cs_parser *p, u32 idx, +static int r600_check_texture_resource(struct radeon_cs_parser *p, u32 idx, struct radeon_bo *texture, struct radeon_bo *mipmap, u64 base_offset,
Signature · 1 line
1.7.4.4
PATCH 3/12 RADEON: Move r100_*_*reg out of line
In reply to Andi KleenFrom: Andi Kleen <[email protected]>
This shrinks the sizes of a lot of functions in the radeon driver dramatically.
With a non force inline + -Os kernel this is default anyways.
Signed-off-by Andi Kleen <[email protected]>
--- drivers/gpu/drm/radeon/r100.c | 40 ++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/radeon/radeon.h | 43 +++----------------------------------- 2 files changed, 44 insertions(+), 39 deletions(-)
drivers/gpu/drm/radeon/r100.c +40 -0
@@ -3967,3 +3967,43 @@ int r100_init(struct radeon_device *rdev) }return 0 ; } + +uint32_t r100_mm_rreg (struct radeon_device *rdev,uint32_t reg) +{ +if (reg < rdev->rmmio_size) +return readl (((void __iomem *)rdev->rmmio) + reg); +else { +writel (reg, ((void __iomem *)rdev->rmmio) +RADEON_MM_INDEX ); +return readl (((void __iomem *)rdev->rmmio) +RADEON_MM_DATA ); + } +} + +void r100_mm_wreg (struct radeon_device *rdev,uint32_t reg,uint32_t v) +{ +if (reg < rdev->rmmio_size) +writel (v, ((void __iomem *)rdev->rmmio) + reg); +else { +writel (reg, ((void __iomem *)rdev->rmmio) +RADEON_MM_INDEX ); +writel (v, ((void __iomem *)rdev->rmmio) +RADEON_MM_DATA ); + } +} + +u32 r100_io_rreg (struct radeon_device *rdev,u32 reg) +{ +if (reg < rdev->rio_mem_size) +return ioread32 (rdev->rio_mem + reg); +else { +iowrite32 (reg, rdev->rio_mem +RADEON_MM_INDEX ); +return ioread32 (rdev->rio_mem +RADEON_MM_DATA ); + } +} + +void r100_io_wreg (struct radeon_device *rdev,u32 reg,u32 v) +{ +if (reg < rdev->rio_mem_size) +iowrite32 (v, rdev->rio_mem + reg); +else { +iowrite32 (reg, rdev->rio_mem +RADEON_MM_INDEX ); +iowrite32 (v, rdev->rio_mem +RADEON_MM_DATA ); + } +}
drivers/gpu/drm/radeon/radeon.h +4 -39
49 lines not on this page · raw message
Signature · 1 line
1.7.4.4
PATCH 4/12 RADEON: drop inlines in r600_blit.c
In reply to Andi KleenFrom: Andi Kleen <[email protected]>
Signed-off-by Andi Kleen <[email protected]>
--- drivers/gpu/drm/radeon/r600_blit.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-)
drivers/gpu/drm/radeon/r600_blit.c +12 -12
@@ -41,7 +41,7 @@#define COLOR_5_6_5 0x8#define COLOR_8_8_8_8 0x1a -static inline void +static void set_render_target (drm_radeon_private_t *dev_priv,int format,int w,int h,u64 gpu_addr) {u32 cb_color_info;
@@ -99,7 +99,7 @@ set_render_target(drm_radeon_private_t *dev_priv, int format, int w, int h, u64ADVANCE_RING (); } -static inline void +static void cp_set_surface_sync (drm_radeon_private_t *dev_priv,u32 sync_type,u32 size,u64 mc_addr) {
@@ -121,7 +121,7 @@ cp_set_surface_sync(drm_radeon_private_t *dev_priv,ADVANCE_RING (); } -static inline void +static void set_shaders (struct drm_device *dev) {drm_radeon_private_t *dev_priv = dev->dev_private;
@@ -184,7 +184,7 @@ set_shaders(struct drm_device *dev) R600_SH_ACTION_ENA, 512, gpu_addr); } -static inline void +static void set_vtx_resource (drm_radeon_private_t *dev_priv,u64 gpu_addr) {uint32_t sq_vtx_constant_word2;
@@ -220,7 +220,7 @@ set_vtx_resource(drm_radeon_private_t *dev_priv, u64 gpu_addr) R600_VC_ACTION_ENA, 48, gpu_addr); } -static inline void +static void set_tex_resource (drm_radeon_private_t *dev_priv,int format,int w,int h,int pitch,u64 gpu_addr) {
@@ -258,7 +258,7 @@ set_tex_resource(drm_radeon_private_t *dev_priv, } -static inline void +static void set_scissors (drm_radeon_private_t *dev_priv,int x1,int y1,int x2,int y2) {RING_LOCALS ;
@@ -282,7 +282,7 @@ set_scissors(drm_radeon_private_t *dev_priv, int x1, int y1, int x2, int y2)ADVANCE_RING (); } -static inline void +static void draw_auto (drm_radeon_private_t *dev_priv) {RING_LOCALS ;
@@ -311,7 +311,7 @@ draw_auto(drm_radeon_private_t *dev_priv)COMMIT_RING (); } -static inline void +static void set_default_state (drm_radeon_private_t *dev_priv) {int i;
@@ -489,7 +489,7 @@ set_default_state(drm_radeon_private_t *dev_priv)ADVANCE_RING (); } -static inline uint32_t i2f (uint32_t input) +static uint32_t i2f (uint32_t input) {u32 result, i, exponent, fraction;
@@ -515,7 +515,7 @@ static inline uint32_t i2f(uint32_t input) } -static inline int r600_nomm_get_vb (struct drm_device *dev) +static int r600_nomm_get_vb (struct drm_device *dev) {drm_radeon_private_t *dev_priv = dev->dev_private; dev_priv->blit_vb =radeon_freelist_get (dev);
@@ -526,7 +526,7 @@ static inline int r600_nomm_get_vb(struct drm_device *dev)return 0 ; } -static inline void r600_nomm_put_vb (struct drm_device *dev) +static void r600_nomm_put_vb (struct drm_device *dev) {drm_radeon_private_t *dev_priv = dev->dev_private;
@@ -534,7 +534,7 @@ static inline void r600_nomm_put_vb(struct drm_device *dev)radeon_cp_discard_buffer (dev, dev_priv->blit_vb->file_priv->master, dev_priv->blit_vb); } -static inline void *r600_nomm_get_vb_ptr (struct drm_device *dev) +static void *r600_nomm_get_vb_ptr (struct drm_device *dev) {drm_radeon_private_t *dev_priv = dev->dev_private; return (((char *)dev->agp_buffer_map->handle +
Signature · 1 line
1.7.4.4
PATCH 5/12 I915: Move i915 register accesses out of line.
In reply to Andi KleenFrom: Andi Kleen <[email protected]>
With the tracing code in there they are too big to inline.
Fixes compared to a non force inline kernel:
i915_restore_display 4393 12036 +7643 i915_save_display 4295 11459 +7164 i915_handle_error 2979 6666 +3687 i915_driver_irq_handler 2923 5086 +2163 i915_ringbuffer_info 458 1661 +1203 i915_save_vga - 1200 +1200 i915_driver_irq_uninstall 453 1624 +1171 i915_driver_irq_postinstall 913 2078 +1165 ironlake_enable_drps 719 1872 +1153 i915_restore_vga - 1142 +1142 intel_display_capture_error_state 784 2030 +1246 intel_init_emon 719 2016 +1297
and more ...
Cc Chris Wilson <[email protected]>
Signed-off-by Andi Kleen <[email protected]>
--- drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/i915_drv.h | 12 ++---------- drivers/gpu/drm/i915/i915_reg.c | 24 ++++++++++++++++++++++++ 3 files changed, 27 insertions(+), 10 deletions(-) create mode 100644 drivers/gpu/drm/i915/i915_reg.c
drivers/gpu/drm/i915/Makefile +1 -0
@@ -13,6 +13,7 @@ i915-y := i915_drv.o i915_dma.o i915_irq.o i915_mem.o \ i915_gem_gtt.o \ i915_gem_tiling.o \ i915_trace_points.o \ + i915_reg.o \ intel_display.o \ intel_crt.o \ intel_lvds.o \
drivers/gpu/drm/i915/i915_drv.h +2 -10
@@ -1312,13 +1312,8 @@ extern void intel_display_print_error_state(struct seq_file *m,LOCK_TEST_WITH_RETURN (dev, file); \ } while (0) -#define __i915_read (x, y) \ -static inline u##x i915_read##x(struct drm_i915_private *dev_priv, u32 reg) { \ - u##x val = read##y(dev_priv->regs + reg); \ - trace_i915_reg_rw(false, reg, val, sizeof(val)); \ - return val; \ -} + u##x i915_read##x(struct drm_i915_private *dev_priv, u32 reg); __i915_read(8, b) __i915_read(16, w)__i915_read (32 , l)
@@ -1326,10 +1321,7 @@ __i915_read(64, q)#undef __i915_read#define __i915_write (x, y) \ -static inline void i915_write##x(struct drm_i915_private *dev_priv, u32 reg, u##x val) { \ - trace_i915_reg_rw(true, reg, val, sizeof(val)); \ - write##y(val, dev_priv->regs + reg); \ -} + void i915_write##x(struct drm_i915_private *dev_priv, u32 reg, u##x val); __i915_write(8, b) __i915_write(16, w)__i915_write (32 , l)
drivers/gpu/drm/i915/i915_reg.c new file +24 -0
@@ -0,0 +1,24 @@ +#include "i915_drv.h" + +#define __i915_read (x, y) \ +u##x i915_read##x(struct drm_i915_private *dev_priv, u32 reg) { \ + u##x val = read##y(dev_priv->regs + reg); \ + trace_i915_reg_rw(false, reg, val, sizeof(val)); \ + return val; \ +} +__i915_read(8, b) +__i915_read(16, w) +__i915_read(32, l) +__i915_read(64, q) +#undef __i915_read + +#define __i915_write (x, y) \ +void i915_write##x(struct drm_i915_private *dev_priv, u32 reg, u##x val) { \ + trace_i915_reg_rw(true, reg, val, sizeof(val)); \ + write##y(val, dev_priv->regs + reg); \ +} +__i915_write(8, b) +__i915_write(16, w) +__i915_write(32, l) +__i915_write(64, q) +#undef __i915_write
Signature · 1 line
1.7.4.4
PATCH 6/12 RADEON: Remove now unused functions in radeon driver
In reply to Andi KleenFrom: Andi Kleen <[email protected]>
With the dropped inlines gccs starts warning about genuinely unused functions. Remove r600_bpe_from_format, evergreen_cs_track_validate_cb, evergreen-cs_packet_next_is_pkt3_nop which are all unused.
Signed-off-by Andi Kleen <[email protected]>
--- drivers/gpu/drm/radeon/evergreen_cs.c | 28 ---------------------------- drivers/gpu/drm/radeon/r600_cs.c | 19 ------------------- 2 files changed, 0 insertions(+), 47 deletions(-)
drivers/gpu/drm/radeon/evergreen_cs.c +0 -28
@@ -122,12 +122,6 @@ static void evergreen_cs_track_init(struct evergreen_cs_track *track) track->db_s_write_bo =NULL ; } -static int evergreen_cs_track_validate_cb (struct radeon_cs_parser *p,int i) -{ -/* XXX fill in */ -return 0 ; -} -static int evergreen_cs_track_check (struct radeon_cs_parser *p) {struct evergreen_cs_track *track = p->track;
@@ -236,28 +230,6 @@ static int evergreen_cs_packet_next_reloc(struct radeon_cs_parser *p, }/** -* evergreen_cs_packet_next_is_pkt3_nop() - test if next packet is packet3 nop for reloc -* @parser: parser structure holding parsing context. -* -* Check next packet is relocation packet3, do bo validation and compute -* GPU offset using the provided start. -**/ -static int evergreen_cs_packet_next_is_pkt3_nop (struct radeon_cs_parser *p) -{ -struct radeon_cs_packet p3reloc; -int r; - - r =evergreen_cs_packet_parse (p, &p3reloc, p->idx); -if (r) { -return 0 ; - } -if (p3reloc.type !=PACKET_TYPE3 || p3reloc.opcode !=PACKET3_NOP ) { -return 0 ; - } -return 1 ; -} - -/** * evergreen_cs_packet_next_vline() - parse userspace VLINE packet * @parser: parser structure holding parsing context. *
drivers/gpu/drm/radeon/r600_cs.c +0 -19
@@ -215,25 +215,6 @@ static int fmt_get_nblocksy(u32 format, u32 h)return (h + bh -1 ) / bh; } -static int r600_bpe_from_format (u32 *bpe,u32 format) -{ -unsigned res; - -if (format >=ARRAY_SIZE (color_formats_table)) - goto fail; - - res = color_formats_table[format].blocksize; -if (res ==0 ) - goto fail; - - *bpe = res; -return 0 ; - -fail: - *bpe =16 ; -return -EINVAL ; -} -struct array_mode_checker {int array_mode;u32 group_size;
Signature · 1 line
1.7.4.4
PATCH 7/12 FB_ATY: Move register accesses out of line
In reply to Andi KleenFrom: Andi Kleen <[email protected]>
This fixes size regressions like
radeon_set_suspend 1724 7873 +6149 radeon_reinitialize_M10 3974 9285 +5311 radeon_pm_disable_dynamic_mode 868 6125 +5257 radeon_pm_enable_dynamic_mode 985 6065 +5080 radeon_pm_start_mclk_sclk - 4614 +4614 radeon_write_mode 1252 5377 +4125
among others compared to a non force inline kernel.
Signed-off-by Andi Kleen <[email protected]>
--- drivers/video/aty/radeon_accel.c | 88 ++++++++++++++++++++++++++++++++++ drivers/video/aty/radeonfb.h | 96 +++----------------------------------- 2 files changed, 95 insertions(+), 89 deletions(-)
drivers/video/aty/radeon_accel.c +88 -0
@@ -326,3 +326,91 @@ void radeonfb_engine_init (struct radeonfb_info *rinfo)radeon_engine_idle (); } + + +void _OUTREGP (struct radeonfb_info *rinfo,u32 addr,u32 val,u32 mask) +{ +unsigned long flags; +unsigned int tmp; + +spin_lock_irqsave (&rinfo->reg_lock, flags); + tmp =INREG (addr); + tmp &= (mask); + tmp |= (val); +OUTREG (addr, tmp); +spin_unlock_irqrestore (&rinfo->reg_lock, flags); +} + + +/* +* Note about PLL register accesses: +* +* I have removed the spinlock on them on purpose. The driver now +* expects that it will only manipulate the PLL registers in normal +* task environment, where radeon_msleep() will be called, protected +* by a semaphore (currently the console semaphore) so that no conflict +* will happen on the PLL register index. +* +* With the latest changes to the VT layer, this is guaranteed for all +* calls except the actual drawing/blits which aren't supposed to use +* the PLL registers anyway +* +* This is very important for the workarounds to work properly. The only +* possible exception to this rule is the call to unblank(), which may +* be done at irq time if an oops is in progress. +*/ +void radeon_pll_errata_after_index (struct radeonfb_info *rinfo) +{ +if (!(rinfo->errata &CHIP_ERRATA_PLL_DUMMYREADS )) +return ; + + (void )INREG (CLOCK_CNTL_DATA ); + (void )INREG (CRTC_GEN_CNTL ); +} + +void radeon_pll_errata_after_data (struct radeonfb_info *rinfo) +{ +if (rinfo->errata &CHIP_ERRATA_PLL_DELAY ) { +/* we can't deal with posted writes here ... */ +_radeon_msleep (rinfo,5 ); + } +if (rinfo->errata &CHIP_ERRATA_R300_CG ) { +u32 save, tmp; + save =INREG (CLOCK_CNTL_INDEX ); + tmp = save & ~(0x3f |PLL_WR_EN ); +OUTREG (CLOCK_CNTL_INDEX , tmp); + tmp =INREG (CLOCK_CNTL_DATA ); +OUTREG (CLOCK_CNTL_INDEX , save); + } +} + +u32 __INPLL (struct radeonfb_info *rinfo,u32 addr) +{ +u32 data; + +OUTREG8 (CLOCK_CNTL_INDEX , addr &0x0000003f ); +radeon_pll_errata_after_index (rinfo); + data =INREG (CLOCK_CNTL_DATA ); +radeon_pll_errata_after_data (rinfo); +return data; +} + +void __OUTPLL (struct radeonfb_info *rinfo,unsigned int index,u32 val) +{ + +OUTREG8 (CLOCK_CNTL_INDEX , (index &0x0000003f ) |0x00000080 ); +radeon_pll_errata_after_index (rinfo); +OUTREG (CLOCK_CNTL_DATA , val); +radeon_pll_errata_after_data (rinfo); +} + +void __OUTPLLP (struct radeonfb_info *rinfo,unsigned int index,u32 val,u32 mask) +{ +unsigned int tmp; + + tmp =__INPLL (rinfo, index); + tmp &= (mask); + tmp |= (val); +__OUTPLL (rinfo, index, tmp); +} +
drivers/video/aty/radeonfb.h +7 -89
105 lines not on this page · raw message
Signature · 1 line
1.7.4.4
PATCH 8/12 RADEON: Remove more bogus inlines in the radeon driver.
In reply to Andi KleenFrom: Andi Kleen <[email protected]>
Remove bogus inlines in evergreen and r100.
Signed-off-by Andi Kleen <[email protected]>
--- drivers/gpu/drm/radeon/evergreen.c | 4 +- drivers/gpu/drm/radeon/evergreen_blit_kms.c | 2 +- drivers/gpu/drm/radeon/r100.c | 100 +++++++++++++++++++++++++- drivers/gpu/drm/radeon/r100_track.h | 103 ++------------------------- 4 files changed, 108 insertions(+), 101 deletions(-)
drivers/gpu/drm/radeon/evergreen.c +2 -2
@@ -2477,7 +2477,7 @@ int evergreen_irq_set(struct radeon_device *rdev)return 0 ; } -static inline void evergreen_irq_ack (struct radeon_device *rdev) +static void evergreen_irq_ack (struct radeon_device *rdev) {u32 tmp;
@@ -2584,7 +2584,7 @@ void evergreen_irq_suspend(struct radeon_device *rdev)r600_rlc_stop (rdev); } -static inline u32 evergreen_get_ih_wptr (struct radeon_device *rdev) +static u32 evergreen_get_ih_wptr (struct radeon_device *rdev) {u32 wptr, tmp;
drivers/gpu/drm/radeon/evergreen_blit_kms.c +1 -1
@@ -520,7 +520,7 @@ set_default_state(struct radeon_device *rdev) } -static inline uint32_t i2f (uint32_t input) +static uint32_t i2f (uint32_t input) {u32 result, i, exponent, fraction;
drivers/gpu/drm/radeon/r100.c +98 -2
115 lines not on this page · raw message
drivers/gpu/drm/radeon/r100_track.h +7 -96
107 lines not on this page · raw message
Signature · 1 line
1.7.4.4
PATCH 9/12 RADEON: Move more code out of line
In reply to Andi KleenFrom: Andi Kleen <[email protected]>
With this patch I'm only about 50k larger with DRM debugging enables (why is that enabled by default?!?), and slightly smaller without.
Signed-off-by Andi Kleen <[email protected]>
--- drivers/gpu/drm/radeon/r100.c | 39 ++++++++++++++++++++++++++ drivers/gpu/drm/radeon/r300_cmdbuf.c | 2 +- drivers/gpu/drm/radeon/r600.c | 4 +- drivers/gpu/drm/radeon/r600_blit_kms.c | 2 +- drivers/gpu/drm/radeon/radeon.h | 39 +++++---------------------- drivers/gpu/drm/radeon/radeon_atombios.c | 4 +- drivers/gpu/drm/radeon/radeon_irq.c | 2 +- drivers/gpu/drm/radeon/radeon_legacy_tv.c | 2 +- drivers/gpu/drm/radeon/radeon_object.c | 41 ++++++++++++++++++++++++++++ drivers/gpu/drm/radeon/radeon_object.h | 42 ++-------------------------- drivers/gpu/drm/radeon/radeon_state.c | 16 +++++----- 11 files changed, 106 insertions(+), 87 deletions(-)
drivers/gpu/drm/radeon/r100.c +39 -0
@@ -4103,3 +4103,42 @@ int r100_packet3_load_vbpntr(struct radeon_cs_parser *p, }return r; } + +/* Better place? */ +u32 radeon_get_ib_value (struct radeon_cs_parser *p,int idx) +{ +struct radeon_cs_chunk *ibc = &p->chunks[p->chunk_ib_idx]; +u32 pg_idx, pg_offset; +u32 idx_value =0 ; +int new_page; + + pg_idx = (idx *4 ) /PAGE_SIZE ; + pg_offset = (idx *4 ) %PAGE_SIZE ; + +if (ibc->kpage_idx[0 ] == pg_idx) +return ibc->kpage[0 ][pg_offset/4 ]; +if (ibc->kpage_idx[1 ] == pg_idx) +return ibc->kpage[1 ][pg_offset/4 ]; + + new_page =radeon_cs_update_pages (p, pg_idx); +if (new_page <0 ) { + p->parser_error = new_page; +return 0 ; + } + + idx_value = ibc->kpage[new_page][pg_offset/4 ]; +return idx_value; +} + +void radeon_ring_write (struct radeon_device *rdev,uint32_t v) +{ +#if DRM_DEBUG_CODE +if (rdev->cp.count_dw <=0 ) { +DRM_ERROR ("radeon: writting more dword to ring than expected !\n" ); + } +#endif + rdev->cp.ring[rdev->cp.wptr++] = v; + rdev->cp.wptr &= rdev->cp.ptr_mask; + rdev->cp.count_dw--; + rdev->cp.ring_free_dw--; +}
drivers/gpu/drm/radeon/r300_cmdbuf.c +1 -1
@@ -791,7 +791,7 @@ static __inline__ int r300_emit_packet3(drm_radeon_private_t *dev_priv,/** * Emit the sequence to pacify R300. */ -static __inline__void r300_pacify (drm_radeon_private_t *dev_priv) +static void r300_pacify (drm_radeon_private_t *dev_priv) {uint32_t cache_z, cache_3d, cache_2d;RING_LOCALS ;
drivers/gpu/drm/radeon/r600.c +2 -2
@@ -3125,7 +3125,7 @@ int r600_irq_set(struct radeon_device *rdev)return 0 ; } -static inline void r600_irq_ack (struct radeon_device *rdev) +static void r600_irq_ack (struct radeon_device *rdev) {u32 tmp;
@@ -3226,7 +3226,7 @@ void r600_irq_disable(struct radeon_device *rdev)r600_disable_interrupt_state (rdev); } -static inline u32 r600_get_ih_wptr (struct radeon_device *rdev) +static u32 r600_get_ih_wptr (struct radeon_device *rdev) {u32 wptr, tmp;
drivers/gpu/drm/radeon/r600_blit_kms.c +1 -1
@@ -450,7 +450,7 @@ set_default_state(struct radeon_device *rdev)radeon_ring_write (rdev, sq_stack_resource_mgmt_2); } -static inline uint32_t i2f (uint32_t input) +static uint32_t i2f (uint32_t input) {u32 result, i, exponent, fraction;
drivers/gpu/drm/radeon/radeon.h +7 -32
@@ -598,32 +598,7 @@ struct radeon_cs_parser {extern int radeon_cs_update_pages (struct radeon_cs_parser *p,int pg_idx);extern int radeon_cs_finish_pages (struct radeon_cs_parser *p); - - -static inline u32 radeon_get_ib_value (struct radeon_cs_parser *p,int idx) -{ -struct radeon_cs_chunk *ibc = &p->chunks[p->chunk_ib_idx]; -u32 pg_idx, pg_offset; -u32 idx_value =0 ; -int new_page; - - pg_idx = (idx *4 ) /PAGE_SIZE ; - pg_offset = (idx *4 ) %PAGE_SIZE ; - -if (ibc->kpage_idx[0 ] == pg_idx) -return ibc->kpage[0 ][pg_offset/4 ]; -if (ibc->kpage_idx[1 ] == pg_idx) -return ibc->kpage[1 ][pg_offset/4 ]; - - new_page =radeon_cs_update_pages (p, pg_idx); -if (new_page <0 ) { - p->parser_error = new_page; -return 0 ; - } - - idx_value = ibc->kpage[new_page][pg_offset/4 ]; -return idx_value; -} +extern u32 radeon_get_ib_value (struct radeon_cs_parser *p,int idx);struct radeon_cs_packet {unsigned idx;
@@ -1372,19 +1347,19 @@ void radeon_atombios_fini(struct radeon_device *rdev);/* * RING helpers. */ + +#if DRM_DEBUG_CODE ==0 static inline void radeon_ring_write (struct radeon_device *rdev,uint32_t v) { -#if DRM_DEBUG_CODE -if (rdev->cp.count_dw <=0 ) { -DRM_ERROR ("radeon: writting more dword to ring than expected !\n" ); - } -#endif rdev->cp.ring[rdev->cp.wptr++] = v; rdev->cp.wptr &= rdev->cp.ptr_mask; rdev->cp.count_dw--; rdev->cp.ring_free_dw--; } - +#else +/* With debugging this is just too big to inline */ +void radeon_ring_write (struct radeon_device *rdev,uint32_t v); +#endif /* * ASICs macro.
drivers/gpu/drm/radeon/radeon_atombios.c +2 -2
@@ -62,7 +62,7 @@ union atom_supported_devices {struct _ATOM_SUPPORTED_DEVICES_INFO_2d1 info_2d1; }; -static inline struct radeon_i2c_bus_rec radeon_lookup_i2c_gpio (struct radeon_device *rdev, +static struct radeon_i2c_bus_rec radeon_lookup_i2c_gpio (struct radeon_device *rdev,uint8_t id) {struct atom_context *ctx = rdev->mode_info.atom_context;
@@ -228,7 +228,7 @@ void radeon_atombios_i2c_init(struct radeon_device *rdev) } } -static inline struct radeon_gpio_rec radeon_lookup_gpio (struct radeon_device *rdev, +static struct radeon_gpio_rec radeon_lookup_gpio (struct radeon_device *rdev,u8 id) {struct atom_context *ctx = rdev->mode_info.atom_context;
drivers/gpu/drm/radeon/radeon_irq.c +1 -1
@@ -129,7 +129,7 @@ void radeon_disable_vblank(struct drm_device *dev, int crtc) } } -static inline u32 radeon_acknowledge_irqs (drm_radeon_private_t *dev_priv,u32 *r500_disp_int) +static u32 radeon_acknowledge_irqs (drm_radeon_private_t *dev_priv,u32 *r500_disp_int) {u32 irqs =RADEON_READ (RADEON_GEN_INT_STATUS );u32 irq_mask =RADEON_SW_INT_TEST ;
drivers/gpu/drm/radeon/radeon_legacy_tv.c +1 -1
@@ -864,7 +864,7 @@ void radeon_legacy_tv_adjust_crtc_reg(struct drm_encoder *encoder, *v_sync_strt_wid = tmp; } -static inline int get_post_div (int value) +static int get_post_div (int value) {int post_div;switch (value) {
drivers/gpu/drm/radeon/radeon_object.c +41 -0
44 lines not on this page · raw message
drivers/gpu/drm/radeon/radeon_object.h +3 -39
54 lines not on this page · raw message
drivers/gpu/drm/radeon/radeon_state.c +8 -8
@@ -272,12 +272,12 @@ static __inline__ int radeon_check_and_fixup_packets(drm_radeon_private_t *return 0 ; } -static __inline__int radeon_check_and_fixup_packet3 (drm_radeon_private_t * - dev_priv, -struct drm_file *file_priv, -drm_radeon_kcmd_buffer_t * - cmdbuf, -unsigned int *cmdsz) +static int radeon_check_and_fixup_packet3 (drm_radeon_private_t * + dev_priv, +struct drm_file *file_priv, +drm_radeon_kcmd_buffer_t * + cmdbuf, +unsigned int *cmdsz) {u32 *cmd =drm_buffer_pointer_to_dword (cmdbuf->buffer,0 );u32 offset, narrays;
@@ -446,8 +446,8 @@ static __inline__ int radeon_check_and_fixup_packet3(drm_radeon_private_t ** CP hardware state programming functions */ -static __inline__void radeon_emit_clip_rect (drm_radeon_private_t * dev_priv, -struct drm_clip_rect * box) +static void radeon_emit_clip_rect (drm_radeon_private_t * dev_priv, +struct drm_clip_rect * box) {RING_LOCALS ;
Signature · 1 line
1.7.4.4
PATCH 10/12 X86: Move alloc_intr_gate out of line
In reply to Andi KleenFrom: Andi Kleen <[email protected]>
This saves about 2.5k text on a non force inline kernel.
Signed-off-by Andi Kleen <[email protected]>
--- arch/x86/include/asm/desc.h | 16 +--------------- arch/x86/kernel/irqinit.c | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 15 deletions(-)
arch/x86/include/asm/desc.h +1 -15
@@ -337,21 +337,7 @@ extern int first_system_vector;/* used_vectors is BITMAP for irq is not managed by percpu vector_irq */ extern unsigned long used_vectors[]; -static inline void alloc_system_vector (int vector) -{ -if (!test_bit (vector, used_vectors)) { -set_bit (vector, used_vectors); -if (first_system_vector > vector) - first_system_vector = vector; - }else -BUG (); -} - -static inline void alloc_intr_gate (unsigned int n,void *addr) -{ -alloc_system_vector (n); -set_intr_gate (n, addr); -} +void alloc_intr_gate (unsigned int n,void *addr);/* * This routine sets up an interrupt gate at directory privilege level 3.
arch/x86/kernel/irqinit.c +20 -0
@@ -162,6 +162,26 @@ void setup_vector_irq(int cpu)__setup_vector_irq (cpu); } +static void alloc_system_vector (int vector) +{ +if (!test_bit (vector, used_vectors)) { +set_bit (vector, used_vectors); +if (first_system_vector > vector) + first_system_vector = vector; + }else +BUG (); +} + +/* +* This could be made __init if xen didn't abuse it in its +* suspend path! +*/ +void alloc_intr_gate (unsigned int n,void *addr) +{ +alloc_system_vector (n); +set_intr_gate (n, addr); +} +static void __init smp_intr_init (void ) {#ifdef CONFIG_SMP
Signature · 1 line
1.7.4.4
Re: [PATCH 10/12] X86: Move alloc_intr_gate out of line
Quoted 3 lines · Andi Kleen
From: Andi Kleen <[email protected]>
This saves about 2.5k text on a non force inline kernel.
Please fix the subject line, there's two problems with it and you are not a newbie to have others fix it for you.
Thanks,
Ingo
PATCH 11/12 Don't use inline node_page_state for sysfs output functions
In reply to Andi KleenFrom: Andi Kleen <[email protected]>
These are not time critical, and using an out of line function saves about 2.5k text on a non force inline kernel.
I left the main hotpath user -- readahead -- inline for now.
Signed-off-by Andi Kleen <[email protected]>
--- drivers/base/node.c | 76 +++++++++++++++++++++++++++----------------------- 1 files changed, 41 insertions(+), 35 deletions(-)
drivers/base/node.c +41 -35
@@ -57,6 +57,12 @@ static inline ssize_t node_read_cpulist(struct sys_device *dev, static SYSDEV_ATTR(cpumap, S_IRUGO, node_read_cpumask, NULL); static SYSDEV_ATTR(cpulist, S_IRUGO, node_read_cpulist, NULL); +/* Don't inline */ +static unsigned long my_node_page_state (int node,enum zone_stat_item item) +{ +return node_page_state (node, item); +} +#define K (x) ((x) << (PAGE_SHIFT - 10))static ssize_t node_read_meminfo (struct sys_device * dev,struct sysdev_attribute *attr,char * buf)
@@ -81,16 +87,16 @@ static ssize_t node_read_meminfo(struct sys_device * dev, nid,K (i.totalram), nid,K (i.freeram), nid,K (i.totalram - i.freeram), - nid,K (node_page_state (nid,NR_ACTIVE_ANON ) + -node_page_state (nid,NR_ACTIVE_FILE )), - nid,K (node_page_state (nid,NR_INACTIVE_ANON ) + -node_page_state (nid,NR_INACTIVE_FILE )), - nid,K (node_page_state (nid,NR_ACTIVE_ANON )), - nid,K (node_page_state (nid,NR_INACTIVE_ANON )), - nid,K (node_page_state (nid,NR_ACTIVE_FILE )), - nid,K (node_page_state (nid,NR_INACTIVE_FILE )), - nid,K (node_page_state (nid,NR_UNEVICTABLE )), - nid, K(node_page_state(nid, NR_MLOCK))); + nid,K (my_node_page_state (nid,NR_ACTIVE_ANON ) + +my_node_page_state (nid,NR_ACTIVE_FILE )), + nid,K (my_node_page_state (nid,NR_INACTIVE_ANON ) + +my_node_page_state (nid,NR_INACTIVE_FILE )), + nid,K (my_node_page_state (nid,NR_ACTIVE_ANON )), + nid,K (my_node_page_state (nid,NR_INACTIVE_ANON )), + nid,K (my_node_page_state (nid,NR_ACTIVE_FILE )), + nid,K (my_node_page_state (nid,NR_INACTIVE_FILE )), + nid,K (my_node_page_state (nid,NR_UNEVICTABLE )), + nid, K(my_node_page_state(nid, NR_MLOCK)));#ifdef CONFIG_HIGHMEM n += sprintf(buf + n,
@@ -122,30 +128,30 @@ static ssize_t node_read_meminfo(struct sys_device * dev,"Node %d AnonHugePages: %8lu kB\n" #endif , - nid,K (node_page_state (nid,NR_FILE_DIRTY )), - nid,K (node_page_state (nid,NR_WRITEBACK )), - nid,K (node_page_state (nid,NR_FILE_PAGES )), - nid,K (node_page_state (nid,NR_FILE_MAPPED )), - nid,K (node_page_state (nid,NR_ANON_PAGES ) + nid,K (my_node_page_state (nid,NR_FILE_DIRTY )), + nid,K (my_node_page_state (nid,NR_WRITEBACK )), + nid,K (my_node_page_state (nid,NR_FILE_PAGES )), + nid,K (my_node_page_state (nid,NR_FILE_MAPPED )), + nid,K (my_node_page_state (nid,NR_ANON_PAGES ) #ifdef CONFIG_TRANSPARENT_HUGEPAGE - +node_page_state (nid,NR_ANON_TRANSPARENT_HUGEPAGES ) * + +my_node_page_state (nid,NR_ANON_TRANSPARENT_HUGEPAGES ) *HPAGE_PMD_NR #endif ), - nid,K (node_page_state (nid,NR_SHMEM )), - nid,node_page_state (nid,NR_KERNEL_STACK ) * + nid,K (my_node_page_state (nid,NR_SHMEM )), + nid,my_node_page_state (nid,NR_KERNEL_STACK ) *THREAD_SIZE /1024 , - nid,K (node_page_state (nid,NR_PAGETABLE )), - nid,K (node_page_state (nid,NR_UNSTABLE_NFS )), - nid,K (node_page_state (nid,NR_BOUNCE )), - nid,K (node_page_state (nid,NR_WRITEBACK_TEMP )), - nid,K (node_page_state (nid,NR_SLAB_RECLAIMABLE ) + -node_page_state (nid,NR_SLAB_UNRECLAIMABLE )), - nid,K (node_page_state (nid,NR_SLAB_RECLAIMABLE )), - nid,K (node_page_state (nid,NR_SLAB_UNRECLAIMABLE )) + nid,K (my_node_page_state (nid,NR_PAGETABLE )), + nid,K (my_node_page_state (nid,NR_UNSTABLE_NFS )), + nid,K (my_node_page_state (nid,NR_BOUNCE )), + nid,K (my_node_page_state (nid,NR_WRITEBACK_TEMP )), + nid,K (my_node_page_state (nid,NR_SLAB_RECLAIMABLE ) + +my_node_page_state (nid,NR_SLAB_UNRECLAIMABLE )), + nid,K (my_node_page_state (nid,NR_SLAB_RECLAIMABLE )), + nid,K (my_node_page_state (nid,NR_SLAB_UNRECLAIMABLE )) #ifdef CONFIG_TRANSPARENT_HUGEPAGE , nid, -K (node_page_state (nid,NR_ANON_TRANSPARENT_HUGEPAGES ) * +K (my_node_page_state (nid,NR_ANON_TRANSPARENT_HUGEPAGES ) *HPAGE_PMD_NR ) #endif );
@@ -166,12 +172,12 @@ static ssize_t node_read_numastat(struct sys_device * dev,"interleave_hit %lu\n" "local_node %lu\n" "other_node %lu\n" , -node_page_state (dev->id,NUMA_HIT ), -node_page_state (dev->id,NUMA_MISS ), -node_page_state (dev->id,NUMA_FOREIGN ), -node_page_state (dev->id,NUMA_INTERLEAVE_HIT ), -node_page_state (dev->id,NUMA_LOCAL ), - node_page_state(dev->id, NUMA_OTHER)); +my_node_page_state (dev->id,NUMA_HIT ), +my_node_page_state (dev->id,NUMA_MISS ), +my_node_page_state (dev->id,NUMA_FOREIGN ), +my_node_page_state (dev->id,NUMA_INTERLEAVE_HIT ), +my_node_page_state (dev->id,NUMA_LOCAL ), + my_node_page_state(dev->id, NUMA_OTHER)); } static SYSDEV_ATTR(numastat, S_IRUGO, node_read_numastat, NULL);
@@ -182,8 +188,8 @@ static ssize_t node_read_vmstat(struct sys_device *dev,return sprintf (buf,"nr_written %lu\n" "nr_dirtied %lu\n" , -node_page_state (nid,NR_WRITTEN ), -node_page_state (nid,NR_DIRTIED )); +my_node_page_state (nid,NR_WRITTEN ), +my_node_page_state (nid,NR_DIRTIED )); } static SYSDEV_ATTR(vmstat, S_IRUGO, node_read_vmstat, NULL);
Signature · 1 line
1.7.4.4
PATCH 12/12 REISERFS: reiserfs drop unnecessary inlines
In reply to Andi KleenFrom: Andi Kleen <[email protected]>
Drop some inlines to shrink code size with force inline
Still some unfixed growth in:
balance_leaf 7190 8766 +1576 search_by_key 1963 3317 +1354
--- fs/reiserfs/do_balan.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-)
fs/reiserfs/do_balan.c +7 -7
@@ -21,7 +21,7 @@#include <linux/buffer_head.h> #include <linux/kernel.h> -static inline void buffer_info_init_left (struct tree_balance *tb, +static void buffer_info_init_left (struct tree_balance *tb,struct buffer_info *bi) { bi->tb = tb;
@@ -30,7 +30,7 @@ static inline void buffer_info_init_left(struct tree_balance *tb, bi->bi_position =get_left_neighbor_position (tb,0 ); } -static inline void buffer_info_init_right (struct tree_balance *tb, +static void buffer_info_init_right (struct tree_balance *tb,struct buffer_info *bi) { bi->tb = tb;
@@ -39,7 +39,7 @@ static inline void buffer_info_init_right(struct tree_balance *tb, bi->bi_position =get_right_neighbor_position (tb,0 ); } -static inline void buffer_info_init_tbS0 (struct tree_balance *tb, +static void buffer_info_init_tbS0 (struct tree_balance *tb,struct buffer_info *bi) { bi->tb = tb;
@@ -48,7 +48,7 @@ static inline void buffer_info_init_tbS0(struct tree_balance *tb, bi->bi_position =PATH_H_POSITION (tb->tb_path,1 ); } -static inline void buffer_info_init_bh (struct tree_balance *tb, +static void buffer_info_init_bh (struct tree_balance *tb,struct buffer_info *bi,struct buffer_head *bh) {
@@ -58,7 +58,7 @@ static inline void buffer_info_init_bh(struct tree_balance *tb, bi->bi_position =0 ; } -inline void do_balance_mark_leaf_dirty (struct tree_balance *tb, +void do_balance_mark_leaf_dirty (struct tree_balance *tb,struct buffer_head *bh,int flag) { journal_mark_dirty(tb->transaction_handle,
@@ -1967,7 +1967,7 @@ static void check_internal_levels(struct tree_balance *tb)*/ -static inline void do_balance_starts (struct tree_balance *tb) +static void do_balance_starts (struct tree_balance *tb) {/* use print_cur_tb() to see initial state of struct tree_balance */
@@ -1983,7 +1983,7 @@ static inline void do_balance_starts(struct tree_balance *tb)#endif } -static inline void do_balance_completed (struct tree_balance *tb) +static void do_balance_completed (struct tree_balance *tb) {#ifdef CONFIG_REISERFS_CHECK
Signature · 1 line
1.7.4.4
Quoted 8 lines
some subsystems (in my kernel) had a real problem. The biggest offender was DRM. I fixed those up manually by removing inlines. With these changes (and disabling DRM debugging, which is on by default) I get a kernel with force inline that is a few KB smaller. With DRM debugging enabled it's about 50k larger (nearly all of it in DRM, mostly radeon). I hope the default for this can be changed.
Oh these look like a good plan, one of our contributors has an inline fetish and it got cut-n-pasted into a few places particular in radeon.
But we won't be turning DRM debugging off, its what we use to debug things in the field, I did get a patch recently to reduce some of its overhead
5ad3d8831f0c97257460c11ddcc1cc0466c762d4 in my drm-next branch,
drm: Create and use drm_err from Joe Perches.
Dave.
Quoted 7 lines
Oh these look like a good plan, one of our contributors has an inline fetish and it got cut-n-pasted into a few places particular in radeon.
But we won't be turning DRM debugging off, its what we use to debug things in the field, I did get a patch recently to reduce some of its overhead
Why can't it be a CONFIG option like all other debugging code?
If you want to keep it on would need to drop even more inlines to get the 50k overhead down.
-Andi
Quoted 8 lines
Quoted 6 lines
Oh these look like a good plan, one of our contributors has an inline fetish and it got cut-n-pasted into a few places particular in radeon.
But we won't be turning DRM debugging off, its what we use to debug things in the field, I did get a patch recently to reduce some of its overhead
Why can't it be a CONFIG option like all other debugging code?
Not sure which part of debug things in the field doesn't explain it, having people remove the debugging code would sort of work against fixing problems. Having a config option might be possible, but then I'd have to deal with people who think they know what they are doing turning it off, so I'd rather not. Next think you know some distro turns it off and you have users who you can't help anymore.
Quoted 2 lines
If you want to keep it on would need to drop even more inlines to get the 50k overhead down.
Dave.