From patchwork Sun Aug 9 01:55:13 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bill Fischofer X-Patchwork-Id: 52079 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f200.google.com (mail-wi0-f200.google.com [209.85.212.200]) by patches.linaro.org (Postfix) with ESMTPS id 81DF820A60 for ; Sun, 9 Aug 2015 02:04:11 +0000 (UTC) Received: by wilj18 with SMTP id j18sf27745252wil.0 for ; Sat, 08 Aug 2015 19:04:10 -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=hrNU5VYUuF+IunMF4N6GJ9zBiTCM1wr1Nb9HJEjMtIA=; b=DirDbVoG/d3R4cg9CoXKkagCzpokoKXmpvw6UPjdcoRDYRLctuTzYc80yH4+nFlUiP n/nD4lpYldmnlIRUG8OkLULyI4shFc3Mhv9fd/FwlJcRqQaYuCKjj3/wYN1nZhu5b5qe LKOAwHgyAffjEOjKFN/DRppmUMYQ0YPRLWaQnYWfT4Jt6lj0urrmZPWjRvwrvAyVsKTU 1X0hdRxTrKpFcW3QfKrpGSOHCC0BzdsNO8w3hVQUZhrpEK7wW4bMF/vv22rX3CZDd3+I qOOtuGEk0cJuQz0hMBKKWv3zFrfmrntutYqprRZ3VNIpVpqjtfNEnOb9NhaJxNoi4Rl7 TZLg== X-Gm-Message-State: ALoCoQlhNMGQA+M24LVtWpPemC7xnbnq8qBR+4UXsnt3bhptaP3tV5m7Czd5Bbf4BBs/nTUZ8+Hf X-Received: by 10.194.93.198 with SMTP id cw6mr4302017wjb.3.1439085850761; Sat, 08 Aug 2015 19:04:10 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.37.162 with SMTP id z2ls62529laj.101.gmail; Sat, 08 Aug 2015 19:04:10 -0700 (PDT) X-Received: by 10.152.87.116 with SMTP id w20mr14645062laz.119.1439085850470; Sat, 08 Aug 2015 19:04:10 -0700 (PDT) Received: from mail-lb0-f173.google.com (mail-lb0-f173.google.com. [209.85.217.173]) by mx.google.com with ESMTPS id vp4si2457509lbb.80.2015.08.08.19.04.10 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 08 Aug 2015 19:04:10 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.173 as permitted sender) client-ip=209.85.217.173; Received: by lbbtg9 with SMTP id tg9so40854264lbb.1 for ; Sat, 08 Aug 2015 19:04:10 -0700 (PDT) X-Received: by 10.152.26.163 with SMTP id m3mr14741023lag.86.1439085850029; Sat, 08 Aug 2015 19:04:10 -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 l6csp1188824lba; Sat, 8 Aug 2015 19:04:08 -0700 (PDT) X-Received: by 10.140.35.103 with SMTP id m94mr2080502qgm.50.1439085848459; Sat, 08 Aug 2015 19:04:08 -0700 (PDT) Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id j96si46498qge.76.2015.08.08.19.04.07; Sat, 08 Aug 2015 19:04:08 -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 4B01661CDE; Sun, 9 Aug 2015 02:04:07 +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 5503C61EF7; Sun, 9 Aug 2015 02:02:06 +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 23A2E61DDF; Sun, 9 Aug 2015 01:55:34 +0000 (UTC) Received: from mail-oi0-f47.google.com (mail-oi0-f47.google.com [209.85.218.47]) by lists.linaro.org (Postfix) with ESMTPS id 889D661DDF for ; Sun, 9 Aug 2015 01:55:31 +0000 (UTC) Received: by oihn130 with SMTP id n130so73302670oih.2 for ; Sat, 08 Aug 2015 18:55:31 -0700 (PDT) X-Received: by 10.202.75.2 with SMTP id y2mr1264364oia.116.1439085331024; Sat, 08 Aug 2015 18:55:31 -0700 (PDT) Received: from localhost.localdomain (cpe-24-28-70-239.austin.res.rr.com. [24.28.70.239]) by smtp.gmail.com with ESMTPSA id d184sm9449191oif.9.2015.08.08.18.55.30 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 08 Aug 2015 18:55:30 -0700 (PDT) From: Bill Fischofer To: lng-odp@lists.linaro.org Date: Sat, 8 Aug 2015 20:55:13 -0500 Message-Id: <1439085315-6957-12-git-send-email-bill.fischofer@linaro.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1439085315-6957-1-git-send-email-bill.fischofer@linaro.org> References: <1439085315-6957-1-git-send-email-bill.fischofer@linaro.org> X-Topics: patch Subject: [lng-odp] [API-NEXT PATCHv11 11/13] 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.217.173 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 Permit events to be removed from an ordered flow. Signed-off-by: Bill Fischofer --- platform/linux-generic/odp_queue.c | 85 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) diff --git a/platform/linux-generic/odp_queue.c b/platform/linux-generic/odp_queue.c index 4d3c548..669b630 100644 --- a/platform/linux-generic/odp_queue.c +++ b/platform/linux-generic/odp_queue.c @@ -908,3 +908,88 @@ void odp_queue_param_init(odp_queue_param_t *params) { memset(params, 0, sizeof(odp_queue_param_t)); } + +/* These routines exists here rather than in odp_schedule + * because they operate 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 in the current 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; + if (!buf_hdr->flags.sustain) + order_release(origin_qe, 1); + + /* 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; +}