From patchwork Sun Aug 9 16:54:31 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bill Fischofer X-Patchwork-Id: 52120 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f198.google.com (mail-lb0-f198.google.com [209.85.217.198]) by patches.linaro.org (Postfix) with ESMTPS id C8C3D2152A for ; Sun, 9 Aug 2015 17:04:49 +0000 (UTC) Received: by lbsm2 with SMTP id m2sf18348181lbs.1 for ; Sun, 09 Aug 2015 10:04:48 -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=XRWwaXyepaHNLeVBYdOBBc4LJjD33+AwPo5urcE45NQ=; b=Yfk2Hqxc5IuHNznb26g/2KlXwW3taMHmPyRk5svOi40mBNoLduvLORo033aWDSF1Z4 NUs/Y2uRcWCcZzUUokgwijQfTiItNNLdR4WFua0AVNhNqsnS/JhRf+Hla1T2E6UbTm+r P78wyEVMBBw7J4Hznw+se6/Aw8l9AGUb8ySPuoTkYCpxB/8xkLMDv2Ko0Gu9ZcLYaXHC xDN3SvGb2adTNW00pWKgR3EAlKNh51/EtbBU/9ejvJ561bG+E7A/2M3yKnDTWsXc7XP1 Tb5c1fUPbjs5x/kwKtfF1Ez+s0Ok234cMEe3NadwHpdCYUWTxELkrtrqNlWIBrWEUsxp aQ4A== X-Gm-Message-State: ALoCoQnYs2OiTQzVjMvL8aZIjxQCftXg3Lrar4CU3CUHrBpF7gKXqnfffYmrKCrENEaGWBnbAOF/ X-Received: by 10.112.149.39 with SMTP id tx7mr1065046lbb.11.1439139888491; Sun, 09 Aug 2015 10:04:48 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.18.137 with SMTP id w9ls596040lad.102.gmail; Sun, 09 Aug 2015 10:04:48 -0700 (PDT) X-Received: by 10.112.55.105 with SMTP id r9mr16817104lbp.89.1439139888336; Sun, 09 Aug 2015 10:04:48 -0700 (PDT) Received: from mail-lb0-f174.google.com (mail-lb0-f174.google.com. [209.85.217.174]) by mx.google.com with ESMTPS id l6si12352892lbd.114.2015.08.09.10.04.47 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 09 Aug 2015 10:04:47 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.174 as permitted sender) client-ip=209.85.217.174; Received: by lbbtg9 with SMTP id tg9so46011083lbb.1 for ; Sun, 09 Aug 2015 10:04:47 -0700 (PDT) X-Received: by 10.112.168.168 with SMTP id zx8mr4183511lbb.117.1439139887898; Sun, 09 Aug 2015 10:04:47 -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 l6csp1513891lba; Sun, 9 Aug 2015 10:04:46 -0700 (PDT) X-Received: by 10.140.38.21 with SMTP id s21mr31134886qgs.10.1439139886299; Sun, 09 Aug 2015 10:04:46 -0700 (PDT) Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id b92si13194888qga.1.2015.08.09.10.04.45; Sun, 09 Aug 2015 10:04:46 -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 8643F61E02; Sun, 9 Aug 2015 17:04:45 +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 C003C61E09; Sun, 9 Aug 2015 17:00:40 +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 F236661E0B; Sun, 9 Aug 2015 16:56:05 +0000 (UTC) Received: from mail-ob0-f175.google.com (mail-ob0-f175.google.com [209.85.214.175]) by lists.linaro.org (Postfix) with ESMTPS id DB85C61DF2 for ; Sun, 9 Aug 2015 16:54:48 +0000 (UTC) Received: by obnw1 with SMTP id w1so109048604obn.3 for ; Sun, 09 Aug 2015 09:54:48 -0700 (PDT) X-Received: by 10.182.142.202 with SMTP id ry10mr15861292obb.27.1439139288319; Sun, 09 Aug 2015 09:54:48 -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 x69sm199357oif.5.2015.08.09.09.54.47 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 09 Aug 2015 09:54:47 -0700 (PDT) From: Bill Fischofer To: lng-odp@lists.linaro.org Date: Sun, 9 Aug 2015 11:54:31 -0500 Message-Id: <1439139273-22438-12-git-send-email-bill.fischofer@linaro.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1439139273-22438-1-git-send-email-bill.fischofer@linaro.org> References: <1439139273-22438-1-git-send-email-bill.fischofer@linaro.org> X-Topics: patch Subject: [lng-odp] [API-NEXT PATCHv14 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.174 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 a62713d..a3091e2 100644 --- a/platform/linux-generic/odp_queue.c +++ b/platform/linux-generic/odp_queue.c @@ -913,3 +913,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; + 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; +}