Received: by 2002:a05:6358:11c7:b0:104:8066:f915 with SMTP id i7csp268813rwl; Wed, 29 Mar 2023 01:15:04 -0700 (PDT) X-Google-Smtp-Source: AKy350Ylgv9XR6sDHqltuMk3s90p5XlVAcW7etBQs97VVxY39FpzTZA7PiaaeGQpsSUIfeSeXC/e X-Received: by 2002:a17:906:6b8b:b0:93f:9b68:a0f4 with SMTP id l11-20020a1709066b8b00b0093f9b68a0f4mr1581148ejr.26.1680077704695; Wed, 29 Mar 2023 01:15:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680077704; cv=none; d=google.com; s=arc-20160816; b=pVWpzoTU2rePBor11b31Q5CqFl3e/LD8+t1YCalKNMZNSdjiT8SQbKUQoHRxzctMHZ UY/ApkRCKKkKmr3QXycMScFUy4d9LGYy4J7xPfu6+WFtzGQPDnSpI44Iqajz4Nvx/Whz ndacyTOAusUNV7WQXXUmDvIoyTMCAPKLB+JEc50sZLJqnjIg8OeX7429WLQXYtZj9Tyb LLRJRDvWY+KAsT8B4E2QXBJqXzaJAytNH/pcHLaN9yt/APqkOhua6lqo2dpE8VbkP+/v ZKmX5f7oel0D2j3ZtgcvzpWp4vkvdtKlNDNKweVO2i50HzOJixNZRqcPq32gcF6URdyE vYpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=XkIlKbNA1TkczV1RQwGRPvUdSOv/P1LFG2UzjXLvDSU=; b=ej540DvUG5kjS0DB2Ex8ikdRg6CjaHQSz6ChKRUHLCAtwA5+8hm2nOWbGNS6XBHKjJ S3DumNbUMP6a6e1v4//DmQEG+dL47T77Y5+7wnbKCdbbxsvSYw2wJG/ZG7FXQ7FsWq8d nJuUC9z1l5BC9aZz5X2YFmXLaYc2pqx7T2MSUIwVIsuxyLOUXPfFKPfrjXCVe5l+kkrj islf3KYGap8eoSnLR9Vfc5vfjSZ/cCrO8j9ZY14RULEz5mab8AlM4DsNmILV4NBrZfYY 2OtXiLsu3Iom7Y+4GAakTpJEPQSJcNKZjADSld/MbeeZ++dv/OlwiaiSIypeeeO9J+d0 yzHA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.com header.s=susede1 header.b=l686GUWR; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id lc17-20020a170906f91100b009314e27809esi35277010ejb.116.2023.03.29.01.14.35; Wed, 29 Mar 2023 01:15:04 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=susede1 header.b=l686GUWR; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230254AbjC2IDJ (ORCPT + 99 others); Wed, 29 Mar 2023 04:03:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56562 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229615AbjC2IDG (ORCPT ); Wed, 29 Mar 2023 04:03:06 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2001:67c:2178:6::1d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1DFAF3C1D; Wed, 29 Mar 2023 01:03:05 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id A91031FE0C; Wed, 29 Mar 2023 08:03:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1680076983; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=XkIlKbNA1TkczV1RQwGRPvUdSOv/P1LFG2UzjXLvDSU=; b=l686GUWRSYDUHgUznltiyuVdym2edkLnSc7FQgWFkIM47r7WpN2eCj0rOSOWAOPRzKIbcn MzsbTQUYdGLGBtUVfeL7hzX+43Sf0U78MmmZWgWiwD85yibarwgOUC4rWn+AtBS3389qCJ o3va+i7x9e5FYkdI02qO0JklhX3jyjI= Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 5602A139D3; Wed, 29 Mar 2023 08:03:03 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id gP+dE7fwI2QLVAAAMHmgww (envelope-from ); Wed, 29 Mar 2023 08:03:03 +0000 From: Juergen Gross To: linux-kernel@vger.kernel.org, netdev@vger.kernel.org Cc: Juergen Gross , Wei Liu , Paul Durrant , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , xen-devel@lists.xenproject.org, Jan Beulich Subject: [PATCH v3] xen/netback: use same error messages for same errors Date: Wed, 29 Mar 2023 10:02:59 +0200 Message-Id: <20230329080259.14823-1-jgross@suse.com> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.5 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- V2: - new patch V3: - modify message text (Jan Beulich) --- 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 9ca4b69d3b39..dbaead243737 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.35.3