From patchwork Fri Feb 4 06:47:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Heimes X-Patchwork-Id: 1588304 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=dUVTVOK1; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JqmMv16Cqz9s8q for ; Fri, 4 Feb 2022 17:48:41 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1nFsOS-0001Ja-Ve; Fri, 04 Feb 2022 06:48:28 +0000 Received: from smtp-relay-canonical-0.internal ([10.131.114.83] helo=smtp-relay-canonical-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1nFsOR-0001JS-0o for kernel-team@lists.ubuntu.com; Fri, 04 Feb 2022 06:48:27 +0000 Received: from T570.fritz.box (p5dce2ea0.dip0.t-ipconnect.de [93.206.46.160]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-0.canonical.com (Postfix) with ESMTPSA id C660C41039 for ; Fri, 4 Feb 2022 06:48:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1643957306; bh=KnvcizO2qGiusQMp6Xabal4bD4IGDMB7phg8gkyLsWQ=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=dUVTVOK1/dvaCN9hRSA6UO44l1PAgnxNQ1MsoCQJ/hO2T0LXVibrr93RkjZtwnMLP zmT9KQ6c0WwNPHNVBS+n729RLIhI6MoMvpwwifAmVf0PK+DEuuT4tQzCt2e7/ocsJZ 0AAGn1NEWONZ/98zzhRwni/WI3+KhKkR9baCFPNkidft0kxjVCH0L2sAsFY8gFqFSH 4N34XZ/8ULmpCAwk2yhdSbKe8p/usR3QnwJBACigg0ZxAOwKbmxNIQwG2cpGPJUz9y BvH/4/ZfZkMIWCbGgVhqcTAhqXTX1iUOIWw2GYEe1rvg9AogClXhb21exeDvdO3yqw Vm4+kaoYdVEKQ== From: frank.heimes@canonical.com To: kernel-team@lists.ubuntu.com Subject: [SRU][F][PATCH 1/1] s390/qeth: use memory reserves to back RX buffers Date: Fri, 4 Feb 2022 07:47:54 +0100 Message-Id: <20220204064754.425963-2-frank.heimes@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220204064754.425963-1-frank.heimes@canonical.com> References: <20220204064754.425963-1-frank.heimes@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Julian Wiedmann BugLink: https://bugs.launchpad.net/bugs/1959529 Use dev_alloc_page() for backing the RX buffers with pages. This way we pick up __GFP_MEMALLOC. Signed-off-by: Julian Wiedmann Signed-off-by: David S. Miller (backported from commit 714c9108851743bb718fbc1bfb81290f12a53854) Signed-off-by: Alexandra Winter Signed-off-by: Frank Heimes Acked-by: Thadeu Lima de Souza Cascardo --- drivers/s390/net/qeth_core_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c index ec8c7a640d9e..61372e5c279b 100644 --- a/drivers/s390/net/qeth_core_main.c +++ b/drivers/s390/net/qeth_core_main.c @@ -227,7 +227,7 @@ static int qeth_alloc_buffer_pool(struct qeth_card *card) return -ENOMEM; } for (j = 0; j < QETH_MAX_BUFFER_ELEMENTS(card); ++j) { - ptr = (void *) __get_free_page(GFP_KERNEL); + ptr = (void *) __dev_alloc_page(GFP_KERNEL); if (!ptr) { while (j > 0) free_page((unsigned long) @@ -2612,7 +2612,7 @@ static struct qeth_buffer_pool_entry *qeth_find_free_buffer_pool_entry( struct qeth_buffer_pool_entry, list); for (i = 0; i < QETH_MAX_BUFFER_ELEMENTS(card); ++i) { if (page_count(virt_to_page(entry->elements[i])) > 1) { - page = alloc_page(GFP_ATOMIC); + page = dev_alloc_page(); if (!page) { return NULL; } else {