![Tejun Heo](/assets/img/avatar_default.png)
percpu.h is included by sched.h and module.h and thus ends up being included when building most .c files. percpu.h includes slab.h which in turn includes gfp.h making everything defined by the two files universally available and complicating inclusion dependencies. percpu.h -> slab.h dependency is about to be removed. Prepare for this change by updating users of gfp and slab facilities include those headers directly instead of assuming availability. As this conversion needs to touch large number of source files, the following script is used as the basis of conversion. http://userweb.kernel.org/~tj/misc/slabh-sweep.py The script does the followings. * Scan files for gfp and slab usages and update includes such that only the necessary includes are there. ie. if only gfp is used, gfp.h, if slab is used, slab.h. * When the script inserts a new include, it looks at the include blocks and try to put the new include such that its order conforms to its surrounding. It's put in the include block which contains core kernel includes, in the same order that the rest are ordered - alphabetical, Christmas tree, rev-Xmas-tree or at the end if there doesn't seem to be any matching order. * If the script can't find a place to put a new include (mostly because the file doesn't have fitting include block), it prints out an error message indicating which .h file needs to be added to the file. The conversion was done in the following steps. 1. The initial automatic conversion of all .c files updated slightly over 4000 files, deleting around 700 includes and adding ~480 gfp.h and ~3000 slab.h inclusions. The script emitted errors for ~400 files. 2. Each error was manually checked. Some didn't need the inclusion, some needed manual addition while adding it to implementation .h or embedding .c file was more appropriate for others. This step added inclusions to around 150 files. 3. The script was run again and the output was compared to the edits from #2 to make sure no file was left behind. 4. Several build tests were done and a couple of problems were fixed. e.g. lib/decompress_*.c used malloc/free() wrappers around slab APIs requiring slab.h to be added manually. 5. The script was run on all .h files but without automatically editing them as sprinkling gfp.h and slab.h inclusions around .h files could easily lead to inclusion dependency hell. Most gfp.h inclusion directives were ignored as stuff from gfp.h was usually wildly available and often used in preprocessor macros. Each slab.h inclusion directive was examined and added manually as necessary. 6. percpu.h was updated not to include slab.h. 7. Build test were done on the following configurations and failures were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my distributed build env didn't work with gcov compiles) and a few more options had to be turned off depending on archs to make things build (like ipr on powerpc/64 which failed due to missing writeq). * x86 and x86_64 UP and SMP allmodconfig and a custom test config. * powerpc and powerpc64 SMP allmodconfig * sparc and sparc64 SMP allmodconfig * ia64 SMP allmodconfig * s390 SMP allmodconfig * alpha SMP allmodconfig * um on x86_64 SMP allmodconfig 8. percpu.h modifications were reverted so that it could be applied as a separate patch and serve as bisection point. Given the fact that I had only a couple of failures from tests on step 6, I'm fairly confident about the coverage of this conversion patch. If there is a breakage, it's likely to be something in one of the arch headers which should be easily discoverable easily on most builds of the specific arch. Signed-off-by: Tejun Heo <tj@kernel.org> Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org> Cc: Ingo Molnar <mingo@redhat.com> Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
300 lines
6.9 KiB
C
300 lines
6.9 KiB
C
/*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* Copyright (C) Jonathan Naylor G4KLX (g4klx@g4klx.demon.co.uk)
|
|
*/
|
|
#include <linux/errno.h>
|
|
#include <linux/types.h>
|
|
#include <linux/socket.h>
|
|
#include <linux/in.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/jiffies.h>
|
|
#include <linux/timer.h>
|
|
#include <linux/string.h>
|
|
#include <linux/sockios.h>
|
|
#include <linux/net.h>
|
|
#include <linux/slab.h>
|
|
#include <net/ax25.h>
|
|
#include <linux/inet.h>
|
|
#include <linux/netdevice.h>
|
|
#include <linux/skbuff.h>
|
|
#include <net/sock.h>
|
|
#include <asm/system.h>
|
|
#include <linux/fcntl.h>
|
|
#include <linux/mm.h>
|
|
#include <linux/interrupt.h>
|
|
#include <linux/netfilter.h>
|
|
#include <net/rose.h>
|
|
|
|
static void rose_ftimer_expiry(unsigned long);
|
|
static void rose_t0timer_expiry(unsigned long);
|
|
|
|
static void rose_transmit_restart_confirmation(struct rose_neigh *neigh);
|
|
static void rose_transmit_restart_request(struct rose_neigh *neigh);
|
|
|
|
void rose_start_ftimer(struct rose_neigh *neigh)
|
|
{
|
|
del_timer(&neigh->ftimer);
|
|
|
|
neigh->ftimer.data = (unsigned long)neigh;
|
|
neigh->ftimer.function = &rose_ftimer_expiry;
|
|
neigh->ftimer.expires =
|
|
jiffies + msecs_to_jiffies(sysctl_rose_link_fail_timeout);
|
|
|
|
add_timer(&neigh->ftimer);
|
|
}
|
|
|
|
static void rose_start_t0timer(struct rose_neigh *neigh)
|
|
{
|
|
del_timer(&neigh->t0timer);
|
|
|
|
neigh->t0timer.data = (unsigned long)neigh;
|
|
neigh->t0timer.function = &rose_t0timer_expiry;
|
|
neigh->t0timer.expires =
|
|
jiffies + msecs_to_jiffies(sysctl_rose_restart_request_timeout);
|
|
|
|
add_timer(&neigh->t0timer);
|
|
}
|
|
|
|
void rose_stop_ftimer(struct rose_neigh *neigh)
|
|
{
|
|
del_timer(&neigh->ftimer);
|
|
}
|
|
|
|
void rose_stop_t0timer(struct rose_neigh *neigh)
|
|
{
|
|
del_timer(&neigh->t0timer);
|
|
}
|
|
|
|
int rose_ftimer_running(struct rose_neigh *neigh)
|
|
{
|
|
return timer_pending(&neigh->ftimer);
|
|
}
|
|
|
|
static int rose_t0timer_running(struct rose_neigh *neigh)
|
|
{
|
|
return timer_pending(&neigh->t0timer);
|
|
}
|
|
|
|
static void rose_ftimer_expiry(unsigned long param)
|
|
{
|
|
}
|
|
|
|
static void rose_t0timer_expiry(unsigned long param)
|
|
{
|
|
struct rose_neigh *neigh = (struct rose_neigh *)param;
|
|
|
|
rose_transmit_restart_request(neigh);
|
|
|
|
neigh->dce_mode = 0;
|
|
|
|
rose_start_t0timer(neigh);
|
|
}
|
|
|
|
/*
|
|
* Interface to ax25_send_frame. Changes my level 2 callsign depending
|
|
* on whether we have a global ROSE callsign or use the default port
|
|
* callsign.
|
|
*/
|
|
static int rose_send_frame(struct sk_buff *skb, struct rose_neigh *neigh)
|
|
{
|
|
ax25_address *rose_call;
|
|
ax25_cb *ax25s;
|
|
|
|
if (ax25cmp(&rose_callsign, &null_ax25_address) == 0)
|
|
rose_call = (ax25_address *)neigh->dev->dev_addr;
|
|
else
|
|
rose_call = &rose_callsign;
|
|
|
|
ax25s = neigh->ax25;
|
|
neigh->ax25 = ax25_send_frame(skb, 260, rose_call, &neigh->callsign, neigh->digipeat, neigh->dev);
|
|
if (ax25s)
|
|
ax25_cb_put(ax25s);
|
|
|
|
return (neigh->ax25 != NULL);
|
|
}
|
|
|
|
/*
|
|
* Interface to ax25_link_up. Changes my level 2 callsign depending
|
|
* on whether we have a global ROSE callsign or use the default port
|
|
* callsign.
|
|
*/
|
|
static int rose_link_up(struct rose_neigh *neigh)
|
|
{
|
|
ax25_address *rose_call;
|
|
ax25_cb *ax25s;
|
|
|
|
if (ax25cmp(&rose_callsign, &null_ax25_address) == 0)
|
|
rose_call = (ax25_address *)neigh->dev->dev_addr;
|
|
else
|
|
rose_call = &rose_callsign;
|
|
|
|
ax25s = neigh->ax25;
|
|
neigh->ax25 = ax25_find_cb(rose_call, &neigh->callsign, neigh->digipeat, neigh->dev);
|
|
if (ax25s)
|
|
ax25_cb_put(ax25s);
|
|
|
|
return (neigh->ax25 != NULL);
|
|
}
|
|
|
|
/*
|
|
* This handles all restart and diagnostic frames.
|
|
*/
|
|
void rose_link_rx_restart(struct sk_buff *skb, struct rose_neigh *neigh, unsigned short frametype)
|
|
{
|
|
struct sk_buff *skbn;
|
|
|
|
switch (frametype) {
|
|
case ROSE_RESTART_REQUEST:
|
|
rose_stop_t0timer(neigh);
|
|
neigh->restarted = 1;
|
|
neigh->dce_mode = (skb->data[3] == ROSE_DTE_ORIGINATED);
|
|
rose_transmit_restart_confirmation(neigh);
|
|
break;
|
|
|
|
case ROSE_RESTART_CONFIRMATION:
|
|
rose_stop_t0timer(neigh);
|
|
neigh->restarted = 1;
|
|
break;
|
|
|
|
case ROSE_DIAGNOSTIC:
|
|
printk(KERN_WARNING "ROSE: received diagnostic #%d - %02X %02X %02X\n", skb->data[3], skb->data[4], skb->data[5], skb->data[6]);
|
|
break;
|
|
|
|
default:
|
|
printk(KERN_WARNING "ROSE: received unknown %02X with LCI 000\n", frametype);
|
|
break;
|
|
}
|
|
|
|
if (neigh->restarted) {
|
|
while ((skbn = skb_dequeue(&neigh->queue)) != NULL)
|
|
if (!rose_send_frame(skbn, neigh))
|
|
kfree_skb(skbn);
|
|
}
|
|
}
|
|
|
|
/*
|
|
* This routine is called when a Restart Request is needed
|
|
*/
|
|
static void rose_transmit_restart_request(struct rose_neigh *neigh)
|
|
{
|
|
struct sk_buff *skb;
|
|
unsigned char *dptr;
|
|
int len;
|
|
|
|
len = AX25_BPQ_HEADER_LEN + AX25_MAX_HEADER_LEN + ROSE_MIN_LEN + 3;
|
|
|
|
if ((skb = alloc_skb(len, GFP_ATOMIC)) == NULL)
|
|
return;
|
|
|
|
skb_reserve(skb, AX25_BPQ_HEADER_LEN + AX25_MAX_HEADER_LEN);
|
|
|
|
dptr = skb_put(skb, ROSE_MIN_LEN + 3);
|
|
|
|
*dptr++ = AX25_P_ROSE;
|
|
*dptr++ = ROSE_GFI;
|
|
*dptr++ = 0x00;
|
|
*dptr++ = ROSE_RESTART_REQUEST;
|
|
*dptr++ = ROSE_DTE_ORIGINATED;
|
|
*dptr++ = 0;
|
|
|
|
if (!rose_send_frame(skb, neigh))
|
|
kfree_skb(skb);
|
|
}
|
|
|
|
/*
|
|
* This routine is called when a Restart Confirmation is needed
|
|
*/
|
|
static void rose_transmit_restart_confirmation(struct rose_neigh *neigh)
|
|
{
|
|
struct sk_buff *skb;
|
|
unsigned char *dptr;
|
|
int len;
|
|
|
|
len = AX25_BPQ_HEADER_LEN + AX25_MAX_HEADER_LEN + ROSE_MIN_LEN + 1;
|
|
|
|
if ((skb = alloc_skb(len, GFP_ATOMIC)) == NULL)
|
|
return;
|
|
|
|
skb_reserve(skb, AX25_BPQ_HEADER_LEN + AX25_MAX_HEADER_LEN);
|
|
|
|
dptr = skb_put(skb, ROSE_MIN_LEN + 1);
|
|
|
|
*dptr++ = AX25_P_ROSE;
|
|
*dptr++ = ROSE_GFI;
|
|
*dptr++ = 0x00;
|
|
*dptr++ = ROSE_RESTART_CONFIRMATION;
|
|
|
|
if (!rose_send_frame(skb, neigh))
|
|
kfree_skb(skb);
|
|
}
|
|
|
|
/*
|
|
* This routine is called when a Clear Request is needed outside of the context
|
|
* of a connected socket.
|
|
*/
|
|
void rose_transmit_clear_request(struct rose_neigh *neigh, unsigned int lci, unsigned char cause, unsigned char diagnostic)
|
|
{
|
|
struct sk_buff *skb;
|
|
unsigned char *dptr;
|
|
int len;
|
|
|
|
len = AX25_BPQ_HEADER_LEN + AX25_MAX_HEADER_LEN + ROSE_MIN_LEN + 3;
|
|
|
|
if ((skb = alloc_skb(len, GFP_ATOMIC)) == NULL)
|
|
return;
|
|
|
|
skb_reserve(skb, AX25_BPQ_HEADER_LEN + AX25_MAX_HEADER_LEN);
|
|
|
|
dptr = skb_put(skb, ROSE_MIN_LEN + 3);
|
|
|
|
*dptr++ = AX25_P_ROSE;
|
|
*dptr++ = ((lci >> 8) & 0x0F) | ROSE_GFI;
|
|
*dptr++ = ((lci >> 0) & 0xFF);
|
|
*dptr++ = ROSE_CLEAR_REQUEST;
|
|
*dptr++ = cause;
|
|
*dptr++ = diagnostic;
|
|
|
|
if (!rose_send_frame(skb, neigh))
|
|
kfree_skb(skb);
|
|
}
|
|
|
|
void rose_transmit_link(struct sk_buff *skb, struct rose_neigh *neigh)
|
|
{
|
|
unsigned char *dptr;
|
|
|
|
#if 0
|
|
if (call_fw_firewall(PF_ROSE, skb->dev, skb->data, NULL, &skb) != FW_ACCEPT) {
|
|
kfree_skb(skb);
|
|
return;
|
|
}
|
|
#endif
|
|
|
|
if (neigh->loopback) {
|
|
rose_loopback_queue(skb, neigh);
|
|
return;
|
|
}
|
|
|
|
if (!rose_link_up(neigh))
|
|
neigh->restarted = 0;
|
|
|
|
dptr = skb_push(skb, 1);
|
|
*dptr++ = AX25_P_ROSE;
|
|
|
|
if (neigh->restarted) {
|
|
if (!rose_send_frame(skb, neigh))
|
|
kfree_skb(skb);
|
|
} else {
|
|
skb_queue_tail(&neigh->queue, skb);
|
|
|
|
if (!rose_t0timer_running(neigh)) {
|
|
rose_transmit_restart_request(neigh);
|
|
neigh->dce_mode = 0;
|
|
rose_start_t0timer(neigh);
|
|
}
|
|
}
|
|
}
|