Series to introduce WARN()... a WARN_ON() variant that takes printk arguments
Subsystems (18)
cover Series to introduce WARN()... a WARN_ON() variant that takes printk arguments
Hi,
This patch series introduces WARN(), which is a WARN_ON() variant that takes printk() like arguments. This was done after both akpm and I hit several cases where this would have been useful; in addition, with WARN(), we put the printk string inside the -----[ cut here ]----- section, making it more likely that users (and tools like kerneloops) pick up the message in addition to just the bare WARNING.
The first few patches have been in -mm for a long time; the later ones are newer and introduce more users of WARN().
PATCH 1/17 Clear the WARN() namespace
From: Arjan van de Ven <[email protected]>
We want to use WARN() as a variant of WARN_ON(), however a few drivers are using WARN() internally. This patch renames these to WARNING() to avoid the namespace clash. A few cases were defining but not using the thing, for those cases I just deleted the definition.
---
drivers/isdn/hisax/st5481.h | 4 drivers/isdn/hisax/st5481_b.c | 4 drivers/isdn/hisax/st5481_d.c | 6 drivers/isdn/hisax/st5481_usb.c | 18 +- drivers/usb/gadget/at91_udc.h | 2 drivers/usb/gadget/cdc2.c | 2 drivers/usb/gadget/ether.c | 2 drivers/usb/gadget/file_storage.c | 14 - drivers/usb/gadget/fsl_usb2_udc.c | 2 drivers/usb/gadget/fsl_usb2_udc.h | 2 drivers/usb/gadget/gmidi.c | 2 drivers/usb/gadget/goku_udc.c | 2 drivers/usb/gadget/goku_udc.h | 2 drivers/usb/gadget/inode.c | 2 drivers/usb/gadget/net2280.c | 2 drivers/usb/gadget/net2280.h | 2 drivers/usb/gadget/omap_udc.c | 6 drivers/usb/gadget/omap_udc.h | 2 drivers/usb/gadget/printer.c | 2 drivers/usb/gadget/pxa25x_udc.c | 6 drivers/usb/gadget/pxa25x_udc.h | 2 drivers/usb/gadget/u_ether.c | 3 drivers/usb/host/isp116x-hcd.c | 2 drivers/usb/host/isp116x.h | 2 drivers/usb/host/sl811-hcd.c | 2 drivers/usb/host/sl811.h | 2 drivers/usb/misc/usbtest.c | 4 include/linux/usb/composite.h | 2 usr/share/quilt/refresh | 304 -------------------------------------- 29 files changed, 48 insertions(+), 359 deletions(-)
drivers/isdn/hisax/st5481.h +2 -2
@@ -220,7 +220,7 @@ enum { #define ERR(format, arg...) \ printk(KERN_ERR "%s:%s: " format "\n" , __FILE__, __func__ , ## arg) -#define WARN(format, arg...) \ +#define WARNING(format, arg...) \ printk(KERN_WARNING "%s:%s: " format "\n" , __FILE__, __func__ , ## arg) #define INFO(format, arg...) \
@@ -412,7 +412,7 @@ struct st5481_adapter { ({ \int status; \if ((status =usb_submit_urb (urb, mem_flags)) <0 ) { \ -WARN ("usb_submit_urb failed,status=%d" , status); \ +WARNING ("usb_submit_urb failed,status=%d" , status); \ } \ status; \ })
drivers/isdn/hisax/st5481_b.c +2 -2
@@ -180,7 +180,7 @@ static void usb_b_out_complete(struct urDBG (4 ,"urb killed status %d" , urb->status);return ;// Give up default : -WARN ("urb status %d" ,urb->status); +WARNING ("urb status %d" ,urb->status);if (b_out->busy ==0 ) {st5481_usb_pipe_reset (adapter, (bcs->channel+1 )*2 |USB_DIR_OUT ,NULL ,NULL ); }
@@ -372,6 +372,6 @@ void st5481_b_l2l1(struct hisax_if *ifc,B_L1L2 (bcs,PH_DEACTIVATE |INDICATION ,NULL );break ;default : -WARN ("pr %#x\n" , pr); +WARNING ("pr %#x\n" , pr); } }
drivers/isdn/hisax/st5481_d.c +3 -3
@@ -389,7 +389,7 @@ static void usb_d_out_complete(struct urDBG (1 ,"urb killed status %d" , urb->status);break ;default : -WARN ("urb status %d" ,urb->status); +WARNING ("urb status %d" ,urb->status);if (d_out->busy ==0 ) {st5481_usb_pipe_reset (adapter,EP_D_OUT |USB_DIR_OUT , fifo_reseted, adapter); }
@@ -420,7 +420,7 @@ static void dout_start_xmit(struct FsmInisdnhdlc_out_init (&d_out->hdlc_state,1 ,0 );if (test_and_set_bit (buf_nr, &d_out->busy)) { -WARN ("ep %d urb %d busy %#lx" ,EP_D_OUT , buf_nr, d_out->busy); +WARNING ("ep %d urb %d busy %#lx" ,EP_D_OUT , buf_nr, d_out->busy);return ; } urb = d_out->urb[buf_nr];
@@ -601,7 +601,7 @@ void st5481_d_l2l1(struct hisax_if *hisaFsmEvent (&adapter->d_out.fsm,EV_DOUT_START_XMIT ,NULL );break ;default : -WARN ("pr %#x\n" , pr); +WARNING ("pr %#x\n" , pr);break ; } }
drivers/isdn/hisax/st5481_usb.c +9 -9
@@ -66,7 +66,7 @@ static void usb_ctrl_msg(struct st5481_astruct ctrl_msg *ctrl_msg;if ((w_index =fifo_add (&ctrl->msg_fifo.f)) <0 ) { -WARN ("control msg FIFO full" ); +WARNING ("control msg FIFO full" );return ; } ctrl_msg = &ctrl->msg_fifo.data[w_index];
@@ -139,7 +139,7 @@ static void usb_ctrl_complete(struct urbDBG (1 ,"urb killed status %d" , urb->status);return ;// Give up default : -WARN ("urb status %d" ,urb->status); +WARNING ("urb status %d" ,urb->status);break ; } }
@@ -198,7 +198,7 @@ static void usb_int_complete(struct urbDBG (2 ,"urb shutting down with status: %d" , urb->status);return ;default : -WARN ("nonzero urb status received: %d" , urb->status); +WARNING ("nonzero urb status received: %d" , urb->status); goto exit; }
@@ -235,7 +235,7 @@ static void usb_int_complete(struct urb exit: status =usb_submit_urb (urb,GFP_ATOMIC );if (status) -WARN ("usb_submit_urb failed with result %d" , status); +WARNING ("usb_submit_urb failed with result %d" , status); }/* ======================================================================
@@ -257,7 +257,7 @@ int st5481_setup_usb(struct st5481_adaptDBG (2 ,"" );if ((status =usb_reset_configuration (dev)) <0 ) { -WARN ("reset_configuration failed,status=%d" ,status); +WARNING ("reset_configuration failed,status=%d" ,status);return status; }
@@ -269,7 +269,7 @@ int st5481_setup_usb(struct st5481_adapt// Check if the config is sane if ( altsetting->desc.bNumEndpoints !=7 ) { -WARN ("expecting 7 got %d endpoints!" , altsetting->desc.bNumEndpoints); +WARNING ("expecting 7 got %d endpoints!" , altsetting->desc.bNumEndpoints);return -EINVAL ; }
@@ -279,7 +279,7 @@ int st5481_setup_usb(struct st5481_adapt// Use alternative setting 3 on interface 0 to have 2B+D if ((status =usb_set_interface (dev,0 ,3 )) <0 ) { -WARN ("usb_set_interface failed,status=%d" ,status); +WARNING ("usb_set_interface failed,status=%d" ,status);return status; }
@@ -497,7 +497,7 @@ static void usb_in_complete(struct urb *DBG (1 ,"urb killed status %d" , urb->status);return ;// Give up default : -WARN ("urb status %d" ,urb->status); +WARNING ("urb status %d" ,urb->status);break ; } }
@@ -523,7 +523,7 @@ static void usb_in_complete(struct urb *DBG (4 ,"count=%d" ,status);DBG_PACKET (0x400 , in->rcvbuf, status);if (!(skb =dev_alloc_skb (status))) { -WARN ("receive out of memory\n" ); +WARNING ("receive out of memory\n" );break ; }memcpy (skb_put (skb, status), in->rcvbuf, status);
drivers/usb/gadget/ether.c +1 -1
@@ -293,7 +293,7 @@ static int __init eth_bind(struct usb_co* but if the controller isn't recognized at all then * that assumption is a bit more likely to be wrong. */ -WARN (cdev,"controller '%s' not recognized; trying %s\n" , +WARNING (cdev,"controller '%s' not recognized; trying %s\n" , gadget->name, eth_config_driver.label); device_desc.bcdDevice =
drivers/usb/gadget/file_storage.c +7 -7
@@ -308,7 +308,7 @@ MODULE_LICENSE("Dual BSD/GPL"); dev_vdbg(&(d)->gadget->dev , fmt , ## args) #define ERROR(d, fmt, args...) \ dev_err(&(d)->gadget->dev , fmt , ## args) -#define WARN(d, fmt, args...) \ +#define WARNING(d, fmt, args...) \ dev_warn(&(d)->gadget->dev , fmt , ## args) #define INFO(d, fmt, args...) \ dev_info(&(d)->gadget->dev , fmt , ## args)
@@ -1091,7 +1091,7 @@ static int ep0_queue(struct fsg_dev *fsgif (rc !=0 && rc != -ESHUTDOWN ) {/* We can't do much more than wait for a reset */ -WARN (fsg,"error in submission: %s --> %d\n" , +WARNING (fsg,"error in submission: %s --> %d\n" , fsg->ep0->name, rc); }return rc;
@@ -1227,7 +1227,7 @@ static void received_cbi_adsc(struct fsg/* Save the command for later */ if (fsg->cbbuf_cmnd_size) -WARN (fsg,"CB[I] overwriting previous command\n" ); +WARNING (fsg,"CB[I] overwriting previous command\n" ); fsg->cbbuf_cmnd_size = req->actual;memcpy (fsg->cbbuf_cmnd, req->buf, fsg->cbbuf_cmnd_size);
@@ -1506,7 +1506,7 @@ static void start_transfer(struct fsg_de* submissions if DMA is enabled. */ if (rc != -ESHUTDOWN && !(rc == -EOPNOTSUPP && req->length ==0 )) -WARN (fsg,"error in submission: %s --> %d\n" , +WARNING (fsg,"error in submission: %s --> %d\n" , ep->name, rc); } }
@@ -2294,7 +2294,7 @@ static int halt_bulk_in_endpoint(structVDBG (fsg,"delayed bulk-in endpoint halt\n" );while (rc !=0 ) {if (rc != -EAGAIN ) { -WARN (fsg,"usb_ep_set_halt -> %d\n" , rc); +WARNING (fsg,"usb_ep_set_halt -> %d\n" , rc); rc =0 ;break ; }
@@ -2317,7 +2317,7 @@ static int wedge_bulk_in_endpoint(structVDBG (fsg,"delayed bulk-in endpoint wedge\n" );while (rc !=0 ) {if (rc != -EAGAIN ) { -WARN (fsg,"usb_ep_set_wedge -> %d\n" , rc); +WARNING (fsg,"usb_ep_set_wedge -> %d\n" , rc); rc =0 ;break ; }
@@ -3755,7 +3755,7 @@ static int __init check_parameters(strucif (gcnum >=0 ) mod_data.release =0x0300 + gcnum;else { -WARN (fsg,"controller '%s' not recognized\n" , +WARNING (fsg,"controller '%s' not recognized\n" , fsg->gadget->name); mod_data.release =0x0399 ; }
drivers/usb/gadget/fsl_usb2_udc.c +1 -1
@@ -1538,7 +1538,7 @@ static void dtd_complete_irq(struct fsl_/* If the ep is configured */ if (curr_ep->name ==NULL ) { -WARN ("Invalid EP?" ); +WARNING ("Invalid EP?" );continue ; }
drivers/usb/gadget/fsl_usb2_udc.h +1 -1
@@ -552,7 +552,7 @@ static void dump_msg(const char *label,#endif #define ERR(stuff...) pr_err("udc: " stuff) -#define WARN(stuff...) pr_warning("udc: " stuff) +#define WARNING(stuff...) pr_warning("udc: " stuff) #define INFO(stuff...) pr_info("udc: " stuff)/*-------------------------------------------------------------------------*/
drivers/usb/gadget/gmidi.c +0 -2
@@ -138,8 +138,6 @@ static void gmidi_transmit(struct gmidi_ dev_vdbg(&(d)->gadget->dev , fmt , ## args) #define ERROR(d, fmt, args...) \ dev_err(&(d)->gadget->dev , fmt , ## args) -#define WARN(d, fmt, args...) \ - dev_warn(&(d)->gadget->dev , fmt , ## args) #define INFO(d, fmt, args...) \ dev_info(&(d)->gadget->dev , fmt , ## args)
drivers/usb/gadget/goku_udc.c +1 -1
@@ -1768,7 +1768,7 @@ static int goku_probe(struct pci_dev *pd* usb_gadget_driver_{register,unregister}() must change. */ if (the_controller) { -WARN (dev,"ignoring %s\n" ,pci_name (pdev)); +WARNING (dev,"ignoring %s\n" ,pci_name (pdev));return -EBUSY ; }if (!pdev->irq) {
drivers/usb/gadget/goku_udc.h +1 -1
@@ -285,7 +285,7 @@ struct goku_udc { #define ERROR(dev,fmt,args...) \ xprintk(dev , KERN_ERR , fmt , ## args) -#define WARN(dev,fmt,args...) \ +#define WARNING(dev,fmt,args...) \ xprintk(dev , KERN_WARNING , fmt , ## args) #define INFO(dev,fmt,args...) \ xprintk(dev , KERN_INFO , fmt , ## args)
drivers/usb/gadget/inode.c +0 -2
@@ -262,8 +262,6 @@ static const char *CHIP; #define ERROR(dev,fmt,args...) \ xprintk(dev , KERN_ERR , fmt , ## args) -#define WARN(dev,fmt,args...) \ - xprintk(dev , KERN_WARNING , fmt , ## args) #define INFO(dev,fmt,args...) \ xprintk(dev , KERN_INFO , fmt , ## args)
drivers/usb/gadget/net2280.c +1 -1
@@ -1007,7 +1007,7 @@ static void scan_dma_completions (struct* 0122, and 0124; not all cases trigger the warning. */ if ((tmp & (1 <<NAK_OUT_PACKETS )) ==0 ) { -WARN (ep->dev,"%s lost packet sync!\n" , +WARNING (ep->dev,"%s lost packet sync!\n" , ep->ep.name); req->req.status = -EOVERFLOW ; }else if ((tmp =readl (&ep->regs->ep_avail)) !=0 ) {
drivers/usb/gadget/net2280.h +1 -1
@@ -272,7 +272,7 @@ static inline void net2280_led_shutdown #define ERROR(dev,fmt,args...) \ xprintk(dev , KERN_ERR , fmt , ## args) -#define WARN(dev,fmt,args...) \ +#define WARNING(dev,fmt,args...) \ xprintk(dev , KERN_WARNING , fmt , ## args) #define INFO(dev,fmt,args...) \ xprintk(dev , KERN_INFO , fmt , ## args)
drivers/usb/gadget/omap_udc.c +3 -3
@@ -1120,7 +1120,7 @@ static int omap_ep_set_halt(struct usb_e status = -EINVAL ; else if (value) {if (ep->udc->ep0_set_config) { -WARN ("error changing config?\n" ); +WARNING ("error changing config?\n" );omap_writew (UDC_CLR_CFG ,UDC_SYSCON2 ); }omap_writew (UDC_STALL_CMD ,UDC_SYSCON2 );
@@ -1764,7 +1764,7 @@ do_stall: u.r.bRequestType, u.r.bRequest, status);if (udc->ep0_set_config) {if (udc->ep0_reset_config) -WARN ("error resetting config?\n" ); +WARNING ("error resetting config?\n" );else omap_writew (UDC_CLR_CFG ,UDC_SYSCON2 ); }
@@ -3076,7 +3076,7 @@ static int omap_udc_suspend(struct platf* which would prevent entry to deep sleep... */ if ((devstat &UDC_ATT ) !=0 && (devstat &UDC_SUS ) ==0 ) { -WARN ("session active; suspend requires disconnect\n" ); +WARNING ("session active; suspend requires disconnect\n" );omap_pullup (&udc->gadget,0 ); }
drivers/usb/gadget/omap_udc.h +1 -1
@@ -188,7 +188,7 @@ struct omap_udc {#endif #define ERR(stuff...) pr_err("udc: " stuff) -#define WARN(stuff...) pr_warning("udc: " stuff) +#define WARNING(stuff...) pr_warning("udc: " stuff) #define INFO(stuff...) pr_info("udc: " stuff) #define DBG(stuff...) pr_debug("udc: " stuff)
drivers/usb/host/isp116x-hcd.c +1 -1
@@ -882,7 +882,7 @@ static void isp116x_endpoint_disable(strfor (i =0 ; i <100 && !list_empty (&hep->urb_list); i++)msleep (3 );if (!list_empty (&hep->urb_list)) -WARN ("ep %p not empty?\n" , ep); +WARNING ("ep %p not empty?\n" , ep);kfree (ep); hep->hcpriv =NULL ;
drivers/usb/host/isp116x.h +1 -1
@@ -338,7 +338,7 @@ struct isp116x_ep {#endif #define ERR(stuff...) printk(KERN_ERR "116x: " stuff) -#define WARN(stuff...) printk(KERN_WARNING "116x: " stuff) +#define WARNING(stuff...) printk(KERN_WARNING "116x: " stuff) #define INFO(stuff...) printk(KERN_INFO "116x: " stuff)/* ------------------------------------------------- */
drivers/usb/host/sl811-hcd.c +1 -1
@@ -1026,7 +1026,7 @@ sl811h_endpoint_disable(struct usb_hcd *if (!list_empty (&hep->urb_list))msleep (3 );if (!list_empty (&hep->urb_list)) -WARN ("ep %p not empty?\n" , ep); +WARNING ("ep %p not empty?\n" , ep);kfree (ep); hep->hcpriv =NULL ;
drivers/usb/host/sl811.h +1 -1
@@ -261,6 +261,6 @@ sl811_read_buf(struct sl811 *sl811, int#endif #define ERR(stuff...) printk(KERN_ERR "sl811: " stuff) -#define WARN(stuff...) printk(KERN_WARNING "sl811: " stuff) +#define WARNING(stuff...) printk(KERN_WARNING "sl811: " stuff) #define INFO(stuff...) printk(KERN_INFO "sl811: " stuff)
drivers/usb/misc/usbtest.c +2 -2
@@ -81,7 +81,7 @@ static struct usb_device *testdev_to_usb #define ERROR(tdev, fmt, args...) \ dev_err(&(tdev)->intf->dev , fmt , ## args) -#define WARN(tdev, fmt, args...) \ +#define WARNING(tdev, fmt, args...) \ dev_warn(&(tdev)->intf->dev , fmt , ## args)/*-------------------------------------------------------------------------*/
@@ -1946,7 +1946,7 @@ usbtest_probe (struct usb_interface *int status =get_endpoints (dev, intf);if (status <0 ) { -WARN (dev,"couldn't get endpoints, %d\n" , +WARNING (dev,"couldn't get endpoints, %d\n" , status);return status; }
drivers/usb/gadget/printer.c +1 -1
@@ -179,7 +179,7 @@ module_param(qlen, uint, S_IRUGO|S_IWUSR #define ERROR(dev, fmt, args...) \ xprintk(dev, KERN_ERR, fmt, ## args) -#define WARN(dev, fmt, args...) \ +#define WARNING(dev, fmt, args...) \ xprintk(dev, KERN_WARNING, fmt, ## args) #define INFO(dev, fmt, args...) \ xprintk(dev, KERN_INFO, fmt, ## args)
drivers/usb/gadget/pxa25x_udc.c +3 -3
@@ -340,7 +340,7 @@ pxa25x_ep_free_request (struct usb_ep *_struct pxa25x_request *req; req = container_of (_req, struct pxa25x_request, req); -WARN_ON (!list_empty (&req->queue)); +WARN_ON (!list_empty (&req->queue));kfree (req); }
@@ -1554,7 +1554,7 @@ config_change:* tell us about config change events, * so later ones may fail... */ -WARN ("config change %02x fail %d?\n" , +WARNING ("config change %02x fail %d?\n" , u.r.bRequest, i);return ;/* TODO experiment: if has_cfr,
@@ -2328,7 +2328,7 @@ static int pxa25x_udc_suspend(struct plaunsigned long flags;if (!udc->mach->gpio_pullup && !udc->mach->udc_command) -WARN ("USB host won't detect disconnect!\n" ); +WARNING ("USB host won't detect disconnect!\n" ); udc->suspended =1 ;local_irq_save (flags);
drivers/usb/gadget/cdc2.c +1 -1
@@ -170,7 +170,7 @@ static int __init cdc_bind(struct usb_co* but if the controller isn't recognized at all then * that assumption is a bit more likely to be wrong. */ -WARN (cdev,"controller '%s' not recognized; trying %s\n" , +WARNING (cdev,"controller '%s' not recognized; trying %s\n" , gadget->name, cdc_config_driver.label); device_desc.bcdDevice =
drivers/usb/gadget/u_ether.c +0 -3
@@ -116,7 +116,6 @@ static inline int qlen(struct usb_gadget#undef DBG#undef VDBG#undef ERROR -#undef WARN#undef INFO #define xprintk(d, level, fmt, args...) \
@@ -140,8 +139,6 @@ static inline int qlen(struct usb_gadget #define ERROR(dev, fmt, args...) \ xprintk(dev , KERN_ERR , fmt , ## args) -#define WARN(dev, fmt, args...) \ - xprintk(dev , KERN_WARNING , fmt , ## args) #define INFO(dev, fmt, args...) \ xprintk(dev , KERN_INFO , fmt , ## args)
drivers/usb/gadget/at91_udc.h +1 -1
@@ -171,7 +171,7 @@ struct at91_request {#endif #define ERR(stuff...) pr_err("udc: " stuff) -#define WARN(stuff...) pr_warning("udc: " stuff) +#define WARNING(stuff...) pr_warning("udc: " stuff) #define INFO(stuff...) pr_info("udc: " stuff) #define DBG(stuff...) pr_debug("udc: " stuff)
drivers/usb/gadget/pxa25x_udc.h +1 -1
@@ -259,7 +259,7 @@ dump_state(struct pxa25x_udc *dev) #define DBG(lvl, stuff...) do{if ((lvl) <= UDC_DEBUG) DMSG(stuff);}while(0) #define ERR(stuff...) pr_err("udc: " stuff) -#define WARN(stuff...) pr_warning("udc: " stuff) +#define WARNING(stuff...) pr_warning("udc: " stuff) #define INFO(stuff...) pr_info("udc: " stuff)
include/linux/usb/composite.h +1 -1
@@ -330,7 +330,7 @@ extern int usb_string_id(struct usb_comp dev_vdbg(&(d)->gadget->dev , fmt , ## args) #define ERROR(d, fmt, args...) \ dev_err(&(d)->gadget->dev , fmt , ## args) -#define WARN(d, fmt, args...) \ +#define WARNING(d, fmt, args...) \ dev_warn(&(d)->gadget->dev , fmt , ## args) #define INFO(d, fmt, args...) \ dev_info(&(d)->gadget->dev , fmt , ## args)
usr/share/quilt/refresh deleted +0 -304
304 lines not on this page · raw message
Andrew Morton
maintainerRe: [patch 1/17] Clear the WARN() namespace
Quoted 33 lines · On Tue, 8 Jul 2008 09:39:30 -0700 Arjan van de Ven <[email protected]> wrote:
From: Arjan van de Ven <[email protected]>
We want to use
WARN()as a variant ofWARN_ON(), however a few drivers are usingWARN()internally. This patch renames these toWARNING()to avoid the namespace clash. A few cases were defining but not using the thing, for those cases I just deleted the definition.Signed-off-by Arjan van de Ven <[email protected]>Acked-by Greg KH <[email protected]>Cc Karsten Keil <[email protected]>Signed-off-by Andrew Morton <[email protected]>---
drivers/isdn/hisax/st5481.h | 4 drivers/isdn/hisax/st5481_b.c | 4 drivers/isdn/hisax/st5481_d.c | 6 drivers/isdn/hisax/st5481_usb.c | 18 +- drivers/usb/gadget/at91_udc.h | 2 drivers/usb/gadget/cdc2.c | 2 drivers/usb/gadget/ether.c | 2 drivers/usb/gadget/file_storage.c | 14 - drivers/usb/gadget/fsl_usb2_udc.c | 2 drivers/usb/gadget/fsl_usb2_udc.h | 2 drivers/usb/gadget/gmidi.c | 2 drivers/usb/gadget/goku_udc.c | 2 drivers/usb/gadget/goku_udc.h | 2 drivers/usb/gadget/inode.c | 2 drivers/usb/gadget/net2280.c | 2 drivers/usb/gadget/net2280.h | 2 drivers/usb/gadget/omap_udc.c | 6 drivers/usb/gadget/omap_udc.h | 2 drivers/usb/gadget/printer.c | 2 drivers/usb/gadget/pxa25x_udc.c | 6
Quoted 8 lines
drivers/usb/gadget/pxa25x_udc.h | 2 drivers/usb/gadget/u_ether.c | 3 drivers/usb/host/isp116x-hcd.c | 2 drivers/usb/host/isp116x.h | 2 drivers/usb/host/sl811-hcd.c | 2 drivers/usb/host/sl811.h | 2 drivers/usb/misc/usbtest.c | 4 include/linux/usb/composite.h | 2
After fixing rejects, this appears to be identical to what I already had.
Quoted 1 line
usr/share/quilt/refresh | 304 --------------------------------------
Except for this curosity, which I rather hope wasn't supposed to be there.
PATCH 2/17 Add a WARN() macro that acts like WARN_ON()+printk
In reply to Arjan van de VenFrom: Arjan van de Ven <[email protected]>
Add a WARN() macro that acts like WARN_ON(), with the added feature that it takes a printk like argument that is printed as part of the warning message.
---
include/asm-generic/bug.h | 32 ++++++++++++++++++++++++++++++++ kernel/panic.c | 22 ++++++++++++++++++++++ 2 files changed, 54 insertions(+)
include/asm-generic/bug.h +32 -0
@@ -34,9 +34,14 @@ struct bug_entry {#ifndef __WARN#ifndef __ASSEMBLY__extern void warn_on_slowpath (const char *file,const int line); +extern void warn_slowpath (const char *file,const int line, +const char *fmt, ...) __attribute__((format (printf,3 ,4 )));#define WANT_WARN_ON_SLOWPATH #endif #define __WARN () warn_on_slowpath(__FILE__, __LINE__) +#define __WARN_printf(arg...) warn_slowpath(__FILE__, __LINE__, arg) +#else +#define __WARN_printf(arg...) __WARN()#endif #ifndef WARN_ON
@@ -48,6 +53,15 @@ extern void warn_on_slowpath(const char })#endif +#ifndef WARN +#define WARN(condition, format...) ({ \ + int __ret_warn_on = !!(condition); \ + if (unlikely(__ret_warn_on)) \ + __WARN_printf(format); \ + unlikely(__ret_warn_on); \ +}) +#endif +#else /* !CONFIG_BUG */ #ifndef HAVE_ARCH_BUG #define BUG ()
@@ -63,6 +77,14 @@ extern void warn_on_slowpath(const charunlikely (__ret_warn_on); \ })#endif + +#ifndef WARN +#define WARN(condition, format...) ({ \ + int __ret_warn_on = !!(condition); \ + unlikely(__ret_warn_on); \ +}) +#endif +#endif #define WARN_ON_ONCE (condition) ({ \
@@ -75,6 +97,16 @@ extern void warn_on_slowpath(const charunlikely (__ret_warn_once); \ }) +#define WARN_ONCE(condition, format...) ({ \ + static int __warned; \ + int __ret_warn_once = !!(condition); \ + \ + if (unlikely(__ret_warn_once)) \ + if (WARN(!__warned, format)) \ + __warned = 1; \ + unlikely(__ret_warn_once); \ +}) +#ifdef CONFIG_SMP # define WARN_ON_SMP (x) WARN_ON(x)#else
kernel/panic.c +22 -0
@@ -321,6 +321,28 @@ void warn_on_slowpath(const char *file, add_taint(TAINT_WARN); }EXPORT_SYMBOL (warn_on_slowpath); + + +void warn_slowpath (const char *file,int line,const char *fmt, ...) +{ +va_list args; +char function[KSYM_SYMBOL_LEN ]; +unsigned long caller = (unsigned long )__builtin_return_address (0 ); +sprint_symbol (function, caller); + +printk (KERN_WARNING "------------[ cut here ]------------\n" ); +printk (KERN_WARNING "WARNING: at %s:%d %s()\n" , file, + line, function); +va_start (args, fmt); +vprintk (fmt, args); +va_end (args); + +print_modules (); +dump_stack (); +print_oops_end_marker (); +add_taint (TAINT_WARN ); +} +EXPORT_SYMBOL (warn_slowpath);#endif #ifdef CONFIG_CC_STACKPROTECTOR
Re: [patch 2/17] Add a WARN() macro that acts like WARN_ON()+printk
include/asm-generic/bug.h extern void warn_on_slowpath(const char · line 64
Quoted 9 lines · Arjan van de Ven
include/asm-generic/bug.h +9
-0+#ifndef WARN +#define WARN(condition, format...) ({ \ + int __ret_warn_on = !!(condition); \ + if (unlikely(__ret_warn_on)) \ + __WARN_printf(format); \ + unlikely(__ret_warn_on); \ +}) +#endif +
If all current uses of WARN are going to change, perhaps adding an argument for KERN_<level> or removing the KERN_<level> prefixes and standardizing on a single KERN_<level> (KERN_WARNING?) is appropriate.
If not standardizing on a single KERN_<level> prefix, perhaps change the conditional and using something like:
assert_<level>(cond, fmt, arg...)
or
assert_msg(cond, level, fmt, arg...)
Re: [patch 2/17] Add a WARN() macro that acts like WARN_ON()+printk
Quoted 11 lines · On Tue, 08 Jul 2008 11:00:05 -0700 Joe Perches <[email protected]> wrote:
Quoted 10 lines · Arjan van de Ven
(quoted diff) +2
-0+#ifndef WARN +#define WARN(condition, format...)({ \
(quoted diff) +1
-0+ int __ret_warn_on= !!(condition); \
(quoted diff) +1
-0+ if(
unlikely(__ret_warn_on)) \
+__WARN_printf(format); \
+
Quoted 8 lines
Review
Quoted 3 lines
unlikely(__ret_warn_on); \(quoted diff) +2
-0+}) +#endif +If all current uses of WARN are going to change, perhaps adding an argument for KERN_<level> or removing the KERN_<level> prefixes and standardizing on a single KERN_<level> (
KERN_WARNING?) is appropriate.
I looked at this and there are various levels in use today, I don't think we can standardize on one unfortunately.
I don't think there's a real problem; WARN() really acts like printk... all the way.
If you want to reach me at my work email, use [email protected] For development, discussion and tips for power savings, visit http://www.lesswatts.org
Andrew Morton
maintainerRe: [patch 2/17] Add a WARN() macro that acts like WARN_ON()+printk
In reply to Arjan van de VenQuoted 5 lines · On Tue, 8 Jul 2008 09:40:23 -0700 Arjan van de Ven <[email protected]> wrote:
From: Arjan van de Ven <[email protected]>
Add a
WARN()macro that acts likeWARN_ON(), with the added feature that it takes a printk like argument that is printed as part of the warning message.
Apart from a little whitespace tweak, this is identical to what I already had.
include/asm-generic/bug.h extern void warn_on_slowpath(const char · line 108
Quoted 9 lines
include/asm-generic/bug.h +9
-0+#define WARN_ONCE(condition, format...) ({ \ + static int __warned; \ + int __ret_warn_once = !!(condition); \ + \ + if (unlikely(__ret_warn_once)) \ + if (WARN(!__warned, format)) \ + __warned = 1; \ + unlikely(__ret_warn_once); \ +})
Except it adds this operation, without describing it at all in the changelog.
Is this some brainfart, or am I missing something? I can see some sense in a WARN_ONCE(format...), but not in a WARN_ONCE() which takes a `condition' and should be called WARN_ON_ONCE(), which we already have.
As it appears that you didn't add any users of WARN_ONCE(), I shall delicately step away from this patch.
More care, please?
Re: [patch 2/17] Add a WARN() macro that acts like WARN_ON()+printk
Quoted 32 lines · On Fri, 11 Jul 2008 12:19:49 -0700 Andrew Morton <[email protected]>…
Quoted 6 lines · On Tue, 8 Jul 2008 09:40:23 -0700 Arjan van de Ven <[email protected]> wrote:
From: Arjan van de Ven <[email protected]>
Add a
WARN()macro that acts likeWARN_ON(), with the added feature that it takes a printk like argument that is printed as part of the warning message.Apart from a little whitespace tweak, this is identical to what I already had.
Quoted 13 lines
+#define
WARN_ONCE(condition, format...)
({ \(quoted diff) +1
-0+ static int
__warned; \(quoted diff) +1
-0+ int __ret_warn_once= !!(condition); \
(quoted diff) +2
-0+ \ + if(
unlikely(__ret_warn_once)) \(quoted diff) +1
-0+ if (WARN(!__warned, format))\(quoted diff) +1
-0+ __warned =1; \
include/asm-generic/bug.h extern void warn_on_slowpath(const char · line 108
Quoted 2 lines
include/asm-generic/bug.h +2
-0+unlikely (__ret_warn_once); \ +})Except it adds this operation, without describing it at all in the changelog.
Quoted 4 lines
Is this some brainfart, or am I missing something? I can see some sense in a
WARN_ONCE(format...), but not in aWARN_ONCE()which takes a `condition' and should be calledWARN_ON_ONCE(), which we already have.
WARN_ON_ONCE() doesn't take printk arguments. So WARN_ONCE() is WAR_ON_ONCE() with printk arguments...
Signature · 3 lines
If you want to reach me at my work email, use [email protected] For development, discussion and tips for power savings, visit http://www.lesswatts.org
PATCH 3/17 Introduce WARN() usage in the kobject code
In reply to Arjan van de VenFrom: Arjan van de Ven <[email protected]>
Now that WARN() exists, we can fold some of the printk's into it.
---
lib/kobject.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
lib/kobject.c +3 -6
@@ -215,9 +215,8 @@ static int kobject_add_internal(struct kreturn -ENOENT ;if (!kobj->name || !kobj->name[0 ]) { -pr_debug ("kobject: (%p): attempted to be registered with empty " +WARN (1 ,"kobject: (%p): attempted to be registered with empty " "name!\n" , kobj); -WARN_ON (1 );return -EINVAL ; }
@@ -627,12 +626,10 @@ static void kobject_release(struct krefvoid kobject_put (struct kobject *kobj) {if (kobj) { -if (!kobj->state_initialized) { -printk (KERN_WARNING "kobject: '%s' (%p): is not " +if (!kobj->state_initialized) +WARN (1 ,KERN_WARNING "kobject: '%s' (%p): is not " "initialized, yet kobject_put() is being " "called.\n" ,kobject_name (kobj), kobj); -WARN_ON (1 ); - }kref_put (&kobj->kref, kobject_release); } }
PATCH 4/17 Use WARN() in kernel/irq/manage.c
In reply to Arjan van de VenFrom: Arjan van de Ven <[email protected]>
Replace a printk+WARN_ON() by a WARN(); this increases the chance of the string making it into the bugreport (ie: it goes inside the ---[ cut here ]--- section)
---
kernel/irq/manage.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
kernel/irq/manage.c +2 -5
@@ -177,8 +177,7 @@ static void __enable_irq(struct irq_desc {switch (desc->depth) {case 0 : -printk (KERN_WARNING "Unbalanced enable for IRQ %d\n" , irq); -WARN_ON (1 ); +WARN (1 ,KERN_WARNING "Unbalanced enable for IRQ %d\n" , irq);break ;case 1 : {unsigned int status = desc->status & ~IRQ_DISABLED ;
@@ -247,9 +246,7 @@ int set_irq_wake(unsigned int irq, unsig set_wake =NULL ; }else {if (desc->wake_depth ==0 ) { -printk (KERN_WARNING "Unbalanced IRQ %d " -"wake disable\n" , irq); -WARN_ON (1 ); +WARN (1 ,"Unbalanced IRQ %d wake disable\n" , irq); }else if (--desc->wake_depth ==0 ) desc->status &= ~IRQ_WAKEUP ;else
PATCH 5/17 Use WARN() in kernel/panic.c
In reply to Arjan van de VenFrom: Arjan van de Ven <[email protected]>
Subject: Use WARN instead of printk+WARN_ON in kernel/panic.c
Use WARN() instead of a printk+WARN_ON() pair; this way the message becomes part of the warning section for better reporting/collection. This allowed the if() to be folded entirely into the WARN()
--- kernel/panic.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
kernel/panic.c +2 -4
@@ -392,10 +392,8 @@ static int __stack_chk_test(void)printk (KERN_INFO "Testing -fstack-protector-all feature\n" ); __stack_check_testing = (unsigned long )&__stack_chk_test_func;__stack_chk_test_func (); -if (__stack_check_testing) { -printk (KERN_ERR "-fstack-protector-all test failed\n" ); -WARN_ON (1 ); - } +WARN (__stack_check_testing, +KERN_ERR "-fstack-protector-all test failed\n" );return 0 ; }/*
PATCH 6/17 Use WARN() in mm/vmalloc.c
In reply to Arjan van de VenFrom: Arjan van de Ven <[email protected]>
Subject: Use WARN instead of printk+WARN_ON in mm/vmalloc.c
Use WARN() instead of a printk+WARN_ON() pair; this way the message becomes part of the warning section for better reporting/collection.
--- mm/vmalloc.c | 6 2 files changed, 2 insertions(+), 309 deletions(-)
mm/vmalloc.c +2 -4
@@ -381,16 +381,14 @@ static void __vunmap(const void *addr, ireturn ;if ((PAGE_SIZE -1 ) & (unsigned long )addr) { -printk (KERN_ERR "Trying to vfree() bad address (%p)\n" , addr); -WARN_ON (1 ); +WARN (1 ,KERN_ERR "Trying to vfree() bad address (%p)\n" , addr);return ; } area =remove_vm_area (addr);if (unlikely (!area)) { -printk (KERN_ERR "Trying to vfree() nonexistent vm area (%p)\n" , +WARN (1 ,KERN_ERR "Trying to vfree() nonexistent vm area (%p)\n" , addr); -WARN_ON (1 );return ; }
PATCH 7/17 use WARN() in kernel/lockdep.c
In reply to Arjan van de VenFrom: Arjan van de Ven <[email protected]>
Subject: Use WARN instead of printk+WARN_ON in kernel/lockdep.c
Use WARN() instead of a printk+WARN_ON() pair; this way the message becomes part of the warning section for better reporting/collection.
--- kernel/lockdep.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
kernel/lockdep.c +2 -4
@@ -1643,11 +1643,10 @@ static void check_chain_key(struct task_ hlock = curr->held_locks + i;if (chain_key != hlock->prev_chain_key) {debug_locks_off (); -printk ("hm#1, depth: %u [%u], %016Lx != %016Lx\n" , +WARN (1 ,"hm#1, depth: %u [%u], %016Lx != %016Lx\n" , curr->lockdep_depth, i, (unsigned long long )chain_key, (unsigned long long )hlock->prev_chain_key); -WARN_ON (1 );return ; } id = hlock->class - lock_classes;
@@ -1662,11 +1661,10 @@ static void check_chain_key(struct task_ }if (chain_key != curr->curr_chain_key) {debug_locks_off (); -printk ("hm#2, depth: %u [%u], %016Lx != %016Lx\n" , +WARN (1 ,"hm#2, depth: %u [%u], %016Lx != %016Lx\n" , curr->lockdep_depth, i, (unsigned long long )chain_key, (unsigned long long )curr->curr_chain_key); -WARN_ON (1 ); }#endif }
PATCH 8/17 use WARN() in kernel/irq/chip.c
In reply to Arjan van de VenFrom: Arjan van de Ven <[email protected]>
Subject: Use WARN instead of printk+WARN_ON in kernel/irq
Use WARN() instead of a printk+WARN_ON() pair; this way the message becomes part of the warning section for better reporting/collection.
--- kernel/irq/chip.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
kernel/irq/chip.c +4 -8
@@ -28,8 +28,7 @@ void dynamic_irq_init(unsigned int irq)unsigned long flags;if (irq >=NR_IRQS ) { -printk (KERN_ERR "Trying to initialize invalid IRQ%d\n" , irq); -WARN_ON (1 ); +WARN (1 ,KERN_ERR "Trying to initialize invalid IRQ%d\n" , irq);return ; }
@@ -62,8 +61,7 @@ void dynamic_irq_cleanup(unsigned int irunsigned long flags;if (irq >=NR_IRQS ) { -printk (KERN_ERR "Trying to cleanup invalid IRQ%d\n" , irq); -WARN_ON (1 ); +WARN (1 ,KERN_ERR "Trying to cleanup invalid IRQ%d\n" , irq);return ; }
@@ -71,9 +69,8 @@ void dynamic_irq_cleanup(unsigned int irspin_lock_irqsave (&desc->lock, flags);if (desc->action) {spin_unlock_irqrestore (&desc->lock, flags); -printk (KERN_ERR "Destroying IRQ%d without calling free_irq\n" , +WARN (1 ,KERN_ERR "Destroying IRQ%d without calling free_irq\n" , irq); -WARN_ON (1 );return ; } desc->msi_desc =NULL ;
@@ -96,8 +93,7 @@ int set_irq_chip(unsigned int irq, strucunsigned long flags;if (irq >=NR_IRQS ) { -printk (KERN_ERR "Trying to install chip for IRQ%d\n" , irq); -WARN_ON (1 ); +WARN (1 ,KERN_ERR "Trying to install chip for IRQ%d\n" , irq);return -EINVAL ; }
PATCH 9/17 Use WARN() in arch/x86/mm/ioremap.c
In reply to Arjan van de VenFrom: Arjan van de Ven <[email protected]>
Subject: Use WARN instead of printk+WARN_ON in arch/x86/mm/ioremap.c
Use WARN() instead of a printk+WARN_ON() pair; this way the message becomes part of the warning section for better reporting/collection.
--- arch/x86/mm/ioremap.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
arch/x86/mm/ioremap.c +3 -5
@@ -522,13 +522,11 @@ static int __init check_early_ioremap_le {if (!early_ioremap_nested)return 0 ; - -printk (KERN_WARNING +WARN (1 ,KERN_WARNING "Debug warning: early ioremap leak of %d areas detected.\n" , - early_ioremap_nested); + early_ioremap_nested);printk (KERN_WARNING -"please boot with early_ioremap_debug and report the dmesg.\n" ); -WARN_ON (1 ); +"please boot with early_ioremap_debug and report the dmesg.\n" );return 1 ; }
PATCH 10/17 use WARN() in arch/x86/mm/pageattr.c
In reply to Arjan van de VenFrom: Arjan van de Ven <[email protected]>
Subject: Use WARN instead of printk+WARN_ON in x86/mm/pageattr
Use WARN() instead of a printk+WARN_ON() pair; this way the message becomes part of the warning section for better reporting/collection.
--- arch/x86/mm/pageattr-test.c | 3 +-- arch/x86/mm/pageattr.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-)
arch/x86/mm/pageattr.c +1 -2
@@ -586,10 +586,9 @@ repeat:if (!pte_val (old_pte)) {if (!primary)return 0 ; -printk (KERN_WARNING "CPA: called for zero pte. " +WARN (1 ,KERN_WARNING "CPA: called for zero pte. " "vaddr = %lx cpa->vaddr = %lx\n" , address, cpa->vaddr); -WARN_ON (1 );return -EINVAL ; }
arch/x86/mm/pageattr-test.c +1 -2
@@ -221,8 +221,7 @@ static int pageattr_test(void) failed +=print_split (&sc);if (failed) { -printk (KERN_ERR "NOT PASSED. Please report.\n" ); -WARN_ON (1 ); +WARN (1 ,KERN_ERR "NOT PASSED. Please report.\n" );return -EINVAL ; }else {if (print)
PATCH 11/17 Use WARN() in arch/x86/kernel
In reply to Arjan van de VenFrom: Arjan van de Ven <[email protected]>
Subject: Use WARN instead of printk+WARN_ON in arch/x86/kernel
Use WARN() instead of a printk+WARN_ON() pair; this way the message becomes part of the warning section for better reporting/collection. This also allowed the folding of some if()'s into the WARN()
--- arch/x86/kernel/cpu/mtrr/main.c | 5 +---- arch/x86/kernel/pci-calgary_64.c | 3 +-- arch/x86/kernel/tsc_sync.c | 6 ++---- 3 files changed, 4 insertions(+), 10 deletions(-)
arch/x86/kernel/pci-calgary_64.c +1 -2
@@ -339,9 +339,8 @@ static void iommu_free(struct iommu_tabl/* were we called with bad_dma_address? */ badend = bad_dma_address + (EMERGENCY_PAGES *PAGE_SIZE );if (unlikely ((dma_addr >= bad_dma_address) && (dma_addr < badend))) { -printk (KERN_ERR "Calgary: driver tried unmapping bad DMA " +WARN (1 ,KERN_ERR "Calgary: driver tried unmapping bad DMA " "address 0x%Lx\n" , dma_addr); -WARN_ON (1 );return ; }
arch/x86/kernel/tsc_sync.c +2 -4
@@ -88,11 +88,9 @@ static __cpuinit void check_tsc_warp(voi__raw_spin_unlock (&sync_lock); } } -if (!(now-start)) { -printk ("Warning: zero tsc calibration delta: %Ld [max: %Ld]\n" , +WARN (!(now-start), +"Warning: zero tsc calibration delta: %Ld [max: %Ld]\n" , now-start, end-start); -WARN_ON (1 ); - } }/*
arch/x86/kernel/cpu/mtrr/main.c +1 -4
@@ -1496,11 +1496,8 @@ int __init mtrr_trim_uncached_memory(uns/* kvm/qemu doesn't have mtrr set right, don't trim them all */ if (!highest_pfn) { -if (!kvm_para_available ()) { -printk (KERN_WARNING +WARN (!kvm_para_available (),KERN_WARNING "WARNING: strange, CPU MTRRs all blank?\n" ); -WARN_ON (1 ); - }return 0 ; }
PATCH 12/17 Use WARN() in block/
In reply to Arjan van de VenFrom: Arjan van de Ven <[email protected]>
Subject: Use WARN instead of printk+WARN_ON in block
Use WARN() instead of a printk+WARN_ON() pair; this way the message becomes part of the warning section for better reporting/collection.
block/as-iosched.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
block/as-iosched.c +1 -2
@@ -837,8 +837,7 @@ static void as_completed_request(structWARN_ON (!list_empty (&rq->queuelist));if (RQ_STATE (rq) !=AS_RQ_REMOVED ) { -printk ("rq->state %d\n" ,RQ_STATE (rq)); -WARN_ON (1 ); +WARN (1 ,"rq->state %d\n" ,RQ_STATE (rq)); goto out; }
PATCH 13/17 Use WARN() in drivers/base/
In reply to Arjan van de VenFrom: Arjan van de Ven <[email protected]>
Subject: Use WARN instead of printk+WARN_ON in drivers/base
Use WARN() instead of a printk+WARN_ON() pair; this way the message becomes part of the warning section for better reporting/collection.
===================================================================
--- drivers/base/core.c | 6 ++---- drivers/base/memory.c | 3 +-- drivers/base/sys.c | 12 ++++-------- 3 files changed, 7 insertions(+), 14 deletions(-)
drivers/base/core.c +2 -4
@@ -116,12 +116,10 @@ static void device_release(struct kobjec dev->type->release (dev); else if (dev->class && dev->class->dev_release) dev->class->dev_release(dev); - else { -printk (KERN_ERR "Device '%s' does not have a release() " + else + WARN(1, KERN_ERR "Device '%s' does not have a release() ""function, it is broken and must be fixed.\n" , dev->bus_id); -WARN_ON (1 ); - } }static struct kobj_type device_ktype = {
drivers/base/sys.c +4 -8
@@ -168,19 +168,16 @@ int sysdev_driver_register(struct sysdevint err =0 ;if (!cls) { -printk (KERN_WARNING "sysdev: invalid class passed to " +WARN (1 ,KERN_WARNING "sysdev: invalid class passed to " "sysdev_driver_register!\n" ); -WARN_ON (1 );return -EINVAL ; }/* Check whether this driver has already been added to a class. */ -if (drv->entry.next && !list_empty (&drv->entry)) { -printk (KERN_WARNING "sysdev: class %s: driver (%p) has already" +if (drv->entry.next && !list_empty (&drv->entry)) +WARN (1 ,KERN_WARNING "sysdev: class %s: driver (%p) has already" " been registered to a class, something is wrong, but " "will forge on!\n" , cls->name, drv); -WARN_ON (1 ); - }mutex_lock (&sysdev_drivers_lock);if (cls &&kset_get (&cls->kset)) {
@@ -194,8 +191,7 @@ int sysdev_driver_register(struct sysdev } }else { err = -EINVAL ; -printk (KERN_ERR "%s: invalid device class\n" , __func__); -WARN_ON (1 ); +WARN (1 ,KERN_ERR "%s: invalid device class\n" , __func__); }mutex_unlock (&sysdev_drivers_lock);return err;
drivers/base/memory.c +1 -2
@@ -189,9 +189,8 @@ memory_block_action(struct memory_block }break ;default : -printk (KERN_WARNING "%s(%p, %ld) unknown action: %ld\n" , +WARN (1 ,KERN_WARNING "%s(%p, %ld) unknown action: %ld\n" , __func__, mem, action, action); -WARN_ON (1 ); ret = -EINVAL ; }
Andrew Morton
maintainerRe: [patch 13/17] Use WARN() in drivers/base/
Quoted 1 line · On Tue, 8 Jul 2008 09:53:07 -0700 Arjan van de Ven <[email protected]> wrote:
A number of these patches had mangled signed-off-by: lines.
Please try to be consistent in the presence and placement of the ^--- line at the end of the changelog.
I verified that all three copies of "Use WARN() in fs/" were the same.
I've decided that I don't like the whole thing :( This:
#define WARN(condition, format...) ({ \
int __ret_warn_on = !!(condition); \
if (unlikely(__ret_warn_on)) \
__WARN_printf(format); \
unlikely(__ret_warn_on); \
})is not a WARN(). It is a WARN_ON() function. The use of this name now leaves us no sensible name under which to implement
#define WARN(format...)
Re: [patch 13/17] Use WARN() in drivers/base/
Quoted 22 lines · On Fri, 11 Jul 2008 12:20:11 -0700 Andrew Morton <[email protected]>…
Quoted 2 lines · On Tue, 8 Jul 2008 09:53:07 -0700 Arjan van de Ven <[email protected]> wrote:
Signed-off-by Arjan van de Ven <[email protected]>Index:
linux.trees.git/drivers/base/core.cA number of these patches had mangled signed-off-by: lines.
Please try to be consistent in the presence and placement of the ^--- line at the end of the changelog.
I verified that all three copies of "Use
WARN()infs/" were the same.I've decided that I don't like the whole thing :( This:
#define
WARN(condition, format...)
({ \ int__ret_warn_on
= !!(condition); \ if
(unlikely(__ret_warn_on)) \__WARN_printf(format); \unlikely(__ret_warn_on); \ })
Quoted 3 lines
is not a
WARN(). It is aWARN_ON()function. The use of this name now leaves us no sensible name under which to implement
I'm totally open to a better name.
Having a condition in there is really nice, it means we can fold the if() into it in many cases. Just like BUG_ON() did.
Andrew Morton
maintainerRe: [patch 13/17] Use WARN() in drivers/base/
Quoted 25 lines · On Fri, 11 Jul 2008 13:54:09 -0700 Arjan van de Ven <[email protected]> wrote:
Quoted 22 lines · On Fri, 11 Jul 2008 12:20:11 -0700 Andrew Morton <[email protected]>…
Quoted 2 lines · On Tue, 8 Jul 2008 09:53:07 -0700 Arjan van de Ven <[email protected]> wrote:
Signed-off-by Arjan van de Ven <[email protected]>Index:
linux.trees.git/drivers/base/core.cA number of these patches had mangled signed-off-by: lines.
Please try to be consistent in the presence and placement of the ^--- line at the end of the changelog.
I verified that all three copies of "Use
WARN()infs/" were the same.I've decided that I don't like the whole thing :( This:
#define
WARN(condition, format...)
({ \ int__ret_warn_on
= !!(condition); \ if
(unlikely(__ret_warn_on)) \__WARN_printf(format); \unlikely(__ret_warn_on); \ })
Quoted 7 lines
Quoted 3 lines
is not a
WARN(). It is aWARN_ON()function. The use of this name now leaves us no sensible name under which to implementI'm totally open to a better name.
Having a condition in there is really nice, it means we can fold theif()into it in many cases. Just likeBUG_ON()did.
Alexey's WARN_IF() would suit, I guess. Plain old "WARN" is just wrong here, alas.
I can just edit all the diffs if we're all OK with that.
I don't suppose there's any way of tricking the preprocessor into supporting
WARN_ON(foo == 42);
as well as
WARN_ON(foo == 42, "bite me!");
Re: [patch 13/17] Use WARN() in drivers/base/
Quoted 34 lines · On Fri, 11 Jul 2008 15:11:10 -0700 Andrew Morton <[email protected]>…
Quoted 31 lines · On Fri, 11 Jul 2008 13:54:09 -0700 Arjan van de Ven <[email protected]> wrote:
Quoted 27 lines · On Fri, 11 Jul 2008 12:20:11 -0700 Andrew Morton <[email protected]>…
Quoted 2 lines · On Tue, 8 Jul 2008 09:53:07 -0700 Arjan van de Ven <[email protected]> wrote:
Signed-off-by Arjan van de Ven <[email protected]>Index:
linux.trees.git/drivers/base/core.cA number of these patches had mangled signed-off-by: lines.
Please try to be consistent in the presence and placement of the ^--- line at the end of the changelog.
I verified that all three copies of "Use
WARN()infs/" were the same.I've decided that I don't like the whole thing :( This:
#define
WARN(condition, format...)
({ \ int__ret_warn_on
= !!(condition); \ if
(unlikely(__ret_warn_on)) \__WARN_printf(format); \unlikely(__ret_warn_on);
\ })is not a
WARN(). It is aWARN_ON()function. The use of this name now leaves us no sensible name under which to implement
Quoted 8 lines
Quoted 3 lines
I'm totally open to a better name.
Having a condition in there is really nice, it means we can fold theif()into it in many cases. Just likeBUG_ON()did.Alexey's
WARN_IF()would suit, I guess. Plain old "WARN" is just wrong here, alas.I can just edit all the diffs if we're all OK with that.
I'm ok with that.
Quoted 11 lines
I don't suppose there's any way of tricking the preprocessor into supporting
WARN_ON(foo == 42);as well as
WARN_ON(foo == 42, "bite me!");
there might be some obscure GCC extensions, but to be honest I fear the worst ;(
Signature · 3 lines
If you want to reach me at my work email, use [email protected] For development, discussion and tips for power savings, visit http://www.lesswatts.org
Re: [patch 13/17] Use WARN() in drivers/base/
In reply to Andrew MortonQuoted 10 lines · On Fri, 11 Jul 2008 15:11:10 -0700 Andrew Morton <[email protected]>…
I don't suppose there's any way of tricking the preprocessor into supporting
WARN_ON(foo == 42);as well as
WARN_ON(foo == 42, "bite me!");
after reading preprocessor docs from gcc and trying some things:
We can do this. It comes at a price: the price is a blank line in the WARN trace for the "no printk comments" case, and we lose the ability to override the printk level. (which you can argue is a feature by just setting it to KERN_WARNING).
(and some interesting but otherwise non-harmful preprocessor stuff in headers)
Is this is price worth paying to not have a second macro?
Signature · 3 lines
If you want to reach me at my work email, use [email protected] For development, discussion and tips for power savings, visit http://www.lesswatts.org
Andrew Morton
maintainerRe: [patch 13/17] Use WARN() in drivers/base/
Quoted 14 lines · On Fri, 11 Jul 2008 15:51:05 -0700 Arjan van de Ven <[email protected]> wrote:
Quoted 10 lines · On Fri, 11 Jul 2008 15:11:10 -0700 Andrew Morton <[email protected]>…
I don't suppose there's any way of tricking the preprocessor into supporting
WARN_ON(foo == 42);as well as
WARN_ON(foo == 42, "bite me!");
Quoted 8 lines
after reading preprocessor docs from gcc and trying some things:
We can do this. It comes at a price: the price is a blank line in the WARN trace for the "no printk comments" case, and we lose the ability to override the printk level. (which you can argue is a feature by just setting it toKERN_WARNING).(and some interesting but otherwise non-harmful preprocessor stuff in headers)
the blank line: might be avoidable by doing some extra work at runtime to recognise its presence?
overriding facility level: doesn't sound very useful, as WARN()'s stack-trace's facility level is not controllable.
Quoted 1 line
Is this is price worth paying to not have a second macro?
Dunno, how ugly is the patch?
It would be rather nice to not go and fatten the interface. Would there be additional text or data size costs?
Re: [patch 13/17] Use WARN() in drivers/base/
Quoted 23 lines · On Fri, 11 Jul 2008 16:02:13 -0700 Andrew Morton <[email protected]>…
Quoted 20 lines · On Fri, 11 Jul 2008 15:51:05 -0700 Arjan van de Ven <[email protected]> wrote:
Quoted 10 lines · On Fri, 11 Jul 2008 15:11:10 -0700 Andrew Morton <[email protected]>…
I don't suppose there's any way of tricking the preprocessor into supporting
WARN_ON(foo == 42);as well as
WARN_ON(foo == 42, "bite me!");after reading preprocessor docs from gcc and trying some things:
We can do this. It comes at a price: the price is a blank line in the WARN trace for the "no printk comments" case, and we lose the ability to override the printk level. (which you can argue is a feature by just setting it toKERN_WARNING).
Quoted 5 lines
Quoted 2 lines
(and some interesting but otherwise non-harmful preprocessor stuff in headers)
the blank line: might be avoidable by doing some extra work at runtime to recognise its presence?
probably (but vararg stuff is weird)
Quoted 3 lines
overriding facility level: doesn't sound very useful, as WARN()'s stack-trace's facility level is not controllable.
ok
Quoted 4 lines
Quoted 2 lines
Is this is price worth paying to not have a second macro?
Dunno, how ugly is the patch?
it's not too bad ;) I'll turn the userland experiment into a kernel patch tomorrow or so
Quoted 3 lines
It would be rather nice to not go and fatten the interface. Would there be additional text or data size costs?
there will be a few bytes of text in the out of line implementation; I'm not too worried about that.
There shouldn't be a per-instance overhead
Signature · 3 lines
If you want to reach me at my work email, use [email protected] For development, discussion and tips for power savings, visit http://www.lesswatts.org
Re: [patch 13/17] Use WARN() in drivers/base/
In reply to Andrew MortonQuoted 9 lines
I don't suppose there's any way of tricking the preprocessor into supporting
WARN_ON(foo == 42);as well as
WARN_ON(foo == 42, "bite me!");
Here's one that abuses variadic macros and limits the number of arguments to 19.
#include <stdarg.h>
#include <stdio.h>
#define cnt(y...) _cnt( , ## y)
#define _cnt(y...) __cnt(y,19,18,17,16,15,14,13,12,11,10,9,8,7,6,5,4,3,2,1,0) #define __cnt(x0,x1,x2,x3,x4,x5,x6,x7,x8,x9,x10,x11,x12,x13,x14,x15,x16,x17,x18,x19,n,ys...) n
static void warn_on_slowpath(int argcount, ...)
{
va_list args;
char *fmt;
// print beginning of warning
if (argcount) {
va_start(args, count);
fmt = va_arg(args, char *);
vprintf(fmt, args);
va_end(args);
}
// print rest of warning
}#define WARN_ON(test, fmt...) \
do { \
if (test) { \
warn_on_slowpath(cnt(fmt) , ## fmt); \
printf("WARN\n"); \
} \} while (0)
int main(void)
{
WARN_ON(1);
WARN_ON(1, "asdf %d\n", 7);
return 0;
}johannes
Re: [patch 13/17] Use WARN() in drivers/base/
Quoted 8 lines
#define WARN_ON(test, fmt...) \ do { \ if (test) { \ warn_on_slowpath(cnt(fmt) , ## fmt); \ printf("WARN\n"); \ } \} while (0)
That doesn't play well with the bugtrap stuff, obviously. This one is a bit better, but still has more overhead than the bugtrap stuff, but avoids the overhead in the no-argument case.
#include <stdarg.h>
#include <stdio.h>
#define unlikely(x) (x)
#define hasargs(...) _hasargs( , ## __VA_ARGS__)
#define _hasargs(...) __hasargs(__VA_ARGS__,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0) #define __hasargs(x0,x1,x2,x3,x4,x5,x6,x7,x8,x9,x10,x11,x12,x13,x14,x15,x16,x17,x18,x19,n,ys...) n
static void warn_slowpath(int count, ...)
{
va_list args;
char *fmt;
printf("WARNING: <<\n");
if (count) {
va_start(args, count);
fmt = va_arg(args, char *);
vprintf(fmt, args);
va_end(args);
}
printf(">>\n");
}/*
* This is the original arch WARN_ON that just emits
* a trap instruction and a bugtrap section entry for
* example on powerpc.
*
* Obviously this isn't, but it could be.
*/
#define BUGTRAP_WARN_ON(test) ({ \
if (unlikely(test)) \
printf("WARNING: %s\n", #test); \
unlikely(test); \
})/*
* This is a WARN_ON for some other architectures that don't
* use the bugtrap section, it calls the slowpath function
* which leads to more code size. But when you've added
* parameters to your WARN_ON those need to be calculated
* as well so you've already increased code size. */
#define OUT_OF_LINE_WARN_ON(test, fmt...) ({ \
if (unlikely(test)) \
warn_slowpath(hasargs(fmt) , ## fmt); \
unlikely(test); \
})/*
* This new version determines whether to do a bugtrap
* entry or not depending on whether there were any extra
* arguments given.
*/
#define CONFIG_BUG_EXTRA_VERBOSE
#ifdef CONFIG_BUG_EXTRA_VERBOSE
#define WARN_ON(test, fmt...) ({ \
if (!hasargs(fmt)) \
BUGTRAP_WARN_ON(test); \
else \
OUT_OF_LINE_WARN_ON(test , ## fmt); \
})#else
#define WARN_ON(test, fmt...) BUGTRAP_WARN_ON(test) #endif
int main(void)
{
WARN_ON(1);
WARN_ON(2, "asdf %d %d\n", 7, 8);
WARN_ON(3, "asdf\n");
return 0;
}PATCH 14/17 Use WARN() in lib/
In reply to Arjan van de VenFrom: Arjan van de Ven <[email protected]>
Subject: Use WARN instead of printk+WARN_ON in /lib
Use WARN() instead of a printk+WARN_ON() pair; this way the message becomes part of the warning section for better reporting/collection. In addition, one of the if() clauses collapes into the WARN() entirely now.
lib/debugobjects.c | 15 +++++---------- lib/iomap.c | 3 +-- lib/kobject_uevent.c | 6 ++---- lib/plist.c | 13 +++++++------ 4 files changed, 15 insertions(+), 22 deletions(-)
lib/debugobjects.c +5 -10
@@ -205,9 +205,8 @@ static void debug_print_object(struct deif (limit <5 && obj->descr != descr_test) { limit++; -printk (KERN_ERR "ODEBUG: %s %s object type: %s\n" , msg, +WARN (1 ,KERN_ERR "ODEBUG: %s %s object type: %s\n" , msg, obj_states[obj->state], obj->descr->name); -WARN_ON (1 ); } debug_objects_warnings++; }
@@ -735,26 +734,22 @@ check_results(void *addr, enum debug_obj obj =lookup_object (addr, db);if (!obj && state !=ODEBUG_STATE_NONE ) { -printk (KERN_ERR "ODEBUG: selftest object not found\n" ); -WARN_ON (1 ); +WARN (1 ,KERN_ERR "ODEBUG: selftest object not found\n" ); goto out; }if (obj && obj->state != state) { -printk (KERN_ERR "ODEBUG: selftest wrong state: %d != %d\n" , +WARN (1 ,KERN_ERR "ODEBUG: selftest wrong state: %d != %d\n" , obj->state, state); -WARN_ON (1 ); goto out; }if (fixups != debug_objects_fixups) { -printk (KERN_ERR "ODEBUG: selftest fixups failed %d != %d\n" , +WARN (1 ,KERN_ERR "ODEBUG: selftest fixups failed %d != %d\n" , fixups, debug_objects_fixups); -WARN_ON (1 ); goto out; }if (warnings != debug_objects_warnings) { -printk (KERN_ERR "ODEBUG: selftest warnings failed %d != %d\n" , +WARN (1 ,KERN_ERR "ODEBUG: selftest warnings failed %d != %d\n" , warnings, debug_objects_warnings); -WARN_ON (1 ); goto out; } res =0 ;
lib/iomap.c +1 -2
@@ -40,8 +40,7 @@ static void bad_io_access(unsigned longstatic int count =10 ;if (count) { count--; -printk (KERN_ERR "Bad IO access at port %#lx (%s)\n" , port, access); -WARN_ON (1 ); +WARN (1 ,KERN_ERR "Bad IO access at port %#lx (%s)\n" , port, access); } }
lib/kobject_uevent.c +2 -4
@@ -285,8 +285,7 @@ int add_uevent_var(struct kobj_uevent_enint len;if (env->envp_idx >=ARRAY_SIZE (env->envp)) { -printk (KERN_ERR "add_uevent_var: too many keys\n" ); -WARN_ON (1 ); +WARN (1 ,KERN_ERR "add_uevent_var: too many keys\n" );return -ENOMEM ; }
@@ -297,8 +296,7 @@ int add_uevent_var(struct kobj_uevent_enva_end (args);if (len >= (sizeof (env->buf) - env->buflen)) { -printk (KERN_ERR "add_uevent_var: buffer size too small\n" ); -WARN_ON (1 ); +WARN (1 ,KERN_ERR "add_uevent_var: buffer size too small\n" );return -ENOMEM ; }
lib/plist.c +7 -6
@@ -31,12 +31,13 @@static void plist_check_prev_next (struct list_head *t,struct list_head *p,struct list_head *n) { -if (n->prev != p || p->next != n) { -printk ("top: %p, n: %p, p: %p\n" , t, t->next, t->prev); -printk ("prev: %p, n: %p, p: %p\n" , p, p->next, p->prev); -printk ("next: %p, n: %p, p: %p\n" , n, n->next, n->prev); -WARN_ON (1 ); - } +WARN (n->prev != p || p->next != n, +"top: %p, n: %p, p: %p\n" +"prev: %p, n: %p, p: %p\n" +"next: %p, n: %p, p: %p\n" , + t, t->next, t->prev, + p, p->next, p->prev, + n, n->next, n->prev); }static void plist_check_list (struct list_head *top)
PATCH 15/17 Use WARN() in fs/
In reply to Arjan van de VenFrom: Arjan van de Ven <[email protected]>
Subject: Use WARN instead of printk+WARN_ON in fs/
Use WARN() instead of a printk+WARN_ON() pair; this way the message becomes part of the warning section for better reporting/collection.
--- fs/buffer.c | 3 +-- fs/namespace.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-)
fs/buffer.c +1 -2
@@ -1214,8 +1214,7 @@ void __brelse(struct buffer_head * buf)put_bh (buf);return ; } -printk (KERN_ERR "VFS: brelse: Trying to free free buffer\n" ); -WARN_ON (1 ); +WARN (1 ,KERN_ERR "VFS: brelse: Trying to free free buffer\n" ); }/*
fs/namespace.c +1 -2
@@ -309,10 +309,9 @@ static void handle_write_count_underflow*/ if ((atomic_read (&mnt->__mnt_writers) <0 ) && !(mnt->mnt_flags &MNT_IMBALANCED_WRITE_COUNT )) { -printk (KERN_DEBUG "leak detected on mount(%p) writers " +WARN (1 ,KERN_DEBUG "leak detected on mount(%p) writers " "count: %d\n" , mnt,atomic_read (&mnt->__mnt_writers)); -WARN_ON (1 );/* use the flag to keep the dmesg spam down */ mnt->mnt_flags |=MNT_IMBALANCED_WRITE_COUNT ; }
PATCH 15/17 Use WARN() in fs/
In reply to Arjan van de VenFrom: Arjan van de Ven <[email protected]>
Subject: Use WARN instead of printk+WARN_ON in fs/
Use WARN() instead of a printk+WARN_ON() pair; this way the message becomes part of the warning section for better reporting/collection.
--- fs/buffer.c | 3 +-- fs/namespace.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-)
fs/buffer.c +1 -2
@@ -1214,8 +1214,7 @@ void __brelse(struct buffer_head * buf)put_bh (buf);return ; } -printk (KERN_ERR "VFS: brelse: Trying to free free buffer\n" ); -WARN_ON (1 ); +WARN (1 ,KERN_ERR "VFS: brelse: Trying to free free buffer\n" ); }/*
fs/namespace.c +1 -2
@@ -309,10 +309,9 @@ static void handle_write_count_underflow*/ if ((atomic_read (&mnt->__mnt_writers) <0 ) && !(mnt->mnt_flags &MNT_IMBALANCED_WRITE_COUNT )) { -printk (KERN_DEBUG "leak detected on mount(%p) writers " +WARN (1 ,KERN_DEBUG "leak detected on mount(%p) writers " "count: %d\n" , mnt,atomic_read (&mnt->__mnt_writers)); -WARN_ON (1 );/* use the flag to keep the dmesg spam down */ mnt->mnt_flags |=MNT_IMBALANCED_WRITE_COUNT ; }
PATCH 15/17 Use WARN() in fs/
In reply to Arjan van de VenFrom: Arjan van de Ven <[email protected]>
Subject: Use WARN instead of printk+WARN_ON in fs/
Use WARN() instead of a printk+WARN_ON() pair; this way the message becomes part of the warning section for better reporting/collection.
--- fs/buffer.c | 3 +-- fs/namespace.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-)
fs/buffer.c +1 -2
@@ -1214,8 +1214,7 @@ void __brelse(struct buffer_head * buf)put_bh (buf);return ; } -printk (KERN_ERR "VFS: brelse: Trying to free free buffer\n" ); -WARN_ON (1 ); +WARN (1 ,KERN_ERR "VFS: brelse: Trying to free free buffer\n" ); }/*
fs/namespace.c +1 -2
@@ -309,10 +309,9 @@ static void handle_write_count_underflow*/ if ((atomic_read (&mnt->__mnt_writers) <0 ) && !(mnt->mnt_flags &MNT_IMBALANCED_WRITE_COUNT )) { -printk (KERN_DEBUG "leak detected on mount(%p) writers " +WARN (1 ,KERN_DEBUG "leak detected on mount(%p) writers " "count: %d\n" , mnt,atomic_read (&mnt->__mnt_writers)); -WARN_ON (1 );/* use the flag to keep the dmesg spam down */ mnt->mnt_flags |=MNT_IMBALANCED_WRITE_COUNT ; }
PATCH 16/17 Usr WARN() in fs/sysfs
In reply to Arjan van de VenFrom: Arjan van de Ven <[email protected]>
Subject: Use WARN() instead of printk+WARN_ON in fs/sysfs
Use WARN() instead of a printk+WARN_ON() pair; this way the message becomes part of the warning section for better reporting/collection. Also, with this, one fo the if() sections collapses entirely into the WARN().
--- fs/sysfs/dir.c | 5 +---- fs/sysfs/file.c | 3 +-- fs/sysfs/group.c | 3 +-- 3 files changed, 3 insertions(+), 8 deletions(-)
fs/sysfs/dir.c +1 -4
@@ -459,11 +459,8 @@ int sysfs_add_one(struct sysfs_addrm_cxtint ret; ret =__sysfs_add_one (acxt, sd); -if (ret == -EEXIST ) { -printk (KERN_WARNING "sysfs: duplicate filename '%s' " +WARN (ret == -EEXIST ,KERN_WARNING "sysfs: duplicate filename '%s' " "can not be created\n" , sd->s_name); -WARN_ON (1 ); - }return ret; }
fs/sysfs/file.c +1 -2
@@ -350,9 +350,8 @@ static int sysfs_open_file(struct inodeif (kobj->ktype && kobj->ktype->sysfs_ops) ops = kobj->ktype->sysfs_ops;else { -printk (KERN_ERR "missing sysfs attribute operations for " +WARN (1 ,KERN_ERR "missing sysfs attribute operations for " "kobject: %s\n" ,kobject_name (kobj)); -WARN_ON (1 ); goto err_out; }
fs/sysfs/group.c +1 -2
@@ -134,9 +134,8 @@ void sysfs_remove_group(struct kobject *if (grp->name) { sd =sysfs_get_dirent (dir_sd, grp->name);if (!sd) { -printk (KERN_WARNING "sysfs group %p not found for " +WARN (!sd,KERN_WARNING "sysfs group %p not found for " "kobject '%s'\n" , grp,kobject_name (kobj)); -WARN_ON (!sd);return ; } }else
PATCH 17/17 Use WARN() in fs/proc/
In reply to Arjan van de VenFrom: Arjan van de Ven <[email protected]>
Subject: Use WARN() instead of printk+WARN_ON() in fs/procfs
Use WARN() instead of a printk+WARN_ON() pair; this way the message becomes part of the warning section for better reporting/collection. This way, the entire if() {} section can collapse into the WARN() as well.
Signed-off-by: Arjan van de VenIndex: linux.trees.git/fs/proc/generic.c
===================================================================
--- fs/proc/generic.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
fs/proc/generic.c +1 -4
@@ -792,12 +792,9 @@ continue_removing:if (S_ISDIR (de->mode)) parent->nlink--; de->nlink =0 ; -if (de->subdir) { -printk (KERN_WARNING "%s: removing non-empty directory " +WARN (de->subdir,KERN_WARNING "%s: removing non-empty directory " "'%s/%s', leaking at least '%s'\n" , __func__, de->parent->name, de->name, de->subdir->name); -WARN_ON (1 ); - }if (atomic_dec_and_test (&de->count))free_proc_entry (de); }
Quoted 11 lines · Arjan van de Ven
Hi,
This patch series introduces
WARN(), which is aWARN_ON()variant that takesprintk()like arguments. This was done after both akpm and I hit several cases where this would have been useful; in addition, withWARN(), we put the printk string inside the -----[ cut here ]----- section, making it more likely that users (and tools like kerneloops) pick up the message in addition to just the bare WARNING.The first few patches have been in -mm for a long time; the later ones are newer and introduce more users of
WARN().
i've created a new -git based topic branch in tip/core/warn-API and picked up your patches:
Arjan van de Ven (16):
full tree: clear the WARN() namespace
core: add a WARN() macro that acts like WARN_ON()+printk
kobject: introduce WARN() usage in the kobject code
irq: use WARN() in kernel/irq/manage.c
mm: use WARN() in mm/vmalloc.c
lockdep: use WARN() in kernel/lockdep.c
irq: use WARN() in kernel/irq/chip.c
x86: use WARN() in arch/x86/mm/ioremap.c
x86: use WARN() in arch/x86/mm/pageattr.c
x86: use WARN() in arch/x86/kernel
block: use WARN() in block/
driver core: use WARN() in drivers/base/
core libs: use WARN() in lib/
fs: use WARN() in fs/
sysfs: use WARN() in fs/sysfs
procfs: use WARN() in fs/proc/
it can be picked up via:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git core/warn-API
( Note, i added a few more tree-wide namespace preparation fixes to the
first patch - a few more came in since you first prepared this patch i guess. )
Ingo
Andrew Morton
maintainerQuoted 9 lines · On Wed, 9 Jul 2008 12:13:48 +0200 Ingo Molnar <[email protected]> wrote:
Quoted 9 lines
Hi,
This patch series introduces
WARN(), which is aWARN_ON()variant that takesprintk()like arguments. This was done after both akpm and I hit several cases where this would have been useful; in addition, withWARN(), we put the printk string inside the -----[ cut here ]----- section, making it more likely that users (and tools like kerneloops) pick up the message in addition to just the bare WARNING.
Quoted 5 lines
Quoted 2 lines
The first few patches have been in -mm for a long time; the later ones are newer and introduce more users of
WARN().i've created a new -git based topic branch in tip/core/warn-API and picked up your patches:
um, why?
If you merge this into linux-next then it will trash already-merged patches in -mm and, more particularly, it will trash other trees which you aren't looking at, causing Stephen problems.
The way to merge this code is to get the base patches into mainline and then trickle the dependent patches into subsystem trees, or direct into mainline after the subsystem trees have merged, and with suitable acks.
You aren't set up to do that?
Quoted 11 lines · Andrew Morton
Quoted 5 lines
Quoted 2 lines
The first few patches have been in -mm for a long time; the later ones are newer and introduce more users of
WARN().i've created a new -git based topic branch in tip/core/warn-API and picked up your patches:
um, why?
If you merge this into linux-next then it will trash already-merged patches in -mm and, more particularly, it will trash other trees which you aren't looking at, causing Stephen problems.
no, i didnt plan to push this towards linux-next - given the broad consensus and given the wide spread of the changes.
I wanted to wait with this until the end of the merge window and keep it tested and merged up nicely. I.e. zero maintenance overhead to subsystems.
Quoted 6 lines
The way to merge this code is to get the base patches into mainline and then trickle the dependent patches into subsystem trees, or direct into mainline after the subsystem trees have merged, and with suitable acks.
You aren't set up to do that?
i think it's better to just go through the merge window i believe, and then do this atomically in one correct and tested step, when all subsystem trees are at their minimum size and there's virtually no collisions.
Note that this situation is special: this is a patchset that has virtually no functionality side-effects, and hence can be done 100% correctly, i thought the atomic step was the right approach.
For anything semantically meaningful i too would do the spread-out gradual approach (and i'm presently doing that for a number of topics).
But if you'd like to do this the spread-out way then sure, and i will drop this tree. ( if you do that then please import the commits from tip/core/warn-API, i fixed a couple of of typos in the commit messages and did some merging and extensions as well. The tree also passed a fair amount of testing meanwhile as well. )
Anyway, your call.
Ingo
Andrew Morton
maintainerQuoted 9 lines · On Wed, 9 Jul 2008 13:37:03 +0200 Ingo Molnar <[email protected]> wrote:
Quoted 6 lines · Andrew Morton
Quoted 5 lines
Quoted 2 lines
The first few patches have been in -mm for a long time; the later ones are newer and introduce more users of
WARN().i've created a new -git based topic branch in tip/core/warn-API and picked up your patches:
Quoted 8 lines
Quoted 5 lines
um, why?
If you merge this into linux-next then it will trash already-merged patches in -mm and, more particularly, it will trash other trees which you aren't looking at, causing Stephen problems.
no, i didnt plan to push this towards linux-next - given the broad consensus and given the wide spread of the changes.
Well, there was no way for me (or, I believe, Arjan or anyone else) to have worked this out from your reply.
Quoted 3 lines
I wanted to wait with this until the end of the merge window and keep it tested and merged up nicely. I.e. zero maintenance overhead to subsystems.
That's an option. That's why I will cc the relevant subsystem maintainers on the commits, and will collect and maintain the acked-by's.
Quoted 11 lines
Quoted 6 lines
The way to merge this code is to get the base patches into mainline and then trickle the dependent patches into subsystem trees, or direct into mainline after the subsystem trees have merged, and with suitable acks.
You aren't set up to do that?
i think it's better to just go through the merge window i believe, and then do this atomically in one correct and tested step, when all subsystem trees are at their minimum size and there's virtually no collisions.
Probably.
Quoted 7 lines
Note that this situation is special: this is a patchset that has virtually no functionality side-effects, and hence can be done 100% correctly, i thought the atomic step was the right approach.
For anything semantically meaningful i too would do the spread-out gradual approach (and i'm presently doing that for a number of topics).
Quoted 7 lines
But if you'd like to do this the spread-out way then sure, and i will drop this tree. ( if you do that then please import the commits from tip/core/warn-API, i fixed a couple of of typos in the commit messages and did some merging and extensions as well. The tree also passed a fair amount of testing meanwhile as well. )
Anyway, your call.
Well I haven't got onto processing these patches in detail yet. An open questions is why the damn thing was resubmitted from scratch when I've already merged it and fixed various rejects and had to fix several bugs in it. Do those rejects need to be re-fixed? Were my bugfixes folded back? I haven't looked yet. I'll need to generate the incremental diff and see what was done.
But if what you've merged was against mainline then it isn't terribly useful.
Hopefully this sort of thing won't happen as much once I get -mm into linx-next. Soon...
Quoted 23 lines · Andrew Morton
Quoted 8 lines
Note that this situation is special: this is a patchset that has virtually no functionality side-effects, and hence can be done 100% correctly, i thought the atomic step was the right approach.
For anything semantically meaningful i too would do the spread-out gradual approach (and i'm presently doing that for a number of topics).
Quoted 7 lines
But if you'd like to do this the spread-out way then sure, and i will drop this tree. ( if you do that then please import the commits from tip/core/warn-API, i fixed a couple of of typos in the commit messages and did some merging and extensions as well. The tree also passed a fair amount of testing meanwhile as well. )
Anyway, your call.
Well I haven't got onto processing these patches in detail yet. An open questions is why the damn thing was resubmitted from scratch when I've already merged it and fixed various rejects and had to fix several bugs in it. Do those rejects need to be re-fixed? Were my bugfixes folded back? I haven't looked yet. I'll need to generate the incremental diff and see what was done.
Quoted 2 lines
But if what you've merged was against mainline then it isn't terribly useful.
i cross-ported it from the linux-next base to -git base and the conflict fallout was minimal, well below 5% or so. I.e. the patches change long-existent warnings that have not changed in linux-next either.
About 30% of the changes in this patchset affect subsystems that i co-maintain, still tip/core/warn-API did a pure, conflict-free git-merge when it was applied ontop of all these subsystem trees:
commit 99eb83efbe2e3c12d26be22a032495ccddb36a2c
Merge: de67579... c2e0195...
Author: Ingo Molnar <[email protected]>
Date: Wed Jul 9 12:14:48 2008 +0200
Merge branch 'core/warn-API'
Hence my suggestion that this should be maintained and forward ported to the end of the merge window, in a separate, standalone tree that is -git based.
Anyway, no strong feelings, it's your call.
Ingo
Quoted 6 lines · On Wed, 9 Jul 2008 04:46:13 -0700 Andrew Morton <[email protected]>…
Well I haven't got onto processing these patches in detail yet. An open questions is why the damn thing was resubmitted from scratch when I've already merged it and fixed various rejects and had to fix several bugs in it. Do those rejects need to be re-fixed? Were my bugfixes folded back? I haven't looked yet. I'll need to generate the incremental diff and see what was done.
I started with the version in -mm (and had to do one reject fix against -next) with folding the 2 -fix's into it.
Signature · 3 lines
If you want to reach me at my work email, use [email protected] For development, discussion and tips for power savings, visit http://www.lesswatts.org