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;
Date:   Fri, 14 May 2021 18:06:16 -0700
From:   Martin KaFai Lau <kafai@fb.com>
To:     Kuniyuki Iwashima <kuniyu@amazon.co.jp>
CC:     "David S . Miller" <davem@davemloft.net>,
        Jakub Kicinski <kuba@kernel.org>,
        Eric Dumazet <edumazet@google.com>,
        Alexei Starovoitov <ast@kernel.org>,
        Daniel Borkmann <daniel@iogearbox.net>,
        Andrii Nakryiko <andrii@kernel.org>,
        Benjamin Herrenschmidt <benh@amazon.com>,
        Kuniyuki Iwashima <kuni1840@gmail.com>, <bpf@vger.kernel.org>,
        <netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v5 bpf-next 05/11] tcp: Migrate
 TCP_ESTABLISHED/TCP_SYN_RECV sockets in accept queues.
Message-ID: <20210515010616.uy5szaoqvjrn4qfv@kafai-mbp>
References: <20210510034433.52818-1-kuniyu@amazon.co.jp>
 <20210510034433.52818-6-kuniyu@amazon.co.jp>
Content-Type: text/plain; charset="us-ascii"
Content-Disposition: inline
In-Reply-To: <20210510034433.52818-6-kuniyu@amazon.co.jp>
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
Received: from kafai-mbp (2620:10d:c090:400::5:717c) by CO2PR04CA0105.namprd04.prod.outlook.com (2603:10b6:104:6::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Sat, 15 May 2021 01:06:19 +0000
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id: 1d61d8ad-dda7-4726-9ed6-08d9173da66b
X-MS-TrafficTypeDiagnostic: BYAPR15MB3304:
X-Microsoft-Antispam-PRVS: <BYAPR15MB33047B06D54D2DAB7437F9F1D52F9@BYAPR15MB3304.namprd15.prod.outlook.com>
X-FB-Source: Internal
X-MS-Oob-TLC-OOBClassifiers: OLM:7219;
X-MS-Exchange-SenderADCheck: 1
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: M+598x8P488BWz4P6czf4+bj7ncB9f5tqWpAXicUxeT/taAQHKStWLXuorv0zwOSIULZFDojTRig/YElPBVW53IpBvmyI02d/rVqlahYg38bxmrG0if2a2AGCtkhkZCnZ75BhQwDTdaRT731TOnYMFGkWW9AlBykk+l9/6e6YSTU348ChFkqMcCIQIBeVa3RkfTIhMDzvHoxcRcgbvc9DWhyY7uoTUDA8jSdIR6+zZaAiNr/e3eOcWJ06dU4nmIbTRDfZAEJEqQH0eWgkbPG9Y6r3M5NAgDIhDx4z4Yc+VtC3lVV2MigCeSoQucxZeCcKZVIAe0W7jj34j2eCsd4fIiwrQlmctSd5p4SsshPXTeJYajXl1OODUNV0XluzV+ZSivmkdJdU/mml7KQSZe+UAvZKRoWChBxPSTP36QwZFwq75FIB5QQKtswVjJIs+xtQYweTq6CDa3XA+0cB8mFncXy8vEvyxIdiXJ5bR4SXlwFEN2E8UQ6sndrZnmUjkzGDlDKEP2KYMqodpz8dwsHV9KRighXlUTnmlf0YKVcwzs4xGFjAjbNM0zYDzxC0+xR3zvnPm4S6NRLz72ZiL2fSA==
X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BY5PR15MB3571.namprd15.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(346002)(376002)(39850400004)(396003)(136003)(366004)(55016002)(33716001)(1076003)(8936002)(316002)(5660300002)(4326008)(9686003)(54906003)(6666004)(7416002)(83380400001)(6916009)(38100700002)(16526019)(478600001)(6496006)(66476007)(2906002)(8676002)(186003)(66556008)(86362001)(66946007)(52116002);DIR:OUT;SFP:1102;
X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?TvZoxRCKxX3KNJY5y8oqLeetM4RNh6g/a8SAIO1gWHpmULy+Bov9v/wenUMY?=
 =?us-ascii?Q?WCM4f9dSO/K91HNN/ocN4R+aFGe2QhXkNFM0ULGvhX1BH3kHRgORoSXDrBz5?=
 =?us-ascii?Q?bIJQZgj7d2aGYTnZ5q7fY1Fj3EPhi8O66okzsSCw0lnS0y4hDrUBHFyWWgcM?=
 =?us-ascii?Q?bdvJd1IiVNz4ZMpKoS0fjGKYm2CzzuSAW3icU/gZZuDcDGL+NtpwLl8Ttuiz?=
 =?us-ascii?Q?vEZt9zo6+8VKnN7AmS70yxdOo+WP/TDn271NudMZVSKelaT3CgunrZrXJ4HM?=
 =?us-ascii?Q?WFiZIx7MUHFkqxb0cshuLT0FUMgYIZCo6mzf71eUxclkb2yn9siPMHsqfcy0?=
 =?us-ascii?Q?8yZdQuijkwz+3XZywekDlNu399GyDmuWCsNeNxmYjMzP388XdHPFg9T1pfOu?=
 =?us-ascii?Q?OgG2/fytybvaGCK/e2FR7Ny0nyFem2MNDMMRWMFD3yu9EmRczRQjHeVdUgQz?=
 =?us-ascii?Q?N95aD9Jf5XPCBhNLYQp7ifl2zZBrndshxIcs8xKjz6AJVOarjVwjOOropM7h?=
 =?us-ascii?Q?yQPVdi+2hi0tFddOyhmc5B8PnfExLXPpOOqFGtq8bkKDYckFqDi/qp3xMdME?=
 =?us-ascii?Q?UB+VxlYmepm1GlOIZpE107/qsZtHhnPR1YppUx8+1ma4HEHFC4KMDvCURI8V?=
 =?us-ascii?Q?kg+WaelY10JtkZJz/bOAw8kddHEu9xdHSvA0TmXGw/de1QjK1e/kUYmMEd/c?=
 =?us-ascii?Q?njTMirTR1UWixGJWB/7ET7asMhu6o++ysey9b9ar/98yWXNIDEdyTYnzsjnk?=
 =?us-ascii?Q?yRLUjg5XSt3hw3L/fOSTO7BtXO56HgGF8wI/air36jMWJsM8QnGT1/XjBKWY?=
 =?us-ascii?Q?PM2u4i7/+4qufrwczZ2ODkwFZrrnf2RSqftJdYE3oiWy9oNZK48efgg8xC/R?=
 =?us-ascii?Q?U6s/gs/jq1Gc/VvrcZyNiqWq73UK4qkc5Ruq7RGbBSTqRuTwrtsJsD5STeTl?=
 =?us-ascii?Q?GEhpjsv9Mci6JBl+oIm+qCoxfIYRJhS0scS3ziTvNJ8nF0j5/NlZSVDbTshT?=
 =?us-ascii?Q?4STsbTdT9TSw5RGw6cB3/io6oLSkleZnrJgj2wVX3pcE38UPqoZtBMyJ5M3t?=
 =?us-ascii?Q?QZNT1LbH+htTQqlo79HIgD30jRMHYVt0VcF3g4amA6SduWcO2Gllp7yCBZ8Q?=
 =?us-ascii?Q?IEGbMgNWx7z8nYC6PSE/jhxUPKQuTzNdecUnMczD3HCvvm/1EvmNXqwAbifO?=
 =?us-ascii?Q?k+s4krqPZa2CHla+YediAuerSWGn7go9S1I2QoOnizIVruAwdndfGPh9CNQx?=
 =?us-ascii?Q?V4/Jz7wbW26MIiaPkiS49OPO8koi6eiooRu1GUE3ClML1rVu9eS7rrzn70qP?=
 =?us-ascii?Q?7llDLebpbi78FAy2DziiSv9QeAlVEZvpPRA5ASV+8/maJA=3D=3D?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 1d61d8ad-dda7-4726-9ed6-08d9173da66b
X-MS-Exchange-CrossTenant-AuthSource: BY5PR15MB3571.namprd15.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 May 2021 01:06:20.6298
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 8ae927fe-1255-47a7-a2af-5f3a069daaa2
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: i3hf8t9iX9klOzEoeA7TL9mgpwS2OlgKej5VuoDf3AibL8PafTUqH3hDNuNvhybu
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR15MB3304
X-OriginatorOrg: fb.com
X-Proofpoint-GUID: IX9lsddgjkDML0a3i3Gk5ELZMaZguidn
X-Proofpoint-ORIG-GUID: IX9lsddgjkDML0a3i3Gk5ELZMaZguidn
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.391,18.0.761
 definitions=2021-05-14_11:2021-05-12,2021-05-14 signatures=0
X-Proofpoint-Spam-Details: rule=fb_default_notspam policy=fb_default score=0 mlxlogscore=679
 clxscore=1015 mlxscore=0 adultscore=0 priorityscore=1501 malwarescore=0
 suspectscore=0 bulkscore=0 spamscore=0 lowpriorityscore=0 impostorscore=0
 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2104190000 definitions=main-2105150002
X-FB-Internal: deliver
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Mon, May 10, 2021 at 12:44:27PM +0900, Kuniyuki Iwashima wrote:
> diff --git a/net/core/request_sock.c b/net/core/request_sock.c
> index f35c2e998406..7879a3660c52 100644
> --- a/net/core/request_sock.c
> +++ b/net/core/request_sock.c
> @@ -130,3 +130,42 @@ void reqsk_fastopen_remove(struct sock *sk, struct request_sock *req,
>  out:
>  	spin_unlock_bh(&fastopenq->lock);
>  }
> +
> +struct request_sock *reqsk_clone(struct request_sock *req, struct sock *sk)
> +{
> +	struct sock *req_sk, *nreq_sk;
> +	struct request_sock *nreq;
> +
> +	nreq = kmem_cache_alloc(req->rsk_ops->slab, GFP_ATOMIC | __GFP_NOWARN);
> +	if (!nreq) {
> +		/* paired with refcount_inc_not_zero() in reuseport_migrate_sock() */
> +		sock_put(sk);
> +		return NULL;
> +	}
> +
> +	req_sk = req_to_sk(req);
> +	nreq_sk = req_to_sk(nreq);
> +
> +	memcpy(nreq_sk, req_sk,
> +	       offsetof(struct sock, sk_dontcopy_begin));
> +	memcpy(&nreq_sk->sk_dontcopy_end, &req_sk->sk_dontcopy_end,
> +	       req->rsk_ops->obj_size - offsetof(struct sock, sk_dontcopy_end));
> +
> +	sk_node_init(&nreq_sk->sk_node);
> +	nreq_sk->sk_tx_queue_mapping = req_sk->sk_tx_queue_mapping;
> +#ifdef CONFIG_XPS
> +	nreq_sk->sk_rx_queue_mapping = req_sk->sk_rx_queue_mapping;
> +#endif
> +	nreq_sk->sk_incoming_cpu = req_sk->sk_incoming_cpu;
> +	refcount_set(&nreq_sk->sk_refcnt, 0);
> +
> +	nreq->rsk_listener = sk;
> +
> +	/* We need not acquire fastopenq->lock
> +	 * because the child socket is locked in inet_csk_listen_stop().
> +	 */
> +	if (tcp_rsk(nreq)->tfo_listener)
Should IPPROTO_TCP be tested first like other similar situations
in inet_connection_sock.c?

Also, reqsk_clone() is only used in inet_connection_sock.c.
Can it be moved to inet_connection_sock.c instead and renamed to
inet_reqsk_clone()?