-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
- Loading branch information
Showing
26 changed files
with
1,538 additions
and
183 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -408,6 +408,7 @@ enum | |
| TCF_EM_NBYTE, | ||
| TCF_EM_U32, | ||
| TCF_EM_META, | ||
| TCF_EM_TEXT, | ||
| __TCF_EM_MAX | ||
| }; | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| #ifndef __LINUX_TC_EM_TEXT_H | ||
| #define __LINUX_TC_EM_TEXT_H | ||
|
|
||
| #include <linux/pkt_cls.h> | ||
|
|
||
| #define TC_EM_TEXT_ALGOSIZ 16 | ||
|
|
||
| struct tcf_em_text | ||
| { | ||
| char algo[TC_EM_TEXT_ALGOSIZ]; | ||
| __u16 from_offset; | ||
| __u16 to_offset; | ||
| __u16 pattern_len; | ||
| __u8 from_layer:4; | ||
| __u8 to_layer:4; | ||
| __u8 pad; | ||
| }; | ||
|
|
||
| #endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,180 @@ | ||
| #ifndef __LINUX_TEXTSEARCH_H | ||
| #define __LINUX_TEXTSEARCH_H | ||
|
|
||
| #ifdef __KERNEL__ | ||
|
|
||
| #include <linux/types.h> | ||
| #include <linux/list.h> | ||
| #include <linux/kernel.h> | ||
| #include <linux/module.h> | ||
| #include <linux/err.h> | ||
|
|
||
| struct ts_config; | ||
|
|
||
| /** | ||
| * TS_AUTOLOAD - Automatically load textsearch modules when needed | ||
| */ | ||
| #define TS_AUTOLOAD 1 | ||
|
|
||
| /** | ||
| * struct ts_state - search state | ||
| * @offset: offset for next match | ||
| * @cb: control buffer, for persistant variables of get_next_block() | ||
| */ | ||
| struct ts_state | ||
| { | ||
| unsigned int offset; | ||
| char cb[40]; | ||
| }; | ||
|
|
||
| /** | ||
| * struct ts_ops - search module operations | ||
| * @name: name of search algorithm | ||
| * @init: initialization function to prepare a search | ||
| * @find: find the next occurrence of the pattern | ||
| * @destroy: destroy algorithm specific parts of a search configuration | ||
| * @get_pattern: return head of pattern | ||
| * @get_pattern_len: return length of pattern | ||
| * @owner: module reference to algorithm | ||
| */ | ||
| struct ts_ops | ||
| { | ||
| const char *name; | ||
| struct ts_config * (*init)(const void *, unsigned int, int); | ||
| unsigned int (*find)(struct ts_config *, | ||
| struct ts_state *); | ||
| void (*destroy)(struct ts_config *); | ||
| void * (*get_pattern)(struct ts_config *); | ||
| unsigned int (*get_pattern_len)(struct ts_config *); | ||
| struct module *owner; | ||
| struct list_head list; | ||
| }; | ||
|
|
||
| /** | ||
| * struct ts_config - search configuration | ||
| * @ops: operations of chosen algorithm | ||
| * @get_next_block: callback to fetch the next block to search in | ||
| * @finish: callback to finalize a search | ||
| */ | ||
| struct ts_config | ||
| { | ||
| struct ts_ops *ops; | ||
|
|
||
| /** | ||
| * get_next_block - fetch next block of data | ||
| * @consumed: number of bytes consumed by the caller | ||
| * @dst: destination buffer | ||
| * @conf: search configuration | ||
| * @state: search state | ||
| * | ||
| * Called repeatedly until 0 is returned. Must assign the | ||
| * head of the next block of data to &*dst and return the length | ||
| * of the block or 0 if at the end. consumed == 0 indicates | ||
| * a new search. May store/read persistant values in state->cb. | ||
| */ | ||
| unsigned int (*get_next_block)(unsigned int consumed, | ||
| const u8 **dst, | ||
| struct ts_config *conf, | ||
| struct ts_state *state); | ||
|
|
||
| /** | ||
| * finish - finalize/clean a series of get_next_block() calls | ||
| * @conf: search configuration | ||
| * @state: search state | ||
| * | ||
| * Called after the last use of get_next_block(), may be used | ||
| * to cleanup any leftovers. | ||
| */ | ||
| void (*finish)(struct ts_config *conf, | ||
| struct ts_state *state); | ||
| }; | ||
|
|
||
| /** | ||
| * textsearch_next - continue searching for a pattern | ||
| * @conf: search configuration | ||
| * @state: search state | ||
| * | ||
| * Continues a search looking for more occurrences of the pattern. | ||
| * textsearch_find() must be called to find the first occurrence | ||
| * in order to reset the state. | ||
| * | ||
| * Returns the position of the next occurrence of the pattern or | ||
| * UINT_MAX if not match was found. | ||
| */ | ||
| static inline unsigned int textsearch_next(struct ts_config *conf, | ||
| struct ts_state *state) | ||
| { | ||
| unsigned int ret = conf->ops->find(conf, state); | ||
|
|
||
| if (conf->finish) | ||
| conf->finish(conf, state); | ||
|
|
||
| return ret; | ||
| } | ||
|
|
||
| /** | ||
| * textsearch_find - start searching for a pattern | ||
| * @conf: search configuration | ||
| * @state: search state | ||
| * | ||
| * Returns the position of first occurrence of the pattern or | ||
| * UINT_MAX if no match was found. | ||
| */ | ||
| static inline unsigned int textsearch_find(struct ts_config *conf, | ||
| struct ts_state *state) | ||
| { | ||
| state->offset = 0; | ||
| return textsearch_next(conf, state); | ||
| } | ||
|
|
||
| /** | ||
| * textsearch_get_pattern - return head of the pattern | ||
| * @conf: search configuration | ||
| */ | ||
| static inline void *textsearch_get_pattern(struct ts_config *conf) | ||
| { | ||
| return conf->ops->get_pattern(conf); | ||
| } | ||
|
|
||
| /** | ||
| * textsearch_get_pattern_len - return length of the pattern | ||
| * @conf: search configuration | ||
| */ | ||
| static inline unsigned int textsearch_get_pattern_len(struct ts_config *conf) | ||
| { | ||
| return conf->ops->get_pattern_len(conf); | ||
| } | ||
|
|
||
| extern int textsearch_register(struct ts_ops *); | ||
| extern int textsearch_unregister(struct ts_ops *); | ||
| extern struct ts_config *textsearch_prepare(const char *, const void *, | ||
| unsigned int, int, int); | ||
| extern void textsearch_destroy(struct ts_config *conf); | ||
| extern unsigned int textsearch_find_continuous(struct ts_config *, | ||
| struct ts_state *, | ||
| const void *, unsigned int); | ||
|
|
||
|
|
||
| #define TS_PRIV_ALIGNTO 8 | ||
| #define TS_PRIV_ALIGN(len) (((len) + TS_PRIV_ALIGNTO-1) & ~(TS_PRIV_ALIGNTO-1)) | ||
|
|
||
| static inline struct ts_config *alloc_ts_config(size_t payload, int gfp_mask) | ||
| { | ||
| struct ts_config *conf; | ||
|
|
||
| conf = kmalloc(TS_PRIV_ALIGN(sizeof(*conf)) + payload, gfp_mask); | ||
| if (conf == NULL) | ||
| return ERR_PTR(-ENOMEM); | ||
|
|
||
| memset(conf, 0, TS_PRIV_ALIGN(sizeof(*conf)) + payload); | ||
| return conf; | ||
| } | ||
|
|
||
| static inline void *ts_config_priv(struct ts_config *conf) | ||
| { | ||
| return ((u8 *) conf + TS_PRIV_ALIGN(sizeof(struct ts_config))); | ||
| } | ||
|
|
||
| #endif /* __KERNEL__ */ | ||
|
|
||
| #endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| #ifndef __LINUX_TEXTSEARCH_FSM_H | ||
| #define __LINUX_TEXTSEARCH_FSM_H | ||
|
|
||
| #include <linux/types.h> | ||
|
|
||
| enum { | ||
| TS_FSM_SPECIFIC, /* specific character */ | ||
| TS_FSM_WILDCARD, /* any character */ | ||
| TS_FSM_DIGIT, /* isdigit() */ | ||
| TS_FSM_XDIGIT, /* isxdigit() */ | ||
| TS_FSM_PRINT, /* isprint() */ | ||
| TS_FSM_ALPHA, /* isalpha() */ | ||
| TS_FSM_ALNUM, /* isalnum() */ | ||
| TS_FSM_ASCII, /* isascii() */ | ||
| TS_FSM_CNTRL, /* iscntrl() */ | ||
| TS_FSM_GRAPH, /* isgraph() */ | ||
| TS_FSM_LOWER, /* islower() */ | ||
| TS_FSM_UPPER, /* isupper() */ | ||
| TS_FSM_PUNCT, /* ispunct() */ | ||
| TS_FSM_SPACE, /* isspace() */ | ||
| __TS_FSM_TYPE_MAX, | ||
| }; | ||
| #define TS_FSM_TYPE_MAX (__TS_FSM_TYPE_MAX - 1) | ||
|
|
||
| enum { | ||
| TS_FSM_SINGLE, /* 1 occurrence */ | ||
| TS_FSM_PERHAPS, /* 1 or 0 occurrence */ | ||
| TS_FSM_ANY, /* 0..n occurrences */ | ||
| TS_FSM_MULTI, /* 1..n occurrences */ | ||
| TS_FSM_HEAD_IGNORE, /* 0..n ignored occurrences at head */ | ||
| __TS_FSM_RECUR_MAX, | ||
| }; | ||
| #define TS_FSM_RECUR_MAX (__TS_FSM_RECUR_MAX - 1) | ||
|
|
||
| /** | ||
| * struct ts_fsm_token - state machine token (state) | ||
| * @type: type of token | ||
| * @recur: number of recurrences | ||
| * @value: character value for TS_FSM_SPECIFIC | ||
| */ | ||
| struct ts_fsm_token | ||
| { | ||
| __u16 type; | ||
| __u8 recur; | ||
| __u8 value; | ||
| }; | ||
|
|
||
| #endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.