From mboxrd@z Thu Jan 1 00:00:00 1970 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1E3AED0E6FA for ; Mon, 21 Oct 2024 11:43:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 71C346B007B; Mon, 21 Oct 2024 07:43:42 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6A5C56B0082; Mon, 21 Oct 2024 07:43:42 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 546AC6B0083; Mon, 21 Oct 2024 07:43:42 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 354ED6B007B for ; Mon, 21 Oct 2024 07:43:42 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 99B4FC1908 for ; Mon, 21 Oct 2024 11:43:25 +0000 (UTC) X-FDA: 82697423970.01.B185F9B Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) by imf23.hostedemail.com (Postfix) with ESMTP id D388A140014 for ; Mon, 21 Oct 2024 11:43:30 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=YnUZcBiw; spf=pass (imf23.hostedemail.com: domain of cassel@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=cassel@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1729510944; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=nGMCM+IrhIGAK/1KxJptEubxT1WfclkWW2jkCLnLo1o=; b=msXQRUx3iZqN8o9jfDIikmvtp812KCTurPipjGTgdxj4YfWwBj8wDlBW0elJm3sUBmcgum SUuTqa5x0xoss/VS/e5FbTIbUQdK/D0w1zLhPWTyZKsaNdPGPE6FJa8SIPU78RZXJzB3d/ oC31Eg43w3qrt8Fot6dUdUUZ+KSfZ+c= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=YnUZcBiw; spf=pass (imf23.hostedemail.com: domain of cassel@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=cassel@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1729510944; a=rsa-sha256; cv=none; b=niOVrgCoSSSoiIgPgn8D16EbfIfXlervCVDyC33CRZx4C483AfhQ67wsTxsgfONpzGRzke SRT8wmliCiLo5BdN2DTzVF7OQuJRkWacyu2+/5//lX1Dgt2HELQa8T6uOi4qD02q97XIZY crvHeI30MXSMRYIK7ZXvb9y7QG3hr6I= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id 3CCF3A42764; Mon, 21 Oct 2024 11:43:30 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 83058C4CEC3; Mon, 21 Oct 2024 11:43:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1729511019; bh=awMHKeW2IqFLj8Un2Mvc6m+8vNSs8NS5bptZgfjy3Vc=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=YnUZcBiwYN0oUEeEN8LXcEyIIfpko9fRGTmgbdH9YqBuPYZSZ6fd1nAx3SYHnTtZ6 0+kKjJEolyA7JaHYxeB1sERy/Bx0qJVDrUbBIrelx+n9qu30MtD+oRvnqdh/8FjREZ 1LkgNq/GG215kUUqZXU0mnCR8rXbaIKnXbgL8J49OpXiLNEQ8YLUuGiDMBSzbqyUzi 5xrjZJwdCHucJLpgaWYm/Wd+iqQmJaXwiYXdMlVIfubyCRZJUlS2Lp7nwvIUWGN29N BIHjAFRwmJnNv1adZRa1v6DMrh8XfZk0jxPnpaLxgAIXB/RIHi8eLd+Wnk9LCHUIkk wvtzlsVf2oaqQ== Date: Mon, 21 Oct 2024 13:43:31 +0200 From: Niklas Cassel To: Ryan Roberts Cc: Andrew Morton , Anshuman Khandual , Ard Biesheuvel , Catalin Marinas , Damien Le Moal , David Hildenbrand , Greg Marsden , Ivan Ivanov , Kalesh Singh , Marc Zyngier , Mark Rutland , Matthias Brugger , Miroslav Benes , Will Deacon , linux-arm-kernel@lists.infradead.org, linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Kees Cook , "Gustavo A. R. Silva" Subject: Re: [RFC PATCH v1 34/57] sata_sil24: Remove PAGE_SIZE compile-time constant assumption Message-ID: References: <20241014105514.3206191-1-ryan.roberts@arm.com> <20241014105912.3207374-1-ryan.roberts@arm.com> <20241014105912.3207374-34-ryan.roberts@arm.com> <7aa84080-6845-496a-a394-30d334632298@arm.com> <2f578256-7e56-491f-a4ca-ad6caa72b7ae@arm.com> <8e1e0824-1022-4f8f-9753-e134c7244d3a@arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <8e1e0824-1022-4f8f-9753-e134c7244d3a@arm.com> X-Rspamd-Server: rspam03 X-Rspam-User: X-Rspamd-Queue-Id: D388A140014 X-Stat-Signature: agejdt5nbutaetfwy76c6pj65a4funt6 X-HE-Tag: 1729511010-549079 X-HE-Meta: U2FsdGVkX18q5b3Yn86Ar6QDpxGi5qTgA7vysZNq+BDGPRfKzwOwNjk8JVGeG87yvHgtKyBMg0YUjvpJI1s6qI/1ESkUCzFd/ZKiJz2xqcgYPM+BHrcou5VN0CLf0j+PByWCEk3UAMshfTPfVhIW7i94GXpkavPiK20jerMwEEJw2Z5d70N31xUy3MEoU2k7QOSaRTmQ64/ulg0kONiTf+gasqxEJTWau+kBNmv1sGY1qr7wnSh+ElqSTV17cDoF+BV4RNupTQvChRedPKLNcIQqRIwtfuJHm/RSZorC1GkRzQhzSWMZivFcwLlEwnOq6x7BLSOruL9I5ha7mzamY52CRQOPVldp9gx8/wW7kmM6LZZx0ff9d3uX7Eu6r1Jl0whX9CNYhv53zSF86bfHbxrKu69q5Ez8cCaANg0toc3+/TGrCZskQdsgd2NAm2nARaBw5XGp6BQnMhVa1oQJvH+2QOEpkCk88+E4P1rPOIoVrlzKJC3f7bbWtgpURXCKG7yXYwVnlmE6w5vTDS3qjTwM6HlDp1vUicCgV/vGn8ljGErx6sDblnc4BXcQPmcfxdyhHcwIBeRGKNOQMcuyDZOg1TSfZifMvf5pLZCaL3hO4PFg5q/Z8+DzKE+wQcx6I8ubyAHrtWt7c5mzH30TiT4pylCADLO+etwAgDYWMblpmHJWwDjF30gUo6UqKdAI45JWeHfpDgndieYcaHIe7ZBb3pCioy0VhUYSPWFTj1P/vYz8mXK8zTaMRPNRvDAUNJkcAZB/ENTY8Kn99wT9ZB0qBqDaMT8eNay56OlqIZDegnvsewrHcAr9HfOLGocYKqlkzO/mh+0oxsMFY6TaQ2DmobfIoygVgJVGwOa7VgCt/WBDCs40y2T59Hob3tcoHDeXU91pUeQIDbD2QaVa2XQARPOMO3Q3are2YUdzNmbhCPYAAlbaVAEC9nWF96rM57UuQnsQQSDjYoTHicW +3IOwY0D 0XotkYjWVEieRZp6Vfo8qPydokTYN9Sa+NjK4CPkFVJjPLRVMLY6pfZnC6cd7Zue7pZwAnEyStmxKTFJ1jEGSwA3t2ueIVgkupQkMgm4+kcknNFKjO1+ouuUvE9OGy8vsweBnrqk8TXSe1uFEdfsFHjSoFDQQ8Dxf6D1bk8Bf7mX4MgI0cccujgm5ODndAH22nRgjoI7uBoYCsFgrfqVSc3rlaLX+EP7d98Mh51zTJZe//uiqcWl3QL4rmvXmKJ0f2/vX34W4IbIxhwU= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: On Mon, Oct 21, 2024 at 12:26:15PM +0100, Ryan Roberts wrote: > On 21/10/2024 12:04, Niklas Cassel wrote: > > On Mon, Oct 21, 2024 at 10:24:37AM +0100, Ryan Roberts wrote: > >> On 17/10/2024 13:51, Niklas Cassel wrote: > >>> On Thu, Oct 17, 2024 at 01:42:22PM +0100, Ryan Roberts wrote: > > > > (snip) > > > >> That said, while investigating this, I've spotted a bug in my change. paddr calculation in sil24_qc_issue() is incorrect since sizeof(*pp->cmd_block) is no longer PAGE_SIZE. Based on feedback in another patch, I'm also converting the BUG_ONs to WARN_ON_ONCEs. > > > > Side note: Please wrap you lines to 80 characters max. > > Yes sorry, I turned off line wrapping for that last mail because I didn't want > it to wrap the copy/pasted patch. I'll figure out how to mix and match for future. > > > > > > >> > >> Additional proposed change, which I'll plan to include in the next version: > >> > >> ---8<--- > >> diff --git a/drivers/ata/sata_sil24.c b/drivers/ata/sata_sil24.c > >> index 85c6382976626..c402bf998c4ee 100644 > >> --- a/drivers/ata/sata_sil24.c > >> +++ b/drivers/ata/sata_sil24.c > >> @@ -257,6 +257,10 @@ union sil24_cmd_block { > >> struct sil24_atapi_block atapi; > >> }; > >> > >> +#define SIL24_ATA_BLOCK_SIZE struct_size_t(struct sil24_ata_block, sge, SIL24_MAX_SGE) > >> +#define SIL24_ATAPI_BLOCK_SIZE struct_size_t(struct sil24_atapi_block, sge, SIL24_MAX_SGE) > >> +#define SIL24_CMD_BLOCK_SIZE max(SIL24_ATA_BLOCK_SIZE, SIL24_ATAPI_BLOCK_SIZE) > >> + > >> static const struct sil24_cerr_info { > >> unsigned int err_mask, action; > >> const char *desc; > >> @@ -886,7 +890,7 @@ static unsigned int sil24_qc_issue(struct ata_queued_cmd *qc) > >> dma_addr_t paddr; > >> void __iomem *activate; > >> > >> - paddr = pp->cmd_block_dma + tag * sizeof(*pp->cmd_block); > >> + paddr = pp->cmd_block_dma + tag * SIL24_CMD_BLOCK_SIZE; > >> activate = port + PORT_CMD_ACTIVATE + tag * 8; > >> > >> /* > >> @@ -1192,7 +1196,7 @@ static int sil24_port_start(struct ata_port *ap) > >> struct device *dev = ap->host->dev; > >> struct sil24_port_priv *pp; > >> union sil24_cmd_block *cb; > >> - size_t cb_size = PAGE_SIZE * SIL24_MAX_CMDS; > >> + size_t cb_size = SIL24_CMD_BLOCK_SIZE * SIL24_MAX_CMDS; > >> dma_addr_t cb_dma; > >> > >> pp = devm_kzalloc(dev, sizeof(*pp), GFP_KERNEL); > >> @@ -1265,8 +1269,8 @@ static int sil24_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) > >> u32 tmp; > >> > >> /* union sil24_cmd_block must be PAGE_SIZE */ > > > > This comment should probably be rephrased to be more clear then, since like > > you said sizeof(union sil24_cmd_block) will no longer be PAGE_SIZE. > > How about: > > /* > * union sil24_cmd_block must be PAGE_SIZE once taking into account the 'sge' > * flexible array members in struct sil24_atapi_block and struct sil24_ata_block > */ Sounds good to me! Kind regards, Niklas