From patchwork Fri Dec 16 20:16:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keith Busch X-Patchwork-Id: 34082 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp1181738wrn; Fri, 16 Dec 2022 12:31:17 -0800 (PST) X-Google-Smtp-Source: AA0mqf7kA4KKhQjgk1JjYAXhmtkO4fML6pN2Job+DyP7UarMXqKG0s3MD2ARrZG7JZxbhtVyomId X-Received: by 2002:a50:fe88:0:b0:467:5e9b:7df1 with SMTP id d8-20020a50fe88000000b004675e9b7df1mr27961400edt.24.1671222677540; Fri, 16 Dec 2022 12:31:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671222677; cv=none; d=google.com; s=arc-20160816; b=PGrVh/hQwqQUE0al5AFxRnWR+nd0eVtzsm0SfZ7rdmC0Czg27bOt2ihxKS4fJLyqqC AzuxhRa7SzW+adOHXYQozn/sjz3koiBSdS85DWEb4cw2coa76U72AgCnt1P4Ahhim2Pz /KlwYwon4BukrnPjLiYYOarDFD+kCPfORe0FFJOjH/+RKpNJ9KMMxhscChJgTlc+NE2j e2eyrqNoHDX9ztPEw507agOrcOXfM0Hdvr/EBxZ2Qg9Z1aVGT+XdL1zykZ/tHQEkEwmA 4RMO/L87NtO2qfsTohB8aWqJ/LjKjh5lW1ORBaYhJ5LcKRz96WisI24PxS9nB979oITv yOdw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=MLWHDUS20C0jmHJ39hBO1H02jIUsWm5bZEXT2SOrcPk=; b=qpd9MQ7KaUmuqfItHx8snRyqZgp1gVeP815fqNrNruuWvoQ/Xc8v8JrBGOmxGd1zWE AGNmSu91TJXZ3i5IphHD3zkXN7p/NV6P0Vuf1qf+gi8uV9r5H30CqZBIeZF0TEMWlcpp LEE80gzCFepkmUdI0B6F3jLFyZoxX3cevGfY8exszfJ1SOpVEEWl2xmsBmjHYDnSxjKS MR5LNwWoDi+8D30Rk3JWH97yLUsjhL3XkF1XM017EZMzrYn6yWDb2k5JFCrrskf+SJUO GEnHLft7UI7boLzTv6M21qF8Zz9AY4062JVMHTjNFcTj0B8WSb9DnO4a0BVu7pvGcfdH XMIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@meta.com header.s=s2048-2021-q4 header.b=mfMn7jRA; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=meta.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id mm8-20020a170906cc4800b007c15ca85481si2645383ejb.812.2022.12.16.12.30.51; Fri, 16 Dec 2022 12:31:17 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@meta.com header.s=s2048-2021-q4 header.b=mfMn7jRA; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=meta.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232071AbiLPUSS (ORCPT + 99 others); Fri, 16 Dec 2022 15:18:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59550 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232021AbiLPURs (ORCPT ); Fri, 16 Dec 2022 15:17:48 -0500 Received: from mx0a-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1921872601 for ; Fri, 16 Dec 2022 12:17:33 -0800 (PST) Received: from pps.filterd (m0001303.ppops.net [127.0.0.1]) by m0001303.ppops.net (8.17.1.19/8.17.1.19) with ESMTP id 2BGJxVB0024629 for ; Fri, 16 Dec 2022 12:17:33 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=meta.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=s2048-2021-q4; bh=MLWHDUS20C0jmHJ39hBO1H02jIUsWm5bZEXT2SOrcPk=; b=mfMn7jRAj1JALvXAGMrFFL2ynhUTkET2GZUP//Au3O898Gj3HgP6C83+obVffTaI9AEC LdH93rl62N9EjRD5+os0ye+85TMSG1HNxCqKKwVjcnoo9AYzjB9WKpmso7prETZ5tjzc 3HRP9xgLaR+p0coaQsxcCgS66JxPo99d6u33bkLP+D12zFt3zYgcMC02JjfrlJuH8gXo LYvJCI7ZTuPhY8i7TzUUu5iEU6bFUrUlcg/HAud+/dv1BAINn8D3AdXdX6uIibAi8w1U ySKVjeRciobFpyq04tF0c/gbUyK/rd7Wx3oq7ad63OgUBOIRgxK+2AB1dxOA/1eD9v5e Jg== Received: from mail.thefacebook.com ([163.114.132.120]) by m0001303.ppops.net (PPS) with ESMTPS id 3mg3hn2eff-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Fri, 16 Dec 2022 12:17:32 -0800 Received: from twshared15216.17.frc2.facebook.com (2620:10d:c085:208::f) by mail.thefacebook.com (2620:10d:c085:11d::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Fri, 16 Dec 2022 12:17:24 -0800 Received: by devbig007.nao1.facebook.com (Postfix, from userid 544533) id 143E1D042AB5; Fri, 16 Dec 2022 12:17:10 -0800 (PST) From: Keith Busch To: , , Matthew Wilcox CC: Tony Battersby , Kernel Team , Keith Busch Subject: [PATCHv2 03/11] dmapool: use sysfs_emit() instead of scnprintf() Date: Fri, 16 Dec 2022 12:16:17 -0800 Message-ID: <20221216201625.2362737-4-kbusch@meta.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221216201625.2362737-1-kbusch@meta.com> References: <20221216201625.2362737-1-kbusch@meta.com> MIME-Version: 1.0 X-FB-Internal: Safe X-Proofpoint-GUID: qfc2w-Px_3l_LSo_6fiQmORoywmOr1Ul X-Proofpoint-ORIG-GUID: qfc2w-Px_3l_LSo_6fiQmORoywmOr1Ul X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.923,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-12-16_14,2022-12-15_02,2022-06-22_01 X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1752403990667414447?= X-GMAIL-MSGID: =?utf-8?q?1752403990667414447?= From: Tony Battersby Use sysfs_emit instead of scnprintf, snprintf or sprintf. Signed-off-by: Tony Battersby Signed-off-by: Keith Busch Reviewed-by: Christoph Hellwig --- mm/dmapool.c | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/mm/dmapool.c b/mm/dmapool.c index 559207e1c3339..20616b760bb9c 100644 --- a/mm/dmapool.c +++ b/mm/dmapool.c @@ -64,18 +64,11 @@ static DEFINE_MUTEX(pools_reg_lock); static ssize_t pools_show(struct device *dev, struct device_attribute *attr, char *buf) { - unsigned temp; - unsigned size; - char *next; + int size; struct dma_page *page; struct dma_pool *pool; - next = buf; - size = PAGE_SIZE; - - temp = scnprintf(next, size, "poolinfo - 0.1\n"); - size -= temp; - next += temp; + size = sysfs_emit(buf, "poolinfo - 0.1\n"); mutex_lock(&pools_lock); list_for_each_entry(pool, &dev->dma_pools, pools) { @@ -90,16 +83,14 @@ static ssize_t pools_show(struct device *dev, struct device_attribute *attr, cha spin_unlock_irq(&pool->lock); /* per-pool info, no real statistics yet */ - temp = scnprintf(next, size, "%-16s %4u %4zu %4zu %2u\n", - pool->name, blocks, - pages * (pool->allocation / pool->size), - pool->size, pages); - size -= temp; - next += temp; + size += sysfs_emit_at(buf, size, "%-16s %4u %4zu %4zu %2u\n", + pool->name, blocks, + pages * (pool->allocation / pool->size), + pool->size, pages); } mutex_unlock(&pools_lock); - return PAGE_SIZE - size; + return size; } static DEVICE_ATTR_RO(pools);