From patchwork Sun Oct 13 16:26:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Luczaj X-Patchwork-Id: 13833360 X-Patchwork-Delegate: bpf@iogearbox.net Received: from mailtransmit04.runbox.com (mailtransmit04.runbox.com [185.226.149.37]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 19362145B0C for ; Sun, 13 Oct 2024 16:27:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.226.149.37 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728836844; cv=none; b=lmjmwUi9XEqrD3+URtZZUTuqNQeOgPYKIuSGo685FasVsIYJPBG8GT9LuJr+Pnj07RAmIXTsbsTxuFjIoZEvUsF71R329a0W7boPfIJVPTCAGOoxpnNHRCDAv2yyzvD8VW+XKERaqggHK1yk/HEF2g+0U+S3epFlQIQ65hlOkMM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728836844; c=relaxed/simple; bh=e3SrNTsK0dGD9xesl4OQqQipb7Tulhm6OyotiGyjymc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=gop0ylNckG8NPTibkw+JKzIWdoed06No7X/mp4moisB0cbLdnz2s4uiRUKp0nay584gIBfZ/TCAl/oFr6ZWF9BRZQC24bAc3dJt5rsrz5dGdmv3zWoXuDsMUz8KPYWJ89p4OnjjoAtIrEx5Q8TKYlwnH+efJjJeJWA+4ZZlCHPU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=rbox.co; spf=pass smtp.mailfrom=rbox.co; dkim=pass (2048-bit key) header.d=rbox.co header.i=@rbox.co header.b=yhHE+Jqm; arc=none smtp.client-ip=185.226.149.37 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=rbox.co Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rbox.co Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=rbox.co header.i=@rbox.co header.b="yhHE+Jqm" Received: from mailtransmit02.runbox ([10.9.9.162] helo=aibo.runbox.com) by mailtransmit04.runbox.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1t01R6-00CydY-QE; Sun, 13 Oct 2024 18:27:16 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=rbox.co; s=selector1; h=Cc:To:In-Reply-To:References:Message-Id: Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date:From; bh=F+RJd+JIpP4NiuqPuwFGdxJw5I73YccdWoYTGb3P+Vo=; b=yhHE+JqmMpgEhQ3KhAvJUPSfr6 2dc6qE/7Y6UX7ylRucZ1qHklE3xOJ6oqBYbL5LmB3tl2WHaQ6VLBCVq6FnzLdggz9gcon/eYsTjp2 y8o2xcnE5ulzQgGEGmVm5P5yck/06B5JXJg1+Sb/phghMZtXVCwfae+XJjEaPnRXlrngR3mupRZNF nwyCfy9obsTCKP2jS0Oy0xWD2aJNn8ACCNfksbUPeqgvVX3QIk0EUb8h6dVzvJog2q5rTxnFnEHoa C5cO8pR8vizF1D3waghnnSd22Hd7335AOI/g/yNniF/gMHCu7o7/aqTTb1+MsfEP8WnFZSdybHrWM wv3b8F8g==; Received: from [10.9.9.73] (helo=submission02.runbox) by mailtransmit02.runbox with esmtp (Exim 4.86_2) (envelope-from ) id 1t01R1-0007iv-AC; Sun, 13 Oct 2024 18:27:11 +0200 Received: by submission02.runbox with esmtpsa [Authenticated ID (604044)] (TLS1.2:ECDHE_SECP256R1__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.93) id 1t01Qh-00GV5b-Sn; Sun, 13 Oct 2024 18:26:51 +0200 From: Michal Luczaj Date: Sun, 13 Oct 2024 18:26:42 +0200 Subject: [PATCH bpf v2 4/4] bpf, vsock: Drop static vsock_bpf_prot initialization Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241013-vsock-fixes-for-redir-v2-4-d6577bbfe742@rbox.co> References: <20241013-vsock-fixes-for-redir-v2-0-d6577bbfe742@rbox.co> In-Reply-To: <20241013-vsock-fixes-for-redir-v2-0-d6577bbfe742@rbox.co> To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , John Fastabend , Jakub Sitnicki , "Michael S. Tsirkin" , Stefano Garzarella , Bobby Eshleman , Stefan Hajnoczi Cc: netdev@vger.kernel.org, bpf@vger.kernel.org, Michal Luczaj X-Mailer: b4 0.14.2 X-Patchwork-Delegate: bpf@iogearbox.net vsock_bpf_prot is set up at runtime. Remove the superfluous init. No functional change intended. Fixes: 634f1a7110b4 ("vsock: support sockmap") Signed-off-by: Michal Luczaj --- net/vmw_vsock/vsock_bpf.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/net/vmw_vsock/vsock_bpf.c b/net/vmw_vsock/vsock_bpf.c index c42c5cc18f324108e044772e957c8d42c92ead8c..4aa6e74ec2957b28b9e9d8ce0b5f4d5c289a9276 100644 --- a/net/vmw_vsock/vsock_bpf.c +++ b/net/vmw_vsock/vsock_bpf.c @@ -114,14 +114,6 @@ static int vsock_bpf_recvmsg(struct sock *sk, struct msghdr *msg, return copied; } -/* Copy of original proto with updated sock_map methods */ -static struct proto vsock_bpf_prot = { - .close = sock_map_close, - .recvmsg = vsock_bpf_recvmsg, - .sock_is_readable = sk_msg_is_readable, - .unhash = sock_map_unhash, -}; - static void vsock_bpf_rebuild_protos(struct proto *prot, const struct proto *base) { *prot = *base;