5a0e3ad6af
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>
212 lines
5.5 KiB
C
212 lines
5.5 KiB
C
/*
|
|
* llc_input.c - Minimal input path for LLC
|
|
*
|
|
* Copyright (c) 1997 by Procom Technology, Inc.
|
|
* 2001-2003 by Arnaldo Carvalho de Melo <acme@conectiva.com.br>
|
|
*
|
|
* This program can be redistributed or modified under the terms of the
|
|
* GNU General Public License as published by the Free Software Foundation.
|
|
* This program is distributed without any warranty or implied warranty
|
|
* of merchantability or fitness for a particular purpose.
|
|
*
|
|
* See the GNU General Public License for more details.
|
|
*/
|
|
#include <linux/netdevice.h>
|
|
#include <linux/slab.h>
|
|
#include <net/net_namespace.h>
|
|
#include <net/llc.h>
|
|
#include <net/llc_pdu.h>
|
|
#include <net/llc_sap.h>
|
|
|
|
#if 0
|
|
#define dprintk(args...) printk(KERN_DEBUG args)
|
|
#else
|
|
#define dprintk(args...)
|
|
#endif
|
|
|
|
/*
|
|
* Packet handler for the station, registerable because in the minimal
|
|
* LLC core that is taking shape only the very minimal subset of LLC that
|
|
* is needed for things like IPX, Appletalk, etc will stay, with all the
|
|
* rest in the llc1 and llc2 modules.
|
|
*/
|
|
static void (*llc_station_handler)(struct sk_buff *skb);
|
|
|
|
/*
|
|
* Packet handlers for LLC_DEST_SAP and LLC_DEST_CONN.
|
|
*/
|
|
static void (*llc_type_handlers[2])(struct llc_sap *sap,
|
|
struct sk_buff *skb);
|
|
|
|
void llc_add_pack(int type, void (*handler)(struct llc_sap *sap,
|
|
struct sk_buff *skb))
|
|
{
|
|
if (type == LLC_DEST_SAP || type == LLC_DEST_CONN)
|
|
llc_type_handlers[type - 1] = handler;
|
|
}
|
|
|
|
void llc_remove_pack(int type)
|
|
{
|
|
if (type == LLC_DEST_SAP || type == LLC_DEST_CONN)
|
|
llc_type_handlers[type - 1] = NULL;
|
|
}
|
|
|
|
void llc_set_station_handler(void (*handler)(struct sk_buff *skb))
|
|
{
|
|
llc_station_handler = handler;
|
|
}
|
|
|
|
/**
|
|
* llc_pdu_type - returns which LLC component must handle for PDU
|
|
* @skb: input skb
|
|
*
|
|
* This function returns which LLC component must handle this PDU.
|
|
*/
|
|
static __inline__ int llc_pdu_type(struct sk_buff *skb)
|
|
{
|
|
int type = LLC_DEST_CONN; /* I-PDU or S-PDU type */
|
|
struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);
|
|
|
|
if ((pdu->ctrl_1 & LLC_PDU_TYPE_MASK) != LLC_PDU_TYPE_U)
|
|
goto out;
|
|
switch (LLC_U_PDU_CMD(pdu)) {
|
|
case LLC_1_PDU_CMD_XID:
|
|
case LLC_1_PDU_CMD_UI:
|
|
case LLC_1_PDU_CMD_TEST:
|
|
type = LLC_DEST_SAP;
|
|
break;
|
|
case LLC_2_PDU_CMD_SABME:
|
|
case LLC_2_PDU_CMD_DISC:
|
|
case LLC_2_PDU_RSP_UA:
|
|
case LLC_2_PDU_RSP_DM:
|
|
case LLC_2_PDU_RSP_FRMR:
|
|
break;
|
|
default:
|
|
type = LLC_DEST_INVALID;
|
|
break;
|
|
}
|
|
out:
|
|
return type;
|
|
}
|
|
|
|
/**
|
|
* llc_fixup_skb - initializes skb pointers
|
|
* @skb: This argument points to incoming skb
|
|
*
|
|
* Initializes internal skb pointer to start of network layer by deriving
|
|
* length of LLC header; finds length of LLC control field in LLC header
|
|
* by looking at the two lowest-order bits of the first control field
|
|
* byte; field is either 3 or 4 bytes long.
|
|
*/
|
|
static inline int llc_fixup_skb(struct sk_buff *skb)
|
|
{
|
|
u8 llc_len = 2;
|
|
struct llc_pdu_un *pdu;
|
|
|
|
if (unlikely(!pskb_may_pull(skb, sizeof(*pdu))))
|
|
return 0;
|
|
|
|
pdu = (struct llc_pdu_un *)skb->data;
|
|
if ((pdu->ctrl_1 & LLC_PDU_TYPE_MASK) == LLC_PDU_TYPE_U)
|
|
llc_len = 1;
|
|
llc_len += 2;
|
|
|
|
if (unlikely(!pskb_may_pull(skb, llc_len)))
|
|
return 0;
|
|
|
|
skb->transport_header += llc_len;
|
|
skb_pull(skb, llc_len);
|
|
if (skb->protocol == htons(ETH_P_802_2)) {
|
|
__be16 pdulen = eth_hdr(skb)->h_proto;
|
|
s32 data_size = ntohs(pdulen) - llc_len;
|
|
|
|
if (data_size < 0 ||
|
|
((skb_tail_pointer(skb) -
|
|
(u8 *)pdu) - llc_len) < data_size)
|
|
return 0;
|
|
if (unlikely(pskb_trim_rcsum(skb, data_size)))
|
|
return 0;
|
|
}
|
|
return 1;
|
|
}
|
|
|
|
/**
|
|
* llc_rcv - 802.2 entry point from net lower layers
|
|
* @skb: received pdu
|
|
* @dev: device that receive pdu
|
|
* @pt: packet type
|
|
*
|
|
* When the system receives a 802.2 frame this function is called. It
|
|
* checks SAP and connection of received pdu and passes frame to
|
|
* llc_{station,sap,conn}_rcv for sending to proper state machine. If
|
|
* the frame is related to a busy connection (a connection is sending
|
|
* data now), it queues this frame in the connection's backlog.
|
|
*/
|
|
int llc_rcv(struct sk_buff *skb, struct net_device *dev,
|
|
struct packet_type *pt, struct net_device *orig_dev)
|
|
{
|
|
struct llc_sap *sap;
|
|
struct llc_pdu_sn *pdu;
|
|
int dest;
|
|
int (*rcv)(struct sk_buff *, struct net_device *,
|
|
struct packet_type *, struct net_device *);
|
|
|
|
if (!net_eq(dev_net(dev), &init_net))
|
|
goto drop;
|
|
|
|
/*
|
|
* When the interface is in promisc. mode, drop all the crap that it
|
|
* receives, do not try to analyse it.
|
|
*/
|
|
if (unlikely(skb->pkt_type == PACKET_OTHERHOST)) {
|
|
dprintk("%s: PACKET_OTHERHOST\n", __func__);
|
|
goto drop;
|
|
}
|
|
skb = skb_share_check(skb, GFP_ATOMIC);
|
|
if (unlikely(!skb))
|
|
goto out;
|
|
if (unlikely(!llc_fixup_skb(skb)))
|
|
goto drop;
|
|
pdu = llc_pdu_sn_hdr(skb);
|
|
if (unlikely(!pdu->dsap)) /* NULL DSAP, refer to station */
|
|
goto handle_station;
|
|
sap = llc_sap_find(pdu->dsap);
|
|
if (unlikely(!sap)) {/* unknown SAP */
|
|
dprintk("%s: llc_sap_find(%02X) failed!\n", __func__,
|
|
pdu->dsap);
|
|
goto drop;
|
|
}
|
|
/*
|
|
* First the upper layer protocols that don't need the full
|
|
* LLC functionality
|
|
*/
|
|
rcv = rcu_dereference(sap->rcv_func);
|
|
if (rcv) {
|
|
struct sk_buff *cskb = skb_clone(skb, GFP_ATOMIC);
|
|
if (cskb)
|
|
rcv(cskb, dev, pt, orig_dev);
|
|
}
|
|
dest = llc_pdu_type(skb);
|
|
if (unlikely(!dest || !llc_type_handlers[dest - 1]))
|
|
goto drop_put;
|
|
llc_type_handlers[dest - 1](sap, skb);
|
|
out_put:
|
|
llc_sap_put(sap);
|
|
out:
|
|
return 0;
|
|
drop:
|
|
kfree_skb(skb);
|
|
goto out;
|
|
drop_put:
|
|
kfree_skb(skb);
|
|
goto out_put;
|
|
handle_station:
|
|
if (!llc_station_handler)
|
|
goto drop;
|
|
llc_station_handler(skb);
|
|
goto out;
|
|
}
|
|
|
|
EXPORT_SYMBOL(llc_add_pack);
|
|
EXPORT_SYMBOL(llc_remove_pack);
|
|
EXPORT_SYMBOL(llc_set_station_handler);
|