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 lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5CBACC76196 for ; Thu, 6 Apr 2023 11:33:07 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.518843.805768 (Exim 4.92) (envelope-from ) id 1pkNrF-0002K5-7f; Thu, 06 Apr 2023 11:32:49 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 518843.805768; Thu, 06 Apr 2023 11:32:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pkNrF-0002Jy-4h; Thu, 06 Apr 2023 11:32:49 +0000 Received: by outflank-mailman (input) for mailman id 518843; Thu, 06 Apr 2023 11:32:47 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pkNrD-0001qa-N3 for xen-devel@lists.xenproject.org; Thu, 06 Apr 2023 11:32:47 +0000 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id c0bfc78e-d46e-11ed-85db-49a42c6b2330; Thu, 06 Apr 2023 13:32:47 +0200 (CEST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id E10B66459D; Thu, 6 Apr 2023 11:32:45 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 22A6CC4339B; Thu, 6 Apr 2023 11:32:44 +0000 (UTC) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: c0bfc78e-d46e-11ed-85db-49a42c6b2330 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1680780765; bh=JYv8anrELkRS2InyKfowv6LTjAw5NsWku3VF0hOAG1c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TlhXg6GL5mf5rV0n3VwXmCe9PulH8a8MtoXyFv6OONrS0HyqnnsaUhkG+tnx+i6FS hMzSiofU9zHbmdEeAgUwJa9tuO8xehyJ3ftsoCqe89JcT9bVyrwFkc4DJ7KvnfFQ1d 7S2h1mZ62MyPSdt9F4WDrpuD4fWI1QVLi/rjQYN9enSxrd6eddA7pXAeDyOs1G4+ZD tPGNPiivyC7pQgnZFdLVFBb6B7cHKFSyhn+fFKK9OoVcvWvoSkMT9z8QA25keq1oJY AEh/LKzK5g2/5vkxiOysqp5YTp1eQhxV4QuNkuzw0xeY/SUVx7uFBgsCQyDtYcSuEK siLcWKzzJ1m8g== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Juergen Gross , Jan Beulich , Paolo Abeni , Sasha Levin , wei.liu@kernel.org, paul@xen.org, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, xen-devel@lists.xenproject.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 6.1 14/17] xen/netback: use same error messages for same errors Date: Thu, 6 Apr 2023 07:32:08 -0400 Message-Id: <20230406113211.648424-14-sashal@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230406113211.648424-1-sashal@kernel.org> References: <20230406113211.648424-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit From: Juergen Gross [ Upstream commit 2eca98e5b24d01c02b46c67be05a5f98cc9789b1 ] Issue the same error message in case an illegal page boundary crossing has been detected in both cases where this is tested. Suggested-by: Jan Beulich Signed-off-by: Juergen Gross Reviewed-by: Jan Beulich Link: https://lore.kernel.org/r/20230329080259.14823-1-jgross@suse.com Signed-off-by: Paolo Abeni Signed-off-by: Sasha Levin --- drivers/net/xen-netback/netback.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c index 5c266062c08f0..c35c085dbc877 100644 --- a/drivers/net/xen-netback/netback.c +++ b/drivers/net/xen-netback/netback.c @@ -996,10 +996,8 @@ static void xenvif_tx_build_gops(struct xenvif_queue *queue, /* No crossing a page as the payload mustn't fragment. */ if (unlikely((txreq.offset + txreq.size) > XEN_PAGE_SIZE)) { - netdev_err(queue->vif->dev, - "txreq.offset: %u, size: %u, end: %lu\n", - txreq.offset, txreq.size, - (unsigned long)(txreq.offset&~XEN_PAGE_MASK) + txreq.size); + netdev_err(queue->vif->dev, "Cross page boundary, txreq.offset: %u, size: %u\n", + txreq.offset, txreq.size); xenvif_fatal_tx_err(queue->vif); break; } -- 2.39.2