From patchwork Mon May 15 05:04:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 9726081 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A6FB660380 for ; Mon, 15 May 2017 05:06:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9BB9628953 for ; Mon, 15 May 2017 05:06:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8FF8D28956; Mon, 15 May 2017 05:06:33 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2196328953 for ; Mon, 15 May 2017 05:06:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758533AbdEOFFj (ORCPT ); Mon, 15 May 2017 01:05:39 -0400 Received: from mail-pf0-f182.google.com ([209.85.192.182]:34610 "EHLO mail-pf0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758070AbdEOFFd (ORCPT ); Mon, 15 May 2017 01:05:33 -0400 Received: by mail-pf0-f182.google.com with SMTP id 9so16945848pfj.1 for ; Sun, 14 May 2017 22:05:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=xaLcYNcv+4Nk0xNhR+n6jyYOTT+mRQ1bx2VxjuVHw5M=; b=VP+nRBu40zLQrTw4MpJ2Sp0KRZK+kNc3FsKQHZPluQuUEzWp5IMtwtwLU1Uf38ta3l +yfDlmIWU2BATdZeWNbYPZYUSL8doXr5llCC0SW1OjSFogUpxDi7aSZzrxACJX2XZpuV BZIBwfzJgSHQYzmAHjtpWDPHC/fHgdq2Lcsag= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=xaLcYNcv+4Nk0xNhR+n6jyYOTT+mRQ1bx2VxjuVHw5M=; b=ZTKO938J6dbaqLhg1xoUgiuB3Mer16wJAYEpqdLuBG7jD51FqBls0GfFczw8zxcdjO 83W1QZXqtV6cylD02VtE+F7NrhPKdhX05PRgw6GcCJPP1C4PxbgwBlk41F3rZDezlSUX t2hvz9V+wSG13+hV6RniIBw2+DeDSzKAVRtc/254EY7PB5mCATjmBaNrpA7yAX+pXjxm +ZOK+GapqKAahC59ahsNyguPeNEoLQ2EXz3yuIEZBiQ53Gl4W5nLD/FBhSYgrlscWWK5 qS4vTnyEiiAw358MALwamfajKvPuvRXAwBV5IIpEiDm2EQUMc+vC+gVpMgJjvA5Q8AOJ JddQ== X-Gm-Message-State: AODbwcD+fv298qlZDKMo574GKCFK8XdRXrrOBFGZA4M5g2dNr05+007z r8Uhtq7yWn+L995w X-Received: by 10.99.168.75 with SMTP id i11mr2230505pgp.228.1494824732213; Sun, 14 May 2017 22:05:32 -0700 (PDT) Received: from anup-HP-Compaq-8100-Elite-CMT-PC.dhcp.avagotech.net ([192.19.237.250]) by smtp.gmail.com with ESMTPSA id q28sm16623363pgc.0.2017.05.14.22.05.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 14 May 2017 22:05:31 -0700 (PDT) From: Anup Patel To: Vinod Koul , Rob Herring , Mark Rutland , Herbert Xu , "David S . Miller" , Jassi Brar Cc: Dan Williams , Ray Jui , Scott Branden , Jon Mason , Rob Rice , bcm-kernel-feedback-list@broadcom.com, dmaengine@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-crypto@vger.kernel.org, linux-raid@vger.kernel.org, Anup Patel Subject: [PATCH v8 2/4] async_tx: Fix DMA_PREP_FENCE usage in do_async_gen_syndrome() Date: Mon, 15 May 2017 10:34:53 +0530 Message-Id: <1494824695-21797-3-git-send-email-anup.patel@broadcom.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1494824695-21797-1-git-send-email-anup.patel@broadcom.com> References: <1494824695-21797-1-git-send-email-anup.patel@broadcom.com> Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The DMA_PREP_FENCE is to be used when preparing Tx descriptor if output of Tx descriptor is to be used by next/dependent Tx descriptor. The DMA_PREP_FENSE will not be set correctly in do_async_gen_syndrome() when calling dma->device_prep_dma_pq() under following conditions: 1. ASYNC_TX_FENCE not set in submit->flags 2. DMA_PREP_FENCE not set in dma_flags 3. src_cnt (= (disks - 2)) is greater than dma_maxpq(dma, dma_flags) This patch fixes DMA_PREP_FENCE usage in do_async_gen_syndrome() taking inspiration from do_async_xor() implementation. Signed-off-by: Anup Patel Reviewed-by: Ray Jui Reviewed-by: Scott Branden Acked-by: Dan Williams --- crypto/async_tx/async_pq.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/crypto/async_tx/async_pq.c b/crypto/async_tx/async_pq.c index f83de99..56bd612 100644 --- a/crypto/async_tx/async_pq.c +++ b/crypto/async_tx/async_pq.c @@ -62,9 +62,6 @@ do_async_gen_syndrome(struct dma_chan *chan, dma_addr_t dma_dest[2]; int src_off = 0; - if (submit->flags & ASYNC_TX_FENCE) - dma_flags |= DMA_PREP_FENCE; - while (src_cnt > 0) { submit->flags = flags_orig; pq_src_cnt = min(src_cnt, dma_maxpq(dma, dma_flags)); @@ -83,6 +80,8 @@ do_async_gen_syndrome(struct dma_chan *chan, if (cb_fn_orig) dma_flags |= DMA_PREP_INTERRUPT; } + if (submit->flags & ASYNC_TX_FENCE) + dma_flags |= DMA_PREP_FENCE; /* Drivers force forward progress in case they can not provide * a descriptor