xnu-3789.1.32.tar.gz

[apple/xnu.git] / osfmk / kern / coalition.c

diff --git a/osfmk/kern/coalition.c b/osfmk/kern/coalition.c
index fd2afa85800b83596fbdbde5d1129377d36c1c67..7b9885612e4f14cef9597ccb94f1afc5d550b457 100644 (file)
--- a/osfmk/kern/coalition.c
+++ b/osfmk/kern/coalition.c
@@ -80,6 +80,7 @@ static uint64_t coalition_next_id = 1;
 static queue_head_t coalitions_q;
 
 coalition_t init_coalition[COALITION_NUM_TYPES];
 static queue_head_t coalitions_q;
 
 coalition_t init_coalition[COALITION_NUM_TYPES];

+coalition_t corpse_coalition[COALITION_NUM_TYPES];

 
 zone_t coalition_zone;
 
 
 zone_t coalition_zone;
 


@@ -168,6 +169,7 @@ struct i_resource_coalition {
        ledger_t ledger;
        uint64_t bytesread;
        uint64_t byteswritten;
        ledger_t ledger;
        uint64_t bytesread;
        uint64_t byteswritten;

+       uint64_t energy;

        uint64_t gpu_time;
        uint64_t logical_immediate_writes;
        uint64_t logical_deferred_writes;
        uint64_t gpu_time;
        uint64_t logical_immediate_writes;
        uint64_t logical_deferred_writes;


@@ -297,6 +299,7 @@ coalition_notify_user(uint64_t id, uint32_t flags)
        }
 
        coalition_notification(user_port, id, flags);
        }
 
        coalition_notification(user_port, id, flags);

+       ipc_port_release_send(user_port);

 }
 
 /*
 }
 
 /*


@@ -442,10 +445,18 @@ coalition_resource_usage_internal(coalition_t coal, struct coalition_resource_us
 {
        kern_return_t kr;
        ledger_amount_t credit, debit;
 {
        kern_return_t kr;
        ledger_amount_t credit, debit;

+       int i;

 
        if (coal->type != COALITION_TYPE_RESOURCE)
                return KERN_INVALID_ARGUMENT;
 
 
        if (coal->type != COALITION_TYPE_RESOURCE)
                return KERN_INVALID_ARGUMENT;
 

+       /* Return KERN_INVALID_ARGUMENT for Corpse coalition */
+       for (i = 0; i < COALITION_NUM_TYPES; i++) {
+               if (coal == corpse_coalition[i]) {
+                       return KERN_INVALID_ARGUMENT;
+               }
+       }
+

        ledger_t sum_ledger = ledger_instantiate(task_ledger_template, LEDGER_CREATE_ACTIVE_ENTRIES);
        if (sum_ledger == LEDGER_NULL)
                return KERN_RESOURCE_SHORTAGE;
        ledger_t sum_ledger = ledger_instantiate(task_ledger_template, LEDGER_CREATE_ACTIVE_ENTRIES);
        if (sum_ledger == LEDGER_NULL)
                return KERN_RESOURCE_SHORTAGE;


@@ -460,6 +471,7 @@ coalition_resource_usage_internal(coalition_t coal, struct coalition_resource_us
        uint64_t bytesread = coal->r.bytesread;
        uint64_t byteswritten = coal->r.byteswritten;
        uint64_t gpu_time = coal->r.gpu_time;
        uint64_t bytesread = coal->r.bytesread;
        uint64_t byteswritten = coal->r.byteswritten;
        uint64_t gpu_time = coal->r.gpu_time;

+       uint64_t energy = coal->r.energy;

        uint64_t logical_immediate_writes = coal->r.logical_immediate_writes;
        uint64_t logical_deferred_writes = coal->r.logical_deferred_writes;
        uint64_t logical_invalidated_writes = coal->r.logical_invalidated_writes;
        uint64_t logical_immediate_writes = coal->r.logical_immediate_writes;
        uint64_t logical_deferred_writes = coal->r.logical_deferred_writes;
        uint64_t logical_invalidated_writes = coal->r.logical_invalidated_writes;


@@ -539,6 +551,7 @@ coalition_resource_usage_internal(coalition_t coal, struct coalition_resource_us
        cru_out->bytesread = bytesread;
        cru_out->byteswritten = byteswritten;
        cru_out->gpu_time = gpu_time;
        cru_out->bytesread = bytesread;
        cru_out->byteswritten = byteswritten;
        cru_out->gpu_time = gpu_time;

+       cru_out->energy = energy;

        cru_out->logical_immediate_writes = logical_immediate_writes;
        cru_out->logical_deferred_writes = logical_deferred_writes;
        cru_out->logical_invalidated_writes = logical_invalidated_writes;
        cru_out->logical_immediate_writes = logical_immediate_writes;
        cru_out->logical_deferred_writes = logical_deferred_writes;
        cru_out->logical_invalidated_writes = logical_invalidated_writes;


@@ -1173,6 +1186,18 @@ coalitions_adopt_init_task(task_t task)
        return kr;
 }
 
        return kr;
 }
 

+/* Used for forked corpses. */
+kern_return_t
+coalitions_adopt_corpse_task(task_t task)
+{
+       kern_return_t kr;
+       kr = coalitions_adopt_task(corpse_coalition, task);
+       if (kr != KERN_SUCCESS) {
+               panic("failed to adopt task %p into corpse coalition: %d", task, kr);
+       }
+       return kr;
+}
+

 /*
  * coalition_adopt_task_internal
  * Condition: Coalition must be referenced and unlocked. Will fail if coalition
 /*
  * coalition_adopt_task_internal
  * Condition: Coalition must be referenced and unlocked. Will fail if coalition


@@ -1313,8 +1338,11 @@ task_release_coalitions(task_t task)
 {
        int i;
        for (i = 0; i < COALITION_NUM_TYPES; i++) {
 {
        int i;
        for (i = 0; i < COALITION_NUM_TYPES; i++) {

-               if (task->coalition[i])
+               if (task->coalition[i]) {

                        coalition_release(task->coalition[i]);
                        coalition_release(task->coalition[i]);

+               } else if (i == COALITION_TYPE_RESOURCE) {
+                       panic("deallocating task %p was not a member of a resource coalition", task);
+               }

        }
 }
 
        }
 }
 


@@ -1517,6 +1545,10 @@ coalitions_init(void)
                if (kr != KERN_SUCCESS)
                        panic("%s: could not create init %s coalition: kr:%d",
                              __func__, coal_type_str(i), kr);
                if (kr != KERN_SUCCESS)
                        panic("%s: could not create init %s coalition: kr:%d",
                              __func__, coal_type_str(i), kr);

+               kr = coalition_create_internal(ctype->type, FALSE, &corpse_coalition[ctype->type]);
+               if (kr != KERN_SUCCESS)
+                       panic("%s: could not create corpse %s coalition: kr:%d",
+                             __func__, coal_type_str(i), kr);

        }
 
        /* "Leak" our reference to the global object */
        }
 
        /* "Leak" our reference to the global object */