From patchwork Mon Oct 14 10:58:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Roberts X-Patchwork-Id: 13834696 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 9D0AAD1A443 for ; Mon, 14 Oct 2024 11:00:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2E9F16B00B1; Mon, 14 Oct 2024 07:00:59 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2990D6B00B2; Mon, 14 Oct 2024 07:00:59 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 160066B00B3; Mon, 14 Oct 2024 07:00:59 -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 E53F26B00B1 for ; Mon, 14 Oct 2024 07:00:58 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id D47D6140D62 for ; Mon, 14 Oct 2024 11:00:50 +0000 (UTC) X-FDA: 82671915144.13.367C055 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf14.hostedemail.com (Postfix) with ESMTP id E33B2100016 for ; Mon, 14 Oct 2024 11:00:49 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf14.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1728903626; a=rsa-sha256; cv=none; b=Bq9Kyoa2LtJD4/jamzWBaRbbJVF0hrgXSbGodNXjqVxJpk6hvj1z/6zM+O07xfZaJhIQPC RPli1fdRWXVky0Dz1IOcDCQ9t13c/2oLZWOQkJmv2KQx7nu5b/8fylEJlWAcgSiSxw0ztu pHTgeFDDiXtlyhfWEn2xMgJ1kRijcKs= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf14.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1728903626; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=I1DzdKxvBfT38zdagRbaKNLNUfAtWjrd/PCrV+EF/6Q=; b=XzmCQ9aFC5Yd2KczhukOD4OvSwa5KmeQ3kePJ9wPVsV5XOEsy2dmHnfLNAuQt7Qq5G5M4W JlTN2dKD94P8CSHyStHGahsF+oGhJC8HpNEMTrFXXL/YBxW526AQ1c55jhbEC6X/7GN2Fc I6F7MC1k7ndKB/is9zTOeDNvHrMWDtA= Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id B102016F2; Mon, 14 Oct 2024 04:01:25 -0700 (PDT) Received: from e125769.cambridge.arm.com (e125769.cambridge.arm.com [10.1.196.27]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id EDCA03F51B; Mon, 14 Oct 2024 04:00:52 -0700 (PDT) From: Ryan Roberts To: "David S. Miller" , Andrew Morton , Anshuman Khandual , Ard Biesheuvel , Catalin Marinas , David Hildenbrand , Eric Dumazet , Greg Marsden , Ivan Ivanov , Jakub Kicinski , Kalesh Singh , Marc Zyngier , Mark Rutland , Matthias Brugger , Miroslav Benes , Paolo Abeni , Will Deacon Cc: Ryan Roberts , intel-wired-lan@lists.osuosl.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, netdev@vger.kernel.org Subject: [RFC PATCH v1 28/57] net: igbvf: Remove PAGE_SIZE compile-time constant assumption Date: Mon, 14 Oct 2024 11:58:35 +0100 Message-ID: <20241014105912.3207374-28-ryan.roberts@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241014105912.3207374-1-ryan.roberts@arm.com> References: <20241014105514.3206191-1-ryan.roberts@arm.com> <20241014105912.3207374-1-ryan.roberts@arm.com> MIME-Version: 1.0 X-Rspam-User: X-Stat-Signature: jhpu8kk3jfaxb6if45ujz8oa5j5ke7kz X-Rspamd-Queue-Id: E33B2100016 X-Rspamd-Server: rspam02 X-HE-Tag: 1728903649-244503 X-HE-Meta: U2FsdGVkX19qZV1KILMsZJJZ47KD62hvr8BYKvNR3cVOMncLw1SqLzJPhhJq0UaYebt0Le4UcKDGUgKD6XlmH50NnntyIAC4tVbDHSoET3IjCXjWlaJp6ojkS1GTMxo08v7SdxwKFldTsTvfEYXw8Y9UHZTY8B3EuaxKJLrdsTsi/5qN+Ohb8tNgAcTClsY3sXfNk/Th9Y7S1DSQC9en+jMKi2knPBCzE6qvVChCzCEee3HFSTmV+hFAlmvqoeN0vOHOlbZNmYkVYsaw3waZlgGrIECOBihZH91eNGIHuH+Pv3g1u2ngg7lbqgSZiA9gAREoQOM9zn5TYRsTRTHm5wK+2/ZRHEcJr+K2QZjx4vsKGNNYccQw5I3xiVfqw8ActeBltY0LrVv4kM5TPRf+arEvoye/aDPMhHCn5h5+mElGaKaTRDsa/xCcJ8v61zGZtfVxXQfd5A+Jwt+r4KfT8Az5XlMvP20h0U8qzbT9g3RMyKrNVBoGWJh/+Ly5UPgVd82OjBTZ//D2rGJYFfsG82XLvluOo6WnrQSTJA6HOh9bUjG3s3T440jmsvCQ7N0xih9sOgJvfxAKvrG4PQXDUFgFNTsH9SmXc3Df/qOIc58wWPAwqq7KCDSkRhMuB9I4QdmSYjNF2kPPBs79328S/01gVagT5cfj154Q94iSVeubiCUHRQWxh0cB0kkxGFCDsBawj4jidUZFB6nOJXRUVEIlunlDKvo587HFMWRd7vZtSKsaKU3qR7Hv7xeLd60SLBVAphNadTvP0Qq1ykO0BJ18hImSxbN+zxD547S0Zp0lSH1kawr3Ud4eSHZQma7fQvxgRVCR1IGPWu8ghylZfRnJZbH9aCUhj3De0fteoPpfbPtx26hVI2NsPU1a5tH7c8hWciTyrm/F+HmvYUH/P8oWGQM8dQXNvp1xVLWFuji/BPSXVftK47xpQyMSF0h91BsQG3AOgeoc+Xr03cH z6DVOq2J 6Yxr08jUKDj6B9gDM4zZX2rU48CaEZhOTA/Pt7eTwNPck7ACrJIABHjQYPhBzi+GI7PODcaEHoZggYolm7mRZTMh510UZ69C7eyq15P/HHZOY0a21Pb11LtyCRHq0MqEPbxWThvuV+G5o/ix8Ub7mnkpUTRT18+4YfpwdBju9STZm802QWUKAv69Q6BcHcalIDbZq5rRshRImZjQH3qvv+diVcxxB3xqE0HjO 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: To prepare for supporting boot-time page size selection, refactor code to remove assumptions about PAGE_SIZE being compile-time constant. Code intended to be equivalent when compile-time page size is active. Convert CPP conditionals to C conditionals. The compiler will dead code strip when doing a compile-time page size build, for the same end effect. But this will also work with boot-time page size builds. Signed-off-by: Ryan Roberts --- ***NOTE*** Any confused maintainers may want to read the cover note here for context: https://lore.kernel.org/all/20241014105514.3206191-1-ryan.roberts@arm.com/ drivers/net/ethernet/intel/igbvf/netdev.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/intel/igbvf/netdev.c b/drivers/net/ethernet/intel/igbvf/netdev.c index 925d7286a8ee4..2e11d999168de 100644 --- a/drivers/net/ethernet/intel/igbvf/netdev.c +++ b/drivers/net/ethernet/intel/igbvf/netdev.c @@ -2419,12 +2419,10 @@ static int igbvf_change_mtu(struct net_device *netdev, int new_mtu) adapter->rx_buffer_len = 1024; else if (max_frame <= 2048) adapter->rx_buffer_len = 2048; - else -#if (PAGE_SIZE / 2) > 16384 + else if ((PAGE_SIZE / 2) > 16384) adapter->rx_buffer_len = 16384; -#else + else adapter->rx_buffer_len = PAGE_SIZE / 2; -#endif /* adjust allocation if LPE protects us, and we aren't using SBP */ if ((max_frame == ETH_FRAME_LEN + ETH_FCS_LEN) ||