mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 09:19:51 +00:00
![Kees Cook](/assets/img/avatar_default.png)
This converts all remaining setup_timer() calls that use a nested field to reach a struct timer_list. Coccinelle does not have an easy way to match multiple fields, so a new script is needed to change the matches of "&_E->_timer" into "&_E->_field1._timer" in all the rules. spatch --very-quiet --all-includes --include-headers \ -I ./arch/x86/include -I ./arch/x86/include/generated \ -I ./include -I ./arch/x86/include/uapi \ -I ./arch/x86/include/generated/uapi -I ./include/uapi \ -I ./include/generated/uapi --include ./include/linux/kconfig.h \ --dir . \ --cocci-file ~/src/data/timer_setup-2fields.cocci @fix_address_of depends@ expression e; @@ setup_timer( -&(e) +&e , ...) // Update any raw setup_timer() usages that have a NULL callback, but // would otherwise match change_timer_function_usage, since the latter // will update all function assignments done in the face of a NULL // function initialization in setup_timer(). @change_timer_function_usage_NULL@ expression _E; identifier _field1; identifier _timer; type _cast_data; @@ ( -setup_timer(&_E->_field1._timer, NULL, _E); +timer_setup(&_E->_field1._timer, NULL, 0); | -setup_timer(&_E->_field1._timer, NULL, (_cast_data)_E); +timer_setup(&_E->_field1._timer, NULL, 0); | -setup_timer(&_E._field1._timer, NULL, &_E); +timer_setup(&_E._field1._timer, NULL, 0); | -setup_timer(&_E._field1._timer, NULL, (_cast_data)&_E); +timer_setup(&_E._field1._timer, NULL, 0); ) @change_timer_function_usage@ expression _E; identifier _field1; identifier _timer; struct timer_list _stl; identifier _callback; type _cast_func, _cast_data; @@ ( -setup_timer(&_E->_field1._timer, _callback, _E); +timer_setup(&_E->_field1._timer, _callback, 0); | -setup_timer(&_E->_field1._timer, &_callback, _E); +timer_setup(&_E->_field1._timer, _callback, 0); | -setup_timer(&_E->_field1._timer, _callback, (_cast_data)_E); +timer_setup(&_E->_field1._timer, _callback, 0); | -setup_timer(&_E->_field1._timer, &_callback, (_cast_data)_E); +timer_setup(&_E->_field1._timer, _callback, 0); | -setup_timer(&_E->_field1._timer, (_cast_func)_callback, _E); +timer_setup(&_E->_field1._timer, _callback, 0); | -setup_timer(&_E->_field1._timer, (_cast_func)&_callback, _E); +timer_setup(&_E->_field1._timer, _callback, 0); | -setup_timer(&_E->_field1._timer, (_cast_func)_callback, (_cast_data)_E); +timer_setup(&_E->_field1._timer, _callback, 0); | -setup_timer(&_E->_field1._timer, (_cast_func)&_callback, (_cast_data)_E); +timer_setup(&_E->_field1._timer, _callback, 0); | -setup_timer(&_E._field1._timer, _callback, (_cast_data)_E); +timer_setup(&_E._field1._timer, _callback, 0); | -setup_timer(&_E._field1._timer, _callback, (_cast_data)&_E); +timer_setup(&_E._field1._timer, _callback, 0); | -setup_timer(&_E._field1._timer, &_callback, (_cast_data)_E); +timer_setup(&_E._field1._timer, _callback, 0); | -setup_timer(&_E._field1._timer, &_callback, (_cast_data)&_E); +timer_setup(&_E._field1._timer, _callback, 0); | -setup_timer(&_E._field1._timer, (_cast_func)_callback, (_cast_data)_E); +timer_setup(&_E._field1._timer, _callback, 0); | -setup_timer(&_E._field1._timer, (_cast_func)_callback, (_cast_data)&_E); +timer_setup(&_E._field1._timer, _callback, 0); | -setup_timer(&_E._field1._timer, (_cast_func)&_callback, (_cast_data)_E); +timer_setup(&_E._field1._timer, _callback, 0); | -setup_timer(&_E._field1._timer, (_cast_func)&_callback, (_cast_data)&_E); +timer_setup(&_E._field1._timer, _callback, 0); | _E->_field1._timer@_stl.function = _callback; | _E->_field1._timer@_stl.function = &_callback; | _E->_field1._timer@_stl.function = (_cast_func)_callback; | _E->_field1._timer@_stl.function = (_cast_func)&_callback; | _E._field1._timer@_stl.function = _callback; | _E._field1._timer@_stl.function = &_callback; | _E._field1._timer@_stl.function = (_cast_func)_callback; | _E._field1._timer@_stl.function = (_cast_func)&_callback; ) // callback(unsigned long arg) @change_callback_handle_cast depends on change_timer_function_usage@ identifier change_timer_function_usage._callback; identifier change_timer_function_usage._field1; identifier change_timer_function_usage._timer; type _origtype; identifier _origarg; type _handletype; identifier _handle; @@ void _callback( -_origtype _origarg +struct timer_list *t ) { ( ... when != _origarg _handletype *_handle = -(_handletype *)_origarg; +from_timer(_handle, t, _field1._timer); ... when != _origarg | ... when != _origarg _handletype *_handle = -(void *)_origarg; +from_timer(_handle, t, _field1._timer); ... when != _origarg | ... when != _origarg _handletype *_handle; ... when != _handle _handle = -(_handletype *)_origarg; +from_timer(_handle, t, _field1._timer); ... when != _origarg | ... when != _origarg _handletype *_handle; ... when != _handle _handle = -(void *)_origarg; +from_timer(_handle, t, _field1._timer); ... when != _origarg ) } // callback(unsigned long arg) without existing variable @change_callback_handle_cast_no_arg depends on change_timer_function_usage && !change_callback_handle_cast@ identifier change_timer_function_usage._callback; identifier change_timer_function_usage._field1; identifier change_timer_function_usage._timer; type _origtype; identifier _origarg; type _handletype; @@ void _callback( -_origtype _origarg +struct timer_list *t ) { + _handletype *_origarg = from_timer(_origarg, t, _field1._timer); + ... when != _origarg - (_handletype *)_origarg + _origarg ... when != _origarg } // Avoid already converted callbacks. @match_callback_converted depends on change_timer_function_usage && !change_callback_handle_cast && !change_callback_handle_cast_no_arg@ identifier change_timer_function_usage._callback; identifier t; @@ void _callback(struct timer_list *t) { ... } // callback(struct something *handle) @change_callback_handle_arg depends on change_timer_function_usage && !match_callback_converted && !change_callback_handle_cast && !change_callback_handle_cast_no_arg@ identifier change_timer_function_usage._callback; identifier change_timer_function_usage._field1; identifier change_timer_function_usage._timer; type _handletype; identifier _handle; @@ void _callback( -_handletype *_handle +struct timer_list *t ) { + _handletype *_handle = from_timer(_handle, t, _field1._timer); ... } // If change_callback_handle_arg ran on an empty function, remove // the added handler. @unchange_callback_handle_arg depends on change_timer_function_usage && change_callback_handle_arg@ identifier change_timer_function_usage._callback; identifier change_timer_function_usage._field1; identifier change_timer_function_usage._timer; type _handletype; identifier _handle; identifier t; @@ void _callback(struct timer_list *t) { - _handletype *_handle = from_timer(_handle, t, _field1._timer); } // We only want to refactor the setup_timer() data argument if we've found // the matching callback. This undoes changes in change_timer_function_usage. @unchange_timer_function_usage depends on change_timer_function_usage && !change_callback_handle_cast && !change_callback_handle_cast_no_arg && !change_callback_handle_arg@ expression change_timer_function_usage._E; identifier change_timer_function_usage._field1; identifier change_timer_function_usage._timer; identifier change_timer_function_usage._callback; type change_timer_function_usage._cast_data; @@ ( -timer_setup(&_E->_field1._timer, _callback, 0); +setup_timer(&_E->_field1._timer, _callback, (_cast_data)_E); | -timer_setup(&_E._field1._timer, _callback, 0); +setup_timer(&_E._field1._timer, _callback, (_cast_data)&_E); ) // If we fixed a callback from a .function assignment, fix the // assignment cast now. @change_timer_function_assignment depends on change_timer_function_usage && (change_callback_handle_cast || change_callback_handle_cast_no_arg || change_callback_handle_arg)@ expression change_timer_function_usage._E; identifier change_timer_function_usage._field1; identifier change_timer_function_usage._timer; identifier change_timer_function_usage._callback; type _cast_func; typedef TIMER_FUNC_TYPE; @@ ( _E->_field1._timer.function = -_callback +(TIMER_FUNC_TYPE)_callback ; | _E->_field1._timer.function = -&_callback +(TIMER_FUNC_TYPE)_callback ; | _E->_field1._timer.function = -(_cast_func)_callback; +(TIMER_FUNC_TYPE)_callback ; | _E->_field1._timer.function = -(_cast_func)&_callback +(TIMER_FUNC_TYPE)_callback ; | _E._field1._timer.function = -_callback +(TIMER_FUNC_TYPE)_callback ; | _E._field1._timer.function = -&_callback; +(TIMER_FUNC_TYPE)_callback ; | _E._field1._timer.function = -(_cast_func)_callback +(TIMER_FUNC_TYPE)_callback ; | _E._field1._timer.function = -(_cast_func)&_callback +(TIMER_FUNC_TYPE)_callback ; ) // Sometimes timer functions are called directly. Replace matched args. @change_timer_function_calls depends on change_timer_function_usage && (change_callback_handle_cast || change_callback_handle_cast_no_arg || change_callback_handle_arg)@ expression _E; identifier change_timer_function_usage._field1; identifier change_timer_function_usage._timer; identifier change_timer_function_usage._callback; type _cast_data; @@ _callback( ( -(_cast_data)_E +&_E->_field1._timer | -(_cast_data)&_E +&_E._field1._timer | -_E +&_E->_field1._timer ) ) // If a timer has been configured without a data argument, it can be // converted without regard to the callback argument, since it is unused. @match_timer_function_unused_data@ expression _E; identifier _field1; identifier _timer; identifier _callback; @@ ( -setup_timer(&_E->_field1._timer, _callback, 0); +timer_setup(&_E->_field1._timer, _callback, 0); | -setup_timer(&_E->_field1._timer, _callback, 0L); +timer_setup(&_E->_field1._timer, _callback, 0); | -setup_timer(&_E->_field1._timer, _callback, 0UL); +timer_setup(&_E->_field1._timer, _callback, 0); | -setup_timer(&_E._field1._timer, _callback, 0); +timer_setup(&_E._field1._timer, _callback, 0); | -setup_timer(&_E._field1._timer, _callback, 0L); +timer_setup(&_E._field1._timer, _callback, 0); | -setup_timer(&_E._field1._timer, _callback, 0UL); +timer_setup(&_E._field1._timer, _callback, 0); | -setup_timer(&_field1._timer, _callback, 0); +timer_setup(&_field1._timer, _callback, 0); | -setup_timer(&_field1._timer, _callback, 0L); +timer_setup(&_field1._timer, _callback, 0); | -setup_timer(&_field1._timer, _callback, 0UL); +timer_setup(&_field1._timer, _callback, 0); | -setup_timer(_field1._timer, _callback, 0); +timer_setup(_field1._timer, _callback, 0); | -setup_timer(_field1._timer, _callback, 0L); +timer_setup(_field1._timer, _callback, 0); | -setup_timer(_field1._timer, _callback, 0UL); +timer_setup(_field1._timer, _callback, 0); ) @change_callback_unused_data depends on match_timer_function_unused_data@ identifier match_timer_function_unused_data._callback; type _origtype; identifier _origarg; @@ void _callback( -_origtype _origarg +struct timer_list *unused ) { ... when != _origarg } Signed-off-by: Kees Cook <keescook@chromium.org>
198 lines
5.2 KiB
C
198 lines
5.2 KiB
C
/*
|
|
* Copyright (c) 2005 Cisco Systems. All rights reserved.
|
|
*
|
|
* This software is available to you under a choice of one of two
|
|
* licenses. You may choose to be licensed under the terms of the GNU
|
|
* General Public License (GPL) Version 2, available from the file
|
|
* COPYING in the main directory of this source tree, or the
|
|
* OpenIB.org BSD license below:
|
|
*
|
|
* Redistribution and use in source and binary forms, with or
|
|
* without modification, are permitted provided that the following
|
|
* conditions are met:
|
|
*
|
|
* - Redistributions of source code must retain the above
|
|
* copyright notice, this list of conditions and the following
|
|
* disclaimer.
|
|
*
|
|
* - Redistributions in binary form must reproduce the above
|
|
* copyright notice, this list of conditions and the following
|
|
* disclaimer in the documentation and/or other materials
|
|
* provided with the distribution.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
|
|
* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
|
|
* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
|
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
* SOFTWARE.
|
|
*/
|
|
|
|
#include <linux/jiffies.h>
|
|
#include <linux/module.h>
|
|
#include <linux/timer.h>
|
|
#include <linux/workqueue.h>
|
|
|
|
#include "mthca_dev.h"
|
|
|
|
enum {
|
|
MTHCA_CATAS_POLL_INTERVAL = 5 * HZ,
|
|
|
|
MTHCA_CATAS_TYPE_INTERNAL = 0,
|
|
MTHCA_CATAS_TYPE_UPLINK = 3,
|
|
MTHCA_CATAS_TYPE_DDR = 4,
|
|
MTHCA_CATAS_TYPE_PARITY = 5,
|
|
};
|
|
|
|
static DEFINE_SPINLOCK(catas_lock);
|
|
|
|
static LIST_HEAD(catas_list);
|
|
static struct workqueue_struct *catas_wq;
|
|
static struct work_struct catas_work;
|
|
|
|
static int catas_reset_disable;
|
|
module_param_named(catas_reset_disable, catas_reset_disable, int, 0644);
|
|
MODULE_PARM_DESC(catas_reset_disable, "disable reset on catastrophic event if nonzero");
|
|
|
|
static void catas_reset(struct work_struct *work)
|
|
{
|
|
struct mthca_dev *dev, *tmpdev;
|
|
LIST_HEAD(tlist);
|
|
int ret;
|
|
|
|
mutex_lock(&mthca_device_mutex);
|
|
|
|
spin_lock_irq(&catas_lock);
|
|
list_splice_init(&catas_list, &tlist);
|
|
spin_unlock_irq(&catas_lock);
|
|
|
|
list_for_each_entry_safe(dev, tmpdev, &tlist, catas_err.list) {
|
|
struct pci_dev *pdev = dev->pdev;
|
|
ret = __mthca_restart_one(dev->pdev);
|
|
/* 'dev' now is not valid */
|
|
if (ret)
|
|
printk(KERN_ERR "mthca %s: Reset failed (%d)\n",
|
|
pci_name(pdev), ret);
|
|
else {
|
|
struct mthca_dev *d = pci_get_drvdata(pdev);
|
|
mthca_dbg(d, "Reset succeeded\n");
|
|
}
|
|
}
|
|
|
|
mutex_unlock(&mthca_device_mutex);
|
|
}
|
|
|
|
static void handle_catas(struct mthca_dev *dev)
|
|
{
|
|
struct ib_event event;
|
|
unsigned long flags;
|
|
const char *type;
|
|
int i;
|
|
|
|
event.device = &dev->ib_dev;
|
|
event.event = IB_EVENT_DEVICE_FATAL;
|
|
event.element.port_num = 0;
|
|
dev->active = false;
|
|
|
|
ib_dispatch_event(&event);
|
|
|
|
switch (swab32(readl(dev->catas_err.map)) >> 24) {
|
|
case MTHCA_CATAS_TYPE_INTERNAL:
|
|
type = "internal error";
|
|
break;
|
|
case MTHCA_CATAS_TYPE_UPLINK:
|
|
type = "uplink bus error";
|
|
break;
|
|
case MTHCA_CATAS_TYPE_DDR:
|
|
type = "DDR data error";
|
|
break;
|
|
case MTHCA_CATAS_TYPE_PARITY:
|
|
type = "internal parity error";
|
|
break;
|
|
default:
|
|
type = "unknown error";
|
|
break;
|
|
}
|
|
|
|
mthca_err(dev, "Catastrophic error detected: %s\n", type);
|
|
for (i = 0; i < dev->catas_err.size; ++i)
|
|
mthca_err(dev, " buf[%02x]: %08x\n",
|
|
i, swab32(readl(dev->catas_err.map + i)));
|
|
|
|
if (catas_reset_disable)
|
|
return;
|
|
|
|
spin_lock_irqsave(&catas_lock, flags);
|
|
list_add(&dev->catas_err.list, &catas_list);
|
|
queue_work(catas_wq, &catas_work);
|
|
spin_unlock_irqrestore(&catas_lock, flags);
|
|
}
|
|
|
|
static void poll_catas(struct timer_list *t)
|
|
{
|
|
struct mthca_dev *dev = from_timer(dev, t, catas_err.timer);
|
|
int i;
|
|
|
|
for (i = 0; i < dev->catas_err.size; ++i)
|
|
if (readl(dev->catas_err.map + i)) {
|
|
handle_catas(dev);
|
|
return;
|
|
}
|
|
|
|
mod_timer(&dev->catas_err.timer,
|
|
round_jiffies(jiffies + MTHCA_CATAS_POLL_INTERVAL));
|
|
}
|
|
|
|
void mthca_start_catas_poll(struct mthca_dev *dev)
|
|
{
|
|
phys_addr_t addr;
|
|
|
|
timer_setup(&dev->catas_err.timer, poll_catas, 0);
|
|
dev->catas_err.map = NULL;
|
|
|
|
addr = pci_resource_start(dev->pdev, 0) +
|
|
((pci_resource_len(dev->pdev, 0) - 1) &
|
|
dev->catas_err.addr);
|
|
|
|
dev->catas_err.map = ioremap(addr, dev->catas_err.size * 4);
|
|
if (!dev->catas_err.map) {
|
|
mthca_warn(dev, "couldn't map catastrophic error region "
|
|
"at 0x%llx/0x%x\n", (unsigned long long) addr,
|
|
dev->catas_err.size * 4);
|
|
return;
|
|
}
|
|
|
|
dev->catas_err.timer.expires = jiffies + MTHCA_CATAS_POLL_INTERVAL;
|
|
INIT_LIST_HEAD(&dev->catas_err.list);
|
|
add_timer(&dev->catas_err.timer);
|
|
}
|
|
|
|
void mthca_stop_catas_poll(struct mthca_dev *dev)
|
|
{
|
|
del_timer_sync(&dev->catas_err.timer);
|
|
|
|
if (dev->catas_err.map)
|
|
iounmap(dev->catas_err.map);
|
|
|
|
spin_lock_irq(&catas_lock);
|
|
list_del(&dev->catas_err.list);
|
|
spin_unlock_irq(&catas_lock);
|
|
}
|
|
|
|
int __init mthca_catas_init(void)
|
|
{
|
|
INIT_WORK(&catas_work, catas_reset);
|
|
|
|
catas_wq = alloc_ordered_workqueue("mthca_catas", WQ_MEM_RECLAIM);
|
|
if (!catas_wq)
|
|
return -ENOMEM;
|
|
|
|
return 0;
|
|
}
|
|
|
|
void mthca_catas_cleanup(void)
|
|
{
|
|
destroy_workqueue(catas_wq);
|
|
}
|