summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--staging/layer1.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/staging/layer1.c b/staging/layer1.c
index a1ca417..bf00a52 100644
--- a/staging/layer1.c
+++ b/staging/layer1.c
@@ -58,7 +58,8 @@ int send_eth(void)
j=0;
char
err_buf[LIBNET_ERRBUF_SIZE],
- message[MAX_PAYLOAD_SIZE*3];
+ message[MAX_PAYLOAD_SIZE*3],
+ argval[MAX_PAYLOAD_SIZE*2];
u_int8_t bytestring[MAX_PAYLOAD_SIZE];
libnet_ptag_t t;
@@ -100,7 +101,10 @@ int send_eth(void)
// Create a temporal, local bytestring:
//
for (i=0; i<MAX_PAYLOAD_SIZE; i++) bytestring[i]=0x00;
- bytestring_s = str2hex (tx.arg_string, bytestring, MAX_PAYLOAD_SIZE);
+ if ( (getarg(tx.arg_string,"payload", argval)==1) || (getarg(tx.arg_string,"p", argval)==1))
+ {
+ bytestring_s = str2hex (argval, bytestring, MAX_PAYLOAD_SIZE);
+ }
// Set the flags to shorten subsequent decisions:
src = strlen(tx.eth_src_txt);
mq_freeze_queue_wait where percpu_ref_kill (blk_mq_freeze_queue_start) raced with percpu_ref_tryget (blk_mq_timeout_work). Sample stack trace: __switch_to+0x2c0/0x450 __schedule+0x2f8/0x970 schedule+0x48/0xc0 blk_mq_freeze_queue_wait+0x94/0x120 blk_mq_queue_reinit_work+0xb8/0x180 blk_mq_queue_reinit_prepare+0x84/0xa0 cpuhp_invoke_callback+0x17c/0x600 cpuhp_up_callbacks+0x58/0x150 _cpu_up+0xf0/0x1c0 do_cpu_up+0x120/0x150 cpu_subsys_online+0x64/0xe0 device_online+0xb4/0x120 online_store+0xb4/0xc0 dev_attr_store+0x68/0xa0 sysfs_kf_write+0x80/0xb0 kernfs_fop_write+0x17c/0x250 __vfs_write+0x6c/0x1e0 vfs_write+0xd0/0x270 SyS_write+0x6c/0x110 system_call+0x38/0xe0 Examination of the queue showed a single reference (no PERCPU_COUNT_BIAS, and __PERCPU_REF_DEAD, __PERCPU_REF_ATOMIC set) and no requests. However, conditions at the time of the race are count of PERCPU_COUNT_BIAS + 0 and __PERCPU_REF_DEAD and __PERCPU_REF_ATOMIC set. The fix is to make the tryget routines use an actual boolean internally instead of the atomic long result truncated to a int. Fixes: e625305b3907 percpu-refcount: make percpu_ref based on longs instead of ints Link: https://bugzilla.kernel.org/show_bug.cgi?id=190751 Signed-off-by: Douglas Miller <dougmill@linux.vnet.ibm.com> Reviewed-by: Jens Axboe <axboe@fb.com> Signed-off-by: Tejun Heo <tj@kernel.org> Fixes: e625305b3907 ("percpu-refcount: make percpu_ref based on longs instead of ints") Cc: stable@vger.kernel.org # v3.18+
Diffstat (limited to 'tools')