From patchwork Mon Aug 3 01:17:32 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bill Fischofer X-Patchwork-Id: 51830 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f199.google.com (mail-lb0-f199.google.com [209.85.217.199]) by patches.linaro.org (Postfix) with ESMTPS id 73723229FD for ; Mon, 3 Aug 2015 01:23:03 +0000 (UTC) Received: by lbcjf8 with SMTP id jf8sf39154561lbc.0 for ; Sun, 02 Aug 2015 18:23:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:delivered-to:from:to:date :message-id:in-reply-to:references:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :mime-version:content-type:content-transfer-encoding:errors-to :sender:x-original-sender:x-original-authentication-results :mailing-list; bh=SRSahJuIBOXGiooqbO1FG73+nGN8ZiLGO+q8O/dGw9M=; b=Rf2cV4uz0J4479yDAEvHkM5hb8eytRaaLaVCticbRfEziha4DOfN2uNm50aLXCnSSv IlWKZNXXFpCMvn6l0gxZfmVlSvyxbVLJMNh0wrmREN9lzyG+zvBwYXjb9xWG9RzjSh8m ckfB6b1FPSGpHMR4szio2eTGwIKTQetdO/z6G8y/flvoK2AMvWxIcyhyJE78qmikb4KY h4F3dTVzXbULx+ZqmxkuFJE53Qk+zBSUlUbKEYqAoZvemO73fh6n0jTX8JEOTiGkNk5g Mfn75hzHYdgSvzoduhbJ3nUDJPuNmEjF3Qz9f0K7dH6uRt3kc7HdGEHougrL/GbUMojm OJrw== X-Gm-Message-State: ALoCoQlNt2o5YNJlBvuRBsKIjDkg1xReXdPyd/jDy5CPUlWBxiHbnRqGdFfZOnMoz5qdawRAHHWe X-Received: by 10.112.16.200 with SMTP id i8mr4756097lbd.20.1438564982431; Sun, 02 Aug 2015 18:23:02 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.37.7 with SMTP id u7ls445244laj.105.gmail; Sun, 02 Aug 2015 18:23:02 -0700 (PDT) X-Received: by 10.112.137.97 with SMTP id qh1mr14161197lbb.1.1438564982278; Sun, 02 Aug 2015 18:23:02 -0700 (PDT) Received: from mail-la0-f48.google.com (mail-la0-f48.google.com. [209.85.215.48]) by mx.google.com with ESMTPS id y4si9271636laj.76.2015.08.02.18.23.02 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 02 Aug 2015 18:23:02 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.48 as permitted sender) client-ip=209.85.215.48; Received: by labsr2 with SMTP id sr2so1329822lab.2 for ; Sun, 02 Aug 2015 18:23:02 -0700 (PDT) X-Received: by 10.152.18.162 with SMTP id x2mr14455316lad.73.1438564982023; Sun, 02 Aug 2015 18:23:02 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.7.198 with SMTP id l6csp1599177lba; Sun, 2 Aug 2015 18:23:00 -0700 (PDT) X-Received: by 10.140.43.199 with SMTP id e65mr21266195qga.80.1438564980833; Sun, 02 Aug 2015 18:23:00 -0700 (PDT) Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id b74si14100864qge.107.2015.08.02.18.23.00; Sun, 02 Aug 2015 18:23:00 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Received: by lists.linaro.org (Postfix, from userid 109) id 06F2061CB4; Mon, 3 Aug 2015 01:23:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252.ec2.internal X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from ip-10-142-244-252.ec2.internal (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 09BA361D9A; Mon, 3 Aug 2015 01:19:30 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 50E6661D80; Mon, 3 Aug 2015 01:19:14 +0000 (UTC) Received: from mail-qg0-f46.google.com (mail-qg0-f46.google.com [209.85.192.46]) by lists.linaro.org (Postfix) with ESMTPS id F143F61CB4 for ; Mon, 3 Aug 2015 01:18:32 +0000 (UTC) Received: by qgeh16 with SMTP id h16so79348665qge.3 for ; Sun, 02 Aug 2015 18:18:32 -0700 (PDT) X-Received: by 10.141.23.199 with SMTP id z190mr22368353qhd.34.1438564712754; Sun, 02 Aug 2015 18:18:32 -0700 (PDT) Received: from localhost.localdomain ([64.88.227.134]) by smtp.gmail.com with ESMTPSA id 60sm6125044qgy.37.2015.08.02.18.18.27 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 02 Aug 2015 18:18:32 -0700 (PDT) From: Bill Fischofer To: lng-odp@lists.linaro.org Date: Sun, 2 Aug 2015 18:17:32 -0700 Message-Id: <1438564655-12686-7-git-send-email-bill.fischofer@linaro.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1438564655-12686-1-git-send-email-bill.fischofer@linaro.org> References: <1438564655-12686-1-git-send-email-bill.fischofer@linaro.org> X-Topics: patch Subject: [lng-odp] [API-NEXT PATCHv5 6/9] linux-generic: schedule: implement odp_schedule_release_ordered() X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: bill.fischofer@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.48 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Signed-off-by: Bill Fischofer --- platform/linux-generic/odp_queue.c | 169 +++++++++++++++++++++++++++++++++---- 1 file changed, 152 insertions(+), 17 deletions(-) diff --git a/platform/linux-generic/odp_queue.c b/platform/linux-generic/odp_queue.c index 4d0e1b4..a2460e7 100644 --- a/platform/linux-generic/odp_queue.c +++ b/platform/linux-generic/odp_queue.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include @@ -401,6 +402,7 @@ int queue_enq(queue_entry_t *queue, odp_buffer_hdr_t *buf_hdr) return 0; } + /* We're in order, so account for this and proceed with enq */ origin_qe->s.order_out++; } @@ -426,16 +428,56 @@ int queue_enq(queue_entry_t *queue, odp_buffer_hdr_t *buf_hdr) */ if (origin_qe) { odp_buffer_hdr_t *reorder_buf = origin_qe->s.reorder_head; - odp_buffer_hdr_t *reorder_prev; + odp_buffer_hdr_t *reorder_prev = NULL; + odp_buffer_hdr_t *placeholder_buf = NULL; + odp_buffer_hdr_t *next_buf; uint32_t release_count = 0; + uint32_t placeholder_count = 0; while (reorder_buf && - reorder_buf->target_qe == queue && - reorder_buf->order <= - origin_qe->s.order_out + release_count) { - release_count++; - reorder_prev = reorder_buf; - reorder_buf = reorder_buf->next; + reorder_buf->order <= origin_qe->s.order_out + + release_count + placeholder_count) { + /* + * Elements on the reorder list fall into one of + * three categories: + * + * 1. Those destined for the same queue. These + * can be enq'd now if they were waiting to + * be unblocked by this enq. + * + * 2. Those representing placeholders for events + * whose ordering was released by a prior + * odp_schedule_release_ordered() call. These + * can now just be freed. + * + * 3. Those representing events destined for another + * queue. These cannot be consolidated with this + * enq since they have a different target. + * + * Detecting an element with an order sequence gap, an + * element in category 3, or running out of elements + * stops the scan. + */ + next_buf = reorder_buf->next; + + if (odp_likely(reorder_buf->target_qe == queue)) { + reorder_prev = reorder_buf; + reorder_buf = next_buf; + release_count++; + } else if (!reorder_buf->target_qe) { + if (reorder_prev) + reorder_prev->next = next_buf; + else + origin_qe->s.reorder_head = next_buf; + + reorder_buf->next = placeholder_buf; + placeholder_buf = reorder_buf; + + reorder_buf = next_buf; + placeholder_count++; + } else { + break; + } } /* Add released buffers to the queue as well */ @@ -444,19 +486,28 @@ int queue_enq(queue_entry_t *queue, odp_buffer_hdr_t *buf_hdr) queue->s.tail = reorder_prev; origin_qe->s.reorder_head = reorder_prev->next; reorder_prev->next = NULL; - origin_qe->s.order_out += release_count; } - /* Now handle unblocked buffers destined for other queues */ + /* Reflect the above two in the output sequence */ + origin_qe->s.order_out += release_count + placeholder_count; + + /* Now handle any unblocked buffers destined for other queues */ + UNLOCK(&queue->s.lock); if (reorder_buf && - reorder_buf->order <= origin_qe->s.order_out) { - UNLOCK(&origin_qe->s.lock); - UNLOCK(&queue->s.lock); - if (schedule_enq(reorder_buf->target_qe, origin_qe)) - ODP_ABORT("schedule_enq failed\n"); - } else { - UNLOCK(&origin_qe->s.lock); - UNLOCK(&queue->s.lock); + reorder_buf->order <= origin_qe->s.order_out) + origin_qe->s.reorder_head = reorder_buf->next; + else + reorder_buf = NULL; + UNLOCK(&origin_qe->s.lock); + if (reorder_buf) + odp_queue_enq(reorder_buf->target_qe->s.handle, + (odp_event_t)reorder_buf->handle.handle); + + /* Free all placeholder bufs that are now released */ + while (placeholder_buf) { + next_buf = placeholder_buf->next; + odp_buffer_free(buf_hdr->handle.handle); + placeholder_buf = next_buf; } } else { UNLOCK(&queue->s.lock); @@ -685,3 +736,87 @@ void odp_queue_param_init(odp_queue_param_t *params) { memset(params, 0, sizeof(odp_queue_param_t)); } + +/* This routine exists here rather than in odp_schedule + * because it operates on queue interenal structures + */ +int odp_schedule_release_ordered(odp_event_t ev) +{ + odp_buffer_t placeholder_buf; + odp_buffer_hdr_t *placeholder_buf_hdr, *reorder_buf, *reorder_prev; + odp_buffer_hdr_t *buf_hdr = + odp_buf_to_hdr(odp_buffer_from_event(ev)); + queue_entry_t *origin_qe = buf_hdr->origin_qe; + + /* Can't release if we didn't originate from an ordered queue */ + if (!origin_qe) + return -1; + + LOCK(&origin_qe->s.lock); + + /* If we are the first or second element beyond the next in order, + * we can release immediately since there can be no confusion about + * intermediate elements + */ + if (buf_hdr->order <= origin_qe->s.order_out + 1) { + buf_hdr->origin_qe = NULL; + origin_qe->s.order_out++; + + /* check if this release allows us to unblock waiters */ + reorder_buf = origin_qe->s.reorder_head; + if (reorder_buf && + reorder_buf->order <= origin_qe->s.order_out) + origin_qe->s.reorder_head = reorder_buf->next; + else + reorder_buf = NULL; + UNLOCK(&origin_qe->s.lock); + if (reorder_buf) + odp_queue_enq(reorder_buf->target_qe->s.handle, + (odp_event_t)reorder_buf->handle.handle); + return 0; + } + + /* If we are beyond the second element in the expected order, we need + * a placeholder to represent our "place in line". Just use an element + * from the same pool the buffer being released is from. + */ + placeholder_buf = odp_buffer_alloc(buf_hdr->pool_hdl); + + /* Can't release if no placeholder is available */ + if (placeholder_buf == ODP_BUFFER_INVALID) { + UNLOCK(&origin_qe->s.lock); + return -1; + } + + placeholder_buf_hdr = odp_buf_to_hdr(placeholder_buf); + reorder_buf = origin_qe->s.reorder_head; + + if (!reorder_buf) { + placeholder_buf_hdr->next = NULL; + origin_qe->s.reorder_head = placeholder_buf_hdr; + origin_qe->s.reorder_tail = placeholder_buf_hdr; + } else { + reorder_prev = NULL; + + while (buf_hdr->order > reorder_buf->order) { + reorder_prev = reorder_buf; + reorder_buf = reorder_buf->next; + if (!reorder_buf) + break; + } + + placeholder_buf_hdr->next = reorder_buf; + if (reorder_prev) + reorder_prev->next = placeholder_buf_hdr; + else + origin_qe->s.reorder_head = placeholder_buf_hdr; + + if (!reorder_buf) + origin_qe->s.reorder_tail = placeholder_buf_hdr; + } + + placeholder_buf_hdr->target_qe = NULL; + + UNLOCK(&origin_qe->s.lock); + return 0; +}