From patchwork Tue Aug 13 09:05:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Huan Yang X-Patchwork-Id: 13761593 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A2B77C52D7B for ; Tue, 13 Aug 2024 09:05:50 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id EA03710E2D3; Tue, 13 Aug 2024 09:05:49 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=vivo.com header.i=@vivo.com header.b="Mj1aQv/f"; dkim-atps=neutral Received: from HK2PR02CU002.outbound.protection.outlook.com (mail-eastasiaazon11010003.outbound.protection.outlook.com [52.101.128.3]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7903110E272 for ; Tue, 13 Aug 2024 09:05:48 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=NxhIclmUSF6MwLLQE4gwMf2VRzB1ilgaOgaLpZKNTD3NE8TZWTqvvW6clRERB2di4n/RznjVGeA8wc/TPGsgBp8VpiNHmfkTHcb1xI37lGAK/AmEQgmM6XOdGTzFZcaHwJyyTBraHXwGaGfFM5lDtrrkHSCMaBxQF17XnaoDCOjee67E64VTHt/DluEBZ0EXTGEifX4Np03scB3ezU8GsZrIiWTE9Vrwnqqso9mbc3fwgYUla1iyLcTfkdEaCm0wYT+1ll9sAyWr2TKBE4ktUtiaPMvFstILtiCG+Baddw+vSmcYm+gnbK98wanoPUV4kJ0c6fPXWYnSdV0mwvWHlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=vbHVesOajLT6BoqvW7mli+cTiCaZZJnwmj1hAE6QkLo=; b=juwqWCNghmwStliDtthSRB3DBuYrV+2iimR0XrEKpG4+cjUNDESqtxmLn/dDzVnvUJe1S4sqPAH6WOHefF+0uuIlAy44fNTfhpqocHf7xMiH69CN99uC9FXzPWpKL5UD0TZok/H1DuSf1c6paWNd3mL/BUYe7VkBmuCS1OzKH3uXEo65HSIYp/N0BaPzJSF1UGxGY3hE71aBt0yZLy2ko1JdHIVnxHO9tNUnd0dqU7B/XaHCgQM2OYq9Zrf5up66+XTowARA5veGvVzV3wXmERTSoXbWmdruzmN4eMQhYfbPqYfDicPqEhibDXFfFMIQtCWnU/Y/G+x/rtR4eamY2A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=vivo.com; dmarc=pass action=none header.from=vivo.com; dkim=pass header.d=vivo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vivo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=vbHVesOajLT6BoqvW7mli+cTiCaZZJnwmj1hAE6QkLo=; b=Mj1aQv/fUVtp8iANdjyzctBJGsHWdK/tmei84W9ZBjBYHwsRh2qkNQS3uX5CFr3I7dkCsVpfY6TPZLBG7ziukXZq3ce7WMELY0OGJ+xdnosZGZrUzaJZujJZKys8BebzXDpAufCXPjvf7x82HyLQTmdE/7wlUj29wwqOE5cJaLu2NurDY7Kx1hX1A3R218FoArj6E3PFCLu/fN63o1/rzgue7xgqeC4DFolyhEpx9cKymYDfykk9P+cu9fohWsX3rUuo/MOtsFebWukpWchsVgpl4A7iQu8sgFq5VeK0Qbtr5G5mW1dmdEmQ+r3a+ZqSJzTFkCtI+XRCLtMmD118Jw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=vivo.com; Received: from PUZPR06MB5676.apcprd06.prod.outlook.com (2603:1096:301:f8::10) by SEYPR06MB5400.apcprd06.prod.outlook.com (2603:1096:101:8d::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.22; Tue, 13 Aug 2024 09:05:44 +0000 Received: from PUZPR06MB5676.apcprd06.prod.outlook.com ([fe80::a00b:f422:ac44:636f]) by PUZPR06MB5676.apcprd06.prod.outlook.com ([fe80::a00b:f422:ac44:636f%4]) with mapi id 15.20.7849.019; Tue, 13 Aug 2024 09:05:44 +0000 From: Huan Yang To: Gerd Hoffmann , Sumit Semwal , =?utf-8?q?Christian_K=C3=B6nig?= , dri-devel@lists.freedesktop.org, linux-media@vger.kernel.org, linaro-mm-sig@lists.linaro.org, linux-kernel@vger.kernel.org Cc: opensource.kernel@vivo.com, Huan Yang Subject: [PATCH v3 4/5] udmabuf: codestyle cleanup Date: Tue, 13 Aug 2024 17:05:10 +0800 Message-ID: <20240813090518.3252469-5-link@vivo.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240813090518.3252469-1-link@vivo.com> References: <20240813090518.3252469-1-link@vivo.com> X-ClientProxiedBy: SI2PR01CA0041.apcprd01.prod.exchangelabs.com (2603:1096:4:193::15) To PUZPR06MB5676.apcprd06.prod.outlook.com (2603:1096:301:f8::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PUZPR06MB5676:EE_|SEYPR06MB5400:EE_ X-MS-Office365-Filtering-Correlation-Id: a92c7671-af66-4e60-433b-08dcbb771cf9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|366016|1800799024|376014|52116014|38350700014; X-Microsoft-Antispam-Message-Info: bFcxMPp3TafpKVFbccDXXgjZAedWga9v5rNlnedXyXs9MdTCDo+nlnHSqBbPJEPJCRQwuaa8NugNSaNjs78MmcL4kWYfZsAfQIj40VsELVP6QFxTTeQ1rrtI+dordDOoa4rU0jbb3AZjJVVsl8BSQj2QFXnymRuGOyWmeAX6mBsh1azOR/BMTaeOfqLc6MPZOarlk++mx4UyqXl/6HwYiOh0vW9v+a1wwLwbwx2yxEqT3SgoHTgtJRWSsDP2XTvNBfo+AS750QCH6NvjzQYfLWej1lbjfJoBqxPnBg/gozBbP1g1VFY7l4WLq/Q74XEni0873wYaxV3vQOzbBOVNbjvu7h2TbPl+fOuzHKLLsGu0a0krxe1LSjToWdC6g8hoNy0EyN9vy+vy50wrnpi94YlLcCqun9/+9OtsrnyTInauuwFV8bMohN92qR8bsAbUFmKcmrU+P1UrYFvLY/NOj5iMxqOyQzm4uTxSuu35w0uwAncF7gJGPeusULDHosvZ7sMcBWRFQJSb0pYyDKtftQN6zys0g2TUjHWedtR6rPEyfMNlc0xVK4RwweUadwHGk7pFYcbDRQK1YNqMioe236a638Ogmzrm9KLxzYDHXR9u2miv19If38Uc/2LKUUH/HH2nQn6glkN2AiQGM+xiXDHbLSgWh2tfCzUsDSys6xggrdeiYFM/7dKVEVd6i5pnTHXlzADxyILgHuNiXgc7jdzjUkk6C3Qv0e9Dy+lTI5n5CmsxL5196QruRDNSgWEDLT7pVkWUd4+Y5f4fokEmFl/j7UcITEGOE5mbSlc8XtfXPjsIDg2sNxSs/tx0zwebPMH6flHUDZIBQuNM8UMsk0w4T9l5iUtLI33kMtM8w+hL6XrVOT3/GDXP8JIgKtQLokXOZ4MpL1lfyIBpfn4WUhFd0a3cuQN9nVWn+KspLeZqqz5psvk5R3yv8ks3C8Nn95jg0IVTVv7TF0UGvnzuPMY+Bhj78o3WwQ4QuZODDn12j0e3x74Ycec9nCUTaWhQtNW1ON5UivBZ6AzG8YK2c8rB4VG1IU/ZxpSRevyHiJTwkIc6/wS4tIWEU2Nji2u495GCHhMNyEZA4li7LteFTUzF8lhaQIyqtwG0HkTUHOAlZ5cxhEi17wYpGrxX880Iz2Zv17vvFbGPUqxJ5PMt9apvAw+LHhsI9yTdBB8h9n7cj95Qn+yIlSOLAKmk2wQhj5a8mObkNkzjLrPvxxyRACo+8vFHOLmpj1LOYZl0unvyj3qnONpnzdCR0ZvbkQg7Vh38ZiGN7+fztQEAYK1eNQXT4bt2SLyXIYFPpCJAd40i8PmU8zktHe36ZxaR4haJ9CkhZSxqHnQDlkWXiLLEBDw94F3lJCSDWFYugb8VVD5oQs8vxKaWyvX95/0u7IujqGRpvMtrNNWhSvJ9O8ZGQA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PUZPR06MB5676.apcprd06.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(366016)(1800799024)(376014)(52116014)(38350700014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: +KkAzq3wWjjbv/uEiP9+TnIPpv8s2oYDItKnLwP9SR4Q3sqViq100uixLo2BKt1ipy/yf9DlkF8AoYHzUnZ4kKnBicpzLEiEC/g77W224i21CDfX+VD9MGZT/beQEoU/P/PTE3+1ii4oPzaynOEHk82Gacv0752e9CATUE4I7qsjMb9VMzREI1Z7eDJtz6ugg/Ib49A1Hb66ihol17wYPXlQFVGR2sHXRzuwhtR1UZvtiOSt22TCbxxoccTtUIjURHJvjjIhRgCg8wBPFUpBiBzmMi5TAgIEAXIKrRE/qUx0RCncF0a4O3P+gce+i6nk7NIrJDDcH9elN2cvu2K3tAU5/5jwvl2rZR4p9fqXWDXShK8TtSj03Yjwd4sIZNmfj987T1Zq6tCSnEQ4PZOHHSuaolF6KqQnWRefCsr68irw+3mhbHbHxLTuiZuUFlw5nVL66pgZ7d+rBUGng0RJ8pKgUMw7p9cSbioJnyJiZiHCcnJh8BKNc1bmjdEooGkWXb6aui83BH1CnOZyLmOvQK44cqPt02Frux2epqpVmLUbAR1owl8jUdFs2YdiKYmavT1lC3SnPUj+4sKwnomYoZUjzcftM78DqOCa2+rt89VmrVVNI4FJx7pmhkHK1Guq1XRE2AzQdD2FTAPyy8RycgK0V6w6zyNtfA5YE7LXvbSH5b4o8vYosWXbAScIWtbw8mYXyAudZ52WQOZcda3tjVkdgD6N6rwLpSzziGzx8udd3xXll5SVdVjwTtiR5EqkK5eLpDhiycd1l07k//BN5FY9uObaKiSuEyueC7MpplQZ82KteEC02LZETQREqN/bxBeEwsxETjA2OA139UBsaFY9RRnQrAGQd7zXI+Q0AV54z+aHsJoXnvp6yH2FtgS6CaZp1QIYgyCuemMlNG+QkjBclVJ7jp6sgWiQ20WoEkNHDj5tokk9pkII3XUJP9HIb2UExtZB+Gs4Tn2s6ZcXXgDByKzJ3ahSmix3QRstRa0VuJK0tL16Ydlv/MAGUhsM8+25eGed592jw8Uwtn/EeAWeOHSP0PAT3kx2n9/DjkdCCke/YB4l9XLpD+bGjhA3v7RA0DZZs/yuYUdEa2D26V6/hrkm1/8dYG1PEnTJMeQGP0JzG/1Lf+yKHwoLAARp7Qo4tb2KmS5NSu2Y2r9Jgm+usiQ6DgO/R8FOsQOoO5QVxZNTZHffYgkW9ExyDoYogbP6WH4ml/kRdqVd55ZD/wDxPfOT5Ip5IBxbJ1IGnWmwrGNXXwc2UPqIDNxpliRVhcd+35CKijuQ+CGVSQ1endWi6sfR1FBej1PuESl4MguVehDc9mfQIirnoIVwqTIkweBZWQSxvsmFpbG+tfySBmdjm4F45aR1a3lsuVf3ltc9n3b3F//FUf2/jnZ8Hw2lqjzGPwcdWi119LKNVY6YqUJvZjJgm3Q3vslszy+SlzGV8TxgUM5pw8qWr7CHNX4RSszSu+8AF3s9nvJhZ5v+pzA9Lqt9G0Ni493QtK1qZLK8JAwl4e0mK3wRN5MOlU4y3sOeYKK4z7JpJvSSAzJA7tAzh/j+VNPOPRuTud924OeP3C0UITRw4xc6zt2MUswt X-OriginatorOrg: vivo.com X-MS-Exchange-CrossTenant-Network-Message-Id: a92c7671-af66-4e60-433b-08dcbb771cf9 X-MS-Exchange-CrossTenant-AuthSource: PUZPR06MB5676.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Aug 2024 09:05:44.2639 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: vl3vCJQZuX52alBrZ51/bb1areNmsnRthrUHvuG+8j0WB0/tG9eOZEJkG/Q+7DRalCY6owxJzcFcUN6hx7u/Ww== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SEYPR06MB5400 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" There are some variables in udmabuf_create that are only used inside the loop. Therefore, there is no need to declare them outside the scope. This patch moved it into loop. It is difficult to understand the loop condition of the code that adds folio to the unpin_list. The outer loop of this patch iterates through folios, while the inner loop correctly sets the folio and corresponding offset into the udmabuf starting from the offset. if reach to pgcnt or nr_folios, end of loop. By this, more readable. Signed-off-by: Huan Yang --- drivers/dma-buf/udmabuf.c | 65 ++++++++++++++++++++------------------- 1 file changed, 33 insertions(+), 32 deletions(-) diff --git a/drivers/dma-buf/udmabuf.c b/drivers/dma-buf/udmabuf.c index 4ec54c60d76c..8f9cb0e2e71a 100644 --- a/drivers/dma-buf/udmabuf.c +++ b/drivers/dma-buf/udmabuf.c @@ -296,12 +296,12 @@ static long udmabuf_create(struct miscdevice *device, struct udmabuf_create_list *head, struct udmabuf_create_item *list) { - pgoff_t pgoff, pgcnt, pglimit, pgbuf = 0; - long nr_folios, ret = -EINVAL; + pgoff_t upgcnt = 0, pglimit, pgbuf = 0; + long ret = -EINVAL; struct file *memfd = NULL; struct folio **folios; struct udmabuf *ubuf; - u32 i, j, k, flags; + u32 i, flags; loff_t end; ubuf = kzalloc(sizeof(*ubuf), GFP_KERNEL); @@ -315,22 +315,21 @@ static long udmabuf_create(struct miscdevice *device, goto err; if (!IS_ALIGNED(list[i].size, PAGE_SIZE)) goto err; - ubuf->pagecount += list[i].size >> PAGE_SHIFT; + upgcnt += list[i].size >> PAGE_SHIFT; if (ubuf->pagecount > pglimit) goto err; } - if (!ubuf->pagecount) + if (!upgcnt) goto err; - ubuf->folios = kvmalloc_array(ubuf->pagecount, sizeof(*ubuf->folios), + ubuf->folios = kvmalloc_array(upgcnt, sizeof(*ubuf->folios), GFP_KERNEL); if (!ubuf->folios) { ret = -ENOMEM; goto err; } - ubuf->offsets = kvcalloc(ubuf->pagecount, sizeof(*ubuf->offsets), - GFP_KERNEL); + ubuf->offsets = kvcalloc(upgcnt, sizeof(*ubuf->offsets), GFP_KERNEL); if (!ubuf->offsets) { ret = -ENOMEM; goto err; @@ -338,6 +337,10 @@ static long udmabuf_create(struct miscdevice *device, pgbuf = 0; for (i = 0; i < head->count; i++) { + pgoff_t pgoff, pgcnt; + u32 j, cnt; + long nr_folios; + memfd = fget(list[i].memfd); ret = check_memfd_seals(memfd); if (ret < 0) @@ -351,38 +354,36 @@ static long udmabuf_create(struct miscdevice *device, } end = list[i].offset + (pgcnt << PAGE_SHIFT) - 1; - ret = memfd_pin_folios(memfd, list[i].offset, end, - folios, pgcnt, &pgoff); - if (ret <= 0) { + nr_folios = memfd_pin_folios(memfd, list[i].offset, end, folios, + pgcnt, &pgoff); + if (nr_folios <= 0) { kvfree(folios); - if (!ret) - ret = -EINVAL; + ret = nr_folios ? nr_folios : -EINVAL; goto err; } - nr_folios = ret; - pgoff >>= PAGE_SHIFT; - for (j = 0, k = 0; j < pgcnt; j++) { - ubuf->folios[pgbuf] = folios[k]; - ubuf->offsets[pgbuf] = pgoff << PAGE_SHIFT; - - if (j == 0 || ubuf->folios[pgbuf-1] != folios[k]) { - ret = add_to_unpin_list(&ubuf->unpin_list, - folios[k]); - if (ret < 0) { - kfree(folios); - goto err; - } + for (j = 0, cnt = 0; j < nr_folios; ++j, pgoff = 0) { + u32 k; + long fsize = folio_size(folios[j]); + + ret = add_to_unpin_list(&ubuf->unpin_list, folios[j]); + if (ret < 0) { + kfree(folios); + goto err; } - pgbuf++; - if (++pgoff == folio_nr_pages(folios[k])) { - pgoff = 0; - if (++k == nr_folios) - break; + for (k = pgoff; k < fsize; k += PAGE_SIZE) { + ubuf->folios[pgbuf] = folios[j]; + ubuf->offsets[pgbuf] = k; + ++pgbuf; + + if (++cnt >= pgcnt) + goto end; } } - +end: + // update the number of pages that have already been set up. + ubuf->pagecount += pgcnt; kvfree(folios); fput(memfd); memfd = NULL;