Skip to content

Commit 93ff6f9

Browse files
anchaoxiaoxiang781216
authored andcommitted
drivers/rptun: check the status before stop remote proc
Race condition if the remote proc is stoped during initialization phase | #0 0x0249f959 in rpmsg_destroy_ept (ept=0xffffffc0) at open-amp/lib/rpmsg/rpmsg.c:376 | #1 0x024a938c in rpmsg_deinit_vdev (rvdev=0xf2303a48) at open-amp/lib/rpmsg/rpmsg_virtio.c:971 | #2 0x02117e33 in rptun_dev_stop (rproc=0xf2303a04, stop_ns=true) at rptun/rptun.c:891 | apache#3 0x021181d8 in rptun_do_ioctl (priv=0xf2303a00, cmd=11010, arg=0) at rptun/rptun.c:922 | apache#4 0x02119722 in rptun_ioctl_foreach (cpuname=0x0, cmd=11010, value=0) at rptun/rptun.c:1086 | apache#5 0x0211b9df in rptun_poweroff (cpuname=0x0) at rptun/rptun.c:1378 | apache#6 0x02053aa6 in board_power_off (status=0) at sim/sim_head.c:206 | apache#7 0x0253d65c in boardctl (cmd=65283, arg=0) at boardctl.c:400 | apache#8 0x021eb497 in cmd_poweroff (vtbl=0xef606280, argc=1, argv=0xef9b73e0) at nsh_syscmds.c:356 | apache#9 0x021cdb4d in nsh_command (vtbl=0xef606280, argc=1, argv=0xef9b73e0) at nsh_command.c:1164 | apache#10 0x021baa72 in nsh_execute (vtbl=0xef606280, argc=1, argv=0xef9b73e0, redirfile=0x0, oflags=0) at nsh_parse.c:845 | apache#11 0x021c6b0a in nsh_parse_command (vtbl=0xef606280, cmdline=0xef606708 "poweroff") at nsh_parse.c:2744 | apache#12 0x021c7166 in nsh_parse (vtbl=0xef606280, cmdline=0xef606708 "poweroff") at nsh_parse.c:2828 | apache#13 0x0221fa2f in nsh_session (pstate=0xef606280, login=1, argc=1, argv=0xef7a7860) at nsh_session.c:245 | apache#14 0x021f8c04 in nsh_consolemain (argc=1, argv=0xef7a7860) at nsh_consolemain.c:75 | apache#15 0x021b77eb in nsh_main (argc=1, argv=0xef7a7860) at nsh_main.c:74 | apache#16 0x02166ddf in nxtask_startup (entrypt=0x21b76ca <nsh_main>, argc=1, argv=0xef7a7860) at sched/task_startup.c:70 | apache#17 0x020b363c in nxtask_start () at task/task_start.c:134 Signed-off-by: chao an <anchao@xiaomi.com>
1 parent 0995e17 commit 93ff6f9

File tree

1 file changed

+18
-8
lines changed

1 file changed

+18
-8
lines changed

drivers/rptun/rptun.c

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -756,6 +756,16 @@ static int rptun_dev_stop(FAR struct remoteproc *rproc, bool stop_ns)
756756
FAR struct metal_list *tmp;
757757
FAR struct rptun_cb_s *cb;
758758

759+
if (priv->rproc.state == RPROC_OFFLINE)
760+
{
761+
return OK;
762+
}
763+
else if (priv->rproc.state == RPROC_CONFIGURED ||
764+
priv->rproc.state == RPROC_READY)
765+
{
766+
return -EBUSY;
767+
}
768+
759769
rdev->support_ns = stop_ns;
760770

761771
#ifdef CONFIG_RPTUN_PING
@@ -805,7 +815,7 @@ static int rptun_dev_stop(FAR struct remoteproc *rproc, bool stop_ns)
805815

806816
remoteproc_shutdown(rproc);
807817

808-
return 0;
818+
return OK;
809819
}
810820

811821
static int rptun_do_ioctl(FAR struct rptun_priv_s *priv, int cmd,
@@ -818,19 +828,19 @@ static int rptun_do_ioctl(FAR struct rptun_priv_s *priv, int cmd,
818828
case RPTUNIOC_START:
819829
if (priv->rproc.state == RPROC_OFFLINE)
820830
{
821-
rptun_dev_start(&priv->rproc);
831+
ret = rptun_dev_start(&priv->rproc);
822832
}
823833
else
824834
{
825-
rptun_dev_stop(&priv->rproc, false);
826-
rptun_dev_start(&priv->rproc);
835+
ret = rptun_dev_stop(&priv->rproc, false);
836+
if (ret == OK)
837+
{
838+
ret = rptun_dev_start(&priv->rproc);
839+
}
827840
}
828841
break;
829842
case RPTUNIOC_STOP:
830-
if (priv->rproc.state != RPROC_OFFLINE)
831-
{
832-
rptun_dev_stop(&priv->rproc, true);
833-
}
843+
ret = rptun_dev_stop(&priv->rproc, true);
834844
break;
835845
case RPTUNIOC_RESET:
836846
RPTUN_RESET(priv->dev, arg);

0 commit comments

Comments
 (0)