Commit Graph

207 Commits

Author SHA1 Message Date
logwang 7ed267a536 Merge pull request #64 from ppliu1979/master
Fix the wrong operator order in ff_rss_check function
2017-08-30 18:33:35 +08:00
ppliu1979 27fdd30224 Fix the wrong operator order in ff_rss_check function. 2017-08-30 18:29:03 +08:00
Peng Liu b1371608d2 Merge pull request #1 from F-Stack/master
merge new changes from f-stack
2017-08-30 18:21:57 +08:00
logwang a9e7dcf4da Fix ff_rss_check function bug.
1.Close #22.
2.Configure the HW indirection table when initializing port.
3.Use several LSBs of the rss hash result according to reta_size when
calculating queue index.
2017-08-28 17:12:07 +08:00
logwang e23c20de1e Merge pull request #61 from ppliu1979/master
fix a compile error in ngx_ff_channel.c
2017-08-25 19:07:25 +08:00
ppliu1979 a4079f754c fix a compile error in ngx_ff_channel.c 2017-08-25 19:03:59 +08:00
logwang 9335f1b92e Merge pull request #60 from nickcooper-zhangtonghao/master
Fix bug when using the redis
2017-08-25 15:20:40 +08:00
Tonghao Zhang a7b42f3d80 start: Support others args to apps.
Other arg is mostly configure file. And this
patch will support it. User can use the configure
file specified.

Signed-off-by: Tonghao Zhang <xiangxia.m.yue@gmail.com>
2017-08-25 00:11:21 -07:00
Tonghao Zhang f7ca998abb redis: Fix the bug which parsing arg ERRO.
For using the redis, we should allow users to configure
theirs configure file. Now fstack uses the options as below:
—-conf config.ini --proc-type= --proc-id=

And we should skip 4 args(including program name arg), not 3.

Use the redis-config-file:
bin/redis-server --conf config.ini \
	--proc-type=primary --proc-id=0 redis-3.2.8/redis.conf

Signed-off-by: Tonghao Zhang <xiangxia.m.yue@gmail.com>
2017-08-25 00:05:09 -07:00
logwang b892bbe044 Merge pull request #59 from isjy/master
user prosess lr->loop called every 100us when idle
2017-08-24 21:17:41 +08:00
Andy 8fecf4dd08 user prosess lr->loop called every 100us when idle 2017-08-24 07:41:07 -04:00
logwang a1720b1d7a Merge pull request #57 from isjy/master
add top tool
2017-08-24 19:12:24 +08:00
Andy e7741141d0 add top tool 2017-08-24 02:17:34 -04:00
logwang b14f72a480 Update doc/F-Stack_Nginx_APP_Guide.md 2017-08-23 17:23:21 +08:00
logwang 6a812e619b Merge branch 'master' of https://github.com/F-Stack/f-stack 2017-08-23 17:00:59 +08:00
logwang 406002113b Support nginx reload.
close #12.
For more details, see doc/F-Stack_Nginx_APP_Guide.md.
2017-08-23 16:54:32 +08:00
logwang 642d53f0d6 Merge pull request #58 from nickcooper-zhangtonghao/master
Fix bugs for f-stack when running in VMs.
2017-08-23 16:52:45 +08:00
Tonghao Zhang 830124b89c dpdk: Set default numa node for broken systems.
This bug has been fixed in dpdk upstream. But in the f-stack,
we should use it for voiding ERROR.

More info:
http://dpdk.org/browse/dpdk/commit/?id=8a04cb6125896e9ea25a4d15a316f0d873822c7b

Signed-off-by: Tonghao Zhang <xiangxia.m.yue@gmail.com>
2017-08-23 01:14:58 -07:00
Tonghao Zhang 2408588520 dpdk-if: Change the TX_QUEUE_SIZE to 512.
The ring length of some NIC devices(e.g vmxnet3 ) should be
between 512-4096. We should change the TX_QUEUE_SIZE from 256 to 512
and make sure we can use the f-stack in vmxnet3.

Signed-off-by: Tonghao Zhang <xiangxia.m.yue@gmail.com>
2017-08-23 01:09:32 -07:00
logwang 6adce16393 Merge pull request #55 from tenfyzhong/fix_doc
Fix doc.
2017-08-14 11:20:55 +08:00
tenfy 7330b870ca Fix doc.
The path `/data/f-stack/dpdk/x86_64-native-linuxapp-gcc/build/kmod`
should be `/data/f-stack/dpdk/x86_64-native-linuxapp-gcc/kmod`

Fixes #54
2017-08-11 14:39:33 +08:00
johnjiang 22efc75818 Update README.md 2017-08-09 17:41:58 +08:00
logwang 64abcf71e3 Add configuration item: vlan_strip 2017-08-09 16:52:16 +08:00
logwang 5825eee0c3 Optimize ngx_ff_module 2017-08-09 14:50:21 +08:00
logwang 615f2d3c02 Fix `ff_fdused_range` not work. 2017-08-08 23:47:38 +08:00
logwang a02c88d651 Simplify startup arguments and add ff_fdisused.
Changes:
1.Simplify f-stack startup arguments:"--conf, --proc-type, --proc-id".
2.add a function `ff_fdisused` to check if fd is used in f-stack.
2017-08-08 22:36:49 +08:00
johnjiang a090190f3c Update Launch_F-Stack_on_AWS_EC2_in_one_minute.md 2017-08-07 10:49:11 +08:00
johnjiang a8f819cc8a Merge pull request #52 from pkking/master
fix a typo
2017-08-07 10:40:20 +08:00
Li Chaoran cf42840965 fix a typo 2017-08-05 12:05:51 +08:00
logwang 7e048838a7 Add API: ff_gettimeofday.
Since f-stack run with polling mode, nginx will call gettimeofday every loop, and cost a lot.
With this commit, f-stack will update current timespec periodically in
ff_hardclock_job. And ff_gettimeofday will get this value.
In nginx, hijack gettimeofday to call ff_gettimeofday.
2017-08-04 18:04:43 +08:00
logwang 3cbf1fd344 Merge branch 'master' of https://github.com/F-Stack/f-stack 2017-08-04 11:43:25 +08:00
logwang a43cdca49a Fix #51: nginx readv errors.
When use nginx as a proxy, nginx error logs always print 'readv() failed
(9: Bad file descriptor) while reading upstream'.
In previous commit: 10c5711ed2, i removed
`readv`, caused this issue.
2017-08-04 11:24:40 +08:00
johnjiang 90a6589cca close ASLR 2017-08-03 16:06:25 +08:00
fengbojiang(姜凤波) 7544d3aff0 add test environment description 2017-07-25 18:06:31 +08:00
johnjiang 1ce9d61a4e Update Launch_F-Stack_on_AWS_EC2_in_one_minute.md 2017-07-11 11:36:28 +08:00
logwang c8722d26ac Fix KNI out of memory: a typo leads rte_mbuf leak. 2017-07-04 11:47:44 +08:00
logwang 408caf3346 Related #42: add a license for anet_ff.c. 2017-06-30 16:43:02 +08:00
logwang 5efe15ae45 Fix #42: add a license for ngx_ff_module.c.
Since ngx_ff_module.c was derived from nginx_ofp's ngx_ofp_module.c, but
according to #42, nginx_ofp's ngx_ofp_module.c may be derived from
opendp/dpdk-nginx's ans_module.c and nginx_ofp didn't have a license, so
add opendp/dpdk-nginx's license.
2017-06-29 12:56:18 +08:00
logwang 6b26207ec3 Nginx auto/make compatible with /bin/sh 2017-06-20 11:19:01 +08:00
logwang 10c5711ed2 Fix #38: nginx crash on Suse12.
The newer version of libcrypto will invoke read and close function when
dl_init, the real address of read/close function can’t be determined in
compilation phase and libcrypto will seek read/close symbol in ELF
files and other libraries. However nginx_fstack redefined these two
functions, this causes these symbols to be found in nginx_fstack. But the real read/close function is NULL before ff_mod_init, this leads to crash.

Changes:
1.if real_close is NULL, assign it with the address of close function in Glibc.
2.remove unnecessary read/readv/write.
2017-06-20 10:48:26 +08:00
logwang 3132126c98 Merge branch master of https://github.com/F-Stack/f-stack 2017-06-14 15:38:42 +08:00
logwang 144c6bcd95 Add tool: route.
This commit ports FreeBSD `route` to F-Stack, can be used to set the route
table.
2017-06-14 15:25:35 +08:00
logwang a2d49456a2 Merge pull request #37 from uvuv/devel
Epoll optimization: add ff_kevent_do_each()
2017-06-13 19:39:01 +08:00
Ron 850cbeb422 kevent copyout directly without 2017-06-13 19:26:38 +08:00
Ron 1a78ce8ea6 epoll optimization, add ff_kevent_do_each 2017-06-13 17:50:51 +08:00
logwang d5f5b02c2e Fix multi ports bug: the secondary processes will not start port correctly. 2017-06-13 17:14:49 +08:00
logwang 61a488cc9b Merge pull request #35 from uvuv/fstack-master
Fix: redis build failed because some files ignored by jemalloc/.gitignore.
2017-06-13 10:52:11 +08:00
Ron 12e31dcff6 Fix: redis build failed 2017-06-13 09:51:19 +08:00
root bed8feab33 fix KNI: Out of memory 2017-06-12 16:12:22 +08:00
logwang 488adaba23 Fix #28: opt_vlan.h is omitted by the previous commit. 2017-06-07 15:39:13 +08:00