From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-3269524-1523477325-2-17243244300252681911 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.25, MAILING_LIST_MULTI -1, ME_NOAUTH 0.01, RCVD_IN_DNSWL_HI -5, LANGUAGES en, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='org', MailFrom='org' X-Spam-charsets: plain='UTF-8' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=fm2; t= 1523477325; b=L1l0fpQ8Zf3i1M3vCH9z9NoD/n4yo78WxDoj/AlrAr4/5fH9x6 sFgbebQkqWDQPq/WW26trb6EdtvNOmmS/wLIBy8J2l2s8XscTbhf3Y/0UeDl0gEk odXI0YD5EhqHzPJ0/r+Y7k/ytDw6t4lolAJlw4tJe9r7FgcUsHocagwe9a6JQJ9w YnSl5AZC97Wejq3JMwhJmc1RZpvPAVciKSldIHqyTg1D9qXHgeD+DiotABfsQdJO 42p2DmehYkTTvMZUf6eml1YUPrXOZmA65ccsH7uGXeWk6/y7YgDfGXPBaWqTLNgf p/inE+HxLIoKBc5XA52V7sy81s3pQ9M21auQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-type:sender :list-id; s=fm2; t=1523477325; bh=bGwbwNfKw5fS2lR18G1Wto3bVQZJUg FU9d3+k7sQsSs=; b=boX9hme5m+OkJfnUwxWdN8TL95MERBE9Mq6ABnVBvJ+45f yuGd7RKUkDI0fECjrJ+v/1DhGJMU0suqHhalxyDNlw5vtg5OI4QHFDjQGyz65V3Y 9t0tMH8kiQwlIruwjqaRJ4ZmRFTQ1+JjBW+u3+9dWhl4Aid4Pv3UO8/uIY3KRkKK uKSpahXFEJcmwJRZhu/2LyKd7smNgJraMWEvkbypE1qIAQQocPkqosKsbyBSGuH7 Nlj8P2ycNIbMgZ8UO7S4YPcQHkHGq5XoFMd+APe12pCw2wrx03zX9XQnApB/STEk bRmRXHqyiO6RiV/kDu2VNswOE9+YeZHgwaMbXVXg== ARC-Authentication-Results: i=1; mx5.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=none (p=none,has-list-id=yes,d=none) header.from=linuxfoundation.org; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-cm=none score=0; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=linuxfoundation.org header.result=pass header_is_org_domain=yes; x-vs=clean score=-100 state=0 Authentication-Results: mx5.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=none (p=none,has-list-id=yes,d=none) header.from=linuxfoundation.org; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-cm=none score=0; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=linuxfoundation.org header.result=pass header_is_org_domain=yes; x-vs=clean score=-100 state=0 X-ME-VSCategory: clean X-CM-Envelope: MS4wfGN+LvRX8eM1bF6DNFJgjSF7FrP7edb236J3Lew7rdToJz7AICdwRZ0gsh8KQ+K5gDzg2S0SRyCWG4eD/KJbJa/mgbZ4RkGlOYun7bETHyDZkfgMMV9S fNm2FQNv6PvZCuE10gz9QEoIkT4Z4BIyFGI10QwiFzJNsweyRZbN/vkDJNlsTINsbqfAl8h2ps6v5r/1a3ZIMtPJMI1uKMgL/Vf3qFkoIG+M8ApSxUJUioZN X-CM-Analysis: v=2.3 cv=NPP7BXyg c=1 sm=1 tr=0 a=UK1r566ZdBxH71SXbqIOeA==:117 a=UK1r566ZdBxH71SXbqIOeA==:17 a=IkcTkHD0fZMA:10 a=Kd1tUaAdevIA:10 a=Q-fNiiVtAAAA:8 a=QyXUC8HyAAAA:8 a=yMhMjlubAAAA:8 a=ag1SF4gXAAAA:8 a=u__7uJSp3HEpzIBEySsA:9 a=QEXdDO2ut3YA:10 a=Fp8MccfUoT0GBdDC_Lng:22 a=Yupwre4RP9_Eg_Bd0iYG:22 X-ME-CMScore: 0 X-ME-CMCategory: none Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757383AbeDKUIP (ORCPT ); Wed, 11 Apr 2018 16:08:15 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:34730 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933590AbeDKSyw (ORCPT ); Wed, 11 Apr 2018 14:54:52 -0400 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Anup Patel , Ray Jui , Scott Branden , Dan Williams , Vinod Koul , Sasha Levin Subject: [PATCH 4.9 054/310] async_tx: Fix DMA_PREP_FENCE usage in do_async_gen_syndrome() Date: Wed, 11 Apr 2018 20:33:13 +0200 Message-Id: <20180411183624.571301091@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180411183622.305902791@linuxfoundation.org> References: <20180411183622.305902791@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Anup Patel [ Upstream commit baae03a0e2497f49704628fd0aaf993cf98e1b99 ] 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 Signed-off-by: Vinod Koul Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- crypto/async_tx/async_pq.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) --- 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 *c 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 *c 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