Update snull #49
Update snull #49
Conversation
There was a problem hiding this comment.
@jypan-ccu thanks for your contribution! I've made a few changes to support 5.4 kernels on https://github.com/martinezjavier/ldd3/tree/jypan-ccu-update_snull%2Bfixes. Please give this a try and if this works for you I will merge it instead of your branch since I have found some compile issues on 5.4 kernels with this branch.
|
|
||
| /* | ||
| * The I/O queue, depending on whether we are using our own | ||
| * make_request function or not. | ||
| */ | ||
| switch (request_mode) { | ||
| case RM_NOQUEUE: | ||
| dev->queue = blk_alloc_queue(GFP_KERNEL); | ||
| //dev->queue = blk_alloc_queue(GFP_KERNEL); | ||
| dev->queue = blk_alloc_queue(sbull_make_request, NUMA_NO_NODE); |
There was a problem hiding this comment.
@jypan-ccu this logic fails for me on a 5.4 Ubuntu kernel with:
/home/yocto/aesd/ldd3/sbull/sbull.c:410:33: warning: passing argument 1 of ‘blk_alloc_queue’ makes integer from pointer without a cast [-Wint-conversion]
dev->queue = blk_alloc_queue(sbull_make_request, NUMA_NO_NODE);
^~~~~~~~~~~~~~~~~~
In file included from ./include/linux/blk-mq.h:5:0,
from /home/yocto/aesd/ldd3/sbull/sbull.c:6:
./include/linux/blkdev.h:1146:23: note: expected ‘gfp_t {aka unsigned int}’ but argument is of type ‘blk_qc_t (*)(struct request_queue *, struct bio *) {aka unsigned int (*)(struct request_queue *, struct bio *)}’
struct request_queue *blk_alloc_queue(gfp_t);
^~~~~~~~~~~~~~~
/home/yocto/aesd/ldd3/sbull/sbull.c:410:17: error: too many arguments to function ‘blk_alloc_queue’
dev->queue = blk_alloc_queue(sbull_make_request, NUMA_NO_NODE);
^~~~~~~~~~~~~~~
In file included from ./include/linux/blk-mq.h:5:0,
from /home/yocto/aesd/ldd3/sbull/sbull.c:6:
./include/linux/blkdev.h:1146:23: note: declared here
struct request_queue *blk_alloc_queue(gfp_t);
^~~~~~~~~~~~~~~
I tried using the logic at openzfs/zfs#10187 instead, this compiled successfully for me. Can you verify this works? See 4a91477
There was a problem hiding this comment.
Perfect! It works.
| @@ -90,7 +90,8 @@ struct snull_priv { | |||
| struct napi_struct napi; | |||
| }; | |||
|
|
|||
| static void snull_tx_timeout(struct net_device *dev); | |||
| //static void snull_tx_timeout(struct net_device *dev); | |||
There was a problem hiding this comment.
@jypan-ccu this logic also fails on 5.4 kernel builds. I've addressed with 4a91477
There was a problem hiding this comment.
Perfect! It works, except the git program is complicated for me.
|
Committed with #51 |
Modify sbull and snull, and tested them.
You can check with more tests