From c2b1d8e3eff6daf5c5582f9af7d2f57dc6ef23b2 Mon Sep 17 00:00:00 2001 From: Ken Sato Date: Fri, 24 Mar 2017 18:12:06 +0900 Subject: [PATCH] IKC: delete the comments for review --- arch/x86/kernel/mikc.c | 1 - executer/kernel/mcctrl/ikc.c | 7 ------- kernel/ap.c | 1 - kernel/host.c | 7 ------- kernel/include/cls.h | 1 - 5 files changed, 17 deletions(-) diff --git a/arch/x86/kernel/mikc.c b/arch/x86/kernel/mikc.c index ef57e891..1a087226 100644 --- a/arch/x86/kernel/mikc.c +++ b/arch/x86/kernel/mikc.c @@ -47,7 +47,6 @@ int ihk_mc_ikc_init_first_local(struct ihk_ikc_channel_desc *channel, ihk_ikc_init_desc(channel, IKC_OS_HOST, 0, rq, wq, ihk_ikc_master_channel_packet_handler, channel); ihk_ikc_enable_channel(channel); -/* Comment: McKernel側のmaster_channel 割り込み処理channel_list に追加 */ ihk_ikc_add_intr_channel(NULL, channel, 0); /* Set boot parameter */ diff --git a/executer/kernel/mcctrl/ikc.c b/executer/kernel/mcctrl/ikc.c index 953f72a5..e3240704 100644 --- a/executer/kernel/mcctrl/ikc.c +++ b/executer/kernel/mcctrl/ikc.c @@ -138,7 +138,6 @@ static int syscall_packet_handler(struct ihk_ikc_channel_desc *c, return 0; } -/* Comment: 受信を想定しないchannel用のパケットハンドラ */ static int dummy_packet_handler(struct ihk_ikc_channel_desc *c, void *__packet, void *__os) { @@ -215,7 +214,6 @@ static void mcctrl_ikc_init(ihk_os_t os, int cpu, unsigned long rphys, struct ih ihk_ikc_send(pmc->c, &packet, 0); } -/* Comment: ikc2linuxのaccept後のchannelの処理 */ static int connect_handler_ikc2linux(struct ihk_ikc_channel_info *param) { struct ihk_ikc_channel_desc *c; @@ -227,12 +225,10 @@ static int connect_handler_ikc2linux(struct ihk_ikc_channel_info *param) param->packet_handler = syscall_packet_handler; -/* Comment: 指定されたCPUの割り込み処理channel_list へ追加 */ ihk_ikc_add_intr_channel(os, param->channel, linux_cpu); return 0; } -/* Comment: ikc2mckernelのaccept後のchannelの処理 */ static int connect_handler_ikc2mckernel(struct ihk_ikc_channel_info *param) { struct ihk_ikc_channel_desc *c; @@ -249,13 +245,11 @@ static int connect_handler_ikc2mckernel(struct ihk_ikc_channel_info *param) } param->packet_handler = dummy_packet_handler; -/* Comment: MCK_CPU毎の送信channelとして管理 (従来通り) */ usrdata->channels[mck_cpu].c = c; return 0; } -/* Comment: listen_paramの設定 */ static struct ihk_ikc_listen_param lp_ikc2linux = { .port = 503, .handler = connect_handler_ikc2linux, @@ -292,7 +286,6 @@ int prepare_ikc_channels(ihk_os_t os) return -EINVAL; } -/* Comment: syscall_channel2 廃止に伴い、num_channelsも減らす */ usrdata->num_channels = usrdata->cpu_info->n_cpus; usrdata->channels = kzalloc(sizeof(struct mcctrl_channel) * usrdata->num_channels, diff --git a/kernel/ap.c b/kernel/ap.c index 56b3d677..455083ec 100644 --- a/kernel/ap.c +++ b/kernel/ap.c @@ -64,7 +64,6 @@ static void ap_wait(void) mcs_lock_node_t mcs_node; mcs_lock_lock_noirq(&ap_syscall_semaphore, &mcs_node); -/* Comment: 自CPUのikc2mckernel と ikc2linuxの準備 */ init_host_ikc2mckernel(); init_host_ikc2linux(cpu_info->ikc_cpus[ihk_mc_get_processor_id()]); mcs_lock_unlock_noirq(&ap_syscall_semaphore, &mcs_node); diff --git a/kernel/host.c b/kernel/host.c index e85c93b4..6d06b142 100644 --- a/kernel/host.c +++ b/kernel/host.c @@ -480,8 +480,6 @@ static int syscall_packet_handler(struct ihk_ikc_channel_desc *c, { struct ikc_scd_packet *packet = __packet; struct ikc_scd_packet pckt; -/* Comment: 受信したchannel に返事をする方式から、 - 自CPUのikc2linux に返事をするよう変更 */ struct ihk_ikc_channel_desc *resp_channel = cpu_local_var(ikc2linux); int rc; struct mcs_rwlock_node_irqsave lock; @@ -677,7 +675,6 @@ static int syscall_packet_handler(struct ihk_ikc_channel_desc *c, return ret; } -/* Comment: パケット受信を想定しないchannel用のハンドラ */ static int dummy_packet_handler(struct ihk_ikc_channel_desc *c, void *__packet, void *__os) { @@ -686,14 +683,12 @@ static int dummy_packet_handler(struct ihk_ikc_channel_desc *c, return 0; } -/* Comment: ikc2linux の接続と自CPUへの設定を行う */ void init_host_ikc2linux(int linux_cpu) { struct ihk_ikc_connect_param param; struct ihk_ikc_channel_desc *c = ikc2linuxs[linux_cpu]; if (!c) { -/* Comment: 対象Linux_cpu 宛のikc2linuxが存在しなければ、接続 */ param.port = 503; param.intr_cpu = linux_cpu; param.pkt_size = sizeof(struct ikc_scd_packet); @@ -715,7 +710,6 @@ void init_host_ikc2linux(int linux_cpu) get_this_cpu_local_var()->ikc2linux = c; } -/* Comment: ikc2mckernelの接続と自CPUへの設定を行う */ void init_host_ikc2mckernel(void) { struct ihk_ikc_connect_param param; @@ -734,7 +728,6 @@ void init_host_ikc2mckernel(void) } dkprintf("connected.\n"); -/* Comment: 待ち受け処理channel_list に追加する */ ihk_ikc_add_intr_channel(NULL, param.channel, ihk_ikc_get_processor_id()); } diff --git a/kernel/include/cls.h b/kernel/include/cls.h index 9f364916..85aa1906 100644 --- a/kernel/include/cls.h +++ b/kernel/include/cls.h @@ -75,7 +75,6 @@ struct cpu_local_var { struct list_head runq; size_t runq_len; -/* Comment: 送信用するchannelをsyscall_channel から ikc2linux へ変更 */ struct ihk_ikc_channel_desc *ikc2linux; struct resource_set *resource_set;