From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754631AbeDTK4F (ORCPT ); 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 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 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; >>>>>> } >>>>>> >>>>>> /** >>>>>> >>> >> >