From patchwork Sun Aug 9 13:13:53 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bill Fischofer X-Patchwork-Id: 52094 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f70.google.com (mail-la0-f70.google.com [209.85.215.70]) by patches.linaro.org (Postfix) with ESMTPS id D77F92152A for ; Sun, 9 Aug 2015 13:23:10 +0000 (UTC) Received: by labia3 with SMTP id ia3sf31101472lab.1 for ; Sun, 09 Aug 2015 06:23:09 -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=9QTfYQpZwxh55apFtbZS6aEBBL9VqRja/An3DsJfjlM=; b=G9q/VtZrwFcByN90v5MZyI/RvtnehH6HTUBCYmBZTHruPf3W0JDQcCwzOmbcUynjlC AQS5UyTrXP69J+taR4SNuScKvwp+YCsnKeNk6AD+PVojmQHd/DDHFPg9pmREaGccPacS 57PjjjDyHIqHpI96KGH6e+NQTVng/1AbS9GdWlN2twQMJL4s0IQx/xsbvbU+w1uuC6G6 s59LkMqzr4JoIIl7N1gUFnBUobiBKlduJz102PPspq6ocZBMSpxN29LrmCLXVOxqSv61 oEmXyKe85aqBzMD572wpBLVqdZgbpygqDChFvaUQzO5vWZJdBiErgr7NnLLzzSoE+gCp XkRg== X-Gm-Message-State: ALoCoQmi8Qz1TeX0IDjteimXoXx4zMwSjspDReN4/RTPHKNNk3fHGZPet0mnU/ifeROVMmYxCnF+ X-Received: by 10.112.98.42 with SMTP id ef10mr4886934lbb.18.1439126589883; Sun, 09 Aug 2015 06:23:09 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.44.228 with SMTP id h4ls634901lam.23.gmail; Sun, 09 Aug 2015 06:23:09 -0700 (PDT) X-Received: by 10.112.198.71 with SMTP id ja7mr9354045lbc.109.1439126589462; Sun, 09 Aug 2015 06:23:09 -0700 (PDT) Received: from mail-la0-f49.google.com (mail-la0-f49.google.com. [209.85.215.49]) by mx.google.com with ESMTPS id i1si12053175lbs.87.2015.08.09.06.23.09 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 09 Aug 2015 06:23:09 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.49 as permitted sender) client-ip=209.85.215.49; Received: by lahi9 with SMTP id i9so11671616lah.2 for ; Sun, 09 Aug 2015 06:23:09 -0700 (PDT) X-Received: by 10.112.209.106 with SMTP id ml10mr16260050lbc.112.1439126589364; Sun, 09 Aug 2015 06:23:09 -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 l6csp1426608lba; Sun, 9 Aug 2015 06:23:08 -0700 (PDT) X-Received: by 10.55.19.133 with SMTP id 5mr29633149qkt.37.1439126587800; Sun, 09 Aug 2015 06:23:07 -0700 (PDT) Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id v17si3163752qge.61.2015.08.09.06.23.07; Sun, 09 Aug 2015 06:23:07 -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 1A9AC61E11; Sun, 9 Aug 2015 13:23: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 BD78C62114; Sun, 9 Aug 2015 13:15:28 +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 0220D61F63; Sun, 9 Aug 2015 13:15:22 +0000 (UTC) Received: from mail-ob0-f171.google.com (mail-ob0-f171.google.com [209.85.214.171]) by lists.linaro.org (Postfix) with ESMTPS id 6669E61F70 for ; Sun, 9 Aug 2015 13:14:10 +0000 (UTC) Received: by obbhe7 with SMTP id he7so11190450obb.0 for ; Sun, 09 Aug 2015 06:14:10 -0700 (PDT) X-Received: by 10.60.82.67 with SMTP id g3mr15198816oey.29.1439126049920; Sun, 09 Aug 2015 06:14:09 -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 i3sm5012321oig.24.2015.08.09.06.14.09 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 09 Aug 2015 06:14:09 -0700 (PDT) From: Bill Fischofer To: lng-odp@lists.linaro.org Date: Sun, 9 Aug 2015 08:13:53 -0500 Message-Id: <1439126035-13656-12-git-send-email-bill.fischofer@linaro.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1439126035-13656-1-git-send-email-bill.fischofer@linaro.org> References: <1439126035-13656-1-git-send-email-bill.fischofer@linaro.org> X-Topics: patch Subject: [lng-odp] [API-NEXT PATCHv12 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.215.49 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 | 72 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/platform/linux-generic/odp_queue.c b/platform/linux-generic/odp_queue.c index 4d3c548..75cc95b 100644 --- a/platform/linux-generic/odp_queue.c +++ b/platform/linux-generic/odp_queue.c @@ -908,3 +908,75 @@ 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; + + /* Buffer is no longer associated with an ordered queue */ + buf_hdr->origin_qe = NULL; + + /* Sustaining buffers can be released without further action */ + if (buf_hdr->flags.sustain) + return 0; + + /* Must lock the origin queue to process the release */ + 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) { + 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 (odp_unlikely(placeholder_buf == ODP_BUFFER_INVALID)) { + UNLOCK(&origin_qe->s.lock); + buf_hdr->origin_qe = origin_qe; + return -1; + } + + placeholder_buf_hdr = odp_buf_to_hdr(placeholder_buf); + + /* Copy info to placeholder and add it to the reorder queue */ + placeholder_buf_hdr->origin_qe = origin_qe; + placeholder_buf_hdr->order = buf_hdr->order; + placeholder_buf_hdr->flags.sustain = 0; + + reorder_enq(NULL, origin_qe, placeholder_buf_hdr); + + UNLOCK(&origin_qe->s.lock); + return 0; +}