Received: by 10.192.165.148 with SMTP id m20csp106451imm; Fri, 20 Apr 2018 03:57:20 -0700 (PDT) X-Google-Smtp-Source: AIpwx4+yLfhgPCpIR0YeT6ezjMhqHyGYHKqhSM2wZDYvr2Iqzh48p0GhBfLRqzXS27z82O/4m4RT X-Received: by 10.98.0.194 with SMTP id 185mr5518045pfa.238.1524221840865; Fri, 20 Apr 2018 03:57:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524221840; cv=none; d=google.com; s=arc-20160816; b=ThRboeW0rUCrflCx/2OXG+JM5XsHcv9GbteiSwRVsdvDadN/e6DemSI4pC7AeUgnZ8 +2cI9EBm+QJRJtPKNB4eaYjxRb7vExMyV35Y54SGC5vyfWx+TsPTSTndFAvfoUraok7e /rKvaHJiovw5c8I4C4e5dJ/eMdEVqQK3fbFyR7ayxIQsXkWhRUixAahL9KswHOzkdzXb lm99SZJLDjpihn/73dAgKip3rJPCkiljosmMlfv7YQhvS9zWjxhM6rPRQMcyJus4KWs6 q92nbpdQS/F96Fb58g3F54Q++LPonoPN7vREqSdRfsewe5WlLWm+CvZJjaFHcw3FcUe+ mjsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:content-transfer-encoding :content-language:in-reply-to:mime-version:user-agent:date:from :references:cc:to:subject:arc-authentication-results; bh=JRoezh1i/8jIk4Xe+6PhSTN2DfqrHGruxPpgU/ybOsA=; b=0ah6WqlFBitx+xL7CuD5sn45O2X5f3BuX3+0EAHX/cpck5/XkaMKPd9F5mGxfzdyUU VOIgn/IS60D9y4JENvUOBmPZJlc2O1bdAiJrhpzWzq6N2qEFAc5W0Ye/Xv4BfFpeV+Q9 dfS/W+oBPtkfcvOKj3CM2Fbz+Z63zm/TW+n1yLLuWb54SAyhDqhFc8smJ5KmKkEUQk6H geSJXde+In7R55G5A6EXfmFEL1bz5o2NYoRhc1fcpvfverIzqGUULVXNwOHCpsLYOJWb WGgudyTt9RkpgU5Lv1fwzQz6xt+JVwvw4C4Fbqji7QXKX4VdAP/ISO8kLu5IgNHlbYED /yLA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t12-v6si5413478plm.192.2018.04.20.03.57.06; Fri, 20 Apr 2018 03:57:20 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754629AbeDTK4F (ORCPT + 99 others); Fri, 20 Apr 2018 06:56:05 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:57020 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754511AbeDTK4E (ORCPT ); Fri, 20 Apr 2018 06:56:04 -0400 Received: from pps.filterd (m0098394.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w3KAtkhB142660 for ; Fri, 20 Apr 2018 06:56:04 -0400 Received: from e06smtp11.uk.ibm.com (e06smtp11.uk.ibm.com [195.75.94.107]) by mx0a-001b2d01.pphosted.com with ESMTP id 2hfbh3994h-1 (version=TLSv1.2 cipher=AES256-SHA256 bits=256 verify=NOT) for ; Fri, 20 Apr 2018 06:55:53 -0400 Received: from localhost by e06smtp11.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 20 Apr 2018 11:54:29 +0100 Received: from b06cxnps3075.portsmouth.uk.ibm.com (9.149.109.195) by e06smtp11.uk.ibm.com (192.168.101.141) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 20 Apr 2018 11:54:26 +0100 Received: from d06av26.portsmouth.uk.ibm.com (d06av26.portsmouth.uk.ibm.com [9.149.105.62]) by b06cxnps3075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w3KAsQgD17301954; Fri, 20 Apr 2018 10:54:26 GMT Received: from d06av26.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 840C6AE053; Fri, 20 Apr 2018 11:44:13 +0100 (BST) Received: from d06av26.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 2EB1CAE04D; Fri, 20 Apr 2018 11:44:13 +0100 (BST) Received: from oc3836556865.ibm.com (unknown [9.152.224.131]) by d06av26.portsmouth.uk.ibm.com (Postfix) with ESMTP; Fri, 20 Apr 2018 11:44:13 +0100 (BST) Subject: Re: [PATCH 1/4] vfio: ccw: fix cleanup if cp_prefetch fails To: Dong Jia Shi , Cornelia Huck Cc: Pierre Morel , linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org, kvm@vger.kernel.org, borntraeger@de.ibm.com References: <20180321020822.86255-1-bjsdjshi@linux.vnet.ibm.com> <20180321020822.86255-2-bjsdjshi@linux.vnet.ibm.com> <682d8b1c-5aca-7015-043b-a3f1446bf378@linux.vnet.ibm.com> <20180322022248.GB12194@bjsdjshi@linux.vnet.ibm.com> <54fd02cd-bd0b-889b-c40f-f9a32aa25d77@linux.vnet.ibm.com> <20180326142839.23bfc4f6.cohuck@redhat.com> <20180327014200.GH12194@bjsdjshi@linux.vnet.ibm.com> From: Halil Pasic Date: Fri, 20 Apr 2018 12:54:26 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.6.0 MIME-Version: 1.0 In-Reply-To: <20180327014200.GH12194@bjsdjshi@linux.vnet.ibm.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-TM-AS-GCONF: 00 x-cbid: 18042010-0040-0000-0000-0000044FAADC X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18042010-0041-0000-0000-000020F40685 Message-Id: <59687ed1-befb-a861-7b91-40859ac00bb7@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2018-04-20_04:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=2 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 impostorscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1709140000 definitions=main-1804200106 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org ping I think get this fixed. Better sooner than later. On 03/27/2018 03:42 AM, Dong Jia Shi wrote: > * Cornelia Huck [2018-03-26 14:28:39 +0200]: > > [...] > >>> By the way, since you will propose a new version, >>> you have a long description of the cp_prefetch function in the code. >>> I think you should modify it according to the changes and describe how and >>> why the ch_len field of each chain is used and changed by this function. >>> >>> Something like: >>> >>> " >>> For each chain composing the channel program: >>> On entry ch_len hold the count of CCW to be translated. >> >> s/hold/holds/ ? >> > Sure. > >>> On exit ch_len is adjusted to the count of successfully translated CCW. >>> >>> This allows cp_free to find in ch_len the count of CCW to free in a chain. >>> " >>> >>> Could also be inside the commit message. >>> >>> Pierre >>> >>> >>>> >>>>>> Acked-by: Pierre Morel >>>>>> Reviewed-by: Dong Jia Shi >>>>>> Signed-off-by: Halil Pasic >>>>>> Signed-off-by: Dong Jia Shi >>>>>> --- >>>>>> drivers/s390/cio/vfio_ccw_cp.c | 9 ++++++++- >>>>>> 1 file changed, 8 insertions(+), 1 deletion(-) >>>>>> >>>>>> diff --git a/drivers/s390/cio/vfio_ccw_cp.c b/drivers/s390/cio/vfio_ccw_cp.c >>>>>> index d9a2fffd034b..2be114db02f9 100644 >>>>>> --- a/drivers/s390/cio/vfio_ccw_cp.c >>>>>> +++ b/drivers/s390/cio/vfio_ccw_cp.c >>>>>> @@ -749,11 +749,18 @@ int cp_prefetch(struct channel_program *cp) >>>>>> for (idx = 0; idx < len; idx++) { >>>>>> ret = ccwchain_fetch_one(chain, idx, cp); >>>>>> if (ret) >>>>>> - return ret; >>>>>> + goto out_err; >>>>>> } >>>>>> } >>>>>> >>>>>> return 0; >>>>>> +out_err: >>>>>> + /* Only cleanup the chain elements that where actually translated. */ >> >> s/where/were/ > Ok. > >> >>>>>> + chain->ch_len = idx; >>>>>> + list_for_each_entry_continue(chain, &cp->ccwchain_list, next) { >>>>>> + chain->ch_len = 0; >>>>>> + } >>>>>> + return ret; >>>>>> } >>>>>> >>>>>> /** >>>>>> >>> >> >