From patchwork Thu Mar 19 17:40:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Prasad Pandit X-Patchwork-Id: 11447809 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4E3B7913 for ; Thu, 19 Mar 2020 17:44:29 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 209EE2072D for ; Thu, 19 Mar 2020 17:44:29 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Rby+RffM" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 209EE2072D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:41184 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jEzDY-0004mW-8U for patchwork-qemu-devel@patchwork.kernel.org; Thu, 19 Mar 2020 13:44:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37642) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jEzCv-0003xX-JJ for qemu-devel@nongnu.org; Thu, 19 Mar 2020 13:43:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jEzCu-0006UZ-CE for qemu-devel@nongnu.org; Thu, 19 Mar 2020 13:43:49 -0400 Received: from us-smtp-delivery-74.mimecast.com ([63.128.21.74]:34942) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jEzCu-0006UD-8D for qemu-devel@nongnu.org; Thu, 19 Mar 2020 13:43:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584639827; h=from:from: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:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4HbV0cQ9P9Xo7EHZ8Az+BhnhBarlR3zlQZ8FTdALk2k=; b=Rby+RffMmZuKVRh3iWQfZpFTvx0VLPBhCIbP8XIbb/dxjyL+Brx5EglpwbZOqGy6w5XJAE o4YAhC6da9NBBIELmF2n+m5MYqtnXKMPveFX6e63u9nzgrzoOsfdmFk0K/+3YIQWtMPHex nXoapNPe2RCXWkYYyGPu7pXUMmKnyXU= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-306-HasEiZ25PT2_iWJlodoXig-1; Thu, 19 Mar 2020 13:43:43 -0400 X-MC-Unique: HasEiZ25PT2_iWJlodoXig-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BA789800D5B; Thu, 19 Mar 2020 17:43:42 +0000 (UTC) Received: from localhost.localdomain (unknown [10.40.192.16]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A029B21ECB; Thu, 19 Mar 2020 17:43:27 +0000 (UTC) From: P J P To: Jason Wang Subject: [PATCH v5 2/3] net: tulip: add .can_receive routine Date: Thu, 19 Mar 2020 23:10:49 +0530 Message-Id: <20200319174050.759794-3-ppandit@redhat.com> In-Reply-To: <20200319174050.759794-1-ppandit@redhat.com> References: <20200319174050.759794-1-ppandit@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 63.128.21.74 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Prasad J Pandit , Stefan Hajnoczi , Sven Schnelle , Qemu Developers , Li Qiang , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Ziming Zhang Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: Prasad J Pandit Define .can_receive routine to do sanity checks before receiving packet data. Signed-off-by: Prasad J Pandit Reviewed-by: Philippe Mathieu-Daudé --- hw/net/tulip.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) Update v3: define .can_receive routine -> https://lists.gnu.org/archive/html/qemu-devel/2020-02/msg06275.html Update v5: fix a typo in commit log message -> https://lists.gnu.org/archive/html/qemu-devel/2020-03/msg06209.html diff --git a/hw/net/tulip.c b/hw/net/tulip.c index fbe40095da..757f12c710 100644 --- a/hw/net/tulip.c +++ b/hw/net/tulip.c @@ -229,6 +229,18 @@ static bool tulip_filter_address(TULIPState *s, const uint8_t *addr) return ret; } +static int +tulip_can_receive(NetClientState *nc) +{ + TULIPState *s = qemu_get_nic_opaque(nc); + + if (s->rx_frame_len || tulip_rx_stopped(s)) { + return false; + } + + return true; +} + static ssize_t tulip_receive(TULIPState *s, const uint8_t *buf, size_t size) { struct tulip_descriptor desc; @@ -236,7 +248,7 @@ static ssize_t tulip_receive(TULIPState *s, const uint8_t *buf, size_t size) trace_tulip_receive(buf, size); if (size < 14 || size > sizeof(s->rx_frame) - 4 - || s->rx_frame_len || tulip_rx_stopped(s)) { + || !tulip_can_receive(s->nic->ncs)) { return 0; } @@ -288,6 +300,7 @@ static NetClientInfo net_tulip_info = { .type = NET_CLIENT_DRIVER_NIC, .size = sizeof(NICState), .receive = tulip_receive_nc, + .can_receive = tulip_can_receive, }; static const char *tulip_reg_name(const hwaddr addr)