Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp2249384pxj; Sun, 9 May 2021 20:49:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzZHWIG2DvBX/kDF/UH94eBlB2/5h8LihNOeu4PE38NvqNh4lexwVmGf3iDH09apXuwuGmF X-Received: by 2002:a17:906:82c9:: with SMTP id a9mr24398209ejy.58.1620618576285; Sun, 09 May 2021 20:49:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620618576; cv=none; d=google.com; s=arc-20160816; b=uXIgqDdtE50zyZu0ZHf2R0nog8ukPDohU4klvK/oN75wjvcTBoor8tJFghmlXYtQYs M/O6d+GNl8bedMEmCdzz7oEB6utb6vqsu9tT8znjyFnQCffSsoh5PxCVRjSS0eD1H47O aGjlIop96Zdzluc+Ddk8lRc55HN0LhALR65ycsLE/vje5zv6t286mTfK9xt5+chfXnri 2uKKaOcyNT7loKEmF1DLALIeFmEfgr8KrFwsTvZrjTwndp/7ApPSE/yhqkWfgSX7bqwy gRayWxYnageUt7SWVxpRfMJjeWRkkLSvYu8ktFEfUWJ+cIAOC36prbTaZKmpBhj6nkBr NMRw== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=gyt1CQPX41Y2hG/KqJcCuoJehCJZx0XEIj7EiL7V73Q=; b=TQEmgzzPAbWfzO5GLLYDuSihcKnphiQJ/pED7PehdMXLn14zPwQvJPNsU9ZDUjMrqN FhUgOkyXoO215Gf9YYcTe2kEvaDBgaxLIgZG/frK2PXxD+nB8RZ2VqCSLwkdOrZel5wT 2d8GvjgMLAIRjbos10KE6x2Vq9rZDeSeBO1wdeVKhS3Bm6hPhNJJz37PTP5du96uKlbu SaDdw4Ds0AAKkL0C/DWPV6ZLkKjkf23HtkIgI1s/Ej99Ho3o8qpGT0U0eIkNGzNagrPG JDnGjQzhBzNK0d9GLKVnF21kjGrDqZQS8QQgwQT/mXjUQtiGoo1DDrOd/qpAunRfK4g0 LbGQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amazon.co.jp header.s=amazon201209 header.b=mFybB0uh; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amazon.co.jp Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id i19si12388462ejv.399.2021.05.09.20.49.13; Sun, 09 May 2021 20:49:36 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@amazon.co.jp header.s=amazon201209 header.b=mFybB0uh; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amazon.co.jp Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230448AbhEJDsn (ORCPT + 99 others); Sun, 9 May 2021 23:48:43 -0400 Received: from smtp-fw-9102.amazon.com ([207.171.184.29]:63293 "EHLO smtp-fw-9102.amazon.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230449AbhEJDsm (ORCPT ); Sun, 9 May 2021 23:48:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.co.jp; i=@amazon.co.jp; q=dns/txt; s=amazon201209; t=1620618459; x=1652154459; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=gyt1CQPX41Y2hG/KqJcCuoJehCJZx0XEIj7EiL7V73Q=; b=mFybB0uhZEfRcGq0RSnRqnEuC4kMPgHalaPfjrlEFT5HmYLJw+aL7qzl 4aMYHvAWZ8oT8xzyx1zjjTfO1GTFlPtkjlVFYgSN5mc3Trhv3Ax2TCetU sIqMSvIhKLSogmnP7squ1PdcwroWfBF+AMGxdkJKvPRm0sQrrAVppnI6w 0=; X-IronPort-AV: E=Sophos;i="5.82,286,1613433600"; d="scan'208";a="134082432" Received: from pdx4-co-svc-p1-lb2-vlan2.amazon.com (HELO email-inbound-relay-1d-16425a8d.us-east-1.amazon.com) ([10.25.36.210]) by smtp-border-fw-9102.sea19.amazon.com with ESMTP; 10 May 2021 03:47:37 +0000 Received: from EX13MTAUWB001.ant.amazon.com (iad12-ws-svc-p26-lb9-vlan3.iad.amazon.com [10.40.163.38]) by email-inbound-relay-1d-16425a8d.us-east-1.amazon.com (Postfix) with ESMTPS id 4E04F100AB4; Mon, 10 May 2021 03:47:33 +0000 (UTC) Received: from EX13D04ANC001.ant.amazon.com (10.43.157.89) by EX13MTAUWB001.ant.amazon.com (10.43.161.207) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 10 May 2021 03:47:32 +0000 Received: from 88665a182662.ant.amazon.com (10.43.160.17) by EX13D04ANC001.ant.amazon.com (10.43.157.89) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 10 May 2021 03:47:28 +0000 From: Kuniyuki Iwashima To: "David S . Miller" , Jakub Kicinski , Eric Dumazet , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau CC: Benjamin Herrenschmidt , Kuniyuki Iwashima , Kuniyuki Iwashima , , , Subject: [PATCH v5 bpf-next 10/11] libbpf: Set expected_attach_type for BPF_PROG_TYPE_SK_REUSEPORT. Date: Mon, 10 May 2021 12:44:32 +0900 Message-ID: <20210510034433.52818-11-kuniyu@amazon.co.jp> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210510034433.52818-1-kuniyu@amazon.co.jp> References: <20210510034433.52818-1-kuniyu@amazon.co.jp> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.43.160.17] X-ClientProxiedBy: EX13D18UWC001.ant.amazon.com (10.43.162.105) To EX13D04ANC001.ant.amazon.com (10.43.157.89) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This commit introduces a new section (sk_reuseport/migrate) and sets expected_attach_type to two each section in BPF_PROG_TYPE_SK_REUSEPORT program. Signed-off-by: Kuniyuki Iwashima --- tools/lib/bpf/libbpf.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index e2a3cf437814..48df7498226e 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -8820,7 +8820,10 @@ static struct bpf_link *attach_iter(const struct bpf_sec_def *sec, static const struct bpf_sec_def section_defs[] = { BPF_PROG_SEC("socket", BPF_PROG_TYPE_SOCKET_FILTER), - BPF_PROG_SEC("sk_reuseport", BPF_PROG_TYPE_SK_REUSEPORT), + BPF_EAPROG_SEC("sk_reuseport/migrate", BPF_PROG_TYPE_SK_REUSEPORT, + BPF_SK_REUSEPORT_SELECT_OR_MIGRATE), + BPF_EAPROG_SEC("sk_reuseport", BPF_PROG_TYPE_SK_REUSEPORT, + BPF_SK_REUSEPORT_SELECT), SEC_DEF("kprobe/", KPROBE, .attach_fn = attach_kprobe), BPF_PROG_SEC("uprobe/", BPF_PROG_TYPE_KPROBE), -- 2.30.2