From patchwork Thu Jan 9 09:45:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans Zhang <18255117159@163.com> X-Patchwork-Id: 13932258 X-Patchwork-Delegate: kw@linux.com Received: from m16.mail.163.com (m16.mail.163.com [117.135.210.2]) by smtp.subspace.kernel.org (Postfix) with ESMTP id CF5E5218EBD; Thu, 9 Jan 2025 09:46:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=117.135.210.2 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736415989; cv=none; b=hGCP6qrUddCgrv19VZX8Pi7HZYh506ZbVWvk4XuukQwagCcDXCmhu8/agjuuoFi9KWsS7KsKIN32k2Yc6lR+jJUk+ydsC0Jz+4wfFpkz4q9pWsMqWrNvwg5QrlCkXjVxxYlLmHEQOpJBXoEU3siDJCTlauS8QD90AkcrWa7rNkQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736415989; c=relaxed/simple; bh=0EHq9dnHa3RePe47elKr8iVapjS/Yb6yjGxe6SjiRz0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=MmCF3oi6higYKlUYlbxES8svkxh7DpNq3HGRjCYrKMARuOgChxdvQKQ/bh0R/PvvBLDF10Yfy6o0VAuYOxVp7W7vOFgu9uGnBx/TSC5GWlCVGyjm7Q52iUUIldbf4rv2buwxoi26Xu5Mh5Mcfa2hAdz39XplfS1YjYn6Lc0QVzw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com; spf=pass smtp.mailfrom=163.com; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b=Hf30FJTy; arc=none smtp.client-ip=117.135.210.2 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=163.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b="Hf30FJTy" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=2KkwN vTms8tc/ou5IFjWkPFbYSQYerIwTcfjHGS9w5Y=; b=Hf30FJTyZoBFc4g5D3+fb YygPHdFFQpnppfGbQoNHK2TP9pZFZrYwc1gZj6vWcKWbHhf2gFfwuFMR6CPOzIo4 8fDfPPA/m+kkGuQJZs59e1Vulz71xuOACoQEYWLQj6i4wGBkyG1KFBDuUR9rhxuF i3cB71RpB59SbrT2ztrGv4= Received: from localhost.localdomain (unknown []) by gzga-smtp-mtada-g1-3 (Coremail) with SMTP id _____wD3t7rYmn9nRKzYEw--.38788S3; Thu, 09 Jan 2025 17:46:01 +0800 (CST) From: Hans Zhang <18255117159@163.com> To: manivannan.sadhasivam@linaro.org Cc: kw@linux.com, kishon@kernel.org, arnd@arndb.de, gregkh@linuxfoundation.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, rockswang7@gmail.com, Hans Zhang <18255117159@163.com>, Niklas Cassel Subject: [v11 1/2] misc: pci_endpoint_test: Remove the "remainder" code Date: Thu, 9 Jan 2025 17:45:55 +0800 Message-Id: <20250109094556.1724663-2-18255117159@163.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20250109094556.1724663-1-18255117159@163.com> References: <20250109094556.1724663-1-18255117159@163.com> Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-CM-TRANSID: _____wD3t7rYmn9nRKzYEw--.38788S3 X-Coremail-Antispam: 1Uf129KBjvJXoW7Ww45Jw1rCr13JF4kJw1kKrg_yoW8Wr4Dpr ZxCry0yF4jyry8Gw4xK3ZrCFyFyFZrXry7JFW5Cw1FvrnxAFn5tF1UGrW8Kry8CFZFvF1Y ya1DAa1v9w12kFJanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07UXo7_UUUUU= X-CM-SenderInfo: rpryjkyvrrlimvzbiqqrwthudrp/1tbiDw7Po2d-kzQzswAFsX A BAR size is always a power of two. buf_size = min(SZ_1M, bar_size); If the BAR size is <= 1MB, there will be 1 iteration, no remainder. If the BAR size is > 1MB, there will be more than one iteration, but the size will always be evenly divisible by 1MB, so no remainder. Signed-off-by: Hans Zhang <18255117159@163.com> Reviewed-by: Niklas Cassel --- Changes since v9-v10: https://lore.kernel.org/linux-pci/20250108072504.1696532-2-18255117159@163.com - Remove the remain variable declaration. --- drivers/misc/pci_endpoint_test.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/misc/pci_endpoint_test.c b/drivers/misc/pci_endpoint_test.c index 3aaaf47fa4ee..f78c7540c52c 100644 --- a/drivers/misc/pci_endpoint_test.c +++ b/drivers/misc/pci_endpoint_test.c @@ -280,7 +280,7 @@ static int pci_endpoint_test_bar_memcmp(struct pci_endpoint_test *test, static bool pci_endpoint_test_bar(struct pci_endpoint_test *test, enum pci_barno barno) { - int j, bar_size, buf_size, iters, remain; + int j, bar_size, buf_size, iters; void *write_buf __free(kfree) = NULL; void *read_buf __free(kfree) = NULL; struct pci_dev *pdev = test->pdev; @@ -313,12 +313,6 @@ static bool pci_endpoint_test_bar(struct pci_endpoint_test *test, write_buf, read_buf, buf_size)) return false; - remain = bar_size % buf_size; - if (remain) - if (pci_endpoint_test_bar_memcmp(test, barno, buf_size * iters, - write_buf, read_buf, remain)) - return false; - return true; } From patchwork Thu Jan 9 09:45:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans Zhang <18255117159@163.com> X-Patchwork-Id: 13932259 X-Patchwork-Delegate: kw@linux.com Received: from m16.mail.163.com (m16.mail.163.com [117.135.210.3]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 72D8E219A88; Thu, 9 Jan 2025 09:46:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=117.135.210.3 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736415995; cv=none; b=hw+Y39T4I1uG7EErb1LBNhLQyK8Kq+Z/yclv5it9tODU4CYdiZN4NuVFFf+bGfHe6V84ak7i3BiLcTjdfJyMTu2ZzMsYoksGtkfuSim6oaB7p5Cq+C/9q48JQ32uvmCdsPGNdo+AXZkRbTIRHsDyXIh+w3rFOLYX3ltW03GgQYI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736415995; c=relaxed/simple; bh=ypd63jAWFgGd4MmKm0Z+Xw0QkKUUyoS50twh06kC5xA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=UJfc7G7AOjTZsaatoWcw/tdBmOKlgLeCj2CHvgi2GA1lPFSqjhxoOzUISDVcH2VpGOcS+kBF0SBvbtlQiT7ifOu4Wy8AFNsgVw4XDsVjOmB05WLpxVxS4jtrrRi/1Kt4oD3XIEGY2RVHfifxkAHrwNNQIcpPpFZuzEgzws2UTn8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com; spf=pass smtp.mailfrom=163.com; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b=ZbNDgBYA; arc=none smtp.client-ip=117.135.210.3 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=163.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b="ZbNDgBYA" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=aNhJQ pggggx1i44cb3KmGFJzk7TZjsfL4u/0L0GAGCA=; b=ZbNDgBYAhBO3XMAQmgJu2 hY7n74H8VNcqQdiGCxZBF2lAZQNgDuTZfyZdVx0INiebqWq1Ga2gJdjoXpePSNjS gc9+55xjxjJXfrJer9Cc8eMRAldS6nl4dNUM8xe286/e8lyS35H0Pq+cKFO9biFK JecM7dgax4S4hJuu5fsndU= Received: from localhost.localdomain (unknown []) by gzga-smtp-mtada-g1-3 (Coremail) with SMTP id _____wD3t7rYmn9nRKzYEw--.38788S4; Thu, 09 Jan 2025 17:46:02 +0800 (CST) From: Hans Zhang <18255117159@163.com> To: manivannan.sadhasivam@linaro.org Cc: kw@linux.com, kishon@kernel.org, arnd@arndb.de, gregkh@linuxfoundation.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, rockswang7@gmail.com, Hans Zhang <18255117159@163.com>, Niklas Cassel Subject: [v11 2/2] misc: pci_endpoint_test: Fix overflow of bar_size Date: Thu, 9 Jan 2025 17:45:56 +0800 Message-Id: <20250109094556.1724663-3-18255117159@163.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20250109094556.1724663-1-18255117159@163.com> References: <20250109094556.1724663-1-18255117159@163.com> Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-CM-TRANSID: _____wD3t7rYmn9nRKzYEw--.38788S4 X-Coremail-Antispam: 1Uf129KBjvJXoWxAw1rCF1fKFWUWr18CFWxZwb_yoW5Gry7pF Z0kr1vvF4jqry8Gan7G3ZrCFyqya9rJry7WFW5Aw1FvFnxZFn5t3W0grWYgrnruFsF9r18 A3ZIya1vgw1jyFJanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jrrcfUUUUU= X-CM-SenderInfo: rpryjkyvrrlimvzbiqqrwthudrp/1tbiDw7Po2d-kzQzswAGsU With 8GB BAR2, running pcitest -b 2 fails with "TEST FAILED". The return value of the `pci_resource_len` interface is not an integer. Using `pcitest` with an 8GB BAR2, the bar_size of integer type will overflow. Change the data type of bar_size from integer to resource_size_t, to fix the above issue. Signed-off-by: Hans Zhang <18255117159@163.com> Suggested-by: Niklas Cassel Reviewed-by: Niklas Cassel --- Changes since v10: https://lore.kernel.org/linux-pci/20250108080951.1700230-3-18255117159@163.com/ - Replace do_div with the div_u64 API. Changes since v8-v9: https://lore.kernel.org/linux-pci/20250104151652.1652181-1-18255117159@163.com/ - Split the patch. Changes since v4-v7: https://lore.kernel.org/linux-pci/20250102120222.1403906-1-18255117159@163.com/ - Fix 32-bit OS warnings and errors. - Fix undefined reference to `__udivmoddi4` Changes since v3: https://lore.kernel.org/linux-pci/20241221141009.27317-1-18255117159@163.com/ - The patch subject were modified. Changes since v2: https://lore.kernel.org/linux-pci/20241220075253.16791-1-18255117159@163.com/ - Fix "changes" part goes below the --- line - The patch commit message were modified. Changes since v1: https://lore.kernel.org/linux-pci/20241217121220.19676-1-18255117159@163.com/ - The patch subject and commit message were modified. --- drivers/misc/pci_endpoint_test.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/misc/pci_endpoint_test.c b/drivers/misc/pci_endpoint_test.c index f78c7540c52c..0f6291801078 100644 --- a/drivers/misc/pci_endpoint_test.c +++ b/drivers/misc/pci_endpoint_test.c @@ -280,10 +280,11 @@ static int pci_endpoint_test_bar_memcmp(struct pci_endpoint_test *test, static bool pci_endpoint_test_bar(struct pci_endpoint_test *test, enum pci_barno barno) { - int j, bar_size, buf_size, iters; + int j, buf_size, iters; void *write_buf __free(kfree) = NULL; void *read_buf __free(kfree) = NULL; struct pci_dev *pdev = test->pdev; + resource_size_t bar_size; if (!test->bar[barno]) return false; @@ -307,7 +308,7 @@ static bool pci_endpoint_test_bar(struct pci_endpoint_test *test, if (!read_buf) return false; - iters = bar_size / buf_size; + iters = div_u64(bar_size, buf_size); for (j = 0; j < iters; j++) if (pci_endpoint_test_bar_memcmp(test, barno, buf_size * j, write_buf, read_buf, buf_size))