From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ed1-f52.google.com (mail-ed1-f52.google.com [209.85.208.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 29E7712B151 for ; Tue, 26 Mar 2024 22:34:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.52 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711492492; cv=none; b=bETAdyTUsOF4gYKj5uJWoYNZE3AOn15D4K6aSxewdj2+AF+4rV+XVGJ5BKIJbhlx3EQTuYdAhENylsTe7lmt9ni29d2oVLqvxJjQ8KRE2VyW1YOfAUeB0/Ik6RTCSGfDa79LlxbxrWd6uK/l+qPwBumOiUwvuICnPgCVltuRCtA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711492492; c=relaxed/simple; bh=0M4LvvNI77zQI/9DV2/Qo4nlzkup1uIbZ/plEPq0ClM=; h=References:From:To:Cc:Subject:Date:In-reply-to:Message-ID: MIME-Version:Content-Type; b=F7LKxCHs+m4GQmmoNK6hQoYDOoMHKLT9oznw4lxl89hBXtGen5HYo67z7r/w00R4TPnbTLhpXYoeQZBO84VShVkYNUbOD3/m/+wftdQXyY/3hk7aVHgcfOaaeWy/QqM87rShCWvMA/WN6G7FaZSPBKpp0OcoTKgjgoavL0VbCwc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=cloudflare.com; spf=pass smtp.mailfrom=cloudflare.com; dkim=pass (2048-bit key) header.d=cloudflare.com header.i=@cloudflare.com header.b=bxtrlIfD; arc=none smtp.client-ip=209.85.208.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=cloudflare.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=cloudflare.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=cloudflare.com header.i=@cloudflare.com header.b="bxtrlIfD" Received: by mail-ed1-f52.google.com with SMTP id 4fb4d7f45d1cf-56c36f8f932so550943a12.0 for ; Tue, 26 Mar 2024 15:34:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloudflare.com; s=google09082023; t=1711492488; x=1712097288; darn=vger.kernel.org; h=mime-version:message-id:in-reply-to:date:subject:cc:to:from :user-agent:references:from:to:cc:subject:date:message-id:reply-to; bh=ab5N2/+UMfCyeLSLqFwz+fy2fJSFKubepMeB6XNxJn0=; b=bxtrlIfDbbiE/5MrJFqFtrQrJ50HoLyNg9llDly7kaSAi+zSWauS4PBLKN/3QAmD3T ZFgg9rMOD4gSXQbu9mWywK7vJiOZ19uKpz470DBzEDiD8P1x26fhK6VdTDlTVnRuLg/D aBQPJ29Lom9hqjUOzPgc+1bfi3RbFHXe8H1yezqnL4rWkBlF9zIFg52i10HcUNXvqJxV 3DLAKxttTZgbIR0pK5cxZkliX+4MXfxO/0rPkeS0KvsDr4hUbBrIerq4wtmVt8lDuGWl zqCGlfY9rfVerVbW6yzIzSr1O86Kw72TZvAPpMQCLtykwg7re0kSg34AprY/yn4BoByZ xyNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711492488; x=1712097288; h=mime-version:message-id:in-reply-to:date:subject:cc:to:from :user-agent:references:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=ab5N2/+UMfCyeLSLqFwz+fy2fJSFKubepMeB6XNxJn0=; b=QFCr1EL7XHXF/WRnMmBaZuCNHh9SRfwuKagwBbbjgq5rd03TeugC2Xe3pGfozWARWL y6rjzzL2GLgtAUz9WykhtPsC1SCfpWEYouNw9WEm+MDXVPdfNMPnrmwSkhgJCu0n08iD 79bYr6czs0ZQTyWCmbhqsiv+A3L3bidyPeVh1RCsaypJAd1q0AgMHCprlxcH71aRyf/y 9y1Eq7IT2s0YfpEoknTJp1dZNuODg6lY4Sy68oVgw7xUOCXCyM8WCNVb/+0W1ugdZcS+ nCHyI0fWyMG6XtZBj2zFwhVR3Ol7eKL6DHJKZnsp+WvfKW+YNTI+4XsrP5KB/TIcMftI 6ETg== X-Forwarded-Encrypted: i=1; AJvYcCXP4YfExeQZ7J9vye15XpZO2rYSjmM+/l87Da1QRil0XdCecZpO9g3k53g+gW/UVaIPJOIFifYOUAe9uAzUe9WOxp8kJzDI X-Gm-Message-State: AOJu0YyrDqRiQbNFXtZYE+jR26p6r2dwyQ0qg87cD/0Pxdky4/8go9+5 uxsaV49WA87fy1WH3v6a4LvIoEG2AEScO2v3c5NqEYfFvsFq9b3yx9nUASyYDuM= X-Google-Smtp-Source: AGHT+IFd29NI7E7fmbI2DetVVaDs2M2zc93WZvEnIfgrzdHQe3qFznuwCZPaHATWQui+pZyinL6lOw== X-Received: by 2002:a17:906:2655:b0:a46:e9f9:2208 with SMTP id i21-20020a170906265500b00a46e9f92208mr2494997ejc.3.1711492488485; Tue, 26 Mar 2024 15:34:48 -0700 (PDT) Received: from cloudflare.com ([2a09:bac5:5064:2dc::49:1b1]) by smtp.gmail.com with ESMTPSA id v8-20020a170906180800b00a46be5169f1sm4672377eje.181.2024.03.26.15.34.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Mar 2024 15:34:47 -0700 (PDT) References: <000000000000dc9aca0613ec855c@google.com> <87y1a6biie.fsf@cloudflare.com> User-agent: mu4e 1.6.10; emacs 29.2 From: Jakub Sitnicki To: Alexei Starovoitov , Edward Adam Davis , John Fastabend Cc: syzbot+c4f4d25859c2e5859988@syzkaller.appspotmail.com, 42.hyeyoo@gmail.com, andrii@kernel.org, ast@kernel.org, bpf@vger.kernel.org, daniel@iogearbox.net, davem@davemloft.net, edumazet@google.com, kafai@fb.com, kpsingh@kernel.org, kuba@kernel.org, linux-kernel@vger.kernel.org, namhyung@kernel.org, netdev@vger.kernel.org, pabeni@redhat.com, peterz@infradead.org, songliubraving@fb.com, syzkaller-bugs@googlegroups.com, yhs@fb.com Subject: Re: [PATCH] bpf, sockmap: fix deadlock in rcu_report_exp_cpu_mult Date: Tue, 26 Mar 2024 23:15:47 +0100 In-reply-to: <87y1a6biie.fsf@cloudflare.com> Message-ID: <87plvgbp15.fsf@cloudflare.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain On Mon, Mar 25, 2024 at 01:23 PM +01, Jakub Sitnicki wrote: > On Sat, Mar 23, 2024 at 12:08 AM -07, Alexei Starovoitov wrote: >> It seems this bug was causing multiple syzbot reports. > Any chance we could disallow mutating sockhash from interrupt context? I've been playing with the repro from one of the other reports: https://lore.kernel.org/all/CABOYnLzaRiZ+M1v7dPaeObnj_=S4JYmWbgrXaYsyBbWh=553vQ@mail.gmail.com/ syzkaller workload is artificial. So, if we can avoid it, I'd rather not support modifying sockmap/sockhash in contexts where irqs are disabled, and lock safety rules are stricter than what we abide to today. Ideally, we allow task and softirq contexts with irqs enabled (so no tracing progs attached to timer tick, which syzcaller is using as corpus here). Otherwise, we will have to cover for that in selftests. I'm thinking about a restriction like: ---8<--- diff --git a/net/core/sock_map.c b/net/core/sock_map.c index 27d733c0f65e..3692f7256dd6 100644 --- a/net/core/sock_map.c +++ b/net/core/sock_map.c @@ -907,6 +907,7 @@ static void sock_hash_delete_from_link(struct bpf_map *map, struct sock *sk, struct bpf_shtab_elem *elem_probe, *elem = link_raw; struct bpf_shtab_bucket *bucket; + WARN_ON_ONCE(irqs_disabled()); WARN_ON_ONCE(!rcu_read_lock_held()); bucket = sock_hash_select_bucket(htab, elem->hash); @@ -933,6 +934,10 @@ static long sock_hash_delete_elem(struct bpf_map *map, void *key) struct bpf_shtab_elem *elem; int ret = -ENOENT; + /* Can't run. We don't play nice with hardirq-safe locks. */ + if (irqs_disabled()) + return -EOPNOTSUPP; + hash = sock_hash_bucket_hash(key, key_size); bucket = sock_hash_select_bucket(htab, hash); @@ -986,6 +991,7 @@ static int sock_hash_update_common(struct bpf_map *map, void *key, struct sk_psock *psock; int ret; + WARN_ON_ONCE(irqs_disabled()); WARN_ON_ONCE(!rcu_read_lock_held()); if (unlikely(flags > BPF_EXIST)) return -EINVAL;