From patchwork Mon Apr 12 08:25:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Melnichenko X-Patchwork-Id: 1465054 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=daynix-com.20150623.gappssmtp.com header.i=@daynix-com.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=TrPw1HO3; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4FJhgH0x7Sz9sVq for ; Mon, 12 Apr 2021 18:27:22 +1000 (AEST) Received: from localhost ([::1]:47482 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lVrui-0005ix-89 for incoming@patchwork.ozlabs.org; Mon, 12 Apr 2021 04:27:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60736) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lVruJ-0005g6-4F for qemu-devel@nongnu.org; Mon, 12 Apr 2021 04:26:55 -0400 Received: from mail-lj1-x22e.google.com ([2a00:1450:4864:20::22e]:46923) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lVruH-0001tj-J7 for qemu-devel@nongnu.org; Mon, 12 Apr 2021 04:26:54 -0400 Received: by mail-lj1-x22e.google.com with SMTP id u20so14315805lja.13 for ; Mon, 12 Apr 2021 01:26:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=6xQ6d7Yn5nFfsysxmW+CwFe1lo5fZBiYJKt+iocWOWY=; b=TrPw1HO3J3w7YjfD12YFZz2QuU9080NETA+3cnuHUGoCNoD9zY6IUaxE6PF/BZgA6+ gND31dfh2qs2V/3m5As9D9/q2nUB6sa/MfoSW4E/vSYvXokfDdEbog0W9ayjtByUSbmb MYV0ffGfC1l+dbpAsMzuji84G+b74YACZDQEeg4vALfZjhwQBdHb7bKhyePme+HUsLL4 DJwy0ogF97KqtMJUp8t+CnbVJFQM/kXrny0d+DR1GRsTTCjya01wJVh7IAtBXAngw2d+ RvBESf2wH2cSaixqPw5seK+FhPKdvayqeGDh1xyHLquLkGB1xFsf+gv9wwWRaOYlEvHC obYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=6xQ6d7Yn5nFfsysxmW+CwFe1lo5fZBiYJKt+iocWOWY=; b=oZTqjMSB4EHtza7RvcY2/BMMXTX9IWOiC9hZDz4ve+X3NVaMpu4gl2KY67yv/CjZuO XMqwWCsA41o7oP4B/YvCgjKOBzGGhck9ABzG7X/OW1BfyRs4vQ7BOMHP9zcweJcPLFL/ Lnf361d1MuvtCI102Z3QcUhh3CtsCkjCcXflUa/8CZyu/dRdUea4+i6lguoKWBobIGGG 5dISNmfkxKYNmdXLhNo5xQ9DGSDpzDbUdmfb8rkhZ00j7OhnGdf4WwuufKJlN+my7CdQ nUjw5JchgNMFhQLzZbxB/kjligmwT7WLl4qxDDRclWXUBYDkNbIvPTjVwb0Flp+AdK4z g7fw== X-Gm-Message-State: AOAM5327PVrxeO0/DHxqFQhqBeRMyU88slHV+XU74lyEyJhYR1ha0bKK qOEdePkjkU20GqBn+7YL0HrSfggfCzMKag== X-Google-Smtp-Source: ABdhPJzyocVp+AZqN1EaOs0EA51v1viUjkqlv7LPLZ1yeUcqXKNgbJqk9oLFI7p110cieMliXpFmBw== X-Received: by 2002:a2e:a481:: with SMTP id h1mr17271201lji.143.1618216012104; Mon, 12 Apr 2021 01:26:52 -0700 (PDT) Received: from localhost.localdomain (128-124-64-30.mobile.vf-ua.net. [128.124.64.30]) by smtp.gmail.com with ESMTPSA id n22sm2679702ljc.23.2021.04.12.01.26.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Apr 2021 01:26:51 -0700 (PDT) From: Andrew Melnychenko To: jasowang@redhat.com, mst@redhat.com Subject: [PATCH v6 2/7] net: Added SetSteeringEBPF method for NetClientState. Date: Mon, 12 Apr 2021 11:25:07 +0300 Message-Id: <20210412082512.14998-3-andrew@daynix.com> X-Mailer: git-send-email 2.31.0 In-Reply-To: <20210412082512.14998-1-andrew@daynix.com> References: <20210412082512.14998-1-andrew@daynix.com> MIME-Version: 1.0 Received-SPF: none client-ip=2a00:1450:4864:20::22e; envelope-from=andrew@daynix.com; helo=mail-lj1-x22e.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: yan@daynix.com, yuri.benditovich@daynix.com, berrange@redhat.com, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Andrew For now, that method supported only by Linux TAP. Linux TAP uses TUNSETSTEERINGEBPF ioctl. Signed-off-by: Andrew Melnychenko --- include/net/net.h | 2 ++ net/tap-bsd.c | 5 +++++ net/tap-linux.c | 13 +++++++++++++ net/tap-solaris.c | 5 +++++ net/tap-stub.c | 5 +++++ net/tap.c | 9 +++++++++ net/tap_int.h | 1 + 7 files changed, 40 insertions(+) diff --git a/include/net/net.h b/include/net/net.h index eff24519d2..c55eb08437 100644 --- a/include/net/net.h +++ b/include/net/net.h @@ -61,6 +61,7 @@ typedef int (SetVnetBE)(NetClientState *, bool); typedef struct SocketReadState SocketReadState; typedef void (SocketReadStateFinalize)(SocketReadState *rs); typedef void (NetAnnounce)(NetClientState *); +typedef bool (SetSteeringEBPF)(NetClientState *, int); typedef struct NetClientInfo { NetClientDriver type; @@ -82,6 +83,7 @@ typedef struct NetClientInfo { SetVnetLE *set_vnet_le; SetVnetBE *set_vnet_be; NetAnnounce *announce; + SetSteeringEBPF *set_steering_ebpf; } NetClientInfo; struct NetClientState { diff --git a/net/tap-bsd.c b/net/tap-bsd.c index 77aaf674b1..4f64f31e98 100644 --- a/net/tap-bsd.c +++ b/net/tap-bsd.c @@ -259,3 +259,8 @@ int tap_fd_get_ifname(int fd, char *ifname) { return -1; } + +int tap_fd_set_steering_ebpf(int fd, int prog_fd) +{ + return -1; +} diff --git a/net/tap-linux.c b/net/tap-linux.c index b0635e9e32..9584769740 100644 --- a/net/tap-linux.c +++ b/net/tap-linux.c @@ -316,3 +316,16 @@ int tap_fd_get_ifname(int fd, char *ifname) pstrcpy(ifname, sizeof(ifr.ifr_name), ifr.ifr_name); return 0; } + +int tap_fd_set_steering_ebpf(int fd, int prog_fd) +{ + if (ioctl(fd, TUNSETSTEERINGEBPF, (void *) &prog_fd) != 0) { + error_report("Issue while setting TUNSETSTEERINGEBPF:" + " %s with fd: %d, prog_fd: %d", + strerror(errno), fd, prog_fd); + + return -1; + } + + return 0; +} diff --git a/net/tap-solaris.c b/net/tap-solaris.c index 0475a58207..d85224242b 100644 --- a/net/tap-solaris.c +++ b/net/tap-solaris.c @@ -255,3 +255,8 @@ int tap_fd_get_ifname(int fd, char *ifname) { return -1; } + +int tap_fd_set_steering_ebpf(int fd, int prog_fd) +{ + return -1; +} diff --git a/net/tap-stub.c b/net/tap-stub.c index de525a2e69..a0fa25804b 100644 --- a/net/tap-stub.c +++ b/net/tap-stub.c @@ -85,3 +85,8 @@ int tap_fd_get_ifname(int fd, char *ifname) { return -1; } + +int tap_fd_set_steering_ebpf(int fd, int prog_fd) +{ + return -1; +} diff --git a/net/tap.c b/net/tap.c index dd42ac6134..54c9960593 100644 --- a/net/tap.c +++ b/net/tap.c @@ -347,6 +347,14 @@ static void tap_poll(NetClientState *nc, bool enable) tap_write_poll(s, enable); } +static bool tap_set_steering_ebpf(NetClientState *nc, int prog_fd) +{ + TAPState *s = DO_UPCAST(TAPState, nc, nc); + assert(nc->info->type == NET_CLIENT_DRIVER_TAP); + + return tap_fd_set_steering_ebpf(s->fd, prog_fd) == 0; +} + int tap_get_fd(NetClientState *nc) { TAPState *s = DO_UPCAST(TAPState, nc, nc); @@ -372,6 +380,7 @@ static NetClientInfo net_tap_info = { .set_vnet_hdr_len = tap_set_vnet_hdr_len, .set_vnet_le = tap_set_vnet_le, .set_vnet_be = tap_set_vnet_be, + .set_steering_ebpf = tap_set_steering_ebpf, }; static TAPState *net_tap_fd_init(NetClientState *peer, diff --git a/net/tap_int.h b/net/tap_int.h index 225a49ea48..547f8a5a28 100644 --- a/net/tap_int.h +++ b/net/tap_int.h @@ -44,5 +44,6 @@ int tap_fd_set_vnet_be(int fd, int vnet_is_be); int tap_fd_enable(int fd); int tap_fd_disable(int fd); int tap_fd_get_ifname(int fd, char *ifname); +int tap_fd_set_steering_ebpf(int fd, int prog_fd); #endif /* NET_TAP_INT_H */